Tadashi Okoshi
slash****@users*****
2006年 3月 7日 (火) 23:39:11 JST
Index: affelio/lib/Affelio/SNS/AuthManager.pm
diff -u affelio/lib/Affelio/SNS/AuthManager.pm:1.1 affelio/lib/Affelio/SNS/AuthManager.pm:1.2
--- affelio/lib/Affelio/SNS/AuthManager.pm:1.1 Wed Nov 23 13:00:20 2005
+++ affelio/lib/Affelio/SNS/AuthManager.pm Tue Mar 7 23:39:11 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: AuthManager.pm,v 1.1 2005/11/23 04:00:20 slash5234 Exp $
+# $Id: AuthManager.pm,v 1.2 2006/03/07 14:39:11 slash5234 Exp $
package Affelio::SNS::AuthManager;
{
Index: affelio/lib/Affelio/SNS/FriendManager.pm
diff -u affelio/lib/Affelio/SNS/FriendManager.pm:1.19 affelio/lib/Affelio/SNS/FriendManager.pm:1.20
--- affelio/lib/Affelio/SNS/FriendManager.pm:1.19 Thu Feb 23 21:41:38 2006
+++ affelio/lib/Affelio/SNS/FriendManager.pm Tue Mar 7 23:39:11 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: FriendManager.pm,v 1.19 2006/02/23 12:41:38 slash5234 Exp $
+# $Id: FriendManager.pm,v 1.20 2006/03/07 14:39:11 slash5234 Exp $
package Affelio::SNS::FriendManager;
{
Index: affelio/lib/Affelio/SNS/Handshaker_c.pm
diff -u affelio/lib/Affelio/SNS/Handshaker_c.pm:1.17 affelio/lib/Affelio/SNS/Handshaker_c.pm:1.18
--- affelio/lib/Affelio/SNS/Handshaker_c.pm:1.17 Thu Jan 19 18:26:57 2006
+++ affelio/lib/Affelio/SNS/Handshaker_c.pm Tue Mar 7 23:39:11 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: Handshaker_c.pm,v 1.17 2006/01/19 09:26:57 slash5234 Exp $
+# $Id: Handshaker_c.pm,v 1.18 2006/03/07 14:39:11 slash5234 Exp $
package Affelio::SNS::Handshaker_c;
{
@@ -103,7 +103,7 @@
throw Affelio::exception::NetworkException($@);
}
if($res->{flerror} ne "0"){
- throw Affelio::exception::NetworkException($res->{message});
+ throw Affelio::exception::NetworkException("Flerror > 0: $res->{message}");
}
debug_print("send_HandShake: OK:[$res->{flerror}] [$res->{message}]");
Index: affelio/lib/Affelio/SNS/Handshaker_s.pm
diff -u affelio/lib/Affelio/SNS/Handshaker_s.pm:1.41 affelio/lib/Affelio/SNS/Handshaker_s.pm:1.42
--- affelio/lib/Affelio/SNS/Handshaker_s.pm:1.41 Thu Feb 23 21:41:38 2006
+++ affelio/lib/Affelio/SNS/Handshaker_s.pm Tue Mar 7 23:39:11 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: Handshaker_s.pm,v 1.41 2006/02/23 12:41:38 slash5234 Exp $
+# $Id: Handshaker_s.pm,v 1.42 2006/03/07 14:39:11 slash5234 Exp $
########################################################################
#package Affelio::SNS::Handshaker_s::Util;
@@ -26,10 +26,12 @@
use lib("../../");
use Affelio;
use Affelio::misc::Debug;
+
+ use vars qw($AF_DIR);
}
sub af_new {
- my $cfg_dir = $Affelio::SNS::Handshaker_s::AF_DIR . "config/";
+ my $cfg_dir = $AF_DIR . "config/";
debug_print("Starting AF($cfg_dir)...");
my $af = Affelio->new( ConfigDir => $cfg_dir )
or die "Cannot start Affelio";
@@ -57,7 +59,7 @@
use Affelio::SNS::FriendManager;
use Affelio::SNS::Handshaker_tmpDB;
use Affelio::SNS::Handshaker_c qw(get_F2List);
- use Affelio::App::Admin::MakeAffelioLink;
+ use Affelio::App::Standalone::Admin::MakeAffelioLink;
use Affelio::Managing::MessageManager;
use Affelio::misc::CGIError;
use Affelio::misc::Debug;
@@ -69,7 +71,7 @@
use Exporter;
@Affelio::SNS::Handshaker_s::ISA = "Exporter";
@Affelio::SNS::Handshaker_s::EXPORT = qw (HandShake HandShakeReply F2List post_Message get_services get_news op_request_AFlink);
- use vars qw( $AF_DIR);
+
}
##################################################################
@@ -101,6 +103,11 @@
};
}
+ ##################################################
+ #Decode MIME
+ ##################################################
+ my $mesg = MIME::Base64::decode_base64($MIMed_mesg);
+
###########################################
# Instantiate Affelio
###########################################
@@ -112,17 +119,21 @@
my $click_url = "$af->{site__user_afid}/bin/recv_mail_ack.cgi?id=$sessionid";
my $mesg1 = "";
$mesg1 .= "<AF_M text='_HANDSHAKE_REQUEST_MAIL_MESG1' param='$peer_nickname'>";
- $mesg1 .= "<AF_M text='_HANDSHAKE_REQUEST_MAIL_MESG2' param='$peer_nickname'>";
- $mesg1 .= "<AF_M text='_HANDSHAKE_REQUEST_MAIL_MESG3' param='$peer_af_id'>";
- $mesg1 .= "<AF_M text='_HANDSHAKE_REQUEST_MAIL_MESG4' param='$click_url'>";
-
+ $mesg1 .= "<AF_M text='_HANDSHAKE_REQUEST_MAIL_MESG2'>";
+ $mesg1 .= "<AF_M text='_HANDSHAKE_REQUEST_MAIL_MESG3' param='$peer_nickname'>";
+ $mesg1 .= "<AF_M text='_HANDSHAKE_REQUEST_MAIL_MESG4' param='$peer_af_id'>";
+ $mesg1 .= "<AF_M text='_HANDSHAKE_REQUEST_MAIL_MESG5' param='$mesg'>";
+ $mesg1 .= "<AF_M text='_HANDSHAKE_REQUEST_MAIL_MESG6' param='$click_url'>";
my $translated = $af->translate_templateL10N($mesg1);
+ $translated =~ s|\r\n|\n|g;
+ $translated =~ s|\r|\n|g;
+ $translated =~ s|\n|\<BR\>|g;
+
my $message_body
= MIME::Base64::encode_base64($translated);
-
$af->getMESGM->post_message("Your Affelio",
"Link Request from $peer_nickname",
- "SystemToUser/LinkRequest/Encode-Base64",
+ "SystemToUser/LinkRequest/Encode-Base64/HTML",
$message_body);
###########################################
@@ -278,7 +289,7 @@
$ret="OK";
debug_print("S::op_request_AFlink: send_request...");
- Affelio::App::Admin::MakeAffelioLink::_send_request($af,
+ Affelio::App::Standalone::Admin::MakeAffelioLink::_send_request($af,
$to_uri);
debug_print("S::op_request_AFlink: send_request...done.");
Index: affelio/lib/Affelio/SNS/Handshaker_tmpDB.pm
diff -u affelio/lib/Affelio/SNS/Handshaker_tmpDB.pm:1.5 affelio/lib/Affelio/SNS/Handshaker_tmpDB.pm:1.6
--- affelio/lib/Affelio/SNS/Handshaker_tmpDB.pm:1.5 Thu Feb 23 21:41:38 2006
+++ affelio/lib/Affelio/SNS/Handshaker_tmpDB.pm Tue Mar 7 23:39:11 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: Handshaker_tmpDB.pm,v 1.5 2006/02/23 12:41:38 slash5234 Exp $
+# $Id: Handshaker_tmpDB.pm,v 1.6 2006/03/07 14:39:11 slash5234 Exp $
use strict;
use lib("../../../extlib/");