Tadashi Okoshi
slash****@users*****
2005年 7月 1日 (金) 12:55:44 JST
Index: affelio/admin.cgi
diff -u affelio/admin.cgi:1.24 affelio/admin.cgi:1.25
--- affelio/admin.cgi:1.24 Fri Jul 1 10:49:00 2005
+++ affelio/admin.cgi Fri Jul 1 12:55:44 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: admin.cgi,v 1.24 2005/07/01 01:49:00 slash5234 Exp $
+# $Id: admin.cgi,v 1.25 2005/07/01 03:55:44 slash5234 Exp $
use strict;
@@ -51,7 +51,7 @@
my $e = shift;
print "Content-type: text/html; charset=UTF-8\n";
print "Pragma: no-cache", "\n\n";
- print "<HTML><PRE>Affelio load error.<BR>$e</PRE></HTML>";
+ print "<HTML><PRE>Affelio load error.<BR>$e<BR><BR>" . $e->stacktrace . "</PRE></HTML>";
exit(1);
};
debug_print("admin.cgi: AF loaded.");
@@ -133,8 +133,7 @@
try{
Affelio::App::Admin::Configuration::configure($af, $q);
}catch Error with{
- my $e = shift;
- $err_msg .= $e;
+ my $e = shift; $err_msg .= $e->stacktrace;
};
}
@@ -151,7 +150,11 @@
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_access_log.tmpl";
- Affelio::App::Admin::AccessLog::show($af,$q,\%output_data);
+ try{
+ Affelio::App::Admin::AccessLog::show($af,$q,\%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
#####################################################################
#Upload Image
@@ -208,35 +211,49 @@
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_showmessage_list.tmpl";
- Affelio::App::Admin::Messaging::show_message_list($af,
+ try{
+ Affelio::App::Admin::Messaging::show_message_list($af,
\%output_data);
-
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}elsif( $q->url_param("action") eq "compose" ){
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_composemessage.tmpl";
- Affelio::App::Admin::Messaging::compose($af,
- $q,
- \%output_data);
+ try{
+ Affelio::App::Admin::Messaging::compose($af,
+ $q,
+ \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}elsif( $q->url_param("action") eq "show" ){
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_showmessage.tmpl";
-
- Affelio::App::Admin::Messaging::mark_as_read($af,
+ try{
+ Affelio::App::Admin::Messaging::mark_as_read($af,
$q->url_param("mid"));
- Affelio::App::Admin::Messaging::show_message($af,
+ Affelio::App::Admin::Messaging::show_message($af,
$q->url_param("mid"),
\%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}else{
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_showmessage_list.tmpl";
-
- Affelio::App::Admin::Messaging::show_message_list($af,
+
+ try{
+ Affelio::App::Admin::Messaging::show_message_list($af,
\%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}
#####################################################################
@@ -248,33 +265,47 @@
if( $q->url_param("action") eq "submitcss" ){
debug_print("admin.cgi: action=[submitcss]");
-
- Affelio::App::Admin::EditSkins::save_css($af, $q);
+ try{
+ Affelio::App::Admin::EditSkins::save_css($af, $q);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}elsif( $q->url_param("action") eq "chooseskin" ){
#Choose skin
debug_print("admin.cgi: action=[chooseskin]");
-
- Affelio::App::Admin::EditSkins::choose_skin($af, $q);
+ try{
+ Affelio::App::Admin::EditSkins::choose_skin($af, $q);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}elsif( $q->url_param("action") eq "backup" ){
#backup skin
debug_print("admin.cgi: action=[backup]");
-
- Affelio::App::Admin::EditSkins::backup($af,$q);
+ try{
+ Affelio::App::Admin::EditSkins::backup($af,$q);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}elsif( $q->url_param("action") eq "upload" ){
#backup skin
debug_print("admin.cgi: action=[upload]");
-
- Affelio::App::Admin::EditSkins::upload($af,$q);
+ try{
+ Affelio::App::Admin::EditSkins::upload($af,$q);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_edit_skins.tmpl";
-
- Affelio::App::Admin::EditSkins::show($af, \%output_data);
-
+ try{
+ Affelio::App::Admin::EditSkins::show($af, \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
#####################################################################
#Edit templates
#####################################################################
@@ -286,21 +317,32 @@
#Retrieve the latest data from friends' sites.
debug_print("admin.cgi: action=[submit]");
- Affelio::App::Admin::EditTemplates::save_templates($af,$q);
- Affelio::App::Admin::EditTemplates::rebuild($af);
-
+ try{
+ Affelio::App::Admin::EditTemplates::save_templates($af,$q);
+ Affelio::App::Admin::EditTemplates::rebuild($af);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}elsif( $q->url_param("action") eq "rebuild" ){
#Retrieve the latest data from friends' sites.
debug_print("admin.cgi: action=[rebuild]");
-
- Affelio::App::Admin::EditTemplates::rebuild($af);
+ try{
+ Affelio::App::Admin::EditTemplates::rebuild($af);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_edit_templates.tmpl";
- Affelio::App::Admin::EditTemplates::show_templates($af, \%output_data);
+ try{
+ Affelio::App::Admin::EditTemplates::show_templates($af, \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
+
#####################################################################
#Friends graph
@@ -313,15 +355,21 @@
#Retrieve the latest data from friends' sites.
debug_print("admin.cgi: action=[retrieve]");
- Affelio::App::Admin::FriendsGraph::retrieve($af);
+ try{
+ Affelio::App::Admin::FriendsGraph::retrieve($af);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_friendsgraph.tmpl";
-
- Affelio::App::Admin::FriendsGraph::show_friendsgraph($af, \%output_data);
-
+ try{
+ Affelio::App::Admin::FriendsGraph::show_friendsgraph($af, \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
#####################################################################
#Edit Profile
#####################################################################
@@ -336,7 +384,11 @@
#Profile data is being submitted.
debug_print("admin.cgi: mode2=[submit]");
- Affelio::App::Admin::EditProfile::save_profile($af,$q);
+ try{
+ Affelio::App::Admin::EditProfile::save_profile($af,$q);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}
Affelio::App::Admin::EditProfile::show_profileeditor($af, \%output_data);
@@ -350,14 +402,20 @@
debug_print("admin.cgi: mode2=[" . $q->url_param("mode2"));
if($q->url_param("mode2") eq "submit"){
- save_GroupMember_table($af, $q);
+ try{
+ save_GroupMember_table($af, $q);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_groupmember_table.tmpl";
-
- show_GroupMember_table($af, \%output_data);
-
+ try{
+ show_GroupMember_table($af, \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
#####################################################################
#Manage Friend
#####################################################################
@@ -367,52 +425,83 @@
debug_print("admin.cgi: mode2=[" . $q->url_param("mode2"));
if($q->url_param("mode2") eq "delete"){
- Affelio::App::Admin::ManageFriend::remove_member($af, $q->url_param("uid"), $q);
+ try{
+ Affelio::App::Admin::ManageFriend::remove_member($af, $q->url_param("uid"), $q);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_managefriends_top.tmpl";
-
- Affelio::App::Admin::ManageFriend::manage_top($af, \%output_data);
-
+ try{
+ Affelio::App::Admin::ManageFriend::manage_top($af, \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}elsif($q->url_param("mode2") eq "show_member"){
##Show member#############
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_managefriends_showmember.tmpl";
-
- Affelio::App::Admin::ManageFriend::show_member($af, $q->url_param("uid"), \%output_data);
+ try{
+ Affelio::App::Admin::ManageFriend::show_member($af, $q->url_param("uid"), \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}elsif($q->url_param("mode2") eq "modify_member"){
##Modify member###########
- Affelio::App::Admin::ManageFriend::modify_member($af, $q->url_param("uid"), $q);
+ try{
+ Affelio::App::Admin::ManageFriend::modify_member($af, $q->url_param("uid"), $q);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_managefriends_showmember.tmpl";
-
- Affelio::App::Admin::ManageFriend::show_member($af, $q->url_param("uid"), \%output_data);
+ try{
+ Affelio::App::Admin::ManageFriend::show_member($af, $q->url_param("uid"), \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}elsif($q->url_param("mode2") eq "unsubscribe_group"){
##Unsubscribe group#######
- Affelio::App::Admin::ManageFriend::unsubscribe_group($af, $q->url_param("gid"), $q->url_param("uid"));
+ try{
+ Affelio::App::Admin::ManageFriend::unsubscribe_group($af, $q->url_param("gid"), $q->url_param("uid"));
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_managefriends_showmember.tmpl";
- Affelio::App::Admin::ManageFriend::show_member($af, $q->url_param("uid"), \%output_data);
+ try{
+ Affelio::App::Admin::ManageFriend::show_member($af, $q->url_param("uid"), \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}elsif($q->url_param("mode2") eq "subscribe_group"){
##Subscribe group#########
my @add_group_inputs = $q->param("add_group");
foreach my $i (@add_group_inputs){
- Affelio::App::Admin::ManageFriend::subscribe_group($af, $i, $q->url_param("uid"));
+ try{
+ Affelio::App::Admin::ManageFriend::subscribe_group($af, $i, $q->url_param("uid"));
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_managefriends_showmember.tmpl";
-
- Affelio::App::Admin::ManageFriend::show_member($af, $q->url_param("uid"), \%output_data);
+ try{
+ Affelio::App::Admin::ManageFriend::show_member($af, $q->url_param("uid"), \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}else{
##TOP#####################
@@ -420,7 +509,12 @@
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_managefriends_top.tmpl";
- Affelio::App::Admin::ManageFriend::manage_top($af, \%output_data);
+ try{
+ Affelio::App::Admin::ManageFriend::manage_top($af, \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
+
}
#####################################################################
@@ -436,43 +530,70 @@
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_managegroups_showgroup.tmpl";
-
- Affelio::App::Admin::ManageGroup::show_group($af, $q->url_param("gid"), \%output_data);
+ try{
+ Affelio::App::Admin::ManageGroup::show_group($af, $q->url_param("gid"), \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}elsif($q->url_param("mode2") eq "rename"){
##Modify member###########
-
- Affelio::App::Admin::ManageGroup::rename_group($af, $q->url_param("gid"), $q->param("new_name"));
+ try{
+ Affelio::App::Admin::ManageGroup::rename_group($af, $q->url_param("gid"), $q->param("new_name"));
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_managegroups_top.tmpl";
- Affelio::App::Admin::ManageGroup::manage_top($af, \%output_data);
+ try{
+ Affelio::App::Admin::ManageGroup::manage_top($af, \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}elsif($q->url_param("mode2") eq "add_group"){
- Affelio::App::Admin::ManageGroup::add_group($af, $q->param("new_group_name"));
+ try{
+ Affelio::App::Admin::ManageGroup::add_group($af, $q->param("new_group_name"));
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_managegroups_top.tmpl";
- Affelio::App::Admin::ManageGroup::manage_top($af, \%output_data);
-
+ try{
+ Affelio::App::Admin::ManageGroup::manage_top($af, \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}elsif($q->url_param("mode2") eq "remove_group"){
-
- Affelio::App::Admin::ManageGroup::remove_group($af, $q->url_param("gid"), $q);
+ try{
+ Affelio::App::Admin::ManageGroup::remove_group($af, $q->url_param("gid"), $q);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_managegroups_top.tmpl";
+ try{
+ Affelio::App::Admin::ManageGroup::manage_top($af, \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
- Affelio::App::Admin::ManageGroup::manage_top($af, \%output_data);
}else{
##TOP#####################
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_managegroups_top.tmpl";
-
- Affelio::App::Admin::ManageGroup::manage_top($af, \%output_data);
+ try{
+ Affelio::App::Admin::ManageGroup::manage_top($af, \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}
#####################################################################
@@ -483,14 +604,21 @@
use Affelio::App::Admin::AccessControl;
if($q->url_param("mode2") eq "submit"){
- save_GroupAttribute_table($af, $q);
+ try{
+ save_GroupAttribute_table($af, $q);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_accesscontrol.tmpl";
-
- show_GroupAttribute_table($af, \%output_data);
+ try{
+ show_GroupAttribute_table($af, \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
#####################################################################
#Application Access Control
@@ -502,18 +630,30 @@
if($q->url_param("mode2") eq "modify_app"){
##Show app#############
- Affelio::App::Admin::ManageApplication::save_permission($af, $q, $q->url_param("app_name"));
+ try{
+ Affelio::App::Admin::ManageApplication::save_permission($af, $q, $q->url_param("app_name"));
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_accesscontrol_apps_showapp.tmpl";
- Affelio::App::Admin::ManageApplication::show_app($af, $q->url_param("app_name"), \%output_data);
+ try{
+ Affelio::App::Admin::ManageApplication::show_app($af, $q->url_param("app_name"), \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}elsif($q->url_param("mode2") eq "show_app"){
##Show app#############
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_accesscontrol_apps_showapp.tmpl";
- Affelio::App::Admin::ManageApplication::show_app($af, $q->url_param("app_name"), \%output_data);
+ try{
+ Affelio::App::Admin::ManageApplication::show_app($af, $q->url_param("app_name"), \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}else{
##TOP#####################
@@ -521,7 +661,11 @@
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_accesscontrol_apps_top.tmpl";
- Affelio::App::Admin::ManageApplication::manage_top($af, \%output_data);
+ try{
+ Affelio::App::Admin::ManageApplication::manage_top($af, \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}
@@ -531,7 +675,11 @@
}elsif($admin_mode eq "send_invitation"){
use Affelio::App::Admin::SendInvitation;
- send_invitation($af, $q->param("dest_address"), \%output_data);
+ try{
+ send_invitation($af, $q->param("dest_address"), \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/admin_top.tmpl";
@@ -545,10 +693,10 @@
use Affelio::App::Admin::SendHandshake;
try{
Affelio::App::Admin::SendHandshake::send($af, $q, \%output_data);
- }catch Error with{
- my $e = shift;
- $err_msg='<AF_M text="Error in handshaking"><BR>' . $e;
- };
+ }catch Error with{
+ my $e = shift;
+ $err_msg='<AF_M text="Error in handshaking"><BR>' . $e;
+ };
$TMPL_FILE = "$af->{site__fs_root}/templates/" .
"$af->{site__template}/owner_side/handshake_sent.tmpl";
@@ -560,7 +708,12 @@
use Affelio::App::Admin::MyStatus;
- Affelio::App::Admin::MyStatus::post($af, $q->param("my_currentstatus"));
+ try{
+ Affelio::App::Admin::MyStatus::post($af, $q->param("my_currentstatus"));
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
+
$HTTP_forward_flag = 1;
$forward_URL = "$af->{site__web_root}/admin.cgi";
@@ -574,8 +727,11 @@
"$af->{site__template}/owner_side/admin_top.tmpl";
use Affelio::App::Admin::AffelioNews;
- Affelio::App::Admin::AffelioNews::getnews($af, \%output_data);
-
+ try{
+ Affelio::App::Admin::AffelioNews::getnews($af, \%output_data);
+ }catch Error with{
+ my $e = shift; $err_msg .= $e->stacktrace;
+ };
}#if
@@ -593,7 +749,6 @@
my $tmpl = new HTML::Template( filename => $TMPL_FILE,
die_on_bad_params => 0);
-
foreach my $data_key (keys(%output_data)) {
$tmpl->param($data_key => $output_data{$data_key});
#debug_print("$data_key ... $output_data{$data_key}");