Core template path changes.

2025-08-29 01:00:20 +02:00 · 2013-03-20 23:50:30 -07:00
parent 0ba11945ab
commit 59a6edb4e4
22 changed files with 560 additions and 547 deletions
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -99,6 +99,9 @@ class admin_shortcodes
 		if (ADMIN)
 		{
 			global $e_sub_cat, $e_icon_array, $PLUGINS_DIRECTORY;
+			
+			$e_icon_array = e107::getNav()->getIconArray();
+			
 			if (e_CURRENT_PLUGIN)
 			{
 				$eplug_icon = '';
--- a/e107_core/shortcodes/single/search.sc
+++ b/e107_core/shortcodes/single/search.sc
@@ -1,12 +1,17 @@
+//<?
 global $sql,$sysprefs,$SEARCH_SHORTCODE;

 include_lan(e_PLUGIN."search_menu/languages/".e_LANGUAGE.".php");
 $text = "";
-if (!isset($SEARCH_SHORTCODE)) {
-	if (file_exists(THEME."search_template.php")) {
+if (!isset($SEARCH_SHORTCODE)) 
+{
+	if (file_exists(THEME."search_template.php")) 
+	{
 			include(THEME."search_template.php");
-	} else {
-	  		include(e_THEME."templates/search_template.php");
+	} 
+	else 
+	{
+	  		include(e_CORE."templates/search_template.php");
 	}
 }
 	$ref['all'] = 'all';
--- a/e107_core/templates/admin_template.php
+++ b/e107_core/templates/admin_template.php
@@ -0,0 +1,54 @@
+<?php
+/*
+ * e107 website system
+ *
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_themes/templates/admin_template.php,v $
+ * $Revision$
+ * $Date$
+ * $Author$
+ */
+
+if (!defined('e107_INIT')) { exit; }
+
+$ADMIN_HEADER = "<div style='text-align:center'>
+{ADMIN_LOGO}
+<br />
+{ADMIN_LOGGED}
+{ADMIN_SEL_LAN}
+</div>
+<table style='width:100%' cellspacing='10' cellpadding='10'>
+<tr>
+<td style='width:17%; vertical-align: top;'>
+{ADMIN_NAV}
+{ADMIN_LANG}
+{ADMIN_PWORD}
+{ADMIN_STATUS=request}
+{ADMIN_LATEST=request}
+{ADMIN_LOG=request}
+{ADMIN_HELP}
+{ADMIN_MSG}
+{ADMIN_PLUGINS}
+</td>
+<td style='width:62%; vertical-align: top;'>
+";
+
+$ADMIN_FOOTER = "</td>
+<td style='width:17%; vertical-align:top'>
+{ADMIN_MENU}
+{ADMIN_PRESET}
+{ADMIN_UPDATE}
+{ADMIN_SITEINFO}
+{ADMIN_DOCS}
+</td>
+</tr>
+</table>
+{ADMIN_CREDITS}
+";
+
+?>
--- a/e107_core/templates/bbcode_template.php
+++ b/e107_core/templates/bbcode_template.php
@@ -0,0 +1,99 @@
+<?php
+/*
+ * e107 website system
+ *
+ * Copyright (C) e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * $URL$
+ * $Id$
+ */
+
+// How to register your own BBcode button.
+// Uncomment the 2 commented lines below to see it in action. (only applies to the user area)
+
+// $register_bb['blank'] = array("", "[blank][/blank]","Blank example helper text",e_IMAGE."bbcode/template.png");
+// Simplified default bbcode bar - removed P, H, BR and NOBR bbcodes
+
+
+// This is used on the front-end. ie. comments etc. 
+$BBCODE_TEMPLATE = "
+	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=justify}{BB=center}{BB=left}{BB=right}
+	{BB=bq}{BB=list}{BB=emotes}
+	<div class='field-spacer'><!-- --></div>
+";
+
+$BBCODE_TEMPLATE_COMMENT = ""; // no buttons on comments by default. 
+
+// $BBCODE_TEMPLATE .= "{BB=blank}";
+
+$BBCODE_TEMPLATE_SIGNATURE = "
+	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=justify}{BB=center}{BB=left}{BB=right}
+	{BB=bq}{BB=list}
+	<div class='field-spacer'><!-- --></div>
+";
+
+
+
+
+// $sc_style['BB_HELP']['pre'] = "<div style='text-align:center'>";
+// $sc_style['BB_HELP']['post'] = "</div>";
+
+$BBCODE_TEMPLATE_SUBMITNEWS = "
+	
+	{BB_HELP}
+	<div class='field-spacer'><!-- --></div>
+    {BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=justify}{BB=center}{BB=left}{BB=right}
+	{BB=bq}{BB=list}{BB=nobr}{BB=br}{BB=fontcol}{BB=fontsize}{BB=emotes}{BB=flash}{BB=youtube}
+	<div class='field-spacer'><!-- --></div>
+";
+
+
+// --------   Admin Templates ----------------------
+
+$BBCODE_TEMPLATE_ADMIN = "
+	{BB_HELP=admin}
+	<div class='field-spacer'><!-- --></div>
+	<div class='btn-group inline-text'>
+	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=format}{BB=justify}{BB=center}{BB=left}
+	{BB=right}{BB=bq}{BB=list}{BB=table}{BB=fontcol}{BB=fontsize}{BB=emotes}
+	{BB_PREIMAGEDIR}
+	{BB=preimage}{BB=prefile}{BB=flash}{BB=youtube}
+	</div>
+	<div class='field-spacer'><!-- --></div>
+";
+
+$BBCODE_TEMPLATE_MAILOUT = "
+	{BB_HELP=admin}
+	<div class='field-spacer'><!-- --></div>
+	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=justify}{BB=center}{BB=left}
+	{BB=right}{BB=bq}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes}
+	{BB_PREIMAGEDIR}
+	{BB=preimage}{BB=prefile}{BB=flash}{BB=shortcode}
+	<div class='field-spacer'><!-- --></div>
+";
+
+// $BBCODE_TEMPLATE_ADMIN .= "{BB=blank}";
+
+$BBCODE_TEMPLATE_NEWSPOST = "
+	{BB_HELP=$mode}
+	<div class='field-spacer'><!-- --></div>
+	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=format}{BB=justify}{BB=center}{BB=left}
+	{BB=right}{BB=bq}{BB=list}{BB=table}{BB=fontcol}{BB=fontsize}{BB=emotes}
+	{BB_PREIMAGEDIR=news}
+	{BB=preimage}{BB=prefile}{BB=flash}{BB=youtube}
+	<div class='field-spacer'><!-- --></div>
+";
+
+$BBCODE_TEMPLATE_CPAGE = "
+	{BB_HELP}
+	<div class='field-spacer'><!-- --></div>
+	{BB=newpage}
+	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=format}{BB=justify}{BB=center}{BB=left}{BB=right}
+	{BB=bq}{BB=list}{BB=table}{BB=fontcol}{BB=fontsize}{BB=emotes}
+	{BB_PREIMAGEDIR=page}
+	{BB=preimage}{BB=prefile}{BB=flash}{BB=youtube}
+	<div class='field-spacer'><!-- --></div>
+";
+?>
--- a/e107_core/templates/email_template.php
+++ b/e107_core/templates/email_template.php
@@ -0,0 +1,319 @@
+<?php
+/*
+ * e107 website system
+ *
+ * Copyright (C) 2008-2013 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * Templates for all emails
+ *
+ * $URL: $
+ * $Revision: 11315 $
+ * $Id: $
+ */
+
+/**
+ * 
+ *	@package     e107
+ *	@subpackage	e107_templates
+ *	@version 	$Id: mail_manager_class.php 11315 2010-02-10 18:18:01Z secretr $;
+ *
+*/
+
+
+/**
+ *	This file defines the default templates for each type of email which may be sent.
+ *	In general it is assumed that HTML emails are being sent (with a plain text alternate part), although simple plain text emails are also possible.
+ *
+ *	Default values are defined for the key elements of an email:
+ *
+ *	$EMAIL_HEADER - the first part of the email, usually defining the headers, and everything up to and including <body>
+ *	$EMAIL_FOOTER - the last part of the email - it may include a displayed footer, as well as </body> and other 'closing' tags
+ *
+ *		Taken as a pair, $EMAIL_HEADER.$EMAIL_FOOTER must generate standards-compliant XHTML
+ *
+ *	$EMAIL_BODY - the body text of the email - essentially, the message. It gets sandwiched between $EMAIL_HEADER and $EMAIL_FOOTER
+ *		This must generate standards-compliant XHTML in its own right, when taken with an appropriate header and footer section.
+ *		Within the template definition, insert the shortcode '{BODY}' to indicate where the passed text of the email is to be stored.
+ *
+ *	$EMAIL_OVERRIDES may optionally be defined, in which case it can override default mailout settings (see later). Only define this variable
+ *		if you explicitly want overrides - a defined, but empty, variable may have unexpected consequences!
+ *
+ *	$EMAIL_PLAINTEXT - an alternative template for the alternative text part of HTML emails. Set to empty string if hard-coded default to be used
+ *
+ *
+ *	Templates may be defined for specific purposes
+ *	Each template is given a name, which is the name of the variable.
+ *	This variable may be a simple string, in which case it defines the email body, and is only available via code.
+ *	Alternatively the variable may be an array, in which case each element of the array defines a different aspect of the email:
+ *
+ *		$NAME['template_name'] is a user-friendly name shown in the mass mailer
+ *		$NAME['template_type'] takes values (user|system|all) to define its purpose - only 'user' and 'all' templates are shown in the mass mailer
+ *		$NAME['email_header'] defines the header - optional
+ *		$NAME['email_footer'] defines the footer - optional
+ *		$NAME['email_body'] defines the body text
+ *		$NAME['email_overrides'] defines any mailout settings which are to be overridden (see later) - optional
+ *
+ *		The format and functionality of these four main array elements correspond exactly to those of the defaults already described.
+ *
+ *		The template need only define those variables which are to be overridden, in which case the default definitions will be used for the others.
+ *
+ *
+ *	For templated HTML emails, a style sheet MUST be specified in the header field (if its required), in one of the following forms:
+ *
+ *		{STYLESHEET}				- embeds the stylesheet for the current site theme
+ *		{STYLESHEET=filename,link}	- embeds a link to the referenced stylesheet file
+ *		{STYLESHEET=filename}		- embeds the contents of the specified file
+ *		{STYLESHEET=filename,embed} - embeds the contents of the specified file
+ *
+ *
+ *	Where no style sheet is specified for an HTML-format email, the following applies:
+ *		If 'emailstyle.css' exists in the current theme directory, it is used
+ *		otherwise, the theme's 'style.css' is used
+ *
+ * The override variable is an array, which can override any of the following mailer parameters:
+'mailer', 'smtp_server', 'smtp_username', 'smtp_password', 'sendmail', 'siteadminemail', 'siteadmin', 'smtp_pop3auth',
+'SMTPDebug', 'subject', 'from', 'fromname', 'replyto', 'send_html', 'add_html_header', 'attachments', 'cc', 'bcc', 
+'bouncepath', 'returnreceipt', 'priority', 'extra_header', 'wordwrap', 'split'
+
+See e_HANDLER.mail.php for more information
+ */
+
+if (!defined('e107_INIT')) { exit; }
+
+
+// @TODO: Move signup email into templated form
+$includeSiteButton = e107::getPref('sitebutton');
+
+
+$SIGNUPEMAIL_SUBJECT = LAN_SIGNUP_96.' {SITENAME}';
+$SIGNUPEMAIL_USETHEME = 1; 			// Use CSS STYLE from THEME: 0 = Off, 1 = external, 2 = embedded
+$SIGNUPEMAIL_LINKSTYLE = ''; 		// css to use on links eg. color:red;
+//$SIGNUPEMAIL_IMAGES =  e_IMAGE.$includeSiteButton; // comma separated paths to image to embed. referenced below with {IMAGE1} (IMAGE2} etc.  Not required
+$SIGNUPEMAIL_CC = "";  				// comma separated email addresses to put in CC of the signup email.
+$SIGNUPEMAIL_BCC = "";   			// comma separated email addresses to put in BCC of the signup email.
+$SIGNUPEMAIL_ATTACHMENTS = ""; 		// files-path array of attachments. eg. array(e_FILE."myfile.zip",e_FILE."myotherfile.zip");
+$SIGNUPEMAIL_BACKGROUNDIMAGE = "";	// absolute path to a background image eg. e_IMAGE."mybackground.jpg";
+
+
+
+/*===========================================================================
+				DEFAULT EMAIL TEMPLATE VALUES
+=============================================================================*/
+/**
+These defaults are used if not overridden by the requirements for a specific template.
+
+There are five defaults, which must exist, and must be named as follows:
+	$EMAIL_OVERRIDES - array of override settings; e.g. for mail server to use
+	$EMAIL_HEADER - string for the first part of an HTML email
+	$EMAIL_BODY - the 'body' text (usually a default here is meaningless!)
+	$EMAIL_FOOTER - a standard footer - could include a disclaimer, a link to the site
+	$EMAIL_PLAINTEXT - an alternative template for the alternative text part of HTML emails (if empty, alternate text is
+							derived from the HTLM body.
+
+In most cases only the body will be overridden; in this case it can be overridden using a variable rather than an array.
+*/
+/*
+Optional mailer admin preferences Override. The following mailer parameters can be overridden:
+'mailer', 'smtp_server', 'smtp_username', 'smtp_password', 'sendmail', 'siteadminemail', 'siteadmin', 'smtp_pop3auth',
+'SMTPDebug', 'subject', 'from', 'fromname', 'replyto', 'send_html', 'add_html_header', 'attachments', 'cc', 'bcc', 
+'bouncepath', 'returnreceipt', 'priority', 'extra_header', 'wordwrap', 'split'
+
+See e_HANDLER.mail.php for more information
+
+If required, uncomment the following block and add array elements for options to be overridden - array key is the option name
+DON'T put in empty fields unless you wish to set the value to an empty value! 	*/
+/*
+$EMAIL_OVERRIDES = array(
+	'bouncepath' => 'some email address',
+	'returnreceipt' => 1
+);
+*/
+
+// Not used in signup email
+$EMAIL_HEADER = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
+<html xmlns='http://www.w3.org/1999/xhtml' >
+<head>
+<meta http-equiv='content-type' content='text/html; charset=utf-8' />
+{STYLESHEET}
+</head>
+<body>
+<div style='padding:10px'>
+";
+
+
+$EMAIL_BODY = 'Software malfunction - no email body text specified for template';		// Help debug
+
+// Not used in signup email
+$EMAIL_FOOTER = "
+<br /><br />
+{SITENAME=link}
+</div>
+</body>
+</html>";
+
+
+$EMAIL_PLAINTEXT = '';
+
+/*===========================================================================
+				TEMPLATES FOR SPECIFIC EMAIL TYPES
+=============================================================================*/
+
+/**
+Each template is an array whose name must match that used in the code.
+The array has two mandatory elements (name and type).
+The array may have up to five optional elements, each of which overrides the corresponding default value if present
+An empty element sets the field to empty.
+An element that is not present results in the default being used.
+
+Elements are as follows:
+	'template_name'		- string - mandatory - a 'user-friendly' name for display
+	'template_type'		- string(user|system|all) - mandatory - 'all' and 'user' templates are available for selection in the bulk mailer
+	'email_overrides'	- an array
+	'email_header'		- string
+	'email_body'		- string
+	'email_footer'		- string
+	'email_plainText'	- string
+
+// If everything is standard apart from the body, the body can be defined as a simple variable
+
+*/
+//TODO - integrate into mailout routine
+/*
+$MAILOUT_HEADER = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
+<html xmlns='http://www.w3.org/1999/xhtml' >
+<head>
+<meta http-equiv='content-type' content='text/html; charset=utf-8' />
+{STYLESHEET}
+</head>
+<body>
+<div style='padding:10px'>
+";
+
+$MAILOUT_FOOTER = "
+<br /><br />
+{SITENAME=link}
+</div>
+</body>
+</html>";
+
+
+
+*/
+
+
+//-------------------------------------------------------------
+//		'SIGNUP' TEMPLATE
+//-------------------------------------------------------------
+
+$SIGNUPEMAIL_TEMPLATE = "
+<div style='padding:10px'>
+<div style='text-align:left; width:90%'>
+".LAN_EMAIL_01." {USERNAME},<br />
+<br />".
+LAN_SIGNUP_97." {SITENAME}<br />
+".LAN_SIGNUP_21."<br />
+<br />
+{ACTIVATION_LINK}<br />
+<br />
+".LAN_SIGNUP_59."<br />
+<br />
+".LAN_SIGNUP_18."<br />
+<br />
+".LAN_LOGINNAME.": <b> {LOGINNAME} </b><br />
+".LAN_PASSWORD.": <b> {PASSWORD} </b><br />
+<br />
+".LAN_EMAIL_04."<br />
+".LAN_EMAIL_05."<br />
+<br />
+".LAN_EMAIL_06."<br />
+<br />
+{SITENAME}<br />
+{SITEURL}
+<br /><br />".($includeSiteButton ? "<a href='".SITEURL."' title=''><img src='".e_IMAGE_ABS.str_replace('{e_IMAGE}', '', $includeSiteButton)."' alt='' /></a>" : '')."
+</div>
+</div>
+";
+
+//-------------------------------------------------------------
+//		'NOTIFY' TEMPLATE
+//-------------------------------------------------------------
+$NOTIFY_TEMPLATE = array(
+	'template_name' => 'Notify',
+	'template_type' => 'system',
+	'email_overrides' => '',
+	'email_header' => "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">
+		<html xmlns='http://www.w3.org/1999/xhtml' >
+		<head>
+		<meta http-equiv='content-type' content='text/html; charset=utf-8' />
+		</head>
+		<body>
+		<div style='padding:0px 10px'>
+		",
+	'email_body' => '{BODY}',
+	'email_footer' => "<br /><br />
+		{SITENAME=link}
+		</div>
+		</body>
+		</html>",
+	'email_plainText' => ''
+	);
+
+
+//-------------------------------------------------------------
+//		USER-DEFINED TEMPLATES (for mass mailouts)
+//-------------------------------------------------------------
+/*
+$TEST_TEMPLATE = array(
+	'template_name' => 'TEst1',
+	'template_type' => 'system',
+	'email_overrides' => '',
+//	'email_header' - any header information (usually loaded from the default)
+	'email_body' => '{BODY}',
+	'email_footer' => 'footer',
+	'email_plainText' => ''
+	);
+$TEST2_TEMPLATE = array(
+	'template_name' => 'TEst2',
+	'template_type' => 'all',
+	'email_overrides' => '',
+//	'email_header' - any header information (usually loaded from the default)
+	'email_body' => '{BODY}',
+	'email_footer' => 'footer'
+	);
+$TEST3_TEMPLATE = array(
+	'template_name' => 'TEst4',
+	'template_type' => 'user',
+	'email_overrides' => '',
+//	'email_header' - any header information (usually loaded from the default)
+	'email_body' => '{BODY}',
+	'email_footer' => 'footer'
+	);
+$TEST4_TEMPLATE = array(
+	'template_name' => 'TEst5',
+	'email_overrides' => '',
+//	'email_header' - any header information (usually loaded from the default)
+	'email_body' => '{BODY}',
+	'email_footer' => 'footer'
+	);
+	*/
+$WHATSNEW_TEMPLATE = array(
+	'template_name' => 'WhatsNew',
+	'template_type' => 'user',
+	'email_overrides' => '',
+//	'email_header' - any header information (usually loaded from the default)
+	'email_body' => 'All the latest news and updates.<br />{BODY}<br />To find out more, simply click on the links!',
+//	'email_footer' => 'footer'
+	);
+$MONTHLYUPDATE_TEMPLATE = array(
+	'template_name' => 'MonthlyUpdate',
+	'template_type' => 'user',
+	'email_overrides' => '',
+//	'email_header' - any header information (usually loaded from the default)
+	'email_body' => 'Just to keep you up to date, here\'s a reminder of what\'s changed in the past month.<br />
+	{BODY}<br />To find out more, simply click on the links!',
+//	'email_footer' => 'footer'
+	);
+
+?>
--- a/e107_core/templates/online_template.php
+++ b/e107_core/templates/online_template.php
@@ -0,0 +1,45 @@
+<?php
+
+if (!defined('e107_INIT')) { exit; }
+if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:96%"); }
+
+// ##### ONLINE TABLE -----------------------------------------------------------------------------
+if(!isset($ONLINE_TABLE_START))
+{
+	$ONLINE_TABLE_START = "
+		<div style='text-align:center'>
+		<table class='table fborder' style='".USER_WIDTH."'>
+		<tr>
+			<td class='forumheader' style='width:3%'>&nbsp;</td>
+			<td class='forumheader' style='width:43%'>".ONLINE_EL10."</td>
+			<td class='forumheader' style='width:50%'>".ONLINE_EL11."</td>
+		</tr>";
+}
+if(!isset($ONLINE_TABLE))
+{
+	$ONLINE_TABLE = "
+		<tr>
+			<td class='forumheader3' style='width:3%;text-align:center'>{ONLINE_TABLE_ICON}</td>
+			<td class='forumheader3' style='width:45%'>{ONLINE_TABLE_USERNAME}</td>
+			<td class='forumheader3' style='width:50%'>{ONLINE_TABLE_LOCATION}<br /></td>
+		</tr>";
+}
+if(!isset($ONLINE_TABLE_END))
+{
+	$ONLINE_TABLE_END = "
+		</table>
+		</div>
+		<br />";
+}
+if (!isset($ONLINE_TABLE_MISC))
+{
+  $ONLINE_TABLE_MISC = ONLINE_EL1.GUESTS_ONLINE.",
+		".ONLINE_EL2.MEMBERS_ONLINE." ...<br />
+		<br />{ONLINE_TABLE_MOST_EVER_ONLINE}
+		<br />({ONLINE_TABLE_MOST_MEMBERS_ONLINE}, {ONLINE_TABLE_MOST_GUESTS_ONLINE}) ".ONLINE_EL9." {ONLINE_TABLE_DATESTAMP}<br />
+		{ONLINE_TABLE_MEMBERS_TOTAL}{ONLINE_TABLE_MEMBERS_NEWEST}";
+}
+// ##### ------------------------------------------------------------------------------------------
+
+
+?>
--- a/e107_core/templates/search_template.php
+++ b/e107_core/templates/search_template.php
@@ -0,0 +1,111 @@
+<?php
+
+if (!defined('e107_INIT')) { exit; }
+if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:95%"); }
+/*
+if (!defined('SEARCH_SHORTCODE_REF')) {
+	define('SEARCH_SHORTCODE_REF',"");
+}
+*/
+
+
+if (!isset($SEARCH_SHORTCODE)) {
+
+	$SEARCH_SHORTCODE = "<input class='tbox search' type='text' name='q' size='20' value='' maxlength='50' />
+	<input class='btn button search' type='submit' name='s' value=\"".LAN_180."\" />";
+
+	/*  // Image Version Example
+	$SEARCH_SHORTCODE = "<input class='tbox search' type='text' name='q' size='20' value='Default Value' maxlength='50' onclick=\"this.value=''\" />
+	<input type='image' name='s' src='".e_PLUGIN_ABS."search_menu/images/search.png'  value='".LAN_180."' style='width: 16px; height: 16px; border: 0px; vertical-align: middle'  />";
+    */
+}
+
+
+
+
+if (!isset($SEARCH_TOP_TABLE)) {
+	$SEARCH_TOP_TABLE = "<div style='text-align: center'>
+	<form id='searchform' method='get' action='".e_SELF."'>
+	<table style='".USER_WIDTH."' class='table fborder'><tr>
+	<td class='forumheader3' style='width: 40%'>".LAN_199."</td>
+	<td class='forumheader3' style='width: 60%; white-space: nowrap'>
+	{SEARCH_MAIN_SEARCHFIELD}&nbsp;{SEARCH_MAIN_SUBMIT}&nbsp;{ENHANCED_ICON}
+	</td>
+	</tr>";
+}
+
+if (!isset($SEARCH_ENHANCED)) {
+	$SEARCH_ENHANCED = "<tr id='{ENHANCED_DISPLAY_ID}' {ENHANCED_DISPLAY}>
+	<td class='forumheader3' style='width: 40%; white-space: nowrap'>{ENHANCED_TEXT}</td>
+	<td class='forumheader3' style='width: 60%; white-space: nowrap'>
+	{ENHANCED_FIELD}
+	</td>
+	</tr>";
+}
+
+if (!isset($SEARCH_CATS)) {
+	$SEARCH_CATS = "<tr>
+	<td style='width:30%' class='forumheader3'>".LAN_SEARCH_19."<br />
+	{SEARCH_MAIN_CHECKALL} {SEARCH_MAIN_UNCHECKALL}
+	</td>
+	<td style='width:70%' class='forumheader3'>
+	{SEARCH_MAIN_CHECKBOXES}{SEARCH_DROPDOWN}&nbsp;{SEARCH_ADVANCED}
+	<br />
+	</td>
+	</tr>";
+}
+
+if (!isset($SEARCH_TYPE)) {
+	$SEARCH_TYPE = "<tr id='advanced_type' {SEARCH_TYPE_DISPLAY}>
+	<td style='width:30%' class='forumheader3'>".LAN_SEARCH_75.":</td>
+	<td style='width:70%' class='forumheader3'>
+	{SEARCH_TYPE_SEL}
+	<br />
+	</td>
+	</tr>";
+}
+
+if (!isset($SEARCH_ADV)) {
+	$SEARCH_ADV = "<tr>
+	<td class='forumheader3'>
+	{SEARCH_ADV_A}
+	</td>
+	<td class='forumheader3'>
+	{SEARCH_ADV_B}
+	</td>
+	</tr>";
+}
+
+if (!isset($SEARCH_ADV_COMBO)) {
+	$SEARCH_ADV_COMBO = "<tr>
+	<td class='forumheader3' colspan='2'>
+	{SEARCH_ADV_TEXT}
+	</td>
+	</tr>";
+}
+
+if (!isset($SEARCH_TABLE_MSG)) {
+	$SEARCH_TABLE_MSG = "<tr>
+	<td class='forumheader3' style='text-align: center' colspan='2'>
+	{SEARCH_MESSAGE}
+	</td>
+	</tr>";
+}
+
+if (!isset($SEARCH_BOT_TABLE)) {
+	$SEARCH_BOT_TABLE = "<tr style='display: none !important; display: visible'>
+	<td style='display: none' colspan='2'></td>
+	</tr></table>
+	</form>
+	</div>";
+}
+
+if (!isset($PRE_CHECKBOXES)) {
+	$PRE_CHECKBOXES = "<span style='white-space: nowrap; padding-bottom: 7px; padding-top: 7px'>";	/* string thats printed before each category checkbox */
+}
+
+if (!isset($POST_CHECKBOXES)) {
+	$POST_CHECKBOXES = "</span>";	/* string thats printed after each category checkbox */
+}
+
+?>
--- a/e107_core/templates/trackback_template.php
+++ b/e107_core/templates/trackback_template.php
@@ -0,0 +1,12 @@
+<?php
+
+if (!defined('e107_INIT')) { exit; }
+
+$TRACKBACK = "
+<div class='fcaption'>{TITLE}</div>
+{EXCERPT}<br />From: {BLOGNAME}<br /><br />
+";
+
+$TRACKBACK_RENDER_METHOD = TRUE;			/* TRUE=tablerender, FALSE=echo */
+
+?>
--- a/e107_core/templates/userposts_template.php
+++ b/e107_core/templates/userposts_template.php
@@ -0,0 +1,101 @@
+<?php
+/*
+ * e107 website system
+ *
+ * Copyright (C) 2008-2011 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * User posts page template
+ *
+ * $URL$
+ * $Id$
+ */
+
+if (!defined('e107_INIT')) { exit; }
+
+if (!defined("USER_WIDTH")){ define("USER_WIDTH", "width:95%"); }
+
+$USERPOSTS_TEMPLATE['np_table'] = "<p class='nextprev'>{USERPOSTS_NEXTPREV}</p>";
+$USERPOSTS_NP_TABLE = $USERPOSTS_TEMPLATE['np_table']; // BC, will be removed
+
+// $USERPOSTS_NP_TABLE = "<div class='nextprev'>{USERPOSTS_NEXTPREV}</div>";
+
+// ##### USERPOSTS_COMMENTS TABLE -----------------------------------------------------------------
+	$USERPOSTS_TEMPLATE['comments_table_start'] = "
+	<div id='up-comments-container'>
+		{NEXTPREV}
+		<table class='table fborder up-comments' id='up-comments'>
+	";
+	$USERPOSTS_COMMENTS_TABLE_START = $USERPOSTS_TEMPLATE['comments_table_start']; // BC, will be removed
+
+	$USERPOSTS_TEMPLATE['comments_table'] = "
+		<tr>
+			<td class='fcaption'>
+				{USERPOSTS_COMMENTS_HREF_PRE}<b>{USERPOSTS_COMMENTS_HEADING}</b></a>
+				<span class='smalltext'>{USERPOSTS_COMMENTS_DATESTAMP} ({USERPOSTS_COMMENTS_TYPE})</span>
+			</td>
+		</tr>
+		<tr>
+			<td class='forumheader3'>
+				{USERPOSTS_COMMENTS_COMMENT}&nbsp;
+			</td>
+		</tr>
+	";
+	$USERPOSTS_COMMENTS_TABLE = $USERPOSTS_TEMPLATE['comments_table']; // BC, will be removed
+
+	$USERPOSTS_TEMPLATE['comments_table_end'] = "
+		</table>
+		{NEXTPREV}
+	</div>";
+	$USERPOSTS_COMMENTS_TABLE_END =  $USERPOSTS_TEMPLATE['comments_table'];
+
+	$USERPOSTS_TEMPLATE['comments_table_empty'] = "
+		<tr>
+			<td class='forumheader3'>
+				<span class='mediumtext'>".UP_LAN_7."</span>
+			</td>
+		</tr>
+	";
+
+// ##### ------------------------------------------------------------------------------------------
+
+// ##### USERPOSTS FORUM TABLE --------------------------------------------------------------------
+	// additional shortcodes available:
+	// {USERPOSTS_FORUM_SEARCH_FIELD}, {USERPOSTS_FORUM_SEARCH_BUTTON}
+	$USERPOSTS_TEMPLATE['forum_table_start'] = "
+	<div style='text-align:center'>
+		{NEXTPREV}
+		<form method='post' action='".e_REQUEST_URL."'>
+		<table class='table fborder up-forum' id='up-forum'>
+	";
+	$USERPOSTS_FORUM_TABLE_START = $USERPOSTS_TEMPLATE['forum_table_start']; // BC, will be removed
+
+	$USERPOSTS_TEMPLATE['forum_table'] = "
+			<tr>
+				<td class='fcaption'>
+					{USERPOSTS_FORUM_TOPIC_HREF_PRE}<b>{USERPOSTS_FORUM_TOPIC_PRE} {USERPOSTS_FORUM_TOPIC}</b></a>
+					<span class='smalltext'>({USERPOSTS_FORUM_NAME_HREF_PRE}<b>{USERPOSTS_FORUM_NAME}</b></a>)</span>
+					<span class='smalltext'>{USERPOSTS_FORUM_DATESTAMP}</span>
+				</td>
+			</tr>
+			<tr>
+				<td class='forumheader3'>
+					{USERPOSTS_FORUM_THREAD}
+				</td>
+			</tr>
+	";
+	$USERPOSTS_FORUM_TABLE = $USERPOSTS_TEMPLATE['forum_table']; // BC, will be removed
+
+	$USERPOSTS_TEMPLATE['forum_table_end'] = "
+			<tr>
+				<td class='forumheader' style='text-align:right'>
+					{USERPOSTS_FORUM_SEARCH}
+				</td>
+			</tr>
+		</table>
+		</form>
+		{NEXTPREV}
+	</div>
+	";
+	$USERPOSTS_FORUM_TABLE_END = $USERPOSTS_TEMPLATE['forum_table_end']; // BC, will be removed