Filter out inactive applications when polling for ActiveSync.

horde · Feb 17, 2016 · e06cbfb · e06cbfb
1 parent a03bfff
commit e06cbfb
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/framework/Core/lib/Horde/Core/ActiveSync/Connector.php b/framework/Core/lib/Horde/Core/ActiveSync/Connector.php
@@ -741,18 +741,24 @@ public function notes_getActionTimestamp($uid, $action, $notepad = null)
      */
     public function horde_listApis()
     {
-        $apps = $this->_registry->horde->listAPIs();
+        $apis = $this->_registry->horde->listAPIs();
 
         // Note support not added until 5.1. Need to check the feature.
         // @TODO: H6, add this check to all apps. BC break to check it now,
         // since we didn't have this feature earlier.
-        if ($key = array_search('notes', $apps)) {
+        if ($key = array_search('notes', $apis)) {
             if (!$this->hasFeature('activesync', 'notes')) {
-                unset($apps[$key]);
+                unset($apis[$key]);
             }
         }
-
-        return $apps;
+        $inactive = $this->_registry->listApps(array('inactive'));
+        $active_apis = array();
+        foreach ($apis as $api) {
+            if (!$this->_registry->isInactive($this->_registry->hasInterface($api))) {
+                $active_apis[] = $api;
+            }
+        }
+        return $active_apis;
     }
 
     /**