Some LAN cleanup. Admin Area caption issue (on legacy plugins) corrected.

e107_admin/eurl.php

@@ -321,7 +321,7 @@ class eurl_admin_ui extends e_admin_controller_ui
 	
 	public function SettingsPage()
 	{
-		$this->addTitle(LAN_EURL_NAME_SETTINGS);
+		//$this->addTitle(LAN_EURL_NAME_SETTINGS);
 		return $this->getUI()->urlSettings();
 	}
 	
@@ -357,7 +357,7 @@ class eurl_admin_ui extends e_admin_controller_ui
 	
 	public function AliasPage()
 	{
-		$this->addTitle(LAN_EURL_NAME_ALIASES);
+	//	$this->addTitle(LAN_EURL_NAME_ALIASES);
 		
 		$aliases = e107::getPref('url_aliases', array());
 		
@@ -412,7 +412,7 @@ class eurl_admin_ui extends e_admin_controller_ui
 	
 	public function ConfigPage()
 	{
-		$this->addTitle(LAN_EURL_NAME_CONFIG);
+		// $this->addTitle(LAN_EURL_NAME_CONFIG);
 		$active = e107::getPref('url_config');
 
 		$set = array();

e107_core/templates/contact_template.php

@@ -60,7 +60,7 @@ $CONTACT_TEMPLATE['menu'] =  '
 	// In this case (see contact.php) e107::getScBatch('contact')->wrapper('contact/form')
 	// Only one Option is used - WRAPPER > SC_STYLE
 
-	$CONTACT_WRAPPER['form']['CONTACT_IMAGECODE'] 			= "<tr><td>".LANCONTACT_16."<br />{---}";
+	$CONTACT_WRAPPER['form']['CONTACT_IMAGECODE'] 			= "<tr><td>".LAN_ENTER_CODE."<br />{---}";
 	$CONTACT_WRAPPER['form']['CONTACT_IMAGECODE_INPUT'] 	= "{---}</td></tr>";
 	$CONTACT_WRAPPER['form']['CONTACT_EMAIL_COPY'] 			= "<tr><td>{---}".LANCONTACT_07."</td></tr>";
 	$CONTACT_WRAPPER['form']['CONTACT_PERSON']				= "<tr><td>".LANCONTACT_14."<br />{---}</td></tr>";

e107_handlers/e_parse_class.php

@@ -2811,6 +2811,7 @@ class e_parser
 	 * @param $lan - string LAN
 	 * @param string | array $vals - either a single value, which will replace '[x]' or an array with key=>value pairs.
 	 * @example $tp->lanVars("My name is [x] and I own a [y]", array('x'=>"John", 'y'=>"Cat"));
+	 * @example $tp->lanVars("My name is [x] and I own a [y]", array("John","Cat"));
 	 * @return string
 	 */
 	function lanVars($lan, $vals, $bold=false)
@@ -2821,8 +2822,15 @@ class e_parser
 		$search = array();
 		$replace = array();
 
+		$defaults = array('x', 'y', 'z');
+
 		foreach($array as $k=>$v)
 		{
+			if(is_numeric($k)) // convert array of numeric to x,y,z
+			{
+				$k = $defaults[$k];
+			}
+
 			$search[] = "[".$k."]";
 			$replace[] = ($bold===true) ? "<strong>".$v."</strong>" : $v;
 		}

e107_languages/English/lan_contact.php

@@ -31,4 +31,4 @@ define("LANCONTACT_13", "Please include a subject.");
 
 define("LANCONTACT_14", "Send message to:");
 define("LANCONTACT_15", "Incorrect code entered");
-define("LANCONTACT_16", "Enter Code");
+

e107_languages/English/lan_signup.php

@@ -23,9 +23,9 @@ define("PAGE_NAME", "Register");
 //define("LAN_106", "That doesn't appear to be a valid email address");
 define("LAN_108", "Registration complete");
 define("LAN_185", "You left required field(s) blank");
-define("LAN_201", "Yes");
+// define("LAN_201", "Yes");
-define("LAN_200", "No");
+// define("LAN_200", "No");
-define("LAN_399", "Continue");
+// define("LAN_399", "Continue");
 define("LAN_407", "Please keep this email for your own information. Your password has been encrypted and cannot be retrieved if you misplace or forget it. You can however request a new password if this happens.\n\nThanks for your registration.\n\nFrom");
 //define("LAN_408", "A user with that email address already exists. Please use the 'forgot password' screen to retrieve your password.");
 

e107_plugins/pm/languages/English.php

@@ -71,12 +71,8 @@ define('LAN_PM_67', 'No users blocked');
 define('LAN_PM_68', 'User Name');
 define('LAN_PM_69', 'Date blocked');
 define('LAN_PM_70', 'Deleting block on user');
-define('LAN_PM_71', '--GOOD-- attachment(s) deleted. --FAIL-- failure(s)');
+define('LAN_PM_71', '[x] attachment(s) deleted. [y] failure(s)');
-define('LAN_PM_72', '');
+
-define('LAN_PM_73', '');
-define('LAN_PM_74', '');
-define('LAN_PM_75', '');
-define('LAN_PM_76', '');
 
 define("LAN_PM_100", "New PM from ");
 define("LAN_PM_101", "You have received a new Private Message from ");
@@ -88,6 +84,5 @@ define("LAN_PM_106", "PM read by ");
 define("LAN_PM_107", "The Private Message you sent to {UNAME} was read on ");
 define("LAN_PM_108", "Message sent on: ");
 define("LAN_PM_109", "New Message(s)");
-define("LAN_PM_110", "ok");
 define("LAN_PM_111", "Read");
 ?>

e107_plugins/pm/pm_class.php

@@ -316,7 +316,9 @@ class private_message
 				}
 				if ($aCount[0] || $aCount[1])
 				{
-					$ret .= str_replace(array('--GOOD--', '--FAIL--'), $aCount, LAN_PM_71).'<br />';
+
+				//	$ret .= str_replace(array('--GOOD--', '--FAIL--'), $aCount, LAN_PM_71).'<br />';
+					$ret .= e107::getParser()->lanVars(LAN_PM_71, $aCount);
 				}
 				$sql->delete('private_msg', 'pm_id = '.$pmid);
 			}

