Login-Menu Language File cleanup.

e107_admin/mailout.php

@@ -1316,7 +1316,7 @@ class mailout_main_ui extends e_admin_ui
 		</colgroup>
 		<tbody>";
 	
-	$bouncePrefs = array('mail_bounce_email'=>LAN_MAILOUT_32, 'mail_bounce_pop3'=>LAN_MAILOUT_33, 'mail_bounce_user'=>LAN_MAILOUT_34, 'mail_bounce_pass'=>LAN_MAILOUT_35);
+	$bouncePrefs = array('mail_bounce_email'=>LAN_MAILOUT_32, 'mail_bounce_pop3'=>LAN_MAILOUT_33, 'mail_bounce_user'=>LAN_MAILOUT_34, 'mail_bounce_pass'=>LAN_PASSWORD);
 	
 	foreach($bouncePrefs as $key =>$label)
 	{
@@ -1328,7 +1328,7 @@ class mailout_main_ui extends e_admin_ui
 		<tr><td>".LAN_MAILOUT_32."</td><td><input class='tbox' size='40' type='text' name='mail_bounce_email' value=\"".$pref['mail_bounce_email']."\" /></td></tr>
 		<tr><td>".LAN_MAILOUT_33."</td><td><input class='tbox' size='40' type='text' name='mail_bounce_pop3' value=\"".$pref['mail_bounce_pop3']."\" /></td></tr>
 		<tr><td>".LAN_MAILOUT_34."</td><td><input class='tbox' size='40' type='text' name='mail_bounce_user' value=\"".$pref['mail_bounce_user']."\" /></td></tr>
-		<tr><td>".LAN_MAILOUT_35."</td><td><input class='tbox' size='40' type='text' name='mail_bounce_pass' value=\"".$pref['mail_bounce_pass']."\" /></td></tr>
+		<tr><td>".LAN_PASSWORD."</td><td><input class='tbox' size='40' type='text' name='mail_bounce_pass' value=\"".$pref['mail_bounce_pass']."\" /></td></tr>
 	";
 	*/
 		
@@ -2627,7 +2627,7 @@ function show_prefs($mailAdmin)
 		<tr><td>".LAN_MAILOUT_32."</td><td><input class='tbox' size='40' type='text' name='mail_bounce_email' value=\"".$pref['mail_bounce_email']."\" /></td></tr>
 		<tr><td>".LAN_MAILOUT_33."</td><td><input class='tbox' size='40' type='text' name='mail_bounce_pop3' value=\"".$pref['mail_bounce_pop3']."\" /></td></tr>
 		<tr><td>".LAN_MAILOUT_34."</td><td><input class='tbox' size='40' type='text' name='mail_bounce_user' value=\"".$pref['mail_bounce_user']."\" /></td></tr>
-		<tr><td>".LAN_MAILOUT_35."</td><td><input class='tbox' size='40' type='text' name='mail_bounce_pass' value=\"".$pref['mail_bounce_pass']."\" /></td></tr>
+		<tr><td>".LAN_PASSWORD."</td><td><input class='tbox' size='40' type='text' name='mail_bounce_pass' value=\"".$pref['mail_bounce_pass']."\" /></td></tr>
 		<tr><td>".LAN_MAILOUT_120."</td><td><select class='tbox' name='mail_bounce_type'>\n
 			<option value=''>&nbsp;</option>\n
 			<option value='pop3'".(($pref['mail_bounce_type']=='pop3') ? " selected='selected'" : "").">".LAN_MAILOUT_121."</option>\n

e107_core/shortcodes/batch/admin_shortcodes.php

@@ -869,7 +869,7 @@ class admin_shortcodes
 				unset($tmp);
 			}
 
-			$e107_var['lout']['text']=ADLAN_46;
+			$e107_var['lout']['text']=LAN_LOGOUT;
 			$e107_var['lout']['link']=e_ADMIN_ABS.'admin.php?logout';
 
 			$text = e_admin_menu('', '', $e107_var);
@@ -1634,7 +1634,7 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
 		{
 			$tmp = array();
 			
-			$tmp[1]['text'] = ADLAN_CL_1;
+			$tmp[1]['text'] = LAN_SETTINGS;
 			$tmp[1]['description'] = ADLAN_151;
 			$tmp[1]['link'] = e_BASE.'usersettings.php';
 			$tmp[1]['image'] =  "<i class='S16 e-settings-16'></i>"; // "<img src='".E_16_CAT_SETT."' alt='".ADLAN_151."' class='icon S16' />";
@@ -1653,7 +1653,7 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
 		//	$tmp[2]['perm'] = '';	
 			
 			
-			$tmp[3]['text'] = ADLAN_46;
+			$tmp[3]['text'] = LAN_LOGOUT;
 			$tmp[3]['description'] = ADLAN_151;
 			$tmp[3]['link'] = e_ADMIN_ABS.'admin.php?logout';
 			$tmp[3]['image'] = "<i class='S16 e-logout-16'></i>"; // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
@@ -1664,7 +1664,7 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
 				
 				
 					
-			$tmp[4]['text'] = ADLAN_46;
+			$tmp[4]['text'] = LAN_LOGOUT;
 			$tmp[4]['description'] = ADLAN_151;
 			$tmp[4]['link'] = e_ADMIN_ABS.'admin.php?logout';
 			$tmp[4]['image'] = "";
@@ -1716,7 +1716,7 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
 			$menu_vars['logout']['text'] = ADMINNAME; // ""; // ADMINNAME;
 			$menu_vars['logout']['link'] = '#';
 			$menu_vars['logout']['image'] = $tp->toGlyph('fa-user'); // "<i class='icon-user'></i>"; // "<img src='".E_16_NAV_LGOT."' alt='".ADLAN_151."' class='icon S16' />";
-			$menu_vars['logout']['image_src'] = ADLAN_46;
+			$menu_vars['logout']['image_src'] = LAN_LOGOUT;
 			$menu_vars['logout']['sub'] = $tmp;	
 		}
 

