From f6097662aad19fcbd4a160667c5836d79f6dae86 Mon Sep 17 00:00:00 2001
From: rica-carv <rica-carv@users.noreply.github.com>
Date: Fri, 9 Dec 2016 11:14:20 +0000
Subject: [PATCH 01/31] Update view_shortcodes.php

---
 e107_plugins/forum/shortcodes/batch/view_shortcodes.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
index 9cfe9f6ab..868659e4f 100644
--- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
@@ -829,9 +829,10 @@ function sc_buttonsx()
 
 
 	$text = '<div class="btn-group">
-   '.($replyUrl?:LAN_FORUM_1003." ".LAN_FORUM_8013).'
+   '.($replyUrl?:"").'
     <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-    <span class="caret"></span>
+    '.($replyUrl?"":LAN_FORUM_1003." ".LAN_FORUM_8013).'<span class="caret"></span>
+    <span class="sr-only">Toggle Dropdown</span>
     </button>
     <ul class="dropdown-menu pull-right">
     ';

From 1526eb55f16881f740553e97416aa557107535bf Mon Sep 17 00:00:00 2001
From: rica-carv <rica-carv@users.noreply.github.com>
Date: Fri, 9 Dec 2016 11:17:56 +0000
Subject: [PATCH 02/31] Update viewforum_shortcodes.php

---
 .../forum/shortcodes/batch/viewforum_shortcodes.php        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
index a45d48306..515c25075 100644
--- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
@@ -82,10 +82,11 @@
 
 			$text = '<div class="btn-group">';
 			$text .=
-			($this->var['ntUrl'] ? '<a href="'.$this->var['ntUrl'].'" class="btn btn-primary">'.LAN_FORUM_1018.'</a>' : LAN_FORUM_1001." ".LAN_FORUM_8013).
+			($this->var['ntUrl'] ? '<a href="'.$this->var['ntUrl'].'" class="btn btn-primary">'.LAN_FORUM_1018.'</a>' :'').
 		    	'<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-		    	<span class="caret"></span>
-		    	</button>
+		    	'.($this->var['ntUrl'] ? '' : LAN_FORUM_1001." ".LAN_FORUM_8013).'<span class="caret"></span>
+		    	<span class="sr-only">Toggle Dropdown</span>
+			</button>
 		    	<ul class="dropdown-menu pull-right">
 		    	';
 

From 87f3d340a069971e15a5a3508299d55f5673eb98 Mon Sep 17 00:00:00 2001
From: rica-carv <rica-carv@users.noreply.github.com>
Date: Fri, 9 Dec 2016 12:14:33 +0000
Subject: [PATCH 03/31] Update viewforum_shortcodes.php

---
 .../shortcodes/batch/viewforum_shortcodes.php     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
index 515c25075..0e37f43f5 100644
--- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
@@ -81,6 +81,7 @@
 			$jumpList = $forum->forumGetAllowed('view');
 
 			$text = '<div class="btn-group">';
