From 229f0486aa13fc1f6d6f5350c45ad9fb5930cd1b Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 28 Sep 2017 09:35:56 -0700
Subject: [PATCH] Issue #2000 Enable news category to determine news category
 default template. Admin area completed. Frontend still to come.

---
 e107_admin/newspost.php        | 15 ++++++++++++---
 e107_core/sql/core_sql.php     |  1 +
 e107_handlers/form_handler.php | 14 ++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index c86587381..4c3f3224b 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -123,6 +123,8 @@ class news_cat_ui extends e_admin_ui
 		protected $batchExport = true;
 		protected $sortField = 'category_order';
 		protected $listOrder	= "category_order ASC";
+
+		protected $tabs = array(LAN_GENERAL, LAN_ADVANCED);
 		
 		protected $fields = array(
 			'checkboxes'				=> array('title'=> '',				'type' => null, 			'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'),
@@ -133,8 +135,9 @@ class news_cat_ui extends e_admin_ui
          	'category_meta_description' => array('title'=> LAN_DESCRIPTION,		'type' => 'textarea',	'data'=>'str',	'inline'=>true, 'width' => 'auto', 'thclass' => 'left','readParms' => 'expand=...&truncate=150&bb=1', 'readonly'=>FALSE, 'writeParms'=>array('size'=>'xxlarge')),
 			'category_meta_keywords' 	=> array('title'=> LAN_KEYWORDS,		'type' => 'tags',		'data'=>'str',	'inline'=>true, 'width' => 'auto', 'thclass' => 'left', 'readonly'=>FALSE),
 			'category_sef' 				=> array('title'=> LAN_SEFURL,	'type' => 'text', 'data'=>'str',	'inline'=>true,	'width' => 'auto', 'readonly'=>FALSE, 'writeParms'=>array('size'=>'xxlarge', 'sef'=>'category_name')), // Display name
-			'category_manager' 			=> array('title'=> LAN_MANAGER,'type' => 'userclass',		'inline'=>true, 'width' => 'auto', 'data' => 'int','batch'=>TRUE, 'filter'=>TRUE),
-			'category_order' 			=> array('title'=> LAN_ORDER,			'type' => 'text',			'width' => 'auto', 'thclass' => 'right', 'class'=> 'right' ),										
+			'category_manager' 			=> array('title'=> LAN_MANAGER,'type' => 'userclass',	'tab'=>1,	'inline'=>true, 'width' => 'auto', 'data' => 'int','batch'=>TRUE, 'filter'=>TRUE),
+			'category_order' 			=> array('title'=> LAN_ORDER,			'type' => 'text',	'tab'=>1,		'width' => 'auto', 'thclass' => 'right', 'class'=> 'right' ),
+			'category_template'         => array('title'=> LAN_TEMPLATE,        'type' => 'layouts', 'tab'=>1, 'width'=>'auto', 'thclass' => 'right', 'class'=> 'right', 'writeParms' => 'plugin=news&id=news&merge=0','help'=>'Template to use as the default view' ),
 			'options' 					=> array('title'=> LAN_OPTIONS,			'type' => null,				'width' => '10%', 'forced'=>TRUE, 'thclass' => 'center last', 'class' => 'center', 'sort' => true)
 		);
 
@@ -189,11 +192,17 @@ class news_cat_ui extends e_admin_ui
 			}
 
 			$sef = e107::getParser()->toDB($new_data['category_sef']);
-			if(e107::getDb()->count('news_category', '(*)', "category_sef='{$sef}' AND category_id!=".intval($id)))
+
+		/*	$message = "Error: sef: ".$sef."   id: ".$id."\n";
+			$message .= print_r($new_data,true);
+			file_put_contents(e_LOG.'uiAjaxResponseInline.log', $message."\n\n", FILE_APPEND);*/
+
+			if(e107::getDb()->count('news_category', '(*)', "category_sef='{$sef}' AND category_id !=".intval($id)))
 			{
 				e107::getMessage()->addError(LAN_NEWS_65);
 				return false;
 			}
+
 			return $new_data;
 		}
 
diff --git a/e107_core/sql/core_sql.php b/e107_core/sql/core_sql.php
index 16c4645b9..ae441bd78 100644
--- a/e107_core/sql/core_sql.php
+++ b/e107_core/sql/core_sql.php
@@ -344,6 +344,7 @@ CREATE TABLE news_category (
   category_manager tinyint(3) unsigned NOT NULL default '254',
   category_icon varchar(250) NOT NULL default '',
   category_order tinyint(3) unsigned NOT NULL default '0',
+  category_template varchar(50) NOT NULL default '',
   PRIMARY KEY  (category_id),
   KEY category_order (category_order)
 ) ENGINE=MyISAM;
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 54982dc64..8e0160fd7 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -5496,7 +5496,21 @@ class e_form
 				$where = vartrue($parms['area'], 'front'); //default is 'front'
 				$filter = varset($parms['filter']);
 				$merge = vartrue($parms['merge']) ? true : false;
+
+
+				if($tmp = e107::getTemplateInfo($location,$ilocation, null,true,$merge)) // read xxxx_INFO array from template file.
+				{
+					$opt = array();
+					foreach($tmp as $k=>$inf)
+					{
+						$opt[$k] = $inf['title'];
+					}
+
+					return vartrue($parms['pre'],'').$this->select($key,$opt,$value,$parms).vartrue($parms['post'],'');
+				}
+
 				$layouts = e107::getLayouts($location, $ilocation, $where, $filter, $merge, true);
+
 				if(varset($parms['default']) && !isset($layouts[0]['default']))
 				{
 					$layouts[0] = array('default' => $parms['default']) + $layouts[0];