EGroupware / egroupware

api/src/Preferences.php

Spacing +97 added lines, -97 removed lines

@@ -95,7 +95,7 @@ 
 	const TABLE = 'egw_preferences';
 	var $table = self::TABLE;
 
-	var $values,$vars;	// standard notify substitues, will be set by standard_substitues()
+	var $values, $vars; // standard notify substitues, will be set by standard_substitues()
 
 	/**
 	 * Contstructor
@@ -163,7 +163,7 @@ 
 			case self::FORCED_ID:
 				return 'forced';
 		}
-		return $this->account_id < self::DEFAULT_ID ? $this->account_id-self::DEFAULT_ID : $this->account_id;
+		return $this->account_id < self::DEFAULT_ID ? $this->account_id - self::DEFAULT_ID : $this->account_id;
 	}
 
 	/**
@@ -193,21 +193,21 @@ 
 	{
 		$prefs = Cache::getInstance(__CLASS__, $ids);
 		$db_read = array();
-		foreach((array)$ids as $id)
+		foreach ((array)$ids as $id)
 		{
 			// if prefs are not returned, null or not an array, read them from db
 			if (!isset($prefs[$id]) && !is_array($prefs[$id])) $db_read[] = $id;
 		}
 		if ($db_read)
 		{
-			foreach($this->db->select($this->table,'*',array('preference_owner' => $db_read),__LINE__,__FILE__) as $row)
+			foreach ($this->db->select($this->table, '*', array('preference_owner' => $db_read), __LINE__, __FILE__) as $row)
 			{
 				// The following replacement is required for PostgreSQL to work
 				$app = trim($row['preference_app']);
 
 				$prefs[$row['preference_owner']][$app] = self::unserialize($row['preference_value']);
 			}
-			foreach($db_read as $id)
+			foreach ($db_read as $id)
 			{
 				if (!isset($prefs[$id])) $prefs[$id] = array();
 				Cache::setInstance(__CLASS__, $id, $prefs[$id]);
@@ -226,7 +226,7 @@ 
 	 * @param boolean $use_standard_values =true should the standard values are used
 	 * @return string with parsed notify-msg
 	 */
-	function parse_notify($msg,$values=array(),$use_standard_values=True)
+	function parse_notify($msg, $values = array(), $use_standard_values = True)
 	{
 		$vals = $values ? $values : array();
 
@@ -235,13 +235,13 @@ 
 			$vals += $this->values;
 		}
 		$replace = $with = array();
-		foreach($vals as $key => $val)
+		foreach ($vals as $key => $val)
 		{
 			if ($this->debug) error_log(__METHOD__." replacing \$\$$key\$\$ with $val  ");
 			$replace[] = '$$'.$key.'$$';
 			$with[]    = $val;
 		}
-		return str_replace($replace,$with,$msg);
+		return str_replace($replace, $with, $msg);
 	}
 
 	/**
@@ -253,9 +253,9 @@ 
 	 * @param boolean $un_lang =false if true translate back
 	 * @return string
 	 */
-	function lang_notify($msg,$vals=array(),$un_lang=False)
+	function lang_notify($msg, $vals = array(), $un_lang = False)
 	{
-		foreach(array_keys($vals) as $key)
+		foreach (array_keys($vals) as $key)
 		{
 			$lname = ($lname = lang($key)) == $key.'*' ? $key : $lname;
 			if ($un_lang)
@@ -267,7 +267,7 @@ 
 				$langs[$key] = '$$'.$lname.'$$';
 			}
 		}
