New language file types: English_global.php (for plugin.xml terms) and English_log.php (for admin-log terms). Auto-detected when present and loaded automatically when needed.

2025-07-31 20:00:37 +02:00 · 2012-12-12 18:46:34 -08:00
parent 0cfce79337
commit 87e225fc36
35 changed files with 276 additions and 144 deletions
--- a/class2.php
+++ b/class2.php
@@ -566,10 +566,28 @@ if(is_readable($customLan)) // FASTER - if exist, should be done 'once' by the c
 }
 unset($customLan);

+$sql->db_Mark_Time('Start: Global Language Files');
+if(isset($pref['lan_global_list']))
+{
+	foreach($pref['lan_global_list'] as $path)
+	{
+		e107::plugLan($path,'global',true);			
+	}			
+}
+
+
+
+$sql->db_Mark_Time('Start: CHAPT challenge');
+
+
 e107::getSession()
 	->challenge() // Create a unique challenge string for CHAP login
 	->check(); // Token protection

+	
+	
+	
+	
 //
 // N: misc setups: online user tracking, cache
 //
--- a/e107_admin/admin_log.php
+++ b/e107_admin/admin_log.php
@@ -49,12 +49,16 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
 // Main language file should automatically be loaded
 // Load language files for log messages
 include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_log_messages.php'); //... for core functions
-if(is_array($pref['logLanguageFile'])) //... and for any plugins which support it
+
+if(is_array($pref['lan_log_list'])) //... and for any plugins which support it
 {
-	foreach($pref['logLanguageFile'] as $path => $file)
+	foreach($pref['lan_log_list'] as $path => $file)
 	{
 		$file = str_replace('--LAN--', e_LANGUAGE, $file);
-		include_lan(e_PLUGIN.$path.'/'.$file);
+		
+		echo "orig = ".$file."     ";
+		e107::lan($path,'log',true);
+		//include_lan(e_PLUGIN.$path.'/'.$file);
 	}
 }

--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -913,6 +913,13 @@ class pluginManager{
 			foreach($pluginList as $plug)
 			{
 				e107::loadLanFiles($plug['plugin_path'],'admin');
+				
+				if($this->action == "avail")
+				{
+					e107::lan($plug['plugin_path'],'global', true); // Load language files. 
+				}
+					
+				

 				$_path = e_PLUGIN.$plug['plugin_path'].'/';

--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -2076,6 +2076,7 @@ class e107
 	 * 	e107::plugLan('forum', 'lan_forum');
 	 *
 	 * 	// import defeinitions from /e107_plugins/featurebox/languages/[CurrentLanguage]_admin_featurebox.php
+	 *  // OR /e107_plugins/featurebox/languages/[CurrentLanguage]/[CurrentLanguage]_admin_featurebox.php (auto-detected)
 	 * 	e107::plugLan('featurebox', 'admin_featurebox', true);
 	 *
 	 * 	// import defeinitions from /e107_plugins/myplug/languages/[CurrentLanguage].php
@@ -2111,9 +2112,17 @@ class e107
 			 $fname = e_LANGUAGE;
 		}

-		$path = e_PLUGIN.$plugin.'/languages/'.$fname.'.php';
+		if($flat === true && is_dir(e_PLUGIN.$plugin."/languages/".e_LANGUAGE)) // support for alt_auth/languages/English/English_log.php etc.
+		{
+			$path = e_PLUGIN.$plugin.'/languages/'.e_LANGUAGE.'/'.$fname.'.php';	
+		} 
+		else
+		{
+			$path = e_PLUGIN.$plugin.'/languages/'.$fname.'.php';	
+		}
+		
+		e107::getMessage()->addDebug("Attempting to Load: ".$path);		
 		
-		//echo "path = ".$path.'<br>';
 		
 		e107::setRegistry($cstring, true);
 		self::includeLan($path, false);
@@ -2187,7 +2196,8 @@ class e107
 				self::themeLan($fname, null);
 				break;
 			default :
-				self::plugLan($type,$fname, false);
+				$opt = ($options === true) ? true : false;
+				self::plugLan($type,$fname, $opt);
 				break;
 		}	
 		
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -1313,7 +1313,7 @@ class e_parse
 		// The check for '::' is a workaround for a bug in the Zend Optimiser 3.3.0 and PHP 5.2.4 combination
 		// - causes crashes if '::' in site name
 		//TODO - marj - find a way to use language method here XOR remove the limit of 24 characters.
-		if($opts['defs'] && (strlen($text) < 25) && ((strpos($text, '::') === FALSE) && defined(trim($text))))
+		if($opts['defs'] && (strlen($text) < 35) && ((strpos($text, '::') === FALSE) && defined(trim($text))))
 		{
 			return constant(trim($text));
 		}
--- a/e107_handlers/message_handler.php
+++ b/e107_handlers/message_handler.php
@@ -259,7 +259,7 @@ class eMessage
 	 * @param boolean $session
 	 * @return eMessage
 	 */
-	public function addDebug($message, $mstack = 'default', $session = false)
+	public function addDebug($message, $mstack = 'default', $session = false) //TODO Add different types of DEBUG depending on the debug mode. 
 	{
 		return $this->addStack($message, $mstack, E_MESSAGE_DEBUG, $session);
 	}
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -279,12 +279,24 @@ class e107plugin
 			$plug_info = $this->plug_vars;
 			$eplug_addons = $this->getAddons($plugin_path);

