Fix some notifications issues with shared users.

Author: cdujeu

core/src/plugins/action.share/class.ShareCenter.php

@@ -1996,16 +1996,16 @@ public function createSharedRepository($httpVars, $repository, $accessDriver, $u
             $userObject->save("superuser");
             if ($this->watcher !== false) {
                 // Register a watch on the current folder for shared user
-                if ($uWatches[$userName] == "true") {
+                if ($uWatches[$userName]) {
                     $this->watcher->setWatchOnFolder(
-                        new AJXP_Node($this->urlBase.$file),
+                        new AJXP_Node("pydio://".$newRepoUniqueId."/"),
                         $userName,
                         MetaWatchRegister::$META_WATCH_USERS_CHANGE,
                         array(AuthService::getLoggedUser()->getId())
                     );
                 } else {
                     $this->watcher->removeWatchFromFolder(
-                        new AJXP_Node($this->urlBase.$file),
+                        new AJXP_Node("pydio://".$newRepoUniqueId."/"),
                         $userName,
                         true
                     );

core/src/plugins/core.mailer/class.AjxpMailer.php

@@ -74,6 +74,7 @@ public function sendMail($recipients, $subject, $body, $from = null, $imageLink
             $coreFromName = ConfService::getCoreConf("FROM_NAME", "mailer");
             $from = array("adress" => $coreFrom, "name" => $coreFromName);
         }
+        $rowBody = $body;
         $images = array();
         if(!empty($prepend)) $subject = $prepend ." ". $subject;
         if(!empty($append)) $subject .= " ".$append;
@@ -99,7 +100,7 @@ public function sendMail($recipients, $subject, $body, $from = null, $imageLink
         $this->sendMailImpl($recipients, $subject, $body, $from, $images);
         if (AJXP_SERVER_DEBUG) {
             $line = "------------------------------------------------------------------------\n";
-            file_put_contents($this->mailCache, "Sending mail from ".print_r($from, true)." to ".print_r($recipients, true)."\n\n$subject\n\n$body\n".$line, FILE_APPEND);
+            file_put_contents($this->mailCache, $line."Sending mail from ".print_r($from, true)." to ".print_r($recipients, true)."\nSubject: $subject\nBody:\n$rowBody\n", FILE_APPEND);
         }
     }
 

core/src/plugins/meta.watch/class.MetaWatchRegister.php

@@ -241,7 +241,10 @@ public function collectWatches($node, $watchType)
             $usersMeta = isSet($nodeMeta[self::$META_WATCH_USERS_NAMESPACE]) ? $nodeMeta[self::$META_WATCH_USERS_NAMESPACE] : false;
             $ids = $this->loadWatchesFromMeta($watchType, $currentUserId, $source, $watchMeta, $usersMeta);
             foreach($ids as $id){
-                $result["ancestors"][] = array("node" => $source, "id" => $id);
+                // Do not send notification to myself!
+                if($id !== $currentUserId){
+                    $result["ancestors"][] = array("node" => $source, "id" => $id);
+                }
             }
         }