EGroupware / egroupware

api/src/Framework/Minimal.php

Braces +9 added lines, -2 removed lines

@@ -47,7 +47,10 @@ 
 	function header(array $extra=array())
 	{
 		// make sure header is output only once
-		if (self::$header_done) return '';
+		if (self::$header_done)
+		{
+			return '';
+		}
 		self::$header_done = true;
 
 		// js stuff is not needed by login page or in popups
@@ -135,7 +138,11 @@ 
 	function footer()
 	{
 		static $footer_done=0;
-		if ($footer_done++) return;	// prevent multiple footers, not sure we still need this (RalfBecker)
+		if ($footer_done++)
+		{
+			return;
+		}
+		// prevent multiple footers, not sure we still need this (RalfBecker)
 
 		return "</body>\n</html>\n";	// close body and html tag, eg. for popups
 	}

api/src/Framework/Updates.php

Braces +8 added lines, -2 removed lines

@@ -49,7 +49,10 @@ 
 			if (($remote = file_get_contents(self::CURRENT_VERSION_URL, false, Api\Framework::proxy_context())))
 			{
 				list($current, $security) = explode("\n", $remote);
-				if (empty($security)) $security = $current;
+				if (empty($security))
+				{
+					$security = $current;
+				}
 				$versions = array(
 					'current'  => $current,		// last maintenance update
 					'security' => $security,	// last security update
@@ -114,7 +117,10 @@ 
 	protected static function update_older($version, $days)
 	{
 		list(,,$date) = explode('.', $version);
-		if ($date < 20140000) return false;
+		if ($date < 20140000)
+		{
+			return false;
+		}
 		$version_timestamp = mktime(0, 0, 0, (int)substr($date, 4, 2), (int)substr($date, -2), (int)substr($date, 0, 4));
 
 		return (time() - $version_timestamp) / 86400 > $days;

api/src/autoload.php

Braces +9 added lines, -2 removed lines

@@ -37,7 +37,11 @@ 
 spl_autoload_register(function($class)
 {
 	$parts = explode('\\', $class);
-	if (array_shift($parts) != 'EGroupware') return;	// not our prefix
+	if (array_shift($parts) != 'EGroupware')
+	{
+		return;
+	}
+	// not our prefix
 
 	$app = lcfirst(array_shift($parts));
 	$base = EGW_INCLUDE_ROOT.'/'.$app.'/src/';
@@ -63,7 +67,10 @@ 
 spl_autoload_register(function($class)
 {
 	// fixing warnings generated by php 5.3.8 is_a($obj) trying to autoload huge strings
-	if (strlen($class) > 64 || strpos($class, '.') !== false) return;
+	if (strlen($class) > 64 || strpos($class, '.') !== false)
+	{
+		return;
+	}
 
 	$components = explode('_',$class);
 	$app = array_shift($components);

api/src/Ldap/ServerInfo.php

Braces +2 added lines, -1 removed lines

@@ -218,7 +218,8 @@
 					{
 						if(($info = ldap_get_entries($ds, $sr)))
 						{
-							if($info[0]['objectclasses']) {
+							if($info[0]['objectclasses'])
+							{
 								for($i=0; $i<$info[0]['objectclasses']['count']; $i++)
 								{
 									$matches = null;

api/src/Preferences.php

Braces +81 added lines, -20 removed lines

@@ -196,7 +196,10 @@ 
 		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 (!isset($prefs[$id]) && !is_array($prefs[$id]))
+			{
+				$db_read[] = $id;
+			}
 		}
 		if ($db_read)
 		{
@@ -209,7 +212,10 @@ 
 			}
 			foreach($db_read as $id)
 			{
-				if (!isset($prefs[$id])) $prefs[$id] = array();
+				if (!isset($prefs[$id]))
+				{
+					$prefs[$id] = array();
+				}
 				Cache::setInstance(__CLASS__, $id, $prefs[$id]);
 			}
 		}
@@ -237,7 +243,10 @@ 
 		$replace = $with = array();
 		foreach($vals as $key => $val)
 		{
-			if ($this->debug) error_log(__METHOD__." replacing \$\$$key\$\$ with $val  ");
+			if ($this->debug)
+			{
+				error_log(__METHOD__." replacing \$\$$key\$\$ with $val  ");
+			}
 			$replace[] = '$$'.$key.'$$';
 			$with[]    = $val;
 		}
@@ -275,7 +284,10 @@ 
 	 */
 	function standard_substitutes()
 	{
-		if ($this->debug) error_log(__METHOD__." is called ");
+		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()
@@ -301,12 +313,18 @@ 
 			'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)
 		{
-			if(!is_array($data)) continue;
+			if(!is_array($data))
+			{
+				continue;
+			}
 			foreach($data as $key => $val)
 			{
 				if (!is_array($val) && strpos($val,'$$') !== False)
@@ -401,7 +419,11 @@ 
 			$primary_group = Accounts::id2name($this->account_id, 'account_primary_group');
 			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;
 		}
@@ -508,9 +530,15 @@ 
 		// Etemplate::complete_array_merge() is identical to PHP >= 5.3 array_replace_recursive()
 		$default = Etemplate::complete_array_merge($this->default, $this->forced);
 
-		if ($app) $default = $default[$app];
+		if ($app)
+		{
+			$default = $default[$app];
+		}
 
-		if ($name && is_array($default)) $default = $default[$name];
+		if ($name && is_array($default))
+		{
+			$default = $default[$name];
+		}
 
 		return $default;
 	}
@@ -588,9 +616,13 @@ 
 				{
 					$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
+					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;
@@ -646,9 +678,12 @@ 
 		}
 		$pref = &$this->$type;
 
-		if (($all = empty($var))) // to check if $var is regarded as empty (false, 0, '', null, array() should do the trick
+		if (($all = empty($var)))
+		{
+			// to check if $var is regarded as empty (false, 0, '', null, array() should do the trick
 		{
 			unset($pref[$app_name]);
+		}
 			unset($this->data[$app_name]);
 		}
 		else
@@ -727,7 +762,10 @@ 
 		$db = isset($GLOBALS['egw_setup']->db) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
 
 		$where = array();
-		if ($app) $where['preference_app'] = $app;
+		if ($app)
+		{
+			$where['preference_app'] = $app;
+		}
 
 		switch($type)
 		{
@@ -747,7 +785,11 @@ 
 		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) == '/')
 			{
@@ -764,10 +806,16 @@ 
 			$updated = false;
 			foreach($attrs as $attr)
 			{
-				if (isset($old_value) && $prefs[$attr] != $old_value) continue;
+				if (isset($old_value) && $prefs[$attr] != $old_value)
+				{
+					continue;
+				}
 
 				$val = is_callable($value) ? call_user_func($value, $attr, $prefs[$attr], $row['preference_owner']) : $value;
-				if ($val === $prefs[$attr]) continue;
+				if ($val === $prefs[$attr])
+				{
+					continue;
+				}
 
 				$updated = true;
 				if ((string)$val !== '')
@@ -832,7 +880,11 @@ 
 			{
 				$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']);
@@ -898,9 +950,15 @@ 
 			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;
+				if ($old_prefs && $old_prefs[$app] == $value)
+				{
+					continue;
+				}
 
-				if (!$changed++) $this->db->transaction_begin();
+				if (!$changed++)
+				{
+					$this->db->transaction_begin();
+				}
 
 				if (!is_array($value) || !$value)
 				{
@@ -986,7 +1044,10 @@ 
 			list($lang,$lang2) = explode('-',$lang);
 			$country_from_lang = strtoupper($lang2);
 		}
-		if (is_null($charset)) $charset = Translation::charset();
+		if (is_null($charset))
+		{
+			$charset = Translation::charset();
+		}
 
 		foreach(array(
 			$lang.'_'.$country,

api/src/Json/Exception/InvalidName.php

Braces +3 added lines, -1 removed lines

@@ -20,4 +20,6 @@
  *
  * As you get this only by an error in the code or during development, the message does not need to be translated
  */
-class InvalidName extends Exception\NoPermission { }
+class InvalidName extends Exception\NoPermission
+{
+}

api/src/Json/Request.php

Braces +16 added lines, -4 removed lines

@@ -42,7 +42,10 @@ 
 	public static function isJSONRequest($set=null)
 	{
 		$ret = self::$_hadJSONRequest;
-		if (isset($set)) self::$_hadJSONRequest = $set;
+		if (isset($set))
+		{
+			self::$_hadJSONRequest = $set;
+		}
 		return $ret;
 	}
 
@@ -60,7 +63,10 @@ 
 		// Remember that we currently are in a JSON request - e.g. used in the redirect code
 		self::$_hadJSONRequest = true;
 
-		if (get_magic_quotes_gpc()) $input_data = stripslashes($input_data);
+		if (get_magic_quotes_gpc())
+		{
+			$input_data = stripslashes($input_data);
+		}
 
 		$json_data = json_decode($input_data,true);
 		if (is_array($json_data) && isset($json_data['request']) && isset($json_data['request']['parameters']) && is_array($json_data['request']['parameters']))
@@ -100,9 +106,12 @@ 
 	 */
 	public function handleRequest($menuaction, array $parameters)
 	{
-		if (strpos($menuaction,'::') !== false && strpos($menuaction,'.') === false)	// static method name app_something::method
+		if (strpos($menuaction,'::') !== false && strpos($menuaction,'.') === false)
+		{
+			// static method name app_something::method
 		{
 			@list($className,$functionName,$handler) = explode('::',$menuaction);
+		}
 			if (substr($className, 0, 11) == 'EGroupware\\')
 			{
 				list(,$appName) = explode('\\', strtolower($className));
@@ -179,6 +188,9 @@ 
 			Api\Translation::convert($parameters, 'utf-8'));
 
 		// check if we have push notifications, if notifications app available
-		if (class_exists('notifications_push')) notifications_push::get();
+		if (class_exists('notifications_push'))
+		{
+			notifications_push::get();
+		}
 	}
 }

api/src/Json/Response.php

Braces +4 added lines, -1 removed lines

@@ -268,7 +268,10 @@
 	 */
 	public static function fix_content($var, $prefix='')
 	{
-		if (json_encode($var) !== false) return $var;
+		if (json_encode($var) !== false)
+		{
+			return $var;
+		}
 
 		if (is_scalar($var))
 		{

api/src/Json/Tail.php

Braces +24 added lines, -6 removed lines

@@ -76,7 +76,10 @@ 
 		{
 			$this->filename = $filename;
 
-			if (!$this->filenames || !in_array($filename,$this->filenames)) $this->filenames[] = $filename;
+			if (!$this->filenames || !in_array($filename,$this->filenames))
+			{
+				$this->filenames[] = $filename;
+			}
 		}
 	}
 
@@ -93,7 +96,10 @@ 
 		{
 			throw new Api\Exception\WrongParameter("Not allowed to view '$filename'!");
 		}
-		if ($filename[0] != '/') $filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		if ($filename[0] != '/')
+		{
+			$filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		}
 
 		if (file_exists($filename))
 		{
@@ -101,7 +107,10 @@ 
 			if (!$start || $start < 0 || $start > $size || $size-$start > 4*self::MAX_CHUNK_SIZE)
 			{
 				$start = $size - 4*self::MAX_CHUNK_SIZE;
-				if ($start < 0) $start = 0;
+				if ($start < 0)
+				{
+					$start = 0;
+				}
 			}
 			$hsize = Api\Vfs::hsize($size);
 			$content = file_get_contents($filename, false, null, $start, self::MAX_CHUNK_SIZE);
@@ -137,7 +146,10 @@ 
 		{
 			throw new Api\Exception\WrongParameter("Not allowed to view '$filename'!");
 		}
-		if ($filename[0] != '/') $filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		if ($filename[0] != '/')
+		{
+			$filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		}
 		if ($truncate)
 		{
 			file_put_contents($filename, '');
@@ -161,7 +173,10 @@ 
 		{
 			throw new Api\Exception\WrongParameter("Must be instanciated with filename!");
 		}
-		if (is_null($header)) $header = $this->filename;
+		if (is_null($header))
+		{
+			$header = $this->filename;
+		}
 
 		return '
 <p style="float: left; margin: 5px"><b>'.htmlspecialchars($header).'</b></p>
@@ -192,7 +207,10 @@ 
 			throw new Api\Exception\WrongParameter("Not allowed to download '$filename'!");
 		}
 		Api\Header\Content::type(basename($filename), 'text/plain');
-		if ($filename[0] != '/') $filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		if ($filename[0] != '/')
+		{
+			$filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
+		}
 		for($n=ob_get_level(); $n > 0; --$n)
 		{
 			ob_end_clean();	// stop all output buffering, to NOT run into memory_limit