[Affelio-cvs 86] CVS update: affelio

Back to archive index

Tadashi Okoshi slash****@users*****
2005年 6月 21日 (火) 17:45:24 JST


Index: affelio/admin.cgi
diff -u affelio/admin.cgi:1.2 affelio/admin.cgi:1.3
--- affelio/admin.cgi:1.2	Fri Jun 17 19:01:04 2005
+++ affelio/admin.cgi	Tue Jun 21 17:45:24 2005
@@ -1,4 +1,4 @@
-#!/usr/bin/perl 
+#!/usr/bin/perl
 
 # Affelio: Open social networking software 
 # Copyright 2004-2005 Fish Grove
@@ -6,7 +6,7 @@
 #    http://affelio.jp/ (Japan)
 #    http://affelio.jp/ (USA and other area)
 #
-# $Id: admin.cgi,v 1.2 2005/06/17 10:01:04 slash5234 Exp $
+# $Id: admin.cgi,v 1.3 2005/06/21 08:45:24 slash5234 Exp $
 
 use strict;
 
@@ -16,6 +16,7 @@
 $CGI::POST_MAX = 1024_000;
 use CGI::Session qw(-ip_match);
 use HTML::Template;
+use Fcntl;
 
 use lib("./lib");
 use Affelio;
@@ -23,7 +24,7 @@
 use Affelio::misc::Debug qw( debug_print);
 use Affelio::misc::Time;
 use Affelio::misc::NetMisc;
-use Affelio::misc::WebInput qw(check_param);
+use Affelio::misc::WebInput;
 
 ############################################################################
 #Load Affelio
@@ -33,7 +34,7 @@
 my $cfg_dir = ".";
 my $af = new Affelio(ConfigDir => $cfg_dir);
 debug_print("admin.cgi: AF loaded.");
-
+my $wi = new Affelio::misc::WebInput();
 
 ############################################################################
 #Check session w/ cookie
@@ -45,6 +46,7 @@
 			       $sid, 
 			       {Directory=> $af->{site__session_dir}});
 
+
 debug_print("admin:cgi Existing session: [" . $session->id . "]");
 
 if( (!$session) || ($session->param("type") ne "self")  ){
@@ -83,13 +85,13 @@
 		   );
 
 my $err="";
-my $flag_forward = 0;
+my $HTTP_forward_flag = 0;
 my $forward_URL = "";
 
 ####################
 #admin_mode
 ####################
