Merge branch 'hotfix/1.4.8'

felixrupp · Nov 9, 2017 · 0f586dd · 0f586dd
2 parents 103b0fc + 4f4e84f
commit 0f586dd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/appinfo/app.php b/appinfo/app.php
@@ -28,7 +28,14 @@
 $app = new \OCA\UserCAS\AppInfo\Application();
 $c = $app->getContainer();
 
-if (\OCP\App::isEnabled($c->getAppName())) {
+$enable = TRUE;
+
+$script = $_SERVER['SCRIPT_FILENAME'];
+if (in_array(basename($script), array('console.php', 'cron.php', 'public.php', 'remote.php', 'status.php', 'version.php')) || strpos($script, "/ocs")) {
+    $enable = FALSE;
+}
+
+if (\OCP\App::isEnabled($c->getAppName()) && !\OC::$CLI && $enable) {
 
     $appService = $c->query('AppService');
     $userService = $c->query('UserService');

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -6,7 +6,7 @@
     <licence>AGPL</licence>
     <author>Felix Rupp, Leonis Holding, Sixto Martin</author>
     <namespace>UserCAS</namespace>
-    <version>1.4.7</version>
+    <version>1.4.8</version>
     <types>
         <prelogin/>
         <authentication/>

diff --git a/lib/Service/AppService.php b/lib/Service/AppService.php
@@ -231,16 +231,13 @@ public function isEnforceAuthentication()
             return FALSE;
         }
 
-        $script = basename($_SERVER['SCRIPT_FILENAME']);
-        return !in_array(
-            $script,
-            array(
-                'cron.php',
-                'public.php',
-                'remote.php',
-                'status.php',
-            )
-        );
+
+        $script = $_SERVER['SCRIPT_FILENAME'];
+        if (in_array(basename($script), array('console.php', 'cron.php', 'public.php', 'remote.php', 'status.php', 'version.php')) || strpos($script, "/ocs")) {
+            return FALSE;
+        }
+
+        return TRUE;
     }
 
     /**