e107_core/shortcodes/single/custom.php

@@ -15,22 +15,22 @@ function custom_shortcode($parm)
 
 			if (USER == true)
 			{
-				$ret .= "<span class='mediumtext'><span class='loginc welcome'>".LOGIN_MENU_L5." ".USERNAME."</span>&nbsp;&nbsp;&nbsp;".$sep." ";
+				$ret .= "<span class='mediumtext'><span class='loginc welcome'>".LAN_LOGINMENU_5." ".USERNAME."</span>&nbsp;&nbsp;&nbsp;".$sep." ";
 				if(ADMIN == true)
 				{
-					$ret .= "<a class='loginc admin' href='".e_ADMIN."admin.php'>".LOGIN_MENU_L11."</a> ".$sep.' ';
+					$ret .= "<a class='loginc admin' href='".e_ADMIN."admin.php'>".LAN_LOGINMENU_11."</a> ".$sep.' ';
 				}
-				$ret .= ($custom_query[0] != 'login noprofile') ? "<a class='loginc profile' href='".e_BASE."user.php?id.".USERID."'>".LOGIN_MENU_L13."</a>\n".$sep." ":"";
+				$ret .= ($custom_query[0] != 'login noprofile') ? "<a class='loginc profile' href='".e_BASE."user.php?id.".USERID."'>".LAN_LOGINMENU_13."</a>\n".$sep." ":"";
-				$ret .= "<a class='loginc usersettings' href='" . e_BASE . "usersettings.php'>".LOGIN_MENU_L12."</a> ".$sep." <a class='loginc logout' href='".e_BASE."index.php?logout'>".LOGIN_MENU_L8."</a> ".$sep."</span>";
+				$ret .= "<a class='loginc usersettings' href='" . e_BASE . "usersettings.php'>".LAN_SETTINGS."</a> ".$sep." <a class='loginc logout' href='".e_BASE."index.php?logout'>".LAN_LOGOUT."</a> ".$sep."</span>";
 			}
 			else
 			{
-				$ret .= "<form method='post' action='".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."'>\n<div class='loginc_div'>\n".LOGIN_MENU_L1."<input class='tbox loginc user' type='text' name='username' size='15' value='$username' maxlength='20' />&nbsp;&nbsp;\n".LOGIN_MENU_L2."<input class='tbox loginc pass' type='password' name='userpass' size='15' value='' maxlength='20' />&nbsp;&nbsp;\n";
+				$ret .= "<form method='post' action='".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."'>\n<div class='loginc_div'>\n".LAN_LOGINMENU_1."<input class='tbox loginc user' type='text' name='username' size='15' value='$username' maxlength='20' />&nbsp;&nbsp;\n".LAN_LOGINMENU_2."<input class='tbox loginc pass' type='password' name='userpass' size='15' value='' maxlength='20' />&nbsp;&nbsp;\n";
-				$ret .= ($pref['user_tracking'] == "cookie") ? "<input type='checkbox' name='autologin' value='1' />".LOGIN_MENU_L6."&nbsp;&nbsp;\n" : "";
+				$ret .= ($pref['user_tracking'] == "cookie") ? "<input type='checkbox' name='autologin' value='1' />".LAN_LOGINMENU_6."&nbsp;&nbsp;\n" : "";
-				$ret .= "<input class='btn btn-default button loginc' type='submit' name='userlogin' value='".LOGIN_MENU_L28."' />";
+				$ret .= "<input class='btn btn-default button loginc' type='submit' name='userlogin' value='".LAN_LOGIN."' />";
 				if($pref['user_reg'])
 				{
-					$ret .= "&nbsp;&nbsp;<a class='loginc signup' href='".e_SIGNUP."'>".LOGIN_MENU_L3."</a>";
+					$ret .= "&nbsp;&nbsp;<a class='loginc signup' href='".e_SIGNUP."'>".LAN_LOGINMENU_3."</a>";
 				}
 				$ret .= "</div>\n</form>";
 			}

e107_handlers/sitelinks_class.php

@@ -672,7 +672,7 @@ class e_navigation
 		
 		$pref = e107::getPref();
 		
-		$this->admin_cat['title'][1] = ADLAN_CL_1;
+		$this->admin_cat['title'][1] = LAN_SETTINGS;
 		$this->admin_cat['id'][1] = 'setMenu';
 		$this->admin_cat['img'][1] = $tp->toGlyph('e-settings-16');
 		$this->admin_cat['lrg_img'][1] = $tp->toGlyph('e-settings-32'); 

e107_languages/English/English.php

@@ -78,6 +78,11 @@ define("LAN_CATEGORY", "Category");
 define("LAN_GUEST", "Guest");
 define("LAN_NEXT", "Next");
 define("LAN_PREVIOUS", "Previous");
+define("LAN_LOGIN", "Login");
+define("LAN_LOGOUT", "Logout");
+define("LAN_SETTINGS", "Settings");
+define("LAN_PASSWORD", "Password");
+
 
 
 ?>

e107_languages/English/admin/lan_admin.php

@@ -51,7 +51,7 @@ define("ADLAN_42", "Pages/Menus");
 define("ADLAN_43", "Create custom menu items");
 define("ADLAN_44", "Database");
 define("ADLAN_45", "Database utilities");
-define("ADLAN_46", "Logout");
+// define("ADLAN_46", "Logout");
 define("ADLAN_47", "Welcome");
 define("ADLAN_48", "Logged in");
 define("ADLAN_49", "main site administrator");