-my $admin_mode = check_param($q->url_param("mode"));
+my $admin_mode = $wi->PTN_mode($q->url_param("mode"));
 
 if($admin_mode eq "uploadimage"){
 
@@ -100,20 +102,18 @@
     $TMPL_FILE = "$af->{site__fs_root}/templates/" .
 	         "$af->{site__template}/owner_side/admin_uploadimage.tmpl";
 
-    if($q->url_param("action") eq "submit" ){
+    my $sub_mode = $wi->PTN_mode($q->url_param("action"));
+    if($sub_mode eq "submit" ){
 
 	$q->cgi_error 
 	    and error($q, "File transfer failed." . $q->cgi_error);
 
-	my $uploaded_filename = $q->param( "file" ) 
+	my $uploaded_filename = $wi->PTN_jpg_filename($q->param("file"))
 	    || error($q, "File has not been transfered to server.");
 	my $fh = $q->upload( "file" );
 	
-	if($uploaded_filename !~ /[JPG|JPEG|jpg|jpeg|]$/){
-	    error($q, "File is not a valid jpeg file.");
-	}
-
-	open(OUT, "> $af->{site__user_dir}/profile_face.jpg");
+	sysopen(OUT, "$af->{site__user_dir}/profile_face.jpg", 
+		O_WRONLY|O_TRUNC|O_CREAT, 0755);
 	binmode $fh;
 	binmode OUT;
 	my $buffer="";
@@ -134,7 +134,7 @@
     #######################
     use Affelio::App::Admin::Messaging;
 
-    if( check_param($q->url_param("action")) eq "show" ){
+    if( $q->url_param("action") eq "show" ){
 	$TMPL_FILE = "$af->{site__fs_root}/templates/" .
 	    "$af->{site__template}/owner_side/admin_showmessage.tmpl";
 
@@ -164,13 +164,13 @@
     if( $q->url_param("action") eq "submitcss" ){
 	debug_print("admin.cgi: action=[submitcss]");
 
-	Affelio::App::Admin::EditSkins::save_css($af,$q);
+	Affelio::App::Admin::EditSkins::save_css($af, $q);
 
     }elsif( $q->url_param("action") eq "chooseskin" ){
 	#Choose skin
 	debug_print("admin.cgi: action=[chooseskin]");
 
-	Affelio::App::Admin::EditSkins::choose_skin($af,$q);
+	Affelio::App::Admin::EditSkins::choose_skin($af, $q);
 
     }elsif( $q->url_param("action") eq "backup" ){
 	#backup skin
@@ -190,6 +190,7 @@
 
     Affelio::App::Admin::EditSkins::show($af, \%output_data);
 
+
 }elsif($admin_mode eq "edit_templates"){
 
     debug_print("admin.cgi: mode=[edit_templates]");
@@ -467,7 +468,7 @@
     use Affelio::App::Admin::MyStatus;
 
     Affelio::App::Admin::MyStatus::post($af, $q->param("my_currentstatus"));
-    $flag_forward = 1;
+    $HTTP_forward_flag = 1;
     $forward_URL = "$af->{site__web_root}/admin.cgi";
 
 }else{
@@ -485,7 +486,7 @@
 ############################################################################
 #Output View
 ############################################################################
-if( $flag_forward==1 ){
+if( $HTTP_forward_flag==1 ){
     print "Location: $forward_URL", "\n\n";
 
 }else{
Index: affelio/index.cgi
diff -u affelio/index.cgi:1.1.1.1 affelio/index.cgi:1.2
--- affelio/index.cgi:1.1.1.1	Tue Jun 14 12:53:29 2005
+++ affelio/index.cgi	Tue Jun 21 17:45:24 2005
@@ -1,4 +1,4 @@
-#!/usr/bin/perl 
+#!/usr/bin/perl
 
 # Affelio: Open social networking software 
 # Copyright 2004-2005 Fish Grove
@@ -6,7 +6,7 @@
 #    http://affelio.jp/ (Japan)
 #    http://affelio.jp/ (USA and other area)
 #
-# $Id: index.cgi,v 1.1.1.1 2005/06/14 03:53:29 slash5234 Exp $
+# $Id: index.cgi,v 1.2 2005/06/21 08:45:24 slash5234 Exp $
 
 use strict;
 
@@ -23,6 +23,7 @@
 use Affelio::misc::Debug qw(debug_print);
 use Affelio::misc::NetMisc;
 use Affelio::misc::Time;
+use Affelio::misc::WebInput;
 use Affelio::SNS::Handshaker_c;
 
 debug_print("index.cgi: start.");
@@ -32,6 +33,7 @@
 ############################################################################
 my $cfg_dir = ".";
 my $af = new Affelio(ConfigDir => $cfg_dir);
+my $wi = new Affelio::misc::WebInput(); 
 
 ############################################################################
 #Check session w/ cookie
@@ -47,9 +49,13 @@
 my $visitor_afid="";
 
 if($session){
-    $visitor_type = $session->param("type");
-    $visitor_nickname = $session->param("user_nickname");
-    $visitor_afid = $session->param("user_afid");
+    $visitor_type 
+	= $wi->PTN_visitor_type($session->param("type"));
+    $visitor_nickname 
+	= $wi->PTN_nickname($session->param("user_nickname"));
+
+    $visitor_afid 
+	= $wi->PTN_URL($session->param("user_afid"));
 }
 if($visitor_type eq ""){
     $visitor_type="pb";
@@ -69,7 +75,7 @@
 ######################################################
 #Template file
 ######################################################
-my $mode = $q->url_param("mode");
+my $mode = $wi->PTN_mode($session->param("mode"));
 if(($mode eq "") ||  !defined($mode)){
     $mode = "index";
 }


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