From 7846015f85711fc27a26f93e4982aacd106584fd Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 16 Mar 2016 19:54:10 -0700
Subject: [PATCH] SubmitNews code cleanup. Admin can now set minimum dimensions
 for attached images.

---
 e107_admin/header.php            |  28 +-
 e107_admin/newspost.php          |  41 ++-
 e107_handlers/upload_handler.php |   5 +
 submitnews.php                   | 493 +++++++++++++++++++------------
 4 files changed, 354 insertions(+), 213 deletions(-)

diff --git a/e107_admin/header.php b/e107_admin/header.php
index 317f2810c..f3cdc6b03 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -508,17 +508,23 @@ echo getAlert();
 		
         return '
        
-         <div id="uiModal" class="modal hide fade" tabindex="-1" role="dialog"  aria-hidden="true">
-            <div class="modal-header">
-            	<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-             	<h4 class="modal-caption">&nbsp;</h4>
-             </div>
-             <div class="modal-body">
-             <p>Loading…</p>
-             </div>
-             <div class="modal-footer">
-                <a href="#" data-dismiss="modal" class="btn btn-primary">Close</a>
-            </div>
+         <div id="uiModal" class="modal  fade" tabindex="-1" role="dialog"  aria-hidden="true">
+            <div class="modal-dialog modal-lg">
+				<div class="modal-content">
+					<div class="modal-header">
+            			<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+             			<h4 class="modal-caption">&nbsp;</h4>
+            		 </div>
+
+             		<div class="modal-body">
+             			<p>Loading…</p>
+             		</div>
+
+             		<div class="modal-footer">
+                		<a href="#" data-dismiss="modal" class="btn btn-primary">Close</a>
+            		</div>
+               </div>
+		    </div>
         </div>';        
             
     }
diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index 6d1519e07..01085fddf 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -298,8 +298,8 @@ class news_sub_form_ui extends e_admin_form_ui
 		$text .= '
 
 		 <div id="submitted_'.$submitnews_id.'" class="modal fade" tabindex="-1" role="dialog"  aria-hidden="true">
-		 <div class="modal-dialog modal-lg">
-    <div class="modal-content">
+		 <div class="modal-dialog modal-lg" >
+             <div class="modal-content">
 			    <div class="modal-header">
 			    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 			   <h4>'.$tp->toHtml($submitnews_title,false,'TITLE').'</h4>
@@ -326,9 +326,9 @@ class news_sub_form_ui extends e_admin_form_ui
 			    
 		$text .= '</p>
 			    </div>
-			    <div class="modal-footer">
-			    <a href="#" data-dismiss="modal" class="btn btn-primary">'.LAN_NEWS_67.'</a>
-			    </div>
+				    <div class="modal-footer">
+				    <a href="#" data-dismiss="modal" class="btn btn-primary">'.LAN_NEWS_67.'</a>
+				    </div>
 			    </div>
 			    </div></div>';
 			
@@ -835,6 +835,7 @@ class news_admin_ui extends e_admin_ui
 		$temp['nbr_cols'] 				= intval($_POST['nbr_cols']);
 		$temp['subnews_attach'] 		= intval($_POST['subnews_attach']);
 		$temp['subnews_resize'] 		= intval($_POST['subnews_resize']);
+		$temp['subnews_attach_minsize'] = e107::getParser()->filter($_POST['subnews_attach_minsize']);
 		$temp['subnews_class'] 			= intval($_POST['subnews_class']);
 		$temp['subnews_htmlarea'] 		= intval($_POST['subnews_htmlarea']);
 		$temp['news_subheader'] 		= e107::getParser()->toDB($_POST['news_subheader']);
@@ -1083,7 +1084,7 @@ class news_admin_ui extends e_admin_ui
 
 
 			$text = "
-			<form method='post' action='".e_SELF."?pref' id='core-newspost-settings-form'>";
+			<form method='post' action='".e_REQUEST_URI."' id='core-newspost-settings-form'>";
 
 			$tab1 = "
 
