Tadashi Okoshi
slash****@users*****
2006年 6月 29日 (木) 03:12:49 JST
Index: affelio/lib/Affelio/SNS/FriendManager.pm
diff -u affelio/lib/Affelio/SNS/FriendManager.pm:1.27 affelio/lib/Affelio/SNS/FriendManager.pm:1.28
--- affelio/lib/Affelio/SNS/FriendManager.pm:1.27 Tue Jun 13 17:04:36 2006
+++ affelio/lib/Affelio/SNS/FriendManager.pm Thu Jun 29 03:12:49 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.27 2006/06/13 08:04:36 slash5234 Exp $
+# $Id: FriendManager.pm,v 1.28 2006/06/28 18:12:49 slash5234 Exp $
package Affelio::SNS::FriendManager;
{
@@ -605,7 +605,9 @@
my $where_block ="";
if($where ne ""){ $where_block = "WHERE $where";}
my $type = $param{type};
- if($type ne ""){
+ if($type eq "ANY"){
+ #Do nothing
+ }elsif($type ne ""){
if($where_block ne ""){
$where_block = "$where_block or af_type = '$type' ";
}else{
Index: affelio/lib/Affelio/SNS/Handshaker_s.pm
diff -u affelio/lib/Affelio/SNS/Handshaker_s.pm:1.51 affelio/lib/Affelio/SNS/Handshaker_s.pm:1.52
--- affelio/lib/Affelio/SNS/Handshaker_s.pm:1.51 Tue Jun 27 04:41:55 2006
+++ affelio/lib/Affelio/SNS/Handshaker_s.pm Thu Jun 29 03:12:49 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.51 2006/06/26 19:41:55 slash5234 Exp $
+# $Id: Handshaker_s.pm,v 1.52 2006/06/28 18:12:49 slash5234 Exp $
########################################################################
#package Affelio::SNS::Handshaker_s::Util;
@@ -375,24 +375,10 @@
#delete AFLink
#################################
my $ret="";
- my $uid = $af->getFM()->get_attribute_by_afid($visitor_afid,
- "uid");
+ my $uid = $af->getFM()->get_attribute_by_afid($visitor_afid, "uid");
debug_print("S::delete_AFLink got uid [$uid]");
-
- #XXX
- # Must be consistent with logic in App/ManageFriends.pm
- #
- #1.Remove entry(uid) from AFuser_CORE_friends
- $af->getFM->remove_friend($uid);
- #XXX
- #2.Remove uid from friends of others in AFuser_CORE_friends
- #XXX
- #3.Remove uid from friends of others in AFuser_CORE_friendsfriends
- debug_print("S::delete_AFLink removed [$uid] from friends table.");
- #4.Remove uid from groups
- $af->getGM->remove_person_from_all($uid);
- debug_print("S::delete_AFLink removed [$uid] all groups.");
- #5.add uid to erasedfriends
+ $af->getRM->remove_relation(uid => $uid,
+ flag => "no_XMLRPC");
#################################
#send back return message