Merge lp:~vierbergenlars/remotecp-panel/edit-user-lang into lp:remotecp-panel/1.x

[Lars Vierbergen]

Add edit user language function (https://blueprints.launchpad.net/remotecp-panel/+spec/edit-user-lang)

[Lars Vierbergen (vierbergenlars)]

There should be a label to the list and the selectbox

review: Needs Fixing (ui)

[Lars Vierbergen (vierbergenlars)]

> There should be a label to the list and the selectbox
Fixed now

review: Approve (ui)

=== added file 'inc/languageCodes.php'
--- inc/languageCodes.php	1970-01-01 00:00:00 +0000
+++ inc/languageCodes.php	2011-03-14 20:16:10 +0000
@@ -0,0 +1,188 @@
+<?php
+$languageCodes = array(
+ "aa" => "Afar",
+ "ab" => "Abkhazian",
+ "ae" => "Avestan",
+ "af" => "Afrikaans",
+ "ak" => "Akan",
+ "am" => "Amharic",
+ "an" => "Aragonese",
+ "ar" => "Arabic",
+ "as" => "Assamese",
+ "av" => "Avaric",
+ "ay" => "Aymara",
+ "az" => "Azerbaijani",
+ "ba" => "Bashkir",
+ "be" => "Belarusian",
+ "bg" => "Bulgarian",
+ "bh" => "Bihari",
+ "bi" => "Bislama",
+ "bm" => "Bambara",
+ "bn" => "Bengali",
+ "bo" => "Tibetan",
+ "br" => "Breton",
+ "bs" => "Bosnian",
+ "ca" => "Catalan",
+ "ce" => "Chechen",
+ "ch" => "Chamorro",
+ "co" => "Corsican",
+ "cr" => "Cree",
+ "cs" => "Czech",
+ "cu" => "Church Slavic",
+ "cv" => "Chuvash",
+ "cy" => "Welsh",
+ "da" => "Danish",
+ "de" => "German",
+ "dv" => "Divehi",
+ "dz" => "Dzongkha",
+ "ee" => "Ewe",
+ "el" => "Greek",
+ "en" => "English",
+ "eo" => "Esperanto",
+ "es" => "Spanish",
+ "et" => "Estonian",
+ "eu" => "Basque",
+ "fa" => "Persian",
+ "ff" => "Fulah",
+ "fi" => "Finnish",
+ "fj" => "Fijian",
+ "fo" => "Faroese",
+ "fr" => "French",
+ "fy" => "Western Frisian",
+ "ga" => "Irish",
+ "gd" => "Scottish Gaelic",
+ "gl" => "Galician",
+ "gn" => "Guarani",
+ "gu" => "Gujarati",
+ "gv" => "Manx",
+ "ha" => "Hausa",
+ "he" => "Hebrew",
+ "hi" => "Hindi",
+ "ho" => "Hiri Motu",
+ "hr" => "Croatian",
+ "ht" => "Haitian",
+ "hu" => "Hungarian",
+ "hy" => "Armenian",
+ "hz" => "Herero",
+ "ia" => "Interlingua (International Auxiliary Language Association)",
+ "id" => "Indonesian",
+ "ie" => "Interlingue",
+ "ig" => "Igbo",
+ "ii" => "Sichuan Yi",
+ "ik" => "Inupiaq",
+ "io" => "Ido",
+ "is" => "Icelandic",
+ "it" => "Italian",
+ "iu" => "Inuktitut",
+ "ja" => "Japanese",
+ "jv" => "Javanese",
+ "ka" => "Georgian",
+ "kg" => "Kongo",
+ "ki" => "Kikuyu",
+ "kj" => "Kwanyama",
+ "kk" => "Kazakh",
+ "kl" => "Kalaallisut",
+ "km" => "Khmer",
+ "kn" => "Kannada",
+ "ko" => "Korean",
+ "kr" => "Kanuri",
+ "ks" => "Kashmiri",
+ "ku" => "Kurdish",
+ "kv" => "Komi",
+ "kw" => "Cornish",
+ "ky" => "Kirghiz",
+ "la" => "Latin",
+ "lb" => "Luxembourgish",
+ "lg" => "Ganda",
+ "li" => "Limburgish",
+ "ln" => "Lingala",
+ "lo" => "Lao",
+ "lt" => "Lithuanian",
+ "lu" => "Luba-Katanga",
+ "lv" => "Latvian",
+ "mg" => "Malagasy",
+ "mh" => "Marshallese",
+ "mi" => "Maori",
+ "mk" => "Macedonian",
+ "ml" => "Malayalam",
+ "mn" => "Mongolian",
+ "mr" => "Marathi",
+ "ms" => "Malay",
+ "mt" => "Maltese",
+ "my" => "Burmese",
+ "na" => "Nauru",
+ "nb" => "Norwegian Bokmal",
+ "nd" => "North Ndebele",
+ "ne" => "Nepali",
+ "ng" => "Ndonga",
+ "nl" => "Dutch",
+ "nn" => "Norwegian Nynorsk",
+ "no" => "Norwegian",
+ "nr" => "South Ndebele",
+ "nv" => "Navajo",
+ "ny" => "Chichewa",
+ "oc" => "Occitan",
+ "oj" => "Ojibwa",
+ "om" => "Oromo",
+ "or" => "Oriya",
+ "os" => "Ossetian",
+ "pa" => "Panjabi",
+ "pi" => "Pali",
+ "pl" => "Polish",
+ "ps" => "Pashto",
+ "pt" => "Portuguese",
+ "qu" => "Quechua",
+ "rm" => "Raeto-Romance",
+ "rn" => "Kirundi",
+ "ro" => "Romanian",
+ "ru" => "Russian",
+ "rw" => "Kinyarwanda",
+ "sa" => "Sanskrit",
+ "sc" => "Sardinian",
+ "sd" => "Sindhi",
+ "se" => "Northern Sami",
+ "sg" => "Sango",
+ "si" => "Sinhala",
+ "sk" => "Slovak",
+ "sl" => "Slovenian",
+ "sm" => "Samoan",
+ "sn" => "Shona",
+ "so" => "Somali",
+ "sq" => "Albanian",
+ "sr" => "Serbian",
+ "ss" => "Swati",
+ "st" => "Southern Sotho",
+ "su" => "Sundanese",
+ "sv" => "Swedish",
+ "sw" => "Swahili",
+ "ta" => "Tamil",
+ "te" => "Telugu",
+ "tg" => "Tajik",
+ "th" => "Thai",
+ "ti" => "Tigrinya",
+ "tk" => "Turkmen",
+ "tl" => "Tagalog",
+ "tn" => "Tswana",
+ "to" => "Tonga",
+ "tr" => "Turkish",
+ "ts" => "Tsonga",
+ "tt" => "Tatar",
+ "tw" => "Twi",
+ "ty" => "Tahitian",
+ "ug" => "Uighur",
+ "uk" => "Ukrainian",
+ "ur" => "Urdu",
+ "uz" => "Uzbek",
+ "ve" => "Venda",
+ "vi" => "Vietnamese",
+ "vo" => "Volapuk",
+ "wa" => "Walloon",
+ "wo" => "Wolof",
+ "xh" => "Xhosa",
+ "yi" => "Yiddish",
+ "yo" => "Yoruba",
+ "za" => "Zhuang",
+ "zh" => "Chinese",
+ "zu" => "Zulu"
+);
+?>
\ No newline at end of file

=== modified file 'scripts/permanent/ajax.js'
--- scripts/permanent/ajax.js	2011-03-11 16:42:13 +0000
+++ scripts/permanent/ajax.js	2011-03-14 20:16:10 +0000
@@ -21,12 +21,16 @@
 			return resp;
 		}
 		else if(page.status==500) {
-			return '<strong>SERVER ERROR:</strong> PHP Errors.\n<hr>'+resp;
+			console.error(resp);
+			return 'false|PHP error';
 		}
 		else if(resp=='') {
+			console.warning('Server returned empty page');
 			return '<strong>Sorry,</strong> the server decided to say nothing.';
 		}
 		else {
+			console.warning('WTF??? Nothing?');
+			console.debug(page);
 			return '<strong>OOPS</strong> Something went wrong...';
 		}
 	},