-		return $this->parse_notify($msg,$langs,False);
+		return $this->parse_notify($msg, $langs, False);
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 		if ($this->debug) error_log(__METHOD__." is called ");
 		if (!is_array(@$GLOBALS['egw_info']['user']['preferences']))
 		{
-			$GLOBALS['egw_info']['user']['preferences'] = $this->data;	// else no lang()
+			$GLOBALS['egw_info']['user']['preferences'] = $this->data; // else no lang()
 		}
 		// we cant use egw_info/user/fullname, as it's not set when we run
 		$this->values = array(	// standard notify replacements
@@ -287,37 +287,37 @@ 
 			'lastname'  => Accounts::id2name($this->account_id, 'account_lastname'),
 			'domain'    => $GLOBALS['egw_info']['server']['mail_suffix'],
 			'email'     => $this->email_address($this->account_id),
-			'date'      => DateTime::to('now',$GLOBALS['egw_info']['user']['preferences']['common']['dateformat']),
+			'date'      => DateTime::to('now', $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']),
 		);
 		// do this first, as it might be already contain some substitues
 		//
 		$this->values['email'] = $this->parse_notify($this->values['email']);
 
 		$this->vars = array(	// langs have to be in common !!!
-			'fullname'  => lang('name of the user, eg. "%1"',$this->values['fullname']),
-			'firstname' => lang('first name of the user, eg. "%1"',$this->values['firstname']),
-			'lastname'  => lang('last name of the user, eg. "%1"',$this->values['lastname']),
-			'domain'    => lang('domain name for mail-address, eg. "%1"',$this->values['domain']),
-			'email'     => lang('email-address of the user, eg. "%1"',$this->values['email']),
-			'date'      => lang('todays date, eg. "%1"',$this->values['date']),
+			'fullname'  => lang('name of the user, eg. "%1"', $this->values['fullname']),
+			'firstname' => lang('first name of the user, eg. "%1"', $this->values['firstname']),
+			'lastname'  => lang('last name of the user, eg. "%1"', $this->values['lastname']),
+			'domain'    => lang('domain name for mail-address, eg. "%1"', $this->values['domain']),
+			'email'     => lang('email-address of the user, eg. "%1"', $this->values['email']),
+			'date'      => lang('todays date, eg. "%1"', $this->values['date']),
 		);
-		if ($this->debug) error_log(__METHOD__.print_r($this->vars,true));
+		if ($this->debug) error_log(__METHOD__.print_r($this->vars, true));
 		// do the substituetion in the effective prefs (data)
 		//
-		foreach($this->data as $app => $data)
+		foreach ($this->data as $app => $data)
 		{
-			if(!is_array($data)) continue;
-			foreach($data as $key => $val)
+			if (!is_array($data)) continue;
+			foreach ($data as $key => $val)
 			{
-				if (!is_array($val) && strpos($val,'$$') !== False)
+				if (!is_array($val) && strpos($val, '$$') !== False)
 				{
 					$this->data[$app][$key] = $this->parse_notify($val);
 				}
 				elseif (is_array($val))
 				{
-					foreach($val as $k => $v)
+					foreach ($val as $k => $v)
 					{
-						if (!is_array($v) && strpos($v,'$$') !== False)
+						if (!is_array($v) && strpos($v, '$$') !== False)
 						{
 							$this->data[$app][$key][$k] = $this->parse_notify($v);
 						}
@@ -342,12 +342,12 @@ 
 		}
 		// handling of old PHP serialized and addslashed prefs
 		$data = php_safe_unserialize($str);
-		if($data === false)
+		if ($data === false)
 		{
 			// manually retrieve the string lengths of the serialized array if unserialize failed
 			$data = php_safe_unserialize(preg_replace_callback('!s:(\d+):"(.*?)";!s', function($matches)
 			{
-				return 's:'.mb_strlen($matches[2],'8bit').':"'.$matches[2].'";';
+				return 's:'.mb_strlen($matches[2], '8bit').':"'.$matches[2].'";';
 			}, $str));
 		}
 		self::unquote($data);
@@ -366,7 +366,7 @@ 
 			$arr = stripslashes($arr);
 			return;
 		}
-		foreach($arr as $key => $value)
+		foreach ($arr as $key => $value)
 		{
 			if (is_array($value))
 			{
@@ -387,27 +387,27 @@ 
 	 * @param boolean $use_session =true should the session prefs get used (default true) or not (false)
 	 * @return array with effective prefs ($this->data)
 	 */
-	function read_repository($use_session=true)
+	function read_repository($use_session = true)
 	{
-		$this->session = $use_session ? Cache::getSession('preferences','preferences') : array();
+		$this->session = $use_session ? Cache::getSession('preferences', 'preferences') : array();
 		if (!is_array($this->session))
 		{
 			$this->session = array();
 		}
 		$this->forced = $this->default = $this->user = $this->group = array();
-		$to_read = array(self::DEFAULT_ID,self::FORCED_ID,$this->account_id);
+		$to_read = array(self::DEFAULT_ID, self::FORCED_ID, $this->account_id);
 		if ($this->account_id > 0)
 		{
 			$primary_group = Accounts::id2name($this->account_id, 'account_primary_group');
-			foreach((array)$GLOBALS['egw']->accounts->memberships($this->account_id, true) as $gid)
+			foreach ((array)$GLOBALS['egw']->accounts->memberships($this->account_id, true) as $gid)
 			{
-				if ($gid != $primary_group) $to_read[] = $gid + self::DEFAULT_ID;	// need to offset it with DEFAULT_ID = -2!
+				if ($gid != $primary_group) $to_read[] = $gid + self::DEFAULT_ID; // need to offset it with DEFAULT_ID = -2!
 			}
 			$to_read[] = $primary_group + self::DEFAULT_ID;
 		}
-		foreach($this->cache_read($to_read) as $id => $values)
+		foreach ($this->cache_read($to_read) as $id => $values)
 		{
-			switch($id)
+			switch ($id)
 			{
 				case self::FORCED_ID:
 					$this->forced = $values;
@@ -419,7 +419,7 @@ 
 					$this->user = $values;
 					break;
 				default:
-					foreach($values as $app => $vals)
+					foreach ($values as $app => $vals)
 					{
 						$this->group[$app] = (array)$vals + (array)$this->group[$app];
 					}
@@ -430,9 +430,9 @@ 
 
 		// let the (temp.) session prefs. override the user prefs.
 		//
-		foreach($this->session as $app => $values)
+		foreach ($this->session as $app => $values)
 		{
-			foreach($values as $var => $value)
+			foreach ($values as $var => $value)
 			{
 				$this->data[$app][$var] = $value;
 			}
@@ -440,9 +440,9 @@ 
 
 		// now use (primary) group defaults if needed (user-value unset or empty)
 		//
-		foreach((array)$this->group as $app => $values)
+		foreach ((array)$this->group as $app => $values)
 		{
-			foreach((array)$values as $var => $value)
+			foreach ((array)$values as $var => $value)
 			{
 				if (!isset($this->data[$app][$var]) || $this->data[$app][$var] === '')
 				{
@@ -452,9 +452,9 @@ 
 		}
 		// now use defaults if needed (user-value unset or empty)
 		//
-		foreach((array)$this->default as $app => $values)
+		foreach ((array)$this->default as $app => $values)
 		{
-			foreach((array)$values as $var => $value)
+			foreach ((array)$values as $var => $value)
 			{
 				if (!isset($this->data[$app][$var]) || $this->data[$app][$var] === '')
 				{
@@ -465,9 +465,9 @@ 
 		}
 		// now set/force forced values
 		//
-		foreach((array)$this->forced as $app => $values)
+		foreach ((array)$this->forced as $app => $values)
 		{
-			foreach((array)$values as $var => $value)
+			foreach ((array)$values as $var => $value)
 			{
 				$this->data[$app][$var] = $value;
 			}
@@ -483,12 +483,12 @@ 
 		{
 			reset($this->data);
 		}
-		if (isset($this->debug) && substr($GLOBALS['egw_info']['flags']['currentapp'],0,3) != 'log')
+		if (isset($this->debug) && substr($GLOBALS['egw_info']['flags']['currentapp'], 0, 3) != 'log')
 		{
-			echo 'user<pre>';     print_r($this->user); echo "</pre>\n";
-			echo 'forced<pre>';   print_r($this->forced); echo "</pre>\n";
-			echo 'default<pre>';  print_r($this->default); echo "</pre>\n";
-			echo 'group<pre>';    print_r($this->group); echo "</pre>\n";
+			echo 'user<pre>'; print_r($this->user); echo "</pre>\n";
+			echo 'forced<pre>'; print_r($this->forced); echo "</pre>\n";
+			echo 'default<pre>'; print_r($this->default); echo "</pre>\n";
+			echo 'group<pre>'; print_r($this->group); echo "</pre>\n";
 			echo 'effectiv<pre>'; print_r($this->data); echo "</pre>\n";
 		}
 		$this->check_set_tz_offset();
@@ -503,7 +503,7 @@ 
 	 * @param string $name =null
 	 * @return mixed
 	 */
-	function default_prefs($app=null,$name=null)
+	function default_prefs($app = null, $name = null)
 	{
 		// Etemplate::complete_array_merge() is identical to PHP >= 5.3 array_replace_recursive()
 		$default = Etemplate::complete_array_merge($this->default, $this->forced);
@@ -521,13 +521,13 @@ 
 	 */
 	function check_set_tz_offset()
 	{
-		$prefs =& $this->data['common'];
+		$prefs = & $this->data['common'];
 
 		if (!empty($prefs['tz']))
 		{
-			DateTime::setUserPrefs($prefs['tz'],$prefs['dateformat'],$prefs['timeformat']);
+			DateTime::setUserPrefs($prefs['tz'], $prefs['dateformat'], $prefs['timeformat']);
 			// set the old preference for compatibilty with old code
-			$prefs['tz_offset'] = DateTime::tz_offset_s()/3600;
+			$prefs['tz_offset'] = DateTime::tz_offset_s() / 3600;
 		}
 	}
 
@@ -551,7 +551,7 @@ 
 		{
 			$this->read_repository();
 		}
-		reset ($this->data);
+		reset($this->data);
 		return $this->data;
 	}
 
@@ -566,7 +566,7 @@ 
 	 * @param string $type ='user' of preference to set: forced, default, user
 	 * @return array with new effective prefs (even when forced or default prefs are set !)
 	 */
-	function add($app_name,$var,$value = '##undef##',$type='user')
+	function add($app_name, $var, $value = '##undef##', $type = 'user')
 	{
 		//echo "<p>add('$app_name','$var','$value')</p>\n";
 		if ($value === '##undef##')
@@ -580,10 +580,10 @@ 
 				if (!isset($this->forced[$app_name][$var]) || $this->forced[$app_name][$var] === '')
 				{
 					$this->session[$app_name][$var] = $this->data[$app_name][$var] = $value;
-					Cache::setSession('preferences','preferences',$this->session);
-					if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+					Cache::setSession('preferences', 'preferences', $this->session);
+					if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 					{
-						$GLOBALS['egw']->invalidate_session_cache();	// in case with cache the egw_info array in the session
+						$GLOBALS['egw']->invalidate_session_cache(); // in case with cache the egw_info array in the session
 					}
 				}
 				break;
@@ -624,13 +624,13 @@ 
 	 * @param string $type ='user' of preference to set: forced, default, user
 	 * @return array with new effective prefs (even when forced or default prefs are deleted!)
 	 */
-	function delete($app_name, $var = False,$type = 'user')
+	function delete($app_name, $var = False, $type = 'user')
 	{
 		//echo "<p>delete('$app_name','$var','$type')</p>\n";
 		$set_via = array(
-			'forced'  => array('user','default'),
-			'default' => array('forced','user'),
-			'user'    => array('forced','group','default'),
+			'forced'  => array('user', 'default'),
+			'default' => array('forced', 'user'),
+			'user'    => array('forced', 'group', 'default'),
 			'group'   => array('forced'),
 		);
 		if (!isset($set_via[$type]))
@@ -664,7 +664,7 @@ 
 			}
 			else
 			{
-				if($var && @isset($arr[$app_name][$var]) && $arr[$app_name][$var] !== '')
+				if ($var && @isset($arr[$app_name][$var]) && $arr[$app_name][$var] !== '')
 				{
 					$this->data[$app_name][$var] = $arr[$app_name][$var];
 					break;
@@ -672,7 +672,7 @@ 
 			}
 			unset($arr);
 		}
-		reset ($this->data);
+		reset($this->data);
 		return $this->data;
 	}
 
@@ -685,7 +685,7 @@ 
 	{
 		if ($accountid > 0)
 		{
-			$this->db->delete($this->table,array('preference_owner' => $accountid),__LINE__,__FILE__);
+			$this->db->delete($this->table, array('preference_owner' => $accountid), __LINE__, __FILE__);
 
 			Cache::unsetInstance(__CLASS__, $accountid);
 		}
@@ -700,9 +700,9 @@ 
 	{
 		if ($accountid < 0)
 		{
-			$this->db->delete($this->table,array('preference_owner' => $accountid+self::DEFAULT_ID),__LINE__,__FILE__);
+			$this->db->delete($this->table, array('preference_owner' => $accountid + self::DEFAULT_ID), __LINE__, __FILE__);
 
-			Cache::unsetInstance(__CLASS__, $accountid+self::DEFAULT_ID);
+			Cache::unsetInstance(__CLASS__, $accountid + self::DEFAULT_ID);
 		}
 	}
 
@@ -715,14 +715,14 @@ 
 	 * @param string $old_value if given, only change if that's current value
 	 * @param string $type if given limit to "user", "forced", "default", "group"
 	 */
-	public static function change_preference($app, $name, $value, $old_value=null, $type=null)
+	public static function change_preference($app, $name, $value, $old_value = null, $type = null)
 	{
 		$db = isset($GLOBALS['egw_setup']->db) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
 
 		$where = array();
 		if ($app) $where['preference_app'] = $app;
 
-		switch($type)
+		switch ($type)
 		{
 			case 'forced':
 				$where['preference_owner'] = self::FORCED_ID;
@@ -737,10 +737,10 @@ 
 				$where[] = 'preference_owner < '.self::DEFAULT_ID;
 				break;
 		}
-		foreach($db->select(self::TABLE, '*', $where, __LINE__, __FILE__) as $row)
+		foreach ($db->select(self::TABLE, '*', $where, __LINE__, __FILE__) as $row)
 		{
 			$prefs = self::unserialize($row['preference_value']);
-			if (!is_array($prefs)) $prefs = array();	// would stall update otherwise
+			if (!is_array($prefs)) $prefs = array(); // would stall update otherwise
 
 			if ($name[0] == '/' && substr($name, -1) == '/')
 			{
@@ -755,7 +755,7 @@ 
 			}
 
 			$updated = false;
-			foreach($attrs as $attr)
+			foreach ($attrs as $attr)
 			{
 				if (isset($old_value) && $prefs[$attr] != $old_value) continue;
 
@@ -784,7 +784,7 @@ 
 
 				// update instance-wide cache
 				$cached = Cache::getInstance(__CLASS__, $row['preference_owner']);
-				if($cached && $cached[$row['preference_app']])
+				if ($cached && $cached[$row['preference_app']])
 				{
 					$cached[$row['preference_app']] = $prefs;
 					Cache::setInstance(__CLASS__, $row['preference_owner'], $cached);
@@ -800,7 +800,7 @@ 
 	 * @param string $name Preference name
 	 * @param string $type ='user' of preference to set: forced, default, user
 	 */
-	public static function delete_preference($app, $name, $type='user')
+	public static function delete_preference($app, $name, $type = 'user')
 	{
 		self::change_preference($app, $name, null, null, $type);
 	}
@@ -812,12 +812,12 @@ 
 	 * @param string $to_app
 	 * @param array $names =null array of names to copy or null for all
 	 */
-	public static function copy_preferences($from_app, $to_app, array $names=null)
+	public static function copy_preferences($from_app, $to_app, array $names = null)
 	{
 		//error_log(__METHOD__."('$from_app', '$to_app', ".array2string($names).')');
 		$db = isset($GLOBALS['egw_setup']->db) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
 
-		foreach($db->select(self::TABLE, '*', array('preference_app' => $from_app), __LINE__, __FILE__) as $row)
+		foreach ($db->select(self::TABLE, '*', array('preference_app' => $from_app), __LINE__, __FILE__) as $row)
 		{
 			$prefs = self::unserialize($row['preference_value']);
 
@@ -825,7 +825,7 @@ 
 			{
 				$prefs = array_intersect_key($prefs, array_flip($names));
 			}
-			if (!$prefs) continue;	// nothing to change, as nothing set
+			if (!$prefs) continue; // nothing to change, as nothing set
 
 			$row['preference_app'] = $to_app;
 			unset($row['preference_value']);
@@ -859,11 +859,11 @@ 
 	 * @param boolean $invalid_cache =true should we invalidate the cache, default true (not used anymore)
 	 * @return array with new effective prefs (even when forced or default prefs are deleted!)
 	 */
-	function save_repository($update_session_info = False,$type='user',$invalid_cache=true)
+	function save_repository($update_session_info = False, $type = 'user', $invalid_cache = true)
 	{
-		unset($update_session_info, $invalid_cache);	// no longer used
+		unset($update_session_info, $invalid_cache); // no longer used
 
-		switch($type)
+		switch ($type)
 		{
 			case 'forced':
 				$account_id = self::FORCED_ID;
@@ -878,17 +878,17 @@ 
 
 			default:
 				$account_id = (int)$this->account_id;
-				$prefs = &$this->user;	// we use the user-array as data contains default values too
+				$prefs = &$this->user; // we use the user-array as data contains default values too
 				break;
 		}
 		//echo "<p>preferences::save_repository(,$type): account_id=$account_id, prefs="; print_r($prefs); echo "</p>\n";
 
-		if (isset($GLOBALS['egw_setup']) || !$GLOBALS['egw']->acl->check('session_only_preferences',1,'preferences') &&
+		if (isset($GLOBALS['egw_setup']) || !$GLOBALS['egw']->acl->check('session_only_preferences', 1, 'preferences') &&
 			(!($old_prefs = $this->cache_read($account_id)) || $old_prefs != $prefs))
 		{
 			//error_log(__METHOD__."(type=$type) saved, because old_prefs[$account_id] != prefs=".array2string($prefs));
 			$changed = 0;
-			foreach($prefs as $app => $value)
+			foreach ($prefs as $app => $value)
 			{
 				// check if app preferences have changed, if not no need to save them
 				if ($old_prefs && $old_prefs[$app] == $value) continue;
@@ -905,12 +905,12 @@ 
 				}
 				else
 				{
-					$this->db->insert($this->table,array(
+					$this->db->insert($this->table, array(
 						'preference_value' => json_encode($value),
-					),array(
+					), array(
 						'preference_owner' => $account_id,
 						'preference_app'   => $app,
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 				}
 			}
 			if ($changed)
@@ -937,21 +937,21 @@ 
 	 * @param int $account_id as determined in and/or passed to "create_email_preferences"
 	 * @return string with email-address
 	 */
-	function email_address($account_id='')
+	function email_address($account_id = '')
 	{
 		if (isset($this->data['email']['address']))
 		{
 			return $this->data['email']['address'];
 		}
 		// if email-address is set in the account, return it
-		if (($email = Accounts::id2name($account_id,'account_email')))
+		if (($email = Accounts::id2name($account_id, 'account_email')))
 		{
 			return $email;
 		}
 		$prefs_email_address = Accounts::id2name($account_id);
-		if ($prefs_email_address && strpos($prefs_email_address,'@') === False)
+		if ($prefs_email_address && strpos($prefs_email_address, '@') === False)
 		{
-			$prefs_email_address .= '@' . $GLOBALS['egw_info']['server']['mail_suffix'];
+			$prefs_email_address .= '@'.$GLOBALS['egw_info']['server']['mail_suffix'];
 		}
 		return $prefs_email_address;
 	}
@@ -965,7 +965,7 @@ 
 	 * @param $charset =null default system charset
 	 * @return string the local (or best estimate) set
 	 */
-	static function setlocale($category=LC_MESSAGES,$charset=null)
+	static function setlocale($category = LC_MESSAGES, $charset = null)
 	{
 		$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 		$country = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
@@ -976,12 +976,12 @@ 
 		}
 		else
 		{
-			list($lang,$lang2) = explode('-',$lang);
+			list($lang, $lang2) = explode('-', $lang);
 			$country_from_lang = strtoupper($lang2);
 		}
 		if (is_null($charset)) $charset = Translation::charset();
 
-		foreach(array(
+		foreach (array(
 			$lang.'_'.$country,
 			$lang.'_'.$country_from_lang,
 			$lang.'_'.$country.'.utf8',
@@ -991,14 +991,14 @@ 
 			'C',
 		) as $local)
 		{
-			if (($ret = setlocale($category,$local.'@'.$charset)) ||
-				($ret = setlocale($category,$local)))
+			if (($ret = setlocale($category, $local.'@'.$charset)) ||
+				($ret = setlocale($category, $local)))
 			{
 				//error_log(__METHOD__."($category,$charset) lang=$lang, country=$country, country_from_lang=$country_from_lang: returning '$ret'");
 				return $ret;
 			}
 		}
 		error_log(__METHOD__."($category,$charset) lang=$lang, country=$country, country_from_lang=$country_from_lang: Could not set local!");
-		return false;	// should not happen, as the 'C' local should at least be available everywhere
+		return false; // should not happen, as the 'C' local should at least be available everywhere
 	}
 }