From 03715cc464c8a9727a945c15f790cd95033cb22b Mon Sep 17 00:00:00 2001 From: CaMer0n Date: Tue, 21 Jul 2009 06:31:23 +0000 Subject: [PATCH] renamed get_function_name() changed to sc_function_name() for shortcode functions. Removing confusion with get_userdata, get_userclasses and other get_ functions built into PHP. --- .../batch/admin_shortcodes_class.php | 50 +++++++-------- .../shortcode/batch/bbcode_shortcodes.php | 10 +-- .../shortcode/batch/news_shortcodes.php | 62 +++++++++---------- .../shortcode/batch/siteinfo_shortcodes.php | 16 ++--- .../shortcode/batch/user_shortcodes.php | 7 ++- e107_handlers/shortcode_handler.php | 10 +-- 6 files changed, 78 insertions(+), 77 deletions(-) diff --git a/e107_files/shortcode/batch/admin_shortcodes_class.php b/e107_files/shortcode/batch/admin_shortcodes_class.php index b5bf1c8f5..990225721 100644 --- a/e107_files/shortcode/batch/admin_shortcodes_class.php +++ b/e107_files/shortcode/batch/admin_shortcodes_class.php @@ -1,7 +1,7 @@ @@ -17,7 +17,7 @@ class admin_shortcodes "; } - function get_admin_docs() + function sc_admin_docs() { if (!ADMIN) { return ''; } global $ns; @@ -47,7 +47,7 @@ class admin_shortcodes return $ns -> tablerender(FOOTLAN_14,$text, array('id' => 'admin_docs', 'style' => 'button_menu'), TRUE); } - function get_admin_help() + function sc_admin_help() { if (!ADMIN) { return ''; } @@ -87,7 +87,7 @@ class admin_shortcodes return $help_text; } - function get_admin_icon() + function sc_admin_icon() { if (ADMIN) { @@ -126,7 +126,7 @@ class admin_shortcodes } } - function get_admin_lang($parm) + function sc_admin_lang($parm) { global $e107, $sql, $pref; @@ -260,7 +260,7 @@ class admin_shortcodes } - function get_admin_latest($parm) + function sc_admin_latest($parm) { if (ADMIN) { if (!function_exists('admin_latest')) @@ -320,7 +320,7 @@ class admin_shortcodes } } - function get_admin_log($parm) + function sc_admin_log($parm) { if (getperms('0')) { @@ -376,7 +376,7 @@ class admin_shortcodes } } - function get_admin_logged() + function sc_admin_logged() { if (ADMIN) { @@ -396,7 +396,7 @@ class admin_shortcodes } } - function get_admin_logo($parm) + function sc_admin_logo($parm) { parse_str($parm); @@ -434,7 +434,7 @@ class admin_shortcodes return $image; } - function get_admin_menu($parm) + function sc_admin_menu($parm) { if (ADMIN) { @@ -478,7 +478,7 @@ class admin_shortcodes } } - function get_admin_msg($parm) + function sc_admin_msg($parm) { if (ADMIN) { @@ -499,7 +499,7 @@ class admin_shortcodes } } - function get_admin_nav($parm) + function sc_admin_nav($parm) { if (ADMIN) { @@ -591,7 +591,7 @@ class admin_shortcodes } } - function get_admin_plugins($parm) + function sc_admin_plugins($parm) { if (ADMIN) { @@ -655,7 +655,7 @@ class admin_shortcodes } } - function get_admin_preset($parm) + function sc_admin_preset($parm) { if(ADMIN && getperms('0')) { @@ -708,7 +708,7 @@ class admin_shortcodes } } - function get_admin_pword() + function sc_admin_pword() { global $pref; if (ADMIN && ADMINPERMS == '0') @@ -722,7 +722,7 @@ class admin_shortcodes } } - function get_admin_sel_lan() + function sc_admin_sel_lan() { global $pref; if (ADMIN) @@ -737,7 +737,7 @@ class admin_shortcodes } } - function get_admin_siteinfo() + function sc_admin_siteinfo() { if (ADMIN) { @@ -797,7 +797,7 @@ class admin_shortcodes } } - function get_admin_status($parm) + function sc_admin_status($parm) { if (getperms('0') || getperms('4')) { @@ -850,7 +850,7 @@ class admin_shortcodes } } - function get_admin_update() + function sc_admin_update() { if (!ADMIN) { return ''; } @@ -909,7 +909,7 @@ class admin_shortcodes } } - function get_admin_userlan() + function sc_admin_userlan() { if (isset($_COOKIE['userlan']) && $_COOKIE['userlan']) { @@ -917,11 +917,11 @@ class admin_shortcodes } } - function get_admin_alt_nav($parm) + function sc_admin_alt_nav($parm) { /* * e107 website system (c) 2001-2008 Steve Dunstan (e107.org) - * $Id: admin_shortcodes_class.php,v 1.14 2009-07-19 11:44:28 marj_nl_fr Exp $ + * $Id: admin_shortcodes_class.php,v 1.15 2009-07-21 06:31:23 e107coders Exp $ */ if (ADMIN) @@ -1088,7 +1088,7 @@ class admin_shortcodes } } - function get_admin_navigation($parm) + function sc_admin_navigation($parm) { if (!ADMIN) return ''; @@ -1278,7 +1278,7 @@ class admin_shortcodes return e_admin_menu('', '', $menu_vars, $$tmpl, false, false); } - function get_admin_menumanager() // List all menu-configs for easy-navigation + function sc_admin_menumanager() // List all menu-configs for easy-navigation { global $pref; $action = ""; diff --git a/e107_files/shortcode/batch/bbcode_shortcodes.php b/e107_files/shortcode/batch/bbcode_shortcodes.php index 9f6a0904e..4c6792930 100644 --- a/e107_files/shortcode/batch/bbcode_shortcodes.php +++ b/e107_files/shortcode/batch/bbcode_shortcodes.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/bbcode_shortcodes.php,v $ -| $Revision: 1.11 $ -| $Date: 2009-07-07 07:32:59 $ +| $Revision: 1.12 $ +| $Date: 2009-07-21 06:31:23 $ | $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -26,7 +26,7 @@ register_shortcode('bbcode_shortcodes', $codes); class bbcode_shortcodes { - function get_bb($parm) + function sc_bb($parm) { //FIXME - cachevars/getcachedvars! global $pref, $eplug_bb, $bbcode_func, $bbcode_help, $bbcode_filedir, $bbcode_imagedir, $bbcode_helpactive, $bbcode_helptag, $register_bb; @@ -130,7 +130,7 @@ class bbcode_shortcodes return $text; } - function get_bb_help($parm) + function sc_bb_help($parm) { if(defsettrue('e_WYSIWYG')) { return; } global $bbcode_helpactive,$bbcode_helptag; @@ -141,7 +141,7 @@ class bbcode_shortcodes return ""; } - function get_bb_preimagedir($parm) + function sc_bb_preimagedir($parm) { if(defsettrue('e_WYSIWYG')) { return; } global $bbcode_imagedir; diff --git a/e107_files/shortcode/batch/news_shortcodes.php b/e107_files/shortcode/batch/news_shortcodes.php index c47f2e60a..7f48dd0c4 100644 --- a/e107_files/shortcode/batch/news_shortcodes.php +++ b/e107_files/shortcode/batch/news_shortcodes.php @@ -1,7 +1,7 @@ tp->e_sc->scClasses['news_shortcodes']->param = getcachedvars('current_news_param'); } - function get_newstitle() + function sc_newstitle() { return $this->e107->tp->toHTML($this->news_item['news_title'], TRUE, 'TITLE'); } - function get_newsbody($parm) + function sc_newsbody($parm) { $news_body = $this->e107->tp->toHTML($this->news_item['news_body'], true, 'BODY, fromadmin', $this->news_item['news_author']); if($this->news_item['news_extended'] && (isset($_POST['preview']) || strpos(e_QUERY, 'extend') !== FALSE) && $parm != 'noextend') @@ -64,7 +64,7 @@ class news_shortcodes return $news_body; } - function get_newsicon($parm) + function sc_newsicon($parm) { $category_icon = str_replace('../', '', trim($this->news_item['category_icon'])); if ($category_icon && strstr('images', $category_icon)) @@ -80,7 +80,7 @@ class news_shortcodes return "news_item['news_category'])."'>"; } - function get_newsauthor($parm) + function sc_newsauthor($parm) { if($this->news_item['user_id']) { @@ -96,7 +96,7 @@ class news_shortcodes return "e107"; } - function get_newscomments($parm) + function sc_newscomments($parm) { global $pref, $sql; if($pref['comments_disabled'] == 1) @@ -132,14 +132,14 @@ class news_shortcodes return ($news_item['news_allow_comments'] ? ''.($pref['comments_icon'] ? $NEWIMAGE : '')." ".$param['commentlink'].$news_item['news_comment_total'].'' : $param['commentoffstring']); } - function get_trackback($parm) + function sc_trackback($parm) { global $pref; if(!varsettrue($pref['trackbackEnabled'])) { return ''; } return ($this->param['trackbackbeforestring'] ? $this->param['trackbackbeforestring'] : '')."".$this->param['trackbackstring'].$this->news_item['tb_count'].''.($this->param['trackbackafterstring'] ? $this->param['trackbackafterstring'] : ''); } - function get_newsheader($parm) + function sc_newsheader($parm) { $category_icon = str_replace("../", "", trim($this->news_item['category_icon'])); if (!$category_icon) return ''; @@ -151,13 +151,13 @@ class news_shortcodes } - function get_newscategory($parm) + function sc_newscategory($parm) { $category_name = $this->e107->tp->toHTML($this->news_item['category_name'], FALSE ,'defs'); return "param['catlink'] : "#")."' href='".$this->e107->url->getUrl('core:news', 'main', 'action=cat&value='.$this->news_item['news_category'])."'>".$category_name.""; } - function get_newsdate($parm) + function sc_newsdate($parm) { $con = new convert; if($parm == '') @@ -181,41 +181,41 @@ class news_shortcodes } } - function get_newscommentlink($parm) + function sc_newscommentlink($parm) { return ($this->news_item['news_allow_comments'] ? $this->param['commentoffstring'] : " ".$this->param['commentlink'].''); } - function get_newscommentcount($parm) + function sc_newscommentcount($parm) { return $this->news_item['news_comment_total']; } - function get_emailicon($parm) + function sc_emailicon($parm) { require_once(e_HANDLER.'emailprint_class.php'); return emailprint::render_emailprint('news', $this->news_item['news_id'], 1); } - function get_printicon() + function sc_printicon() { require_once(e_HANDLER.'emailprint_class.php'); return emailprint::render_emailprint('news', $this->news_item['news_id'], 2); } - function get_pdficon() + function sc_pdficon() { global $pref; if (!$pref['plug_installed']['pdf']) { return ''; } return $this->e107->tp->parseTemplate('{PDF='.LAN_NEWS_24.'^news.'.$this->news_item['news_id'].'}'); } - function get_newsid() + function sc_newsid() { return $this->news_item['news_id']; } - function get_adminoptions() + function sc_adminoptions() { if (ADMIN && getperms('H')) { @@ -228,7 +228,7 @@ class news_shortcodes } } - function get_extended($parm) + function sc_extended($parm) { if ($this->news_item['news_extended'] && (strpos(e_QUERY, 'extend') === FALSE || $parm == 'force')) { @@ -252,50 +252,50 @@ class news_shortcodes return ''; } - function get_captionclass() + function sc_captionclass() { $news_title = $this->e107->tp->toHTML($this->news_item['news_title'], TRUE,'no_hook,emotes_off, no_make_clickable'); return "
".($this->news_item['news_render_type'] == 1 ? "".$news_title."" : $news_title)."
"; } - function get_admincaption() + function sc_admincaption() { $news_title = $this->e107->tp->toHTML($this->news_item['news_title'], TRUE,'no_hook,emotes_off, no_make_clickable'); return "
".($this->news_item['news_render_type'] == 1 ? "".$news_title."" : $news_title)."
"; } - function get_adminbody($parm) + function sc_adminbody($parm) { - $news_body = $this->get_newsbody($parm); + $news_body = $this->sc_newsbody($parm); return "
".$news_body.'
'; } - function get_newssummary() + function sc_newssummary() { return ($this->news_item['news_summary']) ? $this->news_item['news_summary'].'
' : ''; } - function get_newsthumbnail() + function sc_newsthumbnail() { return (isset($this->news_item['news_thumbnail']) && $this->news_item['news_thumbnail']) ? "news_item['news_id']}&value2={$this->news_item['news_category']}")."'>" : ''; } - function get_newsimage() + function sc_newsimage() { return (isset($this->news_item['news_thumbnail']) && $this->news_item['news_thumbnail']) ? "news_item['news_id']}&value2={$this->news_item['news_category']}")."'>" : ''; } - function get_sticky_icon() + function sc_sticky_icon() { return $this->news_item['news_sticky'] ? $this->param['image_sticky'] : ''; } - function get_newstitlelink() + function sc_newstitlelink() { return "param['itemlink'] : 'null')."' href='".$this->e107->url->getUrl('core:news', 'main', "action=item&value1={$this->news_item['news_id']}&value2={$this->news_item['news_category']}")."'>".$this->news_item['news_title'].''; } - function get_newscaticon() + function sc_newscaticon() { $category_icon = str_replace('../', '', trim($this->news_item['category_icon'])); if (!$category_icon) { return ''; } @@ -312,7 +312,7 @@ class news_shortcodes return "news_item['news_category']}")."'>"; } - function get_newsinfo() + function sc_newsinfo() { $news_item = $this->news_item; $param = $this->param; diff --git a/e107_files/shortcode/batch/siteinfo_shortcodes.php b/e107_files/shortcode/batch/siteinfo_shortcodes.php index 88585b386..0702cdcd9 100644 --- a/e107_files/shortcode/batch/siteinfo_shortcodes.php +++ b/e107_files/shortcode/batch/siteinfo_shortcodes.php @@ -1,7 +1,7 @@ tp->replaceConstants($_POST['sitebutton']) : (strstr(SITEBUTTON, 'http:') ? SITEBUTTON : e_IMAGE.SITEBUTTON); return "\"".SITENAME."\""; } - function get_sitedisclaimer() + function sc_sitedisclaimer() { $e107 = e107::getInstance(); return $e107->tp->toHtml(SITEDISCLAIMER, true, 'constants defs'); } - function get_sitename($parm) + function sc_sitename($parm) { return ($parm == 'link') ? "".SITENAME."" : SITENAME; } - function get_sitedescription() + function sc_sitedescription() { global $pref; return SITEDESCRIPTION.(defined('THEME_DESCRIPTION') && $pref['displaythemeinfo'] ? THEME_DESCRIPTION : ''); } - function get_sitetag() + function sc_sitetag() { return SITETAG; } - function get_logo($parm) + function sc_logo($parm) { parse_str($parm); // Optional {LOGO=file=file_name} or {LOGO=link=url} or {LOGO=file=file_name&link=url} // Paths to image file, link are relative to site base @@ -81,7 +81,7 @@ class siteinfo_shortcodes return $image; } - function get_theme_disclaimer($parm) + function sc_theme_disclaimer($parm) { global $pref; return (defined('THEME_DISCLAIMER') && $pref['displaythemeinfo'] ? THEME_DISCLAIMER : ''); diff --git a/e107_files/shortcode/batch/user_shortcodes.php b/e107_files/shortcode/batch/user_shortcodes.php index 5263df1fd..b959663d7 100644 --- a/e107_files/shortcode/batch/user_shortcodes.php +++ b/e107_files/shortcode/batch/user_shortcodes.php @@ -9,8 +9,8 @@ * User information - shortcodes * * $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/user_shortcodes.php,v $ - * $Revision: 1.14 $ - * $Date: 2009-07-07 07:25:27 $ + * $Revision: 1.15 $ + * $Date: 2009-07-21 06:31:23 $ * $Author: e107coders $ * */ @@ -423,7 +423,8 @@ require_once(e_HANDLER."user_extended_class.php"); $ue = new e107_user_extended; $ueCatList = $ue->user_extended_get_categories(); -$ueFieldList = $ue->user_extended_get_fields(); +$ueFieldList = $ue->user_extended_get_ +fields(); $ueCatList[0][0] = array('user_extended_struct_name' => LAN_USER_44); $ret = ""; foreach($ueCatList as $catnum => $cat) diff --git a/e107_handlers/shortcode_handler.php b/e107_handlers/shortcode_handler.php index 3c6538dd3..98e0f4265 100644 --- a/e107_handlers/shortcode_handler.php +++ b/e107_handlers/shortcode_handler.php @@ -12,8 +12,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_handlers/shortcode_handler.php,v $ -| $Revision: 1.26 $ -| $Date: 2009-07-12 02:29:24 $ +| $Revision: 1.27 $ +| $Date: 2009-07-21 06:31:23 $ | $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -32,9 +32,9 @@ function register_shortcode($classFunc, $codes, $path='', $force=false) $tmp = get_class_methods($classFunc); foreach($tmp as $c) { - if(strpos($c, 'get_') === 0) + if(strpos($c, 'sc_') === 0) { - $codes[] = substr($c, 4); + $codes[] = substr($c, 3); } } unset($tmp); @@ -253,7 +253,7 @@ class e_shortcode case 'class': //It is batch shortcode. Load the class and call the method $_class = $this->registered_codes[$code]['class']; - $_method = 'get_'.strtolower($code); + $_method = 'sc_'.strtolower($code); if(!isset($this->scClasses[$_class])) { if(!class_exists($_class) && $this->registered_codes[$code]['path'])