Tadashi Okoshi
slash****@users*****
2005年 10月 24日 (月) 17:52:49 JST
Index: affelio/admin.cgi
diff -u affelio/admin.cgi:1.28 affelio/admin.cgi:1.29
--- affelio/admin.cgi:1.28 Mon Jul 4 01:16:31 2005
+++ affelio/admin.cgi Mon Oct 24 17:52:49 2005
@@ -16,7 +16,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: admin.cgi,v 1.28 2005/07/03 16:16:31 slash5234 Exp $
+# $Id: admin.cgi,v 1.29 2005/10/24 08:52:49 slash5234 Exp $
use strict;
@@ -43,7 +43,7 @@
############################################################################
debug_print("admin.cgi: start.");
-my $cfg_dir = ".";
+my $cfg_dir = "./config/";
my $af;
try{
$af = new Affelio(ConfigDir => $cfg_dir);
Index: affelio/incoming.cgi
diff -u affelio/incoming.cgi:1.7 affelio/incoming.cgi:1.8
--- affelio/incoming.cgi:1.7 Sun Jul 3 22:42:05 2005
+++ affelio/incoming.cgi Mon Oct 24 17:52:49 2005
@@ -16,7 +16,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: incoming.cgi,v 1.7 2005/07/03 13:42:05 slash5234 Exp $
+# $Id: incoming.cgi,v 1.8 2005/10/24 08:52:49 slash5234 Exp $
use strict;
@@ -44,7 +44,7 @@
############################################################################
#Load Affelio, CGI
############################################################################
-my $cfg_dir = ".";
+my $cfg_dir = "./config/";
my $af;
try{
$af = new Affelio(ConfigDir => $cfg_dir);
Index: affelio/index.cgi
diff -u affelio/index.cgi:1.13 affelio/index.cgi:1.14
--- affelio/index.cgi:1.13 Sun Jul 3 22:20:06 2005
+++ affelio/index.cgi Mon Oct 24 17:52:49 2005
@@ -16,7 +16,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: index.cgi,v 1.13 2005/07/03 13:20:06 slash5234 Exp $
+# $Id: index.cgi,v 1.14 2005/10/24 08:52:49 slash5234 Exp $
use strict;
@@ -44,7 +44,7 @@
#Load Affelio
############################################################################
my $wi = new Affelio::misc::WebInput();
-my $cfg_dir = "./";
+my $cfg_dir = "./config/";
my $af;
try{
$af = new Affelio(ConfigDir => $cfg_dir);
Index: affelio/outgoing.cgi
diff -u affelio/outgoing.cgi:1.6 affelio/outgoing.cgi:1.7
--- affelio/outgoing.cgi:1.6 Fri Jul 1 17:19:41 2005
+++ affelio/outgoing.cgi Mon Oct 24 17:52:49 2005
@@ -16,7 +16,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: outgoing.cgi,v 1.6 2005/07/01 08:19:41 slash5234 Exp $
+# $Id: outgoing.cgi,v 1.7 2005/10/24 08:52:49 slash5234 Exp $
use strict;
@@ -44,7 +44,7 @@
############################################################################
#Load Affelio
############################################################################
-my $cfg_dir = ".";
+my $cfg_dir = "./config/";
my $af;
try{
$af = new Affelio(ConfigDir => $cfg_dir);
Index: affelio/setup.cgi
diff -u affelio/setup.cgi:1.13 affelio/setup.cgi:1.14
--- affelio/setup.cgi:1.13 Tue Jul 12 03:01:42 2005
+++ affelio/setup.cgi Mon Oct 24 17:52:49 2005
@@ -16,7 +16,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: setup.cgi,v 1.13 2005/07/11 18:01:42 slash5234 Exp $
+# $Id: setup.cgi,v 1.14 2005/10/24 08:52:49 slash5234 Exp $
use strict;
@@ -239,15 +239,8 @@
sub check_100{
my $err_msg="";
- if(! -e "affelio.cfg"){
- $err_msg .= $g_lh->maketext("_SETUP_check_100_err1");
- }else{
- if(! -r "affelio.cfg"){
- $err_msg .= $g_lh->maketext("_SETUP_check_100_err2");
- }
- if(! -w "affelio.cfg"){
- $err_msg .= $g_lh->maketext("_SETUP_check_100_err3");
- }
+ if(! -w "config"){
+ $err_msg .= $g_lh->maketext("_SETUP_check_100_err4", "config");
}
if(! -w "userdata"){
$err_msg .= $g_lh->maketext("_SETUP_check_100_err4", "userdata");
@@ -325,7 +318,7 @@
return $err_msg;
}
- open(OUT, "> affelio.cfg");
+ open(OUT, "> $g_fsroot/config/affelio.cfg");
print OUT "[site_config]\n";
print OUT "fs_root=$g_fsroot\n";
print OUT "web_root=$g_webroot\n";
@@ -336,7 +329,8 @@
print OUT "sendmail=$sendmail_path\n";
close OUT;
- chmod 0444, 'affelio.cfg';
+ chmod 0444, "$g_fsroot/config/affelio.cfg";
+ chmod 0700, "$g_fsroot/config";
return("");
}
@@ -499,7 +493,7 @@
##########################################################
#Load Affelio
##########################################################
- my $cfg_dir = ".";
+ my $cfg_dir = "./config/";
my $af;
my $dbh;
try{
@@ -549,7 +543,7 @@
or error($cgi, "Check400-15: Cannot prepare SQL statement: $@");
try{
- open(FIN, "$cfg_dir/defaults/AFuser_CORE_prof_attr.csv")
+ open(FIN, "defaults/AFuser_CORE_prof_attr.csv")
or error($cgi, "Check400-16: Cannot open default prof attr.: $@");
while(my $line=<FIN>){