Tadashi Okoshi
slash****@users*****
2006年 3月 7日 (火) 23:39:11 JST
Index: affelio/lib/Affelio/misc/CGIError.pm
diff -u affelio/lib/Affelio/misc/CGIError.pm:1.4 affelio/lib/Affelio/misc/CGIError.pm:1.5
--- affelio/lib/Affelio/misc/CGIError.pm:1.4 Fri Jul 1 11:00:10 2005
+++ affelio/lib/Affelio/misc/CGIError.pm Tue Mar 7 23:39:11 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: CGIError.pm,v 1.4 2005/07/01 02:00:10 slash5234 Exp $
+# $Id: CGIError.pm,v 1.5 2006/03/07 14:39:11 slash5234 Exp $
use strict;
Index: affelio/lib/Affelio/misc/DBroutines.pm
diff -u affelio/lib/Affelio/misc/DBroutines.pm:1.2 affelio/lib/Affelio/misc/DBroutines.pm:1.3
--- affelio/lib/Affelio/misc/DBroutines.pm:1.2 Fri Jul 1 11:00:10 2005
+++ affelio/lib/Affelio/misc/DBroutines.pm Tue Mar 7 23:39:11 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: DBroutines.pm,v 1.2 2005/07/01 02:00:10 slash5234 Exp $
+# $Id: DBroutines.pm,v 1.3 2006/03/07 14:39:11 slash5234 Exp $
package Affelio::misc::DBroutines;
{
Index: affelio/lib/Affelio/misc/Debug.pm
diff -u affelio/lib/Affelio/misc/Debug.pm:1.9 affelio/lib/Affelio/misc/Debug.pm:1.10
--- affelio/lib/Affelio/misc/Debug.pm:1.9 Sun Dec 18 13:20:36 2005
+++ affelio/lib/Affelio/misc/Debug.pm Tue Mar 7 23:39:11 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: Debug.pm,v 1.9 2005/12/18 04:20:36 slash5234 Exp $
+# $Id: Debug.pm,v 1.10 2006/03/07 14:39:11 slash5234 Exp $
package Affelio::misc::Debug;
{
Index: affelio/lib/Affelio/misc/Encoding.pm
diff -u affelio/lib/Affelio/misc/Encoding.pm:1.3 affelio/lib/Affelio/misc/Encoding.pm:1.4
--- affelio/lib/Affelio/misc/Encoding.pm:1.3 Fri Jul 1 11:00:10 2005
+++ affelio/lib/Affelio/misc/Encoding.pm Tue Mar 7 23:39:11 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: Encoding.pm,v 1.3 2005/07/01 02:00:10 slash5234 Exp $
+# $Id: Encoding.pm,v 1.4 2006/03/07 14:39:11 slash5234 Exp $
package Affelio::misc::Encoding;
{
Index: affelio/lib/Affelio/misc/ImageEditor.pm
diff -u affelio/lib/Affelio/misc/ImageEditor.pm:1.1 affelio/lib/Affelio/misc/ImageEditor.pm:1.2
--- affelio/lib/Affelio/misc/ImageEditor.pm:1.1 Sat Dec 17 13:44:52 2005
+++ affelio/lib/Affelio/misc/ImageEditor.pm Tue Mar 7 23:39:11 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: ImageEditor.pm,v 1.1 2005/12/17 04:44:52 slash5234 Exp $
+# $Id: ImageEditor.pm,v 1.2 2006/03/07 14:39:11 slash5234 Exp $
package Affelio::misc::ImageEditor;
{
Index: affelio/lib/Affelio/misc/InitAffelio.pm
diff -u affelio/lib/Affelio/misc/InitAffelio.pm:1.18 affelio/lib/Affelio/misc/InitAffelio.pm:1.19
--- affelio/lib/Affelio/misc/InitAffelio.pm:1.18 Thu Feb 23 21:41:38 2006
+++ affelio/lib/Affelio/misc/InitAffelio.pm Tue Mar 7 23:39:11 2006
@@ -14,14 +14,14 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: InitAffelio.pm,v 1.18 2006/02/23 12:41:38 slash5234 Exp $
+# $Id: InitAffelio.pm,v 1.19 2006/03/07 14:39:11 slash5234 Exp $
package Affelio::misc::InitAffelio;
{
use strict;
use Exporter;
@Affelio::misc::InitAffelio::ISA = "Exporter";
- @Affelio::misc::InitAffelio::EXPORT = qw (create_userdir create_af_cfg create_db_cfg create_login_cfg copy_def_files init_db set_datadir_perm setup_affelio copy_def_aftemplate_files create_resized_images);
+ @Affelio::misc::InitAffelio::EXPORT = qw (create_userdir create_af_cfg create_db_cfg create_login_cfg copy_def_files init_db set_datadir_perm setup_affelio setup_affelio_AFE2 copy_def_aftemplate_files create_resized_images);
use lib("../../../extlib/");
use Cwd;
@@ -34,7 +34,7 @@
use Affelio::misc::Debug;
use Affelio::misc::MyCrypt;
use Affelio::misc::Util qw(get_userdir);
- use Affelio::App::Admin::EditTemplates;
+ use Affelio::App::Standalone::Admin::EditTemplates;
use Affelio::exception::Exception;
use Affelio::exception::DBException;
use Affelio::exception::IOException;
@@ -135,6 +135,7 @@
my $top_dir=shift;
my $user_dir=shift;
my $locale = shift;
+ my $password_remoteop = shift;
#Copy default face JPEG file
system("cp -f $top_dir/defaults/profile_face.jpg $user_dir/profile_face.jpg");
@@ -142,6 +143,9 @@
#Copy default preference file
system("cp -f $top_dir/defaults/preference.cfg $user_dir/preference.cfg");
+ open(OUT, ">> $user_dir/preference.cfg");
+ print OUT "password_remoteop= $password_remoteop\n";
+ close(OUT);
system("cp -fr $top_dir/defaults/af_templates/$locale $user_dir/af_templates");
}
@@ -583,7 +587,7 @@
################################
#(6)Copy default files
- copy_def_files($root_dir , $user_dir, $locale);
+ copy_def_files($root_dir , $user_dir, $locale, "");
debug_print("InitAffelio:setup (6) copy default files. done.");
################################
@@ -599,7 +603,7 @@
#(9)Rebuild template
my $af;
$af = new Affelio(ConfigDir => "$root_dir/config/");
- Affelio::App::Admin::EditTemplates::rebuild($af);
+ Affelio::App::Standalone::Admin::EditTemplates::rebuild($af);
debug_print("InitAffelio:setup (8) Rebuild template done.");
################################
@@ -616,40 +620,52 @@
# all-in-one function to setup affelio
#####################################################################
sub setup_affelio_AFE2{
- my $fs_userdata_dir = shift;
- my $fs_tmpldyn_dir = shift;
- my $fs_affelio_dir = shift;
- my $user_afid = shift;
- #
- my $locale = shift;
- my $lh = shift;
- #
- my $db_type = shift;
- my $db_dbname = shift;
- my $db_username = shift;
- my $db_password = shift;
- my $db_hostname = shift;
- my $db_port = shift;
- #
- my $username = shift;
- my $password = shift;
- my $nickname =shift;
- my $email =shift;
+ debug_print("InitAffelio:setup_affelio_AFE2 start.");
- debug_print("InitAffelio:setup start.");
- #
- #$dataroot/users/$account/userdata
+ my %param = @_;
+
+ #fs_userdata_dir: where .db or .cfg will be saved.
+ my $fs_userdata_dir = $param{fs_userdata_dir};
+
+ #fs_tmpldyn_dir: where dynamic template will be saved.
+ my $fs_tmpldyn_dir = $param{fs_tmpldyn_dir};
+
+ #fs_affelio_dir: path to affelio_core package
+ my $fs_affelio_dir = $param{fs_affelio_dir};
+
+ #fs_farm_dir: path to ***Farm dir
+ my $fs_farm_dir = $param{fs_farm_dir};
+
+ #user_afid: New user's afid (Affelio URL)
+ my $user_afid = $param{user_afid};
+
+ #locale: Locale
+ my $locale = $param{locale};
+
+ #lh: locale handler
+ my $lh = $param{lh};
+
+ #db_type:
+ my $db_type = $param{db_type};
+ my $db_dbname = $param{db_dbname};
+ my $db_username = $param{db_username};
+ my $db_password = $param{db_password};
+ my $db_hostname = $param{db_hostname};
+ my $db_port = $param{db_port};
+
+ #account info...
+ my $username = $param{username};
+ my $password = $param{password};
+ my $password_remoteop = $param{password_remoteop};
+ my $nickname =$param{nickname};
+ my $email =$param{email};
+
+ #############################################################
debug_print("\t$fs_userdata_dir ");
- #
- #$dataroot/users/$account/templates_dyn
debug_print("\t$fs_tmpldyn_dir ");
- #
- #affelio top dir
debug_print("\t$fs_affelio_dir");
- #
- #User's Affelio URL
+ debug_print("\t$fs_farm_dir");
debug_print("\t$user_afid");
- #
debug_print("\t$locale");
debug_print("\t$lh ");
debug_print("\t$db_type ");
@@ -663,6 +679,7 @@
debug_print("\t$nickname ");
debug_print("\t$email ");
+ #############################################################
$ENV{'REDIRECT_AF_USERNAME'} = $username;
################################
@@ -688,7 +705,8 @@
################################
#(3)Copy default files
- copy_def_files($fs_affelio_dir , $fs_userdata_dir, $locale);
+ copy_def_files($fs_farm_dir , $fs_userdata_dir,
+ $locale, $password_remoteop);
debug_print("InitAffelio:setup_AFE2 (3) copy default files. done.");
################################
@@ -704,7 +722,7 @@
#(6)Rebuild template
my $af;
$af = new Affelio(ConfigDir => "$fs_affelio_dir/config/");
- Affelio::App::Admin::EditTemplates::rebuild($af);
+ Affelio::App::Standalone::Admin::EditTemplates::rebuild($af);
debug_print("InitAffelio:setup_AFE2 (6) Rebuild template done.");
debug_print("InitAffelio:setup_AFE2 ****ALL DONE****");
Index: affelio/lib/Affelio/misc/L10N.pm
diff -u affelio/lib/Affelio/misc/L10N.pm:1.3 affelio/lib/Affelio/misc/L10N.pm:1.4
--- affelio/lib/Affelio/misc/L10N.pm:1.3 Fri Jul 1 11:00:10 2005
+++ affelio/lib/Affelio/misc/L10N.pm Tue Mar 7 23:39:11 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: L10N.pm,v 1.3 2005/07/01 02:00:10 slash5234 Exp $
+# $Id: L10N.pm,v 1.4 2006/03/07 14:39:11 slash5234 Exp $
package Affelio::misc::L10N;
{
Index: affelio/lib/Affelio/misc/MyCrypt.pm
diff -u affelio/lib/Affelio/misc/MyCrypt.pm:1.3 affelio/lib/Affelio/misc/MyCrypt.pm:1.4
--- affelio/lib/Affelio/misc/MyCrypt.pm:1.3 Fri Jul 1 11:00:10 2005
+++ affelio/lib/Affelio/misc/MyCrypt.pm Tue Mar 7 23:39:11 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: MyCrypt.pm,v 1.3 2005/07/01 02:00:10 slash5234 Exp $
+# $Id: MyCrypt.pm,v 1.4 2006/03/07 14:39:11 slash5234 Exp $
package Affelio::misc::MyCrypt;
{
Index: affelio/lib/Affelio/misc/NetMisc.pm
diff -u affelio/lib/Affelio/misc/NetMisc.pm:1.4 affelio/lib/Affelio/misc/NetMisc.pm:1.5
--- affelio/lib/Affelio/misc/NetMisc.pm:1.4 Fri Jul 1 11:00:10 2005
+++ affelio/lib/Affelio/misc/NetMisc.pm Tue Mar 7 23:39:11 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-# $Id: NetMisc.pm,v 1.4 2005/07/01 02:00:10 slash5234 Exp $
+# $Id: NetMisc.pm,v 1.5 2006/03/07 14:39:11 slash5234 Exp $
package Affelio::misc::NetMisc;
{
Index: affelio/lib/Affelio/misc/Sanitizer.pm
diff -u affelio/lib/Affelio/misc/Sanitizer.pm:1.3 affelio/lib/Affelio/misc/Sanitizer.pm:1.4
--- affelio/lib/Affelio/misc/Sanitizer.pm:1.3 Fri Jul 1 11:00:10 2005
+++ affelio/lib/Affelio/misc/Sanitizer.pm Tue Mar 7 23:39:11 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: Sanitizer.pm,v 1.3 2005/07/01 02:00:10 slash5234 Exp $
+# $Id: Sanitizer.pm,v 1.4 2006/03/07 14:39:11 slash5234 Exp $
use strict;
Index: affelio/lib/Affelio/misc/Time.pm
diff -u affelio/lib/Affelio/misc/Time.pm:1.7 affelio/lib/Affelio/misc/Time.pm:1.8
--- affelio/lib/Affelio/misc/Time.pm:1.7 Tue Nov 8 16:01:44 2005
+++ affelio/lib/Affelio/misc/Time.pm Tue Mar 7 23:39:11 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: Time.pm,v 1.7 2005/11/08 07:01:44 slash5234 Exp $
+# $Id: Time.pm,v 1.8 2006/03/07 14:39:11 slash5234 Exp $
package Affelio::misc::Time;
{
Index: affelio/lib/Affelio/misc/Util.pm
diff -u affelio/lib/Affelio/misc/Util.pm:1.1 affelio/lib/Affelio/misc/Util.pm:1.2
--- affelio/lib/Affelio/misc/Util.pm:1.1 Thu Oct 27 19:27:05 2005
+++ affelio/lib/Affelio/misc/Util.pm Tue Mar 7 23:39:11 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: Util.pm,v 1.1 2005/10/27 10:27:05 slash5234 Exp $
+# $Id: Util.pm,v 1.2 2006/03/07 14:39:11 slash5234 Exp $
package Affelio::misc::Util;
{
Index: affelio/lib/Affelio/misc/WSSE.pm
diff -u affelio/lib/Affelio/misc/WSSE.pm:1.4 affelio/lib/Affelio/misc/WSSE.pm:1.5
--- affelio/lib/Affelio/misc/WSSE.pm:1.4 Sat Dec 17 01:19:43 2005
+++ affelio/lib/Affelio/misc/WSSE.pm Tue Mar 7 23:39:11 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: WSSE.pm,v 1.4 2005/12/16 16:19:43 slash5234 Exp $
+# $Id: WSSE.pm,v 1.5 2006/03/07 14:39:11 slash5234 Exp $
package Affelio::misc::WSSE;
{
Index: affelio/lib/Affelio/misc/WebInput.pm
diff -u affelio/lib/Affelio/misc/WebInput.pm:1.8 affelio/lib/Affelio/misc/WebInput.pm:1.9
--- affelio/lib/Affelio/misc/WebInput.pm:1.8 Tue Oct 25 00:07:51 2005
+++ affelio/lib/Affelio/misc/WebInput.pm Tue Mar 7 23:39:11 2006
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: WebInput.pm,v 1.8 2005/10/24 15:07:51 slash5234 Exp $
+# $Id: WebInput.pm,v 1.9 2006/03/07 14:39:11 slash5234 Exp $
use strict;
package Affelio::misc::WebInput;