Making sure node metadata for file info is valid for a deleted file #1127

Author: ghecquet

core/src/plugins/access.fs/class.fsAccessDriver.php

@@ -1822,17 +1822,23 @@ public function delete($selectedFiles, &$logMessages)
                 return $mess[120];
             }
             $fileToDelete=$this->urlBase.$selectedFile;
+
             if (!file_exists($fileToDelete)) {
                 $logMessages[]=$mess[100]." ".SystemTextEncoding::toUTF8($selectedFile);
                 continue;
             }
+
+            $node = new AJXP_Node($fileToDelete);
+            $node->setLeaf(!is_dir($fileToDelete));
+
             $this->deldir($fileToDelete, $repoData);
-            if (is_dir($fileToDelete)) {
+
+            if ($node->isLeaf()) {
                 $logMessages[]="$mess[38] ".SystemTextEncoding::toUTF8($selectedFile)." $mess[44].";
             } else {
                 $logMessages[]="$mess[34] ".SystemTextEncoding::toUTF8($selectedFile)." $mess[44].";
             }
-            AJXP_Controller::applyHook("node.change", array(new AJXP_Node($fileToDelete)));
+            AJXP_Controller::applyHook("node.change", [$node]);
         }
         return null;
     }

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

@@ -76,9 +76,13 @@ public function mailConsumeQueue ($action, $httpVars, $fileVars) {
                     $ajxpAction = $ajxpNotification->getAction();
                     $ajxpAuthor = $ajxpNotification->getAuthor();
                     $ajxpNode = new AJXP_Node($value['url']);
+
                     try{
                         @$ajxpNode->loadNodeInfo();
-                    }catch(Exception $e){}
+                    } catch(Exception $e) {
+                        // do nothing
+                    }
+
                     if ($ajxpNode->isLeaf() && !$ajxpNode->isRoot()) {
                         $ajxpContent = $ajxpNode->getParent()->getPath();
                     } else {
@@ -87,20 +91,24 @@ public function mailConsumeQueue ($action, $httpVars, $fileVars) {
                             $ajxpContent = '/';
                         }
                     }
-                    if($ajxpNode->getRepository() != null){
+                    if($ajxpNode->getRepository() != null) {
                         $ajxpNodeWorkspace = $ajxpNode->getRepository()->getDisplay();
-                    }else{
+                    } else {
                         $ajxpNodeWorkspace = "Deleted Workspace";
                     }
+
                     $recipientFormats[$value['recipient']] = ($value["html"] == 1);
                     $ajxpKey = $ajxpAction."|".$ajxpAuthor."|".$ajxpContent;
                     $arrayResultsSQL[$value['recipient']][$ajxpNodeWorkspace][$ajxpKey][] = $ajxpNotification;
                 }
                 //this $body must be here because we need this css
                 $digestTitle = ConfService::getMessages()["core.mailer.9"];
+
                 foreach ($arrayResultsSQL as $recipient => $arrayWorkspace) {
+
                     $useHtml = $recipientFormats[$recipient];
                     $body = $useHtml ? "<div id='digest'>" : "";
+
                     foreach ($arrayWorkspace as $workspace => $arrayAjxpKey) {
                         $key = key($arrayAjxpKey);
                         $body = $body . '<h1>' . $arrayAjxpKey[$key][0]->getDescriptionLocation() . ', </h1><ul>';
@@ -120,6 +128,7 @@ public function mailConsumeQueue ($action, $httpVars, $fileVars) {
                         }
                         $body = $body . '</ul>';
                     }
+
                     $body .= $useHtml ? "</div>" : "";
                     try {
                         $mailer->sendMail(array($recipient),
@@ -134,6 +143,7 @@ public function mailConsumeQueue ($action, $httpVars, $fileVars) {
                         $output["error"][] = "Sending email to ".$recipient.": ".$e->getMessage();
                     }
                 }
+
                 try {
                     dibi::query('DELETE FROM [ajxp_mail_queue] WHERE [date_event] <= %s', $time);
                 } catch (DibiException $e) {

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

@@ -201,7 +201,6 @@ public function getDescriptionLong($skipLink = false)
             $tpl .= "</ul>";
 
         } else {
-
             $tpl .= $this->replaceVars($mess["notification.tpl.long.".($this->getNode()->isLeaf()?"file":"folder").".".$this->action], $mess);
 
         }