e107_plugins/pm/private_msg_menu.php

@@ -54,7 +54,7 @@ if(!function_exists('pm_show_popup'))
 				<td width=100% style='text-align:center'>
 					<b>--- ".LAN_PM." ---</b><br />".$pm_inbox['inbox']['new'].' '.LAN_PM_109."<br />".$pm_inbox['inbox']['unread'].' '.LAN_PM_37."<br /><br />
 					<form>
-						<input class=\'button\' type=\'submit\' onclick=\'self.close();\' value = \'".LAN_PM_110."\' />
+						<input class=\'button\' type=\'submit\' onclick=\'self.close();\' value = \'".LAN_OK."\' />
 					</form>
 				</td>
 			</tr>

e107_themes/bootstrap/admin_template.php

@@ -199,7 +199,7 @@ $ADMIN_HEADER .= '<div class="container-fluid">
 			{ADMIN_MENU}
 			{ADMIN_MENUMANAGER} 
 			
-		
+
 			{ADMIN_PWORD}
 			{SETSTYLE=site_info}
 
@@ -216,11 +216,10 @@ $ADMIN_HEADER .= '<div class="container-fluid">
 			
 		
 			
-			{SETSTYLE=none}
+			{SETSTYLE=default}
 			
          </div>
         <div class="span10" id="right-panel" >
-        
         ';
 
 
@@ -231,7 +230,7 @@ $ADMIN_FOOTER = '
 
     </div><!--/.fluid-container-->
     <footer class="center mute"> 
-		Copyright &copy; 2008-2013 e107 Inc (e107.org)<br />
+		Copyright &copy; 2008-2015 e107 Inc (e107.org)<br />
       </footer>';
 
 

e107_themes/bootstrap/admin_theme.php

@@ -54,15 +54,15 @@ $no_core_css = TRUE;
 class bootstrap_admintheme
 {
 
-	function tablestyle($caption, $text, $mode) 
+	function tablestyle($caption, $text, $mode, $data)
 	{
-		global $style;
+		// global $style;
-		
+
+		$style = $data['setStyle'];
+
+	//	echo "Style: ".$style;
 		$class = '';
-		
+
-	
-		
-		
 		if(is_string($mode) && $mode == 'admin_help') $class = ' '.str_replace('_', '-', $mode);
 			
 		if($mode == 'e_help')