@@ -1164,6 +1165,28 @@ class news_admin_ui extends e_admin_ui
 							</tr>
 							";
 
+
+
+
+			$imageSizes = array(
+
+				'400×300'   => '400x300',
+				'640×480'   => '640x480',
+				'800×600'   => '800x600',
+				'1024×768'  => '1024x768',
+				'1600x1200' => '2 MP (1600×1200)',
+				'2272x1704' => '4 MP (2272×1704)',
+				'2816x2112' => '6 MP (2816×2112)',
+				'3264x2448' => '8 MP (3264×2448)',
+				// 10 MP (3648×2736)
+				// 12 MP (4096×3072)
+
+			);
+
+
+
+
+
 			$tab2  = "<table class='table adminform'>
 								<colgroup>
 									<col class='col-label' />
@@ -1188,6 +1211,12 @@ class news_admin_ui extends e_admin_ui
 								<td>
 									".$frm->radio_switch('subnews_attach', $pref['subnews_attach'])."
 								</td>
+							</tr>
+								<tr>
+								<td>Only accept images larger than</td>
+								<td>
+									".$frm->select('subnews_attach_minsize', $imageSizes, $pref['subnews_attach_minsize'], null, 'Any Size')."
+								</td>
 							</tr>
 							<tr>
 								<td>".NWSLAN_101."</td>
diff --git a/e107_handlers/upload_handler.php b/e107_handlers/upload_handler.php
index cf1b498e9..0344165f5 100644
--- a/e107_handlers/upload_handler.php
+++ b/e107_handlers/upload_handler.php
@@ -191,6 +191,7 @@ function process_uploaded_files($uploaddir, $fileinfo = FALSE, $options = NULL)
 	
 	$c = 0;
 	$tp = e107::getParser();
