Changeset 2849:97e1b334e54b
- Timestamp:
- 12/16/14 11:46:03 (9 years ago)
- Branch:
- default
- Children:
- 2850:aacd042b1035, 2877:ae86da118440
- Files:
-
- 32 edited
Legend:
- Unmodified
- Added
- Removed
-
admin/post.php
r2847 r2849 41 41 $can_delete = false; 42 42 43 $post_headlink = '<link rel="%s" title="%s" href="'.$core->adminurl-> decode('admin.post',array('id' => "%s"),'&').'" />';44 $post_link = '<a href="'.$core->adminurl-> decode('admin.post',array('id' => "%s"),'&').'" title="%s">%s</a>';43 $post_headlink = '<link rel="%s" title="%s" href="'.$core->adminurl->get('admin.post',array('id' => "%s"),false,'&').'" />'; 44 $post_link = '<a href="'.$core->adminurl->get('admin.post',array('id' => "%s"),false,'&').'" title="%s">%s</a>'; 45 45 46 46 $next_link = $prev_link = $next_headlink = $prev_headlink = null; -
inc/admin/lib.dc.adminurl.php
r2822 r2849 71 71 * @param string $name URL Name 72 72 * @param array $params query string parameters, given as an associative array 73 * @param boolean $urlencode set to true if url may not be encoded 73 74 * @param string $separator separator to use between QS parameters 74 75 * @return string the forged url 75 76 */ 76 public function get($name,$params=array(),$ separator='&')77 public function get($name,$params=array(),$urlencode=true,$separator='&') 77 78 { 78 79 if (!isset($this->urls[$name])) { 79 80 throw new exception ('Unknown URL handler for '.$name); 81 } 82 // compatibility check for old behavior 83 if (!is_bool($urlencode)) { 84 $separator=$urlencode; 85 $urlencode = true; 80 86 } 81 87 $url = $this->urls[$name]; … … 85 91 $u .= '?'.http_build_query($p,'',$separator); 86 92 } 87 return $u ;93 return $urlencode?$u:urldecode($u); 88 94 } 89 95 90 96 /** 91 97 * retrieves a URL (decoded — useful for echoing) given its name, and optional parameters 98 * 99 * @deprecated should use get(...,true,...) instead 92 100 * 93 101 * @param string $name URL Name … … 98 106 public function decode($name,$params=array(),$separator='&') 99 107 { 100 return urldecode($this->get($name,$params, $separator));108 return urldecode($this->get($name,$params,false,$separator)); 101 109 } 102 110 -
inc/admin/lib.dc.page.php
r2817 r2849 925 925 '<script type="text/javascript" src="js/meta-editor.js"></script>'; 926 926 } 927 928 public static function getPF($file) { 929 return $GLOBALS['core']->adminurl->get('load.plugin.file',array('pf' => $file),false); 930 } 927 931 } -
inc/admin/lib.moduleslist.php
r2817 r2849 621 621 '<img alt="%1$s" title="%1$s" src="%2$s" />', 622 622 html::escapeHTML($id), file_exists($module['root'].'/icon.png') ? 623 $this->core->adminurl->decode('load.plugin.file',array('pf' => $id.'/icon.png')) : 'images/module.png'623 dcPage::getPF($id.'/icon.png') : 'images/module.png' 624 624 ).'</td>'; 625 625 } -
inc/admin/lib.pager.php
r2817 r2849 214 214 { 215 215 if ($this->core->auth->check('categories',$this->core->blog->id)) { 216 $cat_link = '<a href="'.$this->core->adminurl-> decode('admin.category',array('id' => '%s')).'">%s</a>';216 $cat_link = '<a href="'.$this->core->adminurl->get('admin.category',array('id' => '%s'),false).'">%s</a>'; 217 217 } else { 218 218 $cat_link = '%2$s'; -
plugins/aboutConfig/_admin.php
r2823 r2849 14 14 $_menu['System']->addItem('about:config', 15 15 $core->adminurl->get('admin.plugin.aboutConfig'), 16 $core->adminurl->decode('load.plugin.file',array('pf' => 'aboutConfig/icon.png')),16 dcPage::getPF('aboutConfig/icon.png'), 17 17 preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.aboutConfig')).'(&.*)?$/',$_SERVER['REQUEST_URI']), 18 18 $core->auth->isSuperAdmin()); -
plugins/antispam/_admin.php
r2823 r2849 18 18 $_menu['Plugins']->addItem(__('Antispam'), 19 19 $core->adminurl->get('admin.plugin.antispam'), 20 $core->adminurl->decode('load.plugin.file',array('pf' => 'antispam/icon.png')),20 dcPage::getPF('antispam/icon.png'), 21 21 preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.antispam')).'(&.*)?$/',$_SERVER['REQUEST_URI']), 22 22 $core->auth->check('admin',$core->blog->id)); … … 34 34 'title' => __('Antispam'), 35 35 'url' => $core->adminurl->get('admin.plugin.antispam'), 36 'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'antispam/icon.png')),37 'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'antispam/icon-big.png')),36 'small-icon' => dcPage::getPF('antispam/icon.png'), 37 'large-icon' => dcPage::getPF('antispam/icon-big.png'), 38 38 'permissions' => 'admin') 39 39 ); -
plugins/antispam/index.php
r2823 r2849 118 118 dcPage::jsLoad('js/jquery/jquery-ui.custom.js'). 119 119 dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js'). 120 dcPage::jsLoad( $core->adminurl->decode('load.plugin.file',array('pf' => 'antispam/antispam.js')));120 dcPage::jsLoad(dcPage::getPF('antispam/antispam.js')); 121 121 } 122 122 ?> 123 <link rel="stylesheet" type="text/css" href="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'antispam/style.css')); ?>" />123 <link rel="stylesheet" type="text/css" href="<?php echo dcPage::getPF('antispam/style.css'); ?>" /> 124 124 </head> 125 125 <body> -
plugins/attachments/_admin.php
r2823 r2849 40 40 $core =& $GLOBALS['core']; 41 41 return 42 '<script type="text/javascript" src="'. $core->adminurl->decode('load.plugin.file',array('pf' => 'attachments/js/post.js')).'"></script>';42 '<script type="text/javascript" src="'.dcPage::getPF('attachments/js/post.js').'"></script>'; 43 43 } 44 44 public static function adminPostFormItems($main,$sidebar,$post) -
plugins/blogroll/_admin.php
r2824 r2849 21 21 __('Blogroll'), 22 22 $core->adminurl->get('admin.plugin.blogroll'), 23 $core->adminurl->decode('load.plugin.file',array('pf' => 'blogroll/icon.png'))23 dcPage::getPF('blogroll/icon.png') 24 24 )); 25 25 } … … 29 29 'title' => __('Blogroll'), 30 30 'url' => $core->adminurl->get('admin.plugin.blogroll'), 31 'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'blogroll/icon-small.png')),32 'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'blogroll/icon.png')),31 'small-icon' => dcPage::getPF('blogroll/icon-small.png'), 32 'large-icon' => dcPage::getPF('blogroll/icon.png'), 33 33 'permissions' => 'usage,contentadmin' 34 34 )); … … 38 38 global $core; 39 39 40 return dcPage::jsLoad( $core->adminurl->decode('load.plugin.file',array('pf' => 'blogroll/_users_actions.js')));40 return dcPage::jsLoad(dcPage::getPF('blogroll/_users_actions.js')); 41 41 } 42 42 43 43 $_menu['Blog']->addItem(__('Blogroll'), 44 44 $core->adminurl->get('admin.plugin.blogroll'), 45 $core->adminurl->decode('load.plugin.file',array('pf' => 'blogroll/icon-small.png')),45 dcPage::getPF('blogroll/icon-small.png'), 46 46 preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.blogroll')).'(&.*)?$/',$_SERVER['REQUEST_URI']), 47 47 $core->auth->check('usage,contentadmin',$core->blog->id)); -
plugins/blogroll/index.php
r2824 r2849 178 178 dcPage::jsLoad('js/jquery/jquery-ui.custom.js'). 179 179 dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js'). 180 dcPage::jsLoad( $core->adminurl->decode('load.plugin.file',array('pf' => 'blogroll/blogroll.js')));180 dcPage::jsLoad(dcPage::getPF('blogroll/blogroll.js')); 181 181 } 182 182 ?> -
plugins/blowupConfig/index.php
r2824 r2849 212 212 <head> 213 213 <title><?php echo __('Blowup configuration'); ?></title> 214 <?php echo dcPage::jsLoad( $core->adminurl->decode('load.plugin.file',array('pf' => 'blowupConfig/config.js'))); ?>214 <?php echo dcPage::jsLoad(dcPage::getPF('blowupConfig/config.js')); ?> 215 215 <?php echo dcPage::jsColorPicker(); ?> 216 216 <script type="text/javascript"> … … 312 312 $preview_image = http::concatURL($core->blog->url,blowupConfig::imagesURL().'/page-t.png'); 313 313 } else { 314 $preview_image = $core->adminurl->decode('load.plugin.file', 315 array('pf' => 'blowupConfig/alpha-img/page-t/'.$blowup_user['top_image'].'.png')); 314 $preview_image = dcPage::getPF('blowupConfig/alpha-img/page-t/'.$blowup_user['top_image'].'.png'); 316 315 } 317 316 -
plugins/dcCKEditor/_admin.php
r2825 r2849 15 15 $_menu['Plugins']->addItem('dcCKEditor', 16 16 $core->adminurl->get('admin.plugin.dcCKEditor'), 17 $core->adminurl->decode('load.plugin.file',array('pf' => 'dcCKEditor/imgs/icon.png')),17 dcPage::getPF('dcCKEditor/imgs/icon.png'), 18 18 preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.dcCKEditor')).'/', $_SERVER['REQUEST_URI']), 19 19 $core->auth->check('admin,contentadmin', $core->blog->id) -
plugins/dcLegacyEditor/_admin.php
r2825 r2849 15 15 $_menu['Plugins']->addItem('dcLegacyEditor', 16 16 $core->adminurl->get('admin.plugin.dcLegacyEditor'), 17 $core->adminurl->decode('load.plugin.file',array('pf' => 'dcLegacyEditor/icon.png')),17 dcPage::getPF('dcLegacyEditor/icon.png'), 18 18 preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.dcLegacyEditor')).'/', $_SERVER['REQUEST_URI']), 19 19 $core->auth->check('admin,contentadmin', $core->blog->id) -
plugins/importExport/_admin.php
r2825 r2849 15 15 __('Import/Export'), 16 16 $core->adminurl->get('admin.plugin.importExport'), 17 $core->adminurl->decode('load.plugin.file',array('pf' => 'importExport/icon.png')),17 dcPage::getPF('importExport/icon.png'), 18 18 preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.importExport')).'(&.*)?$/',$_SERVER['REQUEST_URI']), 19 19 $core->auth->check('admin',$core->blog->id) … … 27 27 'title' => __('Import/Export'), 28 28 'url' => $core->adminurl->get('admin.plugin.importExport'), 29 'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'importExport/icon.png')),30 'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'importExport/icon-big.png')),29 'small-icon' => dcPage::getPF('importExport/icon.png'), 30 'large-icon' => dcPage::getPF('importExport/icon-big.png'), 31 31 'permissions' => 'admin' 32 32 )); -
plugins/importExport/index.php
r2837 r2849 63 63 <head> 64 64 <title>'.$title.'</title> 65 <link rel="stylesheet" type="text/css" href="'. $core->adminurl->decode('load.plugin.file',array('pf' => 'importExport/style.css')).'" />66 '.dcPage::jsLoad( $core->adminurl->decode('load.plugin.file',array('pf' => 'importExport/js/script.js'))).'65 <link rel="stylesheet" type="text/css" href="'.dcPage::getPF('importExport/style.css').'" /> 66 '.dcPage::jsLoad(dcPage::getPF('importExport/js/script.js')).' 67 67 <script type="text/javascript"> 68 68 //<![CDATA[ … … 103 103 '<p class="info">'.sprintf( 104 104 __('Export functions are in the page %s.'), 105 '<a href="'.$core->adminurl-> decode('admin.plugin.maintenance',array('tab' => 'backup')).'#backup">'.__('Maintenance').'</a>'105 '<a href="'.$core->adminurl->get('admin.plugin.maintenance',array('tab' => 'backup'),false).'#backup">'.__('Maintenance').'</a>' 106 106 ).'</p>'; 107 107 } -
plugins/maintenance/_admin.php
r2825 r2849 16 16 __('Maintenance'), 17 17 $core->adminurl->get('admin.plugin.maintenance'), 18 $core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/icon.png')),18 dcPage::getPF('maintenance/icon.png'), 19 19 preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.maintenance')).'(&.*)?$/', $_SERVER['REQUEST_URI']), 20 20 $core->auth->check('admin', $core->blog->id) … … 83 83 'title' => __('Maintenance'), 84 84 'url' => $core->adminurl->get('admin.plugin.maintenance'), 85 'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/icon.png')),86 'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/icon-big.png')),85 'small-icon' => dcPage::getPF('maintenance/icon.png'), 86 'large-icon' => dcPage::getPF('maintenance/icon-big.png'), 87 87 'permissions' => 'admin', 88 88 'active_cb' => array('dcMaintenanceAdmin', 'adminDashboardFavoritesActive'), … … 134 134 135 135 $fav['title'] .= '<br />'.sprintf(__('One task to execute', '%s tasks to execute', $count), $count); 136 $fav['large-icon'] = $core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/icon-big-update.png'));136 $fav['large-icon'] = dcPage::getPF('maintenance/icon-big-update.png'); 137 137 } 138 138 … … 177 177 $items[] = new ArrayObject(array( 178 178 '<div id="maintenance-expired" class="box small">'. 179 '<h3><img src="'. $core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/icon-small.png')).'" alt="" /> '.__('Maintenance').'</h3>'.179 '<h3><img src="'.dcPage::getPF('maintenance/icon-small.png').'" alt="" /> '.__('Maintenance').'</h3>'. 180 180 '<p class="warning no-margin">'.sprintf(__('There is a task to execute.', 'There are %s tasks to execute.', count($lines)), count($lines)).'</p>'. 181 181 '<ul>'.implode('',$lines).'</ul>'. … … 310 310 { 311 311 if ($module == 'maintenance') { 312 return dcPage::jsLoad( $core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/js/settings.js')));312 return dcPage::jsLoad(dcPage::getPF('maintenance/js/settings.js')); 313 313 } 314 314 } -
plugins/maintenance/index.php
r2825 r2849 117 117 <title>'.__('Maintenance').'</title>'. 118 118 dcPage::jsPageTabs($tab). 119 dcPage::jsLoad( $core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/js/settings.js')));119 dcPage::jsLoad(dcPage::getPF('maintenance/js/settings.js')); 120 120 121 121 if ($task && $task->ajax()) { … … 126 126 "//]]>\n". 127 127 '</script>'. 128 dcPage::jsLoad( $core->adminurl->decode('load.plugin.file',array('pf' => 'maintenance/js/dc.maintenance.js')));128 dcPage::jsLoad(dcPage::getPF('maintenance/js/dc.maintenance.js')); 129 129 } 130 130 -
plugins/pages/_admin.php
r2825 r2849 22 22 'title' => __('Pages'), 23 23 'url' => $core->adminurl->get('admin.plugin.pages'), 24 'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'pages/icon.png')),25 'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'pages/icon-big.png')),24 'small-icon' => dcPage::getPF('pages/icon.png'), 25 'large-icon' => dcPage::getPF('pages/icon-big.png'), 26 26 'permissions' => 'contentadmin,pages', 27 27 'dashboard_cb' => array('pagesDashboard','pagesDashboardCB'), … … 31 31 'title' => __('New page'), 32 32 'url' => $core->adminurl->get('admin.plugin.pages',array('act' => 'page')), 33 'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'pages/icon-np.png')),34 'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'pages/icon-np-big.png')),33 'small-icon' => dcPage::getPF('pages/icon-np.png'), 34 'large-icon' => dcPage::getPF( 'pages/icon-np-big.png'), 35 35 'permissions' => 'contentadmin,pages', 36 36 'active_cb' => array('pagesDashboard','newPageActiveCB') … … 72 72 $_menu['Blog']->addItem(__('Pages'), 73 73 $core->adminurl->get('admin.plugin.pages'), 74 $core->adminurl->decode('load.plugin.file',array('pf' => 'pages/icon.png')),74 dcPage::getPF('pages/icon.png'), 75 75 preg_match('/plugin.php(.*)$/',$_SERVER['REQUEST_URI']) && !empty($_REQUEST['p']) && $_REQUEST['p']=='pages', 76 76 $core->auth->check('contentadmin,pages',$core->blog->id)); -
plugins/pages/list.php
r2825 r2849 58 58 dcPage::jsLoad('js/jquery/jquery-ui.custom.js'). 59 59 dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js'). 60 dcPage::jsLoad( $core->adminurl->decode('load.plugin.file',array('pf' => 'pages/list.js'))).60 dcPage::jsLoad(dcPage::getPF('pages/list.js')). 61 61 '<script type="text/javascript">'. 62 62 "\n".'//<![CDATA['."\n". -
plugins/pages/page.php
r2825 r2849 710 710 while($rs->fetch()) 711 711 { 712 $comment_url = $core->adminurl-> decode('admin.comment',array('id' => $rs->comment_id));712 $comment_url = $core->adminurl->get('admin.comment',array('id' => $rs->comment_id),false); 713 713 714 714 $img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />'; … … 736 736 '<td class="maximal">'.$rs->comment_author.'</td>'. 737 737 '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$rs->comment_dt).'</td>'. 738 '<td class="nowrap"><a href="'.$core->adminurl-> decode('admin.comment',array('ip' => $rs->comment_ip)).'">'.$rs->comment_ip.'</a></td>'.738 '<td class="nowrap"><a href="'.$core->adminurl->get('admin.comment',array('ip' => $rs->comment_ip),false).'">'.$rs->comment_ip.'</a></td>'. 739 739 '<td class="nowrap status">'.$img_status.'</td>'. 740 740 '<td class="nowrap status"><a href="'.$comment_url.'">'. -
plugins/pings/_admin.php
r2820 r2849 14 14 $_menu['Blog']->addItem(__('Pings'), 15 15 $core->adminurl->get('admin.plugin.pings'), 16 $core->adminurl->decode('load.plugin.file',array('pf' => 'pings/icon.png')),16 dcPage::getPF('pings/icon.png'), 17 17 preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.pings')).'/',$_SERVER['REQUEST_URI']), 18 18 $core->auth->isSuperAdmin()); … … 46 46 'title' => __('Pings'), 47 47 'url' => $core->adminurl->get('admin.plugin.pings'), 48 'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'pings/icon.png')),49 'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'pings/icon-big.png')),48 'small-icon' => dcPage::getPF('pings/icon.png'), 49 'large-icon' => dcPage::getPF('pings/icon-big.png'), 50 50 )); 51 51 } -
plugins/pings/lib.pings.php
r2825 r2849 38 38 "<script type=\"text/javascript\">\n//<![CDATA[\n". 39 39 dcPage::jsVar('dotclear.msg.check_all',__('Check all'))."\n". 40 "</script>\n".dcPage::jsLoad( $core->adminurl->decode('load.plugin.file',array('pf' => 'pings/post.js')));40 "</script>\n".dcPage::jsLoad(dcPage::getPF('pings/post.js')); 41 41 42 42 return $res; -
plugins/simpleMenu/_admin.php
r2820 r2849 18 18 $icons['simpleMenu'] = new ArrayObject(array(__('Simple menu'), 19 19 $core->adminurl->get('admin.plugin.simpleMenu'), 20 $core->adminurl->decode('load.plugin.file',array('pf' => 'simpleMenu/icon.png'))));20 dcPage::getPF('simpleMenu/icon.png'))); 21 21 } 22 22 function simpleMenu_dashboard_favs($core,$favs) … … 25 25 'title' => __('Simple menu'), 26 26 'url' => $core->adminurl->get('admin.plugin.simpleMenu'), 27 'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'simpleMenu/icon-small.png')),28 'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'simpleMenu/icon.png')),27 'small-icon' => dcPage::getPF('simpleMenu/icon-small.png'), 28 'large-icon' => dcPage::getPF('simpleMenu/icon.png'), 29 29 'permissions' => 'usage,contentadmin' 30 30 )); … … 33 33 $_menu['Blog']->addItem(__('Simple menu'), 34 34 $core->adminurl->get('admin.plugin.simpleMenu'), 35 $core->adminurl->decode('load.plugin.file',array('pf' => 'simpleMenu/icon-small.png')),35 dcPage::getPF('simpleMenu/icon-small.png'), 36 36 preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.simpleMenu')).'(&.*)?$/',$_SERVER['REQUEST_URI']), 37 37 $core->auth->check('usage,contentadmin',$core->blog->id)); -
plugins/simpleMenu/index.php
r2820 r2849 371 371 dcPage::jsLoad('js/jquery/jquery-ui.custom.js'). 372 372 dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js'). 373 dcPage::jsLoad( $core->adminurl->decode('load.plugin.file',array('pf' => 'simpleMenu/simplemenu.js')));373 dcPage::jsLoad(dcPage::getPF('simpleMenu/simplemenu.js')); 374 374 } 375 375 echo dcPage::jsConfirmClose('settings','menuitemsappend','additem','menuitems'); -
plugins/tags/_admin.php
r2836 r2849 14 14 $_menu['Blog']->addItem(__('Tags'), 15 15 $core->adminurl->get('admin.plugin.tags',array('m' => 'tags')), 16 $core->adminurl->decode('load.plugin.file',array('pf' => 'tags/icon.png')),16 dcPage::getPF('tags/icon.png'), 17 17 preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.tags')).'&m=tag(s|_posts)?(&.*)?$/',$_SERVER['REQUEST_URI']), 18 18 $core->auth->check('usage,contentadmin',$core->blog->id)); … … 81 81 'title' => __('Tags'), 82 82 'url' => $core->adminurl->get('admin.plugin.tags',array('m' => 'tags')), 83 'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'tags/icon.png')),84 'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'tags/icon-big.png')),83 'small-icon' => dcPage::getPF('tags/icon.png'), 84 'large-icon' => dcPage::getPF('tags/icon-big.png'), 85 85 'permissions' => 'usage,contentadmin' 86 86 )); -
plugins/tags/tag_posts.php
r2826 r2849 73 73 <head> 74 74 <title><?php echo __('Tags'); ?></title> 75 <link rel="stylesheet" type="text/css" href="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'tags/style.css')); ?>" />75 <link rel="stylesheet" type="text/css" href="<?php echo dcPage::getPF('tags/style.css'); ?>" /> 76 76 <script type="text/javascript" src="js/_posts_list.js"></script> 77 77 <script type="text/javascript"> -
plugins/tags/tags.php
r2826 r2849 16 16 <head> 17 17 <title><?php echo __('Tags'); ?></title> 18 <link rel="stylesheet" type="text/css" href="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'tags/style.css')); ?>" />18 <link rel="stylesheet" type="text/css" href="<?php echo dcPage::getPF('tags/style.css'); ?>" /> 19 19 </head> 20 20 -
plugins/themeEditor/index.php
r2815 r2849 70 70 <head> 71 71 <title><?php echo __('Edit theme files'); ?></title> 72 <link rel="stylesheet" type="text/css" href="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'themeEditor/style.css')); ?>" />72 <link rel="stylesheet" type="text/css" href="<?php echo dcPage::getPF('themeEditor/style.css'); ?>" /> 73 73 <script type="text/javascript"> 74 74 //<![CDATA[ … … 81 81 </script> 82 82 <?php echo dcPage::jsConfirmClose('file-form'); ?> 83 <script type="text/javascript" src="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'themeEditor/script.js')); ?>"></script>83 <script type="text/javascript" src="<?php echo dcPage::getPF('themeEditor/script.js'); ?>"></script> 84 84 <?php if ($user_ui_colorsyntax) { ?> 85 <link rel="stylesheet" type="text/css" href="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'themeEditor/codemirror/codemirror.css')); ?>" />86 <link rel="stylesheet" type="text/css" href="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'themeEditor/codemirror.css')); ?>" />87 <script type="text/JavaScript" src="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'themeEditor/codemirror/codemirror.js')); ?>"></script>88 <script type="text/JavaScript" src="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'themeEditor/codemirror/multiplex.js')); ?>"></script>89 <script type="text/JavaScript" src="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'themeEditor/codemirror/xml.js')); ?>"></script>90 <script type="text/JavaScript" src="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'themeEditor/codemirror/javascript.js')); ?>"></script>91 <script type="text/JavaScript" src="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'themeEditor/codemirror/css.js')); ?>"></script>92 <script type="text/JavaScript" src="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'themeEditor/codemirror/php.js')); ?>"></script>93 <script type="text/JavaScript" src="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'themeEditor/codemirror/htmlmixed.js')); ?>"></script>85 <link rel="stylesheet" type="text/css" href="<?php echo dcPage::getPF( 'themeEditor/codemirror/codemirror.css'); ?>" /> 86 <link rel="stylesheet" type="text/css" href="<?php echo dcPage::getPF( 'themeEditor/codemirror.css'); ?>" /> 87 <script type="text/JavaScript" src="<?php echo dcPage::getPF('themeEditor/codemirror/codemirror.js'); ?>"></script> 88 <script type="text/JavaScript" src="<?php echo dcPage::getPF('themeEditor/codemirror/multiplex.js'); ?>"></script> 89 <script type="text/JavaScript" src="<?php echo dcPage::getPF('themeEditor/codemirror/xml.js'); ?>"></script> 90 <script type="text/JavaScript" src="<?php echo dcPage::getPF('themeEditor/codemirror/javascript.js'); ?>"></script> 91 <script type="text/JavaScript" src="<?php echo dcPage::getPF('themeEditor/codemirror/css.js'); ?>"></script> 92 <script type="text/JavaScript" src="<?php echo dcPage::getPF('themeEditor/codemirror/php.js'); ?>"></script> 93 <script type="text/JavaScript" src="<?php echo dcPage::getPF('themeEditor/codemirror/htmlmixed.js'); ?>"></script> 94 94 <?php } ?> 95 95 </head> -
plugins/userPref/_admin.php
r2820 r2849 14 14 $_menu['System']->addItem('user:preferences', 15 15 $core->adminurl->get('admin.plugin.userPref'), 16 $core->adminurl->decode('load.plugin.file',array('pf' => 'userPref/icon.png')),16 dcPage::getPF('userPref/icon.png'), 17 17 preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.userPref')).'(&.*)?$/',$_SERVER['REQUEST_URI']), 18 18 $core->auth->isSuperAdmin()); -
plugins/widgets/_admin.php
r2820 r2849 19 19 'title' => __('Presentation widgets'), 20 20 'url' => $core->adminurl->get('admin.plugin.widgets'), 21 'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'widgets/icon.png')),22 'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'widgets/icon-big.png')),21 'small-icon' => dcPage::getPF('widgets/icon.png'), 22 'large-icon' => dcPage::getPF('widgets/icon-big.png'), 23 23 )); 24 24 } … … 26 26 $_menu['Blog']->addItem(__('Presentation widgets'), 27 27 $core->adminurl->get('admin.plugin.widgets'), 28 $core->adminurl->decode('load.plugin.file',array('pf' => 'widgets/icon.png')),28 dcPage::getPF('widgets/icon.png'), 29 29 preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.widgets')).'(&.*)?$/',$_SERVER['REQUEST_URI']), 30 30 $core->auth->check('admin',$core->blog->id)); -
plugins/widgets/index.php
r2815 r2849 214 214 <head> 215 215 <title><?php echo __('Widgets'); ?></title> 216 <link type="text/css" rel="stylesheet" href="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'widgets/style.css')); ?>"/>216 <link type="text/css" rel="stylesheet" href="<?php echo dcPage::getPF('widgets/style.css'); ?>"/> 217 217 <?php 218 218 echo 219 219 dcPage::jsLoad('js/jquery/jquery-ui.custom.js'). 220 220 dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js'). 221 dcPage::jsLoad( $core->adminurl->decode('load.plugin.file',array('pf' => 'widgets/widgets.js')));221 dcPage::jsLoad(dcPage::getPF('widgets/widgets.js')); 222 222 ?> 223 223 <?php … … 226 226 ?> 227 227 <?php if (!$user_dm_nodragdrop) : ?> 228 <script type="text/javascript" src="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'widgets/dragdrop.js')); ?>"></script>228 <script type="text/javascript" src="<?php echo dcPage::getPF('widgets/dragdrop.js'); ?>"></script> 229 229 <?php endif; ?> 230 230 <script type="text/javascript">
Note: See TracChangeset
for help on using the changeset viewer.