From f30caaf18b4d9dab1bb6e7f68e9a0d850defbc5a Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 23 Feb 2021 12:58:51 -0800 Subject: [PATCH] Removed some LAN constant usage from core templates. --- e107_core/shortcodes/single/lan.php | 4 + .../templates/bootstrap4/user_template.php | 28 +++---- .../bootstrap4/usersettings_template.php | 26 +++--- e107_core/templates/login_template.php | 79 +------------------ e107_core/templates/search_template.php | 6 +- e107_core/templates/signup_template.php | 25 +++--- e107_core/templates/user_template.php | 28 +++---- e107_core/templates/usersettings_template.php | 26 +++--- .../shortcodes/batch/viewforum_shortcodes.php | 25 +++++- .../forum/templates/forum_post_template.php | 14 ++-- .../forum/templates/forum_posted_template.php | 36 ++++----- .../forum/templates/forum_template.php | 20 ++--- .../templates/forum_viewforum_template.php | 58 +++++++------- .../templates/forum_viewtopic_template.php | 6 +- .../templates/newforumposts_menu_template.php | 16 ++-- .../news/templates/news_grid_template.php | 8 +- .../news/templates/news_menu_template.php | 4 +- e107_plugins/news/templates/news_template.php | 2 +- 18 files changed, 178 insertions(+), 233 deletions(-) diff --git a/e107_core/shortcodes/single/lan.php b/e107_core/shortcodes/single/lan.php index 1baa5d6f1..ee701316b 100644 --- a/e107_core/shortcodes/single/lan.php +++ b/e107_core/shortcodes/single/lan.php @@ -13,6 +13,10 @@ function lan_shortcode($parm = '') { return constant($lan); } + elseif(defined('LAN_'.$lan)) + { + return constant('LAN_'.$lan); + } elseif(ADMIN) { return "".$parm ." is undefined"; // debug info diff --git a/e107_core/templates/bootstrap4/user_template.php b/e107_core/templates/bootstrap4/user_template.php index c37102262..7ddd56e0a 100644 --- a/e107_core/templates/bootstrap4/user_template.php +++ b/e107_core/templates/bootstrap4/user_template.php @@ -43,12 +43,12 @@ if (!defined('e107_INIT')) { exit; } $USER_TEMPLATE['list']['start'] = "
-
".LAN_USER_56." {TOTAL_USERS} +
{LAN=USER_56} {TOTAL_USERS}

{USER_FORM_START}
- ".LAN_SHOW.": {USER_FORM_RECORDS} ".LAN_USER_57." {USER_FORM_ORDER} + {LAN=SHOW}: {USER_FORM_RECORDS} {LAN=USER_57} {USER_FORM_ORDER} {USER_FORM_SUBMIT}
{USER_FORM_END} @@ -59,9 +59,9 @@ if (!defined('e107_INIT')) { exit; }   - ".LAN_USER_58." - ".LAN_USER_60." - ".LAN_USER_59." + {LAN=USER_58} + {LAN=USER_60} + {LAN=USER_59} @@ -86,7 +86,7 @@ if (!defined('e107_INIT')) { exit; } // View shortcode wrappers. - $USER_WRAPPER['view']['USER_COMMENTPOSTS'] = '
'.LAN_USER_68.'
{---}'; + $USER_WRAPPER['view']['USER_COMMENTPOSTS'] = '
{LAN=USER_68}
{---}'; $USER_WRAPPER['view']['USER_COMMENTPER'] = ' ( {---}% )
'; $USER_WRAPPER['view']['USER_SIGNATURE'] = '
{---}
'; $USER_WRAPPER['view']['USER_RATING'] = '
{---}
'; @@ -100,7 +100,7 @@ if (!defined('e107_INIT')) { exit; }
-
'.LAN_USER_58.' {USER_ID}
+
{LAN=USER_58} {USER_ID}
{SETIMAGE: w=200&h=200&crop=1} @@ -113,13 +113,13 @@ if (!defined('e107_INIT')) { exit; }
-
'.LAN_USER_63.'
{USER_REALNAME}
-
'.LAN_USER_02.'
{USER_LOGINNAME}
-
'.LAN_USER_60.'
{USER_EMAIL}
-
'.LAN_USER_54.'
{USER_LEVEL}
-
'.LAN_USER_65.'
{USER_LASTVISIT}
{USER_LASTVISIT_LAPSE}
-
'.LAN_USER_59.'
{USER_JOIN}
{USER_DAYSREGGED}
-
'.LAN_USER_66.'
{USER_VISITS}
+
{LAN=USER_63}
{USER_REALNAME}
+
{LAN=USER_02}
{USER_LOGINNAME}
+
{LAN=USER_60}
{USER_EMAIL}
+
{LAN=USER_54}
{USER_LEVEL}
+
{LAN=USER_65}
{USER_LASTVISIT}
{USER_LASTVISIT_LAPSE}
+
{LAN=USER_59}
{USER_JOIN}
{USER_DAYSREGGED}
+
{LAN=USER_66}
{USER_VISITS}
{USER_ADDONS}
{USER_COMMENTPOSTS} {USER_COMMENTPER}
{USER_EXTENDED_ALL} diff --git a/e107_core/templates/bootstrap4/usersettings_template.php b/e107_core/templates/bootstrap4/usersettings_template.php index 2a6270d91..fe5586307 100644 --- a/e107_core/templates/bootstrap4/usersettings_template.php +++ b/e107_core/templates/bootstrap4/usersettings_template.php @@ -21,54 +21,54 @@ if (!defined('e107_INIT')) { exit; } $USERSETTINGS_WRAPPER = array(); $USERSETTINGS_WRAPPER['edit']['USERNAME'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['LOGINNAME'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['PASSWORD1'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['PASSWORD2'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['REALNAME'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['CUSTOMTITLE'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['USERCLASSES'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['AVATAR_UPLOAD'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['PHOTO_UPLOAD'] = "
- +
{---}
"; @@ -76,7 +76,7 @@ $USERSETTINGS_WRAPPER['edit']['PHOTO_UPLOAD'] = "
+
{---}
"; @@ -101,7 +101,7 @@ $USERSETTINGS_TEMPLATE['edit'] = "
- +
{EMAIL}
@@ -117,14 +117,14 @@ $USERSETTINGS_TEMPLATE['edit'] = "
- +
{HIDEEMAIL=radio}
- +
{AVATAR_REMOTE}
diff --git a/e107_core/templates/login_template.php b/e107_core/templates/login_template.php index dc374a13e..8a7f3d8cb 100644 --- a/e107_core/templates/login_template.php +++ b/e107_core/templates/login_template.php @@ -2,83 +2,6 @@ // $Id$ if (!defined('e107_INIT')) { exit; } -/* -// ##### LOGIN HEADER TABLE ----------------------------------------------------------------------- -if(!isset($LOGIN_TABLE_HEADER)) //FIXME - use {LOGO} . -{ - $LOGIN_TABLE_HEADER .= " -

-
- {LOGO=login}"; -} - -// ##### LOGIN TABLE ----------------------------------------------------------------------------- -if(!isset($LOGIN_TABLE)) -{ - $LOGIN_TABLE = ""; - if($LOGIN_TABLE_LOGINMESSAGE != "") - { - $LOGIN_TABLE .= "
{LOGIN_TABLE_LOGINMESSAGE}
"; - } - - if (($pref['user_tracking'] == "session") && varset($pref['password_CHAP'],0)) - { - if ($pref['password_CHAP'] == 2) - { - $LOGIN_TABLE .= " -
"."Javascript must be enabled in your browser if you wish to log into this site"." -
- "; -} -// ##### ------------------------------------------------------------------------------------------*/ - // Starter for v2. - Bootstrap @@ -90,7 +13,7 @@ $LOGIN_TEMPLATE['page']['header'] = " $LOGIN_TEMPLATE['page']['body'] = ' {LOGIN_TABLE_LOGINMESSAGE} - '; + '; if (e107::pref('core', 'password_CHAP') == 2) { $LOGIN_TEMPLATE['page']['body'] .= " diff --git a/e107_core/templates/search_template.php b/e107_core/templates/search_template.php index fd16d9d68..ae7425591 100644 --- a/e107_core/templates/search_template.php +++ b/e107_core/templates/search_template.php @@ -137,7 +137,7 @@ if(!isset($POST_CHECKBOXES)) $SEARCH_TEMPLATE['form']['start'] = '
- +
{SEARCH_MAIN}
@@ -170,7 +170,7 @@ $SEARCH_TEMPLATE['form']['enhanced'] = ' /* $SEARCH_TEMPLATE['form']['type'] = '
- +
{SEARCH_TYPE_SEL}
@@ -179,7 +179,7 @@ $SEARCH_TEMPLATE['form']['type'] = ' $SEARCH_TEMPLATE['form']['category'] = '
- +
{SEARCH_MAIN_CHECKBOXES}{SEARCH_DROPDOWN} 
diff --git a/e107_core/templates/signup_template.php b/e107_core/templates/signup_template.php index 6d7a53ee6..a3c959246 100755 --- a/e107_core/templates/signup_template.php +++ b/e107_core/templates/signup_template.php @@ -22,13 +22,12 @@ if(!defined('e107_INIT')) // Shortcode Wrappers $SIGNUP_WRAPPER['SIGNUP_DISPLAYNAME'] = "
- +
{---}
"; $SIGNUP_WRAPPER['SIGNUP_REALNAME'] = "
- +
{---}
"; @@ -36,50 +35,50 @@ $SIGNUP_WRAPPER['SIGNUP_GDPR_INFO'] = "
+
{---}
"; $SIGNUP_WRAPPER['SIGNUP_IMAGES'] = "
- +
{---}
"; $SIGNUP_WRAPPER['SIGNUP_IMAGECODE'] = "
- +
{---}
"; $SIGNUP_WRAPPER['SIGNUP_LOGINNAME'] = "
- +
{---}
"; $SIGNUP_WRAPPER['SIGNUP_HIDE_EMAIL'] = "
- +
{---}
"; $SIGNUP_WRAPPER['SIGNUP_EMAIL_CONFIRM'] = "
- +
{---}
"; $SIGNUP_WRAPPER['SIGNUP_XUP'] = "
{---} -
"; +
"; $SIGNUP_WRAPPER['SIGNUP_PASSWORD1'] = "
- +
{---}
"; $SIGNUP_WRAPPER['SIGNUP_PASSWORD2'] = "
- +
{---}
"; $SIGNUP_WRAPPER['SIGNUP_USERCLASS_SUBSCRIBE'] = "
- +
{---}
"; diff --git a/e107_core/templates/user_template.php b/e107_core/templates/user_template.php index 2484b56c7..4035a932b 100644 --- a/e107_core/templates/user_template.php +++ b/e107_core/templates/user_template.php @@ -43,12 +43,12 @@ if (!defined('e107_INIT')) { exit; } $USER_TEMPLATE['list']['start'] = "
-
".LAN_USER_56." {TOTAL_USERS} +
{LAN=USER_56} {TOTAL_USERS}

{USER_FORM_START}
- ".LAN_SHOW.": {USER_FORM_RECORDS} ".LAN_USER_57." {USER_FORM_ORDER} + {LAN=SHOW}: {USER_FORM_RECORDS} {LAN=USER_57} {USER_FORM_ORDER} {USER_FORM_SUBMIT}
{USER_FORM_END} @@ -59,9 +59,9 @@ if (!defined('e107_INIT')) { exit; }   - ".LAN_USER_58." - ".LAN_USER_60." - ".LAN_USER_59." + {LAN=USER_58} + {LAN=USER_60} + {LAN=USER_59} @@ -86,7 +86,7 @@ if (!defined('e107_INIT')) { exit; } // View shortcode wrappers. - $USER_WRAPPER['view']['USER_COMMENTPOSTS'] = '
'.LAN_USER_68.'
{---}'; + $USER_WRAPPER['view']['USER_COMMENTPOSTS'] = '
{LAN=USER_68}
{---}'; $USER_WRAPPER['view']['USER_COMMENTPER'] = ' ( {---}% )
'; $USER_WRAPPER['view']['USER_SIGNATURE'] = '
{---}
'; $USER_WRAPPER['view']['USER_RATING'] = '
{---}
'; @@ -100,7 +100,7 @@ if (!defined('e107_INIT')) { exit; }
-
'.LAN_USER_58.' {USER_ID}
+
{LAN=USER_58} {USER_ID}
{SETIMAGE: w=200&h=200&crop=1} @@ -113,13 +113,13 @@ if (!defined('e107_INIT')) { exit; }
-
'.LAN_USER_63.'
{USER_REALNAME}
-
'.LAN_USER_02.'
{USER_LOGINNAME}
-
'.LAN_USER_60.'
{USER_EMAIL}
-
'.LAN_USER_54.'
{USER_LEVEL}
-
'.LAN_USER_65.'
{USER_LASTVISIT}
{USER_LASTVISIT_LAPSE}
-
'.LAN_USER_59.'
{USER_JOIN}
{USER_DAYSREGGED}
-
'.LAN_USER_66.'
{USER_VISITS}
+
{LAN=USER_63}
{USER_REALNAME}
+
{LAN=USER_02}
{USER_LOGINNAME}
+
{LAN=USER_60}
{USER_EMAIL}
+
{LAN=USER_54}
{USER_LEVEL}
+
{LAN=USER_65}
{USER_LASTVISIT}
{USER_LASTVISIT_LAPSE}
+
{LAN=USER_59}
{USER_JOIN}
{USER_DAYSREGGED}
+
{LAN=USER_66}
{USER_VISITS}
{USER_ADDONS}
{USER_COMMENTPOSTS} {USER_COMMENTPER}
{USER_EXTENDED_ALL} diff --git a/e107_core/templates/usersettings_template.php b/e107_core/templates/usersettings_template.php index db493d267..040a4b751 100755 --- a/e107_core/templates/usersettings_template.php +++ b/e107_core/templates/usersettings_template.php @@ -22,54 +22,54 @@ if (!defined('e107_INIT')) { exit; } // e107 v2. bootstrap3 compatible template. $USERSETTINGS_WRAPPER['edit']['USERNAME'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['LOGINNAME'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['PASSWORD1'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['PASSWORD2'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['REALNAME'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['CUSTOMTITLE'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['USERCLASSES'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['AVATAR_UPLOAD'] = "
- +
{---}
"; $USERSETTINGS_WRAPPER['edit']['PHOTO_UPLOAD'] = "
- +
{---}
"; @@ -77,7 +77,7 @@ $USERSETTINGS_WRAPPER['edit']['PHOTO_UPLOAD'] = "
$USERSETTINGS_WRAPPER['edit']['SIGNATURE'] = "
- +
{---}
"; @@ -96,7 +96,7 @@ $USERSETTINGS_TEMPLATE['edit'] = " {USERNAME} {LOGINNAME}
- +
{EMAIL}
@@ -111,14 +111,14 @@ $USERSETTINGS_TEMPLATE['edit'] = " {PASSWORD2}
- +
{HIDEEMAIL=radio}
- +
{AVATAR_REMOTE}
diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php index 0bf6d978d..c7934e2f9 100644 --- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php @@ -209,7 +209,7 @@ { $FORUM_VIEWFORUM_TEMPLATE = varset($GLOBALS['FORUM_VIEWFORUM_TEMPLATE']); - return (defset('BOOTSTRAP') && !empty($FORUM_VIEWFORUM_TEMPLATE['iconkey'])) ? e107::getParser()->parseTemplate($FORUM_VIEWFORUM_TEMPLATE['iconkey'], true) : " + return (defset('BOOTSTRAP') && !empty($FORUM_VIEWFORUM_TEMPLATE['iconkey'])) ? e107::getParser()->parseTemplate($FORUM_VIEWFORUM_TEMPLATE['iconkey'], true, $this) : " @@ -806,9 +806,28 @@ return $this->gen->computeLapse($this->var['thread_datestamp'], time(), false, false, 'short'); // convert_date($thread_info['thread_datestamp'], 'forum'); } - - function sc_icon() + private function keyIcon($parm) { + $size = 'small'; + + if(!empty($parm['type'])) + { + return deftrue('IMAGE_'.$parm['type'].'_'.$size); + } + } + + + function sc_icon($parm) + { + + if(!empty($parm)) + { + return $this->keyIcon($parm); + } + + + + global $forum; // global $forum, $FORUM_VIEW_FORUM, $FORUM_VIEW_FORUM_STICKY, $FORUM_VIEW_FORUM_ANNOUNCE, $gen, $menu_pref, //$threadsViewed = $forum->threadGetUserViewed(); diff --git a/e107_plugins/forum/templates/forum_post_template.php b/e107_plugins/forum/templates/forum_post_template.php index faf8c055d..1a1ee4433 100644 --- a/e107_plugins/forum/templates/forum_post_template.php +++ b/e107_plugins/forum/templates/forum_post_template.php @@ -19,17 +19,17 @@ $FORUM_POST_TEMPLATE['form'] = "
{FORUM_POST_BREADCRUMB}
-
- +
+
{FORUM_POST_AUTHOR}
-
- +
+
{FORUM_POST_SUBJECT}
-
+
{FORUM_POST_TEXTAREA} @@ -37,12 +37,12 @@ $FORUM_POST_TEMPLATE['form'] = "
-
+
{FORUM_POST_OPTIONS}
-
+
{FORUM_POST_BUTTONS}
{FORUM_POST_FORM_END} diff --git a/e107_plugins/forum/templates/forum_posted_template.php b/e107_plugins/forum/templates/forum_posted_template.php index ab2e3149e..aa0b29b4d 100644 --- a/e107_plugins/forum/templates/forum_posted_template.php +++ b/e107_plugins/forum/templates/forum_posted_template.php @@ -14,14 +14,14 @@ if(!defined('USER_WIDTH')) { define('USER_WIDTH','width:95%'); } $FORUMPOLLPOSTED ="
" . IMAGE_new_small . "
- +
".LAN_FORUM_3043."{LAN=FORUM_3043}
".IMAGE_e."  -
".LAN_FORUM_3045."
- ".LAN_FORUM_3046."
- ".LAN_FORUM_2022."

+
{LAN=FORUM_3045}
+ {LAN=FORUM_3046}
+ {LAN=FORUM_2022}
"; @@ -29,15 +29,15 @@ $FORUMPOLLPOSTED =" $FORUMTHREADPOSTED = " - +
".LAN_FORUM_3043."{LAN=FORUM_3043}
".IMAGE_e."  -
".LAN_FORUM_3047."
+
{LAN=FORUM_3047}
".(defined('F_MESSAGE') ? F_MESSAGE.'
' : '')." - ".LAN_FORUM_3048."
- ".LAN_FORUM_2022."

+ {LAN=FORUM_3048}
+ {LAN=FORUM_2022}
"; @@ -46,15 +46,15 @@ $FORUMTHREADPOSTED = " $FORUMREPLYPOSTED = " - +
".LAN_FORUM_3043."{LAN=FORUM_3043}
".IMAGE_e."  -
".LAN_FORUM_3049."
+
{LAN=FORUM_3049}
".(defined('F_MESSAGE') ? F_MESSAGE.'
' : '')." - ".LAN_FORUM_3048."
- ".LAN_FORUM_2022."

+ {LAN=FORUM_3048}
+ {LAN=FORUM_2022}
"; @@ -66,15 +66,15 @@ $FORUMREPLYPOSTED = " $FORUM_POSTED_TEMPLATE['poll'] = $FORUMPOLLPOSTED; $FORUM_POSTED_TEMPLATE['thread'] = "
-

".LAN_FORUM_8029."

- ".LAN_FORUM_3048." - ".LAN_FORUM_2022." +

{LAN=FORUM_8029}

+ {LAN=FORUM_3048} + {LAN=FORUM_2022}
"; $FORUM_POSTED_TEMPLATE['reply'] = "
-

".LAN_FORUM_3049."

- ".LAN_FORUM_3048." - ".LAN_FORUM_2022." +

{LAN=FORUM_3049}

+ {LAN=FORUM_3048} + {LAN=FORUM_2022}
"; diff --git a/e107_plugins/forum/templates/forum_template.php b/e107_plugins/forum/templates/forum_template.php index 917037e19..3a7effdd7 100644 --- a/e107_plugins/forum/templates/forum_template.php +++ b/e107_plugins/forum/templates/forum_template.php @@ -14,7 +14,7 @@ if (!isset($FORUM_MAIN_START)) { // How it should be??? (LAN Shortcodes replaced by their outputed LANS...) /* - $FORUM_MAIN_START = "
\n
\n\n\n\n\n\n\n"; + $FORUM_MAIN_START = "
\n
\n
{FORUMTITLE}".LAN_FORUM_0002."".LAN_FORUM_0003."".LAN_FORUM_0004."
\n\n\n\n\n\n"; */ // LEGACY definition with LAN Shortcodes ({THREADTITLE}, {REPLYTITLE}, {LASTPOSTITLE})..... $FORUM_MAIN_START = "
\n
\n
{FORUMTITLE}{LAN=FORUM_0002}{LAN=FORUM_0003}{LAN=FORUM_0004}
\n\n\n\n\n\n"; @@ -33,7 +33,7 @@ if (!isset($FORUM_MAIN_END)) { // How it should be??? (LAN Shortcodes replaced by their outputed LANS...) /* - $FORUM_MAIN_END = "
{FORUMTITLE}{THREADTITLE}{REPLYTITLE}{LASTPOSTITLE}
\n
\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
".LAN_FORUM_0009."
{LOGO}{USERINFO}
{INFO}
{FORUMINFO}
{USERLIST}
{STATLINK}
\n
\n
\n\n\n\n\n\n\n
{ICONKEY}{SEARCH}{PERMS}\n
\n
\n
"; + $FORUM_MAIN_END = "
\n
\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
{LAN=FORUM_0009}
{LOGO}{USERINFO}
{INFO}
{FORUMINFO}
{USERLIST}
{STATLINK}
\n
\n
\n\n\n\n\n\n\n
{ICONKEY}{SEARCH}{PERMS}\n
\n
\n
"; */ // LEGACY definition with LAN Shortcodes ({INFOTITLE})..... $FORUM_MAIN_END = "
\n
\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
{INFOTITLE}
{LOGO}{USERINFO}
{INFO}
{FORUMINFO}
{USERLIST}
{STATLINK}
\n
\n
\n\n\n\n\n\n\n
{ICONKEY}{SEARCH}{PERMS}\n
\n
\n
"; @@ -43,7 +43,7 @@ if (!isset($FORUM_NEWPOSTS_START)) { // How it should be??? (LAN Shortcodes replaced by their outputed LANS...) /* - $FORUM_NEWPOSTS_START = "
\n
\n\n\n\n\n\n"; + $FORUM_NEWPOSTS_START = "
\n
\n
 ".LAN_FORUM_0075."".LAN_FORUM_0074."
\n\n\n\n\n"; */ // LEGACY definition with LAN Shortcodes ({NEWTHREADTITLE}, {POSTEDTITLE})..... $FORUM_NEWPOSTS_START = "
\n
\n
 {LAN=FORUM_0075}{LAN=FORUM_0074}
\n\n\n\n\n"; @@ -63,7 +63,7 @@ if (!isset($FORUM_TRACK_START)) { // How it should be??? (LAN Shortcodes replaced by their outputed LANS...) /* - $FORUM_TRACK_START = "
\n
\n
 {NEWTHREADTITLE}{POSTEDTITLE}
\n\n\n\n"; + $FORUM_TRACK_START = "
\n
\n
".LAN_FORUM_0073."
\n\n\n\n"; */ // LEGACY definition with LAN Shortcodes ({TRACKTITLE})..... $FORUM_TRACK_START = "
\n
\n
{LAN=FORUM_0073}
\n\n\n\n"; @@ -122,9 +122,9 @@ $FORUM_TEMPLATE['main']['start'] = "{FORUM_BREADCRUMB} $FORUM_TEMPLATE['main']['parent_start'] = " - - - + + + "; $FORUM_TEMPLATE['main']['parent_end'] = ''; @@ -156,9 +156,9 @@ $FORUM_TEMPLATE['track']['start'] = "{FORUM_BREADCRUMB}
".LAN_FORUM_1003." -
- + + + "; diff --git a/e107_plugins/forum/templates/forum_viewforum_template.php b/e107_plugins/forum/templates/forum_viewforum_template.php index 72c66fdf3..b5f07457d 100644 --- a/e107_plugins/forum/templates/forum_viewforum_template.php +++ b/e107_plugins/forum/templates/forum_viewforum_template.php @@ -180,9 +180,9 @@ if (empty($FORUM_VIEW_END))
"; // hardcoded deprecated rss links //
- // ".LAN_431." - // ".LAN_432." - // ".LAN_433." + // {LAN=431} + // {LAN=432} + // {LAN=433} //
// $FORUM_VIEW_END .= " @@ -217,10 +217,10 @@ if (empty($FORUM_VIEW_SUB_START))
{TRACKTITLE}
{PARENTIMAGE:h=50}{PARENTNAME} {PARENTSTATUS}".LAN_FORUM_0002."{LAN=FORUM_0002}
".LAN_FORUM_1020."{LAN=FORUM_1003}{LAN=FORUM_1020}
- - - - + + + + "; } @@ -249,13 +249,13 @@ if (empty($FORUM_VIEW_SUB_END)) } if (empty($FORUM_IMPORTANT_ROW)) { - $FORUM_IMPORTANT_ROW = ""; + $FORUM_IMPORTANT_ROW = ""; } if (empty($FORUM_NORMAL_ROW)) { - $FORUM_NORMAL_ROW = ""; + $FORUM_NORMAL_ROW = ""; } @@ -308,7 +308,7 @@ $FORUM_VIEWFORUM_TEMPLATE['item'] = "
{THREADNAME} -
".LAN_FORUM_1004.": {POSTER} {THREADTIMELAPSE}  
+
{LAN=FORUM_1004}: {POSTER} {THREADTIMELAPSE}  
{PAGESX}
@@ -322,10 +322,10 @@ $FORUM_VIEWFORUM_TEMPLATE['item-announce'] = $FORUM_VIEWFORUM_TEMPLATE['item'] $FORUM_VIEWFORUM_TEMPLATE['sub-header'] = " - - - - + + + + "; $FORUM_VIEWFORUM_TEMPLATE['sub-item'] = " @@ -339,13 +339,13 @@ $FORUM_VIEWFORUM_TEMPLATE['sub-item'] = " $FORUM_VIEWFORUM_TEMPLATE['sub-footer'] = ""; /* Examples top divider with shortcodes - working -$FORUM_VIEWFORUM_TEMPLATE['divider-important'] = ""; -$FORUM_VIEWFORUM_TEMPLATE['divider-normal'] = ""; +$FORUM_VIEWFORUM_TEMPLATE['divider-important'] = ""; +$FORUM_VIEWFORUM_TEMPLATE['divider-normal'] = ""; */ -$FORUM_VIEWFORUM_TEMPLATE['divider-important'] = ""; -$FORUM_VIEWFORUM_TEMPLATE['divider-normal'] = ""; +$FORUM_VIEWFORUM_TEMPLATE['divider-important'] = ""; +$FORUM_VIEWFORUM_TEMPLATE['divider-normal'] = ""; -$SC_WRAPPER['VIEWABLE_BY'] = "
".LAN_FORUM_8012."
{---}
"; +$SC_WRAPPER['VIEWABLE_BY'] = "
{LAN=FORUM_8012}
{---}
"; $FORUM_VIEWFORUM_TEMPLATE['footer'] = "
 ".LAN_FORUM_1002."".LAN_FORUM_0002."".LAN_FORUM_0003."".LAN_FORUM_0004."{LAN=FORUM_1002}{LAN=FORUM_0002}{LAN=FORUM_0003}{LAN=FORUM_0004}
 ".LAN_FORUM_1006."
 {LAN=FORUM_1006}
 ".LAN_FORUM_1007."
 {LAN=FORUM_1007}
".LAN_FORUM_1002."".LAN_FORUM_0003."{LAN=FORUM_1002}{LAN=FORUM_0003}
{NEWFLAG}
{NEWFLAG}
".LAN_FORUM_1006." {FORUMTITLE}".LAN_FORUM_0003."
".LAN_FORUM_1007." {FORUMTITLE}".LAN_FORUM_0003."
{LAN=FORUM_1006} {FORUMTITLE}{LAN=FORUM_0003}
{LAN=FORUM_1007} {FORUMTITLE}{LAN=FORUM_0003}
".LAN_FORUM_1006."".LAN_FORUM_0003."
".LAN_FORUM_1007."".LAN_FORUM_0003."
{LAN=FORUM_1006}{LAN=FORUM_0003}
{LAN=FORUM_1007}{LAN=FORUM_0003}
@@ -354,9 +354,9 @@ $FORUM_VIEWFORUM_TEMPLATE['footer'] = "
-
+
-
".LAN_FORUM_8011."
+
{LAN=FORUM_8011}
{ICONKEY}
@@ -372,17 +372,17 @@ $FORUM_VIEWFORUM_TEMPLATE['end'] = "
\n \n"; // define {ICONKEY} $FORUM_VIEWFORUM_TEMPLATE['iconkey'] = "
-
".IMAGE_new_small." ".LAN_FORUM_0039."
-
".IMAGE_nonew_small." ".LAN_FORUM_0040."
-
".IMAGE_sticky_small." ".LAN_FORUM_1011."
-
".IMAGE_announce_small." ".LAN_FORUM_1013."
+
{ICON: type=new} {LAN=FORUM_0039}
+
{ICON: type=nonew} {LAN=FORUM_0040}
+
{ICON: type=sticky} {LAN=FORUM_1011}
+
{ICON: type=announce} {LAN=FORUM_1013}
-
".IMAGE_new_popular_small." ".LAN_FORUM_0039." ".LAN_FORUM_1010."
-
".IMAGE_nonew_popular_small." ".LAN_FORUM_0040." ".LAN_FORUM_1010."
-
".IMAGE_noreplies_small." ".LAN_FORUM_1021."
-
".IMAGE_closed_small." ".LAN_FORUM_1014."
+
{ICON: type=new_popular} {LAN=FORUM_0039} {LAN=FORUM_1010}
+
{ICON: type=nonew_popular} {LAN=FORUM_0040} {LAN=FORUM_1010}
+
{ICON: type=noreplies} {LAN=FORUM_1021}
+
{ICON: type=closed} {LAN=FORUM_1014}
"; diff --git a/e107_plugins/forum/templates/forum_viewtopic_template.php b/e107_plugins/forum/templates/forum_viewtopic_template.php index 2f8c2675a..b563fa957 100644 --- a/e107_plugins/forum/templates/forum_viewtopic_template.php +++ b/e107_plugins/forum/templates/forum_viewtopic_template.php @@ -89,10 +89,10 @@ $FORUMSTART = "
"; @@ -182,7 +182,7 @@ $FORUMEND = "
- ".LAN_AUTHOR." + {LAN=AUTHOR} - ".LAN_FORUM_2015." + {LAN=FORUM_2015}
/*
- ".LAN_FORUM_0012." ".LAN_FORUM_0013." ".LAN_433." + {LAN=FORUM_0012} {LAN=FORUM_0013} {LAN=433}
*/ diff --git a/e107_plugins/forum/templates/newforumposts_menu_template.php b/e107_plugins/forum/templates/newforumposts_menu_template.php index fc0b75bc9..d95f13ef5 100644 --- a/e107_plugins/forum/templates/newforumposts_menu_template.php +++ b/e107_plugins/forum/templates/newforumposts_menu_template.php @@ -14,7 +14,7 @@ {POST_AUTHOR_AVATAR: shape=circle}
-

{POST_TOPIC}

{POST_CONTENT}
".LAN_FORUM_MENU_001." {POST_AUTHOR_NAME} {POST_DATESTAMP} +

{POST_TOPIC}

{POST_CONTENT}
{LAN=FORUM_MENU_001} {POST_AUTHOR_NAME} {POST_DATESTAMP}
"; $NEWFORUMPOSTS_MENU_TEMPLATE['default']['end'] = ""; @@ -27,7 +27,7 @@ {POST_AUTHOR_AVATAR: shape=circle}
- ".LAN_FORUM_MENU_001." {POST_AUTHOR_NAME} {POST_DATESTAMP}
{POST_CONTENT}
+ {LAN=FORUM_MENU_001} {POST_AUTHOR_NAME} {POST_DATESTAMP}
{POST_CONTENT}
"; $NEWFORUMPOSTS_MENU_TEMPLATE['minimal']['end'] = ""; @@ -38,11 +38,11 @@ - - - - - + + + + + "; $NEWFORUMPOSTS_MENU_TEMPLATE['main']['item'] = " @@ -56,7 +56,7 @@ $NEWFORUMPOSTS_MENU_TEMPLATE['main']['end'] = "
 ".LAN_FORUM_1003."".LAN_USER."".LAN_FORUM_1005."".LAN_FORUM_0003."".LAN_FORUM_0004."{LAN=FORUM_1003}{LAN=USER}{LAN=FORUM_1005}{LAN=FORUM_0003}{LAN=FORUM_0004}
- ".LAN_FORUM_0002.": {TOTAL_TOPICS} | ".LAN_FORUM_0003.": {TOTAL_REPLIES} | ".LAN_FORUM_1005.": {TOTAL_VIEWS} + {LAN=FORUM_0002}: {TOTAL_TOPICS} | {LAN=FORUM_0003}: {TOTAL_REPLIES} | {LAN=FORUM_1005}: {TOTAL_VIEWS}
diff --git a/e107_plugins/news/templates/news_grid_template.php b/e107_plugins/news/templates/news_grid_template.php index b4eadb903..1258eb2e1 100644 --- a/e107_plugins/news/templates/news_grid_template.php +++ b/e107_plugins/news/templates/news_grid_template.php @@ -20,7 +20,7 @@

{NEWSTITLE}

{NEWSMETADIZ: limit=100}

-

' . LAN_READ_MORE . '

+

{LAN=READ_MORE}

@@ -31,7 +31,7 @@ {NEWSTHUMBNAIL=placeholder}

{NEWS_TITLE}

{NEWS_SUMMARY}

-

' . LAN_READ_MORE . '

+

{LAN=READ_MORE}

'; $NEWS_GRID_TEMPLATE['col-md-6']['end'] = ''; @@ -46,7 +46,7 @@ {NEWSTHUMBNAIL=placeholder}

{NEWS_TITLE}

{NEWS_SUMMARY}

-

' . LAN_READ_MORE . '

+

{LAN=READ_MORE}

'; $NEWS_GRID_TEMPLATE['col-md-4']['end'] = $NEWS_GRID_TEMPLATE['col-md-6']['end']; @@ -62,7 +62,7 @@ {NEWSTHUMBNAIL=placeholder}

{NEWS_TITLE}

{NEWS_SUMMARY}

-

' . LAN_READ_MORE . '

+

{LAN=READ_MORE}

'; $NEWS_GRID_TEMPLATE['col-md-3']['end'] = $NEWS_GRID_TEMPLATE['col-md-6']['end']; diff --git a/e107_plugins/news/templates/news_menu_template.php b/e107_plugins/news/templates/news_menu_template.php index ced49bca0..09753ced7 100644 --- a/e107_plugins/news/templates/news_menu_template.php +++ b/e107_plugins/news/templates/news_menu_template.php @@ -53,7 +53,7 @@ $NEWS_MENU_TEMPLATE['other']['item'] = '
'.LAN_READ_MORE.' »

+

{LAN=READ_MORE} »

'; $NEWS_MENU_TEMPLATE['other']['end'] = ""; @@ -71,7 +71,7 @@ $NEWS_MENU_TEMPLATE['other2']['start'] = "

    +

    {LAN=READ_MORE} »

    \n"; diff --git a/e107_plugins/news/templates/news_template.php b/e107_plugins/news/templates/news_template.php index 44fa32085..b29cacd6e 100644 --- a/e107_plugins/news/templates/news_template.php +++ b/e107_plugins/news/templates/news_template.php @@ -68,7 +68,7 @@ $NEWS_TEMPLATE['list']['item'] = ' {NEWS_SUMMARY}

    - '.LAN_READ_MORE.' + {LAN=READ_MORE}