@@ -42,12 +46,16 @@
 			return resp;
 		}
 		else if(page.status==500) {
-			return '<strong>SERVER ERROR:</strong> PHP Errors.\n<hr>'+resp;
+			console.error(resp);
+			return 'false|PHP error';
 		}
 		else if(resp=='') {
+			console.warning('Server returned empty page');
 			return '<strong>Sorry,</strong> the server decided to say nothing.';
 		}
 		else {
+			console.warning('WTF??? Nothing?');
+			console.debug(page);
 			return '<strong>OOPS</strong> Something went wrong...';
 		}
 	},

=== modified file 'system/user_props.php'
--- system/user_props.php	2011-02-01 17:53:44 +0000
+++ system/user_props.php	2011-03-14 20:16:10 +0000
@@ -1,7 +1,7 @@
 <?php //@./system/user_props.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>account_scripts.js</AJAX_SCRIPTLOC>
-<AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
+<AJAX_SCRIPTEVAL>setTimeout('$("#user_edit_language").sortable().removeClass("ui-state-disabled");',1)</AJAX_SCRIPTEVAL>
 < HEADERS --><?php
    /**
     * user_props.php - Jquery UI control panel (?control=userinfo)||(?control=useredit)
@@ -48,6 +48,7 @@
 	}
 }
 else if($_GET['control']=="useredit") {
+	require('inc/languageCodes.php');
 	if(!isset($_POST['currpass'])&&!isset($_POST['email'])) {?>
 	<fieldset><form name="pass_edit" method='POST' onsubmit="if(this.newpass.value!=this.newpass2.value){$(this).prepend(message.error('<?php echo $t->_('Repeated password does not match'); ?>')); return false;} success=ajax.post('?control=useredit','currpass='+this.currpass.value+'&newpass='+this.newpass.value); this.reset(); if(success=='true'){$(this).prepend(message.info('<?php echo $t->_('Password saved'); ?>'));} else if(success=='false') {$(this).prepend(message.error('<?php echo $t->_('Password could not be saved'); ?>'));} else {$(this).prepend(success);} return false;">
 	<?php echo $t->_('Current password') ?>:<input type="password" name="currpass" maxlength="30">
@@ -57,9 +58,25 @@
 	<input value="<?php echo $t->_('Change password') ?>" type="submit">
 	</form></fieldset>
 	<br>
-	<form method='POST' onsubmit="success=ajax.post('?control=useredit','email='+this.email.value);success=success.split('|');if(success[0]=='true') {$(this).prepend(message.info('<?php echo $t->_('Settings changed'); ?>'));}else if(success[0]=='false') {success[0]='<?php echo $t->_('Settings not changed<br>Errors'); ?>:';success.join('<br>');$(this).prepend(message.error(success));}else {success.join('|');$(this).prepend(success);} return false;"><fieldset>
+	<form method='POST' onsubmit="success=ajax.post('?control=useredit','email='+this.email.value+'&language='+$(this).find('ul').sortable('toArray').join(',')); success=success.split('|');if(success[0]=='true') {$(message.info('<?php echo $t->_('Settings changed'); ?>')).prependTo(this);}else if(success[0]=='false') {success[0]='<?php echo $t->_('Settings not changed<br>Errors'); ?>:';success.join('<br>');$(this).prepend(message.error(success));}else {success.join('|');$(this).prepend(success);} return false;"><fieldset>
 	<?php echo $t->_('E-mail address'); ?>:<input type="text" name="email" maxlength="50" value="<?php echo $session->userinfo['email'];?>">
 	<br>
+	<?php
+	echo $t->_('Language').':';
+	$languages=unserialize($session->userinfo['lang']);
+	$languagestr=implode(',',$languages);
+	?>
+	<ul id='user_edit_language' class='ui-state-disabled'>
+		<?php foreach($languages as $language) { ?>
+		<li class='ui-state-default' id='user_edit_language_<?php echo $language; ?>'><?php echo $language.': '.$languageCodes[$language]; ?></li>
+		<?php } ?>
+	</ul>
+	<label><?php echo $t->_('Add language'); ?><select onclick='this.blur()' onchange='$(this).prev().append("<li class=\"ui-state-default\" id=\"user_edit_language_"+this.value+"\">"+this.options[this.selectedIndex].innerHTML+"</li>").sortable("refresh")'>
+		<option disabled><?php echo $t->_('Select additional language'); ?></option>
+		<?php foreach($languageCodes as $code=>$name) {
+			echo '<option value="'.$code.'">'.$code.': '.$name.'</option>';
+		} ?>
+	</select></label>
 	<input type="submit" value="<?php echo $t->_('Submit settings') ?>">
 	</fieldset>
 	</form>
@@ -80,7 +97,11 @@
 	}
 	elseif(isset($_POST['email'])) {
 		$retval = $session->editAccount(false,false,$_POST['email']);
-
+		$langs=explode(',',$_POST['language']);
+		foreach($langs as &$lang) {
+			$lang=substr($lang,-2);
+		}
+		$local_connection->query('UPDATE `users` SET `lang`=\''.serialize($langs).'\' WHERE `username`=\''.$session->username.'\'');
 		/* Account edit successful */
 		if($retval){
 			echo "true";