@@ -184,7 +184,7 @@ define("ADLAN_161", "Custom Fields?");
 define("ADLAN_162", "A newer version of your site-theme is available:");
 define("ADLAN_163", "A newer version of an installed plugin is available:");  
 
-define("ADLAN_CL_1", "Settings");
+// define("ADLAN_CL_1", "Settings");
 define("ADLAN_CL_2", "Users");
 define("ADLAN_CL_3", "Content");
 define("ADLAN_CL_4", "Coms");

e107_languages/English/admin/lan_mailout.php

@@ -45,7 +45,7 @@ define("LAN_MAILOUT_31", "Bounced Email Processing");
 define("LAN_MAILOUT_32", "Email address");
 define("LAN_MAILOUT_33", "Incoming Mail server");
 define("LAN_MAILOUT_34", "Account (user) Name");
-define("LAN_MAILOUT_35", "Password");
+// define("LAN_MAILOUT_35", "Password");
 define("LAN_MAILOUT_36", "Delete Bounced Mails after checking");
 define("LAN_MAILOUT_37", "Proceed");
 define("LAN_MAILOUT_38", "Cancel");

e107_languages/English/lan_signup.php

@@ -147,7 +147,7 @@ define('LAN_SIGNUP_106', 'Unable to action your request - do you already have an
 
 
 define("LAN_LOGINNAME", "Username");
-define("LAN_PASSWORD", "Password");
+//define("LAN_PASSWORD", "Password");
 define("LAN_USERNAME", "Display Name");
 
 define("LAN_SIGNUP_107", "Password must be a minimum of [x] characters and include at least one UPPERCASE letter and a digit");

e107_plugins/login_menu/config.php

@@ -127,23 +127,23 @@ $text = "
     
   /*
     <tr>
-   	 <td colspan="2">'.LOGIN_MENU_L42.'</td>
+   	 <td colspan="2">'.LAN_LOGINMENU_42.'</td>
     </tr>
   */
 
  $text .= "
 	<tr>
-		<td>".LOGIN_MENU_L31."</td>
+		<td>".LAN_LOGINMENU_31."</td>
 		<td>".$frm->checkbox('pref[new_news]', 1, varset($loginPrefs['new_news'],0))."</td>
 	</tr>
 
 	<tr>
-		<td>".LOGIN_MENU_L34."</td>
+		<td>".LAN_LOGINMENU_34."</td>
 		<td>".$frm->checkbox('pref[new_comments]', 1, varset($loginPrefs['new_comments'],0))."</td>
 	</tr>
 
 	<tr>
-		<td>".LOGIN_MENU_L36."</td>
+		<td>".LAN_LOGINMENU_36."</td>
 		<td>".$frm->checkbox('pref[new_members]', 1, varset($loginPrefs['new_members'],0))."</td>
 	</tr>
 	
@@ -157,7 +157,7 @@ $text = "
 	</form>
 	";
 
-$ns->tablerender(LOGIN_MENU_L41, $text);
+$ns->tablerender(LAN_LOGINMENU_41, $text);
 
 require_once(e_ADMIN."footer.php");
 

e107_plugins/login_menu/languages/English.php

@@ -14,66 +14,66 @@
  * $Author$
  */
 
-define("LOGIN_MENU_L1", "Username: ");
+define("LAN_LOGINMENU_1", "Username: ");
-define("LOGIN_MENU_L2", "Password: ");
+define("LAN_LOGINMENU_2", "Password: ");
-define("LOGIN_MENU_L3", "Sign up");
+define("LAN_LOGINMENU_3", "Sign up");
-define("LOGIN_MENU_L4", "Forgot password?");
+define("LAN_LOGINMENU_4", "Forgot password?");
-define("LOGIN_MENU_L5", "Welcome");
+define("LAN_LOGINMENU_5", "Welcome");
-define("LOGIN_MENU_L6", "Remember me");
+define("LAN_LOGINMENU_6", "Remember me");
-define("LOGIN_MENU_L7", "Unique user ID not recognised (possible corrupted cookie). Please click the logout link below to destroy cookie.");
+define("LAN_LOGINMENU_7", "Unique user ID not recognised (possible corrupted cookie). Please click the logout link below to destroy cookie.");
-define("LOGIN_MENU_L8", "Logout");
+// define("LAN_LOGINMENU_8", "Logout");
-define("LOGIN_MENU_L9", "Login Error");
+define("LAN_LOGINMENU_9", "Login Error");
-define("LOGIN_MENU_L10", "The maintenance flag is true - this means normal visitors are being redirected to sitedown.php. To reset the flag go to admin/maintenance.");
+define("LAN_LOGINMENU_10", "The maintenance flag is true - this means normal visitors are being redirected to sitedown.php. To reset the flag go to admin/maintenance.");
-define("LOGIN_MENU_L11", "Admin Area");
+define("LAN_LOGINMENU_11", "Admin Area");
-define("LOGIN_MENU_L12", "Settings");
+// define("LAN_LOGINMENU_12", "Settings");
-define("LOGIN_MENU_L13", "Profile");
+define("LAN_LOGINMENU_13", "Profile");
-define("LOGIN_MENU_L14", "news item");
+define("LAN_LOGINMENU_14", "news item");
-define("LOGIN_MENU_L15", "news items");
+define("LAN_LOGINMENU_15", "news items");
-define("LOGIN_MENU_L16", "chatbox post");
+define("LAN_LOGINMENU_16", "chatbox post");
-define("LOGIN_MENU_L17", "chatbox posts");
+define("LAN_LOGINMENU_17", "chatbox posts");
-define("LOGIN_MENU_L18", "comment");
+define("LAN_LOGINMENU_18", "comment");
-define("LOGIN_MENU_L19", "comments");
+define("LAN_LOGINMENU_19", "comments");
-define("LOGIN_MENU_L20", "forum post");
+define("LAN_LOGINMENU_20", "forum post");
-define("LOGIN_MENU_L21", "forum posts");
+define("LAN_LOGINMENU_21", "forum posts");
-define("LOGIN_MENU_L22", "new site member");
+define("LAN_LOGINMENU_22", "new site member");
-define("LOGIN_MENU_L23", "new site members");
+define("LAN_LOGINMENU_23", "new site members");
-define("LOGIN_MENU_L24", "Click here to see list of new items");
+define("LAN_LOGINMENU_24", "Click here to see list of new items");
-define("LOGIN_MENU_L25", "Since your last visit there have been");
+define("LAN_LOGINMENU_25", "Since your last visit there have been");
-define("LOGIN_MENU_L26", "no");
+define("LAN_LOGINMENU_26", "no");
-define("LOGIN_MENU_L27", "and");
+define("LAN_LOGINMENU_27", "and");
-define("LOGIN_MENU_L28", "Login");
+// define("LAN_LOGINMENU_28", "Login");
 
-//define("LOGIN_MENU_L29", "new article");
+//define("LAN_LOGINMENU_29", "new article");
-//define("LOGIN_MENU_L30", "new articles");
+//define("LAN_LOGINMENU_30", "new articles");
 
 // New config options
-define('LOGIN_MENU_L31', 'Show New News Posts');
+define('LAN_LOGINMENU_31', 'Show New News Posts');
-//define('LOGIN_MENU_L32', 'Show New Article Posts');
+//define('LAN_LOGINMENU_32', 'Show New Article Posts');
-//define('LOGIN_MENU_L33', 'Show New Chatbox Posts');
+//define('LAN_LOGINMENU_33', 'Show New Chatbox Posts');
-define('LOGIN_MENU_L34', 'Show New Comment Posts');
+define('LAN_LOGINMENU_34', 'Show New Comment Posts');
-//define('LOGIN_MENU_L35', 'Show New Forum Posts');
+//define('LAN_LOGINMENU_35', 'Show New Forum Posts');
-define('LOGIN_MENU_L36', 'Show New Members');
+define('LAN_LOGINMENU_36', 'Show New Members');
 
 
-define('LOGIN_MENU_L39', 'Leave Admin');
+define('LAN_LOGINMENU_39', 'Leave Admin');
-define("LOGIN_MENU_L40", "Resend Activation Email");
+define("LAN_LOGINMENU_40", "Resend Activation Email");
-define("LOGIN_MENU_L41", "Login Menu Settings");
+define("LAN_LOGINMENU_41", "Login Menu Settings");
 
 //new v0.8
-define('LOGIN_MENU_L37', 'Show');
+define('LAN_LOGINMENU_37', 'Show');
-define('LOGIN_MENU_L38', 'Login menu - Additional Links');
+define('LAN_LOGINMENU_38', 'Login menu - Additional Links');
 
-define('LOGIN_MENU_L42', 'Login menu - Recent core additions');
+define('LAN_LOGINMENU_42', 'Login menu - Recent core additions');
-define('LOGIN_MENU_L43', 'Position');
+define('LAN_LOGINMENU_43', 'Position');
-define('LOGIN_MENU_L44', 'missing link title');
+define('LAN_LOGINMENU_44', 'missing link title');
-define('LOGIN_MENU_L45', 'link(s) -');
+define('LAN_LOGINMENU_45', 'link(s) -');
-define('LOGIN_MENU_L45a', ''); //pre
+define('LAN_LOGINMENU_45a', ''); //pre
-define('LOGIN_MENU_L45b', 'plugin'); //post
+define('LAN_LOGINMENU_45b', 'plugin'); //post
-define('LOGIN_MENU_L46', 'recent items -');
+define('LAN_LOGINMENU_46', 'recent items -');
-define('LOGIN_MENU_L47', 'Login menu - Recent plugin additions');
+define('LAN_LOGINMENU_47', 'Login menu - Recent plugin additions');
-define('LOGIN_MENU_L48', 'Menu Config');
+define('LAN_LOGINMENU_48', 'Menu Config');
-define('LOGIN_MENU_L49', 'Email: ');
+define('LAN_LOGINMENU_49', 'Email: ');
-define('LOGIN_MENU_L50', 'Username or Email: '); 
+define('LAN_LOGINMENU_50', 'Username or Email: ');
-define("LOGIN_MENU_L51", "Sign In");
+define("LAN_LOGINMENU_51", "Sign In");
 
 ?>

e107_plugins/login_menu/login_menu.php

@@ -45,9 +45,9 @@ else
 //Corrup cookie - template? - TODO
 if (defined('CORRUPT_COOKIE') && CORRUPT_COOKIE == TRUE)
 {
-	$text = "<div class='core-sysmsg loginbox'>".LOGIN_MENU_L7."<br /><br />
+	$text = "<div class='core-sysmsg loginbox'>".LAN_LOGINMENU_7."<br /><br />
-	{$bullet} <a href='".SITEURL."index.php?logout'>".LOGIN_MENU_L8."</a></div>";
+	{$bullet} <a href='".SITEURL."index.php?logout'>".LAN_LOGOUT."</a></div>";
-	$ns->tablerender(LOGIN_MENU_L9, $text, 'login_error');
+	$ns->tablerender(LAN_LOGINMENU_9, $text, 'login_error');
 }
     
 //Image code
@@ -146,9 +146,9 @@ if (USER == TRUE || ADMIN == TRUE)
     
     //menu caption
 	if (file_exists(THEME.'images/login_menu.png')) {
-		$caption = '<img src="'.THEME_ABS.'images/login_menu.png" alt="" />'.LOGIN_MENU_L5.' '.USERNAME;
+		$caption = '<img src="'.THEME_ABS.'images/login_menu.png" alt="" />'.LAN_LOGINMENU_5.' '.USERNAME;
 	} else {
-		$caption = LOGIN_MENU_L5.' '.USERNAME;
+		$caption = LAN_LOGINMENU_5.' '.USERNAME;
 	}
 	
 	//render
@@ -184,9 +184,9 @@ else
 	$text .= '</form>';
 
 	if (file_exists(THEME.'images/login_menu.png')) {
-		$caption = '<img src="'.THEME_ABS.'images/login_menu.png" alt="" />'.LOGIN_MENU_L5;
+		$caption = '<img src="'.THEME_ABS.'images/login_menu.png" alt="" />'.LAN_LOGINMENU_5;
 	} else {
-		$caption = LOGIN_MENU_L5;
+		$caption = LAN_LOGINMENU_5;
 	}
 	$ns->tablerender($caption, $text, 'login');
 }

