EGroupware / egroupware

api/src/Session.php

Braces +189 added lines, -48 removed lines

@@ -265,7 +265,7 @@ 
 
 		// set session_timeout from global php.ini and default to 14400=4h, if not set
 		if (!($GLOBALS['egw_info']['server']['sessions_timeout'] = ini_get('session.gc_maxlifetime')))
-      	{
+		{
       		ini_set('session.gc_maxlifetime', $GLOBALS['egw_info']['server']['sessions_timeout']=14400);
       	}
 	}
@@ -298,7 +298,10 @@ 
 	 */
 	function commit_session()
 	{
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() sessionid=$this->sessionid, _SESSION[".self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]).' '.function_backtrace());
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."() sessionid=$this->sessionid, _SESSION[".self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]).' '.function_backtrace());
+		}
 		self::encrypt($this->kp3);
 
 		session_write_close();
@@ -360,7 +363,10 @@ 
 	 */
 	static function log_session_usage(&$arr,$label,$recursion=true,$limit=1000)
 	{
-		if (!is_array($arr)) return;
+		if (!is_array($arr))
+		{
+			return;
+		}
 
 		$sizes = array();
 		foreach($arr as $key => &$data)
@@ -375,7 +381,10 @@ 
 			if ($diff > $limit)
 			{
 				error_log("strlen({$label}[$key])=".Vfs::hsize($size).", diff=".Vfs::hsize($diff));
-				if ($recursion) self::log_session_usage($arr[$key],$label.'['.$key.']',$recursion,$limit);
+				if ($recursion)
+				{
+					self::log_session_usage($arr[$key],$label.'['.$key.']',$recursion,$limit);
+				}
 			}
 		}
 	}
@@ -475,7 +484,10 @@ 
 				$this->passwd      = $passwd;
 				$this->passwd_type = $passwd_type;
 			}
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) starting ...");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) starting ...");
+			}
 
 			self::split_login_domain($login,$this->account_lid,$this->account_domain);
 			// add domain to the login, if not already there
@@ -525,7 +537,10 @@ 
 				{
 					$this->log_access($this->reason,$login,$user_ip,0);	// log unsuccessfull login
 				}
-				if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+				if (self::ERROR_LOG_DEBUG)
+				{
+					error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+				}
 				return false;
 			}
 
@@ -550,10 +565,13 @@ 
 			// --> allows this stateless protocolls which use basic auth to use sessions!
 			if (($this->sessionid = self::get_sessionid(true)))
 			{
-				if (session_status() !== PHP_SESSION_ACTIVE)	// gives warning including password
+				if (session_status() !== PHP_SESSION_ACTIVE)
+				{
+					// gives warning including password
 				{
 					session_id($this->sessionid);
 				}
+				}
 			}
 			else
 			{
@@ -574,7 +592,10 @@ 
 				$this->reason = 'account is expired';
 				$this->cd_reason = self::CD_ACCOUNT_EXPIRED;
 
-				if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+				if (self::ERROR_LOG_DEBUG)
+				{
+					error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+				}
 				return false;
 			}
 
@@ -590,7 +611,10 @@ 
 					$this->cd_reason = $e->getCode();
 					$this->reason = $e->getMessage();
 					$this->log_access($this->reason, $login, $user_ip, 0);	// log unsuccessfull login
-					if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check,$fail_on_forced_password_change,'$check_2fa') UNSUCCESSFULL ($this->reason)");
+					if (self::ERROR_LOG_DEBUG)
+					{
+						error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check,$fail_on_forced_password_change,'$check_2fa') UNSUCCESSFULL ($this->reason)");
+					}
 					return false;
 				}
 			}
@@ -619,24 +643,33 @@ 
 				'passwd'         => $this->passwd,
 				'account_domain' => $this->account_domain,
 				'user_ip'        => $user_ip,
