EGroupware / egroupware

api/src/Db/Exception.php

Braces +4 added lines, -1 removed lines

@@ -29,7 +29,10 @@
 	 */
 	function __construct($msg=null,$code=100)
 	{
-		if (is_null($msg)) $msg = lang('Database error!');
+		if (is_null($msg))
+		{
+			$msg = lang('Database error!');
+		}
 
 		parent::__construct($msg,$code);
 	}

api/src/Db/Deprecated.php

Braces +17 added lines, -5 removed lines

@@ -121,10 +121,13 @@ 
 		{
 			throw new Exception('next_record called with no query pending.');
 		}
-		if ($this->Row)	// first row is already fetched
+		if ($this->Row)
+		{
+			// first row is already fetched
 		{
 			$this->Query_ID->MoveNext();
 		}
+		}
 		++$this->Row;
 
 		$this->Record = $this->Query_ID->fields;
@@ -133,12 +136,15 @@ 
 		{
 			return False;
 		}
-		if ($this->capabilities[self::CAPABILITY_NAME_CASE] == 'upper')	// maxdb, oracle, ...
+		if ($this->capabilities[self::CAPABILITY_NAME_CASE] == 'upper')
+		{
+			// maxdb, oracle, ...
 		{
 			switch($fetch_mode)
 			{
 				case self::FETCH_ASSOC:
 					$this->Record = array_change_key_case($this->Record);
+		}
 					break;
 				case self::FETCH_NUM:
 					$this->Record = array_values($this->Record);
@@ -199,7 +205,8 @@ 
 	* @return bool True if sucessful, False if fails
 	*/
 	function unlock()
-	{}
+	{
+}
 
 	/**
 	* Number of rows in current result set
@@ -289,7 +296,10 @@ 
 		{
 			if (!is_numeric($column))
 			{
-				if ($strip) $column = str_replace($strip,'',$column);
+				if ($strip)
+				{
+					$column = str_replace($strip,'',$column);
+				}
 
 				$result[$column] = $value;
 			}
@@ -301,4 +311,6 @@ 
 /**
  * @deprecated use EGroupware\Api\Db\CallbackIterator
  */
-class egw_db_callback_iterator extends Api\Db\CallbackIterator {}
+class egw_db_callback_iterator extends Api\Db\CallbackIterator
+{
+}

api/src/Egw/Base.php

Braces +13 added lines, -3 removed lines

@@ -95,7 +95,11 @@ 
 	{
 		//error_log(__METHOD__."($name)".function_backtrace());
 
-		if ($name == 'js') $name = 'framework';	// javascript class is integrated now into framework
+		if ($name == 'js')
+		{
+			$name = 'framework';
+		}
+		// javascript class is integrated now into framework
 
 		if (isset($this->$name))
 		{
@@ -104,7 +108,10 @@ 
 
 		if (!isset(self::$sub_objects[$name]) && !class_exists('EGroupware\\Api\\'.ucfirst($name)) && !class_exists($name))
 		{
-			if ($name != 'ADOdb') error_log(__METHOD__.": There's NO $name object! ".function_backtrace());
+			if ($name != 'ADOdb')
+			{
+				error_log(__METHOD__.": There's NO $name object! ".function_backtrace());
+			}
 			return null;
 		}
 		switch($name)
@@ -121,7 +128,10 @@ 
 				return $this->ldap = Api\Ldap::factory(false);
 			default:
 				$class = isset(self::$sub_objects[$name]) ? self::$sub_objects[$name] : 'EGroupware\\Api\\'.ucfirst($name);
-				if (!class_exists($class)) $class = $name;
+				if (!class_exists($class))
+				{
+					$class = $name;
+				}
 				break;
 		}
 		return $this->$name = new $class();

api/src/Contacts/Tracking.php

Braces +12 added lines, -3 removed lines

@@ -116,7 +116,10 @@ 
 				if ($data['is_contactform'])
 				{
 					$copy = preg_split('/, ?/',$data['email_contactform']);
-					if  ($data['email_copytoreceiver']) $copy[] = $data['email'];
+					if  ($data['email_copytoreceiver'])
+					{
+						$copy[] = $data['email'];
+					}
 					return $copy;
 				}
 				break;
@@ -150,7 +153,10 @@ 
 		{
 			$changed_fields = self::changed_fields($data,$old);
 		}
-		if (!$changed_fields) return 0;
+		if (!$changed_fields)
+		{
+			return 0;
+		}
 
 		foreach(array('adr_one_countryname' => 'adr_one_countrycode', 'adr_two_countryname' => 'adr_two_countrycode') as $name => $code)
 		{
@@ -231,7 +237,10 @@ 
 
 		foreach($this->contacts->contact_fields as $name => $label)
 		{
-			if (!$data[$name] && $name != 'owner') continue;
+			if (!$data[$name] && $name != 'owner')
+			{
+				continue;
+			}
 
 			switch($name)
 			{

api/src/Contacts/Ads.php

Braces +13 added lines, -3 removed lines

@@ -84,7 +84,11 @@ 
 	 */
 	function __construct(array $ldap_config=null, $ds=null)
 	{
-		if (false) parent::__construct ();	// quiten IDE warning, we are explicitly NOT calling parrent constructor!
+		if (false)
+		{
+			parent::__construct ();
+		}
+		// quiten IDE warning, we are explicitly NOT calling parrent constructor!
 
 		$this->accountName 		= $GLOBALS['egw_info']['user']['account_lid'];
 
@@ -202,10 +206,16 @@ 
 		$contact['id'] = $contact['uid'] = $this->accounts_ads->objectguid2str($data['objectguid']);
 
 		// ignore system accounts
-		if ($contact['account_id'] < Api\Accounts\Ads::MIN_ACCOUNT_ID) return false;
+		if ($contact['account_id'] < Api\Accounts\Ads::MIN_ACCOUNT_ID)
+		{
+			return false;
+		}
 
 		// ignore deactivated or expired accounts
-		if (!$this->accounts_ads->user_active($data)) return false;
+		if (!$this->accounts_ads->user_active($data))
+		{
+			return false;
+		}
 
 		$this->_inetorgperson2egw($contact, $data, 'displayname');
 	}

api/src/Contacts/Merge.php

Braces +51 added lines, -13 removed lines

@@ -84,7 +84,10 @@ 
 	 */
 	protected function calendar_replacements($id,$last_event_too=false)
 	{
-		if (!class_exists('calendar_boupdate')) return array();
+		if (!class_exists('calendar_boupdate'))
+		{
+			return array();
+		}
 
 		$calendar = new calendar_boupdate();
 
@@ -118,11 +121,17 @@ 
 		foreach($events as $key => $event)
 		{
 			// Use -1 for previous key
-			if($key < 0) $n = $key;
+			if($key < 0)
+			{
+				$n = $key;
+			}
 
 			foreach($calendar->event2array($event) as $name => $data)
 			{
-				if (substr($name,-4) == 'date') $name = substr($name,0,-4);
+				if (substr($name,-4) == 'date')
+				{
+					$name = substr($name,0,-4);
+				}
 				$replacements['$$calendar/'.$n.'/'.$name.'$$'] = is_array($data['data']) ? implode(', ',$data['data']) : $data['data'];
 			}
 			foreach(array('start','end') as $what)
@@ -134,7 +143,10 @@ 
 				) as $name => $format)
 				{
 					$value = $event[$what] ? date($format,$event[$what]) : '';
-					if ($format == 'l') $value = lang($value);
+					if ($format == 'l')
+					{
+						$value = lang($value);
+					}
 					$replacements['$$calendar/'.$n.'/'.$what.$name.'$$'] = $value;
 				}
 			}
@@ -145,7 +157,8 @@ 
 		}
 
 		// Need to set some keys if there is no previous event
-		if($last_event_too && count($events['-1']) == 0) {
+		if($last_event_too && count($events['-1']) == 0)
+		{
 			$replacements['$$calendar/-1/start$$'] = '';
 			$replacements['$$calendar/-1/end$$'] = '';
 			$replacements['$$calendar/-1/owner$$'] = '';
@@ -170,22 +183,38 @@ 
 		$n = 0;
 		foreach($this->contacts->contact_fields as $name => $label)
 		{
-			if (in_array($name,array('tid','label','geo'))) continue;	// dont show them, as they are not used in the UI atm.
+			if (in_array($name,array('tid','label','geo')))
+			{
+				continue;
+			}
+			// dont show them, as they are not used in the UI atm.
 
-			if (in_array($name,array('email','org_name','tel_work','url')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name,array('email','org_name','tel_work','url')) && $n&1)
+			{
+				// main values, which should be in the first column
 			{
 				echo "</tr>\n";
+			}
 				$n++;
 			}
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{'.$name.'}}</td><td>'.$label.'</td>';
 			if($name == 'cat_id')
 			{
-				if ($n&1) echo "</tr>\n";
+				if ($n&1)
+				{
+					echo "</tr>\n";
+				}
 				echo '<td>{{categories}}</td><td>'.lang('Category path').'</td>';
 				$n++;
 			}
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}
 
@@ -242,14 +271,23 @@ 
 			'owner'    => lang('Owner'),
 		) as $name => $label)
 		{
-			if (in_array($name,array('start','end')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name,array('start','end')) && $n&1)
+			{
+				// main values, which should be in the first column
 			{
 				echo "</tr>\n";
+			}
 				$n++;
 			}
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{calendar/#/'.$name.'}}</td><td>'.$label.'</td>';
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}
 		echo "</table>\n";

api/src/Egw.php

Braces +37 added lines, -10 removed lines

@@ -118,7 +118,7 @@ 
 			'config_app'  => 'phpgwapi',
 			'config_name' => array('system_charset','install_id','temp_dir'),
 		),__LINE__,__FILE__) as $row)
-		{
+			{
 			$GLOBALS['egw_info']['server'][$row['config_name']] = $row['config_value'];
 		}
 		if ($GLOBALS['egw_info']['server']['system_charset'] && $GLOBALS['egw_info']['server']['system_charset'] != 'utf-8')
@@ -131,11 +131,14 @@ 
 		// if no server timezone set, use date_default_timezone_get() to determine it once
 		// it fills to log with deprecated warnings under 5.3 otherwise
 		if (empty($GLOBALS['egw_info']['server']['server_timezone']) ||
-			$GLOBALS['egw_info']['server']['server_timezone'] == 'System/Localtime')	// treat invalid tz like empty!
+			$GLOBALS['egw_info']['server']['server_timezone'] == 'System/Localtime')
+		{
+			// treat invalid tz like empty!
 		{
 			try
 			{
 				$tz = new \DateTimeZone(date_default_timezone_get());
+		}
 				Config::save_value('server_timezone',$GLOBALS['egw_info']['server']['server_timezone'] = $tz->getName(),'phpgwapi');
 				error_log(__METHOD__."() stored server_timezone=".$GLOBALS['egw_info']['server']['server_timezone']);
 			}
@@ -301,14 +304,20 @@ 
 			exit;
 		}
 		// check if we have a session, if not try to automatic create one
-		if ($this->session->verify()) return true;
+		if ($this->session->verify())
+		{
+			return true;
+		}
 
 		$account = null;
 		if (($account_callback = $GLOBALS['egw_info']['flags']['autocreate_session_callback']) && is_callable($account_callback) &&
-			($sessionid = call_user_func_array($account_callback,array(&$account))) === true)	// $account_call_back returns true, false or a session-id
+			($sessionid = call_user_func_array($account_callback,array(&$account))) === true)
+		{
+			// $account_call_back returns true, false or a session-id
 		{
 			$sessionid = $this->session->create($account);
 		}
+		}
 		if (!$sessionid)
 		{
 			//echo "<p>account_callback='$account_callback', account=".print_r($account,true).", sessionid=$sessionid</p>\n"; exit;
@@ -337,9 +346,15 @@ 
 			{
 				$redirect = '/login.php?';
 				// only add "your session could not be verified", if a sessionid is given (cookie or on url)
-				if (Session::get_sessionid()) $redirect .= 'cd=10&';
+				if (Session::get_sessionid())
+				{
+					$redirect .= 'cd=10&';
+				}
+			}
+			if ($relpath)
+			{
+				$redirect .= 'phpgw_forward='.urlencode($relpath.(!empty($query) ? '?'.$query : ''));
 			}
-			if ($relpath) $redirect .= 'phpgw_forward='.urlencode($relpath.(!empty($query) ? '?'.$query : ''));
 			self::redirect_link($redirect);
 		}
 	}
