[Affelio-cvs 406] CVS update: affelio

Back to archive index

Tadashi Okoshi slash****@users*****
2005年 7月 1日 (金) 03:32:56 JST


Index: affelio/setup.cgi
diff -u affelio/setup.cgi:1.9 affelio/setup.cgi:1.10
--- affelio/setup.cgi:1.9	Tue Jun 28 23:07:21 2005
+++ affelio/setup.cgi	Fri Jul  1 03:32:56 2005
@@ -6,7 +6,7 @@
 #    http://affelio.jp/ (Japan)
 #    http://affelio.jp/ (USA and other area)
 #
-# $Id: setup.cgi,v 1.9 2005/06/28 14:07:21 slash5234 Exp $
+# $Id: setup.cgi,v 1.10 2005/06/30 18:32:56 slash5234 Exp $
 
 use strict;
 
@@ -37,6 +37,7 @@
 my $g_lh = "";
 my $g_locale =""; 
 my $g_actionurl="";
+my $g_btn_name_accept="";
 my $g_err="";
 my $g_msg="";
 my $g_img="";
@@ -58,6 +59,10 @@
 if($g_stage ==0){
     show_0();
 
+}elsif($g_stage ==10){
+    show_10();
+
+
 }elsif($g_stage ==30){
     show_30();
 
@@ -80,19 +85,11 @@
 	show_200();
     }
 
-}elsif($g_stage ==300){
+}elsif($g_stage ==350){
     $g_err= check_200();
     if($g_err ne ""){
 	show_200();
     }else{
-	show_300();
-    }
-
-}elsif($g_stage ==350){
-    $g_err= check_300();
-    if($g_err ne ""){
-	show_300();
-    }else{
 	show_350();
     }
 
@@ -118,6 +115,7 @@
 #########################################
 %output_data = ("msg", $g_msg,
 		"title", $g_title,
+		"btn_name_accept", $g_btn_name_accept,
 		"err_msg", $g_err,
 		"tmpl_path", "$g_webroot/templates/default/owner_side",
 		"locale", $g_locale,
@@ -152,7 +150,15 @@
     $TMPL_FILE = "$g_fsroot/templates/default/owner_side/setup_0.tmpl";
     $g_title ="";
     $g_msg="";
-    $g_img= "0.jpg";
+    $g_img= "0.gif";
+    $g_actionurl="setup.cgi?stage=10";
+}
+
+sub show_10{
+    $TMPL_FILE = "$g_fsroot/templates/default/owner_side/setup_1.tmpl";
+    $g_title= $g_lh->maketext("_SETUP_title_10");
+    $g_msg= $g_lh->maketext("_SETUP_msg_10");
+    $g_img= "10.jpg";
     $g_actionurl="setup.cgi?stage=30";
 }
 
@@ -162,6 +168,7 @@
     $g_title= $g_lh->maketext("_SETUP_title_30");
     $g_msg= $g_lh->maketext("_SETUP_msg_30");
     $g_img= "30.jpg";
+    $g_btn_name_accept="true";
     $g_actionurl="setup.cgi?stage=50";
 }
 
@@ -226,7 +233,43 @@
 	    $err_msg .= $g_lh->maketext("_SETUP_check_100_err3");
 	}
     }
