Changeset 2849:97e1b334e54b for plugins/pages

Timestamp:

12/16/14 11:46:03 (11 years ago)

Author:

Dsls

Branch:

default

Children:

2850:aacd042b1035, 2877:ae86da118440

Message:

Deprecated $core->adminurl->decode, use $core->adminurl->get instead (with urlencode set to false)

Added dcPage::getPF to shortcut plugin file inclusion

Location:

plugins/pages

Files:

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

plugins/pages/_admin.php

@@ -22 +22 @@
                'title' => __('Pages'),
                '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')),
+               'small-icon' => dcPage::getPF('pages/icon.png'),
+               'large-icon' => dcPage::getPF('pages/icon-big.png'),
                'permissions' => 'contentadmin,pages',
                'dashboard_cb' => array('pagesDashboard','pagesDashboardCB'),
@@ -31 +31 @@
                'title' => __('New page'),
                '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')),
+               'small-icon' => dcPage::getPF('pages/icon-np.png'),
+               'large-icon' => dcPage::getPF( 'pages/icon-np-big.png'),
                'permissions' => 'contentadmin,pages',
                'active_cb' => array('pagesDashboard','newPageActiveCB')
@@ -72 +72 @@
 $_menu['Blog']->addItem(__('Pages'),
      $core->adminurl->get('admin.plugin.pages'),
-     $core->adminurl->decode('load.plugin.file',array('pf' => 'pages/icon.png')),
+     dcPage::getPF('pages/icon.png'),
      preg_match('/plugin.php(.*)$/',$_SERVER['REQUEST_URI']) && !empty($_REQUEST['p']) && $_REQUEST['p']=='pages',
      $core->auth->check('contentadmin,pages',$core->blog->id));

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($core->adminurl->decode('load.plugin.file',array('pf' => 'pages/list.js'))).
+          dcPage::jsLoad(dcPage::getPF('pages/list.js')).
           '<script type="text/javascript">'.
           "\n".'//<![CDATA['."\n".

plugins/pages/page.php

@@ -710 +710 @@
      while($rs->fetch())
      {
-          $comment_url = $core->adminurl->decode('admin.comment',array('id' => $rs->comment_id));
+          $comment_url = $core->adminurl->get('admin.comment',array('id' => $rs->comment_id),false);
 
           $img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
@@ -736 +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="'.$core->adminurl->decode('admin.comment',array('ip' => $rs->comment_ip)).'">'.$rs->comment_ip.'</a></td>'.
+          '<td class="nowrap"><a href="'.$core->adminurl->get('admin.comment',array('ip' => $rs->comment_ip),false).'">'.$rs->comment_ip.'</a></td>'.
           '<td class="nowrap status">'.$img_status.'</td>'.
           '<td class="nowrap status"><a href="'.$comment_url.'">'.