@@ -357,7 +372,9 @@ 
 	{
 		$this->currentapp = $GLOBALS['egw_info']['flags']['currentapp'];	// some apps change it later
 
-		if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('api','about')))	// give everyone implicit api rights
+		if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('api','about')))
+		{
+			// give everyone implicit api rights
 		{
 			// This will need to use ACL in the future
 			if (!$GLOBALS['egw_info']['user']['apps'][$currentapp = $GLOBALS['egw_info']['flags']['currentapp']] ||
@@ -370,6 +387,7 @@ 
 					if (($sessionid = Session::get_sessionid(true)))
 					{
 						$GLOBALS['egw']->session->destroy($sessionid);
+		}
 					}
 					throw new Exception\Redirect(self::link('/logout.php'));
 				}
@@ -555,7 +573,10 @@ 
 				try {
 					//error_log(__METHOD__."() running ".array2string($data));
 					$callback = array_shift($data);
-					if (!is_array($callback) || strpos($callback[1], 'session') === false) continue;
+					if (!is_array($callback) || strpos($callback[1], 'session') === false)
+					{
+						continue;
+					}
 					call_user_func_array($callback, $data);
 				}
 				catch (\Exception $ex) {
@@ -565,7 +586,10 @@ 
 			}
 			// now we can close the session
 			// without closing the session fastcgi_finish_request() will NOT send output to user
-			if (isset($GLOBALS['egw']->session) && is_object($GLOBALS['egw']->session)) $GLOBALS['egw']->session->commit_session();
+			if (isset($GLOBALS['egw']->session) && is_object($GLOBALS['egw']->session))
+			{
+				$GLOBALS['egw']->session->commit_session();
+			}
 
 			// flush all output to user
 			/* does NOT work on Apache :-(
@@ -593,9 +617,12 @@ 
 				}
 			}
 			// call the asyncservice check_run function if it is not explicitly set to cron-only
-			if (!$GLOBALS['egw_info']['server']['asyncservice'])	// is default
+			if (!$GLOBALS['egw_info']['server']['asyncservice'])
+			{
+				// is default
 			{
 				$async = new Asyncservice();
+			}
 				$async->check_run('fallback');
 			}
 			$this->db->disconnect();

api/src/Vfs/Dav/Directory.php

Braces +4 added lines, -1 removed lines

@@ -69,7 +69,10 @@
 		$path = $this->vfs_path . '/' . $name;
 		$vfs_path = $this->vfs_path . '/' . Vfs::encodePathComponent($name);
 
-		if (!Vfs::file_exists($vfs_path)) throw new DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+		if (!Vfs::file_exists($vfs_path))
+		{
+			throw new DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+		}
 
 		if (Vfs::is_dir($vfs_path))
 		{

api/src/WebDAV/Tools/_parse_lockinfo.php

Braces +45 added lines, -20 removed lines

@@ -99,7 +99,8 @@ 
 
         // open stream
         $f_in = fopen($path, "r");
-        if (!$f_in) {
+        if (!$f_in)
+        {
             $this->success = false;
             return;
         }
@@ -119,16 +120,19 @@ 
                               XML_OPTION_CASE_FOLDING, false);
 
         // parse input
-        while ($this->success && !feof($f_in)) {
+        while ($this->success && !feof($f_in))
+        {
             $line = fgets($f_in);
-            if (is_string($line)) {
+            if (is_string($line))
+            {
                 $had_input = true;
                 $this->success &= xml_parse($xml_parser, $line, false);
             }
         }
 
         // finish parsing
-        if ($had_input) {
+        if ($had_input)
+        {
             $this->success &= xml_parse($xml_parser, "", true);
         }
 
@@ -156,29 +160,40 @@ 
     function _startElement($parser, $name, $attrs)
     {
         // namespace handling
-        if (strstr($name, " ")) {
+        if (strstr($name, " "))
+        {
             list($ns, $tag) = explode(" ", $name);
-        } else {
+        }
+        else
+        {
             $ns  = "";
             $tag = $name;
         }
 
 
-        if ($this->collect_owner) {
+        if ($this->collect_owner)
+        {
             // everything within the <owner> tag needs to be collected
             $ns_short = "";
             $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
+            if ($ns)
+            {
+                if ($ns == "DAV:")
+                {
                     $ns_short = "D:";
-                } else {
+                }
+                else
+                {
                     $ns_attr = " xmlns='$ns'";
                 }
             }
             $this->owner .= "<$ns_short$tag$ns_attr>";
-        } else if ($ns == "DAV:") {
+        }
+        else if ($ns == "DAV:")
+        {
             // parse only the essential tags
-            switch ($tag) {
+            switch ($tag)
+            {
             case "write":
                 $this->locktype = $tag;
                 break;
@@ -204,7 +219,8 @@ 
     function _data($parser, $data)
     {
         // only the <owner> tag has data content
-        if ($this->collect_owner) {
+        if ($this->collect_owner)
+        {
             $this->owner .= $data;
         }
     }
@@ -220,26 +236,35 @@ 
     function _endElement($parser, $name)
     {
         // namespace handling
-        if (strstr($name, " ")) {
+        if (strstr($name, " "))
+        {
             list($ns, $tag) = explode(" ", $name);
-        } else {
+        }
+        else
+        {
             $ns  = "";
             $tag = $name;
         }
 
         // <owner> finished?
-        if (($ns == "DAV:") && ($tag == "owner")) {
+        if (($ns == "DAV:") && ($tag == "owner"))
+        {
             $this->collect_owner = false;
         }
 
         // within <owner> we have to collect everything
-        if ($this->collect_owner) {
+        if ($this->collect_owner)
+        {
             $ns_short = "";
             $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
+            if ($ns)
+            {
+                if ($ns == "DAV:")
+                {
                     $ns_short = "D:";
-                } else {
+                }
+                else
+                {
                     $ns_attr = " xmlns='$ns'";
                 }
             }