-			//Ensure the plugin path lives in the same folder as is configured in the plugin.php/plugin.xml
+			//Ensure the plugin path lives in the same folder as is configured in the plugin.php/plugin.xml - no longer relevant. 
 			if ($plugin_path == $plug_info['folder'])
 			{
 				if (array_key_exists($plugin_path, $pluginDBList))
 				{ // Update the addons needed by the plugin
 					$pluginDBList[$plugin_path]['status'] = 'exists';
+					
+						// Check for name (lan) changes
+					if (vartrue($plug_info['@attributes']['lan']) && $pluginDBList[$plugin_path]['plugin_name'] != $plug_info['@attributes']['lan'])
+					{
+						// print_a($plug_info);
+						$pluginDBList[$plugin_path]['status'] = 'update';
+						$pluginDBList[$plugin_path]['plugin_name'] = $plug_info['@attributes']['lan'];
+						$this->plugFolder = $plugin_path;
+						$this->XmlLanguageFiles('upgrade');
+					}
+					
+					

 					// Check for missing plugin_category in plugin table.
 					if ($pluginDBList[$plugin_path]['plugin_category'] == '' || $pluginDBList[$plugin_path]['plugin_category'] != $plug_info['category'])
@@ -787,7 +799,7 @@ class e107plugin

 		$sql = e107::getDb();
 		$tp = e107::getParser();
-
+		
 		if (!is_numeric($link_class))
 		{
 			$link_class = strtolower($link_class);
@@ -797,9 +809,10 @@ class e107plugin
 			$plug_perm['mainadmin'] = e_UC_MAINADMIN;
 			$plug_perm['admin'] = e_UC_ADMIN;
 			$plug_perm['nobody'] = e_UC_NOBODY;
-			$link_class = ($plug_perm[$link_class]) ? $plug_perm[$link_class] : e_UC_PUBLIC;
+			$link_class = ($plug_perm[$link_class]) ? intval($plug_perm[$link_class]) : e_UC_PUBLIC;
 		}

+
 		$link_url = $tp->toDB($link_url, true);
 		$link_name = $tp->toDB($link_name, true);
 		$path = str_replace("../", "", $link_url); // This should clean up 'non-standard' links
@@ -818,7 +831,7 @@ class e107plugin
 						'link_order'		 => $link_t + 1,
 						'link_parent'		 => '0',
 						'link_open'			 => '0',
-						'link_class'		 => $link_class,
+						'link_class'		 => vartrue($linkclass,'0'),
 						'link_function'		 => ''
 					);
 					return $sql->db_Insert('links', $linkData); // TODO: Add the _FIELD_DEFS array
@@ -1246,6 +1259,9 @@ class e107plugin
 		$path = e_PLUGIN.$plug['plugin_path'].'/';

 		$this->plugFolder = $plug['plugin_path'];
+		
+	
+		
 		$this->unInstallOpts = $options;

 		$addons = explode(',', $plug['plugin_addons']);
@@ -1274,12 +1290,8 @@ class e107plugin
 			$canContinue = FALSE;
 		}
 			
-	
-		
-		if (varset($plug_vars['languageFiles']))
-		{
-			$this->XmlLanguageFiles($function, $plug_vars['languageFiles'], 'pre'); // First of all, see if there's a language file specific to install
-		}
+		// Load install longuage file and set lan_global pref. 
+		$this->XmlLanguageFiles($function, $plug_vars['languageFiles'], 'pre'); // First of all, see if there's a language file specific to install

 		// Next most important, if installing or upgrading, check that any dependencies are met
 		if ($canContinue && ($function != 'uninstall') && isset($plug_vars['dependencies']))
@@ -1558,40 +1570,69 @@ class e107plugin
 	 * @param object $tag
 	 * @return none
 	 */
