Fix event on change error when cross-repository copy.

Author: cdujeu

core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php

@@ -95,26 +95,36 @@ public function persistChangeHookToFeed(AJXP_Node $oldNode = null, AJXP_Node $ne
     {
         if(!$this->eventStore) return;
 
-        $n = ($oldNode == null ? $newNode : $oldNode);
-        $repoId = $n->getRepositoryId();
-        if($n->getUser()){
-            $userId = $n->getUser();
-            $obj = ConfService::getConfStorageImpl()->createUserObject($userId);
-            if($obj) $userGroup = $obj->getGroupPath();
+        $nodes = [];
+        if($oldNode !== null && $newNode !== null && $oldNode->getRepositoryId() !== $newNode->getRepositoryId()){
+            $nodes[] = $oldNode;
+            $nodes[] = $newNode;
         }else{
-            $userId = AuthService::getLoggedUser()->getId();
-            $userGroup = AuthService::getLoggedUser()->getGroupPath();
+            $nodes[] = ($oldNode === null ? $newNode : $oldNode);
+        }
+
+        foreach($nodes as $n){
+            $repoId = $n->getRepositoryId();
+            $userGroup = null;
+            if($n->getUser()){
+                $userId = $n->getUser();
+                $obj = ConfService::getConfStorageImpl()->createUserObject($userId);
+                if($obj) $userGroup = $obj->getGroupPath();
+            }else{
+                $userId = AuthService::getLoggedUser()->getId();
+                $userGroup = AuthService::getLoggedUser()->getGroupPath();
+            }
+            $repository = ConfService::getRepositoryById($repoId);
+            $repositoryScope = $repository->securityScope();
+            $repositoryScope = ($repositoryScope !== false ? $repositoryScope : "ALL");
+            $repositoryOwner = $repository->hasOwner() ? $repository->getOwner() : null;
+            AJXP_Controller::applyHook("msg.instant",array(
+                "<reload_user_feed/>",
+                $repoId,
+                $userId
+            ));
+            $this->eventStore->persistEvent("node.change", func_get_args(), $repoId, $repositoryScope, $repositoryOwner, $userId, $userGroup);
         }
-        $repository = ConfService::getRepositoryById($repoId);
-        $repositoryScope = $repository->securityScope();
-        $repositoryScope = ($repositoryScope !== false ? $repositoryScope : "ALL");
-        $repositoryOwner = $repository->hasOwner() ? $repository->getOwner() : null;
-        AJXP_Controller::applyHook("msg.instant",array(
-            "<reload_user_feed/>",
-            $repoId,
-            $userId
-        ));
-        $this->eventStore->persistEvent("node.change", func_get_args(), $repoId, $repositoryScope, $repositoryOwner, $userId, $userGroup);
 
     }
 

core/src/plugins/feed.sql/class.AJXP_SqlFeedStore.php

@@ -64,8 +64,11 @@ public function persistEvent($hookName, $data, $repositoryId, $repositoryScope,
         }
         try {
             $node = null;
-            if(is_object($data[1]) && is_a($data[1], "AJXP_Node")) $node = $data[1];
-            else if(is_object($data[0]) && is_a($data[0], "AJXP_Node")) $node = $data[0];
+            if(is_object($data[1]) && $data[1] instanceof AJXP_Node && $data[1]->getRepositoryId() === $repositoryId) {
+                $node = $data[1];
+            } else if(is_object($data[0]) && $data[0] instanceof AJXP_Node && $data[0]->getRepositoryId() === $repositoryId) {
+                $node = $data[0];
+            }
             dibi::query("INSERT INTO [ajxp_feed] ([edate],[etype],[htype],[user_id],[repository_id],[repository_owner],[user_group],[repository_scope],[content],[index_path]) VALUES (%i,%s,%s,%s,%s,%s,%s,%s,%bin,%s)",
                 time(),
                 "event",