Tadashi Okoshi
slash****@users*****
2006年 6月 9日 (金) 17:34:04 JST
Index: affelio/lib/Affelio/App/Standalone/Admin.pm
diff -u affelio/lib/Affelio/App/Standalone/Admin.pm:1.2 affelio/lib/Affelio/App/Standalone/Admin.pm:1.3
--- affelio/lib/Affelio/App/Standalone/Admin.pm:1.2 Fri May 26 09:12:13 2006
+++ affelio/lib/Affelio/App/Standalone/Admin.pm Fri Jun 9 17:34:04 2006
@@ -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: Admin.pm,v 1.2 2006/05/26 00:12:13 slash5234 Exp $
+# $Id: Admin.pm,v 1.3 2006/06/09 08:34:04 slash5234 Exp $
package Affelio::App::Standalone::Admin;
{
@@ -116,13 +116,26 @@
##############################################################
#prep vars
##############################################################
- my %output_data = ("tmpl_path", "$af->{site__tmpl_web_path}/owner_side/",
- "style_path", $af->{site__web_root} . "/skins/" . $af->{userpref__skin},
- "site__web_root", "$af->{site__user_afid}",
- "site__locale", $af->{site__locale},
- "my_nickname", $af->{user__nickname},
- "site__skin_dir", $af->{site__web_root} . "/skins/" . $af->{userpref__skin},
- "site__locale", $af->{site__locale});
+ my %output_data;
+ ###################
+ ##Site
+ $output_data{site__skin_path} =
+ $af->{site__web_root} . "/skins/" . $af->{userpref__skin};
+ $output_data{site__tmpl_path} =
+ $af->{site__tmpl_web_path} . "/owner_side/";
+ $output_data{site__locale} = $af->{site__locale};
+ $output_data{site__web_root} = $af->{site__user_afid};
+ $output_data{site__user_afid} = $af->{site__user_afid};
+ ###################
+ ##Owner profile
+ $output_data{my_nickname} = $af->{user__nickname};
+ ###################
+ ##For compatibility...
+ $output_data{site__skin_dir} =
+ $af->{site__web_root} . "/skins/" . $af->{userpref__skin};
+ $output_data{style_path} =
+ $af->{site__web_root} . "/skins/" . $af->{userpref__skin};
+ $output_data{tmpl_path} = $af->{site__tmpl_web_path} . "/owner_side/";
$af->get_module_list(\%output_data, $af->{site__user_afid},"self");
$af->get_guest_owner_list(\%output_data);
@@ -170,9 +183,7 @@
print "Content-type: text/html; charset=UTF-8\n";
print "Pragma: no-cache", "\n\n";
- #print get_HTML_header($self);
print $af->translate_templateL10N($tmpl->output);
- #print get_HTML_footer($self);
}
}
@@ -198,8 +209,6 @@
print "Content-type: text/html; charset=UTF-8\n";
print "Pragma: no-cache", "\n\n";
- #print get_HTML_header($self);
-
$TMPL_FILE = "$af->{site__tmpl_dir}/owner_side/login.tmpl";
my $tmpl = new HTML::Template(filename => $TMPL_FILE,
die_on_bad_params => 0);
@@ -210,59 +219,11 @@
$tmpl->param("forward_URL" => $cgi->self_url);
print $af->translate_templateL10N($tmpl->output);
- #print get_HTML_footer($self);
exit(1);
}
debug_print("StandAlone::Admin::check_session: Session as the admin is OK.");
}
-
- ######################################################################
- #Get_HTML_header
- ######################################################################
- sub get_HTML_header{
- my $self = shift;
- my $af = $self->{af};
- my $app__page_title = shift;
-
- #Set template file name
- my $TMPL_FILE = "$af->{site__tmpl_dir}/owner_side/header.tmpl";
- #Set data for template
- my %output_data = ();
- $output_data{"site__skin_dir"} = $af->{site__web_root} . "/skins/" . $af->{userpref__skin};
- $output_data{'site__web_root'} = $af->{site__web_root};
- $output_data{'site__locale'} = $af->{site__locale};
-
- $af->get_module_list(\%output_data, $af->{site__user_afid},"self");
- $af->get_guest_owner_list(\%output_data);
-
- #Initiate Template
- my $tmpl = new HTML::Template( filename => $TMPL_FILE,
- die_on_bad_params => 0);
- $tmpl->param(%output_data);
-
- my $final_out = $af->translate_templateL10N($tmpl->output);
-
- return($final_out);
- }
-
- ######################################################################
- #get_HTML_footer
- ######################################################################
- sub get_HTML_footer{
- my $self = shift;
- my $af = $self->{af};
-
- #Set template file name
- my $TMPL_FILE = "$af->{site__tmpl_dir}/owner_side/footer.tmpl";
- my $tmpl = new HTML::Template(filename => $TMPL_FILE,
- die_on_bad_params => 0);
-
- my $final_out = $af->translate_templateL10N($tmpl->output);
-
- return($final_out);
- }
-
}
1;