e107_plugins/login_menu/login_menu_class.php

@@ -177,10 +177,10 @@ class login_menu_class
             return array();
         
         $lbox_stats = array();
-        $lbox_stats[0]['stat_item']    = LOGIN_MENU_L20;
+        $lbox_stats[0]['stat_item']    = LAN_LOGINMENU_20;
-        $lbox_stats[0]['stat_items']   = LOGIN_MENU_L21;
+        $lbox_stats[0]['stat_items']   = LAN_LOGINMENU_21;
         $lbox_stats[0]['stat_new']     = 0;
-        $lbox_stats[0]['stat_nonew']   = LOGIN_MENU_L26.' '.LOGIN_MENU_L21;
+        $lbox_stats[0]['stat_nonew']   = LAN_LOGINMENU_26.' '.LAN_LOGINMENU_21;
         if($get_stats) {
 
             $nobody_regexp = "'(^|,)(".str_replace(",", "|", e_UC_NOBODY).")(,|$)'";
@@ -209,10 +209,10 @@ class login_menu_class
         if(!e107::isInstalled('chatbox_menu'))
             return array();
         
-        $lbox_stats[0]['stat_item']     = LOGIN_MENU_L16;
+        $lbox_stats[0]['stat_item']     = LAN_LOGINMENU_16;
-        $lbox_stats[0]['stat_items']    = LOGIN_MENU_L17;
+        $lbox_stats[0]['stat_items']    = LAN_LOGINMENU_17;
         $lbox_stats[0]['stat_new']      = 0;
-        $lbox_stats[0]['stat_nonew']    = LOGIN_MENU_L26.' '.LOGIN_MENU_L17;
+        $lbox_stats[0]['stat_nonew']    = LAN_LOGINMENU_26.' '.LAN_LOGINMENU_17;
         if(vartrue($get_stats)) {
             $lbox_stats['chatbox_menu'][0]['stat_new']  = $sql->db_Count('chatbox', '(*)', 'WHERE `cb_datestamp` > '.USERLV);
         }
@@ -234,7 +234,7 @@ class login_menu_class
         foreach ($lbox_infos['links'] as $id => $stack) {
             $links = array();
             foreach ($stack as $value) {
-            	$links[] = '<a href="'.$value['link_url'].'">'.vartrue($value['link_label'], '['.LOGIN_MENU_L44.']').'</a>';
+            	$links[] = '<a href="'.$value['link_url'].'">'.vartrue($value['link_label'], '['.LAN_LOGINMENU_44.']').'</a>';
             }
             
             $plug_data = $this->get_plugin_data($id);
@@ -243,7 +243,7 @@ class login_menu_class
             
         	$ret .= '
             	<tr>
-            	<td class="forumheader3">'.LOGIN_MENU_L37.' '.(varset($plug_data['eplug_name']) ? LOGIN_MENU_L45.LOGIN_MENU_L45a." {$plug_data['eplug_name']} ".LOGIN_MENU_L45b."<br />" : '').$links.'</td>
+            	<td class="forumheader3">'.LAN_LOGINMENU_37.' '.(varset($plug_data['eplug_name']) ? LAN_LOGINMENU_45.LAN_LOGINMENU_45a." {$plug_data['eplug_name']} ".LAN_LOGINMENU_45b."<br />" : '').$links.'</td>
             	<td style="text-align: left;" class="forumheader3">
 
                    <table style="margin-left: 0px">
@@ -252,7 +252,7 @@ class login_menu_class
                 	   <input type="checkbox" name="external_links['.$id.']" value="1"'.(in_array($id, $enabled) ? ' checked="checked"' : '').' />
                     </td>
                     <td>
-                        '.LOGIN_MENU_L43.': <input type="text" class="tbox" style="text-align: right" size="4" maxlength="3" name="external_links_order['.$id.']" value="'.$num.'" />
+                        '.LAN_LOGINMENU_43.': <input type="text" class="tbox" style="text-align: right" size="4" maxlength="3" name="external_links_order['.$id.']" value="'.$num.'" />
                     </td>                   
                    </tr>
                    </table>
@@ -265,7 +265,7 @@ class login_menu_class
         
         if($ret) 
 		{
-            $ret = '<tr><td colspan="2" class="fcaption">'.LOGIN_MENU_L38.'</td></tr>'.$ret;
+            $ret = '<tr><td colspan="2" class="fcaption">'.LAN_LOGINMENU_38.'</td></tr>'.$ret;
         }
         
         return $ret;
@@ -292,7 +292,7 @@ class login_menu_class
 			{
 				$ret .= '
 					<tr>
-					<td class="forumheader3">'.LOGIN_MENU_L37.' '.LOGIN_MENU_L46.LOGIN_MENU_L45a." {$plug_data['eplug_name']} ".LOGIN_MENU_L45b.'<br /></td>
+					<td class="forumheader3">'.LAN_LOGINMENU_37.' '.LAN_LOGINMENU_46.LAN_LOGINMENU_45a." {$plug_data['eplug_name']} ".LAN_LOGINMENU_45b.'<br /></td>
 					<td class="forumheader3">
 					   <input type="checkbox" name="external_stats['.$id.']" value="1"'.(in_array($id, $enabled) ? ' checked="checked"' : '').' />
 					</td>
@@ -304,7 +304,7 @@ class login_menu_class
         
         if($ret) 
 		{
-            $ret = '<tr><td colspan="2" class="fcaption">'.LOGIN_MENU_L47.'</td></tr>'.$ret;
+            $ret = '<tr><td colspan="2" class="fcaption">'.LAN_LOGINMENU_47.'</td></tr>'.$ret;
         }
         
         return $ret;

e107_plugins/login_menu/login_menu_shortcodes.php

@@ -41,7 +41,7 @@ global $tp;
 
 			private $use_imagecode =0;
 			private $sec;
-			private $usernameLabel = LOGIN_MENU_L1;
+			private $usernameLabel = LAN_LOGINMENU_1;
 			private $allowEmailLogin;
 
 			function __construct()
@@ -55,12 +55,12 @@ global $tp;
 
 				if($pref['allowEmailLogin']==1)
 				{
-					$this->usernameLabel = LOGIN_MENU_L49;
+					$this->usernameLabel = LAN_LOGINMENU_49;
 				}
 
 				if($pref['allowEmailLogin']==2)
 				{
-					$this->usernameLabel = LOGIN_MENU_L50;
+					$this->usernameLabel = LAN_LOGINMENU_50;
 				}
 
 			}
@@ -93,7 +93,7 @@ global $tp;
 
 			function sc_lm_password_label($parm='')
 			{
-				return LOGIN_MENU_L2;
+				return LAN_LOGINMENU_2;
 			}
 
 
@@ -133,7 +133,7 @@ global $tp;
 
 			function sc_lm_loginbutton($parm='')
 			{
-				return "<input class='button btn btn-default login' type='submit' name='userlogin' id='userlogin' value='".LOGIN_MENU_L28."' />";
+				return "<input class='button btn btn-default login' type='submit' name='userlogin' id='userlogin' value='".LAN_LOGIN."' />";
 			}
 
 			function sc_lm_rememberme($parm='')
@@ -144,7 +144,7 @@ global $tp;
 				}
 				if($pref['user_tracking'] != "session")
 				{
-					return "<input type='checkbox' name='autologin' id='autologin' value='1' checked='checked' />".($parm ? $parm : "<label for='autologin'>".LOGIN_MENU_L6."</label>");
+					return "<input type='checkbox' name='autologin' id='autologin' value='1' checked='checked' />".($parm ? $parm : "<label for='autologin'>".LAN_LOGINMENU_6."</label>");
 				}
 				return '';
 			}