-			),'',true)))	// true = run hooks from all apps, not just the ones the current user has perms to run
+			),'',true)))
+			{
+				// true = run hooks from all apps, not just the ones the current user has perms to run
 			{
 				foreach($hook_result as $reason)
 				{
 					if ($reason)	// called hook requests to deny the session
 					{
 						$this->reason = $this->cd_reason = $reason;
+			}
 						$this->log_access($this->reason,$login,$user_ip,0);		// log unsuccessfull login
-						if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+						if (self::ERROR_LOG_DEBUG)
+						{
+							error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) UNSUCCESSFULL ($this->reason)");
+						}
 						return false;
 					}
 				}
 			}
 			$GLOBALS['egw']->db->transaction_begin();
 			$this->register_session($this->login,$user_ip,$now,$this->session_flags);
-			if ($this->session_flags != 'A')		// dont log anonymous sessions
+			if ($this->session_flags != 'A')
+			{
+				// dont log anonymous sessions
 			{
 				$this->sessionid_access_log = $this->log_access($this->sessionid,$login,$user_ip,$this->account_id);
+			}
 				// We do NOT log anonymous sessions to not block website and also to cope with
 				// high rate anon endpoints might be called creating a bottleneck in the egw_accounts table.
 				Cache::setSession('phpgwapi', 'account_previous_login', $GLOBALS['egw']->auth->previous_login);
@@ -663,7 +696,10 @@ 
 				self::egw_setcookie(self::REMEMBER_ME_COOKIE, $token, $expiration);
 			}
 
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) successfull sessionid=$this->sessionid");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) successfull sessionid=$this->sessionid");
+			}
 
 			// hook called once session is created
 			Hooks::process(array(
@@ -1130,10 +1166,13 @@ 
 		//error_log(__METHOD__."('$login', '$ip') false_ip=$false_ip, false_id=$false_id --> blocked=".array2string($blocked));
 
 		if ($blocked && $GLOBALS['egw_info']['server']['admin_mails'] &&
-			$GLOBALS['egw_info']['server']['login_blocked_mail_time'] < time()-5*60)	// max. one mail every 5mins
+			$GLOBALS['egw_info']['server']['login_blocked_mail_time'] < time()-5*60)
+		{
+			// max. one mail every 5mins
 		{
 			try {
 				$mailer = new Mailer();
+		}
 				// notify admin(s) via email
 				$mailer->setFrom('eGroupWare@'.$GLOBALS['egw_info']['server']['mail_suffix']);
 				$mailer->addHeader('Subject', lang("eGroupWare: login blocked for user '%1', IP %2",$login,$ip));
@@ -1211,7 +1250,10 @@ 
 		{
 			$sessionid = null;
 		}
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() _SERVER[REQUEST_URI]='$_SERVER[REQUEST_URI]' returning ".print_r($sessionid,true));
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."() _SERVER[REQUEST_URI]='$_SERVER[REQUEST_URI]' returning ".print_r($sessionid,true));
+		}
 		return $sessionid;
 	}
 
@@ -1241,7 +1283,10 @@ 
 	 */
 	function verify($sessionid=null,$kp3=null)
 	{
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid','$kp3') ".function_backtrace());
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."('$sessionid','$kp3') ".function_backtrace());
+		}
 
 		$fill_egw_info_and_repositories = !$GLOBALS['egw_info']['flags']['restored_from_session'];
 
@@ -1257,7 +1302,10 @@ 
 
 		if (!$this->sessionid)
 		{
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid') get_sessionid()='".self::get_sessionid()."' No session ID");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."('$sessionid') get_sessionid()='".self::get_sessionid()."' No session ID");
+			}
 			return false;
 		}
 
@@ -1278,14 +1326,20 @@ 
 		// check if we have a eGroupware session --> return false if not (but dont destroy it!)
 		if (is_null($_SESSION) || !isset($_SESSION[self::EGW_SESSION_VAR]))
 		{
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid') session does NOT exist!");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."('$sessionid') session does NOT exist!");
+			}
 			return false;
 		}
 		$session =& $_SESSION[self::EGW_SESSION_VAR];
 
 		if ($session['session_dla'] <= time() - $GLOBALS['egw_info']['server']['sessions_timeout'])
 		{
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$sessionid') session timed out!");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__."('$sessionid') session timed out!");
+			}
 			$this->destroy($sessionid,$kp3);
 			return false;
 		}