+/*
 			$text .=
 			($this->var['ntUrl'] ? '<a href="'.$this->var['ntUrl'].'" class="btn btn-primary">'.LAN_FORUM_1018.'</a>' :'').
 		    	'<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
@@ -89,7 +90,19 @@
 			</button>
 		    	<ul class="dropdown-menu pull-right">
 		    	';
-
+*/
+			$text .=
+			'<a href="'.($this->var['ntUrl'] ?:"#").
+			'" class="btn btn-primary'.($this->var['ntUrl'] ?"":" disabled").'"'
+			.($this->var['ntUrl'] ?"":" data-toggle='tooltip' title='Please login or register to be allowed'
+	style='cursor: not-allowed; pointer-events: all !important;'").'>'.LAN_FORUM_1018.'</a>' :'').
+		    	'<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+		    	<span class="caret"></span>
+		    	<span class="sr-only">Toggle Dropdown</span>
+			</button>
+		    	<ul class="dropdown-menu pull-right">
+		    	';
+			
 			//--	foreach($jumpList as $key => $val)
 			foreach($jumpList as $val)
 			{

From 6157e56c77f4ff908a564c38e82f4be2a6567c5c Mon Sep 17 00:00:00 2001
From: rica-carv <rica-carv@users.noreply.github.com>
Date: Fri, 9 Dec 2016 12:22:09 +0000
Subject: [PATCH 04/31] Update view_shortcodes.php

---
 .../forum/shortcodes/batch/view_shortcodes.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
index 868659e4f..3c4a36786 100644
--- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
@@ -797,13 +797,15 @@ function sc_buttonsx()
 {
 	global $forum, $thread; 
 
-	
 	if ($forum->checkPerm($this->var['thread_forum_id'], 'post') && $this->var['thread_active'])
 	{
 		$url = e107::url('forum','post')."?f=rp&amp;id=".$this->var['thread_id']."&amp;post=".$thread->threadId;
 	//	$url = e107::getUrl()->create('forum/thread/reply', array('id' => $thread->threadId));
-		$replyUrl = "<a class='btn btn-primary' href='".$url."'>".LAN_FORUM_2006."</a>";
 	}
+		$replyUrl = "<a class='btn btn-primary".($url ?"":" disabled")."' "
+			.($url?"":" data-toggle='tooltip' title='Please login or register to be allowed'
+	style='cursor: not-allowed; pointer-events: all !important;'")." href='".($url ?:"#")."'>".LAN_FORUM_2006."</a>";
+
 	if ($forum->checkPerm($this->var['thread_forum_id'], 'post'))
 	{
 		$ntUrl = e107::url('forum','post')."?f=nt&amp;id=". $this->var['thread_forum_id'];
@@ -828,13 +830,23 @@ function sc_buttonsx()
 	}
 
 
-	$text = '<div class="btn-group">
+/*
+$text = '<div class="btn-group">
    '.($replyUrl?:"").'
     <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
     '.($replyUrl?"":LAN_FORUM_1003." ".LAN_FORUM_8013).'<span class="caret"></span>
     <span class="sr-only">Toggle Dropdown</span>
     </button>
     <ul class="dropdown-menu pull-right">
+    ';
+*/
+	$text = '<div class="btn-group">
+   '.$replyUrl.'
+    <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+    <span class="caret"></span>
+    <span class="sr-only">Toggle Dropdown</span>
+    </button>
+    <ul class="dropdown-menu pull-right">
     ';
 	
 	foreach($options as $key => $val)

From a1e0181105f9a811ba4aead31e047f69958f1c88 Mon Sep 17 00:00:00 2001
From: rica-carv <rica-carv@users.noreply.github.com>
Date: Fri, 9 Dec 2016 18:31:15 +0000
Subject: [PATCH 05/31] Update viewforum_shortcodes.php

---
 .../forum/shortcodes/batch/viewforum_shortcodes.php         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
index 0e37f43f5..f2cce7794 100644
--- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
@@ -350,7 +350,7 @@
 
 			// Initial ideia, to have a separate shortcode var ($subsc)....
 			//global $forum, $forumId, $threadFrom, $view;
-						global $sc, $forum, $forumId;
+						global $forum, $forumId;
 			//  	var_dump ($forumId);
 			//  	var_dump (vartrue($forumId));
 			//var_dump ($forum->forumGetSubs(vartrue($forum_id)));
@@ -443,12 +443,12 @@
 				// Initial ideia, to have a separate shortcode var ($subsc)....
 				//				$subsc->setVars($subInfo);
 				// Use setVars or addVars???
-					$sc->setVars($subInfo);
+					$this->addVars($subInfo);
 			//echo "--------------------------------------";
 
 			// Initial ideia, to have a separate shortcode var ($subsc)....
 			//	$sub_info .= e107::getParser()->parseTemplate($FORUM_VIEW_SUB, false,  $subsc);
-					$sub_info .= e107::getParser()->parseTemplate($FORUM_VIEW_SUB, false, $sc);
+					$sub_info .= e107::getParser()->parseTemplate($FORUM_VIEW_SUB, false, $this);
 
 			//var_dump ($sc);
 

From 2d61bf19a806d7f3078d8d23ff9aa10dbd69bd86 Mon Sep 17 00:00:00 2001
From: rica-carv <rica-carv@users.noreply.github.com>
Date: Fri, 9 Dec 2016 19:12:21 +0000
Subject: [PATCH 06/31] Update viewforum_shortcodes.php

---
 .../forum/shortcodes/batch/viewforum_shortcodes.php         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
index f2cce7794..f4c8255d2 100644
--- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
@@ -94,9 +94,9 @@
 			$text .=
 			'<a href="'.($this->var['ntUrl'] ?:"#").
 			'" class="btn btn-primary'.($this->var['ntUrl'] ?"":" disabled").'"'
-			.($this->var['ntUrl'] ?"":" data-toggle='tooltip' title='Please login or register to be allowed'
-	style='cursor: not-allowed; pointer-events: all !important;'").'>'.LAN_FORUM_1018.'</a>' :'').
-		    	'<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+			.($this->var['ntUrl'] ?"":" data-toggle='tooltip' title='".LAN_FORUM_0006."'
+			style='cursor: not-allowed; pointer-events: all !important;'").'>'.LAN_FORUM_1018.'</a>
+			<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
 		    	<span class="caret"></span>
 		    	<span class="sr-only">Toggle Dropdown</span>
 			</button>

From 3dff03b6be611ac45c7f466ce0965c63d684905b Mon Sep 17 00:00:00 2001
From: rica-carv <rica-carv@users.noreply.github.com>
Date: Fri, 9 Dec 2016 19:15:28 +0000
Subject: [PATCH 07/31] Update view_shortcodes.php

---
 e107_plugins/forum/shortcodes/batch/view_shortcodes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
index 3c4a36786..79ed864e3 100644
--- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
@@ -803,7 +803,7 @@ function sc_buttonsx()
 	//	$url = e107::getUrl()->create('forum/thread/reply', array('id' => $thread->threadId));
 	}
 		$replyUrl = "<a class='btn btn-primary".($url ?"":" disabled")."' "
-			.($url?"":" data-toggle='tooltip' title='Please login or register to be allowed'
+			.($url?"":" data-toggle='tooltip' title='".LAN_FORUM_0046."'
 	style='cursor: not-allowed; pointer-events: all !important;'")." href='".($url ?:"#")."'>".LAN_FORUM_2006."</a>";
 
 	if ($forum->checkPerm($this->var['thread_forum_id'], 'post'))

From d91b4b2b986326c77414b730b97a849a1a2f0bb1 Mon Sep 17 00:00:00 2001
From: lonalore <lonalore@freemail.hu>
Date: Mon, 12 Dec 2016 16:14:59 +0100
Subject: [PATCH 08/31] Timezone settings improvement: Display time-offset in
 timezone dropdown.

---
 e107_admin/prefs.php | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 51d15fcc1..6178bd11c 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -750,7 +750,7 @@ foreach($toffset as $o)
 
 
 
-					$timeZones = timezone_identifiers_list();
+					$timeZones = systemTimeZones();
 
 
 
@@ -763,7 +763,7 @@ $text .= "
 					<tr>
 						<td><label for='timezone'>".PRFLAN_56."</label></td>
 						<td>
-							".$frm->select('timezone', $timeZones, vartrue($pref['timezone'],'GMT'), 'useValues=1')."
+							".$frm->select('timezone', $timeZones, vartrue($pref['timezone'], 'UTC'))."
 						</td>
 					</tr>
 				</tbody>
@@ -772,6 +772,38 @@ $text .= "
 		</fieldset>
 ";
 
+
+/**
+ * Generate an array of time zones.
+ */
+function systemTimeZones()
+{
+	$zonelist = timezone_identifiers_list();
+	$timeNow = date('m/d/Y H:i', $_SERVER['REQUEST_TIME']);
+
+	$zones = array();
+	foreach($zonelist as $zone)
+	{
+		// Because many time zones exist in PHP only for backward compatibility
+		// reasons and should not be used, the list is filtered by a regular
+		// expression.
+		if(preg_match('!^((Africa|America|Antarctica|Arctic|Asia|Atlantic|Australia|Europe|Indian|Pacific)/|UTC$)!', $zone))
+		{
+			$dateTimeZone = new DateTimeZone($zone);
+			$dateTime = new DateTime($timeNow, $dateTimeZone);
+			$offset = $dateTime->format('O');
+			$offset = chunk_split($offset, 3, ':');
+
+			$zones[$zone] = str_replace('_', ' ', $zone) . ' (' . rtrim($offset, ':') . ')';
+		}
+	}
+
+	// Sort time zones alphabetically.
+	asort($zones);
+	return $zones;
+}
+
+
 // =========== Registration Preferences. ==================
 
 

From 794a9f3ea6fdd933702bf2653cbd761fb493220f Mon Sep 17 00:00:00 2001
From: lonalore <lonalore@freemail.hu>
Date: Mon, 12 Dec 2016 16:41:36 +0100
Subject: [PATCH 09/31] Use UTC as default timezone.

---
 class2.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/class2.php b/class2.php
index a0bec62a3..e6da00ccd 100644
--- a/class2.php
+++ b/class2.php
@@ -1140,7 +1140,7 @@ if (($_SERVER['QUERY_STRING'] == 'logout')/* || (($pref['user_tracking'] == 'ses
 *
 */
 
-$tz = vartrue($pref['timezone'],'GMT'); //TODO Adjust on the front-end based on user timezone value. 
+$tz = vartrue($pref['timezone'], 'UTC'); //TODO Adjust on the front-end based on user timezone value.
 
 date_default_timezone_set($tz); // Must be set or PHP Warning thrown. 
 

From 7f3367df58a3cf57d9465dd8855440a122916662 Mon Sep 17 00:00:00 2001
From: rica-carv <rica-carv@users.noreply.github.com>
Date: Mon, 12 Dec 2016 17:25:36 +0000
Subject: [PATCH 10/31] Update forum_shortcodes.php

---
 e107_plugins/forum/shortcodes/batch/forum_shortcodes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
index ceaabd52d..4593a3add 100644
--- a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
@@ -348,7 +348,7 @@ class forum_shortcodes extends e_shortcode
 
 		if(USER && is_array($this->newFlagList) && in_array($this->var['forum_id'], $this->newFlagList))
 		{
-			$url = $this->sc_lastpost('url');
+			$url = $this->sc_lastpost(['type'=>'url']);
 			return "<a href='".$url."'>".IMAGE_new.'</a>';
 		}
 		elseif(empty($this->var['forum_replies']) && defined('IMAGE_noreplies'))

From a9a63848b178ff59916ad7915c6a3492c8a265c8 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 12 Dec 2016 11:52:18 -0800
Subject: [PATCH 11/31] PHP 7.1 tweaks

---
 install.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/install.php b/install.php
index 3954565dd..c4b3f8357 100644
--- a/install.php
+++ b/install.php
@@ -220,7 +220,7 @@ class e_install
 	var $previous_steps;
 	var $stage;
 	var $post_data;
-	var $required = ""; 		//TODO - use for highlighting required fields with css/js.
+	var $required = array(); 		//TODO - use for highlighting required fields with css/js.
 	var $logFile;			// Name of log file, empty string if logging disabled
 	var	$dbLink = NULL;		// DB link - needed for PHP5.3 bug
 	var $session = null;
@@ -398,12 +398,12 @@ class e_install
 
 	function display_required()
 	{
-		if(!$this->required)
+		if(empty($this->required))
 		{
 			return;
 		}
 		$this->required = array_filter($this->required);
-		if(vartrue($this->required))
+		if(!empty($this->required))
 		{
 			$this->template->SetTag("required","<div class='message'>". implode("<br />",$this->required)."</div>");
 			$this->required = array();
@@ -1064,7 +1064,7 @@ class e_install
 			$this->required['u_name'] = LANINS_086; //
 		}
 
-		if(vartrue($this->required['u_name']) || vartrue($this->required['pass1']))
+		if(!empty($this->required['u_name']) || !empty($this->required['pass1']))
 		{
 			return $this->stage_5();
 		}
@@ -1220,7 +1220,7 @@ class e_install
 			 $this->required['sitetheme'] = LANINS_114; // 'Please select a theme.';
 		}
 
-		if(vartrue($this->required['sitetheme']) || vartrue($this->required['sitename']))
+		if(!empty($this->required['sitetheme']) || !empty($this->required['sitename']))
 		{
 			return $this->stage_6();
 		}
@@ -2019,7 +2019,7 @@ class SimpleTemplate
 	var $open_tag = "{";
 	var $close_tag = "}";
 
-	function SimpleTemplate()
+	function __construct()
 	{
 		define("TEMPLATE_TYPE_FILE", 0);
 		define("TEMPLATE_TYPE_DATA", 1);

From ccb44d46e7fcd5afd228c9d4f1345f107fa156b9 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 12 Dec 2016 12:35:13 -0800
Subject: [PATCH 12/31] News: rewrite of frontend script. To test add
 define('e_DEBUG', 'news'); to e107_config.php

---
 e107_plugins/news/news.php | 1504 ++++++++++++++++++++++++++++++++++++
 news.php                   |    9 +-
 2 files changed, 1512 insertions(+), 1 deletion(-)
 create mode 100644 e107_plugins/news/news.php

diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php
new file mode 100644
index 000000000..64db37a7f
--- /dev/null
+++ b/e107_plugins/news/news.php
@@ -0,0 +1,1504 @@
+<?php
+	/**
+	 * e107 website system
+	 *
+	 * Copyright (C) 2008-2016 e107 Inc (e107.org)
+	 * Released under the terms and conditions of the
+	 * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+	 *
+	 */
+
+
+
+// news rewrite for v2.x
+if (!defined('e107_INIT'))
+{
+	require_once("../../class2.php");
+}
+
+if(e_DEBUG !== 'news')
+{
+	exit;
+}
+
+class news_front
+{
+
+	private $action = null;
+	private $subAction = null;
+	private $route = null;
+	private $defaultTemplate = '';
+	private $cacheString = 'news.php_default_';
+	private $from = 0;
+	private $order = 'news_datestamp';
+	private $nobody_regexp = '';
+	private $ix = null;
+	private $newsUrlparms = array();
+	private $text = null;
+	private $pref = array();
+
+	function __construct()
+	{
+		global $NEWSHEADER;
+
+		include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+		include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_news.php');		// Temporary
+
+		$this->pref = e107::getPref();
+
+		require_once(e_HANDLER."news_class.php");
+
+		if(isset($NEWSHEADER))
+		{
+			return false;
+		}
+
+		$this->nobody_regexp = "'(^|,)(".str_replace(",", "|", e_UC_NOBODY).")(,|$)'";
+		$this->ix = new news;
+
+		$this->setConstants();
+		$this->detect();
+
+
+
+
+
+		return null;
+	}
+
+
+	private function detect()
+	{
+		$this->setActions();
+		$this->setRoute();
+
+
+		if ($this->action == 'cat' || $this->action == 'all' || !empty($_GET['tag']) || !empty($_GET['author']))
+		{	// --> Cache
+			$this->text = $this->renderListTemplate();
+			return null;
+		}
+
+		if ($this->action == 'extend')
+		{	// --> Cache
+			$this->text = $this->renderViewTemplate();
+			return null;
+		}
+
+		if ($this->action != "item" && $this->action != 'list' && $this->pref['newsposts_archive'])
+		{
+			// return $this->show_newsarchive($newsAr,$interval);
+		}
+
+		$this->text = $this->renderDefaultTemplate();
+
+		if(isset($this->pref['nfp_display']) && $this->pref['nfp_display'] == 2 && is_readable(e_PLUGIN."newforumposts_main/newforumposts_main.php"))
+		{
+			ob_start();
+			require_once(e_PLUGIN."newforumposts_main/newforumposts_main.php");
+			$this->text .= ob_get_contents();
+			ob_end_clean();
+		}
+
+		$this->text .= $this->render_newscats();
+		return null;
+
+	}
+
+	public function render()
+	{
+		echo $this->text;
+	}
+
+	private function setActions()
+	{
+
+		$this->defaultTemplate = e107::getPref('news_default_template');
+
+		if (e_QUERY) //TODO add support for $_GET['cat'] and $_GET['mode'] and phase-out the x.x.x format.
+		{
+
+			$tmp = explode(".",e_QUERY);
+			$action = $tmp[0];						// At least one parameter here
+			$sub_action = varset($tmp[1],'');			// Usually a numeric category, or numeric news item number, but don't presume yet
+			//	$id = varset($tmp[2],'');					// ID of specific news item where required
+			$this->from = intval(varset($tmp[2],0));	// Item number for first item on multi-page lists
+			$this->cacheString = 'news.php_'.e_QUERY;
+		}
+		else
+		{
+
+			$opt = array('default'=>'', 'list'=>'all');
+			$action = varset($opt[$this->defaultTemplate],'');
+			$sub_action = '';
+			$tmp = array();
+
+		}
+
+		//$newsfrom = (!is_numeric($action) || !e_QUERY ? 0 : ($action ? $action : e_QUERY));
+
+		// Usually the first query parameter is the action.
+		// For any of the 'list' modes (inc month, day), the action being second is a legacy situation
+		// .... which can hopefully go sometime
+		//SecretR: Gone, gone...
+		if (is_numeric($action) && isset($tmp[1]) && (($tmp[1] == 'list') || ($tmp[1] == 'month') || ($tmp[1] == 'day')))
+		{
+			$action = $tmp[1];
+			$sub_action = varset($tmp[0],'');
+		}
+
+
+
+		if ($action == 'all' || $action == 'cat')
+		{
+			$sub_action = intval(varset($tmp[1],0));
+		}
+
+		$this->action = $action;
+		$this->subAction= $sub_action;
+
+
+
+
+
+
+	}
+
+
+	private function setRoute()
+	{
+		$newsUrlparms = array('page' => '--FROM--');
+		if($this->subAction)
+		{
+
+			switch ($this->action)
+			{
+				case 'list':
+					$newsUrlparms['id'] = $this->subAction;
+					$newsRoute = 'list/category';
+				break;
+
+				case 'cat':
+					$newsUrlparms['id'] = $this->subAction;
+					$newsRoute = 'list/short';
+				break;
+
+				case 'day':
+				case 'month':
+					$newsUrlparms['id'] = $this->subAction;
+					$newsRoute = 'list/'.$this->action;
+				break;
+
+				default:
+					$newsRoute = 'list/items';
+				break;
+			}
+		}
+		elseif($this->action == 'all')
+		{
+			$newsRoute = 'list/all';
+			$newsUrlparms['id'] = $this->subAction;
+		}
+		else
+		{
+			$newsRoute = 'list/items';
+		}
+
+
+
+		$this->route = 'news/'.$newsRoute;
+
+		$tp = e107::getParser();
+
+		if(vartrue($_GET['tag']) || substr($this->action,0,4) == 'tag=')
+		{
+
+			$this->route = 'news/list/tag';
+			if(!vartrue($_GET['tag']))
+			{
+				list($this->action,$word) = explode("=",$this->action,2);
+				$_GET['tag'] = $word;
+				unset($word,$tmp);
+			}
+
+			$this->newsUrlparms['tag'] = $tp->filter($_GET['tag']);
+			$this->from = intval(varset($_GET['page'],0));
+		}
+
+		if(!empty($_GET['author']) || substr($this->action,0,4) == 'author=')
+		{
+
+			$this->route = 'news/list/author';
+			if(!vartrue($_GET['author']))
+			{
+				list($action,$author) = explode("=",$this->action,2);
+				$_GET['author'] = $author;
+				unset($author,$tmp);
+			}
+
+			$this->newsUrlparms['author'] = $tp->filter($_GET['author']);
+			$this->from = intval(varset($_GET['page'],0));
+
+		}
+	}
+
+
+	private function setConstants()
+	{
+
+
+		if (!defined('ITEMVIEW'))
+		{
+			define('ITEMVIEW', varset($this->pref['newsposts'],15));
+		}
+
+		// ?all and ?cat.x and ?tag are the same listing functions - just filtered differently.
+		// NEWSLIST_LIMIT is suitable for all
+
+		if(!defined("NEWSLIST_LIMIT"))
+		{
+			 define("NEWSLIST_LIMIT", varset($this->pref['news_list_limit'],15));
+		}
+
+
+	}
+
+	public function debug()
+	{
+		echo "<div class='alert alert-info'>";
+		echo "<h4>SEF Debug Info</h4>";
+		echo "action= ".$this->action."  ";
+		echo "<br />subaction= ".$this->subAction."  ";
+		echo "<br />route= ".$this->route."  ";
+		echo "<br />e_QUERY= ".e_QUERY."  ";
+
+		echo "<br />_GET= ".print_r($_GET,true);
+		echo "</div>";
+
+
+	}
+
+
+
+
+	// ----------- old functions ------------------------
+
+
+	private function show_newsarchive($newsAr, $i = 1)
+	{
+		global $ns, $gen, $tp, $news_archive_shortcodes, $NEWSARCHIVE, $news2;
+
+		$tp = e107::getParser();
+		// do not show the news archive on the news.php?item.X page (but only on the news mainpage)
+		require_once(e_CORE.'shortcodes/batch/news_archives.php');
+
+		$textnewsarchive = '';
+		ob_start();
+
+		$i++;			// First entry to show
+		while(isset($newsAr[$i]))
+		{
+			$news2 = $newsAr[$i];
+			// Code from Lisa
+			// copied from the rss creation, but added here to make sure the url for the newsitem is to the news.php?item.X
+			// instead of the actual hyperlink that may have been added to a newstitle on creation
+			$search = array();
+			$replace = array();
+			$search[0] = "/\<a href=\"(.*?)\">(.*?)<\/a>/si";
+			$replace[0] = '\\2';
+			$search[1] = "/\<a href='(.*?)'>(.*?)<\/a>/si";
+			$replace[1] = '\\2';
+			$search[2] = "/\<a href='(.*?)'>(.*?)<\/a>/si";
+			$replace[2] = '\\2';
+			$search[3] = "/\<a href=&quot;(.*?)&quot;>(.*?)<\/a>/si";
+			$replace[3] = '\\2';
+			$search[4] = "/\<a href=&#39;(.*?)&#39;>(.*?)<\/a>/si";
+			$replace[4] = '\\2';
+			$news2['news_title'] = preg_replace($search, $replace, $news2['news_title']);
+			// End of code from Lisa
+
+			$gen = new convert;
+			$news2['news_datestamp'] = $gen->convert_date($news2['news_datestamp'], "short");
+
+
+			if(!$NEWSARCHIVE){
+				$NEWSARCHIVE ="<div>
+						<table style='width:98%;'>
+						<tr>
+						<td>
+						<div>{ARCHIVE_BULLET} <b>{ARCHIVE_LINK}</b> <span class='smalltext'><i>{ARCHIVE_AUTHOR} @ ({ARCHIVE_DATESTAMP}) ({ARCHIVE_CATEGORY})</i></span></div>
+						</td>
+						</tr>
+						</table>
+						</div>";
+			}
+
+			$textnewsarchive .= $tp->parseTemplate($NEWSARCHIVE, FALSE, $news_archive_shortcodes);
+			$i++;
+		}
+
+		$newsarchive = $ns->tablerender($this->pref['newsposts_archive_title'], $textnewsarchive, 'news_archive', true);
+
+		$this->setNewsCache('newsarchive', $newsarchive);
+
+		return $newsarchive;
+	}
+
+
+	private function setNewsFrontMeta($news, $type='news')
+	{
+
+		$tp = e107::getParser();
+
+		if($type == 'news')
+		{
+			if($news['news_title'] && !defined('e_PAGETITLE'))
+			{
+				define('e_PAGETITLE', $news['news_title']);
+				e107::meta('og:title',$news['news_title']);
+				e107::meta('og:type','article');
+			}
+
+			if($news['news_meta_description'] && !defined('META_DESCRIPTION'))
+			{
+				e107::meta('description',$news['news_meta_description']);
+				e107::meta('og:description',$news['news_meta_description']);
+				//define('META_DESCRIPTION', $news['news_meta_description']); // deprecated
+			}
+			elseif($news['news_summary']) // BC compatibility
+			{
+				e107::meta('og:description',$news['news_summary']);
+			}
+
+			// include news-thumbnail/image in meta. - always put this one first.
+			if($news['news_thumbnail'])
+			{
+				$iurl = (substr($news['news_thumbnail'],0,3)=="{e_") ? $news['news_thumbnail'] : SITEURL.e_IMAGE."newspost_images/".$news['news_thumbnail'];
+				$tmp = explode(",", $iurl);
+				foreach($tmp as $mimg)
+				{
+					if(substr($mimg,-8) == '.youtube')
+					{
+						continue;
+					}
+					e107::meta('og:image',$tp->thumbUrl($tmp[0],'w=500',false,true) );
+				//	e107::meta('og:image',$mimg);
+				}
+
+			}
+
+			// grab all images in news-body and add to meta.
+			$images = e107::getBB()->getContent('img',$news['news_body'],SITEURL.e_IMAGE."newspost_images/");
+			$c =1;
+			foreach($images as $im)
+			{
+				if($c == 4){ break; }
+				e107::meta('og:image',$im);
+				$c++;
+			}
+
+			// grab all youtube videos in news-body and add thumbnails to meta.
+			$youtube = e107::getBB()->getContent('youtube',$news['news_body']);
+			$c = 1;
+			foreach($youtube as $yt)
+			{
+				if($c == 3){ break; }
+				list($img,$tmp) = explode("?",$yt);
+				e107::meta('og:image',"http://img.youtube.com/vi/".$img."/0.jpg");
+				$c++;
+			}
+
+
+
+			$url = e107::getUrl()->create('news/view/item', $news,'full=1');
+			e107::meta('og:url',$url);
+
+			e107::meta('article:section',$news['category_name']);
+
+			if($news['news_meta_keywords'] && !defined('META_KEYWORDS'))
+			{
+				e107::meta('keywords',$news['news_meta_keywords']);
+				$tmp = explode(",",$news['news_meta_keywords']);
+				foreach($tmp as $t)
+				{
+					e107::meta('article:tag', trim($t));
+				}
+
+				//	define('META_KEYWORDS', $news['news_meta_keywords']); // deprecated
+			}
+
+
+			/* Facebook reference.
+			 * http://developers.facebook.com/docs/opengraph/objects/builtin/
+			 */
+
+			return;
+		}
+
+
+
+		if($news['category_name'] && !defined('e_PAGETITLE') && $type == 'category')
+		{
+			define('e_PAGETITLE', $tp->toHtml($news['category_name'],false,'TITLE_PLAIN'));
+		}
+
+		if($news['category_meta_keywords'] && !defined('META_KEYWORDS'))
+		{
+			define('META_KEYWORDS', $news['category_meta_keywords']);
+		}
+
+		if($news['category_meta_description'] && !defined('META_DESCRIPTION'))
+		{
+			define('META_DESCRIPTION', $news['category_meta_description']);
+		}
+
+
+
+	}
+
+
+
+	private function setNewsCache($cache_tag, $cache_data, $rowData=array())
+	{
+		$e107cache = e107::getCache();
+
+		$e107cache->set($cache_tag, $cache_data);
+		$e107cache->set($cache_tag."_title", defined("e_PAGETITLE") ? e_PAGETITLE : '');
+		$e107cache->set($cache_tag."_diz", defined("META_DESCRIPTION") ? META_DESCRIPTION : '');
+		$e107cache->set($cache_tag."_rows", $rowData);
+
+	}
+
+
+	/**
+	 * @param $cache_tag
+	 * @param string $type 'title' or 'diz' or 'rows' or empty for html.
+	 */
+	private function getNewsCache($cachetag, $type=null)
+	{
+		if(!empty($type))
+		{
+			$cachetag .= "_".$type;
+		}
+
+			e107::getDebug()->log('Retrieving cache string:' . $cachetag);
+
+		return e107::getCache()->retrieve($cachetag);
+	}
+
+	/**
+	 * @param $cacheString
+	 * @return bool|string
+	 */
+	private function checkCache($cacheString)
+	{
+		$e107cache = e107::getCache();
+
+		$cache_data = $e107cache->retrieve($cacheString);
+		$cache_title = $e107cache->retrieve($cacheString."_title");
+		$cache_diz = $e107cache->retrieve($cacheString."_diz");
+		$etitle = ($cache_title != "e_PAGETITLE") ? $cache_title : "";
+		$ediz = ($cache_diz != "META_DESCRIPTION") ? $cache_diz : "";
+
+		if($etitle)
+		{
+			define('e_PAGETITLE', $etitle);
+		}
+
+		if($ediz)
+		{
+			define("META_DESCRIPTION",$ediz);
+		}
+
+		if ($cache_data)
+		{
+			return $cache_data;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+
+	private function renderCache($cache, $nfp = FALSE)
+	{
+		global $pref,$tp,$sql,$CUSTOMFOOTER, $FOOTER,$cust_footer,$ph;
+		global $db_debug,$ns,$eTimingStart, $error_handler, $db_time, $sql2, $mySQLserver, $mySQLuser, $mySQLpassword, $mySQLdefaultdb,$e107;
+
+		return $cache;
+
+		/*if (isset($nfp) && isset($this->pref['nfp_display']) && $this->pref['nfp_display'] == 2)
+		{
+			require_once(e_PLUGIN."newforumposts_main/newforumposts_main.php");
+		}
+		//	render_newscats(); //fixme this shouldn't be here.
+		return $cache;*/
+	}
+
+
+	private function render_newscats() // --  CNN Style Categories. ----
+	{
+		$tp = e107::getParser();
+		$ns = e107::getRender();
+
+		if (isset($this->pref['news_cats']) && $this->pref['news_cats'] == '1')
+		{
+			$text3 = $tp->toHTML("{NEWS_CATEGORIES}", TRUE, 'TITLE');
+			return $ns->tablerender(LAN_NEWS_23, $text3, 'news_cat', true);
+		}
+	}
+
+
+
+	private function renderListTemplate()
+	{
+
+		$sql = e107::getDb();
+		$tp = e107::getParser();
+
+		global $NEWSLISTSTYLE, $NEWSLISTTITLE;
+
+
+		if($newsCachedPage = checkCache($this->cacheString))
+		{
+			return $this->renderCache($newsCachedPage, TRUE);
+		}
+
+		$category = intval($this->subAction);
+		if ($this->action == 'cat' && $category != 0)
+		{
+
+			$gen = new convert;
+			$sql->select("news_category", "*", "category_id='{$category}'");
+			$row = $sql->fetch();
+			extract($row);  // still required for the table-render.  :(
+		}
+
+		if ($this->action == 'all') // show archive of all news items using list-style template.
+		{
+			$renTypeQry = '';
+
+			if(!empty($this->pref['news_list_templates']) && is_array($this->pref['news_list_templates']))
+			{
+				$renTypeQry = " AND (n.news_render_type REGEXP '(^|,)(".implode("|", $this->pref['news_list_templates']).")(,|$)')";
+			}
+
+		//	$news_total = $sql->count("news", "(*)", "WHERE news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (news_class REGEXP ".$nobody_regexp.") AND news_start < ".time()." AND (news_end=0 || news_end>".time().")". str_replace("n.news", "news", $renTypeQry));
+			$query = "
+			SELECT SQL_CALC_FOUND_ROWS n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_id, nc.category_name, nc.category_sef, nc.category_icon,
+			nc.category_meta_keywords, nc.category_meta_description
+			FROM #news AS n
+			LEFT JOIN #user AS u ON n.news_author = u.user_id
+			LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id
+			WHERE n.news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (n.news_class REGEXP ".$this->nobody_regexp.") AND n.news_start < ".time()."
+			AND (n.news_end=0 || n.news_end>".time().") ";
+
+			$query .= $renTypeQry;
+
+			$query .= "
+			ORDER BY n.news_sticky DESC, n.news_datestamp DESC
+			LIMIT ".intval($this->from).",".deftrue('NEWSALL_LIMIT', NEWSLIST_LIMIT); // NEWSALL_LIMIT just for BC. NEWSLIST_LIMIT is sufficient.
+			$category_name = ($this->defaultTemplate == 'list') ? PAGE_NAME : "All";
+			unset($renTypeQry);
+		}
+		elseif ($this->action == 'cat') // show archive of all news items in a particular category using list-style template.
+		{
+
+		//	$news_total = $sql->count("news", "(*)", "WHERE news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (news_class REGEXP ".$nobody_regexp.") AND news_start < ".time()." AND (news_end=0 || news_end>".time().") AND news_category=".intval($sub_action));
+
+			$query = "
+			SELECT SQL_CALC_FOUND_ROWS n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_id, nc.category_name, nc.category_sef, nc.category_icon, nc.category_meta_keywords,
+			nc.category_meta_description
+			FROM #news AS n
+			LEFT JOIN #user AS u ON n.news_author = u.user_id
+			LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id
+			WHERE n.news_category=".intval($this->subAction)."
+			AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().")
+			AND n.news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (n.news_class REGEXP ".$this->nobody_regexp.")
+			ORDER BY n.news_datestamp DESC
+			LIMIT ".intval($this->from).",".NEWSLIST_LIMIT;
+		}
+		elseif(vartrue($_GET['tag']))
+		{
+			$tagsearch = e107::getParser()->filter($_GET['tag']);
+
+			$query = "
+			SELECT SQL_CALC_FOUND_ROWS n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_id, nc.category_name, nc.category_sef, nc.category_icon, nc.category_meta_keywords,
+			nc.category_meta_description
+			FROM #news AS n
+			LEFT JOIN #user AS u ON n.news_author = u.user_id
+			LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id
+			WHERE n.news_meta_keywords LIKE '%".$tagsearch."%'
+			AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().")
+			AND n.news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (n.news_class REGEXP ".$this->nobody_regexp.")
+			ORDER BY n.news_datestamp DESC
+			LIMIT ".intval($this->from).",".NEWSLIST_LIMIT;
+			$category_name = 'Tag: "'.$tagsearch.'"';
+
+		}
+		elseif(!empty($_GET['author']))
+		{
+			$authorSearch = e107::getParser()->filter($_GET['author']);
+
+			$query = "
+			SELECT SQL_CALC_FOUND_ROWS n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_id, nc.category_name, nc.category_sef, nc.category_icon, nc.category_meta_keywords,
+			nc.category_meta_description
+			FROM #news AS n
+			LEFT JOIN #user AS u ON n.news_author = u.user_id
+			LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id
+			WHERE u.user_name = '".$authorSearch."'
+			AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().")
+			AND n.news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (n.news_class REGEXP ".$this->nobody_regexp.")
+			ORDER BY n.news_datestamp DESC
+			LIMIT ".intval($this->from).",".NEWSLIST_LIMIT;
+			$category_name = 'Author: "'.$authorSearch.'"';
+
+
+
+		}
+
+		$newsList = array();
+
+		if(!empty($query) && $sql->gen($query))
+		{
+			$news_total = $sql->foundRows();
+			$newsList = $sql->db_getList();
+			$ogImageCount = 0;
+			foreach($newsList as $row)
+			{
+				if(!empty($row['news_thumbnail']))
+				{
+					$iurl = (substr($row['news_thumbnail'],0,3)=="{e_") ? $row['news_thumbnail'] : SITEURL.e_IMAGE."newspost_images/".$row['news_thumbnail'];
+					$tmp = explode(",", $iurl);
+
+					if($tp->isImage($tmp[0]))
+					{
+						if($ogImageCount > 6)
+						{
+							break;
+						}
+
+						e107::meta('og:image',$tp->thumbUrl($tmp[0],'w=500',false,true) );
+						$ogImageCount++;
+
+					}
+				}
+
+			}
+		}
+
+
+		if($this->action == 'cat')
+		{
+			$this->setNewsFrontMeta($newsList[1], 'category');
+		}
+	//	elseif($category_name)
+	//	{
+	//		define('e_PAGETITLE', $tp->toHTML($category_name,FALSE,'TITLE'));
+	//	}
+		e107::getDebug()->log("PageTitle: ".e_PAGETITLE);
+		$currentNewsAction = $this->action;
+
+		$action = $currentNewsAction;
+
+		if(deftrue('BOOTSTRAP'))  // v2.x
+		{
+			$template = e107::getTemplate('news', 'news', 'list');
+		}
+		else  // v1.x
+		{
+			if(empty($NEWSLISTSTYLE))
+			{
+				$NEWSLISTSTYLE = "
+				<div style='padding:3px;width:100%'>
+				<table style='border-bottom:1px solid black;width:100%' cellpadding='0' cellspacing='0'>
+				<tr>
+				<td style='vertical-align:top;padding:3px;width:20px'>
+				{NEWS_CATEGORY_ICON}
+				</td><td style='text-align:left;padding:3px'>
+				{NEWSTITLELINK=extend}
+				<br />
+				{NEWS_SUMMARY}
+				<span class='smalltext'>
+				{NEWS_DATE}
+				{NEWSCOMMENTS}
+				</span>
+				</td><td style='width:55px'>
+				{SETIMAGE: w=55&h=55&crop=1}
+				{NEWSTHUMBNAIL}
+				</td></tr></table>
+				</div>\n";
+			}
+
+			$template =  array('start'=>'', 'item'=>$NEWSLISTSTYLE, 'end'=>'');
+
+		}
+
+		// Legacy Styling..
+		$param = array();
+		$param['itemlink'] = (defined("NEWSLIST_ITEMLINK")) ? NEWSLIST_ITEMLINK : "";
+		$param['thumbnail'] =(defined("NEWSLIST_THUMB")) ? NEWSLIST_THUMB : "border:0px";
+		$param['catlink']  = (defined("NEWSLIST_CATLINK")) ? NEWSLIST_CATLINK : "";
+		$param['caticon'] =  (defined("NEWSLIST_CATICON")) ? NEWSLIST_CATICON : defset('ICONSTYLE','');
+		$param['current_action'] = $action;
+		$param['template_key'] = 'list';
+
+		// NEW - allow news batch shortcode override (e.g. e107::getScBatch('news', 'myplugin', true); )
+		e107::getEvent()->trigger('news_list_parse', $newsList);
+
+		$text = '';
+
+		if(vartrue($template['start']))
+		{
+			$text .= $tp->parseTemplate($template['start'], true);
+		}
+
+		if(!empty($newsList))
+		{
+			foreach($newsList as $row)
+			{
+				$text .= $this->ix->render_newsitem($row, 'return', '', $template['item'], $param);
+			}
+		}
+		else // No News - empty.
+		{
+			$text .= "<div class='news-empty'><div class='alert alert-info'>".(strstr(e_QUERY, "month") ? LAN_NEWS_462 : LAN_NEWS_83)."</div></div>";
+		}
+
+		if(vartrue($template['end']))
+		{
+			$text .= $tp->parseTemplate($template['end'], true);
+		}
+
+		$icon = ($row['category_icon']) ? "<img src='".e_IMAGE."icons/".$row['category_icon']."' alt='' />" : "";
+
+		// Deprecated.
+		// $parms = $news_total.",".$amount.",".$newsfrom.",".$e107->url->getUrl('core:news', 'main', "action=nextprev&to_action={$action}&subaction={$category}");
+		//	$parms = $news_total.",".$amount.",".$newsfrom.",".e_SELF.'?'.$action.".".$category.".[FROM]";
+		//
+		//	$text .= "<div class='nextprev'>".$tp->parseTemplate("{NEXTPREV={$parms}}")."</div>";
+
+		$amount 	= NEWSLIST_LIMIT;
+		$nitems 	= defined('NEWS_NEXTPREV_NAVCOUNT') ? '&navcount='.NEWS_NEXTPREV_NAVCOUNT : '' ;
+		$url 		= rawurlencode(e107::getUrl()->create($this->route, $this->newsUrlparms));
+		$parms  	= 'tmpl_prefix='.deftrue('NEWS_NEXTPREV_TMPL', 'default').'&total='.$news_total.'&amount='.$amount.'&current='.$this->from.$nitems.'&url='.$url;
+
+
+		// e107::getDebug()->log($newsUrlparms);
+
+		$text  		.= $tp->parseTemplate("{NEXTPREV={$parms}}");
+
+		if(varset($template['caption'])) // v2.x
+		{
+			$NEWSLISTTITLE = str_replace("{NEWSCATEGORY}",$tp->toHTML($category_name,FALSE,'TITLE'), $template['caption']);
+		}
+		elseif(empty($NEWSLISTTITLE)) // default
+		{
+			$NEWSLISTTITLE = LAN_NEWS_82." '".$tp->toHTML($category_name,FALSE,'TITLE')."'";
+		}
+		else // v1.x
+		{
+			$NEWSLISTTITLE = str_replace("{NEWSCATEGORY}",$tp->toHTML($category_name,FALSE,'TITLE'),$NEWSLISTTITLE);
+		}
+
+		if($this->defaultTemplate != 'list')
+		{
+			$text .= "<div class='center news-list-footer'><a class='btn btn-default' href='".e107::getUrl()->create('news/list/all')."'>".LAN_NEWS_84."</a></div>";
+		}
+
+
+		$cache_data = e107::getRender()->tablerender($NEWSLISTTITLE, $text, 'news', true);
+
+		$this->setNewsCache($this->cacheString, $cache_data);
+
+
+		return $cache_data;
+
+
+
+
+	}
+
+
+	private function renderViewTemplate()
+	{
+		if($newsCachedPage = checkCache($this->cacheString))
+		{
+			$rows = getNewsCache($this->cacheString,'rows');
+			e107::getEvent()->trigger('user_news_item_viewed', $rows);
+
+			return $this->renderCache($newsCachedPage, TRUE);		// This exits if cache used
+		}
+
+		$sql = e107::getDb();
+		// <-- Cache
+
+		if(isset($this->pref['trackbackEnabled']) && $this->pref['trackbackEnabled'])
+		{
+			$query = "
+		    SELECT COUNT(tb.trackback_pid) AS tb_count, n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_id, nc.category_name, nc.category_sef,
+			nc.category_icon, nc.category_meta_keywords, nc.category_meta_description
+		    FROM #news AS n
+			LEFT JOIN #user AS u ON n.news_author = u.user_id
+			LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id
+			LEFT JOIN #trackback AS tb ON tb.trackback_pid  = n.news_id
+			WHERE n.news_id=".intval($this->subAction)." AND n.news_class REGEXP '".e_CLASS_REGEXP."'
+			AND NOT (n.news_class REGEXP ".$this->nobody_regexp.")
+			AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().")
+			GROUP by n.news_id";
+		}
+		else
+		{
+			$query = "
+		    SELECT n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_id, nc.category_name, nc.category_sef, nc.category_icon, nc.category_meta_keywords,
+			nc.category_meta_description
+		    FROM #news AS n
+			LEFT JOIN #user AS u ON n.news_author = u.user_id
+			LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id
+			WHERE n.news_class REGEXP '".e_CLASS_REGEXP."'
+			AND NOT (n.news_class REGEXP ".$this->nobody_regexp.")
+			AND n.news_start < ".time()."
+			AND (n.news_end=0 || n.news_end>".time().")
+			AND n.news_id=".intval($this->subAction);
+		}
+
+
+		if ($sql->gen($query))
+		{
+			$news = $sql->fetch();
+			$id = $news['news_category'];		// Use category of this news item to generate next/prev links
+
+			e107::getEvent()->trigger('user_news_item_viewed', $news);
+
+			//***NEW [SecretR] - comments handled inside now
+			e107::setRegistry('news/page_allow_comments', !$news['news_allow_comments']);
+			if(!$news['news_allow_comments'] && isset($_POST['commentsubmit']))
+			{
+				$pid = intval(varset($_POST['pid'], 0));				// ID of the specific comment being edited (nested comments - replies)
+
+				$clean_authorname = $_POST['author_name'];
+				$clean_comment = $_POST['comment'];
+				$clean_subject = $_POST['subject'];
+
+				e107::getSingleton('comment')->enter_comment($clean_authorname, $clean_comment, 'news', $this->subAction, $pid, $clean_subject);
+			}
+
+			//More SEO
+			$this->setNewsFrontMeta($news);
+			/*
+			if($news['news_title'])
+			{
+			if($this->pref['meta_news_summary'] && $news['news_title'])
+			{
+			define("META_DESCRIPTION",SITENAME.": ".$news['news_title']." - ".$news['news_summary']);
+			}
+			define("e_PAGETITLE",$news['news_title']);
+			}*/
+			/* FIXME - better implementation: cache, shortcodes, do it inside the model/shortcode class itself.
+			if (TRUE)
+			{
+			// Added by nlStart - show links to previous and next news
+			if (!isset($news['news_extended'])) $news['news_extended'] = '';
+			$news['news_extended'].="<div style='text-align:center;'><a href='".e_SELF."?cat.".$id."'>".LAN_NEWS_85."</a> &nbsp; <a href='".e_SELF."'>".LAN_NEWS_84."</a></div>";
+			$prev_query = "SELECT news_id, news_title FROM `#news`
+			WHERE `news_id` < ".intval($sub_action)." AND `news_category`=".$id." AND `news_class` REGEXP '".e_CLASS_REGEXP."'
+			AND NOT (`news_class` REGEXP ".$nobody_regexp.")
+			AND `news_start` < ".time()." AND (`news_end`=0 || `news_end` > ".time().') ORDER BY `news_id` DESC LIMIT 1';
+			$sql->db_Select_gen($prev_query);
+			$prev_news = $sql->db_Fetch();
+			if ($prev_news)
+			{
+			$news['news_extended'].="<div style='float:right;'><a href='".e_SELF."?extend.".$prev_news['news_id']."'>".LAN_NEWS_86."</a></div>";
+			}
+			$next_query = "SELECT news_id, news_title FROM `#news` AS n
+			WHERE `news_id` > ".intval($sub_action)." AND `news_category` = ".$id." AND `news_class` REGEXP '".e_CLASS_REGEXP."'
+			AND NOT (`news_class` REGEXP ".$nobody_regexp.")
+			AND `news_start` < ".time()." AND (`news_end`=0 || `news_end` > ".time().') ORDER BY `news_id` ASC LIMIT 1';
+			$sql->db_Select_gen($next_query);
+			$next_news = $sql->db_Fetch();
+			if ($next_news)
+			{
+			$news['news_extended'].="<div style='float:left;'><a href='".e_SELF."?extend.".$next_news['news_id']."'>".LAN_NEWS_87."</a></div>";
+			}
+			$news['news_extended'].="<br /><br />";
+			}*/
+
+			$currentNewsAction = $this->action;
+
+			$action = $currentNewsAction;
+
+			$param = array();
+			$param['current_action'] = $action;
+			$param['template_key'] = 'view';
+
+			if(vartrue($NEWSSTYLE))
+			{
+				$template =  $NEWSSTYLE;
+			}
+			elseif(function_exists("news_style")) // BC
+			{
+				$template = news_style($news, 'extend', $param);
+			}
+			else
+			{
+				$tmp = e107::getTemplate('news', 'news', 'view');
+				$template = $tmp['item'];
+				unset($tmp);
+			}
+			ob_start();
+			$this->ix->render_newsitem($news, 'extend', '', $template, $param);
+			if(e107::getRegistry('news/page_allow_comments'))
+			{
+				global $comment_edit_query; //FIXME - kill me
+				$comment_edit_query = 'comment.news.'.$news['news_id'];
+				e107::getSingleton('comment')->compose_comment('news', 'comment', $news['news_id'], null, $news['news_title'], FALSE);
+			}
+			$cache_data = ob_get_contents();
+			ob_end_clean();
+
+			$this->setNewsCache($this->cacheString, $cache_data, $news);
+
+			return $cache_data;
+		}
+		else
+		{
+		//	$action = 'default';
+
+			//XXX item not found, redirect to avoid messing up search-engine data.
+			$defaultUrl = e107::getUrl()->create('news/list/items');
+			e107::getRedirect()->go($defaultUrl, null, 301);
+			exit;
+
+		}
+
+
+	}
+
+
+	private function renderDefaultTemplate()
+	{
+		$tp = e107::getParser();
+		$sql = e107::getDb();
+
+		if (empty($this->order))
+		{
+			$order = 'news_datestamp';
+		}
+		$order = $tp -> toDB($this->order, true);			/// @todo - try not to use toDB() - triggers prefilter
+
+		$interval = $this->pref['newsposts'];
+
+
+
+		switch ($this->action)
+		{
+			case "list" :
+				$sub_action = intval($this->subAction);
+				//	$news_total = $sql->db_Count("news", "(*)", "WHERE news_category={$sub_action} AND news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (news_class REGEXP ".$nobody_regexp.") AND news_start < ".time()." AND (news_end=0 || news_end>".time().")");
+				$query = "
+				SELECT  SQL_CALC_FOUND_ROWS n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_id, nc.category_name, nc.category_sef,
+				nc.category_icon, nc.category_meta_keywords, nc.category_meta_description
+				FROM #news AS n
+				LEFT JOIN #user AS u ON n.news_author = u.user_id
+				LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id
+				WHERE n.news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (n.news_class REGEXP ".$this->nobody_regexp.")
+				AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().")
+				AND n.news_category={$sub_action}
+				ORDER BY n.news_sticky DESC,".$order." DESC LIMIT ".intval($this->from).",".ITEMVIEW;
+
+				$noNewsMessage = LAN_NEWS_463;
+				break;
+
+
+			case "item" :
+				$sub_action = intval($this->subAction);
+				$news_total = 1;
+				if(isset($this->pref['trackbackEnabled']) && $this->pref['trackbackEnabled'])
+				{
+					$query = "
+			    SELECT COUNT(tb.trackback_pid) AS tb_count, n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_id, nc.category_name, nc.category_sef,
+				nc.category_icon, nc.category_meta_keywords, nc.category_meta_description
+				FROM #news AS n
+				LEFT JOIN #user AS u ON n.news_author = u.user_id
+				LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id
+				LEFT JOIN #trackback AS tb ON tb.trackback_pid  = n.news_id
+				WHERE n.news_id=".$this->subAction." AND n.news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (n.news_class REGEXP ".$this->nobody_regexp.")
+				AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().")
+				GROUP by n.news_id";
+				}
+				else
+				{
+					$query = "
+			    SELECT n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_id, nc.category_name, nc.category_sef, nc.category_icon,
+				nc.category_meta_keywords, nc.category_meta_description
+				FROM #news AS n
+				LEFT JOIN #user AS u ON n.news_author = u.user_id
+				LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id
+				WHERE n.news_id=".$this->subAction." AND n.news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (n.news_class REGEXP ".$this->nobody_regexp.")
+				AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().")";
+				}
+
+				$noNewsMessage = LAN_NEWS_83;
+				break;
+
+
+			case "month" :
+			case "day" :
+				$item = $tp -> toDB($this->subAction).'20000101';
+				$year = substr($item, 0, 4);
+				$month = substr($item, 4,2);
+
+
+
+				if ($this->action == 'day')
+				{
+					$day = substr($item, 6, 2);
+					$lastday = $day;
+					$startdate = mktime(0, 0, 0, $month, $day, $year);
+				}
+				else
+				{	// A month's worth
+					$day = 1;
+					$startdate = mktime(0, 0, 0, $month, $day, $year);
+					$lastday = date("t", $startdate);
+				}
+
+
+				$enddate = mktime(23, 59, 59, $month, $lastday, $year);
+
+				$query = "
+				SELECT SQL_CALC_FOUND_ROWS n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_id, nc.category_name, nc.category_sef,
+				nc.category_icon, nc.category_meta_keywords, nc.category_meta_description
+				FROM #news AS n
+				LEFT JOIN #user AS u ON n.news_author = u.user_id
+				LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id
+				WHERE n.news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (n.news_class REGEXP ".$this->nobody_regexp.")
+				AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().")
+				AND (FIND_IN_SET('0', n.news_render_type) OR FIND_IN_SET(1, n.news_render_type)) AND n.news_datestamp BETWEEN {$startdate} AND {$enddate}
+				ORDER BY ".$order." DESC LIMIT ".intval($this->from).",".ITEMVIEW;
+
+				$noNewsMessage = LAN_NEWS_462;
+
+				break;
+
+			case 'default' :
+			default :
+				//$action = '';
+				$this->cacheString = 'news.php_default_';		// Make sure its sensible
+				//	$news_total = $sql->db_Count("news", "(*)", "WHERE news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (news_class REGEXP ".$nobody_regexp.") AND news_start < ".time()." AND (news_end=0 || news_end>".time().") AND news_render_type<2" );
+
+				if(!isset($this->pref['newsposts_archive']))
+				{
+					$this->pref['newsposts_archive'] = 0;
+				}
+				$interval = $this->pref['newsposts']-$this->pref['newsposts_archive'];		// Number of 'full' posts to show
+
+				// Get number of news item to show
+				if(isset($this->pref['trackbackEnabled']) && $this->pref['trackbackEnabled']) {
+					$query = "
+				SELECT SQL_CALC_FOUND_ROWS COUNT(tb.trackback_pid) AS tb_count, n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_id,
+				nc.category_name, nc.category_sef, nc.category_icon, nc.category_meta_keywords, nc.category_meta_description,
+				COUNT(*) AS tbcount
+				FROM #news AS n
+				LEFT JOIN #user AS u ON n.news_author = u.user_id
+				LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id
+				LEFT JOIN #trackback AS tb ON tb.trackback_pid  = n.news_id
+				WHERE n.news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (n.news_class REGEXP ".$this->nobody_regexp.")
+				AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().")
+				AND (FIND_IN_SET('0', n.news_render_type) OR FIND_IN_SET(1, n.news_render_type))
+				GROUP by n.news_id
+				ORDER BY news_sticky DESC, ".$order." DESC LIMIT ".intval($this->from).",".ITEMVIEW;
+				}
+				else
+				{
+					$query = "
+				SELECT SQL_CALC_FOUND_ROWS n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_id, nc.category_name, nc.category_sef, nc.category_icon,
+				nc.category_meta_keywords, nc.category_meta_description
+				FROM #news AS n
+				LEFT JOIN #user AS u ON n.news_author = u.user_id
+				LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id
+				WHERE n.news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (n.news_class REGEXP ".$this->nobody_regexp.")
+				AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().")
+				AND (FIND_IN_SET('0', n.news_render_type) OR FIND_IN_SET(1, n.news_render_type))
+				ORDER BY n.news_sticky DESC, ".$order." DESC LIMIT ".intval($this->from).",".ITEMVIEW;
+				}
+
+				$noNewsMessage = LAN_NEWS_83;
+		}	// END - switch($action)
+
+
+		if($newsCachedPage = checkCache($this->cacheString)) // normal news front-page - with cache.
+		{
+
+
+			if(!$this->action)
+			{
+				// Removed, themes should use {FEATUREBOX} shortcode instead
+				//		if (isset($this->pref['fb_active']))
+				//		{
+				//			require_once(e_PLUGIN."featurebox/featurebox.php");
+				//		}
+				// Removed, legacy
+				// if (isset($this->pref['nfp_display']) && $this->pref['nfp_display'] == 1)
+				// {
+					// require_once(e_PLUGIN."newforumposts_main/newforumposts_main.php");
+				// }
+
+			}
+
+			//news archive
+			if ($this->action != "item" && $this->action != 'list' && $this->pref['newsposts_archive'])
+			{
+				$sql = e107::getDb();
+
+				if ($sql->gen($query))
+				{
+					$newsAr = $sql -> db_getList();
+
+					if($newsarchive = $this->checkCache('newsarchive'))
+					{
+						$newsCachedPage = $newsCachedPage.$newsarchive;
+					}
+					else
+					{
+						$this->show_newsarchive($newsAr,$interval);
+					}
+				}
+			}
+			$this->renderCache($newsCachedPage, TRUE);
+		}
+
+
+		if (!($news_total = $sql->gen($query)))
+		{  // No news items
+
+			return "<div class='news-empty'><div class='alert alert-info' style='text-align:center'>".$noNewsMessage."</div></div>";
+
+		}
+
+		$newsAr = $sql -> db_getList();
+		$news_total=$sql->total_results;
+		// Get number of entries
+		//$sql -> db_Select_gen("SELECT FOUND_ROWS()");
+	//	$frows = $sql -> db_Fetch();
+		//$news_total = $frows[0];
+
+		//echo "<br />Total ".$news_total." items found, ".count($newsAr)." displayed, Interval = {$interval}<br /><br />";
+
+		$p_title = ($this->action == "item") ? $newsAr[1]['news_title'] : $tp->toHTML($newsAr[1]['category_name'],FALSE,'TITLE');
+
+		switch($this->action)
+		{
+			case 'item':
+				$this->setNewsFrontMeta($newsAr[1]);
+				break;
+
+			case 'list':
+			default:
+				$this->setNewsFrontMeta($newsAr[1], 'list');
+				break;
+		}
+
+		/*if($action != "" && !is_numeric($action))
+		{
+		if($action == "item" && $this->pref['meta_news_summary'] && $newsAr[1]['news_title'])
+		{
+		define("META_DESCRIPTION",SITENAME.": ".$newsAr[1]['news_title']." - ".$newsAr[1]['news_summary']);
+		}
+		define("e_PAGETITLE", $p_title);
+		}*/
+
+		$currentNewsAction = $this->action;
+
+		$action = $currentNewsAction;
+
+		if(!$action)
+		{
+			// Removed, themes should use {FEATUREBOX} shortcode instead
+			//	if (isset($this->pref['fb_active'])){   // --->feature box
+			//		require_once(e_PLUGIN."featurebox/featurebox.php");
+			//	}
+
+			// Removed, legacy
+			// if (isset($this->pref['nfp_display']) && $this->pref['nfp_display'] == 1){
+				// require_once(e_PLUGIN."newforumposts_main/newforumposts_main.php");
+			// }
+		}
+
+		if(isset($this->pref['news_unstemplate']) && $this->pref['news_unstemplate'] && file_exists(THEME."news_template.php"))
+		{
+			// theme specific template required ...
+
+			$ALTERNATECLASSES = null;
+			$NEWSCLAYOUT = null;
+
+			require_once(THEME."news_template.php");
+
+			if(empty($ALTERNATECLASS1))
+			{
+				return TRUE;
+			}
+
+			$newscolumns = (isset($NEWSCOLUMNS) ? $NEWSCOLUMNS : 1);
+			$newspercolumn = (isset($NEWSITEMSPERCOLUMN) ? $NEWSITEMSPERCOLUMN : 10);
+			$newsdata = array();
+			$loop = 1;
+			$param = array();
+			$param['current_action'] = $action;
+			foreach($newsAr as $news) {
+
+				if(is_array($ALTERNATECLASSES))
+				{
+					$newsdata[$loop] .= "<div class='{$ALTERNATECLASSES[0]}'>".$this->ix->render_newsitem($news, "return", '', '', $param)."</div>";
+					$ALTERNATECLASSES = array_reverse($ALTERNATECLASSES);
+				}
+				else
+				{
+					$newsdata[$loop] .= $this->ix->render_newsitem($news, 'return', '', '', $param);
+				}
+				$loop ++;
+				if($loop > $newscolumns) {
+					$loop = 1;
+				}
+			}
+			$loop = 1;
+			foreach($newsdata as $data) {
+				$var = "ITEMS{$loop}";
+				$$var = $data;
+				$loop ++;
+			}
+			$text = preg_replace("/\{(.*?)\}/e", '$\1', $NEWSCLAYOUT);
+
+
+			// Deprecated
+			// $parms = $news_total.",".ITEMVIEW.",".$newsfrom.",".$e107->url->getUrl('core:news', 'main', "action=nextprev&to_action=".($action ? $action : 'default' )."&subaction=".($sub_action ? $sub_action : "0"));
+
+			$sub_action = intval($sub_action);
+			//    $parms = $news_total.",".ITEMVIEW.",".$newsfrom.",".e_SELF.'?'.($action ? $action : 'default' ).($sub_action ? ".".$sub_action : ".0").".[FROM]";
+
+			$amount = ITEMVIEW;
+			$nitems = defined('NEWS_NEXTPREV_NAVCOUNT') ? '&navcount='.NEWS_NEXTPREV_NAVCOUNT : '' ;
+			$url = rawurlencode(e107::getUrl()->create($this->route, $this->newsUrlparms));
+			$parms  = 'tmpl_prefix='.deftrue('NEWS_NEXTPREV_TMPL', 'default').'&total='.$news_total.'&amount='.$amount.'&current='.$this->from.$nitems.'&url='.$url;
+
+			$text  .= $tp->parseTemplate("{NEXTPREV={$parms}}");
+
+			//    $nextprev = $tp->parseTemplate("{NEXTPREV={$parms}}");
+			//    $text .= ($nextprev ? "<div class='nextprev'>".$nextprev."</div>" : "");
+			//    $text=''.$text.'<center>'.$nextprev.'</center>';
+
+			echo $text;
+			$this->setNewsCache($this->cacheString, $text);
+		}
+		else
+		{
+			ob_start();
+
+			$newpostday = 0;
+			$thispostday = 0;
+			$this->pref['newsHeaderDate'] = 1;
+			$gen = new convert();
+			/*
+			if(vartrue($NEWSLISTSTYLE)) $template =  $NEWSLISTSTYLE; v1.x doesn't do this.. so no point doing it here.
+			else
+			{
+				$tmp = e107::getTemplate('news', 'news', 'list');
+				$template = $tmp['item'];
+				unset($tmp);
+			}
+			*/
+			if (!defined("DATEHEADERCLASS")) {
+				define("DATEHEADERCLASS", "nextprev");
+				// if not defined in the theme, default class nextprev will be used for new date header
+			}
+
+			// #### normal newsitems, rendered via render_newsitem(), the $query is changed above (no other changes made) ---------
+			$param = array();
+			$param['current_action'] = $action;
+			$param['template_key'] = 'default';
+
+			// Get Correct Template
+			// XXX we use $NEWSLISTSTYLE above - correct as we are currently in list mode - XXX No this is not NEWSLISTSTYLE - which provides only summaries.
+			// TODO requires BC testing if we comment this one
+			if(vartrue($NEWSSTYLE))
+			{
+				$template =  $NEWSSTYLE;
+			}
+			else
+			{
+				$tmp = e107::getTemplate('news', 'news', 'default'); // default - we show the full items, except for the 'extended' part..
+				$template = $tmp['item'];
+				unset($tmp);
+			}
+
+
+
+			// NEW - news category title when in list
+			if($sub_action && 'list' == $action && vartrue($newsAr[1]['category_name']))
+			{
+				// we know category name - pass it to the nexprev url
+				$category_name = $newsAr[1]['category_name'];
+				if(vartrue($newsAr[1]['category_sef'])) $newsUrlparms['name'] = $newsAr[1]['category_sef'];
+				if(!isset($NEWSLISTCATTITLE))
+				{
+					$NEWSLISTCATTITLE = "<h1 class='newscatlist-title'>".$tp->toHTML($category_name,FALSE,'TITLE')."</h1>";
+				}
+				else
+				{
+					$NEWSLISTCATTITLE = str_replace("{NEWSCATEGORY}",$tp->toHTML($category_name,FALSE,'TITLE'),$NEWSLISTCATTITLE);
+				}
+				echo $NEWSLISTCATTITLE;
+			}
+
+			$i= 1;
+
+			$socialInstalled = e107::isInstalled('social');
+
+			while(isset($newsAr[$i]) && $i <= $interval)
+			{
+				$news = $newsAr[$i];
+
+				// Set the Values for the social shortcode usage.
+				if($socialInstalled == true)
+				{
+					$socialArray = array('url'=>e107::getUrl()->create('news/view/item', $news, 'full=1'), 'title'=>$tp->toText($news['news_title']), 'tags'=>$news['news_meta_keywords']);
+					$socialObj = e107::getScBatch('social');
+
+					if(is_object($socialObj))
+					{
+						$socialObj->setVars($socialArray);
+					}
+				}
+
+				if(function_exists("news_style")) // BC
+				{
+					$template = news_style($news, $action, $param);
+				}
+
+
+				//        render new date header if pref selected ...
+				$thispostday = strftime("%j", $news['news_datestamp']);
+				if ($newpostday != $thispostday && (isset($this->pref['news_newdateheader']) && $this->pref['news_newdateheader']))
+				{
+					echo "<div class='".DATEHEADERCLASS."'>".strftime("%A %d %B %Y", $news['news_datestamp'])."</div>";
+				}
+				$newpostday = $thispostday;
+				$news['category_id'] = $news['news_category'];
+				if ($action == "item")
+				{
+					unset($news['news_render_type']);
+					e107::getEvent()->trigger('user_news_item_viewed', $news);
+					//e107::getDebug()->log($news);
+				}
+				// $template = false;
+				$this->ix->render_newsitem($news, 'default', '', $template, $param);
+
+
+				$i++;
+			}
+
+			$amount = ITEMVIEW;
+			$nitems = defined('NEWS_NEXTPREV_NAVCOUNT') ? '&navcount='.NEWS_NEXTPREV_NAVCOUNT : '' ;
+			$url = rawurlencode(e107::getUrl()->create($this->route, $this->newsUrlparms));
+			// Example of passing route data instead building the URL outside the shortcode - for a reference only
+			// $url = rawurlencode('url::'.$newsRoute.'::'.http_build_query($newsUrlparms, null, '&'));
+			$parms  = 'tmpl_prefix='.deftrue('NEWS_NEXTPREV_TMPL', 'default').'&total='.$news_total.'&amount='.$amount.'&current='.$this->from.$nitems.'&url='.$url;
+
+			echo $tp->parseTemplate("{NEXTPREV={$parms}}");
+
+			//	$parms = $news_total.",".ITEMVIEW.",".$newsfrom.",".e_SELF.'?'.($action ? $action : 'default' ).($sub_action ? ".".$sub_action : ".0").".[FROM]";
+			//	$nextprev = $tp->parseTemplate("{NEXTPREV={$parms}}");
+			// 	echo ($nextprev ? "<div class='nextprev'>".$nextprev."</div>" : "");
+
+			$cache_data = ob_get_clean();
+
+			$this->setNewsCache($this->cacheString, $cache_data);
+
+			return $cache_data;
+		}
+
+	}
+}
+
+$newsObj = new news_front;
+require_once(HEADERF);
+$newsObj->render();
+$newsObj->debug();
+require_once(FOOTERF);
+exit;
+
+
+
+
+//require_once(e_HANDLER."comment_class.php");
+//$cobj = new comment;
+
+
+
+//------------------------------------------------------
+//		DISPLAY NEWS IN 'CATEGORY' LIST FORMAT HERE
+//------------------------------------------------------
+// Just title and a few other details
+
+
+
+
+
+//------------------------------------------------------
+//		DISPLAY SINGLE ITEM IN EXTENDED FORMAT HERE
+//------------------------------------------------------
+
+
+
+//------------------------------------------------------
+//			DISPLAY NEWS IN LIST FORMAT HERE
+//------------------------------------------------------
+// Show title, author, first part of news item...
+
+
+// ##### --------------------------------------------------------------------------------------------------------------
+
+
+// #### new: news archive ---------------------------------------------------------------------------------------------
+
+// #### END -----------------------------------------------------------------------------------------------------------
+
+if ($action != "item") {
+	if (is_numeric($action)){
+		$action = "";
+	}
+	//	$parms = $news_total.",".ITEMVIEW.",".$newsfrom.",".e_SELF.'?'."[FROM].".$action.(isset($sub_action) ? ".".$sub_action : "");
+	//	$nextprev = $tp->parseTemplate("{NEXTPREV={$parms}}");
+	//	echo ($nextprev ? "<div class='nextprev'>".$nextprev."</div>" : "");
+}
+
+if(is_dir("remotefile")) {
+	require_once(e_HANDLER."file_class.php");
+	$file = new e_file;
+	//	$reject = array('$.','$..','/','CVS','thumbs.db','*._$', 'index', 'null*', 'Readme.txt');
+	//	$crem = $file -> get_files(e_BASE."remotefile", "", $reject);
+	$crem = $file -> get_files(e_BASE."remotefile", '~Readme\.txt');
+	if(count($crem)) {
+		foreach($crem as $loadrem) {
+			if(strstr($loadrem['fname'], "load_")) {
+				require_once(e_BASE."remotefile/".$loadrem['fname']);
+			}
+		}
+	}
+}
+
+if (isset($this->pref['nfp_display']) && $this->pref['nfp_display'] == 2 && is_readable(e_PLUGIN."newforumposts_main/newforumposts_main.php"))
+{
+	require_once(e_PLUGIN."newforumposts_main/newforumposts_main.php");
+}
+
+render_newscats();
+
+require_once(FOOTERF);
+
+
+// =========================================================================
+
+
+?>
diff --git a/news.php b/news.php
index 9f507ae82..e0d0ce63c 100644
--- a/news.php
+++ b/news.php
@@ -20,6 +20,13 @@
  */
 
 require_once("class2.php");
+
+if(e_DEBUG === 'news')
+{
+	require_once(e_PLUGIN."news/news.php");
+//	exit;
+}
+
 include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 require_once(e_HANDLER."news_class.php");
@@ -185,7 +192,7 @@ if(!empty($_GET['author']) || substr($action,0,4) == 'author=')
 }
 
 
-if(E107_DBG_PATH)
+if(e_DEBUG === 'news')
 {
 	echo "<div class='alert alert-info'>";
 	echo "<h4>SEF Debug Info</h4>";

From a9a56a761275e032cfd500c1015442031167122a Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 12 Dec 2016 12:52:17 -0800
Subject: [PATCH 13/31] More debug info added.

---
 e107_plugins/news/news.php | 41 +++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php
index 64db37a7f..d086f4e3c 100644
--- a/e107_plugins/news/news.php
+++ b/e107_plugins/news/news.php
@@ -36,6 +36,7 @@ class news_front
 	private $newsUrlparms = array();
 	private $text = null;
 	private $pref = array();
+	private $debugInfo = array();
 
 	function __construct()
 	{
@@ -266,20 +267,38 @@ class news_front
 	public function debug()
 	{
 		echo "<div class='alert alert-info'>";
-		echo "<h4>SEF Debug Info</h4>";
-		echo "action= ".$this->action."  ";
-		echo "<br />subaction= ".$this->subAction."  ";
-		echo "<br />route= ".$this->route."  ";
-		echo "<br />e_QUERY= ".e_QUERY."  ";
+		echo "<h4>News Debug Info</h4>";
+		echo "<b>action:</b> ".$this->action."  ";
+		echo "<br /><b>subaction:</b> ".$this->subAction."  ";
+		echo "<br /><b>route</b> ".$this->route."  ";
+		echo "<br /><b>e_QUERY:</b> ".e_QUERY."  ";
+
+		echo "<br /><b>_GET:</b> ".print_r($_GET,true);
+
+		foreach($this->debugInfo as $key=>$val)
+		{
+			echo "<br /><b>".$key.":</b> ".$val;
+		}
+
 
-		echo "<br />_GET= ".print_r($_GET,true);
 		echo "</div>";
 
 
 	}
 
 
+	private function addDebug($key,$message)
+	{
+		if(is_array($message))
+		{
+			$this->debugInfo[$key] = print_a($message,true);
+		}
+		else
+		{
+			$this->debugInfo[$key] = $message;
+		}
 
+	}
 
 	// ----------- old functions ------------------------
 
@@ -553,7 +572,7 @@ class news_front
 
 	private function renderListTemplate()
 	{
-
+		$this->addDebug("Method",'renderListTemplate()');
 		$sql = e107::getDb();
 		$tp = e107::getParser();
 
@@ -823,11 +842,13 @@ class news_front
 
 	private function renderViewTemplate()
 	{
+		$this->addDebug("Method",'renderViewTemplate()');
+
 		if($newsCachedPage = checkCache($this->cacheString))
 		{
-			$rows = getNewsCache($this->cacheString,'rows');
+			$rows = $this->getNewsCache($this->cacheString,'rows');
 			e107::getEvent()->trigger('user_news_item_viewed', $rows);
-
+			$this->addDebug("Event-triggered:user_news_item_viewed", $rows);
 			return $this->renderCache($newsCachedPage, TRUE);		// This exits if cache used
 		}
 
@@ -870,6 +891,7 @@ class news_front
 			$id = $news['news_category'];		// Use category of this news item to generate next/prev links
 
 			e107::getEvent()->trigger('user_news_item_viewed', $news);
+			$this->addDebug("Event-triggered:user_news_item_viewed", $news);
 
 			//***NEW [SecretR] - comments handled inside now
 			e107::setRegistry('news/page_allow_comments', !$news['news_allow_comments']);
@@ -978,6 +1000,7 @@ class news_front
 
 	private function renderDefaultTemplate()
 	{
+		$this->addDebug("Method",'renderDefaultTemplate()');
 		$tp = e107::getParser();
 		$sql = e107::getDb();
 

From 51ce94b389e64f090b70d25b29f201683fdd8016 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 12 Dec 2016 13:02:17 -0800
Subject: [PATCH 14/31] Some basic bootstrap styling in the News Categories
 shortcode.

---
 e107_core/shortcodes/single/news_categories.sc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/e107_core/shortcodes/single/news_categories.sc b/e107_core/shortcodes/single/news_categories.sc
index 99bfd8921..8c63b8e16 100644
--- a/e107_core/shortcodes/single/news_categories.sc
+++ b/e107_core/shortcodes/single/news_categories.sc
@@ -61,7 +61,7 @@ $nbr_cols = (defined("NEWSCAT_COLS")) ? NEWSCAT_COLS : $nbr_cols;
 	{
 		$NEWSCAT_ITEM = "
 		<div style='width:100%;padding-bottom:2px'>
-		<table style='width:100%' cellpadding='0' cellspacing='0' border='0'>
+		<table class='news-category table' style='width:100%' cellpadding='0' cellspacing='0' border='0'>
 		<tr>
 		<td style='width:2px;vertical-align:top'>&#8226;
 		</td>
@@ -85,7 +85,7 @@ $nbr_cols = (defined("NEWSCAT_COLS")) ? NEWSCAT_COLS : $nbr_cols;
 	}
 	if(!defined("NEWSCAT_STYLE"))
 	{
-			define("NEWSCAT_STYLE","width:96%");
+			define("NEWSCAT_STYLE",'');
 	}
 	if(!defined("NEWSCAT_CATICON"))
 	{
@@ -131,7 +131,7 @@ $nbr_cols = (defined("NEWSCAT_COLS")) ? NEWSCAT_COLS : $nbr_cols;
 	
 	$text3 = "\n\n\n
 	<div style='width:100%;text-align:center;margin-left:auto;margin-right:auto'>
-	<table style='".NEWSCAT_STYLE."'  cellpadding='0' cellspacing='0'>
+	<table class='table' style='".NEWSCAT_STYLE."'  cellpadding='0' cellspacing='0'>
 	\n";
 	$t = 0;
 	$wid = floor(100/$nbr_cols);

From 2296cf33e9cf43c6355f8fee584dddc883ea5e00 Mon Sep 17 00:00:00 2001
From: rica-carv <rica-carv@users.noreply.github.com>
Date: Tue, 13 Dec 2016 13:48:13 +0000
Subject: [PATCH 15/31] Update forum_shortcodes.php

---
 e107_plugins/forum/shortcodes/batch/forum_shortcodes.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
index 4593a3add..46f16fe12 100644
--- a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
@@ -418,13 +418,13 @@ class forum_shortcodes extends e_shortcode
 
 	function sc_lastpostuser()
 	{
-        return $this->sc_lastpost('username');
+        return $this->sc_lastpost(['type'=>'username']);
 	}
 
 
 	function sc_lastpostdate()
 	{
-        return $this->sc_lastpost('datelink');
+        return $this->sc_lastpost(['type'=>'datelink']);
 	}
 
 

From 7858c84da0002a473dcdcebf448e8742039c3436 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 13 Dec 2016 08:58:00 -0800
Subject: [PATCH 16/31] News cache and comment fixes.

---
 e107_handlers/cache_handler.php |  6 +++
 e107_plugins/news/news.php      | 80 +++++++++++++++++++++++++--------
 2 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/e107_handlers/cache_handler.php b/e107_handlers/cache_handler.php
index 652cc5090..05c2933c6 100644
--- a/e107_handlers/cache_handler.php
+++ b/e107_handlers/cache_handler.php
@@ -45,6 +45,12 @@ class ecache {
 	 */
 	public function setMD5($text, $hash=true)
 	{
+		if($text === null)
+		{
+			$this->CachePageMD5 = md5(e_BASE.e_LANGUAGE.THEME.USERCLASS_LIST.defset('e_QUERY').filemtime(THEME.'theme.php'));
+			return $this;
+		}
+
 		$this->CachePageMD5 = ($hash === true) ? md5($text) : $text;
 		return $this;
 	}
diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php
index d086f4e3c..0db0cce18 100644
--- a/e107_plugins/news/news.php
+++ b/e107_plugins/news/news.php
@@ -480,11 +480,13 @@ class news_front
 	private function setNewsCache($cache_tag, $cache_data, $rowData=array())
 	{
 		$e107cache = e107::getCache();
+		$e107cache->setMD5(null,true);
 
 		$e107cache->set($cache_tag, $cache_data);
 		$e107cache->set($cache_tag."_title", defined("e_PAGETITLE") ? e_PAGETITLE : '');
 		$e107cache->set($cache_tag."_diz", defined("META_DESCRIPTION") ? META_DESCRIPTION : '');
-		$e107cache->set($cache_tag."_rows", $rowData);
+
+		$e107cache->set($cache_tag."_rows", e107::serialize($rowData,'json'));
 
 	}
 
@@ -499,10 +501,17 @@ class news_front
 		{
 			$cachetag .= "_".$type;
 		}
+		$this->addDebug('CaheString lookup', $cachetag);
+		e107::getDebug()->log('Retrieving cache string:' . $cachetag);
 
-			e107::getDebug()->log('Retrieving cache string:' . $cachetag);
+		$ret =  e107::getCache()->setMD5(null)->retrieve($cachetag);
 
-		return e107::getCache()->retrieve($cachetag);
+		if($type == 'rows')
+		{
+			return e107::unserialize($ret);
+		}
+
+		return $ret;
 	}
 
 	/**
@@ -512,6 +521,8 @@ class news_front
 	private function checkCache($cacheString)
 	{
 		$e107cache = e107::getCache();
+		$this->addDebug("checkCache", 'true');
+		$e107cache->setMD5(null);
 
 		$cache_data = $e107cache->retrieve($cacheString);
 		$cache_title = $e107cache->retrieve($cacheString."_title");
@@ -844,12 +855,19 @@ class news_front
 	{
 		$this->addDebug("Method",'renderViewTemplate()');
 
-		if($newsCachedPage = checkCache($this->cacheString))
+		if($newsCachedPage = $this->checkCache($this->cacheString))
 		{
+			$this->addDebug("Cache",'active');
 			$rows = $this->getNewsCache($this->cacheString,'rows');
 			e107::getEvent()->trigger('user_news_item_viewed', $rows);
 			$this->addDebug("Event-triggered:user_news_item_viewed", $rows);
-			return $this->renderCache($newsCachedPage, TRUE);		// This exits if cache used
+			$text = $this->renderCache($newsCachedPage, TRUE);		// This exits if cache used
+			$text .= $this->renderComments($rows);
+			return $text;
+		}
+		else
+		{
+			$this->addDebug("Cache",'inactive');
 		}
 
 		$sql = e107::getDb();
@@ -968,20 +986,18 @@ class news_front
 				$template = $tmp['item'];
 				unset($tmp);
 			}
+
 			ob_start();
-			$this->ix->render_newsitem($news, 'extend', '', $template, $param);
-			if(e107::getRegistry('news/page_allow_comments'))
-			{
-				global $comment_edit_query; //FIXME - kill me
-				$comment_edit_query = 'comment.news.'.$news['news_id'];
-				e107::getSingleton('comment')->compose_comment('news', 'comment', $news['news_id'], null, $news['news_title'], FALSE);
-			}
-			$cache_data = ob_get_contents();
+				$this->ix->render_newsitem($news, 'extend', '', $template, $param);
+				$cache_data = ob_get_contents();
 			ob_end_clean();
 
 			$this->setNewsCache($this->cacheString, $cache_data, $news);
 
-			return $cache_data;
+			$text = $cache_data;
+			$text .= $this->renderComments($news);
+
+			return $text;
 		}
 		else
 		{
@@ -998,6 +1014,31 @@ class news_front
 	}
 
 
+	private function renderComments($news)
+	{
+		$this->addDebug("Calling", "renderComments()");
+
+	//	if(e107::getRegistry('news/page_allow_comments'))
+		if(isset($news['news_allow_comments']) && empty($news['news_allow_comments'])) // ie. comments active
+		{
+			global $comment_edit_query; //FIXME - kill me
+			$comment_edit_query = 'comment.news.'.$news['news_id'];
+			$comments = e107::getComment()->compose_comment('news', 'comment', $news['news_id'], null, $news['news_title'], false, true);
+
+
+			if(!empty($comments))
+			{
+				return e107::getRender()->tablerender($comments['caption'],$comments['comment_form'] . $comments['comment'],'comment', true);
+			}
+
+		}
+
+		$this->addDebug("Failed", "renderComments()");
+
+		return '';
+	}
+
+
 	private function renderDefaultTemplate()
 	{
 		$this->addDebug("Method",'renderDefaultTemplate()');
@@ -1012,7 +1053,7 @@ class news_front
 
 		$interval = $this->pref['newsposts'];
 
-
+		global $NEWSSTYLE;
 
 		switch ($this->action)
 		{
@@ -1151,7 +1192,7 @@ class news_front
 		}	// END - switch($action)
 
 
-		if($newsCachedPage = checkCache($this->cacheString)) // normal news front-page - with cache.
+		if($newsCachedPage = $this->checkCache($this->cacheString)) // normal news front-page - with cache.
 		{
 
 
@@ -1297,7 +1338,7 @@ class news_front
 			// Deprecated
 			// $parms = $news_total.",".ITEMVIEW.",".$newsfrom.",".$e107->url->getUrl('core:news', 'main', "action=nextprev&to_action=".($action ? $action : 'default' )."&subaction=".($sub_action ? $sub_action : "0"));
 
-			$sub_action = intval($sub_action);
+		//	$sub_action = intval($sub_action);
 			//    $parms = $news_total.",".ITEMVIEW.",".$newsfrom.",".e_SELF.'?'.($action ? $action : 'default' ).($sub_action ? ".".$sub_action : ".0").".[FROM]";
 
 			$amount = ITEMVIEW;
@@ -1447,7 +1488,10 @@ class news_front
 $newsObj = new news_front;
 require_once(HEADERF);
 $newsObj->render();
-$newsObj->debug();
+if(E107_DBG_BASIC)
+{
+	$newsObj->debug();
+}
 require_once(FOOTERF);
 exit;
 

From 2e3e980f1366375053902f32f5d9a9a1bbc575a8 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 13 Dec 2016 11:22:07 -0800
Subject: [PATCH 17/31] Fix for news-comment moderate button. Use https for
 generated YouTube thumbnails.

---
 e107_handlers/comment_class.php | 2 +-
 e107_handlers/e_parse_class.php | 2 +-
 e107_plugins/news/news.php      | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/e107_handlers/comment_class.php b/e107_handlers/comment_class.php
index 99f8f0155..eda234c07 100644
--- a/e107_handlers/comment_class.php
+++ b/e107_handlers/comment_class.php
@@ -1177,7 +1177,7 @@ class comment
 		
 
 		$ret['comment'] = $text;
-		
+		$ret['moderate'] = $modcomment;
 		$ret['comment_form'] = $comment;
 		$ret['caption'] = "<span id='e-comment-total'>".$this->totalComments."</span> ".LAN_COMMENTS;
 
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 91fe86888..efefb2ac1 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -4060,7 +4060,7 @@ class e_parser
 		if($type == 'youtube')
 		{
 		//	$thumbSrc = "https://i1.ytimg.com/vi/".$id."/0.jpg";
-			$thumbSrc = "http://i1.ytimg.com/vi/".$id."/mqdefault.jpg";
+			$thumbSrc = "https://i1.ytimg.com/vi/".$id."/mqdefault.jpg";
 			$video =  '<iframe class="embed-responsive-item" width="560" height="315" src="//www.youtube.com/embed/'.$id.'?'.$ytqry.'" style="background-size: 100%;background-image: url('.$thumbSrc.');border:0px" allowfullscreen></iframe>';
 
 		
diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php
index 0db0cce18..1d44f6266 100644
--- a/e107_plugins/news/news.php
+++ b/e107_plugins/news/news.php
@@ -1028,7 +1028,8 @@ class news_front
 
 			if(!empty($comments))
 			{
-				return e107::getRender()->tablerender($comments['caption'],$comments['comment_form'] . $comments['comment'],'comment', true);
+				$text = $comments['comment_form'] . $comments['comment'] .$comments['moderate'];
+				return e107::getRender()->tablerender($comments['caption'], $text,'comment', true);
 			}
 
 		}

From 1ebdfb67833544ae0ea81f74e4a167f907d70e67 Mon Sep 17 00:00:00 2001
From: rica-carv <rica-carv@users.noreply.github.com>
Date: Tue, 13 Dec 2016 19:47:06 +0000
Subject: [PATCH 18/31] Update forum_post.php

---
 e107_plugins/forum/forum_post.php | 33 ++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/e107_plugins/forum/forum_post.php b/e107_plugins/forum/forum_post.php
index 673e2beac..f0ce7d119 100644
--- a/e107_plugins/forum/forum_post.php
+++ b/e107_plugins/forum/forum_post.php
@@ -373,20 +373,23 @@ class forum_post_handler
 
 		global $FORUMPOST, $subjectbox, $userbox, $poll_form, $fileattach, $fileattach_alert; // needed for BC.
 
-		$FORUM_POST_TEMPLATE        = array();
-		$FORUM_POSTED_TEMPLATE      = array();
+//--		$FORUM_POST_TEMPLATE        = array();
+//--		$FORUM_POSTED_TEMPLATE      = array();
 		$FORUMREPLYPOSTED           = '';
 		$FORUMTHREADPOSTED          = '';
 		$FORUMPOLLPOSTED            = '';
 
-		$file = "forum_".$type."_template.php";
+//		$file = "forum_".$type."_template.php";
 
-		if($template = e107::getTemplate('forum', 'forum_post'))
+//    var_dump ($type);
+//    var_dump (e107::getTemplate('forum', 'forum_'.$type));
+		if($template = e107::getTemplate('forum', 'forum_'.$type))
 		{
-			$FORUM_POST_TEMPLATE = $template;
+//--		  	$FORUM_POST_TEMPLATE = $template;
 		}
 		elseif (empty($FORUMPOST) && empty($FORUMREPLYPOSTED) && empty($FORUMTHREADPOSTED))
 		{
+  		$file = "forum_".$type."_template.php";
 			if (is_readable(THEME.$file))
 			{
 				include_once(THEME.$file);
@@ -609,27 +612,29 @@ class forum_post_handler
 
 
 
-		if($type == 'post')
+//--		if($type == 'post' || $type == 'posted')
+		if($template)
 		{
-			$template= (deftrue('BOOTSTRAP')) ? $FORUM_POST_TEMPLATE : array('form'=>$FORUMPOST);
+//--			$template= (deftrue('BOOTSTRAP')) ? $FORUM_POST_TEMPLATE : array('form'=>$FORUMPOST);
+			$template= (deftrue('BOOTSTRAP')) ? $template : array('form'=>$FORUMPOST);
 		//	print_a($template);
 			return $this->upgradeTemplate($template);
 		}
 		else
 		{
-			if (deftrue('BOOTSTRAP')) //v2.x
-			{
-				return $FORUM_POSTED_TEMPLATE;
-			}
-			else //v1.x
-			{
+//--			if (deftrue('BOOTSTRAP')) //v2.x
+//--			{
+//--				return $FORUM_POSTED_TEMPLATE;
+//--			}
+//--			else //v1.x
+//--			{
 				return array(
 					 "reply"    => $FORUMREPLYPOSTED,
 					 "thread"   => $FORUMTHREADPOSTED,
 					 "poll"     => $FORUMPOLLPOSTED
 				);
 
-			}
+//--			}
 
 
 		}

From 04cf3a6dc2c68a8c0a0c6d5aa6a94ca7e8a8c33f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=B3na=20Lore?= <lonalore@freemail.hu>
Date: Tue, 13 Dec 2016 20:48:45 +0100
Subject: [PATCH 19/31] Updated Timezone EUF. Use user-defined timezone as
 default date timezone, if it's possible.

---
 class2.php                           |  98 ++++++++++++---
 e107_admin/prefs.php                 |  31 -----
 e107_core/sql/extended_timezones.php | 179 +++++++++++++++------------
 3 files changed, 180 insertions(+), 128 deletions(-)

diff --git a/class2.php b/class2.php
index e6da00ccd..a380759de 100644
--- a/class2.php
+++ b/class2.php
@@ -1127,24 +1127,92 @@ if (($_SERVER['QUERY_STRING'] == 'logout')/* || (($pref['user_tracking'] == 'ses
 	exit();
 }
 
-/*
-* Calculate time zone offset, based on session cookie set in e107.js.
-* (Buyer beware: this may be wrong for the first pageview in a session,
-* which is while the user is logged out, so not a problem...)
-*
-* Time offset is SECONDS. Seconds is much better than hours as a base,
-* as some places have 30 and 45 minute time zones.
-* It matches user clock time, instead of only time zones.
-* Add the offset to MySQL/server time to get user time.
-* Subtract the offset from user time to get server time.
-*
-*/
+/**
+ * @addtogroup timezone
+ * @{
+ */
 
-$tz = vartrue($pref['timezone'], 'UTC'); //TODO Adjust on the front-end based on user timezone value.
+$tzUser = e107::user(USERID);
 
-date_default_timezone_set($tz); // Must be set or PHP Warning thrown. 
+if (varset($tzUser['user_timezone'], false) && systemTimeZoneIsValid($tzUser['user_timezone']))
+{
+	date_default_timezone_set($tzUser['user_timezone']);
+	unset($tzUser);
+}
+else
+{
+	$tz = vartrue($pref['timezone'], 'UTC');
+	date_default_timezone_set($tz);
+	unset($tz);
+}
+
+/**
+ * Generate an array of time zones.
+ *
+ * @return array
+ *  Array of time zones.
+ */
+function systemTimeZones()
+{
+	// Never do something time consuming twice if you can hold onto the results
+	// and re-use them. So we re-use the statically cached value to save time
+	// and memory.
+	static $zones = array();
+
+	// If Timezone list is not populated yet.
+	if(empty($zones))
+	{
+		$zonelist = timezone_identifiers_list();
+		$timeNow = date('m/d/Y H:i', $_SERVER['REQUEST_TIME']);
+
+		foreach($zonelist as $zone)
+		{
+			// Because many time zones exist in PHP only for backward compatibility
+			// reasons and should not be used, the list is filtered by a regular
+			// expression.
+			if(preg_match('!^((Africa|America|Antarctica|Arctic|Asia|Atlantic|Australia|Europe|Indian|Pacific)/|UTC$)!', $zone))
+			{
+				$dateTimeZone = new DateTimeZone($zone);
+				$dateTime = new DateTime($timeNow, $dateTimeZone);
+				$offset = $dateTime->format('O');
+				$offset = chunk_split($offset, 3, ':');
+
+				$zones[$zone] = str_replace('_', ' ', $zone) . ' (' . rtrim($offset, ':') . ')';
+			}
+		}
+
+		// Sort time zones alphabetically.
+		asort($zones);
+	}
+
+	return $zones;
+}
+
+/**
+ * Validate a timezone.
+ *
+ * @param string $zone
+ *  Timezone.
+ *
+ * @return bool
+ */
+function systemTimeZoneIsValid($zone = '')
+{
+	$zones = systemTimeZones();
+	$zoneKeys = array_keys($zones);
+
+	if(in_array($zone, $zoneKeys))
+	{
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * @} End of "addtogroup timezone".
+ */
 
-unset($tz);
 
 
 $e_deltaTime=0;
diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 6178bd11c..62c35d611 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -773,37 +773,6 @@ $text .= "
 ";
 
 
-/**
- * Generate an array of time zones.
- */
-function systemTimeZones()
-{
-	$zonelist = timezone_identifiers_list();
-	$timeNow = date('m/d/Y H:i', $_SERVER['REQUEST_TIME']);
-
-	$zones = array();
-	foreach($zonelist as $zone)
-	{
-		// Because many time zones exist in PHP only for backward compatibility
-		// reasons and should not be used, the list is filtered by a regular
-		// expression.
-		if(preg_match('!^((Africa|America|Antarctica|Arctic|Asia|Atlantic|Australia|Europe|Indian|Pacific)/|UTC$)!', $zone))
-		{
-			$dateTimeZone = new DateTimeZone($zone);
-			$dateTime = new DateTime($timeNow, $dateTimeZone);
-			$offset = $dateTime->format('O');
-			$offset = chunk_split($offset, 3, ':');
-
-			$zones[$zone] = str_replace('_', ' ', $zone) . ' (' . rtrim($offset, ':') . ')';
-		}
-	}
-
-	// Sort time zones alphabetically.
-	asort($zones);
-	return $zones;
-}
-
-
 // =========== Registration Preferences. ==================
 
 
diff --git a/e107_core/sql/extended_timezones.php b/e107_core/sql/extended_timezones.php
index 24955ade9..871aabc4c 100644
--- a/e107_core/sql/extended_timezones.php
+++ b/e107_core/sql/extended_timezones.php
@@ -14,121 +14,136 @@
  * $Author$
  */
 
-if (!defined('e107_INIT')) { exit; }
+if(!defined('e107_INIT'))
+{
+	exit;
+}
 
-/*
-This file is used with the extended user field 'predefined list' type. It is invoked when the value field is 'timezones'.
+/**
+ * @file
+ * This file is used with the extended user field 'predefined list' type. It is
+ * invoked when the value field is 'timezones'.
+ *
+ * It is an example of an extended user field which access a predetermined list
+ * of key-pair values. In this example all the data is loaded into memory; for
+ * other applications the data may be read from a database, possibly with
+ * caching.
+ *
+ * The objective is to provide a uniform interface to such data.
+ *
+ * The class name must be the same as the file name - i.e. the list name
+ * prefixed with 'extended_'.
+ *
+ * The variable name must be 'timezones_list', and is an array of possible
+ * values, each of which is a value => text pair.
+ *
+ * The text is displayed in a drop-down; the value is returned.
+ *
+ * If function timezones_value() exists, it is called to create the displayed
+ * text.
+ */
 
-It is an example of an extended user field which access a predetermined list of key-pair values. In this example all the data is loaded
-into memory; for other applications the data may be read from a database, possibly with caching.
-
-The objective is to provide a uniform interface to such data.
-
-The class name must be the same as the file name - i.e. the list name prefixed with 'extended_'.
-
-The variable name must be 'timezones_list', and is an array of possible values, each of which is a value => text pair
-The text is displayed in a drop-down; the value is returned.
-If function timezones_value() exists, it is called to create the displayed text
-*/
 
+/**
+ * Class extended_timezones.
+ */
 class extended_timezones
 {
 
-	private $timezonesList = array(
-		'-12' => "International DateLine West",
-		'-11' => "Samoa",
-		'-10' => "Hawaii",
-		 '-9' => "Alaska",
-		 '-8' => "Pacific Time (US and Canada)",
-		 '-7' => "Mountain Time (US and Canada)",
-		 '-6' => "Central Time (US and Canada), Central America",
-		 '-5' => "Eastern Time (US and Canada)",
-		 '-4' => "Atlantic Time (Canada)",
-		 '-3.30' => 'Newfoundland',
-		 '-3' => "Greenland, Brasilia, Buenos Aires, Georgetown",
-		 '-2' => "Mid-Atlantic",
-		 '-1' => "Azores, Cape Verde Islands",
-		 '+0' => "UK, Ireland, Lisbon",
-		 '+1' => "West Central Africa, Western Europe",
-		 '+2' => "Greece, Egypt, parts of Africa",
-		 '+3' => "Russia, Baghdad, Kuwait, Nairobi",
-		 '+3.30' => 'Tehran, Iran',
-		 '+4' => "Abu Dhabi, Kabul",
-		 '+4.30' => 'Afghanistan',
-		 '+5' => "Islamabad, Karachi",
-		 '+5.30' => "Mumbai, Delhi, Calcutta",
-		 '+5.45' => 'Kathmandu',
-		 '+6' => "Astana, Dhaka",
-		 '+7' => "Bangkok, Rangoon",
-		 '+8' => "Hong Kong, Singapore, Perth, Beijing",
-		 '+9' => "Tokyo, Seoul",
-		 '+9.30' => 'Darwin, Adelaide',
-		'+10' => "Brisbane, Canberra, Sydney, Melbourne",
-		'+10.30' => 'Lord Howe Island',
-		'+11' => "Soloman Islands",
-		'+11.30' => 'Norfolk Island',
-		'+12' => "New Zealand, Fiji, Marshall Islands",
-		'+13' => "Tonga, Nuku'alofa, Rawaki Islands",
-		'+13.45' => 'Chatham Island',
-		'+14' => 'Kiribati: Line Islands'
-		);
-
-
-	private $isEOF = FALSE;					// True if at last element of list
-	private $bufferValid = FALSE;
-
+	/**
+	 * @var array
+	 */
+	private $timezonesList = array();
 
 	/**
-	 *	Call before using the 'next' format option, to ensure the array is indexed from the beginning
+	 * @var bool
+	 */
+	private $isEOF = false; // True if at last element of list.
+
+	/**
+	 * @var bool
+	 */
+	private $bufferValid = false;
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct()
+	{
+		$this->timezonesList = systemTimeZones();
+	}
+
+	/**
+	 * Call before using the 'next' format option, to ensure the array is
+	 * indexed from the beginning.
 	 */
 	public function pointerReset()
 	{
-		$this->isEOF = (FALSE === reset($this->timezonesList));
-		$this->bufferValid = TRUE;
+		$this->isEOF = (false === reset($this->timezonesList));
+		$this->bufferValid = true;
 	}
 
 
 	/**
-	 *	Return a formatted timezone value
+	 * Return a formatted timezone value
 	 *
-	 *	@param mixed $key - the key value to select
-	 *	@param string $formatSpec - defines format of return value
+	 * @param mixed $key
+	 *  The key value to select.
+	 * @param string $formatSpec
+	 *  Defines format of return value.
 	 *
-	 *	@return mixed (according to $formatSpec). FALSE if no value available
-	 *		'array' - a single-element array; key as passed, and value to match key
-	 *		'next' - as 'array', but ignores the passed $key and moves to next value.
-	 *		default - a string usable for display
+	 * @return mixed
+	 *  (according to $formatSpec).
+	 *  false - if no value available.
+	 *  'array' - a single-element array; key as passed, and value to match key
+	 *  'next' - as 'array', but ignores the passed $key and moves to next value.
+	 *  'default' - a string usable for display.
 	 */
 	public function getValue($key, $formatSpec = '')
 	{
-		if ($formatSpec == 'next')
+		if($formatSpec == 'next')
 		{
-			if (!$this->bufferValid) $this->pointerReset;		// Make sure buffer is defined
-			if ($this->isEOF) return FALSE;
+			// Make sure buffer is defined.
+			if(!$this->bufferValid)
+			{
+				$this->pointerReset();
+			}
+
+			if($this->isEOF)
+			{
+				return false;
+			}
+
 			$key = key($this->timezonesList);
 			$val = current($this->timezonesList);
-			if (FALSE === $val)
+
+			if(false === $val)
 			{
-				$this->isEOF = TRUE;
-				return FALSE;
+				$this->isEOF = true;
+				return false;
 			}
-			$this->isEOF = (FALSE === next($this->timezonesList));
+
+			$this->isEOF = (false === next($this->timezonesList));
+
 			return array($key => $val);
 		}
 
 		$exists = isset($this->timezonesList[$key]);
-		if (!$exists) return FALSE;
+
+		if(!$exists)
+		{
+			return false;
+		}
 
 		$val = $this->timezonesList[$key];
-		if ($formatSpec == 'array')
+
+		if($formatSpec == 'array')
 		{
 			return array($key => $val);
 		}
-		
-		// Default (as per earlier implementations) - can be specified with 'display' format
-		return 'GMT'.$key.' - '.$val;
+
+		// Default (as per earlier implementations) - can be specified with
+		// 'display' format.
+		return $val;
 	}
 }
-
-
-?>
\ No newline at end of file

From e25ead78dfe2194b21cd545cf7d1295a04530518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=B3na=20Lore?= <lonalore@freemail.hu>
Date: Tue, 13 Dec 2016 20:56:11 +0100
Subject: [PATCH 20/31] Removal of "Time offset" setting.

---
 e107_admin/prefs.php              | 32 ++-----------------------------
 e107_core/xml/default_install.xml |  1 -
 e107_plugins/rss_menu/rss.php     | 20 +++++++++----------
 3 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 62c35d611..180588451 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -727,39 +727,11 @@ $text .= "
 					
 					$text .= "
 						</td>
-					</tr>
-					<tr>
-						<td><label for='time-offset'>".PRFLAN_26."</label></td>
-						<td>
-							".$frm->select_open('time_offset', 'class=tbox select time-offset');//use form handler because of the tabindex
-$toffset = array("-12", "-11", "-10", "-9", "-8", "-7", "-6", "-5", "-4", "-3", "-2", "-1", "0", "+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10", "+11", "+12", "+13", "+14", "+15", "+16");
-if(! isset($pref['time_offset']))
-{
-	$pref['time_offset'] = "0";
-}
-
-
-//XXX TODO FIXME - Do we still need this?
-
-foreach($toffset as $o)
-{
-	$text .= "
-								".$frm->option($o, $o, ($o == $pref['time_offset']))."
-	";
-}
-
-
-
-					$timeZones = systemTimeZones();
-
-
+					</tr>";
 
+$timeZones = systemTimeZones();
 
 $text .= "
-							</select>
-							<div class='smalltext field-help'>".PRFLAN_27."</div>
-						</td>
-					</tr>
 					<tr>
 						<td><label for='timezone'>".PRFLAN_56."</label></td>
 						<td>
diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml
index cd1f717f1..18fd42cdf 100644
--- a/e107_core/xml/default_install.xml
+++ b/e107_core/xml/default_install.xml
@@ -310,7 +310,6 @@ City, State, Country
 		<core name="subnews_resize"></core>
 		<core name="themecss">style.css</core>
 		<core name="thumbnail_quality">75</core>
-		<core name="time_offset">0</core>
 		<core name="timezone">UTC</core>
 		<core name="track_online">1</core>
 		<core name="ue_upgrade">1</core>
diff --git a/e107_plugins/rss_menu/rss.php b/e107_plugins/rss_menu/rss.php
index 3175f1881..42c345369 100644
--- a/e107_plugins/rss_menu/rss.php
+++ b/e107_plugins/rss_menu/rss.php
@@ -199,7 +199,6 @@ class rssCreate
 		$sql_rs = new db;
 		global $rssgen;
 		$sql = e107::getDb();
-		$pref = e107::getPref();
 		$tp = e107::getParser();
 
 		$this->e107 = e107::getInstance();
@@ -207,7 +206,6 @@ class rssCreate
 		$this -> path = e_PLUGIN."rss_menu/";
 		$this -> rssType = $rss_type;
 		$this -> topicid = $topic_id;
-		$this -> offset = $pref['time_offset'] * 3600;
 		$this -> limit = $row['rss_limit'];
 		$this -> contentType = $row['rss_name'];
 
@@ -422,7 +420,7 @@ class rssCreate
 						<title>".$tp->toRss($rss_title)."</title>
 						<link>".$pref['siteurl']."</link>
 						<description>".$tp->toRss($pref['sitedescription'])."</description>
-						<lastBuildDate>".$itemdate = date("r", ($time + $this -> offset))."</lastBuildDate>
+						<lastBuildDate>".$itemdate = date("r", ($time))."</lastBuildDate>
 						<docs>http://backend.userland.com/rss092</docs>\n";
 
 					foreach($this -> rssItems as $value)
@@ -473,8 +471,8 @@ class rssCreate
 				<copyright>".$tp->toRss(SITEDISCLAIMER)."</copyright>
 				<managingEditor>".$this->nospam($pref['siteadminemail'])." (".$pref['siteadmin'].")</managingEditor>
 				<webMaster>".$this->nospam($pref['siteadminemail'])." (".$pref['siteadmin'].")</webMaster>
-				<pubDate>".date("r",($time + $this -> offset))."</pubDate>
-				<lastBuildDate>".date("r",($time + $this -> offset))."</lastBuildDate>
+				<pubDate>".date("r",($time))."</pubDate>
+				<lastBuildDate>".date("r",($time))."</lastBuildDate>
 				<docs>http://backend.userland.com/rss</docs>
 				<generator>e107 (http://e107.org)</generator>
 				<sy:updatePeriod>hourly</sy:updatePeriod>
@@ -549,7 +547,7 @@ class rssCreate
 						echo "<enclosure url=\"".$value['enc_url']."\" length=\"".$value['enc_leng']."\" type=\"".$value['enc_type']."\"   />\n";
 					}
 
-					echo "<pubDate>".date("r", ($value['pubdate'] + $this -> offset))."</pubDate>\n";
+					echo "<pubDate>".date("r", ($value['pubdate']))."</pubDate>\n";
 
 					if($link)
 					{
@@ -596,7 +594,7 @@ class rssCreate
 				<link>".$pref['siteurl']."</link>
 				<description>".$tp->toRss($pref['sitedescription'])."</description>
 				<dc:language>".CORE_LC.(defined("CORE_LC2") ? "-".CORE_LC2 : "")."</dc:language>
-				<dc:date>".$this->get_iso_8601_date($time + $this -> offset). "</dc:date>
+				<dc:date>".$this->get_iso_8601_date($time). "</dc:date>
 				<dc:creator>".$this->nospam($pref['siteadminemail'])."</dc:creator>
 				<admin:generatorAgent rdf:resource=\"http://e107.org\" />
 				<admin:errorReportsTo rdf:resource=\"mailto:".$this->nospam($pref['siteadminemail'])."\" />
@@ -629,7 +627,7 @@ class rssCreate
 						<item rdf:about=\"".$link."\">
 						<title>".$tp->toRss($value['title'])."</title>
 						<link>".$link."</link>
-						<dc:date>".$this->get_iso_8601_date($time + $this -> offset)."</dc:date>
+						<dc:date>".$this->get_iso_8601_date($time)."</dc:date>
 						<dc:creator>".$value['author']."</dc:creator>
 						<dc:subject>".$tp->toRss($value['category_name'])."</dc:subject>
 						<description>".$tp->toRss($value['description']). "</description>
@@ -653,7 +651,7 @@ class rssCreate
 					echo "
 					<id>".$pref['siteurl']."</id>\n
 					<title type='text'>".$tp->toRss($rss_title)."</title>\n
-					<updated>".$this->get_iso_8601_date($time + $this -> offset)."</updated>\n";
+					<updated>".$this->get_iso_8601_date($time)."</updated>\n";
 
 					// Recommended
 					echo "
@@ -689,7 +687,7 @@ class rssCreate
 						echo "
 						<id>".$value['link']."</id>\n
 						<title type='text'>".$tp->toRss($value['title'])."</title>\n
-						<updated>".$this->get_iso_8601_date($value['pubdate'] + $this -> offset)."</updated>\n";
+						<updated>".$this->get_iso_8601_date($value['pubdate'])."</updated>\n";
 
 						// Recommended
                         $author = ($value['author']) ? $value['author'] : "unknown";
@@ -713,7 +711,7 @@ class rssCreate
 						//<contributor>
 						//	<name>Jane Doe</name>
 						//</contributor>
-						echo "<published>".$this->get_iso_8601_date($value['pubdate'] + $this -> offset)."</published>\n";
+						echo "<published>".$this->get_iso_8601_date($value['pubdate'])."</published>\n";
 						//<source>
 						//	<id>http://example.org/</id>
 						//	<title>Fourty-Two</title>

From 2b181665c4fd1209ab1f91d55ed1aab253af1cfb Mon Sep 17 00:00:00 2001
From: rica-carv <rica-carv@users.noreply.github.com>
Date: Tue, 13 Dec 2016 20:16:30 +0000
Subject: [PATCH 21/31] Update forum_post.php

---
 e107_plugins/forum/forum_post.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/e107_plugins/forum/forum_post.php b/e107_plugins/forum/forum_post.php
index f0ce7d119..dfcd3faf0 100644
--- a/e107_plugins/forum/forum_post.php
+++ b/e107_plugins/forum/forum_post.php
@@ -383,11 +383,13 @@ class forum_post_handler
 
 //    var_dump ($type);
 //    var_dump (e107::getTemplate('forum', 'forum_'.$type));
-		if($template = e107::getTemplate('forum', 'forum_'.$type))
-		{
+		$template = e107::getTemplate('forum', 'forum_'.$type);
+//--		if($template = e107::getTemplate('forum', 'forum_'.$type))
+//--		{
 //--		  	$FORUM_POST_TEMPLATE = $template;
-		}
-		elseif (empty($FORUMPOST) && empty($FORUMREPLYPOSTED) && empty($FORUMTHREADPOSTED))
+//--		}
+//--		elseif (empty($FORUMPOST) && empty($FORUMREPLYPOSTED) && empty($FORUMTHREADPOSTED))
+		if (empty($template) && empty($FORUMPOST) && empty($FORUMREPLYPOSTED) && empty($FORUMTHREADPOSTED))
 		{
   		$file = "forum_".$type."_template.php";
 			if (is_readable(THEME.$file))

From 322a23e4b0bfc478358119da3e3fc20134276b87 Mon Sep 17 00:00:00 2001
From: rica-carv <rica-carv@users.noreply.github.com>
Date: Tue, 13 Dec 2016 20:20:17 +0000
Subject: [PATCH 22/31] Update forum_post.php

---
 e107_plugins/forum/forum_post.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/e107_plugins/forum/forum_post.php b/e107_plugins/forum/forum_post.php
index dfcd3faf0..3711c2482 100644
--- a/e107_plugins/forum/forum_post.php
+++ b/e107_plugins/forum/forum_post.php
@@ -622,8 +622,8 @@ class forum_post_handler
 		//	print_a($template);
 			return $this->upgradeTemplate($template);
 		}
-		else
-		{
+//--		else
+//--		{
 //--			if (deftrue('BOOTSTRAP')) //v2.x
 //--			{
 //--				return $FORUM_POSTED_TEMPLATE;
@@ -635,14 +635,8 @@ class forum_post_handler
 					 "thread"   => $FORUMTHREADPOSTED,
 					 "poll"     => $FORUMPOLLPOSTED
 				);
-
 //--			}
-
-
-		}
-
-
-
+//--		}
 	}
 
 

From 2f2b3cc7c00d65104c68528146ae63c6888e1274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=B3na=20Lore?= <lonalore@freemail.hu>
Date: Tue, 13 Dec 2016 21:31:59 +0100
Subject: [PATCH 23/31] Set default timezone in init_session().

---
 class2.php                   | 55 ++++++++++++++++++++++--------------
 e107_handlers/user_model.php |  5 ++++
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/class2.php b/class2.php
index a380759de..3bc8d65ac 100644
--- a/class2.php
+++ b/class2.php
@@ -1127,25 +1127,13 @@ if (($_SERVER['QUERY_STRING'] == 'logout')/* || (($pref['user_tracking'] == 'ses
 	exit();
 }
 
+
+
 /**
  * @addtogroup timezone
  * @{
  */
 
-$tzUser = e107::user(USERID);
-
-if (varset($tzUser['user_timezone'], false) && systemTimeZoneIsValid($tzUser['user_timezone']))
-{
-	date_default_timezone_set($tzUser['user_timezone']);
-	unset($tzUser);
-}
-else
-{
-	$tz = vartrue($pref['timezone'], 'UTC');
-	date_default_timezone_set($tz);
-	unset($tz);
-}
-
 /**
  * Generate an array of time zones.
  *
@@ -1209,13 +1197,7 @@ function systemTimeZoneIsValid($zone = '')
 	return false;
 }
 
-/**
- * @} End of "addtogroup timezone".
- */
-
-
-
-$e_deltaTime=0;
+$e_deltaTime = 0;
 
 if (isset($_COOKIE['e107_tdOffset']))
 {
@@ -1231,6 +1213,10 @@ if (isset($_COOKIE['e107_tzOffset']))
 
 define('TIMEOFFSET', $e_deltaTime);
 
+/**
+ * @} End of "addtogroup timezone".
+ */
+
 
 
 // ----------------------------------------------------------------------------
@@ -1791,6 +1777,33 @@ function init_session()
 	// New user model
 	$user = e107::getUser();
 
+	// Get user timezone.
+	$tzUser = $user->getTimezone();
+
+	// If user timezone is valid.
+	if (varset($tzUser, false) && systemTimeZoneIsValid($tzUser))
+	{
+		// Sets the default timezone used by all date/time functions.
+		date_default_timezone_set($tzUser);
+		// Save timezone for later use.
+		define('USERTIMEZONE', $tzUser);
+
+		unset($tzUser);
+	}
+	else
+	{
+		// Use system default timezone.
+		$pref = e107::getPref();
+		$tz = vartrue($pref['timezone'], 'UTC');
+
+		// Sets the default timezone used by all date/time functions.
+		date_default_timezone_set($tz);
+		// Save timezone for later use.
+		define('USERTIMEZONE', $tz);
+
+		unset($tz);
+	}
+
 	define('USERIP', e107::getIPHandler()->getIP(FALSE));
 	define('POST_REFERER', md5($user->getToken()));
 
diff --git a/e107_handlers/user_model.php b/e107_handlers/user_model.php
index cad0e4f34..ac51eabca 100644
--- a/e107_handlers/user_model.php
+++ b/e107_handlers/user_model.php
@@ -219,6 +219,11 @@ class e_user_model extends e_admin_model
 		return ($this->isAdmin() ? $this->get('user_perms') : false);
 	}
 
+	final public function getTimezone()
+	{
+		return ($this->get('user_timezone') ? $this->get('user_timezone') : 'UTC');
+	}
+
 	/**
 	 * DEPRECATED - will be removed or changed soon (see e_session)
 	 * @return string

From 22a40e318bf27adb6ce74d3875a2d1a60ab985b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=B3na=20Lore?= <lonalore@freemail.hu>
Date: Tue, 13 Dec 2016 21:42:57 +0100
Subject: [PATCH 24/31] If timezone is not set by user, need to return an empty
 string in order to use default timezone is set for e107.

---
 e107_handlers/user_model.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/e107_handlers/user_model.php b/e107_handlers/user_model.php
index ac51eabca..b0e9b2b78 100644
--- a/e107_handlers/user_model.php
+++ b/e107_handlers/user_model.php
@@ -221,7 +221,9 @@ class e_user_model extends e_admin_model
 
 	final public function getTimezone()
 	{
-		return ($this->get('user_timezone') ? $this->get('user_timezone') : 'UTC');
+		// If timezone is not set, we return an empty string in order to use the
+		// default timezone is set for e107.
+		return ($this->get('user_timezone') ? $this->get('user_timezone') : '');
 	}
 
 	/**

From fb3946ae0a723f1e067f33f29a5aff95d79043f0 Mon Sep 17 00:00:00 2001
From: lonalore <lonalore@freemail.hu>
Date: Wed, 14 Dec 2016 15:01:51 +0100
Subject: [PATCH 25/31] Error page improvement: template support.

---
 e107.htaccess                                 |   3 +-
 e107_core/controllers/system/error.php        | 152 +++++------
 .../shortcodes/batch/error_shortcodes.php     |  81 ++++++
 e107_core/templates/error_template.php        | 204 +++++++++++---
 e107_core/url/system/rewrite_url.php          |   2 +-
 e107_handlers/e107_class.php                  |  21 +-
 e107_languages/English/lan_error.php          |   3 +-
 error.php                                     | 248 +++++++++++-------
 8 files changed, 498 insertions(+), 216 deletions(-)
 create mode 100644 e107_core/shortcodes/batch/error_shortcodes.php

diff --git a/e107.htaccess b/e107.htaccess
index 06b25d474..b543dd69c 100644
--- a/e107.htaccess
+++ b/e107.htaccess
@@ -1,9 +1,8 @@
 # Custom error pages for php scripts only
-<FilesMatch \.php$> 
+<FilesMatch \.php$>
 	ErrorDocument 400 /error.php?400
 	ErrorDocument 401 /error.php?401
 	ErrorDocument 403 /error.php?403
-	ErrorDocument 404 /error.php?404 
 	ErrorDocument 500 /error.php?500
 </FilesMatch>
 
diff --git a/e107_core/controllers/system/error.php b/e107_core/controllers/system/error.php
index 9dd0afb70..02e0ebc2b 100644
--- a/e107_core/controllers/system/error.php
+++ b/e107_core/controllers/system/error.php
@@ -1,102 +1,104 @@
 <?php
-/*
+
+/**
  * e107 website system
  *
- * Copyright (C) 2008-2011 e107 Inc (e107.org)
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- * System error controller
- *
- * $URL$
- * $Id$
-*/
+ * @file
+ * System error controller.
+ */
+
+
+/**
+ * Class core_system_error_controller.
+ */
 class core_system_error_controller extends eController
 {
-	function preAction()
+
+	/**
+	 * Pre-action callback, fired only if dispatch status is still true
+	 * and action method is found.
+	 */
+	public function preAction()
 	{
 		e107::coreLan('error');
 	}
-	
-	/**
-	 * Alias
-	 */
-	public function action404()
-	{
-		$this->_forward('notfound');
-	}
-	
-	public function actionNotfound()
-	{
-		$this->getResponse()
-			->setRenderMod('error404')
-			->addHeader('HTTP/1.0 404 Not Found');
-		
-		$this->addTitle(LAN_ERROR_7);
-		$template = e107::getCoreTemplate('error', 404);
-		
-		$vars = new e_vars(array(
-			'SITEURL' => SITEURL,
-			'SEARCHURL' => e107::getUrl()->create('search'),
-		));
-
-
-		$body = e107::getParser()->parseTemplate(
-				$this->updateTemplate($template['start']).
-				$this->updateTemplate($template['body']).
-				$this->updateTemplate($template['end'])
-				, true, null, $vars);
-		
-		$this->addBody($body);
-	}
-
 
 	/**
-	 * Update template to v2.x spec. ALL CAPS shortcodes only.
-	 * @param $template
-	 * @return mixed
-	 */
-	private function updateTemplate($template)
-	{
-		$srch = array('{siteUrl}','{searchUrl}');
-		$repl = array('{SITEURL}','{SEARCHURL}');
-
-		return str_replace($srch,$repl,$template);
-	}
-	
-	/**
-	 * Alias
+	 * Alias for "Error 403".
 	 */
 	public function action403()
 	{
 		$this->_forward('forbidden');
 	}
 
+	/**
+	 * Alias for "Error 404".
+	 */
+	public function action404()
+	{
+		$this->_forward('notfound');
+	}
+
+	/**
+	 * Error 403.
+	 */
 	public function actionForbidden()
 	{
-		$this->getResponse()
-			->setRenderMod('error403')
-			->addHeader('HTTP/1.0 403 Forbidden');
-		
-		$this->addTitle(LAN_ERROR_7);
-		$template = e107::getCoreTemplate('error', 403);
-		
-		$vars = new e_vars(array(
-			'SITEURL' => SITEURL,
+		$response = $this->getResponse();
+		$response->setRenderMod('error403');
+		$response->addHeader('HTTP/1.0 403 Forbidden');
+
+		$tp = e107::getParser();
+		$tpl = e107::getCoreTemplate('error', '403');
+		$sc = e107::getScBatch('error');
+
+		$title = LAN_ERROR_TITLE;
+		$subtitle = LAN_ERROR_4;
+		$caption = LAN_ERROR_45;
+		$content = LAN_ERROR_5 . '<br/>' . LAN_ERROR_6 . '<br/><br/>' . LAN_ERROR_2;
+
+		$sc->setVars(array(
+			'title'    => $title,
+			'subtitle' => $subtitle,
+			'caption'  => $caption,
+			'content'  => $content,
 		));
-		
-		$body = e107::getParser()->parseTemplate(
-			$this->updateTemplate($template['start']).
-			$this->updateTemplate($template['body']).
-			$this->updateTemplate($template['end'])
-			, true, null, $vars);
-		
+
+		$body = $tp->parseTemplate($tpl, true, $sc);
 		$this->addBody($body);
 	}
-	
-	function actionHelloWorld()
+
+	/**
+	 * Error 404.
+	 */
+	public function actionNotfound()
 	{
-		//$this->addTitle('Hello!');
-		//echo 'Hello World';
+		$response = $this->getResponse();
+		$response->setRenderMod('error404');
+		$response->addHeader('HTTP/1.0 404 Not Found');
+
+		$tp = e107::getParser();
+		$tpl = e107::getCoreTemplate('error', '404');
+		$sc = e107::getScBatch('error');
+
+		$title = LAN_ERROR_TITLE;
+		$subtitle = LAN_ERROR_7;
+		$caption = LAN_ERROR_45;
+		$content = LAN_ERROR_21 . '<br/>' . LAN_ERROR_9;
+
+		$sc->setVars(array(
+			'title'    => $title,
+			'subtitle' => $subtitle,
+			'caption'  => $caption,
+			'content'  => $content,
+		));
+
+		$body = $tp->parseTemplate($tpl, true, $sc);
+		$this->addBody($body);
 	}
+
 }
diff --git a/e107_core/shortcodes/batch/error_shortcodes.php b/e107_core/shortcodes/batch/error_shortcodes.php
new file mode 100644
index 000000000..7b3a3dcda
--- /dev/null
+++ b/e107_core/shortcodes/batch/error_shortcodes.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * e107 website system
+ *
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * @file
+ * Error shortcodes.
+ */
+
+if(!defined('e107_INIT'))
+{
+	exit;
+}
+
+
+/**
+ * Class error_shortcodes.
+ */
+class error_shortcodes extends e_shortcode
+{
+
+	/**
+	 * @return mixed
+	 */
+	public function sc_error_title()
+	{
+		return varset($this->var['title'], '');
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function sc_error_subtitle()
+	{
+		return varset($this->var['subtitle'], '');
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function sc_error_caption()
+	{
+		return varset($this->var['caption'], '');
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function sc_error_content()
+	{
+		return varset($this->var['content'], '');
+	}
+
+	/**
+	 * @return string
+	 */
+	public function sc_error_link_home()
+	{
+		$icon = e107::getParser()->toGlyph('fa-home');
+		$url = SITEURL;
+
+		return '<a href="' . $url . '" class="btn btn-primary">' . $icon . ' ' . LAN_ERROR_20 . '</a>';
+	}
+
+	/**
+	 * @return string
+	 */
+	public function sc_error_link_search()
+	{
+		$icon = e107::getParser()->toGlyph('fa-search');
+		$url = e107::getUrl()->create('search');
+
+		return '<a href="' . $url . '" class="btn btn-default">' . $icon . ' ' . LAN_ERROR_22 . '</a>';
+	}
+
+}
+
diff --git a/e107_core/templates/error_template.php b/e107_core/templates/error_template.php
index 2c035aa66..7263c8515 100644
--- a/e107_core/templates/error_template.php
+++ b/e107_core/templates/error_template.php
@@ -1,47 +1,187 @@
 <?php
-/*
+
+/**
  * e107 website system
  *
- * Copyright (C) 2008-2013 e107 Inc (e107.org)
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- * Error Templates
- *
- * $Id: $
+ * @file
+ * Error templates.
  */
 
-/**
- * 
- *	@package     e107
- *	@subpackage	e107_templates
- *	@version 	$Id$;
- *
-*/
-
-if (!defined('e107_INIT')) { exit; }
+if(!defined('e107_INIT'))
+{
+	exit;
+}
 
 $ERROR_TEMPLATE = array();
 
-$ERROR_TEMPLATE['404']['start'] = '<div class="error-404 alert-danger">';
-$ERROR_TEMPLATE['404']['body'] = '
-	<h3><i class="icon-exclamation-sign" title="'.LAN_ERROR_45.'"></i> '.LAN_ERROR_45.'</h3>
-	<p>
-		'.LAN_ERROR_21.'<br />'.LAN_ERROR_9.'
-	</p>
-	<a href="{SITEURL}">'.LAN_ERROR_20.'</a><br />
-	<a href="{SEARCHURL}">'.LAN_ERROR_22.'</a>
+/**
+ * 400 Bad Request.
+ */
+$ERROR_TEMPLATE['400'] = '
+<h1 class="text-center">
+	<strong>{ERROR_TITLE}</strong>
+</h1>
+<h2 class="text-center">
+	{ERROR_SUBTITLE}
+</h2>
+<br/>
+<div class="col-md-8 col-md-offset-2">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			{ERROR_CAPTION}
+		</div>
+		<div class="panel-body">
+			{ERROR_CONTENT}
+		</div>
+	</div>
+</div>
+<br/>
+<div class="error-actions text-center">
+	{ERROR_LINK_HOME}
+</div>
+<br/>
 ';
-$ERROR_TEMPLATE['404']['end'] = '</div>';
 
-
-$ERROR_TEMPLATE['403']['start'] = '<div class="error-403 alert-danger">';
-$ERROR_TEMPLATE['403']['body'] = '
-	<h3><i class="icon-exclamation-sign" title="'.LAN_ERROR_4.'"></i> '.LAN_ERROR_4.'</h3>
-	<p>
-		'.LAN_ERROR_5.'<br />'.LAN_ERROR_6.'<br /><br />'.LAN_ERROR_2.'
-	</p>
-	<a href="{SITEURL}">'.LAN_ERROR_20.'</a><br />
+/**
+ * 401 Unauthorized.
+ */
+$ERROR_TEMPLATE['401'] = '
+<h1 class="text-center">
+	<strong>{ERROR_TITLE}</strong>
+</h1>
+<h2 class="text-center">
+	{ERROR_SUBTITLE}
+</h2>
+<br/>
+<div class="col-md-8 col-md-offset-2">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			{ERROR_CAPTION}
+		</div>
+		<div class="panel-body">
+			{ERROR_CONTENT}
+		</div>
+	</div>
+</div>
+<br/>
+<div class="error-actions text-center">
+	{ERROR_LINK_HOME}
+</div>
+<br/>
 ';
-$ERROR_TEMPLATE['403']['end'] = '</div>';
 
+/**
+ * 403 Forbidden.
+ */
+$ERROR_TEMPLATE['403'] = '
+<h1 class="text-center">
+	<strong>{ERROR_TITLE}</strong>
+</h1>
+<h2 class="text-center">
+	{ERROR_SUBTITLE}
+</h2>
+<br/>
+<div class="col-md-8 col-md-offset-2">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			{ERROR_CAPTION}
+		</div>
+		<div class="panel-body">
+			{ERROR_CONTENT}
+		</div>
+	</div>
+</div>
+<br/>
+<div class="error-actions text-center">
+	{ERROR_LINK_HOME}
+</div>
+<br/>
+';
+
+/**
+ * 404 Not Found.
+ */
+$ERROR_TEMPLATE['404'] = '
+<h1 class="text-center">
+	<strong>{ERROR_TITLE}</strong>
+</h1>
+<h2 class="text-center">
+	{ERROR_SUBTITLE}
+</h2>
+<br/>
+<div class="col-md-8 col-md-offset-2">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			{ERROR_CAPTION}
+		</div>
+		<div class="panel-body">
+			{ERROR_CONTENT}
+		</div>
+	</div>
+</div>
+<br/>
+<div class="error-actions text-center">
+	{ERROR_LINK_HOME} {ERROR_LINK_SEARCH}
+</div>
+<br/>
+';
+
+/**
+ * 500 Internal server error.
+ */
+$ERROR_TEMPLATE['500'] = '
+<h1 class="text-center">
+	<strong>{ERROR_TITLE}</strong>
+</h1>
+<h2 class="text-center">
+	{ERROR_SUBTITLE}
+</h2>
+<br/>
+<div class="col-md-8 col-md-offset-2">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			{ERROR_CAPTION}
+		</div>
+		<div class="panel-body">
+			{ERROR_CONTENT}
+		</div>
+	</div>
+</div>
+<br/>
+<div class="error-actions text-center">
+	{ERROR_LINK_HOME}
+</div>
+<br/>
+';
+
+/**
+ * Default error page.
+ */
+$ERROR_TEMPLATE['DEFAULT'] = '
+<h1 class="text-center">
+	<strong>{ERROR_TITLE}</strong>
+</h1>
+<h2 class="text-center">
+	{ERROR_SUBTITLE}
+</h2>
+<br/>
+<div class="col-md-8 col-md-offset-2">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			{ERROR_CAPTION}
+		</div>
+		<div class="panel-body">
+			{ERROR_CONTENT}
+		</div>
+	</div>
+</div>
+<br/>
+<div class="error-actions text-center">
+	{ERROR_LINK_HOME}
+</div>
+<br/>
+';
diff --git a/e107_core/url/system/rewrite_url.php b/e107_core/url/system/rewrite_url.php
index bf4745035..3a2aa7f30 100644
--- a/e107_core/url/system/rewrite_url.php
+++ b/e107_core/url/system/rewrite_url.php
@@ -42,7 +42,7 @@ class core_system_rewrite_url extends eUrlConfig
 				'name' => LAN_EURL_CORE_SYSTEM, // Module name
 				'label' => LAN_EURL_SYSTEM_REWRITE_LABEL, // Current profile name
 				'description' => LAN_EURL_SYSTEM_REWRITE_DESCR, //
-				'examples'  => array("{SITEURL}system/error404")
+				'examples'  => array("{SITEURL}system/error/404")
 			),
 			'form' => array(), // Under construction - additional configuration options
 			'callbacks' => array(), // Under construction - could be used for e.g. URL generator functionallity
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 87a09302b..7685f16ab 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -3036,11 +3036,26 @@ class e107
 
 	/**
 	 * Simple redirect method for developers.
-	 * @param $url string : 'admin' to redirect to admin entry page or leave blank to go to home page (SITEURL)
+	 *
+	 * @param string $url
+	 *  'admin' to redirect to admin entry page or leave blank to go to home page
+	 *  (SITEURL).
+	 * @param int $http_response_code
+	 *  The HTTP status code to use for the redirection, defaults to 302.
+	 *  The valid values for 3xx redirection status codes are defined in RFC 2616
+	 *  and the draft for the new HTTP status codes:
+	 *  - 301: Moved Permanently (the recommended value for most redirects).
+	 *  - 302: Found (default in PHP, sometimes used for spamming search engines).
+	 *  - 303: See Other.
+	 *  - 304: Not Modified.
+	 *  - 305: Use Proxy.
+	 *  - 307: Temporary Redirect.
+	 * @see https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3
+	 * @see https://tools.ietf.org/html/draft-reschke-http-status-308-07
 	 */
-	public static function redirect($url='')
+	public static function redirect($url = '', $http_response_code = 302)
 	{
-		self::getRedirect()->go($url);
+		self::getRedirect()->go($url, true, $http_response_code);
 	}
 
 
diff --git a/e107_languages/English/lan_error.php b/e107_languages/English/lan_error.php
index be471298c..b7e1e5d53 100644
--- a/e107_languages/English/lan_error.php
+++ b/e107_languages/English/lan_error.php
@@ -10,6 +10,7 @@
 +----------------------------------------------------------------------------+
 */
 define("PAGE_NAME", "Error");
+define("LAN_ERROR_TITLE", "Oops!");
 
 define("LAN_ERROR_1", "Error 401 - Authentication Failed");
 define("LAN_ERROR_2", "The URL you've requested requires a correct username and password. Either you entered an incorrect username/password, or your browser doesn't support this feature.");
@@ -21,7 +22,7 @@ define("LAN_ERROR_6", "Please inform the administrator of the referring page if
 
 define("LAN_ERROR_7", "Error 404 - Document Not Found");
 define("LAN_ERROR_9", "Please inform the administrator of the referring page if you think this error message has been shown by mistake.");
-define("LAN_ERROR_10", "Error 500 - Malformed Header");
+define("LAN_ERROR_10", "Error 500 - Internal server error");
 define("LAN_ERROR_11", "The server encountered an internal error or misconfiguration and was unable to complete your request");
 define("LAN_ERROR_12", "Please inform the administrator of the referring page if you think this error page has been shown by mistake.");
 define("LAN_ERROR_13", "Error - Unknown");
diff --git a/error.php b/error.php
index c9f71eeb6..816b4d9e3 100644
--- a/error.php
+++ b/error.php
@@ -1,115 +1,159 @@
 <?php
-/*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     Copyright (C) 2008-2009 e107 Inc 
-|     http://e107.org
-|
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/error.php,v $
-|     $Revision$
-|     $Date$
-|     $Author$
-+----------------------------------------------------------------------------+
-*/
+/**
+ * e107 website system
+ *
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * @file
+ * System error pages.
+ */
 
 define("ERR_PAGE_ACTIVE", 'error');
 
-//TODO - template(s)
+//We need minimal mod.
+$_E107 = array(
+	'no_forceuserupdate',
+	'no_online',
+	'no_prunetmp',
+);
 
-//We need minimal mod
-$_E107 = array('no_forceuserupdate', 'no_online', 'no_prunetmp');
 require_once("class2.php");
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
-//start session if required
-if(!session_id()) session_start();
-
-if (!defined('PAGE_NAME')) define('PAGE_NAME','Error page');
-$errorHeader = '';
-$errorText = '';
-$errorNumber = 999;
-$errFrom = isset($_SESSION['e107_http_referer']) ? $_SESSION['e107_http_referer'] : $_SERVER['HTTP_REFERER'];
-$errReturnTo = isset($_SESSION['e107_error_return']) ? $_SESSION['e107_error_return'] : array();
-unset($_SESSION['e107_http_referer'], $_SESSION['e107_error_return']);
-
-$errTo = $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
-$errorQuery = htmlentities($_SERVER['QUERY_STRING']);
-$base_path = e_HTTP;
-if (is_numeric(e_QUERY)) $errorNumber = intval(e_QUERY);
-
-switch($errorNumber) 
+// Start session if required.
+if(!session_id())
 {
-  case 400 :
-	$errorHeader = "HTTP/1.1 400 Bad Request";
-	$errorText = "<h1><img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_35."</h1><div class='installh'>".LAN_ERROR_36."</div><br /><div class='smalltext'>".LAN_ERROR_3."</div>
-		<br /><div class='installh'>".LAN_ERROR_2."<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
-    break;
-  case 401:
-	$errorHeader = "HTTP/1.1 401 Unauthorized";
-	$errorText = "<h1><img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_1."</h1><div class='installh'>".LAN_ERROR_2."</div><br /><div class='smalltext'>".LAN_ERROR_3."</div>
-		<br /><div class='installh'>".LAN_ERROR_2."<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
-	break;
-  case 403:
-	$errorHeader = "HTTP/1.1 403 Forbidden";
-	$errorText = "<h1><img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_4."</h1><div class='installh'>".LAN_ERROR_5."</div><br /><div class='smalltext'>".LAN_ERROR_6."</div>
-		<br /><div class='installh'>".LAN_ERROR_2."<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
-	break;
-  case 404:
-	$errorHeader = "HTTP/1.1 404 Not Found";
-	$errorText = "<h1><img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_7."</h1>".LAN_ERROR_21.'<br />'.LAN_ERROR_9."<br /><br />";
-	if (strlen($errFrom)) $errorText .= LAN_ERROR_23." <a href='{$errFrom}' rel='external'>{$errFrom}</a> ".LAN_ERROR_24." -- ".LAN_ERROR_19."<br /><br />";
-	//.LAN_ERROR_23."<b>{$errTo}</b>".LAN_ERROR_24."<br /><br />" ???
-
-	$errorText .= "<h3>".LAN_ERROR_45."</h3>";
-	if($errReturnTo) 
-	{
-		foreach ($errReturnTo as $url => $label)
-		{
-			$errorText .= "<a href='{$url}'>".$label."</a><br />";
-		}
-		$errorText .= '<br />';
-	}
-	$errorText .= "<a href='{$base_path}index.php'>".LAN_ERROR_20."</a><br />";
-	$errorText .= "<a href='{$base_path}search.php'>".LAN_ERROR_22."</a>";
-	break;
-  case 500:
-	$errorHeader = "HTTP/1.1 500 Internal Server Error";
-	$errorText = "<h1><img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_10."</h1><div class='installh'>".LAN_ERROR_11."</div><br /><div class='smalltext'>".LAN_ERROR_12."</div>
-		<br /><div class='installh'>".LAN_ERROR_2."<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
-	break;
-  case 999:
-	if (E107_DEBUG_LEVEL)
-	{
-	  echo LAN_ERROR_33."<br/><pre>\n";
-	  print_r($_SERVER);
-	  print_r($_REQUEST);
-	  echo "\n</pre>\n";
-	}
-	else
-	{
-		header("location: ".e_HTTP."index.php");
-		exit;
-	}
-    break;
-
-  default :
-	$errorText = "<h1>".LAN_ERROR_13." (".$errorQuery.")</h1><div class='installh'>".LAN_ERROR_14."</div><br /><div class='smalltext'>".LAN_ERROR_15."</div>
-		<br /><div class='installh'><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
-
-//	default:
-//	$errorText = LAN_ERROR_34." e_QUERY = '".e_QUERY."'<br/><a href='{$base_path}index.php'>".LAN_ERROR_20."</a>";
-//	break;
+	session_start();
+}
+
+// Include language file.
+e107::coreLan('error');
+
+
+/**
+ * Class error_front.
+ */
+class error_front
+{
+
+	/**
+	 * @var
+	 */
+	private $errorNumber;
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct()
+	{
+		if(is_numeric(e_QUERY))
+		{
+			$this->errorNumber = intval(e_QUERY);
+		}
+
+		$this->renderErrorPage();
+	}
+
+	/**
+	 * Renders the error page.
+	 */
+	public function renderErrorPage()
+	{
+		switch($this->errorNumber)
+		{
+			case 400:
+				header('HTTP/1.1 400 Bad Request');
+
+				$subtitle = LAN_ERROR_35; // Error 400 - Bad Request
+				$caption = LAN_ERROR_45;
+				$content = LAN_ERROR_36 . '<br/>' . LAN_ERROR_3;
+				break;
+
+			case 401:
+				header('HTTP/1.1 401 Unauthorized');
+
+				$subtitle = LAN_ERROR_1; // Error 401 - Authentication Failed
+				$caption = LAN_ERROR_45;
+				$content = LAN_ERROR_2 . '<br/>' . LAN_ERROR_3;
+				break;
+
+			case 403:
+				header('HTTP/1.1 403 Forbidden');
+
+				$subtitle = LAN_ERROR_4; // Error 403 - Access forbidden
+				$caption = LAN_ERROR_45;
+				$content = LAN_ERROR_5 . '<br/>' . LAN_ERROR_6 . '<br/><br/>' . LAN_ERROR_2;
+				break;
+
+			case 404:
+				header('HTTP/1.1 404 Not Found');
+
+				$subtitle = LAN_ERROR_7; // Error 404 - Document Not Found
+				$caption = LAN_ERROR_45;
+				$content = LAN_ERROR_21 . '<br/>' . LAN_ERROR_9;
+
+				$errFrom = isset($_SESSION['e107_http_referer']) ? $_SESSION['e107_http_referer'] : $_SERVER['HTTP_REFERER'];
+
+				if(strlen($errFrom))
+				{
+					$content .= '<br/>';
+					$content .= '<br/>';
+					$content .= LAN_ERROR_23 . ' <a href="' . $errFrom . '" rel="external">' . $errFrom . '</a> ';
+					$content .= LAN_ERROR_24;
+				}
+
+				break;
+
+			case 500:
+				header('HTTP/1.1 500 Internal Server Error');
+
+				$subtitle = LAN_ERROR_10; // Error 500 - Internal server error
+				$caption = LAN_ERROR_14;
+				$content = LAN_ERROR_11 . '<br/>' . LAN_ERROR_12;
+				break;
+
+			case 999:
+				if(!defset('E107_DEBUG_LEVEL', false))
+				{
+					e107::redirect();
+				}
+
+				$this->errorNumber = 'DEFAULT'; // Use default template.
+
+				$subtitle = LAN_ERROR_33;
+				$caption = LAN_ERROR_14;
+				$content = '<pre>' . print_r($_SERVER) . print_r($_REQUEST) . '</pre>';
+				break;
+
+			default:
+				$this->errorNumber = 'DEFAULT'; // Use default template.
+				$errorQuery = htmlentities($_SERVER['QUERY_STRING']);
+
+				$subtitle = LAN_ERROR_13 . ' (' . $errorQuery . ')'; // Error - Unknown
+				$caption = LAN_ERROR_14;
+				$content = LAN_ERROR_15;
+				break;
+		}
+
+		$tp = e107::getParser();
+		$tpl = e107::getCoreTemplate('error', $this->errorNumber);
+		$sc = e107::getScBatch('error');
+
+		$sc->setVars(array(
+			'title'    => LAN_ERROR_TITLE,
+			'subtitle' => $subtitle,
+			'caption'  => $caption,
+			'content'  => $content,
+		));
+
+		$body = $tp->parseTemplate($tpl, true, $sc);
+		e107::getRender()->tablerender('', $body);
+	}
+
 }
 
-if ($errorHeader) header($errorHeader);
 
 require_once(HEADERF);
-
-e107::getRender()->tablerender(PAGE_NAME, $errorText);
+new error_front();
 require_once(FOOTERF);
-?>
\ No newline at end of file

From d9f3d487f79c09256dca0bf7a5f505e18d7a17fe Mon Sep 17 00:00:00 2001
From: lonalore <lonalore@freemail.hu>
Date: Wed, 14 Dec 2016 15:03:33 +0100
Subject: [PATCH 26/31] Revert htaccess changes.

---
 e107.htaccess | 1 +
 1 file changed, 1 insertion(+)

diff --git a/e107.htaccess b/e107.htaccess
index b543dd69c..a2d147762 100644
--- a/e107.htaccess
+++ b/e107.htaccess
@@ -3,6 +3,7 @@
 	ErrorDocument 400 /error.php?400
 	ErrorDocument 401 /error.php?401
 	ErrorDocument 403 /error.php?403
+	ErrorDocument 404 /error.php?404
 	ErrorDocument 500 /error.php?500
 </FilesMatch>
 

From ff96fbc8d1ada9624d7801d2c7835172a3d53437 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 14 Dec 2016 08:42:23 -0800
Subject: [PATCH 27/31] Changed FEED URLs to https

---
 e107_admin/boot.php          | 11 +++++++++--
 e107_handlers/file_class.php |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/e107_admin/boot.php b/e107_admin/boot.php
index 550dbfb1d..d9ca9b4ce 100644
--- a/e107_admin/boot.php
+++ b/e107_admin/boot.php
@@ -20,7 +20,7 @@ if (!defined('e107_INIT'))
 
 header('Content-type: text/html; charset=utf-8', TRUE);
 
-define('ADMINFEED', 'http://e107.org/adminfeed');
+define('ADMINFEED', 'https://e107.org/adminfeed');
 
 
 
@@ -67,6 +67,13 @@ if(ADMIN && e_AJAX_REQUEST && varset($_GET['mode']) == 'core' && ($_GET['type']
 		echo $text;
 
 	}
+	else
+	{
+		if(e_DEBUG)
+		{
+		//	echo "Feed failed: ".ADMINFEED;
+		}
+	}
 	exit;
 }
 
@@ -92,7 +99,7 @@ if(ADMIN && e_AJAX_REQUEST && varset($_GET['mode']) == 'addons' )
 	}
 
 
-	if($data = e107::getXml()->getRemoteFile('http://e107.org/feed/?limit=3&type='.$type,3))
+	if($data = e107::getXml()->getRemoteFile('https://e107.org/feed/?limit=3&type='.$type,3))
 	{
 		$rows = e107::getXml()->parseXml($data, 'advanced');
 //	print_a($rows);
diff --git a/e107_handlers/file_class.php b/e107_handlers/file_class.php
index c6fbf767d..fbb162de7 100644
--- a/e107_handlers/file_class.php
+++ b/e107_handlers/file_class.php
@@ -1255,6 +1255,7 @@ class e_file
 
 	//	$text = 'umask 0022'; //Could correct permissions issue with 0664 files.
 		// Change Dir.
+		$folder = e107::getParser()->filter($folder,'file'); // extra filter to keep RIPS happy.
 
 		switch($type)
 		{

From d702ba6ace4de45dd442d5acd0f58acf686d5f5e Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 14 Dec 2016 09:56:36 -0800
Subject: [PATCH 28/31] Fix for broken forum on early PHP 5 versions.

---
 e107_plugins/forum/shortcodes/batch/forum_shortcodes.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
index 46f16fe12..a7974332f 100644
--- a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
@@ -348,7 +348,8 @@ class forum_shortcodes extends e_shortcode
 
 		if(USER && is_array($this->newFlagList) && in_array($this->var['forum_id'], $this->newFlagList))
 		{
-			$url = $this->sc_lastpost(['type'=>'url']);
+
+			$url = $this->sc_lastpost(array('type'=>'url'));
 			return "<a href='".$url."'>".IMAGE_new.'</a>';
 		}
 		elseif(empty($this->var['forum_replies']) && defined('IMAGE_noreplies'))
@@ -418,13 +419,13 @@ class forum_shortcodes extends e_shortcode
 
 	function sc_lastpostuser()
 	{
-        return $this->sc_lastpost(['type'=>'username']);
+        return $this->sc_lastpost(array('type'=>'username'));
 	}
 
 
 	function sc_lastpostdate()
 	{
-        return $this->sc_lastpost(['type'=>'datelink']);
+        return $this->sc_lastpost(array('type'=>'datelink'));
 	}
 
 

From c69a303bce66ba93648cdd168cad231f9ea6a8d4 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 14 Dec 2016 11:45:39 -0800
Subject: [PATCH 29/31] Improved handling of missing news items.

---
 e107_plugins/news/news.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php
index 1d44f6266..8171018fb 100644
--- a/e107_plugins/news/news.php
+++ b/e107_plugins/news/news.php
@@ -1004,9 +1004,17 @@ class news_front
 		//	$action = 'default';
 
 			//XXX item not found, redirect to avoid messing up search-engine data.
-			$defaultUrl = e107::getUrl()->create('news/list/items');
-			e107::getRedirect()->go($defaultUrl, null, 301);
-			exit;
+		//	e107::getRedirect()->go(null, true, 404);
+			header("HTTP/1.0 404 Not Found",true,404);
+			require_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_error.php");
+			$text = e107::getMessage()->setTitle(LAN_ERROR_7, E_MESSAGE_INFO)->addInfo("Perhaps you're looking for one of the news items below?")->render();
+
+			$this->action = 'all';
+		//	$defaultUrl = e107::getUrl()->create('news/list/items');
+			$text .= $this->renderListTemplate();
+
+
+			return $text;
 
 		}
 

From 40e95a1ea8c29c8f4a549b7196289f6928655dbc Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 14 Dec 2016 11:45:56 -0800
Subject: [PATCH 30/31] BC styling fixes.

---
 e107_web/css/backcompat.css | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/e107_web/css/backcompat.css b/e107_web/css/backcompat.css
index f6033242f..fe5624497 100644
--- a/e107_web/css/backcompat.css
+++ b/e107_web/css/backcompat.css
@@ -29,5 +29,14 @@ div.checkboxes label.checkbox { display: block }
 
 textarea.bbarea { margin:0;  }
 #chatbox-input-block { text-align:center }
+ul.breadcrumb { margin:15px 0; }
 ul.breadcrumb li { display:inline-block;  padding-right:5px;}
-ul.breadcrumb li span.divider { padding-left:5px; }
\ No newline at end of file
+ul.breadcrumb li span.divider { padding-left:5px; }
+
+.row { margin-left:15px; margin-right:15px;  }
+.col-md-3 { float:left; width:25%; margin-right:15px}
+
+.thumbnail img { border-radius:8px; }
+
+.img-responsive { max-width:100%; }
+

From d7ae17f99f28f1e0fb6ffc6bc9b85d3ed64963f0 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 14 Dec 2016 11:55:23 -0800
Subject: [PATCH 31/31] Issue: #2125 Possible fix for plugins and/or languages
 files adding junk characters prior to rss rendering.

---
 e107_plugins/rss_menu/rss.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/e107_plugins/rss_menu/rss.php b/e107_plugins/rss_menu/rss.php
index 42c345369..1c1f13e69 100644
--- a/e107_plugins/rss_menu/rss.php
+++ b/e107_plugins/rss_menu/rss.php
@@ -110,6 +110,8 @@ if (empty($rss_type))
 }
 
 
+while (@ob_end_clean());
+
 // Returning feeds here
 // Conversion table for old urls -------
 $conversion[1] = 'news';