Changeset 2817:8b6ca1f5148c for inc

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 !

Location:

inc/admin

Files:

• lib.dc.page.php (modified) (1 diff)
• lib.moduleslist.php (modified) (4 diffs)
• lib.pager.php (modified) (3 diffs)

inc/admin/lib.dc.page.php

@@ -147 +147 @@
           '</p></form>'.
           '<ul id="top-info-user">'.
-          '<li><a class="'.(preg_match('/index.php$/',$_SERVER['REQUEST_URI']) ? ' active' : '').'" href="'.$core->adminurl->get("admin.home").'">'.__('My dashboard').'</a></li>'.
-          '<li><a class="smallscreen'.(preg_match('/preferences.php(\?.*)?$/',$_SERVER['REQUEST_URI']) ? ' active' : '').
+          '<li><a class="'.(preg_match('/'.preg_quote($core->adminurl->get('admin.home')).'$/',$_SERVER['REQUEST_URI']) ? ' active' : '').'" href="'.$core->adminurl->get("admin.home").'">'.__('My dashboard').'</a></li>'.
+          '<li><a class="smallscreen'.(preg_match('/'.preg_quote($core->adminurl->get('admin.user.preferences')).'(\?.*)?$/',$_SERVER['REQUEST_URI']) ? ' active' : '').
           '" href="'.$core->adminurl->get("admin.user.preferences").'">'.__('My preferences').'</a></li>'.
           '<li><a href="'.$core->adminurl->get("admin.home",array('logout' => 1)).'" class="logout"><span class="nomobile">'.sprintf(__('Logout %s'),$core->auth->userID()).

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)

inc/admin/lib.pager.php

@@ -214 +214 @@
      {
           if ($this->core->auth->check('categories',$this->core->blog->id)) {
-               $cat_link = '<a href="category.php?id=%s">%s</a>';
+               $cat_link = '<a href="'.$this->core->adminurl->decode('admin.category',array('id' => '%s')).'">%s</a>';
           } else {
                $cat_link = '%2$s';
@@ -443 +443 @@
 
           $author_url =
-          'comments.php?n='.$nb_per_page.
-          '&amp;status='.$status.
-          '&amp;sortby='.$sortby.
-          '&amp;order='.$order.
-          '&amp;author='.rawurlencode($this->rs->comment_author);
+          $this->core->adminurl->get('admin.comments',array(
+               'n' => $nb_per_page,
+               'status' => $status,
+               'sortby' => $sortby,
+               'order' => $order,
+               'author' => $this->rs->comment_author
+               ));
 
           $post_url = $this->core->getPostAdminURL($this->rs->post_type,$this->rs->post_id);
 
-          $comment_url = 'comment.php?id='.$this->rs->comment_id;
+          $comment_url = $this->core->adminurl->get('admin.comment',array('id' => $this->rs->comment_id));
 
           $comment_dt =
@@ -576 +578 @@
           '<td class="nowrap">'.form::hidden(array('nb_post[]'),(integer) $this->rs->nb_post).
           form::checkbox(array('users[]'),$this->rs->user_id).'</td>'.
-          '<td class="maximal" scope="row"><a href="user.php?id='.$this->rs->user_id.'">'.
+          '<td class="maximal" scope="row"><a href="'.$this->core->adminurl->get('admin.user',array('id' => $this->rs->user_id)).'">'.
           $this->rs->user_id.'</a>&nbsp;'.$img_status.'</td>'.
           '<td class="nowrap">'.html::escapeHTML($this->rs->user_firstname).'</td>'.
           '<td class="nowrap">'.html::escapeHTML($this->rs->user_name).'</td>'.
           '<td class="nowrap">'.html::escapeHTML($this->rs->user_displayname).'</td>'.
-          '<td class="nowrap count"><a href="posts.php?user_id='.$this->rs->user_id.'">'.
+          '<td class="nowrap count"><a href="'.$this->core->adminurl->get('admin.posts',array('user_id' => $this->rs->user_id)).'">'.
           $this->rs->nb_post.'</a></td>'.
           '</tr>';