From 5ce1ee4a2415ea2df76f81b509ac05c416f6d7e0 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 11 Feb 2016 11:21:03 -0800
Subject: [PATCH] Fixes #1337 - newforumposts_menu configuration rewrite.

---
 e107_admin/admin.php                          |   4 +-
 e107_plugins/forum/e_menu.php                 |  53 +++++++++
 e107_plugins/forum/newforumposts_menu.php     |   7 +-
 .../forum/newforumposts_menu_config.php       | 105 ------------------
 4 files changed, 58 insertions(+), 111 deletions(-)
 create mode 100644 e107_plugins/forum/e_menu.php
 delete mode 100755 e107_plugins/forum/newforumposts_menu_config.php

diff --git a/e107_admin/admin.php b/e107_admin/admin.php
index 111a23e14..a29d4710f 100644
--- a/e107_admin/admin.php
+++ b/e107_admin/admin.php
@@ -205,7 +205,9 @@ class admin_start
 			e_HANDLER."np_class.php",
 			e_CORE."shortcodes/single/user_extended.sc",
 			e_ADMIN."download.php",
-			e_PLUGIN."banner/config.php"
+			e_PLUGIN."banner/config.php",
+			e_PLUGIN."forum/newforumposts_menu_config.php",
+
 		);
 
 		$found = array();
diff --git a/e107_plugins/forum/e_menu.php b/e107_plugins/forum/e_menu.php
new file mode 100644
index 000000000..015392d0a
--- /dev/null
+++ b/e107_plugins/forum/e_menu.php
@@ -0,0 +1,53 @@
+<?php
+/*
+ * e107 website system
+ *
+ * Copyright (C) 2008-2015 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+*/
+
+if (!defined('e107_INIT')) { exit; }
+
+//v2.x Standard for extending menu configuration within Menu Manager. (replacement for v1.x config.php)
+	
+class forum_menu
+{
+	function __construct()
+	{
+		e107::lan('forum','menu',true); // English_menu.php or {LANGUAGE}_menu.php
+	}
+
+	/**
+	 * Configuration Fields.
+	 * @return array
+	 */
+	public function config($menu='')
+	{
+
+		$fields = array();
+		$fields['caption']      = array('title'=> LAN_FORUM_MENU_004, 'type'=>'text', 'multilan'=>true, 'writeParms'=>array('size'=>'xxlarge'));
+		$fields['display']      = array('title'=> LAN_FORUM_MENU_005, 'type'=>'text',  'writeParms'=>array('size'=>'mini','pattern'=>'[0-9]*'));
+		$fields['maxage']       = array('title'=> LAN_FORUM_MENU_0012, 'type'=>'text', 'help'=>LAN_FORUM_MENU_0013, 'writeParms'=>array('size'=>'mini','pattern'=>'[0-9]*'));
+		$fields['characters']   = array('title'=> LAN_FORUM_MENU_006, 'type'=>'text',  'writeParms'=>array('size'=>'mini','pattern'=>'[0-9]*'));
+		$fields['postfix']      = array('title'=> LAN_FORUM_MENU_007, 'type'=>'text', 'writeParms'=>array('size'=>'mini'));
+		$fields['title']        = array('title'=> LAN_FORUM_MENU_008, 'type'=>'boolean');
+
+        return $fields;
+
+	}
+
+}
+
+// optional - for when using custom methods above.
+/*
+class forum_menu_form extends e_form
+{
+
+
+}
+*/
+
+?>
\ No newline at end of file
diff --git a/e107_plugins/forum/newforumposts_menu.php b/e107_plugins/forum/newforumposts_menu.php
index 9ee24ecf8..43b244d5b 100755
--- a/e107_plugins/forum/newforumposts_menu.php
+++ b/e107_plugins/forum/newforumposts_menu.php
@@ -138,11 +138,8 @@ class forum_newforumposts_menu // plugin folder + menu name (without the .php)
 			$text = LAN_FORUM_MENU_002;
 		}
 
-
-		e107::getRender()->tablerender($this->menuPref['caption'], $text, 'nfp_menu');
-
-
-
+		$caption = varset($this->menuPref['caption'][e_LANGUAGE], $this->menuPref['caption']);
+		e107::getRender()->tablerender($caption, $text, 'nfp_menu');
 
 	}
 