-    return $err_msg;
+    if(! -w "userdata"){
+	$err_msg .= $g_lh->maketext("_SETUP_check_100_err4",  "userdata");
+    }
+    if(! -r "userdata"){
+	$err_msg .= $g_lh->maketext("_SETUP_check_100_err5",  "userdata");
+    }
+    if(! -w "session"){
+	$err_msg .= $g_lh->maketext("_SETUP_check_100_err4",  "session");
+    }
+    if(! -r "session"){
+	$err_msg .= $g_lh->maketext("_SETUP_check_100_err5",  "session");
+    }
+    if(! -w "skins"){
+	$err_msg .= $g_lh->maketext("_SETUP_check_100_err4",  "skins");
+    }
+    if(! -r "skins"){
+	$err_msg .= $g_lh->maketext("_SETUP_check_100_err5",  "skins");
+    }
+    if(! -w "templates_dyn"){
+	$err_msg .= $g_lh->maketext("_SETUP_check_100_err4",  "templates_dyn");
+    }
+    if(! -r "templates_dyn"){
+	$err_msg .= $g_lh->maketext("_SETUP_check_100_err5",  "templates_dyn");
+    }
+    if($err_msg ne ""){
+	return $err_msg;
+    }
+
+    #make userdata/xxxxx session/yyyy directories
+    srand(time ^ ($$ + ($$ << 15)));
+    #userdata
+    my $dir1 = Affelio::misc::MyCrypt::generate_password();
+    mkdir("userdata/$dir1", 0777);
+    my $dir2 = Affelio::misc::MyCrypt::generate_password();
+    mkdir("session/$dir2", 0777);
+
+    return("");
 }
 
 #########################################
@@ -235,7 +278,7 @@
     $g_title= $g_lh->maketext("_SETUP_title_200");
     $g_msg= msg_200();
     $g_img= "200.jpg";
-    $g_actionurl="setup.cgi?stage=300";
+    $g_actionurl="setup.cgi?stage=350";
 }
 
 sub msg_200{
@@ -277,79 +320,7 @@
     print OUT "sendmail=$sendmail_path\n";
     close OUT;
 
-    return("");
-}
-
-#########################################
-sub show_300{
-    $TMPL_FILE = "$g_fsroot/templates/default/owner_side/setup_1.tmpl";
-    $g_title= $g_lh->maketext("_SETUP_title_300");
-    $g_msg= $g_lh->maketext("_SETUP_msg_300");
-    $g_img= "300.jpg";
-    $g_actionurl="setup.cgi?stage=350";
-}
-
-sub check_300{
-    my $err_msg="";
-
-    my $cfg_mode = 0;
-    if(-w 'affelio.cfg'){
-	$cfg_mode = 1;
-    }
-
-    my $userdatadir_mode=0;
-    if(-w 'userdata'){
-	$userdatadir_mode = 1;
-    }
-
-    my $sessiondir_mode =0;
-    if(-w 'session'){
-	$sessiondir_mode = 1;
-    }
-
-    my $skinsdir_mode =0;
-    if(-w 'skins'){
-	$skinsdir_mode = 1;
-    }
-
-    my $templates_dyndir_mode =0;
-    if(-w 'templates_dyn'){
-	$templates_dyndir_mode = 1;
-    }
-
-    if($cfg_mode){
-	$err_msg .= $g_lh->maketext("_SETUP_check_300_err1_shouldnotwritable",
-				    "affelio.cfg");
-    }
-
-    if(!$userdatadir_mode){
-	$err_msg .= $g_lh->maketext("_SETUP_check_300_err1_shouldwritable",
-				    "userdata");
-    }
-    if(!$sessiondir_mode){
-	$err_msg .= $g_lh->maketext("_SETUP_check_300_err1_shouldwritable",
-				    "session");
-    }
-    if(!$skinsdir_mode){
-	$err_msg .= $g_lh->maketext("_SETUP_check_300_err1_shouldwritable",
-				    "skins");
-    }
-    if(!$templates_dyndir_mode){
-	$err_msg .= $g_lh->maketext("_SETUP_check_300_err1_shouldwritable",
-				    "templates_dyn");
-    }
-
-    if($err_msg ne ""){
-	return($err_msg);
-    }
-
-    #make userdata/xxxxx session/yyyy directories
-    srand(time ^ ($$ + ($$ << 15)));
-    #userdata
-    my $dir1 = Affelio::misc::MyCrypt::generate_password();
-    mkdir("userdata/$dir1", 0777);
-    my $dir2 = Affelio::misc::MyCrypt::generate_password();
-    mkdir("session/$dir2", 0777);
+    chmod 0444, 'affelio.cfg';
 
     return("");
 }


Affelio-cvs メーリングリストの案内
Back to archive index