Merge pull request #1528 from voltan/develop

Move cron option to tools module
pi-engine · Mar 24, 2017 · 2c821d1 · 2c821d1
2 parents 7722f54 + 8ba3f78
commit 2c821d1
Show file tree

Hide file tree

Showing 25 changed files with 904 additions and 902 deletions.
diff --git a/usr/module/system/config/config.php b/usr/module/system/config/config.php
@@ -49,8 +49,8 @@
         'title'     => _t('Text processing'),
     ),
     array(
-        'name'      => 'cron',
-        'title'     => _t('Cron'),
+        'name'      => 're_captcha',
+        'title'     => _t('ReCaptcha'),
     ),
     array(
         'name'      => 'mail',
@@ -117,37 +117,19 @@
         'category'      => 'general',
     ),
 
-    'ga_account'   => array(
-        'title'         => _t('GA account'),
-        'description'   => _t('Google Analytics trackingID `UA-XXXXXXXX-X`. To specify host as well, append to the code `UA-XXXXXXXX-X; XXXX.tld`.'),
-        'category'      => 'general',
-    ),
-
-    'captcha_public_key' => array(
-        'title'         => _t('ReCaptcha Public Key'),
-		'description'   => _t('see https://www.google.com/recaptcha to create your public key dedicated to your website domain. Both keys are mandatory.'),
-        'edit'          => 'text',
-        'value'         => '',
-        'filter'        => 'string',
-        'category'      => 'general',
-    ),
-
-    'captcha_private_key' => array(
-        'title'         => _t('ReCaptcha Private Key'),
-		'description'   => _t('see https://www.google.com/recaptcha to create your private key dedicated to your website domain. Both keys are mandatory..'),
-        'edit'          => 'text',
-        'value'         => '',
-        'filter'        => 'string',
-        'category'      => 'general',
-    ),
-
     'foot_script'   => array(
         'title'         => _t('Foot scripts'),
         'description'   => _t('Scripts that will be appended to each page footer. Either naked or wrapped js scripts are allowed.'),
         'edit'          => 'textarea',
         'category'      => 'general',
     ),
 
+    'ga_account'   => array(
+        'title'         => _t('GA account'),
+        'description'   => _t('Google Analytics trackingID `UA-XXXXXXXX-X`. To specify host as well, append to the code `UA-XXXXXXXX-X; XXXX.tld`.'),
+        'category'      => 'general',
+    ),
+
     'theme'         => array(
         'title'         => _t('Theme'),
         'value'         => 'default',
@@ -710,21 +692,22 @@
         'category'      => 'geo_tag',
     ),
 
-    'cron_active' => array(
-        'category'      => 'cron',
-        'title'         => _a('Active cron'),
-        'description'   => '',
-        'edit'          => 'checkbox',
-        'filter'        => 'number_int',
-        'value'         => 0
+    'captcha_public_key' => array(
+        'title'         => _t('ReCaptcha Public Key'),
+        'description'   => _t('see https://www.google.com/recaptcha to create your public key dedicated to your website domain. Both keys are mandatory.'),
+        'edit'          => 'text',
+        'value'         => '',
+        'filter'        => 'string',
+        'category'      => 're_captcha',
     ),
 
-    'cron_password' => array(
-        'category'      => 'cron',
-        'title'         => _a('Cron password'),
+    'captcha_private_key' => array(
+        'title'         => _t('ReCaptcha Private Key'),
+        'description'   => _t('see https://www.google.com/recaptcha to create your private key dedicated to your website domain. Both keys are mandatory..'),
         'edit'          => 'text',
+        'value'         => '',
         'filter'        => 'string',
-        'value'         => md5(rand()),
+        'category'      => 're_captcha',
     ),
 );
 

diff --git a/usr/module/system/config/module.php b/usr/module/system/config/module.php
@@ -21,7 +21,7 @@
         'description'   =>
             _a('For administration of core functions of the site.'),
         // Version number, required
-        'version'       => '3.5.10',
+        'version'       => '3.5.11',
         // Distribution license, required
         'license'       => 'New BSD',
         // Logo image, for admin, optional

diff --git a/usr/module/system/config/nav.admin.php b/usr/module/system/config/nav.admin.php
@@ -277,17 +277,6 @@
         ),
     ),
 
-    'cron'     => array(
-        'label'         => _t('Cron'),
-        'route'         => 'admin',
-        'module'        => 'system',
-        'controller'    => 'cron',
-        'action'        => 'index',
-        'permission'    => array(
-            'resource'  => 'maintenance',
-        ),
-    ),
-
     'toolkit'   => array(
         'label'         => _t('Toolkit'),
         'permission'    => array(

diff --git a/usr/module/system/config/page.php b/usr/module/system/config/page.php
@@ -124,12 +124,6 @@
             'controller'    => 'asset',
             'permission'    => 'maintenance',
         ),
-        // cron
-        array(
-            'title'         => _a('Cron'),
-            'controller'    => 'cron',
-            'permission'    => 'maintenance',
-        ),
         // audit
         array(
             'title'         => _a('Auditing'),

diff --git a/usr/module/system/locale/en/admin.mo b/usr/module/system/locale/en/admin.mo