Changeset 2817:8b6ca1f5148c for inc/admin/lib.moduleslist.php

Timestamp:

11/26/14 17:45:15 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Using dcAdminURL, work in progress on core : auto-update must be tested BEFORE 2.7 release !

File:

• inc/admin/lib.moduleslist.php (modified) (4 diffs)

inc/admin/lib.moduleslist.php

@@ -39 +39 @@
      protected $path_pattern = false;   /**< @var string    Directory pattern to work on */
 
-     protected $page_url = 'plugins.php';    /**< @var string    Page URL */
+     protected $page_url = '';                    /**< @var string    Page URL */
      protected $page_qs = '?';                    /**< @var string    Page query string */
      protected $page_tab = '';                    /**< @var string    Page tab */
@@ -65 +65 @@
           $this->modules = $modules;
           $this->store = new dcStore($modules, $xml_url);
+
+          $this->page_url = $this->core->adminurl->get('admin.plugins');
 
           $this->setPath($modules_root);
@@ -618 +620 @@
                     '<td class="module-icon nowrap">'.sprintf(
                          '<img alt="%1$s" title="%1$s" src="%2$s" />',
-                         html::escapeHTML($id), file_exists($module['root'].'/icon.png') ? 'index.php?pf='.$id.'/icon.png' : 'images/module.png'
+                         html::escapeHTML($id), file_exists($module['root'].'/icon.png') ?
+                         $this->core->adminurl->decode('load.plugin.file',array('pf' => $id.'/icon.png')) : 'images/module.png'
                     ).'</td>';
                }
@@ -1373 +1376 @@
 class adminThemesList extends adminModulesList
 {
-     protected $page_url = 'blog_theme.php';
+     /**
+      * Constructor.
+      *
+      * Note that this creates dcStore instance.
+      *
+      * @param object    $modules       dcModules instance
+      * @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);
+          $this->page_url = $this->core->adminurl->get('admin.blog.theme');
+     }
 
      public function displayModules($cols=array('name', 'config', 'version', 'desc'), $actions=array(), $nav_limit=false)