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

Back to archive index

Tadashi Okoshi slash****@users*****
2005年 12月 19日 (月) 10:59:02 JST


Index: affelio/lib/Affelio/App/Admin/Messaging.pm
diff -u affelio/lib/Affelio/App/Admin/Messaging.pm:1.18 affelio/lib/Affelio/App/Admin/Messaging.pm:1.19
--- affelio/lib/Affelio/App/Admin/Messaging.pm:1.18	Wed Nov 23 13:00:19 2005
+++ affelio/lib/Affelio/App/Admin/Messaging.pm	Mon Dec 19 10:59:02 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: Messaging.pm,v 1.18 2005/11/23 04:00:19 slash5234 Exp $
+# $Id: Messaging.pm,v 1.19 2005/12/19 01:59:02 slash5234 Exp $
 
 package Affelio::App::Admin::Messaging;
 {
@@ -30,6 +30,7 @@
     use Affelio::misc::Encoding qw(db_encode db_decode);
     use Affelio::misc::Time qw(timestamp2string get_timestamp);
     use Affelio::misc::WebInput;
+    use Affelio::misc::MyCrypt;
     use Affelio::SNS::Handshaker_c;
     use Affelio::exception::CommunicationException;
 
@@ -149,11 +150,14 @@
 	my $mode="";
 
 	my $to_url;
+	my $title;
 	my $reply_to;
 	my $reply_title;
 	my $reply_body;
 
 	$to_url = $cgi->url_param("to_url");
+	$title = url_decode($cgi->url_param("title"));
+
 	$reply_to = $cgi->param("reply_to");
 	$reply_title = $cgi->param("reply_title");
 	$reply_body = $cgi->param("reply_body");
@@ -182,10 +186,20 @@
 
 	while( my @row = $result->fetchrow_array ){
 
+	    if($row[1] !~ /\/$/){
+		$row[1] .= "/";
+	    }
+	    if($reply_to !~ /\/$/){
+		$reply_to .= "/";
+	    }
+	    if($to_url !~ /\/$/){
+		$to_url .= "/";
+	    }
+
 	    my $selected = "";
 	    if(($mode eq "POST__reply") && ($row[1] eq $reply_to)){
 		$selected ="selected";
-	    }elsif(($mode eq "GET__specified_dest_url") && ($row[1] =~ /$to_url/)){
+	    }elsif(($mode eq "GET__specified_dest_url") && ($row[1] eq $to_url)){
 		$selected ="selected";
 	    } 
 	    my $t= sprintf("%-20s %s",$row[2],$row[1]);
@@ -201,7 +215,11 @@
 	############################
 	#Title:
 	############################
-	$output_ref->{"msg_title"} = $reply_title;
+	if($reply_title ne ""){
+	    $output_ref->{"msg_title"} = $reply_title;
+	}else{
+	    $output_ref->{"msg_title"} = $title;
+	}
 
 	############################
 	#Body:


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