Fix fatal errors if activesync configuration is incorrect

horde · Jul 17, 2014 · d481ffc · d481ffc
1 parent f8d1ef3
commit d481ffc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/horde/admin/activesync.php b/horde/admin/activesync.php
@@ -18,10 +18,12 @@
     'permission' => array('horde:administration:activesync')
 ));
 
-if (empty($conf['activesync']['enabled'])) {
+try {
+    $state = $injector->getInstance('Horde_ActiveSyncState');
+} catch (Horde_Exception $e) {
     throw new Horde_Exception_PermissionDenied(_("ActiveSync not activated."));
 }
-$state = $injector->getInstance('Horde_ActiveSyncState');
+
 $state->setLogger($injector->getInstance('Horde_Log_Logger'));
 
 /** Check for any actions **/

diff --git a/horde/lib/Prefs/Special/Activesync.php b/horde/lib/Prefs/Special/Activesync.php
@@ -24,12 +24,14 @@ public function init(Horde_Core_Prefs_Ui $ui)
      */
     public function display(Horde_Core_Prefs_Ui $ui)
     {
-        global $conf, $injector, $page_output, $prefs, $registry;
+        global $injector, $page_output, $prefs, $registry;
 
-        if (empty($conf['activesync']['enabled'])) {
+        try {
+            $state = $injector->getInstance('Horde_ActiveSyncState');
+        } catch (Horde_Exception $e) {
             return _("ActiveSync not activated.");
         }
-        $state = $injector->getInstance('Horde_ActiveSyncState');
+
         $devices = $state->listDevices($registry->getAuth());
 
         $view = new Horde_View(array(