Merge branch 'next-2.x' into 'main'

Next 2.x

See merge request !20

ajax/execute.php

@@ -17,6 +17,7 @@ QUI::$Ajax->registerFunction(
         // not execute at the first log in
         if (QUI::getPackage('quiqqer/cron')->getConfig()->get('update', 'logged_in_before') === false) {
             QUI::getPackage('quiqqer/cron')->getConfig()->set('update', 'logged_in_before', 1);
+            QUI::getPackage('quiqqer/cron')->getConfig()->save();
             return;
         }
 

bin/executeCronViaAdmin.js

+window.addEvent('quiqqerLoaded', function() {
+    require(['Ajax', 'Locale'], function(QUIAjax, QUILocale) {
+
+        const RunningInfo = new Element('div', {
+            html: '' +
+                '<span style="padding-right: 10px; font-size: 20px">' +
+                '   <span class="fa fa-circle-o-notch fa-spin"></span>' +
+                '</span>' +
+                '<span>' + QUILocale.get('quiqqer/cron', 'message.admin.cron.execution') + '</span>',
+            styles: {
+                background: '#fff',
+                bottom: 20,
+                boxShadow: 'rgba(35, 46, 60, .04) 0 2px 4px 0',
+                border: '1px solid rgba(101, 109, 119, .16)',
+                borderLeft: '.25rem solid #4299e1',
+                borderRadius: 4,
+                display: 'flex',
+                maxWidth: '90%',
+                padding: 20,
+                position: 'fixed',
+                right: 20,
+                width: 500,
+                zIndex: 10000
+            }
+        }).inject(document.body);
+
+        QUIAjax.post('package_quiqqer_cron_ajax_execute', function() {
+            moofx(RunningInfo).animate({
+                bottom: 10,
+                opacity: 0
+            }, {
+                callback: () => {
+                    RunningInfo.destroy();
+                }
+            });
+        }, {
+            'package': 'quiqqer/cron'
+        });
+    });
+});

locale.xml

@@ -470,7 +470,7 @@
             <de><![CDATA[Führt ein automatisches Security Update durch.]]></de>
             <en><![CDATA[Performs an automatic security update.]]></en>
         </locale>
-        
+
     </groups>
     <groups name="quiqqer/cron" datatype="js">
         <locale name="cron.id">
@@ -913,6 +913,17 @@ This is realized with an external server on which QUIQQER systems can register t
             <de><![CDATA[Nicht jetzt]]></de>
             <en><![CDATA[Not yet]]></en>
         </locale>
-
+        <locale name="message.admin.cron.execution">
+            <de><![CDATA[
+            Zurzeit wird eine geplante Systemaufgabe (Cron-Job) ausgeführt.
+            Dadurch können andere Aktionen wie Anfragen oder das Laden von Dateien etwas langsamer sein.
+            Bitte haben Sie ein wenig Geduld. Vielen Dank für Ihr Verständnis.
+            ]]></de>
+            <en><![CDATA[
+            A scheduled system task (cron job) is currently being executed.
+            As a result, other actions such as requests or loading files may be somewhat slower.
+            Please be patient. Thank you for your understanding.
+            ]]></en>
+        </locale>
     </groups>
 </locales>

src/QUI/Cron/EventHandler.php

@@ -135,21 +135,7 @@ class EventHandler
 
         // execute cron ?
         if ($Config->get('settings', 'executeOnAdminLogin')) {
-            echo '
-            <script>
-            window.addEvent("load", function()
-            {
-                require(["Ajax"], function(QUIAjax)
-                {
-                    QUIAjax.post("package_quiqqer_cron_ajax_execute", function()
-                    {
-
-                    }, {
-                        "package" : "quiqqer/cron"
-                    });
-                });
-            });
-            </script>';
+            echo '<script src="' . URL_OPT_DIR . 'quiqqer/cron/bin/executeCronViaAdmin.js"></script>';
         }
 
         if (self::$cronWarning) {