+	$uploadfile = null;
 	
 	foreach ($files['name'] as $key=>$name)
 	{
@@ -299,6 +300,8 @@ function process_uploaded_files($uploaddir, $fileinfo = FALSE, $options = NULL)
 
 			if (!$first_error)  // All tests passed - can store it somewhere
 			{
+				$uploaded[$c] = e107::getFile()->get_file_info($uploadfile,true);
+
 				$uploaded[$c]['name'] = $name;
 				$uploaded[$c]['rawname'] = $raw_name;
 				$uploaded[$c]['origname'] = $origname;
@@ -306,6 +309,8 @@ function process_uploaded_files($uploaddir, $fileinfo = FALSE, $options = NULL)
 				$uploaded[$c]['size'] = 0;
 				$uploaded[$c]['index'] = $key; // Store the actual index from the file_userfile array
 
+			//	e107::getMessage()->addDebug(print_a($uploaded[$c],true));
+
 				// Store as flat file
 				if ((!$ul_temp_dir && @move_uploaded_file($uploadfile, $destination_file)) || ($ul_temp_dir && @rename($uploadfile, $destination_file))) // This should work on all hosts
 				{
diff --git a/submitnews.php b/submitnews.php
index 9bdd822a8..a6c3b02b4 100644
--- a/submitnews.php
+++ b/submitnews.php
@@ -25,7 +25,6 @@ if (!isset($pref['subnews_class']))
 }
 
 
-
 if (!check_class($pref['subnews_class']))
 {
 	$ns->tablerender(LAN_UI_403_TITLE_ERROR, LAN_UI_403_BODY_ERROR);
@@ -33,218 +32,320 @@ if (!check_class($pref['subnews_class']))
 	exit;
 }
 
-if (isset($_POST['submitnews_submit']) && $_POST['submitnews_title'] && $_POST['submitnews_item'])
-{
-	$ip = e107::getIPHandler()->getIP(FALSE);
-	$fp = new floodprotect;
-	if ($fp->flood("submitnews", "submitnews_datestamp") == FALSE)
-	{
-		e107::redirect();
-		exit;
-	}
-
-	$submitnews_user  = (USER ? USERNAME  : trim($tp->toDB($_POST['submitnews_name'])));
-	$submitnews_email = (USER ? USEREMAIL : trim(check_email($tp->toDB($_POST['submitnews_email']))));
-	$submitnews_title = $tp->toDB($_POST['submitnews_title']);
-	$submitnews_item  = $tp->toDB($_POST['submitnews_item']);
-	$submitnews_item  = str_replace("src=&quot;e107_images", "src=&quot;".SITEURL."e107_images", $submitnews_item);
-	$submitnews_file  = "";
-	$submitnews_error = FALSE;
-	if (!$submitnews_user || !$submitnews_email)
-	{
-		$message = SUBNEWSLAN_7;
-		$submitnews_error = TRUE;
-	}
-
-	// ==== Process File Upload ====
-	if (FILE_UPLOADS && $_FILES['file_userfile'] && vartrue($pref['subnews_attach']) && vartrue($pref['upload_enabled']) && check_class($pref['upload_class']))
-	{
-		require_once(e_HANDLER.'upload_handler.php');
-		$uploaded = process_uploaded_files(e_UPLOAD, FALSE, array('file_mask' => 'jpg,gif,png', 'max_file_count' => 1));
-	
-		if (($uploaded === FALSE) || !is_array($uploaded))
-		{	// Non-specific error
-			$submitnews_error = TRUE;
-			$message = SUBNEWSLAN_8;
-		}
-		else
-		{
-			$submitnews_filearray = array();
-			
-			foreach($uploaded as $c=>$v)
-			{
-				if (varset($uploaded[$c]['error'],0) != 0)
-				{
-					$submitnews_error = TRUE;
-					$message = handle_upload_messages($uploaded);
-				}
-				else
-				{
-					if (isset($uploaded[$c]['name']) && isset($uploaded[$c]['type']) && isset($uploaded[$c]['size']))
-					{
-						$filename = $uploaded[$c]['name'];
-						$filetype = $uploaded[$c]['type'];
-						$filesize = $uploaded[$c]['size'];
-						$fileext  = substr(strrchr($filename, "."), 1);
-						$today = getdate();
-						$submitnews_file = USERID."_".$today[0]."_".$c."_".str_replace(" ", "_", substr($submitnews_title, 0, 6)).".".$fileext;
-								
-						if (is_numeric($pref['subnews_resize']) && ($pref['subnews_resize'] > 30)  && ($pref['subnews_resize'] < 5000))
-						{
-							require_once(e_HANDLER.'resize_handler.php');
-					
-							if (!resize_image(e_UPLOAD.$filename, e_UPLOAD.$submitnews_file, $pref['subnews_resize']))
-							{
-							  rename(e_UPLOAD.$filename, e_UPLOAD.$submitnews_file);
-							}
-						}
-						elseif ($filename)
-						{
-							rename(e_UPLOAD.$filename, e_UPLOAD.$submitnews_file);
-						}
-					}
-				}
-	
-				if ($filename && file_exists(e_UPLOAD.$submitnews_file))
-				{
-					$submitnews_filearray[] = $submitnews_file;	
-				}
-				
-			}
-		}
-		
-	}
-
-	if ($submitnews_error === FALSE)
-	{
-		$sql->insert("submitnews", "0, '$submitnews_user', '$submitnews_email', '$submitnews_title', '".intval($_POST['cat_id'])."', '$submitnews_item', '".time()."', '$ip', '0', '".implode(',',$submitnews_filearray)."' ");
-		
-		$edata_sn = array("user" => $submitnews_user, "email" => $submitnews_email, "itemtitle" => $submitnews_title, "catid" => intval($_POST['cat_id']), "item" => $submitnews_item, "image" => $submitnews_file, "ip" => $ip);
-
-		e107::getEvent()->trigger("subnews", $edata_sn); // bc
-		e107::getEvent()->trigger("user_news_submit", $edata_sn);
-		
-		$mes = e107::getMessage();
-		$mes->addSuccess(LAN_134);
-		echo $mes->render();
-		
-		// $ns->tablerender(LAN_133, "<div style='text-align:center'>".LAN_134."</div>");
-		require_once(FOOTERF);
-		exit;
-	}
-	else
-	{
-		message_handler("P_ALERT", $message);
-	}
-}
-
-$text = "";
 
 if (!defined("USER_WIDTH")) { define("USER_WIDTH","width:95%"); }
 
 
+class submitNews
+{
 
-	if (!empty($pref['news_subheader']))
+	private $minWidth = 1024;
+	private $minHeight = 768;
+
+
+	function __construct()
 	{
 
+		$mes = e107::getMessage();
+
+		$minDimensions = e107::pref('core','subnews_attach_minsize',false);
+
+		if(empty($minDimensions))
+		{
+			$this->minWidth = 0;
+			$this->minHeight = 0;
+		}
+		else
+		{
+			$tmp = explode('×',$minDimensions);
+			$this->minWidth = intval($tmp[0]);
+			$this->minHeight = intval($tmp[1]);
+		}
+
+		if(isset($_POST['submitnews_submit']) && !empty($_POST['submitnews_title']) && !empty($_POST['submitnews_item']))
+		{
+			$this->process();
+		}
+
+		echo $mes->render();
+
+		$this->form();
+	}
+
+
+	function process()
+	{
+		$ip = e107::getIPHandler()->getIP(FALSE);
+		$tp = e107::getParser();
+		$pref = e107::pref('core');
+		$sql = e107::getDb();
+		$mes = e107::getMessage();
+
+		$fp = new floodprotect;
+
+		if ($fp->flood("submitnews", "submitnews_datestamp") == false)
+		{
+			e107::redirect();
+			exit;
+		}
+
+		$submitnews_user  = (USER ? USERNAME  : trim($tp->toDB($_POST['submitnews_name'])));
+		$submitnews_email = (USER ? USEREMAIL : trim(check_email($tp->toDB($_POST['submitnews_email']))));
+		$submitnews_title = $tp->toDB($_POST['submitnews_title']);
+		$submitnews_item  = $tp->toDB($_POST['submitnews_item']);
+	//	$submitnews_item  = str_replace("src=&quot;e107_images", "src=&quot;".SITEURL."e107_images", $submitnews_item);
+		$submitnews_file  = "";
+		$submitnews_error = false;
+		$submitnews_filearray = array();
+
+		if (!$submitnews_user || !$submitnews_email)
+		{
+			$message = SUBNEWSLAN_7;
+			$submitnews_error = TRUE;
+		}
+
+		// ==== Process File Upload ====
+		if (FILE_UPLOADS && !empty($_FILES['file_userfile']) && vartrue($pref['subnews_attach']) && vartrue($pref['upload_enabled']) && check_class($pref['upload_class']))
+		{
+			$uploaded = e107::getFile()->getUploaded(e_UPLOAD, 'unique', array('file_mask' => 'jpg,gif,png', 'max_file_count' => 3));
+
+			if (empty($uploaded)) // Non-specific error
+			{
+				$submitnews_error = true;
+				$message = SUBNEWSLAN_8;
+			}
+			else
+			{
+				foreach($uploaded as $c=>$v)
+				{
+					// Check if images is too small.
+					if(!empty($this->minWidth) && !empty($v['img-width']) && (intval($v['img-width']) < $this->minWidth || intval($v['img-width']) < $this->minHeight))
+					{
+						//TODO Lan and review wording.
+						$mes->addWarning("One of your images has dimensions smaller than ".$this->minWidth."px  x ".$this->minHeight."px. Please correct the attachment and submit the form again. ");
+
+						return false;
+					}
+
+					if (varset($uploaded[$c]['error'],0) != 0)
+					{
+						$submitnews_error = TRUE;
+						$message = handle_upload_messages($uploaded);
+					}
+					else
+					{
+						if (isset($uploaded[$c]['name']) && isset($uploaded[$c]['type']) && isset($uploaded[$c]['size']))
+						{
+							$filename = $uploaded[$c]['name'];
+							$filetype = $uploaded[$c]['type'];
+							$filesize = $uploaded[$c]['size'];
+							$fileext  = substr(strrchr($filename, "."), 1);
+
+							$today = getdate();
+
+							$submitnews_file = USERID."_".$today[0]."_".$c."_".str_replace(" ", "_", substr($submitnews_title, 0, 6)).".".$fileext;
+
+							if (is_numeric($pref['subnews_resize']) && ($pref['subnews_resize'] > 30)  && ($pref['subnews_resize'] < 5000))
+							{
+								require_once(e_HANDLER.'resize_handler.php');
+
+								if (!resize_image(e_UPLOAD.$filename, e_UPLOAD.$submitnews_file, $pref['subnews_resize']))
+								{
+								  rename(e_UPLOAD.$filename, e_UPLOAD.$submitnews_file);
+								}
+							}
+							elseif ($filename)
+							{
+								rename(e_UPLOAD.$filename, e_UPLOAD.$submitnews_file);
+							}
+						}
+					}
+
+					if ($filename && file_exists(e_UPLOAD.$submitnews_file))
+					{
+						$submitnews_filearray[] = $submitnews_file;
+					}
+
+				}
+			}
+
+		}
+
+		if ($submitnews_error === false)
+		{
+
+			$insertQry = array(
+				'submitnews_id'         => 0,
+				'submitnews_name'       => $submitnews_user,
+				'submitnews_email'      => $submitnews_email,
+				'submitnews_title'      => $submitnews_title,
+				'submitnews_category'   => intval($_POST['cat_id']),
+				'submitnews_item'       => $submitnews_item,
+				'submitnews_datestamp'  => time(),
+				'submitnews_ip'         => $ip,
+				'submitnews_auth'       => '0',
+				'submitnews_file'       => implode(',',$submitnews_filearray),
+			);
+
+			if(!$sql->insert("submitnews", $insertQry))
+			{
+				$mes->addError(LAN_134);
+				return false;
+			}
+
+
+		//	$sql->insert("submitnews", "0, '$submitnews_user', '$submitnews_email', '$submitnews_title', '".intval($_POST['cat_id'])."', '$submitnews_item', '".time()."', '$ip', '0', '".implode(',',$submitnews_filearray)."' ");
+
+			$edata_sn = array("user" => $submitnews_user, "email" => $submitnews_email, "itemtitle" => $submitnews_title, "catid" => intval($_POST['cat_id']), "item" => $submitnews_item, "image" => $submitnews_file, "ip" => $ip);
+
+			e107::getEvent()->trigger("subnews", $edata_sn); // bc
+			e107::getEvent()->trigger("user_news_submit", $edata_sn);
+
+
+			$mes->addSuccess(LAN_134);
+		//	echo $mes->render();
+			unset($_POST);
+
+			// $ns->tablerender(LAN_133, "<div style='text-align:center'>".LAN_134."</div>");
+
+		}
+		else
+		{
+		//	message_handler("P_ALERT", $message);
+			$mes->addWarning($message);
+		}
+	}
+
+
+	function form()
+	{
+
+		$tp = e107::getParser();
+		$sql = e107::getDb();
+		$ns = e107::getRender();
+		$pref = e107::pref('core');
+
+		$text = "";
+
+		if (!empty($pref['news_subheader']))
+		{
+			$text .= $tp->toHTML($pref['news_subheader'], true, "BODY");
+		}
+
+
 		$text .= "
+			<div>
+			  <form id='dataform' method='post' action='".e_SELF."' enctype='multipart/form-data' onsubmit='return frmVerify()'>
+			    <table class='table fborder'>";
+
+
+
+			if (!USER)
+			{
+			    $text .= "
+				  <tr>
+				    <td style='width:20%' class='forumheader3'>".LAN_7."</td>
+				    <td style='width:80%' class='forumheader3'>
+				      <input class='tbox' type='text' name='submitnews_name' size='60' value='".$tp->toHTML($_POST['submitnew_name'],FALSE,'USER_TITLE')."' maxlength='100' required />
+				    </td>
+				  </tr>
+				  <tr>
+				    <td style='width:20%' class='forumheader3'>".LAN_112."</td>
+				    <td style='width:80%' class='forumheader3'>
+				      <input class='tbox' type='text' name='submitnews_email' size='60' value='".$tp->filter($_POST['submitnews_email'], 'email')."' maxlength='100' required />
+				    </td>
+				  </tr>";
+			}
+
+			$text .= "
+			<tr>
+			  <td style='width:20%' class='forumheader3'>".NWSLAN_6.": </td>
+				<td style='width:80%' class='forumheader3'>";
+
+			if (!$sql->select("news_category"))
+			{
+				$text .= NWSLAN_10;
+			}
+			else
+			{
+				$text .= "<select name='cat_id' class='tbox form-control'>";
+				while (list($cat_id, $cat_name, $cat_icon) = $sql->fetch('num'))
+				{
+					$sel = (varset($_POST['cat_id'],'') == $cat_id) ? "selected='selected'" : "";
+					$text .= "<option value='{$cat_id}' {$sel}>".$tp->toHTML($cat_name, FALSE, "defs")."</option>";
+				}
+				$text .= "</select>";
+			}
+
+			$text .= "
+			  </td>
+			</tr>
+			<tr>
+			  <td style='width:20%' class='forumheader3'>".LAN_TITLE."</td>
+				<td style='width:80%' class='forumheader3'>".e107::getForm()->text('submitnews_title',$tp->toHTML(vartrue($_POST['submitnews_title']),TRUE,'USER_TITLE'),200, array('required'=>1))."
+			    </td>
+			</tr>
+			<tr>
+			    <td style='width:20%' class='forumheader3'>".LAN_135."</td>
+				<td style='width:80%' class='forumheader3'>
+					".e107::getForm()->bbarea('submitnews_item', $tp->toForm(vartrue($_POST['submitnews_item'])),null, null, 'large')."
+				</td>
+			</tr>
+			";
+
+			if ($pref['subnews_attach'] && $pref['upload_enabled'] && check_class($pref['upload_class']) && FILE_UPLOADS)
+			{
+				  $text .= "
+				  <tr>
+				    <td style='width:20%' class='forumheader3'>".SUBNEWSLAN_5."<br /><span class='smalltext'>".SUBNEWSLAN_6."</span>";
+
+
+
+
+				   $text .= "
+				    </td>
+				    <td style='width:80%' class='forumheader3'>
+
+				      <input class='tbox' type='file' name='file_userfile[]' multiple='multiple' />
+				      ";
+
+				     if(!empty($this->minWidth))
+				   {
+				        $text .= "<div class='alert alert-warning'>Minimum Dimensions: ".$this->minWidth."px × ".$this->minHeight."px</div>";
+				   }
+
+				      $text .= "
+				    </td>
+				  </tr>";
+			}
+
+			$text .= "
+			      <tr>
+			        <td colspan='2' style='text-align:center' class='forumheader'>
+			          <input class='btn btn-success button' type='submit' name='submitnews_submit' value='".LAN_136."' />
+			           <input type='hidden' name='e-token' value='".e_TOKEN."' />
+			        </td>
+			      </tr>
+			    </table>
+			  </form>
+			</div>";
+
+			$ns->tablerender(LAN_136, $text);
+
 
-	    ".$tp->toHTML($pref['news_subheader'], true, "BODY")."
-	  ";
 	}
 
 
-$text .= "
-<div>
-  <form id='dataform' method='post' action='".e_SELF."' enctype='multipart/form-data' onsubmit='return frmVerify()'>
-    <table class='table fborder'>";
-
-
-
-if (!USER)
-{
-	  $text .= "
-	  <tr>
-	    <td style='width:20%' class='forumheader3'>".LAN_7."</td>
-	    <td style='width:80%' class='forumheader3'>
-	      <input class='tbox' type='text' name='submitnews_name' size='60' value='".$tp->toHTML($submitnews_user,FALSE,'USER_TITLE')."' maxlength='100' required />
-	    </td>
-	  </tr>
-	  <tr>
-	    <td style='width:20%' class='forumheader3'>".LAN_112."</td>
-	    <td style='width:80%' class='forumheader3'>
-	      <input class='tbox' type='text' name='submitnews_email' size='60' value='".$tp->toHTML($submitnews_email, FALSE, 'LINKTEXT')."' maxlength='100' required />
-	    </td>
-	  </tr>";
 }
 
-$text .= "
-<tr>
-  <td style='width:20%' class='forumheader3'>".NWSLAN_6.": </td>
-	<td style='width:80%' class='forumheader3'>";
 
-if (!$sql->select("news_category"))
+new submitNews;
+
+
+if(!vartrue($pref['subnews_htmlarea'])) // check after bbarea is called.
 {
-	$text .= NWSLAN_10;
+	e107::wysiwyg(false);
 }
-else
-{
-	$text .= "
-		<select name='cat_id' class='tbox form-control'>";
-	while (list($cat_id, $cat_name, $cat_icon) = $sql->fetch('num'))
-	{
-		$sel = (varset($_POST['cat_id'],'') == $cat_id) ? "selected='selected'" : "";
-		$text .= "<option value='{$cat_id}' {$sel}>".$tp->toHTML($cat_name, FALSE, "defs")."</option>";
-	}
-	$text .= "</select>";
-}
-
-$text .= "
-  </td>
-</tr>
-<tr>
-  <td style='width:20%' class='forumheader3'>".LAN_TITLE."</td>
-	<td style='width:80%' class='forumheader3'>".e107::getForm()->text('submitnews_title',$tp->toHTML(vartrue($_POST['submitnews_title']),TRUE,'USER_TITLE'),200, array('required'=>1))."
-   	</td>
-</tr>
-<tr>
-  	<td style='width:20%' class='forumheader3'>".LAN_135."</td>
-	<td style='width:80%' class='forumheader3'>
-		".e107::getForm()->bbarea('submitnews_item', $tp->toForm(vartrue($_POST['submitnews_item'])),null, null, 'large', 'required=1')."
-	</td>
-</tr>
-";
-
-if ($pref['subnews_attach'] && $pref['upload_enabled'] && check_class($pref['upload_class']) && FILE_UPLOADS)
-{
-  $text .= "
-  <tr>
-    <td style='width:20%' class='forumheader3'>".SUBNEWSLAN_5."<br /><span class='smalltext'>".SUBNEWSLAN_6."</span></td>
-    <td style='width:80%' class='forumheader3'>
-      <input class='tbox' type='file' name='file_userfile[]' style='width:90%' multiple='multiple' />
-    </td>
-  </tr>";
-}
-
-$text .= "
-      <tr>
-        <td colspan='2' style='text-align:center' class='forumheader'>
-          <input class='btn btn-success button' type='submit' name='submitnews_submit' value='".LAN_136."' />
-           <input type='hidden' name='e-token' value='".e_TOKEN."' />
-        </td>
-      </tr>
-    </table>
-  </form>
-</div>";
-
-$ns->tablerender(LAN_136, $text);
-
-
-
-	if(!vartrue($pref['subnews_htmlarea'])) // check after bbarea is called.
-	{
-		e107::wysiwyg(false);
-	}
 
 require_once(FOOTERF);