Changeset 3812:bc19aeafa1c2

Timestamp:

08/17/18 11:08:51 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Allows superadmin to force check update of plugins/themes

Files:

• admin/blog_theme.php (modified) (3 diffs)
• admin/plugins.php (modified) (3 diffs)
• inc/admin/lib.moduleslist.php (modified) (2 diffs)
• inc/core/class.dc.store.php (modified) (2 diffs)
• locales/fr/main.po (modified) (2 diffs)

admin/blog_theme.php

@@ -20 +20 @@
     $core->themes,
     $core->blog->themes_path,
-    $core->blog->settings->system->store_theme_url
+    $core->blog->settings->system->store_theme_url,
+    !empty($_GET['nocache'])
 );
 adminThemesList::$distributed_modules = explode(',', DC_DISTRIB_THEMES);
@@ -105 +106 @@
 # -- Display modules lists --
 if ($core->auth->isSuperAdmin()) {
+
+    if (!$core->error->flag()) {
+        if (!empty($_GET['nocache'])) {
+            dcPage::success(__('Manual checking of themes update done successfully.'));
+        }
+    }
 
     # Updated modules from repo
@@ -134 +141 @@
 
             '</div>';
+    } else {
+        echo
+        '<form action="' . $list->getURL('', false) . '" method="get">' .
+        '<p><input type="hidden" name="nocache" value="1" />' .
+        '<input type="submit" value="' . __('Force checking update of themes') . '" /></p>' .
+            '</form>';
     }
 }

admin/plugins.php

@@ -16 +16 @@
     $core->plugins,
     DC_PLUGINS_ROOT,
-    $core->blog->settings->system->store_plugin_url
+    $core->blog->settings->system->store_plugin_url,
+    !empty($_GET['nocache'])
 );
 
@@ -115 +116 @@
 # -- Display modules lists --
 if ($core->auth->isSuperAdmin()) {
+
+    if (!$core->error->flag()) {
+        if (!empty($_GET['nocache'])) {
+            dcPage::success(__('Manual checking of plugins update done successfully.'));
+        }
+    }
 
     # Updated modules from repo
@@ -144 +151 @@
 
             '</div>';
+    } else {
+        echo
+        '<form action="' . $list->getURL('', false) . '" method="get">' .
+        '<p><input type="hidden" name="nocache" value="1" />' .
+        '<input type="submit" value="' . __('Force checking update of plugins') . '" /></p>' .
+            '</form>';
     }
 }

inc/admin/lib.moduleslist.php

@@ -54 +54 @@
      *
      * @param    object    $modules        dcModules instance
-     * @param    string    $modules_root    Modules root directories
+     * @param    string    $modules_root   Modules root directories
      * @param    string    $xml_url        URL of modules feed from repository
-     */
-    public function __construct(dcModules $modules, $modules_root, $xml_url)
+     * @param    boolean   $force          Force query repository
+     */
+    public function __construct(dcModules $modules, $modules_root, $xml_url, $force = false)
     {
         $this->core    = $modules->core;
         $this->modules = $modules;
-        $this->store   = new dcStore($modules, $xml_url);
+        $this->store   = new dcStore($modules, $xml_url, $force);
 
         $this->page_url = $this->core->adminurl->get('admin.plugins');
@@ -1468 +1469 @@
      *
      * @param    object    $modules        dcModules instance
-     * @param    string    $modules_root    Modules root directories
+     * @param    string    $modules_root   Modules root directories
      * @param    string    $xml_url        URL of modules feed from repository
-     */
-    public function __construct(dcModules $modules, $modules_root, $xml_url)
-    {
-        parent::__construct($modules, $modules_root, $xml_url);
+     * @param    boolean   $force          Force query repository
+     */
+    public function __construct(dcModules $modules, $modules_root, $xml_url, $force = false)
+    {
+        parent::__construct($modules, $modules_root, $xml_url, $force);
         $this->page_url = $this->core->adminurl->get('admin.blog.theme');
     }

inc/core/class.dc.store.php

@@ -38 +38 @@
      * @param    object    $modules        dcModules instance
      * @param    string    $xml_url        XML feed URL
-     */
-    public function __construct(dcModules $modules, $xml_url)
+     * @param    boolean   $force          Force query repository
+     */
+    public function __construct(dcModules $modules, $xml_url, $force = false)
     {
         $this->core       = $modules->core;
@@ -46 +47 @@
         $this->user_agent = sprintf('Dotclear/%s)', DC_VERSION);
 
-        $this->check();
+        $this->check($force);
     }
 

locales/fr/main.po

@@ -591 +591 @@
 msgstr "Mettre à jour les thèmes"
 
+msgid "Manual checking of themes update done successfully."
+msgstr "La vérification manuelle de mise à jour des thèmes a été effectuée."
+
+msgid "Force checking update of themes"
+msgstr "Forcer la vérification de mise à jour des thèmes"
+
 #, php-format
 msgid "There is one theme to update available from repository."
@@ -1782 +1788 @@
 msgstr "Mise à jour des plugins"
 
+msgid "Manual checking of plugins update done successfully."
+msgstr "La vérification manuelle de mise à jour des plugins a été effectuée."
+
+msgid "Force checking update of plugins"
+msgstr "Forcer la vérification de mise à jour des plugins"
+
 #, php-format
 msgid "There is one plugin to update available from repository."