Changeset 2849:97e1b334e54b for plugins/maintenance

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/maintenance

Files:

• _admin.php (modified) (5 diffs)
• index.php (modified) (2 diffs)

plugins/maintenance/_admin.php

@@ -16 +16 @@
      __('Maintenance'),
      $core->adminurl->get('admin.plugin.maintenance'),
-     $core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/icon.png')),
+     dcPage::getPF('maintenance/icon.png'),
      preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.maintenance')).'(&.*)?$/', $_SERVER['REQUEST_URI']),
      $core->auth->check('admin', $core->blog->id)
@@ -83 +83 @@
                'title' => __('Maintenance'),
                'url' => $core->adminurl->get('admin.plugin.maintenance'),
-               'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/icon.png')),
-               'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/icon-big.png')),
+               'small-icon' => dcPage::getPF('maintenance/icon.png'),
+               'large-icon' => dcPage::getPF('maintenance/icon-big.png'),
                'permissions' => 'admin',
                'active_cb' => array('dcMaintenanceAdmin', 'adminDashboardFavoritesActive'),
@@ -134 +134 @@
 
           $fav['title'] .= '<br />'.sprintf(__('One task to execute', '%s tasks to execute', $count), $count);
-          $fav['large-icon'] =$core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/icon-big-update.png'));
+          $fav['large-icon'] = dcPage::getPF('maintenance/icon-big-update.png');
      }
 
@@ -177 +177 @@
           $items[] = new ArrayObject(array(
                '<div id="maintenance-expired" class="box small">'.
-               '<h3><img src="'.$core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/icon-small.png')).'" alt="" /> '.__('Maintenance').'</h3>'.
+               '<h3><img src="'.dcPage::getPF('maintenance/icon-small.png').'" alt="" /> '.__('Maintenance').'</h3>'.
                '<p class="warning no-margin">'.sprintf(__('There is a task to execute.', 'There are %s tasks to execute.', count($lines)), count($lines)).'</p>'.
                '<ul>'.implode('',$lines).'</ul>'.
@@ -310 +310 @@
      {
           if ($module == 'maintenance') {
-               return dcPage::jsLoad($core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/js/settings.js')));
+               return dcPage::jsLoad(dcPage::getPF('maintenance/js/settings.js'));
           }
      }

plugins/maintenance/index.php

@@ -117 +117 @@
 <title>'.__('Maintenance').'</title>'.
 dcPage::jsPageTabs($tab).
-dcPage::jsLoad($core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/js/settings.js')));
+dcPage::jsLoad(dcPage::getPF('maintenance/js/settings.js'));
 
 if ($task && $task->ajax()) {
@@ -126 +126 @@
      "//]]>\n".
      '</script>'.
-     dcPage::jsLoad($core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/js/dc.maintenance.js')));
+     dcPage::jsLoad(dcPage::getPF('maintenance/js/dc.maintenance.js'));
 }