-	function XmlLanguageFiles($function, $tag, $when = '')
+	function XmlLanguageFiles($function, $tag='', $when = '')
 	{
 		$core = e107::getConfig('core');
-
-		foreach ($tag['file'] as $val)
+	
+		$updated = false;
+		
+		$path_a = e_PLUGIN.$this->plugFolder."/languages/English_install.php"; // always check for English so we have a fall-bak
+		$path_b = e_PLUGIN.$this->plugFolder."/languages/English/English_install.php";		
+		
+		if(file_exists($path_a) || file_exists($path_b))
 		{
-			$att = $val['@attributes'];
-
-			if ($when == 'pre') // just check for install language file BEFORE install.
-
-			{
-				if ($att['type'] == 'install')
-				{
-					$file = str_replace('--LAN--', e_LANGUAGE, $att['path']);
-					$fullpath_file = e_PLUGIN.$this->plugFolder."/".$file;
-					include_lan($fullpath_file);
-					return;
-				}
-			}
-			elseif ($att['type'] == 'log')
-			{
-				switch ($function)
-				{
-					case 'install':
-					case 'upgrade':
-					case 'refresh':
-						$core->setPref('logLanguageFile/'.$this->plugFolder, $att['path']);
-						break;
-					case 'uninstall':
-						$core->removePref('logLanguageFile/'.$this->plugFolder);
-						break;
-				}
-			}
+			e107::lan($this->plugFolder,'install',true);	
 		}
+			
+		$path_a = e_PLUGIN.$this->plugFolder."/languages/English_global.php"; // always check for English so we have a fall-bak
+		$path_b = e_PLUGIN.$this->plugFolder."/languages/English/English_global.php";		
+		
+		if(file_exists($path_a) || file_exists($path_b))
+		{
+			switch ($function)
+			{
+				case 'install':
+				case 'upgrade':
+				case 'refresh':
+					e107::getMessage()->addDebug("Adding ".$this->plugFolder." to lan_global_list");
+					e107::lan($this->plugFolder,'global',true);
+					$core->setPref('lan_global_list/'.$this->plugFolder, $this->plugFolder);
+					$updated = true;
+					break;
+				case 'uninstall':
+					$core->removePref('lan_global_list/'.$this->plugFolder);
+					$update = true;
+				break;
+			}	
+		}
+			
+	
+		$path_a = e_PLUGIN.$this->plugFolder."/languages/English_log.php";  // always check for English so we have a fall-bak
+		$path_b = e_PLUGIN.$this->plugFolder."/languages/English/English_log.php";
+		
+		if(file_exists($path_a) || file_exists($path_b))
+		{
+			switch ($function)
+			{
+				case 'install':
+				case 'upgrade':
+				case 'refresh':
+					$core->setPref('lan_log_list/'.$this->plugFolder, $this->plugFolder);
+					$updated = true;
+					break;
+				case 'uninstall':
+					$core->removePref('lan_log_list/'.$this->plugFolder);
+					$updated = true;
+				break;
+			}	
+		}
+				
+	
+		if($updated === true)
+		{
+			$core->save();	//FIXME do this quietly without an s-message
+		}
+	
 	}

 	/**
@@ -1610,7 +1651,7 @@ class e107plugin
 			$linkName = (defset($link['@value'])) ? constant($link['@value']) : $link['@value'];
 			$remove = (varset($attrib['deprecate']) == 'true') ? TRUE : FALSE;
 			$url = $attrib['url'];
-			$perm = (isset($attrib['perm']) ? $attrib['perm'] : 0);
+			$perm = (isset($attrib['perm']) ? $attrib['perm'] : 'everyone');

 			switch ($function)
 			{
@@ -2360,6 +2401,9 @@ class e107plugin
 		$bbcodeList = array_merge($bbcodeList, $bbcodeClassList);
 		
 		$sqlList = $fl->get_files(e_PLUGIN.$plugin_path, '_sql\.php$', "standard", 1);
+		
+
+		

 		// Search Shortcodes
 		foreach ($shortcodeList as $sc)
--- a/e107_handlers/pref_class.php
+++ b/e107_handlers/pref_class.php
@@ -491,7 +491,7 @@ class e_pref extends e_front_model
 	 *
 	 * @param boolean $from_post merge post data
 	 * @param boolean $force
-	 * @param boolean $session_messages use session messages
+	 * @param boolean $session_messages use session messages //FIXME Appears to be ignored on "Settings successfully saved."; 
 	 * @return boolean|integer 0 - no change, true - saved, false - error
 	 */
 	public function save($from_post = true, $force = false, $session_messages = false)
--- a/e107_handlers/userclass_class.php
+++ b/e107_handlers/userclass_class.php
@@ -691,6 +691,12 @@ class user_class
 		{
 			$style = " style='text-indent:".(1.2*$nest_level)."em'";
 		}
+		
+		$id = "{$treename}_{$classnum}";
+		
+		return "<div {$style}><label>
+			".e107::getForm()->checkbox($treename.'[]', $classnum , $chk, "id=".$id)." ".$this->class_tree[$classnum]['userclass_name'].'  ('.$this->class_tree[$classnum]['userclass_description'].")</label></div>\n";
+		
 		return "<div {$style}><input type='checkbox' class='checkbox' name='{$treename}[]' id='{$treename}_{$classnum}' value='{$classnum}'{$chk} />".$this->class_tree[$classnum]['userclass_name'].'  ('.$this->class_tree[$classnum]['userclass_description'].")</div>\n";
 	}

--- a/e107_plugins/_blank/languages/English_global.php
+++ b/e107_plugins/_blank/languages/English_global.php
@@ -0,0 +1,10 @@
+<?php
+
+// Always use the format LAN_PLUGIN_{FOLDER}_{TYPE} to prevent conflicts. In this case "_BLANK" is the folder. 
+// This should contain the LANs used in the plugin.xml file. 
+
+define("LAN_PLUGIN__BLANK_NAME", "Blank Plugin");
+define("LAN_PLUGIN__BLANK_DIZ",  "A Blank Plugin to help you get started in plugin development"); 
+define("LAN_PLUGIN__BLANK_LINK", "Blank Link");
+
+?>
--- a/e107_plugins/_blank/plugin.xml
+++ b/e107_plugins/_blank/plugin.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<e107Plugin name="Blank Plugin" version="2.0" date="2012-08-01" compatibility="2.0" installRequired="true" >
+<e107Plugin name="Blank Plugin" lan="LAN_PLUGIN__BLANK_NAME" version="2.0" date="2012-08-01" compatibility="2.0" installRequired="true" >
 	<author name="e107 Inc." url="http://e107.org" />
-	<description lan="">A Blank Plugin to help you get started in plugin development</description>
+	<description lan="LAN_PLUGIN__BLANK_DIZ">A Blank Plugin to help you get started in plugin development</description>
 	<category>misc</category> 
 	<adminLinks>