diff --git a/e107_plugins/forum/newforumposts_menu_config.php b/e107_plugins/forum/newforumposts_menu_config.php
deleted file mode 100755
index 7f4646799..000000000
--- a/e107_plugins/forum/newforumposts_menu_config.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/*
- * e107 website system
- *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
- * Released under the terms and conditions of the
- * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
- *
- *
- *
- * $URL$
- * $Id$
- */
-
-$eplug_admin = TRUE;
-require_once('../../class2.php');
-if (!getperms('1'))
-{
-	e107::redirect('admin');
-	 exit();
-}
-require_once(e_ADMIN.'auth.php');
-$mes = e107::getMessage();
-e107::lan('forum','menu',true); // English_menu.php or {LANGUAGE}_menu.php	
-// include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_newforumposts_menu.php');
-
-if (isset($_POST['update_menu'])) {
-	while (list($key, $value) = each($_POST)) {
-		if ($value != LAN_FORUM_MENU_009) {
-			$menu_pref[$key] = $value;
-		}
-	}
-	if (!$_POST['newforumposts_title']) {
-		$menu_pref['newforumposts_title'] = 0;
-	}
-	$tmp = addslashes(serialize($menu_pref));
-	$sql->db_Update("core", "e107_value='$tmp' WHERE e107_name='menu_pref' ");
-	$ns->tablerender("", "<div style=\"text-align:center\"><b>".LAN_FORUM_MENU_003."</b></div>");
-}
-
-$menu_pref['newforumposts_maxage'] = varset($menu_pref['newforumposts_maxage'],0);
-
-$text = "<div>
-	<form method=\"post\" action=\"".e_SELF."?".e_QUERY."\" name=\"menu_conf_form\">
-	<table style='width:85%' class='table table-bordered table-striped'>
-	<colgroup>
-	  <col style='width:40%;' />
-	  <col style='width:60%;' />
-	</colgroup>
-	<tr>
-	<td class='forumheader3'>".LAN_FORUM_MENU_004.": </td>
-	<td class='forumheader3'>
-	<input class=\"tbox\" type=\"text\" name=\"newforumposts_caption\" size=\"20\" value=\"".$menu_pref['newforumposts_caption']."\" maxlength=\"100\" />
-	</td>
-	</tr>
-	 
-	<tr>
-	<td class='forumheader3'>".LAN_FORUM_MENU_005.":
-	</td>
-	<td class='forumheader3'>
-	<input class=\"tbox\" type=\"text\" name=\"newforumposts_display\" size=\"20\" value=\"".$menu_pref['newforumposts_display']."\" maxlength=\"2\" />
-	</td>
-	</tr>
-	 
-	<tr>
-	<td class='forumheader3'>".LAN_FORUM_MENU_0012.":
-	</td>
-	<td class='forumheader3'>
-	<input class=\"tbox\" type=\"text\" name='newforumposts_maxage' size='20' value='".$menu_pref['newforumposts_maxage']."' maxlength='3' /><br />
-	<span class='smalltext'><em>".LAN_FORUM_MENU_0013."</em></span>
-	</td>
-	</tr>
-	 
-	<tr>
-	<td class='forumheader3'>".LAN_FORUM_MENU_006.": </td>
-	<td class='forumheader3'>
-	<input class=\"tbox\" type=\"text\" name=\"newforumposts_characters\" size=\"20\" value=\"".$menu_pref['newforumposts_characters']."\" maxlength=\"4\" />
-	</td>
-	</tr>
-	 
-	<tr>
-	<td class='forumheader3'>".LAN_FORUM_MENU_007.":
-	</td>
-	<td class='forumheader3'>
-	<input class=\"tbox\" type=\"text\" name=\"newforumposts_postfix\" size=\"30\" value=\"".$menu_pref['newforumposts_postfix']."\" maxlength=\"200\" />
-	</td>
-	</tr>
-	 
-	<tr>
-	<td class='forumheader3'>".LAN_FORUM_MENU_008.":</td>
-	<td class='forumheader3'>
-	<input type='checkbox' name='newforumposts_title' value='1'".($menu_pref['newforumposts_title'] ? ' checked="checked"' : '')."
-	</td>
-	</tr>
-	 
-	<tr style=\"vertical-align:top\">
-	<td colspan=\"2\"  style=\"text-align:center\" class='forumheader'>
-	<input class=\"button\" type=\"submit\" name=\"update_menu\" value=\"".LAN_FORUM_MENU_009."\" />
-	</td>
-	</tr>
-	</table>
-	</form>
-	</div>";
-$ns->tablerender(LAN_FORUM_MENU_0010, $mes->render(). $text);
-require_once(e_ADMIN."footer.php");
\ No newline at end of file