Signup and FAQs cleanup

e107_core/shortcodes/batch/signup_shortcodes.php

@@ -212,6 +212,7 @@ class signup_shortcodes extends e_shortcode
 		$options['title'] = LAN_SIGNUP_108; // Must be a valid email address. 
 		$text = e107::getForm()->email('email',($_POST['email'] ? $_POST['email'] : $email),100,$options);
 		$text .= "<div class='e-email-hint' style='display:none' data-hint='Did you mean <b>[x]</b>?'><!-- --></div>";
+		$text .= "<input type='text' name='email2' value='' style='display:none' />"; // spam-trap. 
 		return $text;
 	}
 	

e107_handlers/form_handler.php

@@ -176,6 +176,10 @@ class e_form
 	 * @param $value
 	 * @param $maxlength
 	 * @param $options
+	 *  - size: mini, small, medium, large, xlarge, xxlarge
+	 *  - class: 
+	 *  - typeahead: 'users' 
+	 * 
 	 */
 	function text($name, $value, $maxlength = 80, $options= array())
 	{
@@ -183,7 +187,8 @@ class e_form
 		{
 			parse_str($options,$options);
 		}
-		
+
+		/*
 		if(!vartrue($options['class']))
 		{
 			if($maxlength < 10)
@@ -205,6 +210,7 @@ class e_form
 				$options['class'] = 'tbox input-text';
 			}
 		}	
+		*/
 		
 		if(vartrue($options['typeahead']))
 		{
@@ -215,7 +221,12 @@ class e_form
 			}		
 		}
 		
-	
+		if(vartrue($options['size']) && is_numeric($options['size']))
+		{
+			$options['class'] .= " input-".$options['size'];	
+			unset($options['size']); // don't include in html 'size='. 	
+		}
+			
 		
 		
 		$options = $this->format_options('text', $name, $options);

e107_languages/English/admin/lan_admin.php

@@ -340,6 +340,10 @@ define("LAN_CATEGORIES", "Categories");
 define("LAN_DEMO_FORBIDDEN", "Changes on this page are not possible in demo mode.");
 define("LAN_COPYRIGHT", "Copyright");
 
+define("LAN_CREATE_CATEGORY", "Create Category");
+define("LAN_CREATE_ITEM",	"Create Item");
+
+
 define("LAN_SECURITYL_0", "Looking for trouble (none)");
 define("LAN_SECURITYL_5", "Balanced");
 define("LAN_SECURITYL_7", "High");

e107_plugins/faqs/admin_config.php

@@ -40,9 +40,9 @@ class faq_admin extends e_admin_dispatcher
 
 	protected $adminMenu = array(
 		'main/list'		=> array('caption'=> LAN_MANAGE, 'perm' => 'P'),
-		'main/create'	=> array('caption'=> LANA_FAQ_CREATE_ITEM, 'perm' => 'P'),
+		'main/create'	=> array('caption'=> LAN_CREATE_ITEM, 'perm' => 'P'),
-		'cat/list' 		=> array('caption'=> LANA_FAQ_CATEGORIES, 'perm' => 'P'),
+		'cat/list' 		=> array('caption'=> LAN_CATEGORIES, 'perm' => 'P'),
-		'cat/create' 	=> array('caption'=> LANA_FAQ_CREATE_CATEGORY, 'perm' => 'P'),
+		'cat/create' 	=> array('caption'=> LAN_CREATE_CATEGORY, 'perm' => 'P'),
 		'main/prefs' 	=> array('caption'=> LAN_PREFS, 'perm' => '0'),
 	//	'main/custom'	=> array('caption'=> 'Custom Page', 'perm' => '0')		
 	);

e107_plugins/faqs/languages/English/English_admin.php

@@ -7,14 +7,12 @@
 */
  
 
-define('LANA_FAQ_CREATE_ITEM', 'Create FAQ');
+
-define('LANA_FAQ_CATEGORIES', 'Categories');
-define('LANA_FAQ_CREATE_CATEGORY', 'Create Category');
 define('LANA_FAQ_QUESTION', 'Question');
 define('LANA_FAQ_ANSWER', 'Answer');
-define('LANA_FAQ_COMMENT', 'Comment');
+define('LANA_FAQ_COMMENT', 'Comment'); //FIXME Use generic
-define('LANA_FAQ_UNAME', 'User name');
+define('LANA_FAQ_UNAME', 'User name'); //FIXME Use generic
-define('LANA_FAQ_ULOGINNAME', 'User login');
+define('LANA_FAQ_ULOGINNAME', 'User login'); //FIXME Use generic
 define('LANA_FAQ_PREF_1', 'Allow submitting of FAQs by:');
 define('LANA_FAQ_PREF_2', 'Allow submitting of Questions by:');
 define('LANA_FAQ_PREF_3', 'Use Classic Layout');

e107_themes/templates/user_template.php

@@ -44,9 +44,10 @@ $USER_SHORT_TEMPLATE_START = "
 	<br />
 	<br />
 	{USER_FORM_START}
-	<p>".LAN_USER_70.": {USER_FORM_RECORDS} ".LAN_USER_57." {USER_FORM_ORDER}
+	<div class='form-inline'>
+	".LAN_USER_70.": {USER_FORM_RECORDS} ".LAN_USER_57." {USER_FORM_ORDER}
 	{USER_FORM_SUBMIT}
-	</p>
+	</div>
 	{USER_FORM_END}
 	</div>
 	<br />
@@ -54,10 +55,10 @@ $USER_SHORT_TEMPLATE_START = "
 	<table style='".USER_WIDTH."' class='table fborder e-list'>
 	<thead>
 	<tr>
-	<td class='fcaption' style='width:2%'>&nbsp;</td>
+	<th class='fcaption' style='width:2%'>&nbsp;</th>
-	<td class='fcaption' style='width:20%'>".LAN_USER_58."</td>
+	<th class='fcaption' style='width:20%'>".LAN_USER_58."</th>
-	<td class='fcaption' style='width:20%'>".LAN_USER_60."</td>
+	<th class='fcaption' style='width:20%'>".LAN_USER_60."</th>
-	<td class='fcaption' style='width:20%'>".LAN_USER_59."</td>
+	<th class='fcaption' style='width:20%'>".LAN_USER_59."</th>
 	</tr>
 	</thead>
 	<tbody>

signup.php

@@ -13,7 +13,10 @@
 
 require_once("class2.php");
 
-
+if(vartrue($_POST['email2'])) // spam-trap. 
+{
+	exit; 	
+}
 $qs = explode(".", e_QUERY);
 
 if($qs[0] != 'activate')