webroot/sql/update-usernotes.sql

- Forgot to drop old primary key when addding unique key

webroot/profile.php
- Avatar and target UUID's were in wrong order when getting notes
- Return real success/failure status when updating notes

OpenSimProfile/Modules/ProfileModule/OpenProfile.cs
- Return with target UUID in data block and not ones own UUID


git-svn-id: http://forge.opensimulator.org/svn/osprofile/trunk@78 19860011-0018-435d-96ae-4a7b0aaa3128

OpenSimProfile/Modules/ProfileModule/OpenProfile.cs

@@ -227,8 +227,7 @@ namespace OpenSimProfile.Modules.OpenProfile
                 classifieds[new UUID(d["classifiedid"].ToString())] = d["name"].ToString();
             }
 
-            remoteClient.SendAvatarClassifiedReply(remoteClient.AgentId,
-                        classifieds);
+            remoteClient.SendAvatarClassifiedReply(new UUID(args[0]), classifieds);
         }
 
         // Classifieds Update
@@ -331,8 +330,7 @@ namespace OpenSimProfile.Modules.OpenProfile
                 }
             }
 
-            remoteClient.SendAvatarPicksReply(remoteClient.AgentId,
-                        picks);
+            remoteClient.SendAvatarPicksReply(new UUID(args[0]), picks);
         }
 
         // Picks Request
@@ -486,9 +484,7 @@ namespace OpenSimProfile.Modules.OpenProfile
                     notes = d["notes"].ToString();
             }
 
-            remoteClient.SendAvatarNotesReply(
-                            new UUID(ReqHash["uuid"].ToString()),
-                            notes);
+            remoteClient.SendAvatarNotesReply(new UUID(args[0]), notes);
         }
 
         // Notes Update

webroot/profile.php

@@ -377,8 +377,8 @@ function avatarnotesrequest($method_name, $params, $app_data)
 {
     $req            = $params[0];
 
-    $uuid           = $req['uuid'];
-    $targetuuid     = $req['avatar_id'];
+    $uuid           = $req['avatar_id'];
+    $targetuuid     = $req['uuid'];
 
     $result = mysql_query("SELECT notes FROM usernotes WHERE ".
             "useruuid = '". mysql_escape_string($uuid) ."' AND ".
@@ -448,7 +448,8 @@ function avatar_notes_update($method_name, $params, $app_data)
     }
 
     $response_xml = xmlrpc_encode(array(
-        'success' => True
+        'success' => $result,
+        'errorMessage' => mysql_error()
     ));
 
     print $response_xml;

webroot/sql/update-usernotes.sql

@@ -1,2 +1,3 @@
+ALTER TABLE `usernotes` DROP PRIMARY KEY ;
 ALTER TABLE `usernotes` ADD UNIQUE ( `useruuid` , `targetuuid` );