@@ -156,7 +156,7 @@ global $tp;
 				{
 					if (!$pref['auth_method'] || $pref['auth_method'] == 'e107')
 					{
-						return $parm == 'href' ? e_SIGNUP : "<a class='login_menu_link signup' id='login_menu_link_signup' href='".e_SIGNUP."' title=\"".LOGIN_MENU_L3."\">".LOGIN_MENU_L3."</a>";
+						return $parm == 'href' ? e_SIGNUP : "<a class='login_menu_link signup' id='login_menu_link_signup' href='".e_SIGNUP."' title=\"".LAN_LOGINMENU_3."\">".LAN_LOGINMENU_3."</a>";
 					}
 				}
 				return '';
@@ -167,7 +167,7 @@ global $tp;
 				$pref = e107::getPref();
 				if (!$pref['auth_method'] || $pref['auth_method'] == 'e107')
 				{
-					return $parm == 'href' ? SITEURL.'fpw.php' : "<a class='login_menu_link fpw' id='login_menu_link_fpw' href='".SITEURL."fpw.php' title=\"".LOGIN_MENU_L4."\">".LOGIN_MENU_L4."</a>";
+					return $parm == 'href' ? SITEURL.'fpw.php' : "<a class='login_menu_link fpw' id='login_menu_link_fpw' href='".SITEURL."fpw.php' title=\"".LAN_LOGINMENU_4."\">".LAN_LOGINMENU_4."</a>";
 				}
 				return '';
 			}
