[GitHub #62] Fixed background job detection

marius-wieschollek · Aug 28, 2018 · 4ccae44 · 4ccae44
1 parent 6a37d0b
commit 4ccae44
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/docker/php/files/xdebug.ini b/docker/php/files/xdebug.ini
@@ -1,4 +1,4 @@
-zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20160303/xdebug.so
+zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20170718/xdebug.so
 xdebug.remote_enable = 1
 xdebug.remote_port = 9001
 xdebug.remote_handler = "dbgp"

diff --git a/src/js/Manager/SettingsManager.js b/src/js/Manager/SettingsManager.js
@@ -76,6 +76,7 @@ class SettingsManager {
      * Register observer to get updated when a setting is changed
      *
      * @param settings
+     * @param callback
      * @returns {Promise<any>}
      */
     observe(settings, callback) {

diff --git a/src/lib/Services/EnvironmentService.php b/src/lib/Services/EnvironmentService.php
@@ -111,8 +111,8 @@ public function isMaintenanceEnabled(): bool {
      * @param IRequest $request
      */
     protected function checkIfCronJob(IRequest $request): void {
-        $this->isCronJob = ($request->getRequestUri() === '/cron.php' && in_array(BackgroundJob::getExecutionType(), ['ajax', 'webcron'])) ||
-                           ($this->isCliMode && BackgroundJob::getExecutionType() === 'cron' && strpos($request->getScriptName(), 'cron.php') !== false);
+        $this->isCronJob = ($request->getRequestUri() === '/cron.php' && in_array($this->getBackgroundJobType(), ['ajax', 'webcron'])) ||
+                           ($this->isCliMode && $this->getBackgroundJobType() === 'cron' && strpos($request->getScriptName(), 'cron.php') !== false);
     }
 
     /**
@@ -127,4 +127,14 @@ protected function checkIfAppUpdate(IRequest $request): void {
         } catch(\Exception $e) {
         }
     }
+
+    /**
+     * @return string
+     * @TODO remove in 2019.1.0
+     */
+    protected function getBackgroundJobType() {
+        if(BackgroundJob::getExecutionType() !== '') return BackgroundJob::getExecutionType();
+
+        return \OC::$server->getConfig()->getAppValue('core', 'backgroundjobs_mode', 'ajax');
+    }
 }
diff --git a/src/lib/Settings/AdminSettings.php b/src/lib/Settings/AdminSettings.php
@@ -319,9 +319,13 @@ protected function getFileCaches(): array {
      */
     protected function getPlatformSupport(): array {
         $ncVersion = intval(explode('.', \OC::$server->getConfig()->getSystemValue('version'), 2)[0]);
+        $cronType = \OC::$server->getConfig()->getAppValue('core', 'backgroundjobs_mode', 'ajax');
+
+        if(BackgroundJob::getExecutionType() !== '') $cronType = BackgroundJob::getExecutionType();
+
 
         return [
-            'cron'   => BackgroundJob::getExecutionType() === 'ajax',
+            'cron'   => $cronType === 'ajax',
             'https'  => \OC::$server->getRequest()->getHttpProtocol() === 'https',
             'wkhtml' => $this->config->getAppValue('service/preview') == HelperService::PREVIEW_WKHTML,
             'php'    => [

diff --git a/src/scss/admin.scss b/src/scss/admin.scss
@@ -43,7 +43,7 @@ section.section.passwords {
         }
 
         &:first-of-type {
-            margin-top : -2em;
+            margin-top : 2em;
         }
 
         &:last-of-type {

diff --git a/tests/codecept/steps/steps.js b/tests/codecept/steps/steps.js
@@ -47,7 +47,6 @@ module.exports = function() {
              *
              * @param file     The file name
              * @param wait     Wait for x seconds before capturing
-             * @param full     Capture full page
              * @param preview  Create a preview image
              */
             async captureWholePage(file, wait = 1, preview = true) {