[Affelio-cvs 885] CVS update: affelio/bin

Back to archive index

Tadashi Okoshi slash****@users*****
2005年 12月 17日 (土) 03:19:52 JST


Index: affelio/bin/get_content.cgi
diff -u affelio/bin/get_content.cgi:1.25 affelio/bin/get_content.cgi:1.26
--- affelio/bin/get_content.cgi:1.25	Sat Dec 17 02:29:00 2005
+++ affelio/bin/get_content.cgi	Sat Dec 17 03:19:52 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: get_content.cgi,v 1.25 2005/12/16 17:29:00 slash5234 Exp $
+# $Id: get_content.cgi,v 1.26 2005/12/16 18:19:52 slash5234 Exp $
 
 use strict;
 
@@ -27,7 +27,6 @@
 $CGI::DISABLE_UPLOADS = 1;
 $CGI::POST_MAX = 102_400;
 use CGI::Session; #qw(-ip_match);
-use HTML::Template;
 use Error qw(:try);
 
 use lib("../lib");
@@ -40,36 +39,23 @@
 use Affelio::misc::NetMisc qw(get_remote_host);
 use Affelio::misc::WebInput;
 
-debug_print("get_content: start.\n");
-
-############################################################################
 #Load Affelio and CGI
-############################################################################
 my $q = new CGI;
 my $cfg_dir = "../config/";
 my $af = new Affelio(ConfigDir => $cfg_dir);
-debug_print("get_content.cgi: AF loaded.");
 my $wi = new Affelio::misc::WebInput(); 
 
-
-############################################################################
 #Retrieve args
-############################################################################
 my $module = $wi->PTN_word($q->param("module"));
 if($module eq "" || !defined($module)){
-	error($q,"Input parameters are not defined.(module)");
+    error($q,"Input parameters are not defined.(module)");
 }
 
 my $content = $wi->PTN_getcontent_content($q->param("content"));
 if($content eq "" || !defined($content)){
-	error($q,"Input parameters are not defined.(content)");
+    error($q,"Input parameters are not defined.(content)");
 }
 
-
-############################################################################
-#Check session w/ cookie
-############################################################################
-my $q = new CGI;
 my $sid = $q->cookie("affelio-$af->{user__nickname}");
 my $ck_visitor_type=0;
 my $ck_visitor_type_str="pb"; 
@@ -80,37 +66,32 @@
     $session = new CGI::Session(undef, 
 				$sid, 
 				{Directory=> $af->{site__session_dir}});
-    
+    my $type = $session->param("type");
+
     if(!$session){
 	debug_print("get_content: session not found. [pb]");
 	$ck_visitor_type=0;
 	$ck_visitor_type_str="pb"; 
 	$ck_visitor_afid = $session->param("user_afid");
-    }elsif($session->param("type") eq "self"){
+    }elsif($type eq "self"){
 	debug_print("get_content: session found. [self]");
 	$ck_visitor_type=3; 
 	$ck_visitor_type_str="self"; 
 	$ck_visitor_afid = $session->param("user_afid");
-    }elsif($session->param("type") eq "f1"){
+    }elsif($type eq "f1"){
 	debug_print("get_content: session found. [f1]");
 	$ck_visitor_type=2; 
 	$ck_visitor_type_str="f1"; 
 	$ck_visitor_afid = $session->param("user_afid");
-    }elsif($session->param("type") eq "f2"){
+    }elsif($type eq "f2"){
 	debug_print("get_content: session found. [f2]");
 	$ck_visitor_type=1; 
 	$ck_visitor_type_str="f2"; 
 	$ck_visitor_afid = $session->param("user_afid");
     }
 }
-debug_print("get_content: After cookie checking...");
-debug_print("get_content: \t visitor_type =[$ck_visitor_type] [$ck_visitor_type_str]");
-debug_print("get_content: \t visitor_afid =[$ck_visitor_afid]");
-
 
-############################################################################
 #CFID check
-############################################################################
 my $CFID_timestamp;
 my $CFID_expire;
 my $CFID_remotehost;
@@ -124,7 +105,6 @@
     ){
 
     my $referrer = $wi->PTN_URL($q->param("referrer"));
-    debug_print("get_content: referrer = $referrer\n");   #referrer URL
 
     my $passAB = $af->getFM->get_attribute_by_afid($referrer, "password");
     if($passAB eq "" || !defined($passAB)){
@@ -144,7 +124,6 @@
     #check expire
     #check remotehost
     #check visitor_afid
-
     debug_print("get_content: Information extracted from CFID");
     debug_print("get_content: \ttimestamp    =$CFID_timestamp\n");
     debug_print("get_content: \texpire       =$CFID_expire\n");
@@ -252,7 +231,6 @@
 	binmode (STDOUT);
 	print <IMG>;
 	close IMG;
-	
     }
 
     if($content eq "/profile/mystatus"){


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