@@ -182,7 +182,7 @@ global $tp;
 					{
 						if (!$pref['auth_method'] || $pref['auth_method'] == 'e107' )
 						{
-							return $parm == 'href' ? e_SIGNUP.'?resend' : "<a class='login_menu_link resend' id='login_menu_link_resend' href='".e_SIGNUP."?resend' title=\"".LOGIN_MENU_L40."\">".LOGIN_MENU_L40."</a>";
+							return $parm == 'href' ? e_SIGNUP.'?resend' : "<a class='login_menu_link resend' id='login_menu_link_resend' href='".e_SIGNUP."?resend' title=\"".LAN_LOGINMENU_40."\">".LAN_LOGINMENU_40."</a>";
 						}
 					}
 				}
@@ -195,7 +195,7 @@ global $tp;
 
 				if(ADMIN && varset($pref['maintainance_flag']))
 				{
-					return LOGIN_MENU_L10;
+					return LAN_LOGINMENU_10;
 				}
 				return '';
 			}
@@ -213,7 +213,7 @@ global $tp;
 			function sc_lm_adminlink($parm='')
 			{
 				if(ADMIN == TRUE) {
-					return $parm == 'href' ? e_ADMIN_ABS.'admin.php' : '<a class="login_menu_link admin" id="login_menu_link_admin" href="'.e_ADMIN_ABS.'admin.php">'.LOGIN_MENU_L11.'</a>';
+					return $parm == 'href' ? e_ADMIN_ABS.'admin.php' : '<a class="login_menu_link admin" id="login_menu_link_admin" href="'.e_ADMIN_ABS.'admin.php">'.LAN_LOGINMENU_11.'</a>';
 				}
 				return '';
 			}
