diff --git a/e107_plugins/forum/templates/forum_template.php b/e107_plugins/forum/templates/forum_template.php
index cb3599795..6305dcf20 100644
--- a/e107_plugins/forum/templates/forum_template.php
+++ b/e107_plugins/forum/templates/forum_template.php
@@ -1,181 +1,188 @@
-\n
\n
\n\n{FORUMTITLE} | \n{THREADTITLE} | \n{REPLYTITLE} | \n{LASTPOSTITLE} | \n
";
-}
-if (!isset($FORUM_MAIN_PARENT))
-{
- $FORUM_MAIN_PARENT = " \n\n
";
-}
-if (!isset($FORUM_MAIN_FORUM))
-{
- $FORUM_MAIN_FORUM = "\n\n\n\n\n\n
";
-}
-if (!isset($FORUM_MAIN_END))
-{
- $FORUM_MAIN_END = "
\n\n
\n\n{INFOTITLE} | \n
\n\n\n\n
\n\n\n
\n\n
\n\n\n
\n
\n
\n\n";
-}
-
-if (!isset($FORUM_NEWPOSTS_START))
-{
- $FORUM_NEWPOSTS_START = "\n
\n
\n\n | \n{NEWTHREADTITLE} | \n{POSTEDTITLE} | \n
";
-}
-
-if (!isset($FORUM_NEWPOSTS_MAIN))
-{
- $FORUM_NEWPOSTS_MAIN = "\n\n\n\n
";
-}
-
-if (!isset($FORUM_NEWPOSTS_END))
-{
- $FORUM_NEWPOSTS_END = "
";
-}
-
-if (!isset($FORUM_TRACK_START))
-{
- $FORUM_TRACK_START = "\n
\n
\n\n{TRACKTITLE} | \n
\n";
-
- if (!isset($FORUM_TRACK_MAIN))
- {
- $FORUM_TRACK_MAIN = "
-
-
-
-
";
- }
-}
-
-if (!isset($FORUM_TRACK_END))
-{
- $FORUM_TRACK_END = "
\n
\n
";
-}
-
-
-/*
-$FORUM_MAIN_START = "
MAIN START";
-$FORUM_MAIN_PARENT = "
MAIN PARENT";
-$FORUM_MAIN_FORUM = "
MAIN FORUM";
-$FORUM_MAIN_END = "
MAIN END";
-$FORUM_NEWPOSTS_START = "
NEWPOSTS-START";
-$FORUM_NEWPOSTS_MAIN = "
NEWPOSTS-MAIN";
-$FORUM_NEWPOSTS_END = "
NEWPOSTS END";
-$FORUM_TRACK_START = "
TRACK-START";
-$FORUM_TRACK_MAIN = "
TRACK-MAIN";
-$FORUM_TRACK_END = "
TRACK-END";
-*/
-
-// New in v2.x - requires a bootstrap theme be loaded.
-
-
-$FORUM_TEMPLATE['main']['start'] = "{FORUM_BREADCRUMB}
-
-
-
-
-
-
-
-
-
-
-
- {FORUMTITLE} |
-
";
-
-$FORUM_TEMPLATE['main']['parent'] = "
- {PARENTNAME} {PARENTSTATUS} |
- ".LAN_FORUM_0003." |
- ".LAN_FORUM_0002." |
- ".LAN_FORUM_0004." |
-
";
-
-
-$FORUM_TEMPLATE['main']['forum'] = "
- {NEWFLAG} |
- {FORUMNAME} {FORUMDESCRIPTION}{FORUMSUBFORUMS} |
- {REPLIESX} |
- {THREADSX} |
- {LASTPOSTUSER} {LASTPOSTDATE} |
-
";
-
-$FORUM_TEMPLATE['main']['end'] = "
";
-
-
-
-// Tracking
-$FORUM_TEMPLATE['track']['start'] = "{FORUM_BREADCRUMB}
-
-
-
-
-
-
-
-
-
-
- ".LAN_FORUM_1003." |
- ".LAN_FORUM_0004." |
- ".LAN_FORUM_1020." |
-
-
- ";
-
-$FORUM_TEMPLATE['track']['item'] = "
- {NEWIMAGE} |
- {TRACKPOSTNAME} |
- {LASTPOSTUSER} {LASTPOSTDATE} |
- {UNTRACK} |
-
";
-
-
-$FORUM_TEMPLATE['track']['end'] = "
\n
";
-
-
-
-
-/*
-$FORUM_TEMPLATE['main-end'] .= "
-
-
- {PERMS}
-
-\n
-{INFOTITLE} | \n
\n
-
-\n
-\n\n
-\n\n
-\n\n
\n
-";
-*/
-
-
-
-
-
-
-
-
-
-
-
-
-?>
\ No newline at end of file
+\n\n
\n\n{FORUMTITLE} | \n".LAN_FORUM_0002." | \n".LAN_FORUM_0003." | \n".LAN_FORUM_0004." | \n
";
+*/
+// LEGACY definition with LAN Shortcodes ({THREADTITLE}, {REPLYTITLE}, {LASTPOSTITLE}).....
+ $FORUM_MAIN_START = "\n
\n
\n\n{FORUMTITLE} | \n{THREADTITLE} | \n{REPLYTITLE} | \n{LASTPOSTITLE} | \n
";
+}
+if (!isset($FORUM_MAIN_PARENT))
+{
+ $FORUM_MAIN_PARENT = " \n\n
";
+}
+if (!isset($FORUM_MAIN_FORUM))
+{
+ $FORUM_MAIN_FORUM = "\n\n\n\n\n\n
";
+}
+if (!isset($FORUM_MAIN_END))
+{
+// How it should be??? (LAN Shortcodes replaced by their outputed LANS...)
+/*
+ $FORUM_MAIN_END = "
\n
\n
\n\n".LAN_FORUM_0009." | \n
\n\n\n\n
\n\n\n
\n\n
\n\n\n
\n
\n
\n
\n
";
+*/
+// LEGACY definition with LAN Shortcodes ({INFOTITLE}).....
+$FORUM_MAIN_END = "
\n\n
\n\n{INFOTITLE} | \n
\n\n\n\n
\n\n\n
\n\n
\n\n\n
\n
\n
\n\n";
+}
+
+if (!isset($FORUM_NEWPOSTS_START))
+{
+// How it should be??? (LAN Shortcodes replaced by their outputed LANS...)
+/*
+ $FORUM_NEWPOSTS_START = "\n
\n
\n\n | \n".LAN_FORUM_0075." | \n".LAN_FORUM_0074." | \n
";
+*/
+// LEGACY definition with LAN Shortcodes ({NEWTHREADTITLE}, {POSTEDTITLE}).....
+ $FORUM_NEWPOSTS_START = "\n
\n
\n\n | \n{NEWTHREADTITLE} | \n{POSTEDTITLE} | \n
";
+}
+
+if (!isset($FORUM_NEWPOSTS_MAIN))
+{
+ $FORUM_NEWPOSTS_MAIN = "\n\n\n\n
";
+}
+
+if (!isset($FORUM_NEWPOSTS_END))
+{
+ $FORUM_NEWPOSTS_END = "
";
+}
+
+if (!isset($FORUM_TRACK_START))
+{
+// How it should be??? (LAN Shortcodes replaced by their outputed LANS...)
+/*
+ $FORUM_TRACK_START = "\n
\n
\n\n".LAN_FORUM_0073." | \n
\n";
+*/
+// LEGACY definition with LAN Shortcodes ({TRACKTITLE}).....
+$FORUM_TRACK_START = "\n
\n
\n\n{TRACKTITLE} | \n
\n";
+
+ if (!isset($FORUM_TRACK_MAIN))
+ {
+ $FORUM_TRACK_MAIN = "
+
+
+
+
";
+ }
+}
+
+if (!isset($FORUM_TRACK_END))
+{
+ $FORUM_TRACK_END = "
\n
\n
";
+}
+
+
+/*
+$FORUM_MAIN_START = "
MAIN START";
+$FORUM_MAIN_PARENT = "
MAIN PARENT";
+$FORUM_MAIN_FORUM = "
MAIN FORUM";
+$FORUM_MAIN_END = "
MAIN END";
+$FORUM_NEWPOSTS_START = "
NEWPOSTS-START";
+$FORUM_NEWPOSTS_MAIN = "
NEWPOSTS-MAIN";
+$FORUM_NEWPOSTS_END = "
NEWPOSTS END";
+$FORUM_TRACK_START = "
TRACK-START";
+$FORUM_TRACK_MAIN = "
TRACK-MAIN";
+$FORUM_TRACK_END = "
TRACK-END";
+*/
+
+// New in v2.x - requires a bootstrap theme be loaded.
+
+
+$FORUM_TEMPLATE['main']['start'] = "{FORUM_BREADCRUMB}
+
+
+
+
+
+
+
+
+
+
+
+ {FORUMTITLE} |
+
";
+
+$FORUM_TEMPLATE['main']['parent'] = "
+ {PARENTNAME} {PARENTSTATUS} |
+ ".LAN_FORUM_0003." |
+ ".LAN_FORUM_0002." |
+ ".LAN_FORUM_0004." |
+
";
+
+
+$FORUM_TEMPLATE['main']['forum'] = "
+ {NEWFLAG} |
+ {FORUMNAME} {FORUMDESCRIPTION}{FORUMSUBFORUMS} |
+ {REPLIESX} |
+ {THREADSX} |
+ {LASTPOSTUSER} {LASTPOSTDATE} |
+
";
+
+$FORUM_TEMPLATE['main']['end'] = "
";
+
+
+
+// Tracking
+$FORUM_TEMPLATE['track']['start'] = "{FORUM_BREADCRUMB}
+
+
+
+
+
+
+
+
+
+
+ ".LAN_FORUM_1003." |
+ ".LAN_FORUM_0004." |
+ ".LAN_FORUM_1020." |
+
+
+ ";
+
+$FORUM_TEMPLATE['track']['item'] = "
+ {NEWIMAGE} |
+ {TRACKPOSTNAME} |
+ {LASTPOSTUSER} {LASTPOSTDATE} |
+ {UNTRACK} |
+
";
+
+
+$FORUM_TEMPLATE['track']['end'] = "
\n
";
+
+
+
+
+/*
+$FORUM_TEMPLATE['main-end'] .= "
+
+
+ {PERMS}
+
+\n
+{INFOTITLE} | \n
\n
+
+\n
+\n\n
+\n\n
+\n\n
\n
+";
+*/
+?>