-		<link url='admin_config.php' description='Configure Blank Plugin' icon='images/blank_32.png' iconSmall='images/blank_16.png' primary='true' >Configure Blank</link>
+		<link url='admin_config.php' description='Configure Blank Plugin' icon='images/blank_32.png' iconSmall='images/blank_16.png' primary='true' >LAN_CONGIGURE</link>
 		<link url="admin_config.php?mode=options" description="Configure Blank Prefs" icon="manage" >Blank Prefs</link>
 	</adminLinks>
 	<siteLinks>
-		<link url="{e_PLUGIN}_blank/_blank.php" perm='everyone'>Blank</link>		
+		<link url="{e_PLUGIN}_blank/_blank.php" perm='everyone'>LAN_PLUGIN__BLANK_LINK</link>		
 	</siteLinks>
 	<pluginPrefs>
 		<pref name="blank_pref_1">1</pref>
--- a/e107_plugins/banner/languages/English_admin_banner.php
+++ b/e107_plugins/banner/languages/English_admin_banner.php
@@ -7,10 +7,10 @@
 *
 */
 define("BNRLAN_1", "Banner #%d deleted.");
-define("BNRLAN_2", "Please confirm you wish to delete this banner - once deleted it cannot be retrieved");
-define("BNRLAN_5", "Confirm Delete Banner");
+define("BNRLAN_2", "Please confirm you wish to delete this banner - once deleted it cannot be retrieved");  //FIXME Use Generic
+define("BNRLAN_5", "Confirm Delete Banner");  //FIXME Use Generic
 define("BNRLAN_6", "Delete cancelled.");
-define("BNRLAN_7", "Existing Banners");
+define("BNRLAN_7", "Existing Banners");  //FIXME Use Generic
 define("BNRLAN_8", "Banner ID");
 define("BNRLAN_9", "Client");
 define("BNRLAN_10", "Clickthroughs");
@@ -21,8 +21,8 @@ define("BNRLAN_15", "No banners yet.");
 define("BNRLAN_16", "Unlimited");
 define("BNRLAN_17", "None");
 define("BNRLAN_21", "Ends");
-define("BNRLAN_22", "Update Banner");
-define("BNRLAN_23", "Add New Banner");
+define("BNRLAN_22", "Update Banner");  //FIXME Use Generic
+define("BNRLAN_23", "Add New Banner");  //FIXME Use Generic
 define("BNRLAN_24", "Campaign");

 define("BNRLAN_27", "Client");
@@ -47,12 +47,12 @@ define("BNRLAN_58", "Banner front page");
 define("BNRLAN_59", "Create new banner");
 define("BNRLAN_60", "campaigns");
 define("BNRLAN_61", "Banner menu");
-define("BNRLAN_62", "Banner Options");
-define("BNRLAN_63", "Banner Created");
-define("BNRLAN_64", "Banner Updated");
+define("BNRLAN_62", "Banner Options");  //FIXME Use Generic
+define("BNRLAN_63", "Banner Created");  //FIXME Use Generic
+define("BNRLAN_64", "Banner Updated");  //FIXME Use Generic

 define("BANNER_MENU_L1", "Advertisement");
-define("BANNER_MENU_L2", "Banner menu configuration saved");
+define("BANNER_MENU_L2", "Banner menu configuration saved"); //FIXME Use Generic
 define("BANNER_MENU_L3", "Caption");
 //define("BANNER_MENU_L5", "Banner Configuration");
 define("BANNER_MENU_L6", "choose campaigns to show in menu");
@@ -79,5 +79,5 @@ define("BNRLAN_67", "No campaigns yet.");
 define("BNRLAN_68", "Banner Menu Configuration");

 // Plugin manager
-define("BNRLAN_100", "Add advertising banners to your e107 website");
+
 ?>
--- a/e107_plugins/banner/languages/English_global.php
+++ b/e107_plugins/banner/languages/English_global.php
@@ -0,0 +1,8 @@
+<?php
+
+
+define("LAN_PLUGIN_BANNER_NAME",		"Banners");
+define("LAN_PLUGIN_BANNER_DESCRIPTION", "Add advertising banners to your e107 website");
+
+
+?>
--- a/e107_plugins/banner/plugin.xml
+++ b/e107_plugins/banner/plugin.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<e107Plugin name="Banners" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
+<e107Plugin name="Banners" lan="LAN_PLUGIN_BANNER_NAME" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" email="jalist@e107.org" />
 	<summary>Add advertising banners to your e107 website</summary>
-	<description lan="BNRLAN_100">Add advertising banners to your e107 website</description>
+	<description lan="LAN_PLUGIN_BANNER_DESCRIPTION">Add advertising banners to your e107 website</description>
 	<keywords>
 	   	<word>banners</word>
 		<word>advertise</word>
 	</keywords>
-	<languageFiles>
-		<file type='log' path='languages/--LAN--_admin_banner.php' />
-		<file type='install' path='languages/--LAN--_admin_banner.php' />
-	</languageFiles>
 	<category>content</category>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
 	<adminLinks>
