[Affelio-cvs 1192] CVS update: affelio/lib/Affelio/App/Standalone/Admin

Back to archive index

Tadashi Okoshi slash****@users*****
2006年 3月 28日 (火) 18:15:22 JST


Index: affelio/lib/Affelio/App/Standalone/Admin/AccessControl.pm
diff -u affelio/lib/Affelio/App/Standalone/Admin/AccessControl.pm:1.1 affelio/lib/Affelio/App/Standalone/Admin/AccessControl.pm:1.2
--- affelio/lib/Affelio/App/Standalone/Admin/AccessControl.pm:1.1	Tue Mar  7 23:39:09 2006
+++ affelio/lib/Affelio/App/Standalone/Admin/AccessControl.pm	Tue Mar 28 18:15:22 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: AccessControl.pm,v 1.1 2006/03/07 14:39:09 slash5234 Exp $
+# $Id: AccessControl.pm,v 1.2 2006/03/28 09:15:22 slash5234 Exp $
 
 package Affelio::App::Standalone::Admin::AccessControl;
 {
@@ -48,13 +48,14 @@
 
 	try{
 	    if($sub_mode eq "submit"){
-		debug_print("StandAlone::AccessControl::handler: before save...");
 		save_GroupAttribute_table($af, $cgi);
-		debug_print("StandAlone::AccessControl::handler: after save...");
+		$out_ref->{ret_msg} .= "<AF_M text='Your edit has been saved.'>";
 	    }
 	}catch Error with{
 	    my $e = shift;
-	    $out_ref->{err_msg} .= $e->stacktrace . '<BR>';
+	    $out_ref->{err_title} .= "<AF_M text='System error occured.'>";
+	    $out_ref->{err_msg} .= "Access to local DB failed.<BR>";
+	    $out_ref->{err_msg} .= "01-07-01: " . $e;
 	};
 
 	$out_ref->{tmpl_file} = "$af->{site__tmpl_dir}/owner_side/admin_accesscontrol.tmpl";
Index: affelio/lib/Affelio/App/Standalone/Admin/EditProfile.pm
diff -u affelio/lib/Affelio/App/Standalone/Admin/EditProfile.pm:1.1 affelio/lib/Affelio/App/Standalone/Admin/EditProfile.pm:1.2
--- affelio/lib/Affelio/App/Standalone/Admin/EditProfile.pm:1.1	Tue Mar  7 23:39:09 2006
+++ affelio/lib/Affelio/App/Standalone/Admin/EditProfile.pm	Tue Mar 28 18:15:22 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: EditProfile.pm,v 1.1 2006/03/07 14:39:09 slash5234 Exp $
+# $Id: EditProfile.pm,v 1.2 2006/03/28 09:15:22 slash5234 Exp $
 
 package Affelio::App::Standalone::Admin::EditProfile;
 {
@@ -52,6 +52,8 @@
 	try{
 	    if( $sub_mode eq "submit" ){
 		save_profile($af,$cgi);
+		$out_ref->{ret_msg} .= "<AF_M text='Your edit has been saved.'>";
+
 	    }elsif( $sub_mode eq "uploadimage" ){
 
 		my $uploaded_filename 
@@ -78,7 +80,9 @@
 
 	}catch Error with{
 	    my $e = shift;
-	    $out_ref->{err_msg} .= $e->stacktrace . '<BR>';
+	    $out_ref->{err_title} .= "<AF_M text='System error occured.'>";
+	    $out_ref->{err_msg} .= "Access to local DB failed.<BR>";
+	    $out_ref->{err_msg} .= "01-03-01: " . $e;
 	};
 	
 	show_profileeditor($af, $out_ref);
Index: affelio/lib/Affelio/App/Standalone/Admin/GroupMemberTable.pm
diff -u affelio/lib/Affelio/App/Standalone/Admin/GroupMemberTable.pm:1.1 affelio/lib/Affelio/App/Standalone/Admin/GroupMemberTable.pm:1.2
--- affelio/lib/Affelio/App/Standalone/Admin/GroupMemberTable.pm:1.1	Tue Mar  7 23:39:09 2006
+++ affelio/lib/Affelio/App/Standalone/Admin/GroupMemberTable.pm	Tue Mar 28 18:15:22 2006
@@ -13,7 +13,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: GroupMemberTable.pm,v 1.1 2006/03/07 14:39:09 slash5234 Exp $
+# $Id: GroupMemberTable.pm,v 1.2 2006/03/28 09:15:22 slash5234 Exp $
 
 package Affelio::App::Standalone::Admin::GroupMemberTable;
 {
@@ -46,10 +46,14 @@
 	try{
 	    if( $sub_mode eq "submit" ){
 		save_GroupMember_table($af, $cgi);
+		$out_ref->{ret_msg} .= "<AF_M text='Your edit has been saved.'>";
+
 	    }
 	}catch Error with{
 	    my $e = shift;
-	    $out_ref->{err_msg} .= $e->stacktrace . '<BR>';
+	    $out_ref->{err_title} .= "<AF_M text='System error occured.'>";
+	    $out_ref->{err_msg} .= "Access to local DB failed.<BR>";
+	    $out_ref->{err_msg} .= "01-05-01: " . $e;
 	};
 	
 	$out_ref->{tmpl_file}
Index: affelio/lib/Affelio/App/Standalone/Admin/MakeAffelioLink.pm
diff -u affelio/lib/Affelio/App/Standalone/Admin/MakeAffelioLink.pm:1.1 affelio/lib/Affelio/App/Standalone/Admin/MakeAffelioLink.pm:1.2
--- affelio/lib/Affelio/App/Standalone/Admin/MakeAffelioLink.pm:1.1	Tue Mar  7 23:39:09 2006
+++ affelio/lib/Affelio/App/Standalone/Admin/MakeAffelioLink.pm	Tue Mar 28 18:15:22 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: MakeAffelioLink.pm,v 1.1 2006/03/07 14:39:09 slash5234 Exp $
+# $Id: MakeAffelioLink.pm,v 1.2 2006/03/28 09:15:22 slash5234 Exp $
 
 package Affelio::App::Standalone::Admin::MakeAffelioLink;
 {
@@ -51,14 +51,9 @@
 	
 	my $sub_mode = $wi->PTN_mode($cgi->url_param("action"));
 	
-	try{
-	    if( $sub_mode eq "submit" ){
-		send_request($af, $cgi, $out_ref);
-	    }
-	}catch Error with{
-	    my $e = shift;
-	    $out_ref->{err_msg} .= $e->stacktrace . '<BR>';
-	};
+	if( $sub_mode eq "submit" ){
+	    send_request($af, $cgi, $out_ref);
+	}
 	
 	$out_ref->{tmpl_file}
 	= "$af->{site__tmpl_dir}/owner_side/admin_makefriend.tmpl";
@@ -78,6 +73,11 @@
 	debug_print("StandAlone::MakeAffelioLink::send: start.");
 
 	my $dest_uri = $wi->PTN_URL($cgi->param("dest_uri"));
+	if(!$dest_uri){
+	    $output_ref->{err_title} = "<AF_M text='Destination Affelio URL is not a valid URL.'>";
+	    $output_ref->{err_msg} = "01-01-01";
+	    return;
+	}
 	$dest_uri =~ s/\/$//;
 	my $my_mesg = $cgi->param("my_mesg");
 	my $cur_time = get_timestamp();
@@ -95,32 +95,46 @@
 				 my_AFID  =>  $af->{site__user_afid},
 				 mesg => $my_mesg,
 				 timestamp => $cur_time);
+	}catch Affelio::exception::InvalidInputException with{
+	    my $E = shift;
+	    $output_ref->{err_title} = "<AF_M text='URL value is not valid.'>";
+	    $output_ref->{err_msg} = "01-01-01 " . $E;
 	}catch Affelio::exception::NetworkException with{
 	    my $E = shift;
-	    throw Affelio::exception::CommunicationException($E);
+	    $output_ref->{err_title} = "<AF_M text='Network error occured. Could not communicate with peer Affelio.'>";
+	    $output_ref->{err_msg} = "01-01-02" . $E;
 	}catch Affelio::exception::Exception with{
 	    my $E = shift;
-	    throw Affelio::exception::CommunicationException($E);
+	    $output_ref->{err_title} = "<AF_M text='AFLink request did not accept by peer Affelio.'>";
+	    $output_ref->{err_msg} = "01-01-03 " . $E;
 	};
-	debug_print("StandAlone::MakeAffelioLink::send: send_HandShake returned success.");
+	if($output_ref->{err_title}){ return; }
 
+	debug_print("StandAlone::MakeAffelioLink::send: send_HandShake returned success.");
         ###########################################
         # Save peer's info into pending_DB
         ###########################################
 	my $tmpdb= new Affelio::SNS::Handshaker_tmpDB($af);
-	$tmpdb->add_sent_Handshake($cur_time,
-				   $dest_uri,
-				   "",
-				   $cur_time,
-				   $my_DH_pri_key_str);
-	debug_print("StandAlone::MakeAffelioLink::send: wroteDB $dest_uri=>[$cur_time]\n");
-
-	$output_ref->{ret_msg} = "Affelio Link Request has been sent to<BR><A HREF=\"$dest_uri\">$dest_uri</A>";
+	try{
+	    $tmpdb->add_sent_Handshake($cur_time,
+				       $dest_uri,
+				       "",
+				       $cur_time,
+				       $my_DH_pri_key_str);
+	}catch Error with{
+	    my $E = shift;
+	    $output_ref->{err_title} = "<AF_M text='Access to local DB failed. System error occured.'>";
+	    $output_ref->{err_msg} = "01-01-04: " . $E;
+	};
+	if($output_ref->{err_title}){ return; }
 
+	$output_ref->{ret_msg} = "<AF_M text='AffelioLink request has been sent to ' param='$dest_uri'>";
+	debug_print("StandAlone::MakeAffelioLink::send: wroteDB $dest_uri=>[$cur_time]\n");
 	debug_print("StandAlone::MakeAffelioLink::send: end.");
 	return;
     }
 
+
     #######################################################################
     #show
     #######################################################################    
Index: affelio/lib/Affelio/App/Standalone/Admin/ManageFriend.pm
diff -u affelio/lib/Affelio/App/Standalone/Admin/ManageFriend.pm:1.1 affelio/lib/Affelio/App/Standalone/Admin/ManageFriend.pm:1.2
--- affelio/lib/Affelio/App/Standalone/Admin/ManageFriend.pm:1.1	Tue Mar  7 23:39:09 2006
+++ affelio/lib/Affelio/App/Standalone/Admin/ManageFriend.pm	Tue Mar 28 18:15:22 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: ManageFriend.pm,v 1.1 2006/03/07 14:39:09 slash5234 Exp $
+# $Id: ManageFriend.pm,v 1.2 2006/03/28 09:15:22 slash5234 Exp $
 
 package Affelio::App::Standalone::Admin::ManageFriend;
 {
@@ -63,10 +63,14 @@
 
 	    }elsif($sub_mode eq "delete"){
 		remove_member($af, $cgi->url_param("uid"), $cgi);
+		$out_ref->{ret_msg} .= "<AF_M text='Affelio Link has been deleted.'>";
+
 	    }
 	}catch Error with{
 	    my $e = shift;
-	    $out_ref->{err_msg} .= $e->stacktrace . '<BR>';
+	    $out_ref->{err_title} .= "<AF_M text='System error occured.'>";
+	    $out_ref->{err_msg} .= "Access to local DB failed.<BR>";
+	    $out_ref->{err_msg} .= "01-04-01: " . $e;
 	};
 	
 
Index: affelio/lib/Affelio/App/Standalone/Admin/ManageGroup.pm
diff -u affelio/lib/Affelio/App/Standalone/Admin/ManageGroup.pm:1.1 affelio/lib/Affelio/App/Standalone/Admin/ManageGroup.pm:1.2
--- affelio/lib/Affelio/App/Standalone/Admin/ManageGroup.pm:1.1	Tue Mar  7 23:39:09 2006
+++ affelio/lib/Affelio/App/Standalone/Admin/ManageGroup.pm	Tue Mar 28 18:15:22 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: ManageGroup.pm,v 1.1 2006/03/07 14:39:09 slash5234 Exp $
+# $Id: ManageGroup.pm,v 1.2 2006/03/28 09:15:22 slash5234 Exp $
 
 package Affelio::App::Standalone::Admin::ManageGroup;
 {
@@ -48,14 +48,19 @@
 	    if($sub_mode eq "rename"){
 		rename_group($af, $cgi->url_param("gid"), 
 			     $cgi->param("new_name"));
+		$out_ref->{ret_msg} .= "<AF_M text='Group has been renamed.'>";
 	    }elsif($sub_mode eq "add_group"){
 		add_group($af, $cgi->param("new_group_name"));
+		$out_ref->{ret_msg} .= "<AF_M text='A new group has been created.'>";
 	    }elsif($sub_mode eq "remove_group"){
 		remove_group($af, $cgi->url_param("gid"), $cgi);
+		$out_ref->{ret_msg} .= "<AF_M text='Group has been deleted.'>";
 	    }
 	}catch Error with{
 	    my $e = shift;
-	    $out_ref->{err_msg} .= $e->stacktrace . '<BR>';
+	    $out_ref->{err_title} .= "<AF_M text='System error occured.'>";
+	    $out_ref->{err_msg} .= "Access to local DB failed.<BR>";
+	    $out_ref->{err_msg} .= "01-06-01: " . $e;
 	};
 
 	if($sub_mode eq "show_group"){
Index: affelio/lib/Affelio/App/Standalone/Admin/Messaging.pm
diff -u affelio/lib/Affelio/App/Standalone/Admin/Messaging.pm:1.4 affelio/lib/Affelio/App/Standalone/Admin/Messaging.pm:1.5
--- affelio/lib/Affelio/App/Standalone/Admin/Messaging.pm:1.4	Wed Mar 22 19:15:17 2006
+++ affelio/lib/Affelio/App/Standalone/Admin/Messaging.pm	Tue Mar 28 18:15:22 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: Messaging.pm,v 1.4 2006/03/22 10:15:17 slash5234 Exp $
+# $Id: Messaging.pm,v 1.5 2006/03/28 09:15:22 slash5234 Exp $
 
 package Affelio::App::Standalone::Admin::Messaging;
 {
@@ -34,7 +34,6 @@
     use Affelio::SNS::Handshaker_c;
     use Affelio::exception::CommunicationException;
     use Affelio::exception::DBException;
-    use Affelio::exception::SystemException;
 
     use Exporter;
     @Affelio::App::Standalone::Admin::Messaging::ISA = "Exporter";
@@ -49,53 +48,67 @@
 	my $out_ref = shift;
 	
 	my $wi = new Affelio::misc::WebInput();
-	
-	my $sub_mode = $wi->PTN_mode($cgi->url_param("action"));
+	my $action = $wi->PTN_mode($cgi->url_param("action"));
 
-	if( $sub_mode eq "send_message" ){
+	if( $action eq "send_message" ){
 
+	    ###############################################
 	    #send message
+	    if( $wi->PTN_through($cgi->param("submit_send")) ){
+		#Actually send it!
+		send_message($af, $cgi, "send", $out_ref);
+	    }else{
+		#Just save it!
+		send_message($af, $cgi, "justsave", $out_ref);
+	    }
+
 	    try{
-		if( $wi->PTN_through($cgi->param("submit_send")) ){
-		    send_message($af, $cgi, "send");
-		    $out_ref->{ret_msg}
-		    .= '<AF_M text="Your message has been sent successfuly.">';
-		}else{
-		    send_message($af, $cgi, "justsave");
-		    $out_ref->{ret_msg}
-		    .= '<AF_M text="Your message has been saved.">';
-		}
-	    }catch Affelio::exception::CommunicationException with{
-		my $e = shift;
-		$out_ref->{err_msg} 
-		.= '<AF_M text="Could not send message."><BR>' . $e;
+		show_message_list($af, "inbox", $out_ref);
+	    }catch Affelio::exception::Exception with{
+		my $E = shift;
+		$out_ref->{err_title} .= "<AF_M text='Access to local DB failed. System error occured.'>";
+		$out_ref->{err_msg} .= "01-01-04: " . $E;
 	    };
-
-	    show_message_list($af, "inbox", $out_ref);
 	    
-	}elsif( $sub_mode eq "operate" ){
-
+	}elsif( $action eq "operate" ){
+	    
+	    ###############################################
+	    #operate message
 	    if( $wi->PTN_through($cgi->param("operate_delete")) ){
+
 		try{
 		    delete_messages($af, $cgi);
 		    $out_ref->{ret_msg}
 		    .= '<AF_M text="Messages were deleted.">';
 		}catch Affelio::exception::DBException with{
-		    my $e = shift;
-		    $out_ref->{err_msg} 
-		    .= '<AF_M text="Error occured."><BR>' . $e;
+		    my $E = shift;
+		    $out_ref->{err_title} .= "<AF_M text='Access to local DB failed. System error occured.'>";
+		    $out_ref->{err_msg} .= "01-01-04: " . $E;
 		};
 
 		my $folder = $cgi->param("folder");
-		show_message_list($af, $folder, $out_ref);
+		try{
+		    show_message_list($af, $folder, $out_ref);
+		}catch Affelio::exception::Exception with{
+		    my $E = shift;
+		    $out_ref->{err_title} .= "<AF_M text='Access to local DB failed. System error occured.'>";
+		    $out_ref->{err_msg} .= "01-01-04: " . $E;
+		};
+
 	    }
-	}elsif( $sub_mode eq "compose" ){
-	    
+
+	}elsif( $action eq "compose" ){
+
+	    ###############################################
+	    #compose message	    
 	    $out_ref->{tmpl_file} 
 	    = "$af->{site__tmpl_dir}/owner_side/admin_composemessage.tmpl";
 	    compose($af, $cgi, $out_ref);
 
-	}elsif( $sub_mode eq "show" ){
+	}elsif( $action eq "show" ){
+
+	    ###############################################
+	    #show message
 	    my $folder = $cgi->url_param("folder");
 	    if(!$folder){ $folder = "inbox";}
 
@@ -110,16 +123,31 @@
 		= "$af->{site__tmpl_dir}/owner_side/admin_showmessage.tmpl";
 	    }
 
-	    mark_as_read($af, $cgi->url_param("mid"));
-	    show_message($af, $cgi->url_param("mid"), $out_ref);
+	    try{
+		mark_as_read($af, $cgi->url_param("mid"));
+		show_message($af, $cgi->url_param("mid"), $out_ref);
+	    }catch Affelio::exception::DBException with{
+		my $E = shift;
+		$out_ref->{err_title} .= "<AF_M text='Access to local DB failed. System error occured.'>";
+		$out_ref->{err_msg} .= "01-01-04: " . $E;
+	    };
 
 	}else{
+
+	    ###############################################
+	    #show message list
 	    my $folder = $cgi->url_param("folder");
 	    if(!$folder){ $folder = "inbox";}
-	    
-	    show_message_list($af, $folder, $out_ref);
-	}
 
+	    try{
+		show_message_list($af, $folder, $out_ref);
+	    }catch Affelio::exception::Exception with{
+		my $E = shift;
+		$out_ref->{err_title} .= "<AF_M text='Access to local DB failed. System error occured.'>";
+		$out_ref->{err_msg} .= "01-01-04: " . $E;
+	    };
+
+	}
     }
 
     #######################################################################
@@ -129,36 +157,45 @@
 	my $af = shift;
 	my $cgi = shift;
 	my $mode = shift;
+	my $out_ref = shift;
 
 	debug_print("StandAlone::Mesg::send: start.");
 
-	my $msg_to = $cgi->param("msg_to");
+    	my $wi = new Affelio::misc::WebInput;
+	my $msg_to = $wi->PTN_URL( $cgi->param("msg_to") );
 	my $msg_title = $cgi->param("msg_title");
 	my $msg_body = $cgi->param("msg_body");
-
 	debug_print("StandAlone::Mesg::send: $msg_to $msg_title $msg_body");
 
-	if($msg_to =~ /(.*)\/$/){
-	    $msg_to = $1;
-	}
-
 	###################################################################
 	#Save the message to draft folder
 	###################################################################
+	if($msg_to =~ /(.*)\/$/){
+	    $msg_to = $1;
+	}
 	my $msg_to_nickname ="";
 	my $msg_to_url = "";
+	my $mid ="";
 
-	if($msg_to){
-	    $msg_to_nickname = $af->getFM->get_attribute_by_afid($msg_to, "nickname");
-	    $msg_to_url = "<A HREF=\"$msg_to\">$msg_to_nickname</A>";
-	}
+	try{
+	    if($msg_to){
+		$msg_to_nickname = $af->getFM->get_attribute_by_afid($msg_to, "nickname");
+		$msg_to_url = "<A HREF=\"$msg_to\">$msg_to_nickname</A>";
+	    }
+	    $mid = $af->getMESGM->post_message(from => $msg_to_url,
+					       title => $msg_title,
+					       type => "UserToUser/OneToOne",
+					       body =>  $msg_body,
+					       folder => 'draft',
+					       readflag => 1);	
+	}catch Affelio::exception::Exception with{
+	    my $e = shift;
+	    $out_ref->{err_title} .= "<AF_M text='Access to local DB failed. System error occured.'>";
+	    $out_ref->{err_msg} .= "01-01-04: " . $e;
+	};
+	if ($out_ref->{err_title}){ return; }
 
-	my $mid = $af->getMESGM->post_message(from => $msg_to_url,
-					      title => $msg_title,
-					      type => "UserToUser/OneToOne",
-					      body =>  $msg_body,
-					      folder => 'draft',
-					      readflag => 1);	
+	$out_ref->{ret_msg} .= '<AF_M text="Your message has been saved in draft folder.">';
 	if($mode eq "justsave"){
 	    return();
 	}
@@ -170,14 +207,21 @@
 	try{
 	    $passAB = $af->getFM->get_attribute_by_afid($msg_to, "password");
 	}catch Affelio::exception::DBException with{
-	    my $E = shift;
-	    throw Affelio::exception::SystemException($E);
+	    my $e = shift;
+	    $out_ref->{err_title}.='<AF_M text="Could not send message.">';
+	    $out_ref->{err_title} .= "<AF_M text='Access to local DB failed. System error occured.'>";
+	    $out_ref->{err_msg} .= "01-01-04: " . $e;
 	};
+	if ($out_ref->{err_title}){ return; }
+
+	debug_print("StandAlone::Mesg::send: passAB=[$passAB]");
 	if(!defined($passAB) || $passAB eq ""){
-	    #Exception!
-	    exit(1);
+	    my $e = shift;
+	    $out_ref->{err_title} .= '<AF_M text="Could not send message.">';
+	    $out_ref->{err_title} .= '<AF_M text="Shared key not found in DB. System error occured.">';
+	    $out_ref->{err_msg} .= "01-02-01: Could not found shared key with peer Affelio.";
+	    return;
 	}
-	debug_print("StandAlone::Mesg::send: passAB=[$passAB]");
 
 	my $ret="";
 	try{
@@ -192,19 +236,36 @@
 				msg_body => $msg_body);
 
 	}catch Affelio::exception::NetworkException with{
-	    my $E = shift;
-	    throw Affelio::exception::CommunicationException($E);
-
+	    my $e = shift;
+	    $out_ref->{err_title} .= '<AF_M text="Could not send message.">';
+	    $out_ref->{err_title} .= '<AF_M text="Network error occured.">';
+	    $out_ref->{err_msg} .= "01-02-02: " . $e;
+	}catch Affelio::exception::CommunicationException with{
+	    my $e = shift;
+	    $out_ref->{err_title} .= '<AF_M text="Could not send message.">';
+	    $out_ref->{err_title} .= '<AF_M text="Communication error occured with peer Affelio">';
+	    $out_ref->{err_msg} .= "01-02-03: " . $e;
 	}catch Affelio::exception::InvalidInputException with{
-	    my $E = shift;
-	    error($cgi, "<PRE>Exception: " . $E .  "</PRE>");
+	    my $e = shift;
+	    $out_ref->{err_title} .= '<AF_M text="Could not send message.">';
+	    $out_ref->{err_title} .= '<AF_M text="Invalid Input after input check. System error occured.">';
+	    $out_ref->{err_msg} .= "01-02-04: " . $e;
 	};