@@ -1313,7 +1367,10 @@ 
 		$this->account_id = $GLOBALS['egw']->accounts->name2id($this->account_lid,'account_lid','u');
 		if (!$this->account_id)
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("*** Session::verify($sessionid) !accounts::name2id('$this->account_lid')");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("*** Session::verify($sessionid) !accounts::name2id('$this->account_lid')");
+			}
 			return false;
 		}
 
@@ -1340,7 +1397,10 @@ 
 
 		if ($GLOBALS['egw']->accounts->is_expired($GLOBALS['egw_info']['user']))
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("*** Session::verify($sessionid) accounts is expired");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("*** Session::verify($sessionid) accounts is expired");
+			}
 			return false;
 		}
 		$this->passwd = base64_decode(Cache::getSession('phpgwapi', 'password'));
@@ -1351,7 +1411,10 @@ 
 		}
 		if ($this->account_domain != $GLOBALS['egw_info']['user']['domain'])
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("*** Session::verify($sessionid) wrong domain");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("*** Session::verify($sessionid) wrong domain");
+			}
 			return false;
 		}
 
@@ -1360,7 +1423,10 @@ 
 			if (strtoupper(substr(PHP_OS,0,3)) != 'WIN' && (!$GLOBALS['egw_info']['user']['session_ip'] ||
 				$GLOBALS['egw_info']['user']['session_ip'] != $this->getuser_ip()))
 			{
-				if (self::ERROR_LOG_DEBUG) error_log("*** Session::verify($sessionid) wrong IP");
+				if (self::ERROR_LOG_DEBUG)
+				{
+					error_log("*** Session::verify($sessionid) wrong IP");
+				}
 				return false;
 			}
 		}
@@ -1373,7 +1439,10 @@ 
 		}
 		if (!$this->account_lid)
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("*** Session::verify($sessionid) !account_lid");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("*** Session::verify($sessionid) !account_lid");
+			}
 			return false;
 		}
 
@@ -1392,13 +1461,19 @@ 
 			$_REQUEST[self::EGW_SESSION_NAME] === $this->sessionid &&
 			(!isset($_COOKIE[self::EGW_SESSION_NAME]) || $_COOKIE[self::EGW_SESSION_NAME] !== $_REQUEST[self::EGW_SESSION_NAME]))
 		{
-			if (self::ERROR_LOG_DEBUG) error_log("--> Session::verify($sessionid) SUCCESS, but NO required cookies set --> setting them now");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log("--> Session::verify($sessionid) SUCCESS, but NO required cookies set --> setting them now");
+			}
 			self::egw_setcookie(self::EGW_SESSION_NAME,$this->sessionid);
 			self::egw_setcookie('kp3',$this->kp3);
 			self::egw_setcookie('domain',$this->account_domain);
 		}
 
-		if (self::ERROR_LOG_DEBUG) error_log("--> Session::verify($sessionid) SUCCESS");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log("--> Session::verify($sessionid) SUCCESS");
+		}
 
 		return true;
 	}
@@ -1418,14 +1493,20 @@ 
 		}
 		$this->log_access($sessionid);	// log logout-time
 
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($sessionid,$kp3)");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."($sessionid,$kp3)");
+		}
 
-		if (is_numeric($sessionid))	// do we have a access-log-id --> get PHP session id
+		if (is_numeric($sessionid))
+		{
+			// do we have a access-log-id --> get PHP session id
 		{
 			$sessionid = $GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE,'session_php',array(
 					'sessionid' => $sessionid,
 				),__LINE__,__FILE__)->fetchColumn();
 		}
