Language selection simplification

work in progress

e107_plugins/user_menu/userlanguage_menu.php

@@ -1,63 +1,70 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
+ * e107 website system
-|     e107 website system
+ *
-|
+ * Copyright (C) 2001-2008 e107 Inc (e107.org)
-|     <20>Steve Dunstan 2001-2002
+ * Released under the terms and conditions of the
-|     http://e107.org
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
-|     jalist@e107.org
+ *
-|
+ *
-|     Released under the terms and conditions of the
+ *
-|     GNU General Public License (http://gnu.org).
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/user_menu/userlanguage_menu.php,v $
-|
+ * $Revision: 1.3 $
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/user_menu/userlanguage_menu.php,v $
+ * $Date: 2009-08-03 19:41:17 $
-|     $Revision: 1.2 $
+ * $Author: marj_nl_fr $
-|     $Date: 2007-09-01 02:29:25 $
-|     $Author: e107coders $
-+----------------------------------------------------------------------------+
  */
+//TODO homogenisation with languagelinks + do not force www + unobtrusive redirect
+if ( ! defined('e107_INIT')) { exit(); }
 
-if (!defined('e107_INIT')) { exit; }
+require_once(e_HANDLER.'language_class.php');
-
-require_once(e_HANDLER."language_class.php");
 $slng = new language;
-require_once(e_HANDLER."file_class.php");
-	$fl = new e_file;
-	$lanlist = $fl->get_dirs(e_LANGUAGEDIR);
-	sort($lanlist);
 
-	if(isset($pref['multilanguage_subdomain']) && $pref['multilanguage_subdomain'])
+$languageList = explode(',', e_LANLIST);
+sort($languageList);
+
+if(varset($pref['multilanguage_subdomain']))
 {
-        	$text = "<div style='text-align:center'><select class='tbox' name='lang_select' style='width:95%' onchange=\"location.href=this.options[selectedIndex].value\">";
+	$action = (e_QUERY) ? e_SELF.'?'.e_QUERY : e_SELF;
-			foreach($lanlist as $lng)
+	$text = '
+		<div style="text-align:center">
+			<select class="tbox" name="lang_select" style="width:95%" onchange="location.href=this.options[selectedIndex].value">';
+	foreach($languageList as $languageFolder)
 	{
-				$selected = ($lng  == USERLAN || ($lng == $pref['sitelanguage'] && USERLAN == "")) ? "selected='selected'" : "";
+		$selected = ($languageFolder == e_LANGUAGE) ? ' selected="selected"' : '';
-                $urlval = $slng->subdomainUrl($lng);
+		$urlval   = $slng->subdomainUrl($languageFolder);
-				$text .= "<option value='".$urlval."' $selected>$lng</option>\n";
+		$text .= '
+				<option value="'.$urlval.'" $selected>$languageFolder</option>';
+		$text .= '
+				<option value="'.$urlval.'"'.$selected.'>'.$languageFolder.'</option>';
 	}
-			$text .= "</select></div>";
+	$text .= '
+			</select>
+		</div>';
 }
 else
 {
-	$action = (e_QUERY && !$_GET['elan']) ? e_SELF."?".e_QUERY : e_SELF;
+	//FIXME may not work with session
-	$text = "<form method='post' action='".$action."'>
+	$action = (e_QUERY && ! $_GET['elan']) ? e_SELF.'?'.e_QUERY : e_SELF;
-		<div style='text-align:center'>
+	$text = '
-		<select name='sitelanguage' class='tbox' >";
+	<form method="post" action="'.$action.'">
-	foreach($lanlist as $langval)
+		<div style="text-align:center">
+			<select name="sitelanguage" class="tbox">';
+	foreach($languageList as $languageFolder)
 	{
-		$selected ="";
+		$selected = ($languageFolder == e_LANGUAGE) ? ' selected="selected"' : '';
-		if($langval == USERLAN || ($langval == $pref['sitelanguage'] && USERLAN == ""))
+		$text .= '
-		{
+				<option value="'.$languageFolder.'"'.$selected.'>'.$languageFolder.'</option>';
-			$selected = "selected='selected'";
-		}
-		$text .= "<option value='".$langval."' $selected>".$langval."</option>\n ";
 	}
 
-	$text .= "</select>";
+	$text .= '
-	$text .= "<br /><br /><input class='button' type='submit' name='setlanguage' value='".UTHEME_MENU_L1."' />";
+			</select>
-	$text .= "</div></form>	";
+			<br />
+			<br />
+			<button class="button" type="submit" name="setlanguage">'.UTHEME_MENU_L1.'</button>';
+	$text .= '
+		</div>
+	</form>';
 }
 
 $ns->tablerender(UTHEME_MENU_L2, $text, 'user_lan');
 
-?>

e107_themes/_blank/admin_template.php

@@ -9,8 +9,8 @@
  * Admin template - _blank theme
  *
  * $Source: /cvs_backup/e107_0.8/e107_themes/_blank/admin_template.php,v $
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
- * $Date: 2009-07-18 15:04:01 $
+ * $Date: 2009-08-03 19:41:17 $
  * $Author: marj_nl_fr $
  *
 */
@@ -34,7 +34,6 @@ $ADMIN_HEADER = "
 			{ADMIN_LOGO}
 			{ADMIN_LOGGED}
 			{ADMIN_SEL_LAN}
-			{ADMIN_USERLAN}
 
 		</div>
 		<div style='height: 20px;'><!-- --></div>

e107_themes/jayya/admin_template.php

@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_themes/jayya/admin_template.php,v $
-|     $Revision: 1.6 $
+|     $Revision: 1.7 $
-|     $Date: 2009-04-27 10:52:42 $
+|     $Date: 2009-08-03 19:41:17 $
-|     $Author: secretr $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
@@ -49,7 +49,6 @@ $ADMIN_HEADER = "<table class='page_container'>
 <div style='margin-bottom: 3px;'>
 {ADMIN_LOGGED}
 {ADMIN_SEL_LAN}
-{ADMIN_USERLAN}
 </div>
 {SITELINKS=flat}
 </td>

e107_themes/templates/admin_template.php

@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_themes/templates/admin_template.php,v $
-|     $Revision: 1.2 $
+|     $Revision: 1.3 $
-|     $Date: 2006-12-08 08:10:25 $
+|     $Date: 2009-08-03 19:41:17 $
-|     $Author: e107coders $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
@@ -24,7 +24,6 @@ $ADMIN_HEADER = "<div style='text-align:center'>
 <br />
 {ADMIN_LOGGED}
 {ADMIN_SEL_LAN}
-{ADMIN_USERLAN}
 </div>
 <table style='width:100%' cellspacing='10' cellpadding='10'>
 <tr>