Changeset 2825:966e82aaed07 for plugins/pages

Timestamp:

12/01/14 13:15:13 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Using dcAdminURL, work in progress on plugins…

Location:

plugins/pages

Files:

• _admin.php (modified) (3 diffs)
• list.php (modified) (2 diffs)
• page.php (modified) (6 diffs)

plugins/pages/_admin.php

@@ -21 +21 @@
           $favs->register('pages', array(
                'title' => __('Pages'),
-               'url' => 'plugin.php?p=pages',
-               'small-icon' => 'index.php?pf=pages/icon.png',
-               'large-icon' => 'index.php?pf=pages/icon-big.png',
+               'url' => $core->adminurl->get('admin.plugin.pages'),
+               'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'pages/icon.png')),
+               'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'pages/icon-big.png')),
                'permissions' => 'contentadmin,pages',
                'dashboard_cb' => array('pagesDashboard','pagesDashboardCB'),
@@ -30 +30 @@
           $favs->register('newpage', array(
                'title' => __('New page'),
-               'url' => 'plugin.php?p=pages&act=page',
-               'small-icon' => 'index.php?pf=pages/icon-np.png',
-               'large-icon' => 'index.php?pf=pages/icon-np-big.png',
+               'url' => $core->adminurl->get('admin.plugin.pages',array('act' => 'page')),
+               'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'pages/icon-np.png')),
+               'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'pages/icon-np-big.png')),
                'permissions' => 'contentadmin,pages',
                'active_cb' => array('pagesDashboard','newPageActiveCB')
@@ -70 +70 @@
 }
 
-$_menu['Blog']->addItem(__('Pages'),'plugin.php?p=pages','index.php?pf=pages/icon.png',
-          preg_match('/plugin.php(.*)$/',$_SERVER['REQUEST_URI']) && !empty($_REQUEST['p']) && $_REQUEST['p']=='pages',
-          $core->auth->check('contentadmin,pages',$core->blog->id));
+$_menu['Blog']->addItem(__('Pages'),
+     $core->adminurl->get('admin.plugin.pages'),
+     $core->adminurl->decode('load.plugin.file',array('pf' => 'pages/icon.png')),
+     preg_match('/plugin.php(.*)$/',$_SERVER['REQUEST_URI']) && !empty($_REQUEST['p']) && $_REQUEST['p']=='pages',
+     $core->auth->check('contentadmin,pages',$core->blog->id));
 
 $core->auth->setPermissionType('pages',__('manage pages'));

plugins/pages/list.php

@@ -58 +58 @@
           dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
           dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js').
-          dcPage::jsLoad('index.php?pf=pages/list.js').
+          dcPage::jsLoad($core->adminurl->decode('load.plugin.file',array('pf' => 'pages/list.js'))).
           '<script type="text/javascript">'.
           "\n".'//<![CDATA['."\n".
@@ -90 +90 @@
      # Show pages
      $post_list->display($page,$nb_per_page,
-     '<form action="plugin.php" method="post" id="form-entries">'.
+     '<form action="'.$core->adminurl->get('admin.plugin').'" method="post" id="form-entries">'.
 
      '%s'.

plugins/pages/page.php

@@ -530 +530 @@
      } else {
           echo
-          '<a id="post-cancel" href="index.php" class="button" accesskey="c">'.__('Cancel').' (c)</a>';
+          '<a id="post-cancel" href="'.$core->adminurl->get('admin.home').'" class="button" accesskey="c">'.__('Cancel').' (c)</a>';
      }
 
@@ -563 +563 @@
      {
           echo
-          '<form action="post_media.php" id="attachment-remove-hide" method="post">'.
+          '<form action="'.$core->adminurl->get('admin.post.media').'" id="attachment-remove-hide" method="post">'.
           '<div>'.form::hidden(array('post_id'),$post_id).
           form::hidden(array('media_id'),'').
@@ -643 +643 @@
      '<h3>'.__('Add a comment').'</h3>'.
 
-     '<form action="comment.php" method="post" id="comment-form">'.
+     '<form action="'.$core->adminurl->get('admin.comment').'" method="post" id="comment-form">'.
      '<div class="constrained">'.
      '<p><label for="comment_author" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Name:').'</label>'.
@@ -697 +697 @@
 function showComments($rs,$has_action)
 {
+     global $core;
+
      echo
      '<table class="comments-list"><tr>'.
@@ -708 +710 @@
      while($rs->fetch())
      {
-          $comment_url = 'comment.php?id='.$rs->comment_id;
+          $comment_url = $core->adminurl->decode('admin.comment',array('id' => $rs->comment_id));
 
           $img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
@@ -734 +736 @@
           '<td class="maximal">'.$rs->comment_author.'</td>'.
           '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$rs->comment_dt).'</td>'.
-          '<td class="nowrap"><a href="comments.php?ip='.$rs->comment_ip.'">'.$rs->comment_ip.'</a></td>'.
+          '<td class="nowrap"><a href="'.$core->adminurl->decode('admin.comment',array('ip' => $rs->comment_ip)).'">'.$rs->comment_ip.'</a></td>'.
           '<td class="nowrap status">'.$img_status.'</td>'.
           '<td class="nowrap status"><a href="'.$comment_url.'">'.