+	if ($out_ref->{err_title}){ return; }
+
+	$out_ref->{ret_msg} = '<AF_M text="Your message has been sent successfuly.">';
 
 	###################################################################
 	#Move the message from "draft" to "sent"
 	###################################################################
-	$af->getMESGM->move_message(mid => $mid, 
-				    folder => "sent");
+	try{
+	    $af->getMESGM->move_message(mid => $mid, folder => "sent");
+	}catch Affelio::exception::DBException with{
+	    my $e = shift;
+	    $out_ref->{err_title} .= "<AF_M text='Access to local DB failed. System error occured.'>";
+	    $out_ref->{err_msg} .= "01-01-04: " . $e;
+	};
+	if ($out_ref->{err_title}){ return; }
 
     }
 
@@ -282,7 +343,6 @@
 	}
 	$output_ref->{"friends"} = \@friends_list;
 
-
 	############################
 	#Title:
 	############################
@@ -483,7 +543,8 @@
 	}
 	$output_ref->{tmpl_file}  = "$af->{site__tmpl_dir}/owner_side/admin_showmessage_list$folder_postfix.tmpl";
 
-	my $messages= $af->getMESGM->retrieve_all_messages(folder => $folder);
+	my $messages= "";
+	$messages = $af->getMESGM->retrieve_all_messages(folder => $folder);
 
 	my @message=();
 	while(@message = $messages->fetchrow_array) {
@@ -491,15 +552,12 @@
 		$msg_from, $msg_body, $msg_readflag) = @message;
 
 	    $msg_timestamp = timestamp2string($msg_timestamp);
