Stop Share Notification Dispatcher if noone is listening

pydio · Mar 9, 2016 · 8074611 · 8074611
1 parent 921a96f
commit 8074611
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 616 deletions.
diff --git a/core/src/plugins/access.inbox/class.inboxAccessDriver.php b/core/src/plugins/access.inbox/class.inboxAccessDriver.php
@@ -66,7 +66,11 @@ public function switchAction($action, $httpVars, $fileVars) {
                     $repositoryId = $n->getRepositoryId();
                     $n->getRepository()->driverInstance = null;
 
-                    ConfService::loadDriverForRepository($n->getRepository());
+                    try {
+                        ConfService::loadDriverForRepository($n->getRepository());
+                    } catch (\Exception $e) {
+                        continue;
+                    }
 
                     $repository = $n->getRepository();
 
@@ -210,7 +214,10 @@ public static function getNodes(){
             if ($repo->hasContentFilter()) {
                 $cFilter = $repo->getContentFilter();
                 $filter = ($cFilter instanceof ContentFilter) ? array_keys($cFilter->filters)[0] : $cFilter;
-                $label = basename($filter);
+
+                if (!is_array($filter)) {
+                    $label = basename($filter);
+                }
             }
 
             if (empty($label)) {

diff --git a/core/src/plugins/access.inbox/res/build/ShareNotificationUI.js b/core/src/plugins/access.inbox/res/build/ShareNotificationUI.js
diff --git a/core/src/plugins/access.inbox/res/build/dispatcher/ShareNotificationDispatcher.js b/core/src/plugins/access.inbox/res/build/dispatcher/ShareNotificationDispatcher.js