@@ -221,7 +221,7 @@ global $tp;
 			function sc_lm_admin_configure($parm='')
 			{
 			if(ADMIN == TRUE) {
-				return $parm == 'href' ? e_PLUGIN_ABS.'login_menu/config.php' : '<a class="login_menu_link config" id="login_menu_link_config" href="'.e_PLUGIN_ABS.'login_menu/config.php">'.LOGIN_MENU_L48.'</a>';
+				return $parm == 'href' ? e_PLUGIN_ABS.'login_menu/config.php' : '<a class="login_menu_link config" id="login_menu_link_config" href="'.e_PLUGIN_ABS.'login_menu/config.php">'.LAN_LOGINMENU_48.'</a>';
 			}
 			return '';
 			}
@@ -234,7 +234,7 @@ global $tp;
 
 			function sc_lm_usersettings($parm='')
 			{
-				$text = ($parm) ? $parm : LOGIN_MENU_L12;
+				$text = ($parm) ? $parm : LAN_SETTINGS;
 				$url = $this->sc_lm_usersettings_href();
 				return '<a class="login_menu_link usersettings" id="login_menu_link_usersettings" href="'.$url.'">'.$text.'</a>';
 			}
@@ -247,7 +247,7 @@ global $tp;
 
 			function sc_lm_profile($parm='')
 			{
-				$text = ($parm) ? $parm : LOGIN_MENU_L13;
+				$text = ($parm) ? $parm : LAN_LOGINMENU_13;
 				$url = $this->sc_lm_profile_href();
 				return '<a class="login_menu_link profile" id="login_menu_link_profile" href="'.$url.'">'.$text.'</a>';
 			}
@@ -260,7 +260,7 @@ global $tp;
 
 			function sc_lm_logout($parm='')
 			{
-			$text = ($parm) ? $parm : LOGIN_MENU_L8;
+			$text = ($parm) ? $parm : LAN_LOGOUT;
 			return '<a class="login_menu_link logout" id="login_menu_link_logout" href="'.e_HTTP.'index.php?logout">'.$text.'</a>';
 			}
 
@@ -295,13 +295,13 @@ global $tp;
 			function sc_lm_external_link($parm='')
 			{
 				$lbox_item = getcachedvars('login_menu_linkdata');
-				return $parm == 'href' ? $lbox_item['link_url'] : '<a href="'.$lbox_item['link_url'].'" class="login_menu_link external" id="login_menu_link_external_'.$lbox_item['link_id'].'">'.vartrue($lbox_item['link_label'], '['.LOGIN_MENU_L44.']').'</a>';
+				return $parm == 'href' ? $lbox_item['link_url'] : '<a href="'.$lbox_item['link_url'].'" class="login_menu_link external" id="login_menu_link_external_'.$lbox_item['link_id'].'">'.vartrue($lbox_item['link_label'], '['.LAN_LOGINMENU_44.']').'</a>';
 			}
 
 			function sc_lm_external_link_label($parm='')
 			{
 				$lbox_item = getcachedvars('login_menu_linkdata');
-				return vartrue($lbox_item['link_label'], '['.LOGIN_MENU_L44.']');
+				return vartrue($lbox_item['link_label'], '['.LAN_LOGINMENU_44.']');
 			}
 
 			function sc_lm_stats($parm='')
@@ -322,12 +322,12 @@ global $tp;
 				$tmp = array();
 				if($data['new_news']){
 					$tmp['LM_STAT_NEW']   = $data['new_news'];
-					$tmp['LM_STAT_LABEL'] = $data['new_news'] == 1 ? LOGIN_MENU_L14 : LOGIN_MENU_L15;
+					$tmp['LM_STAT_LABEL'] = $data['new_news'] == 1 ? LAN_LOGINMENU_14 : LAN_LOGINMENU_15;
 					$tmp['LM_STAT_EMPTY'] = '';
 				} else {
 					$tmp['LM_STAT_NEW'] = '';
 					$tmp['LM_STAT_LABEL'] = '';
-					$tmp['LM_STAT_EMPTY'] = LOGIN_MENU_L26." ".LOGIN_MENU_L15;
+					$tmp['LM_STAT_EMPTY'] = LAN_LOGINMENU_26." ".LAN_LOGINMENU_15;
 				}
 				return $tp -> parseTemplate($LOGIN_MENU_STATITEM, false, $tmp);
 			}
@@ -340,12 +340,12 @@ global $tp;
 				$tmp = array();
 				if($data['new_comments']){
 					$tmp['LM_STAT_NEW']   = $data['new_comments'];
-					$tmp['LM_STAT_LABEL'] = $data['new_comments'] == 1 ? LOGIN_MENU_L18 : LOGIN_MENU_L19;
+					$tmp['LM_STAT_LABEL'] = $data['new_comments'] == 1 ? LAN_LOGINMENU_18 : LAN_LOGINMENU_19;
 					$tmp['LM_STAT_EMPTY'] = '';
 				} else {
 					$tmp['LM_STAT_NEW']   = '';
 					$tmp['LM_STAT_LABEL'] = '';
-					$tmp['LM_STAT_EMPTY'] = LOGIN_MENU_L26." ".LOGIN_MENU_L19;
+					$tmp['LM_STAT_EMPTY'] = LAN_LOGINMENU_26." ".LAN_LOGINMENU_19;
 				}
 				return $tp -> parseTemplate($LOGIN_MENU_STATITEM, false, $tmp);
 			}