+		}
 
 		Hooks::process(array(
 			'location'  => 'session_destroyed',
@@ -1435,7 +1516,10 @@ 
 		// Only do the following, if where working with the current user
 		if (!$GLOBALS['egw_info']['user']['sessionid'] || $sessionid == $GLOBALS['egw_info']['user']['sessionid'])
 		{
-			if (self::ERROR_LOG_DEBUG) error_log(__METHOD__." ********* about to call session_destroy!");
+			if (self::ERROR_LOG_DEBUG)
+			{
+				error_log(__METHOD__." ********* about to call session_destroy!");
+			}
 			session_unset();
 			@session_destroy();
 			// we need to (re-)load the eGW session-handler, as session_destroy unloads custom session-handlers
@@ -1530,7 +1614,10 @@ 
 		}
 		else
 		{
-			if ($othervars) $extravars .= ($extravars?'&':'').$othervars;
+			if ($othervars)
+			{
+				$extravars .= ($extravars?'&':'').$othervars;
+			}
 		}
 
 		// parse extravars string into the vars array
@@ -1539,7 +1626,11 @@ 
 			foreach(explode('&',$extravars) as $expr)
 			{
 				list($var,$val) = explode('=', $expr,2);
-				if (strpos($val,'%26') != false) $val = str_replace('%26','&',$val);	// make sure to not double encode &
+				if (strpos($val,'%26') != false)
+				{
+					$val = str_replace('%26','&',$val);
+				}
+				// make sure to not double encode &
 				if (substr($var,-2) == '[]')
 				{
 					$vars[substr($var,0,-2)][] = $val;
@@ -1636,14 +1727,22 @@ 
 		{
 			self::set_cookiedomain();
 		}
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."($cookiename,$cookievalue,$cookietime,$cookiepath,".self::$cookie_domain.")");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."($cookiename,$cookievalue,$cookietime,$cookiepath,".self::$cookie_domain.")");
+		}
 
 		// if we are installed in iOS as web-app, we must not set a cookietime==0 (session-cookie),
 		// as every change between apps will cause the cookie to get lost
 		static $is_iOS = null;
-		if (!$cookietime && !isset($is_iOS)) $is_iOS = (bool)preg_match('/^(iPhone|iPad|iPod)/i', Header\UserAgent::mobile());
+		if (!$cookietime && !isset($is_iOS))
+		{
+			$is_iOS = (bool)preg_match('/^(iPhone|iPad|iPod)/i', Header\UserAgent::mobile());
+		}
 
-		if(!headers_sent())	// gives only a warning, but can not send the cookie anyway
+		if(!headers_sent())
+		{
+			// gives only a warning, but can not send the cookie anyway
 		{
 			setcookie($cookiename, $cookievalue,
 				!$cookietime && $is_iOS ? time()+self::IOS_SESSION_COOKIE_LIFETIME : $cookietime,
@@ -1651,6 +1750,7 @@ 
 				// if called via HTTPS, only send cookie for https and only allow cookie access via HTTP (true)
 				empty($GLOBALS['egw_info']['server']['insecure_cookies']) && Header\Http::schema() === 'https', true);
 		}
+		}
 	}
 
 	/**
@@ -1658,7 +1758,11 @@ 
 	 */
 	private static function set_cookiedomain()
 	{
-		if (PHP_SAPI === "cli") return;	// gives warnings and has no benefit
+		if (PHP_SAPI === "cli")
+		{
+			return;
+		}
+		// gives warnings and has no benefit
 
 		if ($GLOBALS['egw_info']['server']['cookiedomain'])
 		{
@@ -1704,15 +1808,25 @@ 
 	 */
 	public static function search_instance($login,$domain_requested,&$default_domain,$server_names,array $domains=null)
 	{
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$login','$domain_requested',".array2string($default_domain).".".array2string($server_names).".".array2string($domains).")");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."('$login','$domain_requested',".array2string($default_domain).".".array2string($server_names).".".array2string($domains).")");
+		}
 
-		if (is_null($domains)) $domains = $GLOBALS['egw_domain'];
+		if (is_null($domains))
+		{
+			$domains = $GLOBALS['egw_domain'];
+		}
 
-		if (!isset($default_domain) || !isset($domains[$default_domain]))	// allow to overwrite the default domain
+		if (!isset($default_domain) || !isset($domains[$default_domain]))
+		{
+			// allow to overwrite the default domain
 		{
 			foreach((array)$server_names as $server_name)
 			{
-				list($server_name) = explode(':', $server_name);	// remove port from HTTP_HOST
+				list($server_name) = explode(':', $server_name);
+		}
+		// remove port from HTTP_HOST
 				if(isset($domains[$server_name]))
 				{
 					$default_domain = $server_name;
@@ -1737,11 +1851,14 @@ 
 				}
 			}
 		}
-		if (isset($login))	// on login
+		if (isset($login))
+		{
+			// on login
 		{
 			if (strpos($login,'@') === false || count($domains) == 1)
 			{
 				$login .= '@' . (isset($_POST['logindomain']) ? $_POST['logindomain'] : $default_domain);
+		}
 			}
 			$parts = explode('@',$login);
 			$domain = array_pop($parts);
@@ -1755,7 +1872,10 @@ 
 		{
 			$domain = $default_domain;
 		}
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() default_domain=".array2string($default_domain).', login='.array2string($login)." returning ".array2string($domain));
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."() default_domain=".array2string($default_domain).', login='.array2string($login)." returning ".array2string($domain));
+		}
 
 		return $domain;
 	}