--- a/e107_plugins/calendar_menu/languages/English_global.php
+++ b/e107_plugins/calendar_menu/languages/English_global.php
@@ -0,0 +1,9 @@
+<?php
+
+define("LAN_PLUGIN_CALENDAR_MENU_NAME", 			"Event Calendar");
+define("LAN_PLUGIN_CALENDAR_MENU_CONFIG", 			"Configure Event Calendar");
+define("LAN_PLUGIN_CALENDAR_MENU_DESCRIPTION", 		"This plugin is a fully featured event calendar with calendar menu.");
+define("LAN_PLUGIN_CALENDAR_MENU_LINK", 			"Calendar");
+
+
+?>
--- a/e107_plugins/calendar_menu/languages/English_install.php
+++ b/e107_plugins/calendar_menu/languages/English_install.php
@@ -21,7 +21,7 @@ define('EC_ADINST_LAN_02', "Calendar event imminent:\n\n{EC_MAIL_CATEGORY}\n\n{E
 For further details see the calendar entry on the web site:\n{EC_MAIL_LINK=Click Here}\n\n {EC_MAIL_CONTACT} for further details");
 define('EC_ADINST_LAN_03', 'Default category - mailout messages are used if none defined for any other category');
 define('EC_ADINST_LAN_04', 'To activate please go to your menus screen and select the calendar_menu into one of your menu areas.');
-define('EC_ADINST_LAN_05', 'Configure Event Calendar');
+// define('EC_ADINST_LAN_05', 'Configure Event Calendar');
 define('EC_ADINST_LAN_06', 'Default category entered');
 define('EC_ADINST_LAN_07', 'Error adding default category');
 define('EC_ADINST_LAN_08', 'Default category already in DB');
--- a/e107_plugins/calendar_menu/plugin.xml
+++ b/e107_plugins/calendar_menu/plugin.xml
@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<e107Plugin name="Event Calendar" lan="EC_ADLAN_1" version="3.70" date="2012-08-01" compatibility="2.0" installRequired="true" >
+<e107Plugin name="Event Calendar" lan="LAN_PLUGIN_CALENDAR_MENU_NAME" version="3.70" date="2012-08-01" compatibility="2.0" installRequired="true" >
 	<author name="e107 Inc. + Barry" url="http://e107.org" />
-	<description >This plugin is a fully featured event calendar with calendar menu.</description>
+	<description lan="LAN_PLUGIN_CALENDAR_MENU_DESCRIPTION" >This plugin is a fully featured event calendar with calendar menu.</description>
 	<readMe>readme.pdf</readMe>
 	<category>content</category>
-	<languageFiles>
-		<file type='install' path='languages/--LAN--_install.php' />
-		<file type='log' path='languages/--LAN--_log.php' />	
-	</languageFiles>
 	<adminLinks>
-		<link url='admin_config.php' description='EC_ADINST_LAN_05' icon='images/calendar_32.png' iconSmall='images/calendar_16.png' primary='true' >EC_ADINST_LAN_05</link>
+		<link url='admin_config.php' description='LAN_PLUGIN_CALENDAR_MENU_CONFIG' icon='images/calendar_32.png' iconSmall='images/calendar_16.png' primary='true' >LAN_PLUGIN_CALENDAR_MENU_CONFIG</link>
 		<link url='admin_config.php?cat' description='EC_ADLAN_A11' icon='images/calendar_32.png' iconSmall='images/calendar_16.png' >EC_ADLAN_A11</link>
 		<link url='admin_config.php?forthcoming' description='EC_ADLAN_A100' icon='images/calendar_32.png' iconSmall='images/calendar_16.png' >EC_ADLAN_A100</link>
 		<link url='admin_config.php?maint' description='EC_ADLAN_A141' icon='images/calendar_32.png' iconSmall='images/calendar_16.png' >EC_ADLAN_A141</link>
 		<link url='admin_config.php?subs' description='EC_ADLAN_A173' icon='images/calendar_32.png' iconSmall='images/calendar_16.png' >EC_ADLAN_A173</link>		
 	</adminLinks>
 	<siteLinks>
-		<link url="{e_PLUGIN}calendar_menu/calendar.php" >Calendar</link>		
+		<link url="{e_PLUGIN}calendar_menu/calendar.php" >LAN_PLUGIN_CALENDAR_MENU_LINK</link>		
 	</siteLinks>
-	<mainPrefs>
+	<pluginPrefs>
 		<pref name="eventpost_admin">254</pref>
 		<pref name="eventpost_super">254</pref>
 		<pref name="eventpost_adminlog">0</pref>
@@ -56,5 +52,5 @@
 		<pref name="eventpost_fe_showrecent">0</pref>
 		<pref name="eventpost_showcaticon">0</pref>
 		<pref name="eventpost_namelink">0</pref>
-	</mainPrefs>
+	</pluginPrefs>
 </e107Plugin>
--- a/e107_plugins/chatbox_menu/languages/English/English_global.php
+++ b/e107_plugins/chatbox_menu/languages/English/English_global.php
@@ -0,0 +1,15 @@
+<?php
+
+
+define("LAN_PLUGIN_CHATBOX_MENU_NAME",		 	"Chatbox");
+define("LAN_PLUGIN_CHATBOX_MENU_DESCRIPTION", 	"Chatbox Menu");
+
+// Admin Log 
+define("LAN_AL_CHBLAN_01","Chatbox settings updated");
+define("LAN_AL_CHBLAN_02","Chatbox pruned");
+define("LAN_AL_CHBLAN_03","Chatbox posts recalculated");
+define("LAN_AL_CHBLAN_04","");
+define("LAN_AL_CHBLAN_05","");
+
+
+?>
--- a/e107_plugins/chatbox_menu/languages/English/admin_chatbox_menu.php
+++ b/e107_plugins/chatbox_menu/languages/English/admin_chatbox_menu.php
@@ -53,17 +53,11 @@ define("CHBLAN_36", "Chatbox Display options");
 define("CHBLAN_37", "Normal chatbox");
 define("CHBLAN_38", "Use javascript code to update posts dynamically (AJAX)");
 define('CHBLAN_39', 'Nothing changed - not updated');
-define('CHBLAN_40', 'Chatbox');
-define('CHBLAN_41', 'Chatbox Menu');
-define('CHBLAN_42', '');
-define('CHBLAN_43', '');
+// define('CHBLAN_40', 'Chatbox');
+// define('CHBLAN_41', 'Chatbox Menu');
+
+

-// Admin Log 
-define('LAN_AL_CHBLAN_01','Chatbox settings updated');
-define('LAN_AL_CHBLAN_02','Chatbox pruned');
-define('LAN_AL_CHBLAN_03','Chatbox posts recalculated');
-define('LAN_AL_CHBLAN_04','');
-define('LAN_AL_CHBLAN_05','');


 ?>
--- a/e107_plugins/chatbox_menu/plugin.xml
+++ b/e107_plugins/chatbox_menu/plugin.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: plugin.xml,v 1.8 2009-10-20 03:49:22 e107coders Exp $ -->
-<e107Plugin name="Chatbox" lan="CHBLAN_40" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
+<e107Plugin name="Chatbox" lan="LAN_PLUGIN_CHATBOX_MENU_NAME" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" email="jalist@e107.org" />
-	<description lan="CHBLAN_41">Chatbox Menu</description>
+	<description lan="LAN_PLUGIN_CHATBOX_MENU_DESCRIPTION">Chatbox Menu</description>
 	<category>content</category>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
-	<languageFiles>
-		<file type='log' path='languages/--LAN--/--LAN--_config.php' />
-	</languageFiles>
 	<adminLinks>
 		<link url='admin_chatbox.php' description='LAN_CONFIGURE' icon='images/chatbox_32.png' iconSmall='images/chatbox_16.png' primary='true' >LAN_CONFIGURE</link>	
 	</adminLinks>
--- a/e107_plugins/faqs/plugin.xml
+++ b/e107_plugins/faqs/plugin.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id: plugin.xml,v 1.1 2009-11-09 12:57:34 e107coders Exp $ -->
-<e107Plugin name="FAQs" lan="FAQs" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
+<e107Plugin name="FAQs" lan="LAN_PLUGIN_FAQS_NAME" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
 	<author name="e107 Inc" url="http://www.e107.org" email="security@e107.org" />
-	<description lan="A simple plugin to add Frequently Asked Questions to your website.">A simple plugin to add Frequently Asked Questions to your website.</description>
+	<description lan="LAN_PLUGIN_FAQS_DESCRIPTION">A simple plugin to add Frequently Asked Questions to your website.</description>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
 	<bbcodes imgResize="true" />	
 	<category>content</category>
 	<adminLinks>
-		<link url='admin_config.php' description='Configure FAQs' icon='images/icon_32.png' iconSmall='images/icon_16.png' primary='true' >FAQs</link>		
+		<link url='admin_config.php' description='Configure FAQs' icon='images/icon_32.png' iconSmall='images/icon_16.png' primary='true' >LAN_PLUGIN_FAQS_NAME</link>		
 	</adminLinks>
 	<siteLinks>
-		<link url='{e_PLUGIN}faqs/faqs.php' description='FAQs' icon='images/icon_32.png' iconSmall='images/icon_16.png'>FAQs</link>		
+		<link url='{e_PLUGIN}faqs/faqs.php' description='FAQs' icon='images/icon_32.png' iconSmall='images/icon_16.png'>LAN_PLUGIN_FAQS_NAME</link>		
 	</siteLinks>
 	<pluginPrefs>
 		<pref name="add_faq">255</pref>
--- a/e107_plugins/featurebox/languages/English_admin_featurebox.php
+++ b/e107_plugins/featurebox/languages/English_admin_featurebox.php
@@ -34,12 +34,5 @@ define("FBLAN_24", "Plain");
 define("FBLAN_25", "Template"); //FIXME LAN  - use generic. 
 define("FBLAN_26", "you can use a different template for each message, add templates to e107_plugins/featurebox/templates/ folder");

-// Admin log messages
-define('LAN_AL_FBLAN_01', 'Featurebox created'); //FIXME LAN  - use generic. 
-define('LAN_AL_FBLAN_02', 'Featurebox updated'); //FIXME LAN  - use generic. 
-define('LAN_AL_FBLAN_03', 'Featurebox deleted'); //FIXME LAN  - use generic. 

-// Install/uninstall messages
-define('FBLAN_INSTALL_01', 'Adding Default category table data.');
-define('FBLAN_INSTALL_02', 'Adding Default table data.');
 ?>
--- a/e107_plugins/featurebox/languages/English_global.php
+++ b/e107_plugins/featurebox/languages/English_global.php
@@ -0,0 +1,12 @@
+<?php
+
+// Admin log messages
+define('LAN_AL_FBLAN_01', 'Featurebox created'); //FIXME LAN  - use generic. 
+define('LAN_AL_FBLAN_02', 'Featurebox updated'); //FIXME LAN  - use generic. 
+define('LAN_AL_FBLAN_03', 'Featurebox deleted'); //FIXME LAN  - use generic. 
+
+// Install/uninstall messages
+define('FBLAN_INSTALL_01', 'Adding Default category table data.');
+define('FBLAN_INSTALL_02', 'Adding Default table data.');
+
+?>
--- a/e107_plugins/gsitemap/languages/English_admin_gsitemap.php
+++ b/e107_plugins/gsitemap/languages/English_admin_gsitemap.php
@@ -58,11 +58,5 @@ define("GSLAN_40", "Google Sitemap Entries");
 define('GSLAN_41', "Google Sitemap. For more information on the Sitemap protocol, go to <a href='http://www.sitemaps.org/'>http://www.sitemaps.org/</a> or <a href='http://www.google.com/support/webmasters/bin/answer.py?answer=156184'>Google's page About Sitemaps</a>");
 define('GSLAN_42', 'Installation Successful..');

-// Admin log messages
-//-------------------
-define('LAN_AL_GSMAP_01', 'Import sitelinks');
-define('LAN_AL_GSMAP_02', 'Sitemap link deleted');
-define('LAN_AL_GSMAP_03', 'Sitemap link added');
-define('LAN_AL_GSMAP_04', 'Sitemap link updated');
-define('LAN_AL_GSMAP_05', '');
+
 ?>
--- a/e107_plugins/gsitemap/languages/English_log.php
+++ b/e107_plugins/gsitemap/languages/English_log.php
@@ -0,0 +1,11 @@
+<?php
+
+// Admin log messages
+//-------------------
+define('LAN_AL_GSMAP_01', 'Import sitelinks');
+define('LAN_AL_GSMAP_02', 'Sitemap link deleted');
+define('LAN_AL_GSMAP_03', 'Sitemap link added');
+define('LAN_AL_GSMAP_04', 'Sitemap link updated');
+define('LAN_AL_GSMAP_05', '');
+
+?>
--- a/e107_plugins/import/languages/English_admin_import.php
+++ b/e107_plugins/import/languages/English_admin_import.php
@@ -27,8 +27,8 @@ if (!defined('e107_INIT')) { exit; }

 //define('LAN_CONTINUE','Continue');		Now global definition

-define('LAN_CONVERT_01','Import into e107');
-define('LAN_CONVERT_02','Import data from Wordpress, Joomla, Drupal, Blogspot, RSS and other formats.');
+// define('LAN_CONVERT_01','Import into e107');
+// define('LAN_CONVERT_02','Import data from Wordpress, Joomla, Drupal, Blogspot, RSS and other formats.');
 define('LAN_CONVERT_03','You must start with a clean E107 database, other than the main admin user (ID=1)');
 define('LAN_CONVERT_04','Field(s) left blank, please go back and re-enter values.');
 define('LAN_CONVERT_05','Running this script may empty many of your E107 tables - make sure you have a full backup before continuing!');
--- a/e107_plugins/import/plugin.xml
+++ b/e107_plugins/import/plugin.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: plugin.xml,v 1.2 2009-09-24 00:11:20 e107coders Exp $ -->
-<e107Plugin name="Import into e107" lan="LAN_CONVERT_01" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
+<e107Plugin name="Import into e107" lan="LAN_PLUGIN_IMPORT_NAME" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" email="devs@e107.org" />
-	<description lan="LAN_CONVERT_02">Import data from Wordpress, Joomla, Drupal, Blogpost, RSS and other formats.</description>
+	<description lan="LAN_PLUGIN_IMPORT_DIZ">Import data from Wordpress, Joomla, Drupal, Blogpost, RSS and other formats.</description>
 	<category>tools</category>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
 	<adminLinks>
--- a/e107_plugins/list_new/languages/English_admin_list_new.php
+++ b/e107_plugins/list_new/languages/English_admin_list_new.php
@@ -24,11 +24,11 @@

 if (!defined("PAGE_NAME")) { define("PAGE_NAME", "List New Items"); }

-define("LIST_PLUGIN_1", "List");
+// define("LIST_PLUGIN_1", "List");
 define("LIST_PLUGIN_2", "This plugin allows you to view a list of recent additions in all e107 categories. You can either view the list with data since your last visit, or view a general latest additions list. Besides the page a menu is also present. Every section is configurable in the admin area.");
 define("LIST_PLUGIN_3", "Configure Main Menu");
 define("LIST_PLUGIN_4", "The List_new plugin is now ready to be used.");
-define("LIST_PLUGIN_5", "list");
+
 define("LIST_PLUGIN_6", "This plugin is not installed.");

 define("LIST_ADMIN_1", "recent");
--- a/e107_plugins/list_new/plugin.xml
+++ b/e107_plugins/list_new/plugin.xml
@@ -11,7 +11,7 @@
 		<link url='admin_list_config.php' description='LIST_PLUGIN_3' icon='icon/list_32.png' iconSmall='icon/list_16.png' primary='true' >LIST_PLUGIN_3</link>	
 	</adminLinks>
 	<siteLinks>
-		<link url="{e_PLUGIN}list_new/list.php" >LIST_PLUGIN_5</link>
+		<link url="{e_PLUGIN}list_new/list.php" >LIST_PLUGIN_1</link>
 	</siteLinks>
 	<pluginPrefs>
 	</pluginPrefs>
--- a/e107_plugins/log/languages/English.php
+++ b/e107_plugins/log/languages/English.php
@@ -49,7 +49,7 @@ define("ADSTAT_L30", "Site Referrals");
 define("ADSTAT_L31", "Search Engine Query Strings");
 define("ADSTAT_L32", "Referred from");
 define("ADSTAT_L33", "Visits in last");
-define("ADSTAT_L34", "Visits");
+// define("ADSTAT_L34", "Visits"); // see English_globa.php
 define("ADSTAT_L35", "Unique visits in last");
 define("ADSTAT_L36", "days by page");
 define("ADSTAT_L37", "Visits by month");
--- a/e107_plugins/log/languages/English_admin_log.php
+++ b/e107_plugins/log/languages/English_admin_log.php
@@ -48,8 +48,8 @@ define("ADSTAT_L29", "Page Name");
 define("ADSTAT_L30", "Check to remove");
 define("ADSTAT_L31", "Remove selected pages");
 define("ADSTAT_L32", "Page Tidy");
-define("ADSTAT_L33", "Configure Statistics Logging");
-define("ADSTAT_L34", "Site Stats");
+// define("ADSTAT_L33", "Configure Statistics Logging"); see English_global.php
+// define("ADSTAT_L34", "Site Stats");
 define ('ADSTAT_L35', 'Options');
 define ('ADSTAT_L36', 'Data Export');
 define ('ADSTAT_L37', 'Create export file');
@@ -102,13 +102,6 @@ define ('ADSTAT_L83', 'Following log ID entries removed:');
 define ('ADSTAT_L84', '');
 define ('ADSTAT_L85', '');

-// Messages for log entries
-define('LAN_AL_STAT_01', 'Stats - reset');
-define('LAN_AL_STAT_02', 'Stats - settings changed');
-define('LAN_AL_STAT_03', 'Stats - pages removed');
-define('LAN_AL_STAT_04', 'Stats - historic data removed');
-define('LAN_AL_STAT_05', '');
-define('LAN_AL_STAT_06', '');
-define('LAN_AL_STAT_07', '');
+

 ?>
--- a/e107_plugins/log/languages/English_global.php
+++ b/e107_plugins/log/languages/English_global.php
@@ -0,0 +1,10 @@
+<?php
+// e107 Global Log File for the Log Plugin. 
+// All Defined Must include the folder of the plugin. LAN_PLUGIN_{FOLDER}
+
+define("LAN_PLUGIN_LOG_NAME",			"Site Stats");
+define("LAN_PLUGIN_LOG_DESCRIPTION", 	"This plugin will log all visits to your site, and build detailed statistic screens based on the information gathered.");
+define("LAN_PLUGIN_LOG_CONFIGURE",		"Configure Statistics Logging"); 
+define("LAN_PLUGIN_LOG_LINK", 			"Visits");
+
+?>
--- a/e107_plugins/log/languages/English_log.php
+++ b/e107_plugins/log/languages/English_log.php
@@ -0,0 +1,11 @@
+<?php
+// Messages for log entries
+define('LAN_AL_STAT_01', 'Stats - reset');
+define('LAN_AL_STAT_02', 'Stats - settings changed');
+define('LAN_AL_STAT_03', 'Stats - pages removed');
+define('LAN_AL_STAT_04', 'Stats - historic data removed');
+define('LAN_AL_STAT_05', '');
+define('LAN_AL_STAT_06', '');
+define('LAN_AL_STAT_07', '');
+
+?>
--- a/e107_plugins/log/plugin.xml
+++ b/e107_plugins/log/plugin.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: plugin.xml,v 1.9 2009-10-22 04:14:45 e107coders Exp $ -->
-<e107Plugin name="Statistic Logging" lan="ADSTAT_L3" version="2.1" date="2012-08-01" compatibility="2.0" installRequired="true">
+<e107Plugin name="Statistic Logging" lan="LAN_PLUGIN_LOG_NAME" version="2.1" date="2012-08-01" compatibility="2.0" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" />
-	<description lan="ADSTAT_L1">This plugin will log all visits to your site, and build detailed statistic screens based on the information gathered.</description>
-	<languageFiles>
-		<file type='log' path='languages/--LAN--_admin_log.php' />
-	</languageFiles>
+	<description lan="LAN_PLUGIN_LOG_DESCRIPTION">This plugin will log all visits to your site, and build detailed statistic screens based on the information gathered.</description>
 	<adminLinks>
-		<link url='admin_config.php' description='ADSTAT_L33' icon='images/stats_32.png' iconSmall='images/stats_16.png' primary='true' >ADSTAT_L33</link>	
+		<link url='admin_config.php' description='ADSTAT_L33' icon='images/stats_32.png' iconSmall='images/stats_16.png' primary='true' >LAN_PLUGIN_LOG_CONFIGURE</link>	
 	</adminLinks>
 	<siteLinks>
-		<link url="{e_PLUGIN}log/stats.php?1" >ADSTAT_L34</link>
+		<link url="{e_PLUGIN}log/stats.php?1" >LAN_PLUGIN_LOG_LINK</link>
 	</siteLinks>	
 	<mainPrefs>
 		<pref name="statActivate">0</pref>
--- a/e107_plugins/pm/pm_shortcodes.php
+++ b/e107_plugins/pm/pm_shortcodes.php
@@ -175,13 +175,13 @@ class pm_handler_shortcodes

 	public	function sc_pm_post_button()
 	{
-		return "<input class='button' type='submit' name='postpm' value='".LAN_PM_1."' />";
+		return "<input class='button btn' type='submit' name='postpm' value='".LAN_PM_1."' />";
 	}


 	public	function sc_pm_preview_button()
 	{
-		return "<input class='button' type='submit' name='postpm' value='".LAN_PM_3."' />";
+		return "<input class='button btn' type='submit' name='postpm' value='".LAN_PM_3."' />";
 	}