+	    #debug_print("StandAlone::show_message_list: [$msg_title]");
+	    #debug_print("StandAlone::show_message_list: [$msg_from]");
+	    #debug_print("StandAlone::show_message_list: [$msg_body]");
+	    #debug_print("StandAlone::show_message_list: [$msg_timestamp]");
 
-	    debug_print("StandAlone::show_message_list: [$msg_title]");
-	    debug_print("StandAlone::show_message_list: [$msg_from]");
-	    debug_print("StandAlone::show_message_list: [$msg_body]");
-	    debug_print("StandAlone::show_message_list: [$msg_timestamp]");
-
-	    if($msg_title eq ""){
-		$msg_title = "No title";
-	    }
+	    if($msg_title eq ""){  $msg_title = "No title"; }
 
 	    ###############
 	    #UserToUser (inter-Affelio massaging
@@ -514,7 +572,7 @@
 		debug_print("StandAlone::show_message_list: \t[$1]");
 		debug_print("StandAlone::show_message_list: \t[$2]");
 
-		$msg_from = '<A HREF="' . $af->{site__user_afid} . '/outgoing.cgi?dest_url=' . $1 . '" target="_blank">' . $2 . '</A>';
+		$msg_from = '<A HREF="' . $af->{site__user_afid} . '/outgoing.cgi?dest_url=' . $1 . '" target="_blank" title="<AF_M text=\'Click here to go to Affelio page\'>">' . $2 . '</A>';
 	    }
 	    ###########
 


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