@@ -1794,14 +1914,20 @@ 
 		{
 			list(, $action) = explode('.ajax_exec.template.', $_GET['menuaction']);
 
-			if (empty($action)) $action = $_GET['menuaction'];
+			if (empty($action))
+			{
+				$action = $_GET['menuaction'];
+			}
 		}
 		else
 		{
 			$action = $_SERVER['PHP_SELF'];
 			// remove EGroupware path, if not installed in webroot
 			$egw_path = $GLOBALS['egw_info']['server']['webserver_url'];
-			if ($egw_path[0] != '/') $egw_path = parse_url($egw_path,PHP_URL_PATH);
+			if ($egw_path[0] != '/')
+			{
+				$egw_path = parse_url($egw_path,PHP_URL_PATH);
+			}
 			if ($action == '/Microsoft-Server-ActiveSync')
 			{
 				$action .= '?Cmd='.$_GET['Cmd'].'&DeviceId='.$_GET['DeviceId'];
@@ -1834,7 +1960,10 @@ 
 
 		$_SESSION[self::EGW_SESSION_VAR]['session_dla'] = time();
 		$_SESSION[self::EGW_SESSION_VAR]['session_action'] = $this->action;
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__.'() _SESSION['.self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__.'() _SESSION['.self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
+		}
 
 		return $this->action;
 	}
@@ -1976,14 +2105,20 @@ 
 					self::cache_control();
 					$ok = session_start();
 					self::decrypt();
-					if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() sessionid=$sessionid, _SESSION[".self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
+					if (self::ERROR_LOG_DEBUG)
+					{
+						error_log(__METHOD__."() sessionid=$sessionid, _SESSION[".self::EGW_SESSION_VAR.']='.array2string($_SESSION[self::EGW_SESSION_VAR]));
+					}
 					return $ok;
 				}
 				break;
 			case PHP_SESSION_ACTIVE:
 				return true;	// session created by MServer
 		}
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."() no active session!");
+		if (self::ERROR_LOG_DEBUG)
+		{
+			error_log(__METHOD__."() no active session!");
+		}
 
 		return false;
 	}
@@ -2041,9 +2176,12 @@ 
 					error_log(__METHOD__."($expire) called, but header already sent in $file: $line");
 					return;
 				}
-				if($expire === true)	// same behavior as session_cache_limiter('private_no_expire')
+				if($expire === true)
+				{
+					// same behavior as session_cache_limiter('private_no_expire')
 				{
 					header('Cache-Control: private, max-age='.(60*session_cache_expire()));
+				}
 					header_remove('Expires');
 				}
 				elseif ($private)
