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.

e107_plugins/download/download_shortcodes.php

@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/download/download_shortcodes.php,v $
-|     $Revision: 1.5 $
+|     $Revision: 1.6 $
-|     $Date: 2009-07-07 07:33:00 $
+|     $Date: 2009-07-21 07:10:24 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -37,21 +37,21 @@ class download_shortcodes
 		$this->postInfo = array();
 	}
 	// Category ************************************************************************************
-   function get_download_cat_main_name() {
+   function sc_download_cat_main_name() {
       global $tp, $dlrow;
       return $tp->toHTML($dlrow['download_category_name'], FALSE, 'USER_TITLE');
    }
-   function get_download_cat_main_description() {
+   function sc_download_cat_main_description() {
       global $tp, $dlrow;
       return $tp->toHTML($dlrow['download_category_description'], TRUE, 'DESCRIPTION');
    }
-   function get_download_cat_main_icon() {
+   function sc_download_cat_main_icon() {
       global $dlrow;
       // Pass count as 1 to force non-empty icon
-      return $this->_get_cat_icons($dlrow['download_category_icon'], 1, $dlrow['download_category_name']);
+      return $this->_sc_cat_icons($dlrow['download_category_icon'], 1, $dlrow['download_category_name']);
    }
 	// Sub-Category ********************************************************************************
-   function get_download_cat_sub_name() {
+   function sc_download_cat_sub_name() {
       global $tp, $dlsubrow;
       if ($dlsubrow['d_count'])
       {
@@ -62,32 +62,32 @@ class download_shortcodes
          return $tp->toHTML($dlsubrow['download_category_name'], FALSE, 'USER_TITLE');
       }
    }
-   function get_download_cat_sub_description() {
+   function sc_download_cat_sub_description() {
       global $tp, $dlsubrow;
       return $tp->toHTML($dlsubrow['download_category_description'], TRUE, 'DESCRIPTION');
    }
-   function get_download_cat_sub_icon() {
+   function sc_download_cat_sub_icon() {
       global $dlsubrow;
-      return $this->_get_cat_icons($dlsubrow['download_category_icon'], $dlsubrow['d_count'], $dlsubrow['download_category_name']);
+      return $this->_sc_cat_icons($dlsubrow['download_category_icon'], $dlsubrow['d_count'], $dlsubrow['download_category_name']);
    }
-   function get_download_cat_sub_new_icon() {
+   function sc_download_cat_sub_new_icon() {
       global $dlsubrow;
       return $this->_check_new_download($dlsubrow['d_last_subs']);
    }
-   function get_download_cat_sub_count() {
+   function sc_download_cat_sub_count() {
       global $dlsubrow;
       return $dlsubrow['d_count'];
    }
-   function get_download_cat_sub_size() {
+   function sc_download_cat_sub_size() {
       global $e107, $dlsubrow;
       return $this->e107->parseMemorySize($dlsubrow['d_size']);
    }
-   function get_download_cat_sub_downloaded() {
+   function sc_download_cat_sub_downloaded() {
       global $dlsubrow;
       return intval($dlsubrow['d_requests']);
    }
 	// Sub-Sub-Category ****************************************************************************
-   function get_download_cat_subsub_name() {
+   function sc_download_cat_subsub_name() {
       global $tp, $dlsubsubrow;
       if ($dlsubsubrow['d_count'])
       {
@@ -98,28 +98,28 @@ class download_shortcodes
          return $tp->toHTML($dlsubsubrow['download_category_name'], FALSE, 'USER_TITLE');
       }
    }
-   function get_download_cat_subsub_description() {
+   function sc_download_cat_subsub_description() {
       global $tp, $dlsubsubrow;
       return $tp->toHTML($dlsubsubrow['download_category_description'], TRUE, 'DESCRIPTION');
    }
-   function get_download_cat_subsub_icon() {
+   function sc_download_cat_subsub_icon() {
       global $dlsubsubrow;
-      return $this->_get_cat_icons($dlsubsubrow['download_category_icon'], $dlsubsubrow['d_count'], $dlsubsubrow['download_category_name']);
+      return $this->_sc_cat_icons($dlsubsubrow['download_category_icon'], $dlsubsubrow['d_count'], $dlsubsubrow['download_category_name']);
    }
-   function get_download_cat_subsub_count() {
+   function sc_download_cat_subsub_count() {
       global $dlsubsubrow;
       return $dlsubsubrow['d_count'];
    }
-   function get_download_cat_subsub_size() {
+   function sc_download_cat_subsub_size() {
       global $e107, $dlsubsubrow;
       return $this->e107->parseMemorySize($dlsubsubrow['d_size']);
    }
-   function get_download_cat_subsub_downloaded() {
+   function sc_download_cat_subsub_downloaded() {
       global $dlsubsubrow;
       return intval($dlsubsubrow['d_requests']);
    }
 	// List ****************************************************************************************
-   function get_download_list_name()
+   function sc_download_list_name()
    {
       global $dlrow,$tp,$pref,$parm;
       if ($parm == "nolink"){
@@ -137,39 +137,39 @@ class download_shortcodes
       }
       return  "<a href='".e_PLUGIN."download/download.php?view.".$dlrow['download_id']."'>".$tp->toHTML($dlrow['download_name'],TRUE,'LINKTEXT')."</a>";
    }
-   function get_download_list_author()
+   function sc_download_list_author()
    {
       global $dlrow;
       return $dlrow['download_author'];
    }
-   function get_download_list_requested()
+   function sc_download_list_requested()
    {
       global $dlrow;
       return $dlrow['download_requested'];
    }
-   function get_download_list_newicon()
+   function sc_download_list_newicon()
    {
       global $dlrow;
       return (USER && $dlrow['download_datestamp'] > USERLV ? "<img src='".IMAGE_NEW."' alt='*' style='vertical-align:middle' />" : "");
    }
-   function get_download_list_recenticon()
+   function sc_download_list_recenticon()
    {
       global $dlrow, $pref;
       // convert "recent_download_days" to seconds
       return ($dlrow['download_datestamp'] > time()-($pref['recent_download_days']*86400) ? '<img src="'.IMAGE_NEW.'" alt="" style="vertical-align:middle" />' : '');
    }
-   function get_download_list_filesize()
+   function sc_download_list_filesize()
    {
       global $dlrow, $e107;
       return $e107->parseMemorySize($dlrow['download_filesize']);
    }
-   function get_download_list_datestamp()
+   function sc_download_list_datestamp()
    {
       global $dlrow;
       $gen = new convert;
       return $gen->convert_date($dlrow['download_datestamp'], "short");
    }
-   function get_download_list_thumb()
+   function sc_download_list_thumb()
    {
       global $dlrow,$parm;
       $img = ($dlrow['download_thumb']) ? "<img src='".e_FILE."downloadthumbs/".$dlrow['download_thumb']."' alt='*' style='".DL_IMAGESTYLE."' />" : "";
@@ -181,12 +181,12 @@ class download_shortcodes
       	return $img;
       }
    }
-   function get_download_list_id()
+   function sc_download_list_id()
    {
       global $dlrow;
       return $dlrow['download_id'];
    }
-   function get_download_list_rating()
+   function sc_download_list_rating()
    {
       global $dlrow;
       $rater = new rater();
@@ -199,7 +199,7 @@ class download_shortcodes
      		return ($ratearray[2] ? "{$ratearray[1]}.{$ratearray[2]}/{$ratearray[0]}" : "{$ratearray[1]}/{$ratearray[0]}");
      	}
    }
-   function get_download_list_link()
+   function sc_download_list_link()
    {
       global $tp, $dlrow, $pref, $parm;
       $agreetext = $tp->toJS($tp->toHTML($pref['agree_text'],FALSE,'DESCRIPTION'));
@@ -214,7 +214,7 @@ class download_shortcodes
      		return ($pref['agree_flag'] ? "<a href='".e_BASE."request.php?".$dlrow['download_id']."' onclick= \"return confirm('{$agreetext}');\">{$img}</a>" : "<a href='".e_BASE."request.php?".$dlrow['download_id']."' >{$img}</a>");
      	}
    }
-   function get_download_list_icon()
+   function sc_download_list_icon()
    {
       global $dlrow,$parm;
       if ($parm == "link"){
@@ -226,36 +226,36 @@ class download_shortcodes
       }
       return;
    }
-   function get_download_list_nextprev()
+   function sc_download_list_nextprev()
    {
      	global $nextprev_parms,$tp;
      	return $tp->parseTemplate("{NEXTPREV={$nextprev_parms}}");
    }
-   function get_download_list_total_amount() {
+   function sc_download_list_total_amount() {
       global $dltdownloads;
       return $dltdownloads." ".LAN_dl_16;
    }
-   function get_download_list_total_files() {
+   function sc_download_list_total_files() {
       global $dlft;
       return $dlft." ".LAN_dl_17;
    }
 	// View ****************************************************************************************
-   function get_download_view_id()
+   function sc_download_view_id()
    {
       global $dlrow;
       return $dlrow['download_id'];
    }
-   function get_download_admin_edit()
+   function sc_download_admin_edit()
    {
       global $dlrow;
       return (ADMIN && getperms('6')) ? "<a href='".e_ADMIN."download.php?create.edit.".$dlrow['download_id']."' title='edit'><img src='".e_IMAGE."generic/lite/edit.png' alt='*' style='padding:0px;border:0px' /></a>" : "";
    }
-   function get_download_category()
+   function sc_download_category()
    {
       global $dlrow;
       return $dlrow['download_category_name'];
    }
-   function get_download_category_description()
+   function sc_download_category_description()
    {
       global $tp,$dl,$parm;
       $text = $tp -> toHTML($dl['download_category_description'], TRUE,'DESCRIPTION');
@@ -265,7 +265,7 @@ class download_shortcodes
       	return $text;
       }
    }
-   function get_download_view_name()
+   function sc_download_view_name()
    {
       global $dlrow,$parm;
       $link['view'] = "<a href='".e_PLUGIN."download/download.php?view.".$dlrow['download_id']."'>".$dlrow['download_name']."</a>";
@@ -275,7 +275,7 @@ class download_shortcodes
       }
       return $dlrow['download_name'];
    }
-   function get_download_view_name_linked()
+   function sc_download_view_name_linked()
    {
       global $pref,$dl,$tp;
       if ($pref['agree_flag'] == 1) {
@@ -284,22 +284,22 @@ class download_shortcodes
       	return "<a href='".e_BASE."request.php?".$dl['download_id']."' title='".LAN_dl_46."'>".$dl['download_name']."</a>";
       }
    }
-   function get_download_view_author()
+   function sc_download_view_author()
    {
       global $dlrow;
       return ($dlrow['download_author'] ? $dlrow['download_author'] : "");
    }
-   function get_download_view_authoremail()
+   function sc_download_view_authoremail()
    {
       global $tp,$dlrow;
       return ($dlrow['download_author_email']) ? $tp -> toHTML($dlrow['download_author_email'], TRUE, 'LINKTEXT') : "";
    }
-   function get_download_view_authorwebsite()
+   function sc_download_view_authorwebsite()
    {
       global $tp,$dlrow;
       return ($dlrow['download_author_website']) ? $tp -> toHTML($dlrow['download_author_website'], TRUE,'LINKTEXT') : "";
    }
-   function get_download_view_description()
+   function sc_download_view_description()
    {
       global $tp,$dlrow,$parm;
       $maxlen = ($parm ? intval($parm) : 0);
@@ -311,24 +311,24 @@ class download_shortcodes
       }
       return $text;
    }
-   function get_download_view_date()
+   function sc_download_view_date()
    {
       global $gen,$dlrow,$parm;
       return ($dlrow['download_datestamp']) ? $gen->convert_date($dlrow['download_datestamp'], $parm) : "";
    }
-   function get_download_view_date_short()
+   function sc_download_view_date_short()
    {
       // deprecated: DOWNLOAD_VIEW_DATE should be used instead.
       global $gen,$dlrow;
       return ($dlrow['download_datestamp']) ? $gen->convert_date($dlrow['download_datestamp'], "short") : "";
    }
-   function get_download_view_date_long()
+   function sc_download_view_date_long()
    {
       // deprecated: DOWNLOAD_VIEW_DATE should be used instead.
       global $gen,$dlrow;
       return ($dlrow['download_datestamp']) ? $gen->convert_date($dlrow['download_datestamp'], "long") : "";
    }
-   function get_download_view_image()
+   function sc_download_view_image()
    {
       global $dlrow;
       if ($dlrow['download_thumb']) {
@@ -342,12 +342,12 @@ class download_shortcodes
       	return LAN_dl_75;
       }
    }
-   function get_download_view_imagefull()
+   function sc_download_view_imagefull()
    {
       global $dlrow;
       return ($dlrow['download_image']) ? "<img class='dl_image' src='".e_FILE."downloadimages/".$dlrow['download_image']."' alt='*' style='".DL_IMAGESTYLE."' />" : "";
    }
-   function get_download_view_link()
+   function sc_download_view_link()
    {
       global $pref,$dlrow,$tp;
       $click = "";
@@ -371,12 +371,12 @@ class download_shortcodes
       	return $dnld_link." xxx<img src='".IMAGE_DOWNLOAD."' alt='*' style='border:0' /></a>";
       }
    }
-   function get_download_view_filesize()
+   function sc_download_view_filesize()
    {
       global $dlrow, $e107;
       return ($dlrow['download_filesize']) ? $e107->parseMemorySize($dlrow['download_filesize']) : "";
    }
-   function get_download_view_rating()
+   function sc_download_view_rating()
    {
       	require_once(e_HANDLER."rate_class.php");
       	$rater = new rater;
@@ -412,12 +412,12 @@ class download_shortcodes
       	$text .= "</td></tr></table>";
       return $text;
    }
-   function get_download_report_link()
+   function sc_download_report_link()
    {
       global $dlrow,$pref;
       return (check_class($pref['download_reportbroken'])) ? "<a href='".e_PLUGIN."download/download.php?report.".$dlrow['download_id']."'>".LAN_dl_45."</a>" : "";
    }
-   function get_download_view_caption()
+   function sc_download_view_caption()
    {
       global $dlrow;
      	$text = $dlrow['download_category_name'];
@@ -425,100 +425,100 @@ class download_shortcodes
       return $text;
    }
 	// Mirror **************************************************************************************
-	function get_download_mirror_request() {
+	function sc_download_mirror_request() {
 	   global $dlrow;
 	   return $dlrow['download_name'];
 	}
-	function get_download_mirror_request_icon() {
+	function sc_download_mirror_request_icon() {
 	   global $dlrow;
       return ($dlrow['download_thumb'] ? "<img src='".e_FILE."downloadthumbs/".$dlrow['download_thumb']."' alt='*'/>" : "");
 	}
-	function get_download_mirror_name() {
+	function sc_download_mirror_name() {
 	   global $dlmirror;
       return "<a href='{$dlmirror['mirror_url']}' rel='external'>".$dlmirror['mirror_name']."</a>";
 	}
-	function get_download_mirror_image() {
+	function sc_download_mirror_image() {
 	   global $dlrow, $dlmirror;
       return ($dlmirror['mirror_image'] ? "<a href='{$dlmirror['mirror_url']}' rel='external'><img src='".e_FILE."downloadimages/".$dlmirror['mirror_image']."' alt='*'/></a>" : "");
 	}
-	function get_download_mirror_location() {
+	function sc_download_mirror_location() {
 	   global $dlmirror;
       return ($dlmirror['mirror_location'] ? $dlmirror['mirror_location'] : "");
 	}
-	function get_download_mirror_description() {
+	function sc_download_mirror_description() {
 	   global $dlmirror,$tp;
       return ($dlmirror['mirror_description'] ? $tp->toHTML($dlmirror['mirror_description'], TRUE) : "");
 	}
-	function get_download_mirror_filesize() {
+	function sc_download_mirror_filesize() {
 	   global $e107, $dlmirrorfile;
       return $e107->parseMemorySize($dlmirrorfile[3]);
 	}
-	function get_download_mirror_link() {
+	function sc_download_mirror_link() {
 	   global $dlrow, $dlmirrorfile, $tp, $pref;
     	$click = " onclick='return confirm(\"".$tp->toJS($tp->toHTML($pref['agree_text'],FALSE,'DESCRIPTION'))."\")'";
       return "<a href='".e_PLUGIN."download/download.php?mirror.{$dlrow['download_id']}.{$dlmirrorfile[0]}' title='".LAN_dl_32."'{$click}>
               <img src='".IMAGE_DOWNLOAD."' alt='*' title='".LAN_dl_32."' /></a>";
 	}
-	function get_download_mirror_requests() {
+	function sc_download_mirror_requests() {
 	   global $dlmirrorfile;
       return (ADMIN ? LAN_dl_73.$dlmirrorfile[2] : "");
 	}
-	function get_download_total_mirror_requests() {
+	function sc_download_total_mirror_requests() {
 	   global $dlmirror;
 	   return (ADMIN ? LAN_dl_74.$dlmirror['mirror_count'] : "");
 	}
    // --------- Download View Lans -----------------------------
-   function get_download_view_author_lan()
+   function sc_download_view_author_lan()
    {
       global $dlrow;
       return ($dlrow['download_author']) ? LAN_dl_24 : "";
    }
-   function get_download_view_authoremail_lan()
+   function sc_download_view_authoremail_lan()
    {
       global $dlrow;
       return ($dlrow['download_author_email']) ? LAN_dl_30 : "";
    }
-   function get_download_view_authorwebsite_lan()
+   function sc_download_view_authorwebsite_lan()
    {
       global $dlrow;
       return ($dlrow['download_author_website']) ? LAN_dl_31 : "";
    }
-   function get_download_view_date_lan()
+   function sc_download_view_date_lan()
    {
       global $dlrow;
       return ($dlrow['download_datestamp']) ? LAN_dl_22 : "";
    }
-   function get_download_view_image_lan()
+   function sc_download_view_image_lan()
    {
       return LAN_dl_11;
    }
-   function get_download_view_requested()
+   function sc_download_view_requested()
    {
       global $dlrow;
       return $dlrow['download_requested'];
    }
-   function get_download_view_rating_lan()
+   function sc_download_view_rating_lan()
    {
       return LAN_dl_12;
    }
-   function get_download_view_filesize_lan()
+   function sc_download_view_filesize_lan()
    {
       return LAN_dl_10;
    }
-   function get_download_view_description_lan()
+   function sc_download_view_description_lan()
    {
       return LAN_dl_7;
    }
-   function get_download_view_requested_lan()
+   function sc_download_view_requested_lan()
    {
       return LAN_dl_77;
    }
-   function get_download_view_link_lan()
+   function sc_download_view_link_lan()
    {
       return LAN_dl_32;
    }
       //  -----------  Download View : Previous and Next  ---------------
-   function get_download_view_prev()
+   function sc_download_view_prev()
    {
       global $dlrow,$sql;
       	$dlrow_id = intval($dlrow['download_id']);
@@ -529,7 +529,7 @@ class download_shortcodes
       		return "&nbsp;";
       	}
    }
-   function get_download_view_next()
+   function sc_download_view_next()
    {
       global $dlrow,$sql;
       $dlrow_id = intval($dlrow['download_id']);
@@ -541,21 +541,21 @@ class download_shortcodes
       		return "&nbsp;";
       	}
    }
-   function get_download_back_to_list()
+   function sc_download_back_to_list()
    {
       global $dlrow;
       return "<a href='".e_PLUGIN."download/download.php?list.".$dlrow['download_category']."'>".LAN_dl_35."</a>";
    }
-   function get_download_back_to_category_list()
+   function sc_download_back_to_category_list()
    {
       	return "<a href='".e_SELF."'>".LAN_dl_9."</a>";
    }
    // Misc stuff ---------------------------------------------------------------------------------
-   function get_download_cat_newdownload_text()
+   function sc_download_cat_newdownload_text()
    {
       return "<img src='".IMAGE_NEW."' alt='*' style='vertical-align:middle' /> ".LAN_dl_36;
    }
-   function get_download_cat_search()
+   function sc_download_cat_search()
    {
       return "<form method='get' action='".e_BASE."search.php'>
       		  <p>
@@ -568,7 +568,7 @@ class download_shortcodes
 	/**
 	 * @private
 	 */
-	function _get_cat_icons($source, $count, $alt)
+	function _sc_cat_icons($source, $count, $alt)
 	{
 	   if (!$source) return "&nbsp;";
 	   list($ret[TRUE],$ret[FALSE]) = explode(chr(1), $source.chr(1));

e107_plugins/forum/forum_post_shortcodes.php

@@ -14,7 +14,7 @@ class forum_post_shortcodes
 		$this->e107 = e107::getInstance();
 	}
 	
-	function get_latestposts($parm)
+	function sc_latestposts($parm)
 	{
 		$parm = ($parm ? $parm : 10);
 		global $LATESTPOSTS_START, $LATESTPOSTS_END, $LATESTPOSTS_POST;
@@ -33,7 +33,7 @@ class forum_post_shortcodes
 		return $txt;
 	}
 
-	function get_threadtopic()
+	function sc_threadtopic()
 	{
 		global $THREADTOPIC_REPLY;
 		$tmp = $this->forum->postGet($this->threadInfo['thread_id'], 0, 1);
@@ -41,40 +41,40 @@ class forum_post_shortcodes
 		return $this->e107->tp->parseTemplate($THREADTOPIC_REPLY, true);
 	}
 
-	function get_formstart()
+	function sc_formstart()
 	{
 		return "<form enctype='multipart/form-data' method='post' action='".e_SELF.'?'.e_QUERY."' id='dataform'>";
 	}
 	
-	function get_formend()
+	function sc_formend()
 	{
 	return '</form>';
 	}
 
-	function get_forumjump()
+	function sc_forumjump()
 	{
 		return forumjump();
 	}
 	
-	function get_userbox()
+	function sc_userbox()
 	{
 		global $userbox;
 		return (USER == false ? $userbox : '');
 	}
 	
-	function get_subjectbox()
+	function sc_subjectbox()
 	{
 		global $subjectbox, $action;
 		return ($action == 'nt' ? $subjectbox : '');
 	}
 	
-	function get_posttype()
+	function sc_posttype()
 	{
 		global $action;
 		return ($action == 'nt' ? LAN_63 : LAN_73);
 	}
 	
-	function get_postbox()
+	function sc_postbox()
 	{
 		global $post, $pref;
 		$rows = (e_WYSIWYG) ? 15 : 10;
@@ -86,7 +86,7 @@ class forum_post_shortcodes
 		return $ret;
 	}
 	
-	function get_buttons()
+	function sc_buttons()
 	{
 		global $action, $eaction;
 		$ret = "<input class='button' type='submit' name='fpreview' value='".LAN_323."' /> ";
@@ -101,7 +101,7 @@ class forum_post_shortcodes
 		return $ret;
 	}
 	
-	function get_fileattach()
+	function sc_fileattach()
 	{
 		global $pref, $fileattach, $fileattach_alert;
 
@@ -126,7 +126,7 @@ class forum_post_shortcodes
 		}
 	}
 	
-	function get_postthreadas()
+	function sc_postthreadas()
 	{
 		global $action, $thread_info;
 		if (MODERATOR && $action == "nt")
@@ -137,20 +137,20 @@ class forum_post_shortcodes
 		return '';
 	}
 	
-	function get_backlink()
+	function sc_backlink()
 	{
 		global $forum, $thread_info,$eaction, $action,$BREADCRUMB;
 		$forum->set_crumb(TRUE,($action == "nt" ? ($eaction ? LAN_77 : LAN_60) : ($eaction ? LAN_78 : LAN_406." ".$thread_info['head']['thread_name'])));
 		return $BREADCRUMB;
 	}
 	
-	function get_noemotes()
+	function sc_noemotes()
 	{
 		if($eaction == true) { return ; }
 		return "<input type='checkbox' name='no_emote' value='1' />&nbsp;<span class='defaulttext'>".LAN_FORUMPOST_EMOTES.'</span>';
 	}
 	
-	function get_emailnotify()
+	function sc_emailnotify()
 	{
 		global $pref, $thread_info, $action, $eaction;
 		if($eaction == true) { return ; }
@@ -176,7 +176,7 @@ class forum_post_shortcodes
 		return '';
 	}
 	
-	function get_poll()
+	function sc_poll()
 	{
 		global $poll_form, $action, $pref;
 		if ($action == 'nt' && check_class($pref['forum_poll']) && strpos(e_QUERY, 'edit') === false)

e107_plugins/forum/forum_shortcodes.php

@@ -18,12 +18,12 @@ class forum_shortcodes
 		$this->postInfo = array();
 	}
 
-	function get_top()
+	function sc_top()
 	{
 		return "<a href='".e_SELF.'?'.e_QUERY."#top' onclick=\"window.scrollTo(0,0);\">".LAN_10.'</a>';
 	}
 
-	function get_joined()
+	function sc_joined()
 	{
 		global $gen;
 		if ($this->postInfo['post_user'])
@@ -32,19 +32,19 @@ class forum_shortcodes
 		}
 	}
 
-	function get_threaddatestamp()
+	function sc_threaddatestamp()
 	{
 		global $gen;
 		return "<a id='post_{$this->post_info['post_id']}' href='".$this->e107->url->getUrl('forum', 'thread', array('func' => 'post', 'id' => $this->postInfo['post_id']))."'>".IMAGE_post."</a> ".$gen->convert_date($this->postInfo['post_datestamp'], 'forum');
 	}
 
-	function get_post()
+	function sc_post()
 	{
 		$emote = (isset($this->postInfo['post_options']['no_emote']) ? ',emotes_off' : '');
 		return $this->e107->tp->toHTML($this->postInfo['post_entry'], true, 'USER_BODY'.$emote, 'class:'.$this->postInfo['user_class']);
 	}
 
-	function get_postdeleted()
+	function sc_postdeleted()
 	{
 		if($this->postInfo['post_status'])
 		{
@@ -57,7 +57,7 @@ class forum_shortcodes
 		}
 	}
 
-	function get_attachments()
+	function sc_attachments()
 	{
 		if($this->postInfo['post_attachments'])
 		{
@@ -89,7 +89,7 @@ class forum_shortcodes
 
 	}
 
-	function get_privmessage()
+	function sc_privmessage()
 	{
 		if(plugInstalled('pm') && ($this->postInfo['post_user'] > 0))
 		{
@@ -97,7 +97,7 @@ class forum_shortcodes
 		}
 	}
 
-	function get_avatar()
+	function sc_avatar()
 	{
 		if ($this->postInfo['post_user'])
 		{
@@ -120,7 +120,7 @@ class forum_shortcodes
 
 	}
 
-	function get_anon_ip()
+	function sc_anon_ip()
 	{
 		if($this->postInfo['post_user_anon'] && (ADMIN || MODERATOR))
 		{
@@ -128,7 +128,7 @@ class forum_shortcodes
 		}
 	}
 
-	function get_ip()
+	function sc_ip()
 	{
 		if((ADMIN || MODERATOR) && !$this->postInfo['user_admin'])
 		{
@@ -137,7 +137,7 @@ class forum_shortcodes
 
 	}
 
-	function get_poster()
+	function sc_poster()
 	{
 		if($this->postInfo['user_name'])
 		{
@@ -150,7 +150,7 @@ class forum_shortcodes
 
 	}
 
-	function get_emailimg()
+	function sc_emailimg()
 	{
 		if($this->postInfo['user_name'])
 		{
@@ -160,7 +160,7 @@ class forum_shortcodes
 
 	}
 
-	function get_emailitem()
+	function sc_emailitem()
 	{
 		if($this->postInfo['thread_start'])
 		{
@@ -168,7 +168,7 @@ class forum_shortcodes
 		}
 	}
 
-	function get_printitem()
+	function sc_printitem()
 	{
 		if($this->postInfo['thread_start'])
 		{
@@ -176,7 +176,7 @@ class forum_shortcodes
 		}
 	}
 
-	function get_signature()
+	function sc_signature()
 	{
 		if(!USER) { return ''; }
 		global $pref;
@@ -191,7 +191,7 @@ class forum_shortcodes
 
 	}
 
-	function get_profileimg()
+	function sc_profileimg()
 	{
 		if (USER && $this->postInfo['user_name'])
 		{
@@ -199,7 +199,7 @@ class forum_shortcodes
 		}
 	}
 
-	function get_posts()
+	function sc_posts()
 	{
 		if ($this->postInfo['post_user'])
 		{
@@ -207,7 +207,7 @@ class forum_shortcodes
 		}
 	}
 
-	function get_visits()
+	function sc_visits()
 	{
 		if ($this->postInfo['user_name'])
 		{
@@ -215,7 +215,7 @@ class forum_shortcodes
 		}
 	}
 
-	function get_customtitle()
+	function sc_customtitle()
 	{
 		if ($this->postInfo['user_customtitle'])
 		{
@@ -223,14 +223,14 @@ class forum_shortcodes
 		}
 	}
 
-	function get_website()
+	function sc_website()
 	{
 		if ($this->postInfo['user_homepage']) {
 			return LAN_08.': '.$this->postInfo['user_homepage'].'<br />';
 		}
 	}
 
-	function get_websiteimg()
+	function sc_websiteimg()
 	{
 		if ($this->postInfo['user_homepage'] && $this->postInfo['user_homepage'] != 'http://')
 		{
@@ -238,7 +238,7 @@ class forum_shortcodes
 		}
 	}
 
-	function get_editimg()
+	function sc_editimg()
 	{
 		if (USER && $this->postInfo['post_user'] == USERID && $this->thread->threadInfo['thread_active'])
 		{
@@ -246,7 +246,7 @@ class forum_shortcodes
 		}
 	}
 
-	function get_quoteimg()
+	function sc_quoteimg()
 	{
 		if($this->forum->checkperm($this->postInfo['post_forum'], 'post'))
 		{
@@ -254,7 +254,7 @@ class forum_shortcodes
 		}
 	}
 
-	function get_reportimg()
+	function sc_reportimg()
 	{
 		global $page;
 		if (USER) {
@@ -262,18 +262,18 @@ class forum_shortcodes
 		}
 	}
 
-	function get_rpg()
+	function sc_rpg()
 	{
 		return rpg($this->postInfo['user_join'], $this->postInfo['user_plugin_forum_posts']);
 	}
 
-	function get_memberid()
+	function sc_memberid()
 	{
 		if (!$this->postInfo['post_user']) { return FALSE; }
 		return "<span class='smalltext'>".LAN_195.' #'.$this->postInfo['post_user'].'</span>';
 	}
 
-	function get_level($parm)
+	function sc_level($parm)
 	{
 		global $pref;
 		if (!$this->postInfo['post_user']) { return ''; }
@@ -285,7 +285,7 @@ class forum_shortcodes
 		{
 			
 			case 'userid' :
-				return $this->get_memberid();
+				return $this->sc_memberid();
 				break;
 				
 			case 'special':
@@ -303,7 +303,7 @@ class forum_shortcodes
 		}
 	}
 
-	function get_modoptions()
+	function sc_modoptions()
 	{
 		if (MODERATOR)
 		{
@@ -311,7 +311,7 @@ class forum_shortcodes
 		}
 	}
 
-	function get_lastedit()
+	function sc_lastedit()
 	{
 		global $gen;
 		if ($this->postInfo['post_edit_datestamp'])
@@ -320,7 +320,7 @@ class forum_shortcodes
 		}
 	}
 
-	function get_lasteditby()
+	function sc_lasteditby()
 	{
 		if(isset($this->postInfo['edit_name']))
 		{
@@ -334,13 +334,13 @@ class forum_shortcodes
 		}
 	}
 
-	function get_poll()
+	function sc_poll()
 	{
 		global $pollstr;
 		return $pollstr;
 	}
 
-	function get_newflag()
+	function sc_newflag()
 	{
 		// Defined in case an indicator is required
 		return '';

e107_plugins/list_new/list_shortcodes.php

@@ -9,9 +9,9 @@
  * List Shortcodes
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/list_new/list_shortcodes.php,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
- * $Date: 2009-01-28 08:47:37 $
+ * $Date: 2009-07-21 07:10:24 $
- * $Author: lisa_ $
+ * $Author: e107coders $
  *
 */
 
@@ -41,63 +41,63 @@ class list_shortcodes
 		$e107->tp->e_sc->scClasses['list_shortcodes']->list_pref = $rc->list_pref;
 	}
 
-	function get_list_date()
+	function sc_list_date()
 	{
 		return $this->e107->tp->toHTML($this->row['date'], true, "");
 	}
 
-	function get_list_icon()
+	function sc_list_icon()
 	{
 		return $this->e107->tp->toHTML($this->row['icon'], true, "");
 	}
 
-	function get_list_heading()
+	function sc_list_heading()
 	{
 		return $this->e107->tp->toHTML($this->row['heading'], true, "TITLE");
 	}
 
-	function get_list_author()
+	function sc_list_author()
 	{
 		return $this->e107->tp->toHTML($this->row['author'], true, "");
 	}
 
-	function get_list_category()
+	function sc_list_category()
 	{
 		return $this->e107->tp->toHTML($this->row['category'], true, "");
 	}
 
-	function get_list_info()
+	function sc_list_info()
 	{
 		return $this->e107->tp->toHTML($this->row['info'], true, "");
 	}
 
-	function get_list_caption()
+	function sc_list_caption()
 	{
 		return $this->e107->tp->toHTML($this->rc->data['caption'], true, "");
 	}
 
-	function get_list_displaystyle()
+	function sc_list_displaystyle()
 	{
 		//open sections if content exists ? yes if true, else use individual setting of section
 		return (varsettrue($this->list_pref[$this->rc->mode."_openifrecords"]) && is_array($this->rc->data['records']) ? "" : $this->rc->data['display']);
 	}
 
-	function get_list_col_cols()
+	function sc_list_col_cols()
 	{
 		return $this->list_pref[$this->rc->mode."_colomn"];
 	}
 
-	function get_list_col_welcometext()
+	function sc_list_col_welcometext()
 	{
 		return $this->e107->tp->toHTML($this->list_pref[$this->rc->mode."_welcometext"], true, "");
 	}
 
-	function get_list_col_cellwidth()
+	function sc_list_col_cellwidth()
 	{
 		return round((100/$this->list_pref[$this->rc->mode."_colomn"]),0);
 	}
 
-	function get_list_timelapse()
+	function sc_list_timelapse()
 	{
 		return $this->row['timelapse'];
 	}

e107_plugins/login_menu/config.php

@@ -9,8 +9,8 @@
  * Plugin Administration - Login menu
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/config.php,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
- * $Date: 2009-07-12 14:44:57 $
+ * $Date: 2009-07-21 07:10:25 $
  * $Author: e107coders $
  *
 */
@@ -84,7 +84,7 @@ if ($_POST['update_menu'])
 $text = '
 	<div style="text-align:center">
 	<form action="'.e_SELF.'" method="post">
-	<table style="width:85%;" class="fborder" >
+	<table class="fborder" >
 	
     '.login_menu_class::render_config_links().'
     

e107_plugins/tagwords/tagwords_shortcodes.php

@@ -9,9 +9,9 @@
  * Tagwords Shortcodes
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/tagwords/tagwords_shortcodes.php,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
- * $Date: 2009-05-10 10:50:28 $
+ * $Date: 2009-07-21 07:10:25 $
- * $Author: bugrain $
+ * $Author: e107coders $
  *
 */
 if (!defined('e107_INIT')) { exit; }
@@ -26,9 +26,9 @@ $codes = array();
 $tmp = get_class_methods('tagwords_shortcodes');
 foreach($tmp as $c)
 {
-	if(strpos($c, 'get_') === 0)
+	if(strpos($c, 'ax_') === 0)
 	{
-		$codes[] = substr($c, 4);
+		$codes[] = substr($c, 3);
 	}
 }
 register_shortcode('tagwords_shortcodes', $codes);
@@ -44,7 +44,7 @@ class tagwords_shortcodes
 		$this->e107 = e107::getInstance();
 	}
 
-	function get_tag_search($parm, $sc_mode)
+	function sc_tag_search($parm, $sc_mode)
 	{
 		global $tag;
 
@@ -94,13 +94,13 @@ class tagwords_shortcodes
 		}
 	}
 
-	function get_tag_area_heading()
+	function sc_tag_area_heading()
 	{
 		global $tag;
 		return varsettrue($tag->area->settings['caption']);
 	}
 
-	function get_tag_link($parm, $sc_mode)
+	function sc_tag_link($parm, $sc_mode)
 	{
 		global $tag;
 		switch($sc_mode)
@@ -120,7 +120,7 @@ class tagwords_shortcodes
 		}
 	}
 
-	function get_tag_cloud($parm, $sc_mode)
+	function sc_tag_cloud($parm, $sc_mode)
 	{
 		global $tag;
 		switch($sc_mode)
@@ -137,7 +137,7 @@ class tagwords_shortcodes
 		}
 	}
 
-	function get_tag_word($parm, $sc_mode)
+	function sc_tag_word($parm, $sc_mode)
 	{
 		global $tag;
 		switch($sc_mode)
@@ -152,7 +152,7 @@ class tagwords_shortcodes
 		}
 	}
 
-	function get_tag_number($parm, $sc_mode)
+	function sc_tag_number($parm, $sc_mode)
 	{
 		global $tag;
 		switch($sc_mode)
@@ -175,7 +175,7 @@ class tagwords_shortcodes
 		}
 	}
 
-	function get_tag_sort()
+	function sc_tag_sort()
 	{
 		global $tag;
 
@@ -206,7 +206,7 @@ class tagwords_shortcodes
 		return;
 	}
 
-	function get_tag_type()
+	function sc_tag_type()
 	{
 		global $tag;
 
@@ -237,7 +237,7 @@ class tagwords_shortcodes
 		return;
 	}
 
-	function get_tag_area()
+	function sc_tag_area()
 	{
 		global $tag;
 		if(varsettrue($tag->pref['tagwords_view_area'])==1)
@@ -261,12 +261,12 @@ class tagwords_shortcodes
 		return;
 	}
 
-	function get_tag_button()
+	function sc_tag_button()
 	{
 		return "<input class='button' type='submit' name='so' value='".LAN_TAG_SEARCH_3."' />";
 	}
 
-	function get_tag_options()
+	function sc_tag_options()
 	{
 		global $tag;
 		if( varsettrue($tag->pref['tagwords_view_search'])==1 || varsettrue($tag->pref['tagwords_view_sort'])==1 || varsettrue($tag->pref['tagwords_view_style'])==1 || varsettrue($tag->pref['tagwords_view_area'])==1 )
@@ -277,21 +277,21 @@ class tagwords_shortcodes
 
 	//##### ADMIN OPTIONS -------------------------
 
-	function get_tag_opt_min($parm, $sc_mode)
+	function sc_tag_opt_min($parm, $sc_mode)
 	{
 		global $tag;
 		$id = ($sc_mode=='menu' ? 'tagwords_menu_min' : 'tagwords_min');
 		return "<input class='tbox' type='text' id='".$id."' name='".$id."' value='".$tag->pref[$id]."' size='3' maxlength='3' />";
 	}
 
-	function get_tag_opt_class()
+	function sc_tag_opt_class()
 	{
 		global $tag;
 		$id = 'tagwords_class';
 		return r_userclass($id,$tag->pref[$id],"","admin,public,guest,nobody,member,classes");
 	}
 
-	function get_tag_opt_default_sort($parm, $sc_mode)
+	function sc_tag_opt_default_sort($parm, $sc_mode)
 	{
 		global $tag;
 		$id = ($sc_mode=='menu' ? 'tagwords_menu_default_sort' : 'tagwords_default_sort');
@@ -299,7 +299,7 @@ class tagwords_shortcodes
 		<label><input type='radio' name='".$id."' value='0' ".($tag->pref[$id] ? "" : "checked='checked'")." /> ".LAN_TAG_OPT_6."</label>";
 	}
 
-	function get_tag_opt_default_style()
+	function sc_tag_opt_default_style()
 	{
 		global $tag;
 		$id = 'tagwords_default_style';
@@ -307,7 +307,7 @@ class tagwords_shortcodes
 		<label><input type='radio' name='".$id."' value='0' ".($tag->pref[$id] ? "" : "checked='checked'")." /> ".LAN_TAG_OPT_9."</label>";
 	}
 
-	function get_tag_opt_view_sort()
+	function sc_tag_opt_view_sort()
 	{
 		global $tag;
 		$id = 'tagwords_view_sort';
@@ -318,7 +318,7 @@ class tagwords_shortcodes
 		</label>";
 	}
 
-	function get_tag_opt_view_style()
+	function sc_tag_opt_view_style()
 	{
 		global $tag;
 		$id = 'tagwords_view_style';
@@ -329,7 +329,7 @@ class tagwords_shortcodes
 		</label>";
 	}
 
-	function get_tag_opt_view_area()
+	function sc_tag_opt_view_area()
 	{
 		global $tag;
 		$id = 'tagwords_view_area';
@@ -340,7 +340,7 @@ class tagwords_shortcodes
 		</label>";
 	}
 
-	function get_tag_opt_view_search($parm, $sc_mode)
+	function sc_tag_opt_view_search($parm, $sc_mode)
 	{
 		global $tag;
 		$id = ($sc_mode=='menu' ? 'tagwords_menu_view_search' : 'tagwords_view_search');
@@ -351,7 +351,7 @@ class tagwords_shortcodes
 		</label>";
 	}
 
-	function get_tag_opt_view_freq($parm, $sc_mode)
+	function sc_tag_opt_view_freq($parm, $sc_mode)
 	{
 		global $tag;
 		if($sc_mode=='menu')
@@ -369,21 +369,21 @@ class tagwords_shortcodes
 		</label>";
 	}
 
-	function get_tag_opt_caption()
+	function sc_tag_opt_caption()
 	{
 		global $tag;
 		$id = 'tagwords_menu_caption';
 		return "<input class='tbox' type='text' id='".$id."' name='".$id."' value='".$this->e107->tp->toForm($tag->pref[$id],"","defs")."' size='30' maxlength='100' />";
 	}
 
-	function get_tag_opt_seperator()
+	function sc_tag_opt_seperator()
 	{
 		global $tag;
 		$id = 'tagwords_word_seperator';
 		return "<input class='tbox' type='text' id='".$id."' name='".$id."' value='".$this->e107->tp->toForm($tag->pref[$id])."' size='3' maxlength='10' />";
 	}
 
-	function get_tag_opt_activeareas()
+	function sc_tag_opt_activeareas()
 	{
 		global $tag;
 		$id = 'tagwords_activeareas';
@@ -403,7 +403,7 @@ class tagwords_shortcodes
 		return $text;
 	}
 
-	function get_tag_opt_button()
+	function sc_tag_opt_button()
 	{
 		return "<input class='button' type='submit' name='updatesettings' value='".LAN_UPDATE."' />";
 	}