@@ -358,12 +358,12 @@ global $tp;
 				$tmp = array();
 				if($data['new_users']){
 					$tmp['LM_STAT_NEW']   = $data['new_users'];
-					$tmp['LM_STAT_LABEL'] = $data['new_users'] == 1 ? LOGIN_MENU_L22 : LOGIN_MENU_L23;
+					$tmp['LM_STAT_LABEL'] = $data['new_users'] == 1 ? LAN_LOGINMENU_22 : LAN_LOGINMENU_23;
 					$tmp['LM_STAT_EMPTY'] = '';
 				} else {
 					$tmp['LM_STAT_NEW']   = '';
 					$tmp['LM_STAT_LABEL'] = '';
-					$tmp['LM_STAT_EMPTY'] = LOGIN_MENU_L26." ".LOGIN_MENU_L23;
+					$tmp['LM_STAT_EMPTY'] = LAN_LOGINMENU_26." ".LAN_LOGINMENU_23;
 				}
 				return $tp -> parseTemplate($LOGIN_MENU_STATITEM, false, $tmp);
 			}
@@ -403,7 +403,7 @@ global $tp;
 			{
 				$data = getcachedvars('login_menu_data');
 				if($parm == 'href') return $data['listnew_link'];
-				return $data['listnew_link'] ? '<a href="'.$data['listnew_link'].'" class="login_menu_link listnew" id="login_menu_link_listnew">'.LOGIN_MENU_L24.'</a>' : '';
+				return $data['listnew_link'] ? '<a href="'.$data['listnew_link'].'" class="login_menu_link listnew" id="login_menu_link_listnew">'.LAN_LOGINMENU_24.'</a>' : '';
 			}
 
 

e107_plugins/login_menu/login_menu_template.php

@@ -178,7 +178,7 @@ if ( ! isset($LOGIN_MENU_LOGGED))
     $sc_style['LM_EXTERNAL_LINKS']['pre'] = '<li class="login-menu-external">';
 	$sc_style['LM_EXTERNAL_LINKS']['post'] = '</li>';
 
-    $sc_style['LM_STATS']['pre'] = '<li class="nav-header login-menu-stats smalltext">'.LOGIN_MENU_L25.':</li><li>';
+    $sc_style['LM_STATS']['pre'] = '<li class="nav-header login-menu-stats smalltext">'.LAN_LOGINMENU_25.':</li><li>';
 	$sc_style['LM_STATS']['post'] = '</li>';
 
     $sc_style['LM_LISTNEW_LINK']['pre'] = '<li class="login-menu-listnew">';

e107_themes/bootstrap/theme_shortcodes.php

@@ -46,8 +46,8 @@ class theme_shortcodes extends e_shortcode
 			';
 			
 			$text .= '
-			<a href="{LM_FPW_LINK=href}" class="btn btn-small btn-block">'.LOGIN_MENU_L4.'</a>
+			<a href="{LM_FPW_LINK=href}" class="btn btn-small btn-block">'.LAN_LOGINMENU_4.'</a>
-			<a href="{LM_RESEND_LINK=href}" class="btn btn-small btn-block">'.LOGIN_MENU_L40.'</a>
+			<a href="{LM_RESEND_LINK=href}" class="btn btn-small btn-block">'.LAN_LOGINMENU_40.'</a>
 			';
 			
 			

e107_themes/bootstrap3/theme_shortcodes.php

@@ -92,7 +92,7 @@ class theme_shortcodes extends e_shortcode
 			if($userReg==1)
 			{
 				$text .= '
-				<li><a href="'.e_SIGNUP.'">'.LOGIN_MENU_L3.'</a></li>
+				<li><a href="'.e_SIGNUP.'">'.LAN_LOGINMENU_3.'</a></li>
 				'; // Signup
 			}
 
@@ -105,7 +105,7 @@ class theme_shortcodes extends e_shortcode
 				<li class="divider-vertical"></li>
 				<li class="dropdown">
 			
-				<a class="dropdown-toggle" href="#" data-toggle="dropdown">'.LOGIN_MENU_L51.' <strong class="caret"></strong></a>
+				<a class="dropdown-toggle" href="#" data-toggle="dropdown">'.LAN_LOGINMENU_51.' <strong class="caret"></strong></a>
 				<div class="dropdown-menu col-sm-12" style="min-width:250px; padding: 15px; padding-bottom: 0px;">
 				
 				{SOCIAL_LOGIN: size=2x}		
@@ -137,15 +137,15 @@ class theme_shortcodes extends e_shortcode
 				<div class="checkbox">
 				
 				<label class="string optional" for="autologin"><input style="margin-right: 10px;" type="checkbox" name="autologin" id="autologin" value="1">
-				'.LOGIN_MENU_L6.'</label>
+				'.LAN_LOGINMENU_6.'</label>
 				</div>
-				<input class="btn btn-primary btn-block" type="submit" name="userlogin" id="userlogin" value="'.LOGIN_MENU_L51.'">
+				<input class="btn btn-primary btn-block" type="submit" name="userlogin" id="userlogin" value="'.LAN_LOGINMENU_51.'">
 				';
 				
 				$text .= '
 				
-				<a href="{LM_FPW_LINK=href}" class="btn btn-default btn-sm  btn-block">'.LOGIN_MENU_L4.'</a>
+				<a href="{LM_FPW_LINK=href}" class="btn btn-default btn-sm  btn-block">'.LAN_LOGINMENU_4.'</a>
-				<a href="{LM_RESEND_LINK=href}" class="btn btn-default btn-sm  btn-block">'.LOGIN_MENU_L40.'</a>
+				<a href="{LM_RESEND_LINK=href}" class="btn btn-default btn-sm  btn-block">'.LAN_LOGINMENU_40.'</a>
 				';