@@ -2057,10 +2195,13 @@ 
 					header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expire) . ' GMT');
 				}
 				// remove Pragma header, might be set by old header
-				if (function_exists('header_remove'))	// PHP 5.3+
+				if (function_exists('header_remove'))
+				{
+					// PHP 5.3+
 				{
 					header_remove('Pragma');
 				}
+				}
 				else
 				{
 					header('Pragma:');

api/src/Translation.php

Braces +121 added lines, -31 removed lines

@@ -125,17 +125,23 @@ 
 			}
 			return $charsets[$lang];
 		}
-		if (self::$system_charset)	// do we have a system-charset ==> return it
+		if (self::$system_charset)
+		{
+			// do we have a system-charset ==> return it
 		{
 			$charset = self::$system_charset;
 		}
+		}
 		else
 		{
 			// if no translations are loaded (system-startup) use a default, else lang('charset')
 			$charset = !self::$lang_arr ? 'utf-8' : strtolower(self::translate('charset'));
 		}
 		// in case no charset is set, default to utf-8
-		if (empty($charset) || $charset == 'charset') $charset = 'utf-8';
+		if (empty($charset) || $charset == 'charset')
+		{
+			$charset = 'utf-8';
+		}
 
 		// we need to set our charset as mbstring.internal_encoding if mbstring.func_overlaod > 0
 		// else we get problems for a charset is different from the default utf-8
@@ -194,8 +200,14 @@ 
 			}
 			$apps = array('common');
 			// for eTemplate apps, load etemplate before app itself (allowing app to overwrite etemplate translations)
-			if (class_exists('EGroupware\\Api\\Etemplate', false) || class_exists('etemplate', false)) $apps[] = 'etemplate';
-			if ($GLOBALS['egw_info']['flags']['currentapp']) $apps[] = $GLOBALS['egw_info']['flags']['currentapp'];
+			if (class_exists('EGroupware\\Api\\Etemplate', false) || class_exists('etemplate', false))
+			{
+				$apps[] = 'etemplate';
+			}
+			if ($GLOBALS['egw_info']['flags']['currentapp'])
+			{
+				$apps[] = $GLOBALS['egw_info']['flags']['currentapp'];
+			}
 			// load instance specific translations last, so they can overwrite everything
 			$apps[] = 'custom';
 			self::add_app($apps);
@@ -223,7 +235,10 @@ 
 			self::init();
 		}
 		$ret = $key;				// save key if we dont find a translation
