Tadashi Okoshi
slash****@users*****
2005年 10月 27日 (木) 21:06:34 JST
Index: affelio/lib/Affelio.pm
diff -u affelio/lib/Affelio.pm:1.24 affelio/lib/Affelio.pm:1.25
--- affelio/lib/Affelio.pm:1.24 Thu Oct 27 20:15:01 2005
+++ affelio/lib/Affelio.pm Thu Oct 27 21:06:34 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.24 2005/10/27 11:15:01 slash5234 Exp $
+# $Id: Affelio.pm,v 1.25 2005/10/27 12:06:34 slash5234 Exp $
package Affelio;
{
@@ -134,17 +134,33 @@
###################################
#Initialization
- ###################################
- #Read site config. and user preferences.
+ # Read site config. and user preferences.
$self->read_site_config();
$self->read_user_prefs();
+ ###################################
#Load locale
$self->load_Locale();
- #if($self->{mode} ne "init"){
- # $self->load_ApplicationManager();
- #}
+ ###########################
+ #Configure "Top page"
+ ###########################
+ if($self->{mode} ne "init"){
+ if(($self->{userpref__toppage_app_installname} ne "")
+ && ($self->{userpref__toppage_app_installname} ne "Affelio")){
+
+ #Here, top page is not Affelio module but one of apps.
+ #We now need to load Application Manager
+ $self->load_ApplicationManager();
+ $self->{userpref__toppage_app_path}= "/apps/" . $self->{userpref__toppage_app_installname} . "/" . $self->{am}->{apps}->{"$self->{userpref__toppage_app_installname}"}->{guest_index};
+
+ }else{
+
+ #Here, top page is Affelio module.
+ $self->{userpref__toppage_app_installname} = "Affelio";
+ $self->{userpref__toppage_app_path}="index.cgi?mode=index";
+ }
+ }
debug_print("Affelio::new: end.");
return $self;
@@ -494,22 +510,6 @@
###########################
$self->{am} = new Affelio::Managing::ApplicationManager($self);
- ###########################
- #Configure "Top page"
- ###########################
- if(($self->{userpref__toppage_app_installname} ne "")
- && ($self->{userpref__toppage_app_installname} ne "Affelio")){
-
- $self->{userpref__toppage_app_path}=
- "/apps/" .
- $self->{userpref__toppage_app_installname} . "/" .
- $self->{am}->{apps}->{"$self->{userpref__toppage_app_installname}"}->{guest_index};
-
- }else{
- $self->{userpref__toppage_app_installname} = "Affelio";
- $self->{userpref__toppage_app_path}="index.cgi?mode=index";
- }
-
}catch Error with {
my $ex = shift;
if($self->{mode} ne "init"){