Tadashi Okoshi
slash****@users*****
2005年 12月 16日 (金) 18:04:32 JST
Index: affelio/lib/Affelio.pm
diff -u affelio/lib/Affelio.pm:1.30 affelio/lib/Affelio.pm:1.31
--- affelio/lib/Affelio.pm:1.30 Sat Dec 10 11:14:11 2005
+++ affelio/lib/Affelio.pm Fri Dec 16 18:04:31 2005
@@ -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: Affelio.pm,v 1.30 2005/12/10 02:14:11 slash5234 Exp $
+# $Id: Affelio.pm,v 1.31 2005/12/16 09:04:31 slash5234 Exp $
package Affelio;
{
@@ -35,6 +35,7 @@
use Affelio::Managing::AccessLogManager;
use Affelio::Managing::NewsAggregator;
use Affelio::Managing::MyNewsManager;
+ use Affelio::Managing::SessionManager;
use Affelio::misc::Debug;
use Affelio::misc::L10N;
use Affelio::misc::WebInput;
@@ -82,6 +83,11 @@
#guest_owner_switch = "owner" owner
###################################
+ #CGI
+ ###################################
+ my $cgi = $param{CGI};
+
+ ###################################
#Caller
###################################
my $caller = "";
@@ -110,11 +116,11 @@
my $perm = "";
my $am = "";
my $alm = "";
+ my $sm = "";
my $nghr_news = "";
my $my_news="";
my $farm_con = "";
-
###################################
#Blessing
###################################
@@ -122,6 +128,7 @@
cfg_dir => $cfg_dir,
top_dir => $top_dir,
lh => $lh,
+ cgi => $cgi,
db => $db,
pm => $pm,
fm => $fm,
@@ -129,6 +136,7 @@
perm => $perm,
am => $am,
alm => $alm,
+ sm => $sm,
nghr_news => $nghr_news,
my_news => $my_news,
mode => $mode,
@@ -355,6 +363,32 @@
}
######################################################################
+ #getSM
+ ######################################################################
+ sub getSM{
+ my $self=shift;
+
+ if(!($self->{sm}) ){
+ $self->load_SessionManager();
+ }
+ return($self->{sm});
+ }
+
+ ######################################################################
+ #load_SessionManager
+ ######################################################################
+ sub load_SessionManager{
+ my $self = shift;
+ try{
+ $self->{sm} = new Affelio::Managing::SessionManager($self);
+ }
+ catch Error with {
+ my $ex = shift;
+ throw Affelio::exception::SystemException("Cannot load session manager: $ex");
+ };
+ }
+
+ ######################################################################
#getNghrNews
######################################################################
sub getNghrNews{
@@ -835,14 +869,14 @@
if($selected eq "true" ){
$dest_url = $self->{site__web_root} . "/index.cgi?mode=index";
}else{
- if(($visitor_type ne "f1") && ($visitor_type ne "f2")){
+ if($visitor_type eq "self"){
$dest_url = $self->{site__web_root} . "/admin.cgi";
}
}
}else{
####Guest
if($selected eq "true" ){
- if(($visitor_type ne "f1") && ($visitor_type ne "f2")){
+ if($visitor_type eq "self"){
$dest_url = $self->{site__web_root} . "/admin.cgi";
}
}else{
@@ -850,8 +884,6 @@
}
}
-
-
push(@modules,
{'name' => "Affelio",
'image_normal' => "$self->{site__web_root}/icons/affelio_normal.jpg",