-		if ($not_found) $ret .= $not_found;
+		if ($not_found)
+		{
+			$ret .= $not_found;
+		}
 
 		if (isset(self::$lang_arr[$key]))
 		{
@@ -305,9 +320,15 @@ 
 	{
 		//error_log(__METHOD__."(".array2string($apps).", $lang) count(self::\$lang_arr)=".count(self::$lang_arr));
 		//$start = microtime(true);
-		if (!$lang) $lang = self::$userlang;
+		if (!$lang)
+		{
+			$lang = self::$userlang;
+		}
 		$tree_level = $instance_level = array();
-		if (!is_array($apps)) $apps = (array)$apps;
+		if (!is_array($apps))
+		{
+			$apps = (array)$apps;
+		}
 		foreach($apps as $key => $app)
 		{
 			if (!isset(self::$loaded_apps[$app]) || self::$loaded_apps[$app] != $lang && $app != 'common')
@@ -327,8 +348,14 @@ 
 			}
 		}
 		// load all translations from cache at once
-		if ($tree_level) $tree_level = Cache::getTree(__CLASS__, $tree_level);
-		if ($instance_level) $instance_level = Cache::getInstance(__CLASS__, $instance_level);
+		if ($tree_level)
+		{
+			$tree_level = Cache::getTree(__CLASS__, $tree_level);
+		}
+		if ($instance_level)
+		{
+			$instance_level = Cache::getInstance(__CLASS__, $instance_level);
+		}
 
 		// merging loaded translations together
 		$updated_load_via = false;
@@ -398,7 +425,10 @@ 
 		if (!isset(self::$db))
 		{
 			self::init(false);
-			if (!isset(self::$db)) return;
+			if (!isset(self::$db))
+			{
+				return;
+			}
 		}
 		$loaded = array();
 		foreach(self::$db->select(self::LANG_TABLE,'message_id,content',array(
@@ -505,7 +535,10 @@ 
 				$cache['']['en'] = count($en_phrases);
 				foreach(array_keys(self::get_available_langs()) as $lang)
 				{
-					if ($lang == 'en') continue;
+					if ($lang == 'en')
+					{
+						continue;
+					}
 					$lang_phrases = array_keys(self::load_app_files(null, $lang, 'all-apps'));
 					$valid_phrases = array_intersect($lang_phrases, $en_phrases);
 					$cache[''][$lang] = count($valid_phrases);
@@ -522,7 +555,10 @@ 
 						continue;
 					}
 					$en_phrases = array_keys(self::load_app_files(null, 'en', $app));
-					if (count($en_phrases) <= 2) continue;
+					if (count($en_phrases) <= 2)
+					{
+						continue;
+					}
 					$cache['en'][$app] = count($en_phrases);
 					$lang_phrases = array_keys(self::load_app_files(null, $_lang, $app));
 					$valid_phrases = array_intersect($lang_phrases, $en_phrases);
@@ -554,7 +590,10 @@ 
 			// check if cache is NOT invalided by checking if we have a modification time for concerned lang-file
 			$time = Cache::getTree(__CLASS__, $file=self::get_lang_file($_app, $_lang));
 			// if we dont have one, cache has been invalidated and we need to load translations
-			if (!isset($time)) self::add_app($_app, $_lang);
+			if (!isset($time))
+			{
+				self::add_app($_app, $_lang);
+			}
 
 			$etag = self::max_lang_time();
 		}
@@ -606,7 +645,11 @@ 
 		$loaded = array();
 		foreach($load_app == 'all-apps' ? scandir(EGW_SERVER_ROOT) : (array)$load_app as $app_dir)
 		{
-			if ($load_app == 'all-apps' && $app_dir=='..') continue; // do not try to break out of egw server root
+			if ($load_app == 'all-apps' && $app_dir=='..')
+			{
+				continue;
+			}
+			// do not try to break out of egw server root
 			if ($app_dir[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$app_dir) ||
 				!@file_exists($file=self::get_lang_file($app_dir, $lang)) ||
 				!($f = fopen($file, 'r')))
@@ -625,9 +668,15 @@ 
 			{
 				$line = explode("\t", trim($read));
 				++$line_nr;
-				if (count($line) != 4) continue;
+				if (count($line) != 4)
+				{
+					continue;
+				}
 				list($l_id,$l_app,$l_lang,$l_translation) = $line;
-				if ($l_lang != $lang) continue;
+				if ($l_lang != $lang)
+				{
+					continue;
+				}
 				if (!isset($just_app_file) && $l_app != $app)
 				{
 					// check if $l_app contained in file in $app_dir is mentioned in $load_via
@@ -641,8 +690,14 @@ 
 						}
 						// if not update load_via accordingly and store it as config
 						//error_log(__METHOD__."() load_via does not contain $l_app => $app_dir");
-						if (!isset(self::$load_via[$l_app])) self::$load_via[$l_app] = array($l_app);
-						if (!is_array(self::$load_via[$l_app])) self::$load_via[$l_app] = array(self::$load_via[$l_app]);
+						if (!isset(self::$load_via[$l_app]))
+						{
+							self::$load_via[$l_app] = array($l_app);
+						}
+						if (!is_array(self::$load_via[$l_app]))
+						{
+							self::$load_via[$l_app] = array(self::$load_via[$l_app]);
+						}
 						self::$load_via[$l_app][] = $app_dir;
 						$updated_load_via = true;
 					}
@@ -714,7 +769,10 @@ 
 
 			if ($translate)
 			{
-				if (is_null(self::$db)) self::init(false);
+				if (is_null(self::$db))
+				{
+					self::init(false);
+				}
 
 				foreach(self::$langs as $lang => $name)
 				{
@@ -747,10 +805,13 @@ 
 	 */
 	static function lang2language($lang)
 	{
-		if (isset(self::$langs[$lang]))	// no need to query the DB
+		if (isset(self::$langs[$lang]))
+		{
+			// no need to query the DB
 		{
 			return self::$langs[$lang];
 		}
+		}
 		return self::$db->select(self::LANGUAGES_TABLE,'lang_name',array('lang_id' => $lang),__LINE__,__FILE__)->fetchColumn();
 	}
 
@@ -789,7 +850,10 @@ 
 	 */
 	static function get_lang_file($app,$lang,$root=EGW_SERVER_ROOT)
 	{
-		if ($app == 'common') $app = 'api';
+		if ($app == 'common')
+		{
+			$app = 'api';
+		}
 
 		return $root.'/'.$app.'/'.self::LANG_DIR.'/'.self::LANGFILE_PREFIX.$lang.self::LANGFILE_EXTENSION;
 	}
@@ -866,9 +930,15 @@ 
 		}
 		if ($check_to_from)
 		{
-			if ($from) $from = strtolower($from);
+			if ($from)
+			{
+				$from = strtolower($from);
+			}
 
-			if ($to) $to = strtolower($to);
+			if ($to)
+			{
+				$to = strtolower($to);
+			}
 
 			if (!$from)
 			{
@@ -997,7 +1067,10 @@ 
 	 */
 	static function convert_jsonsafe($_data,$from=False)
 	{
-		if ($from===false) $from = self::detect_encoding($_data);
+		if ($from===false)
+		{
+			$from = self::detect_encoding($_data);
+		}
 
 		$data = self::convert($_data, strtolower($from));
 
@@ -1096,15 +1169,22 @@ 
 	static function get_message_id($translation,$app=null,$lang=null)
 	{
 		$where = array('content '.self::$db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.self::$db->quote($translation));
-		if ($app) $where['app_name'] = $app;
-		if ($lang) $where['lang'] = $lang;
+		if ($app)
+		{
+			$where['app_name'] = $app;
+		}
+		if ($lang)
+		{
+			$where['lang'] = $lang;
+		}
 
 		$id = self::$db->select(self::LANG_TABLE,'message_id',$where,__LINE__,__FILE__)->fetchColumn();
 
 		// Check cache, since most things aren't in the DB anymore
 		if(!$id)
 		{
-			$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation) {
+			$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation)
+			{
 				return stripos(self::$lang_arr[$haystack],$translation) !== false;
 			});
 			$id = array_shift($ids);
@@ -1121,10 +1201,17 @@ 
 				}
 
 				// load all translations from cache at once
-				if ($tree_level) $lang_arr = Cache::getTree(__CLASS__, $tree_level);
-				if ($instance_level) $lang_arr = Cache::getInstance(__CLASS__, $instance_level);
+				if ($tree_level)
+				{
+					$lang_arr = Cache::getTree(__CLASS__, $tree_level);
+				}
+				if ($instance_level)
+				{
+					$lang_arr = Cache::getInstance(__CLASS__, $instance_level);
+				}
 				$lang_arr = $lang_arr[$app.':en'];
-				$ids = array_filter(array_keys($lang_arr), function($haystack) use($translation, $lang_arr) {
+				$ids = array_filter(array_keys($lang_arr), function($haystack) use($translation, $lang_arr)
+				{
 					return stripos($lang_arr[$haystack],$translation) !== false;
 				});
 				$id = array_shift($ids);
@@ -1148,7 +1235,10 @@ 
 		{
 			$list = array('utf-8', 'iso-8859-1', 'windows-1251'); // list may be extended
 
-			if ($verify) array_unshift($list, $verify);
+			if ($verify)
+			{
+				array_unshift($list, $verify);
+			}
 
 			foreach ($list as $item)
 			{