EGroupware / egroupware

api/src/Contacts/Merge.php

Spacing +30 added lines, -30 removed lines

@@ -16,7 +16,7 @@ 
 use EGroupware\Api;
 
 // explicit import not namespaced classes
-use calendar_boupdate;	// we detect if it is not available
+use calendar_boupdate; // we detect if it is not available
 
 /**
  * Contacts document merge
@@ -55,22 +55,22 @@ 
 	 * @param boolean $ignore_acl =false true: no acl check
 	 * @return array|boolean
 	 */
-	protected function get_replacements($id,&$content=null,$ignore_acl=false)
+	protected function get_replacements($id, &$content = null, $ignore_acl = false)
 	{
-		if (!($replacements = $this->contact_replacements($id,'',$ignore_acl)))
+		if (!($replacements = $this->contact_replacements($id, '', $ignore_acl)))
 		{
 			return false;
 		}
-		if($content && strpos($content, '$$#') !== 0)
+		if ($content && strpos($content, '$$#') !== 0)
 		{
-			$this->cf_link_to_expand($this->contacts->read($id, $ignore_acl), $content, $replacements,'addressbook');
+			$this->cf_link_to_expand($this->contacts->read($id, $ignore_acl), $content, $replacements, 'addressbook');
 		}
 
 		// Links
 		$replacements += $this->get_all_links('addressbook', $id, '', $content);
-		if (!(strpos($content,'$$calendar/') === false))
+		if (!(strpos($content, '$$calendar/') === false))
 		{
-			$replacements += $this->calendar_replacements($id,!(strpos($content,'$$calendar/-1/') === false));
+			$replacements += $this->calendar_replacements($id, !(strpos($content, '$$calendar/-1/') === false));
 		}
 		return $replacements;
 	}
@@ -82,7 +82,7 @@ 
 	 * @param boolean $last_event_too =false also include information about the last event
 	 * @return array
 	 */
-	protected function calendar_replacements($id,$last_event_too=false)
+	protected function calendar_replacements($id, $last_event_too = false)
 	{
 		if (!class_exists('calendar_boupdate')) return array();
 
@@ -101,7 +101,7 @@ 
 		{
 			$events = array();
 		}
-		if ($last_event_too==true)
+		if ($last_event_too == true)
 		{
 			$last = $calendar->search(array(
 				'end' => $calendar->now_su,
@@ -111,41 +111,41 @@ 
 				'order' => 'cal_start DESC',
 				'enum_recurring' => true
 			));
-			$events['-1'] = $last ? array_shift($last) : array();	// returned events are indexed by cal_id!
+			$events['-1'] = $last ? array_shift($last) : array(); // returned events are indexed by cal_id!
 		}
 		$replacements = array();
-		$n = 1;  // Returned events are indexed by cal_id, need to index sequentially
-		foreach($events as $key => $event)
+		$n = 1; // Returned events are indexed by cal_id, need to index sequentially
+		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)
+			foreach ($calendar->event2array($event) as $name => $data)
 			{
-				if (substr($name,-4) == 'date') $name = substr($name,0,-4);
-				$replacements['$$calendar/'.$n.'/'.$name.'$$'] = is_array($data['data']) ? implode(', ',$data['data']) : $data['data'];
+				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)
+			foreach (array('start', 'end') as $what)
 			{
-				foreach(array(
+				foreach (array(
 					'date' => $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],
 					'day'  => 'l',
 					'time' => $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i',
 				) as $name => $format)
 				{
-					$value = $event[$what] ? date($format,$event[$what]) : '';
+					$value = $event[$what] ? date($format, $event[$what]) : '';
 					if ($format == 'l') $value = lang($value);
 					$replacements['$$calendar/'.$n.'/'.$what.$name.'$$'] = $value;
 				}
 			}
-			$duration = ($event['end'] - $event['start'])/60;
-			$replacements['$$calendar/'.$n.'/duration$$'] = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
+			$duration = ($event['end'] - $event['start']) / 60;
+			$replacements['$$calendar/'.$n.'/duration$$'] = floor($duration / 60).lang('h').($duration % 60 ? $duration % 60 : '');
 
 			++$n;
 		}
 
 		// 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$$'] = '';
@@ -168,18 +168,18 @@ 
 		echo '<tr><td colspan="4"><h3>'.lang('Contact fields:')."</h3></td></tr>";
 
 		$n = 0;
-		foreach($this->contacts->contact_fields as $name => $label)
+		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>';
 			echo '<td>{{'.$name.'}}</td><td>'.$label.'</td>';
-			if($name == 'cat_id')
+			if ($name == 'cat_id')
 			{
 				if ($n&1) echo "</tr>\n";
 				echo '<td>{{categories}}</td><td>'.lang('Category path').'</td>';
@@ -190,13 +190,13 @@ 
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
-		foreach($this->contacts->customfields as $name => $field)
+		foreach ($this->contacts->customfields as $name => $field)
 		{
 			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'link' => lang('HTML link to the current record'),
 			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
  			'attachments' => lang('List of files linked to the current record'),
@@ -220,7 +220,7 @@ 
 
 		Api\Translation::add_app('calendar');
 		echo '<tr><td colspan="4"><h3>'.lang('Calendar fields:')." # = 1, 2, ..., 20, -1</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'title' => lang('Title'),
 			'description' => lang('Description'),
 			'participants' => lang('Participants'),
@@ -242,7 +242,7 @@ 
 			'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++;

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

Spacing +77 added lines, -77 removed lines

@@ -43,7 +43,7 @@ 
 	 * @var	string
 	 * @access	public
 	 */
-	var $debug = 0;		// This will turn on debugging information.
+	var $debug = 0; // This will turn on debugging information.
 	/**
 	 * Instance of the account object
 	 *
@@ -57,10 +57,10 @@ 
 	 * @author RalfBecker@outdoor-training.de
 	 * @param array $domain_names array with valid egw-domain names
 	 */
-	function __construct($domain_names=null)
+	function __construct($domain_names = null)
 	{
-		$GLOBALS['egw'] =& $this;	// we need to be immediately available there for the other classes we instantiate
-		$this->setup($domain_names,True);
+		$GLOBALS['egw'] = & $this; // we need to be immediately available there for the other classes we instantiate
+		$this->setup($domain_names, True);
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 * @param array $domain_names array with valid egw-domain names
 	 * @param boolean $createsessionobject True to create the session object (default=True)
 	 */
-	function setup($domain_names,$createsessionobject=True)
+	function setup($domain_names, $createsessionobject = True)
 	{
 		// create the DB-object
 		// as SiteMgr, Wiki, KnowledgeBase and probably more still use eg next_record(), we stick with Db\Deprecated for now
@@ -84,18 +84,18 @@ 
 		// check if eGW is already setup, if not redirect to setup/
 		try {
 			$this->db->connect();
-			$num_config = $this->db->select(Config::TABLE,'COUNT(config_name)',false,__LINE__,__FILE__)->fetchColumn();
+			$num_config = $this->db->select(Config::TABLE, 'COUNT(config_name)', false, __LINE__, __FILE__)->fetchColumn();
 		}
-		catch(Db\Exception\Connection $e) {
+		catch (Db\Exception\Connection $e) {
 			// ignore exception, get handled below
 		}
-		catch(Db\Exception\InvalidSql $e1) {
-			unset($e1);	// not used
+		catch (Db\Exception\InvalidSql $e1) {
+			unset($e1); // not used
 			try {
-				$phpgw_config = $this->db->select('phpgw_config','COUNT(config_name)',false,__LINE__,__FILE__)->fetchColumn();
+				$phpgw_config = $this->db->select('phpgw_config', 'COUNT(config_name)', false, __LINE__, __FILE__)->fetchColumn();
 			}
 			catch (Db\Exception\InvalidSql $e2) {
-				unset($e2);	// not used
+				unset($e2); // not used
 				// ignor error, get handled below
 			}
 		}
@@ -104,20 +104,20 @@ 
 			// we check for the old table too, to not scare updating users ;-)
 			if ($phpgw_config)
 			{
-				throw new Exception('You need to update EGroupware before you can continue using it.',999);
+				throw new Exception('You need to update EGroupware before you can continue using it.', 999);
 			}
 			if ($e)
 			{
 				throw new Db\Exception\Setup('Connection with '.$e->getMessage()."\n\n".
-					'Maybe you not created a database for EGroupware yet.',999);
+					'Maybe you not created a database for EGroupware yet.', 999);
 			}
-			throw new Db\Exception\Setup('It appears that you have not created the database tables for EGroupware.',999);
+			throw new Db\Exception\Setup('It appears that you have not created the database tables for EGroupware.', 999);
 		}
 		// Set the DB's client charset if a system-charset is set and some other values needed by egw_cache (used in Config::read)
-			foreach($this->db->select(Config::TABLE,'config_name,config_value',array(
+			foreach ($this->db->select(Config::TABLE, 'config_name,config_value', array(
 			'config_app'  => 'phpgwapi',
-			'config_name' => array('system_charset','install_id','temp_dir'),
-		),__LINE__,__FILE__) as $row)
+			'config_name' => array('system_charset', 'install_id', 'temp_dir'),
+		), __LINE__, __FILE__) as $row)
 		{
 			$GLOBALS['egw_info']['server'][$row['config_name']] = $row['config_value'];
 		}
@@ -136,10 +136,10 @@ 
 			try
 			{
 				$tz = new \DateTimeZone(date_default_timezone_get());
-				Config::save_value('server_timezone',$GLOBALS['egw_info']['server']['server_timezone'] = $tz->getName(),'phpgwapi');
+				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']);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				// do nothing if new DateTimeZone fails (eg. 'System/Localtime' returned), specially do NOT store it!
 				error_log(__METHOD__."() NO valid 'date.timezone' set in your php.ini!");
@@ -150,24 +150,24 @@ 
 		// if phpgwapi exists we prefer accounts and egw_session, as they have some deprecated methods
 		if (file_exists(EGW_SERVER_ROOT.'/phpgwapi'))
 		{
-			$this->accounts       = new egw_accounts();
+			$this->accounts = new egw_accounts();
 			/* Do not create the session object if called by the sessions class.  This way
 			 * we ensure the correct db based on the user domain.
 			 */
-			if($createsessionobject)
+			if ($createsessionobject)
 			{
-				$this->session    = new egw_session($domain_names);
+				$this->session = new egw_session($domain_names);
 			}
 		}
 		else
 		{
-			$this->accounts       = new Accounts();
+			$this->accounts = new Accounts();
 			/* Do not create the session object if called by the sessions class.  This way
 			 * we ensure the correct db based on the user domain.
 			 */
-			if($createsessionobject)
+			if ($createsessionobject)
 			{
-				$this->session    = new Session($domain_names);
+				$this->session = new Session($domain_names);
 			}
 		}
 		// setup the other subclasses
@@ -178,7 +178,7 @@ 
 		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'login' && $GLOBALS['egw_info']['flags']['currentapp'] != 'logout')
 		{
 			$this->verify_session();
-			$this->applications->read_installed_apps();	// to get translated app-titles, has to be after verify_session
+			$this->applications->read_installed_apps(); // to get translated app-titles, has to be after verify_session
 
 			$this->define_egw_constants();
 
@@ -199,9 +199,9 @@ 
 	 */
 	function __wakeup()
 	{
-		$GLOBALS['egw'] =& $this;	// we need to be immediately available there for the other classes we instantiate
+		$GLOBALS['egw'] = & $this; // we need to be immediately available there for the other classes we instantiate
 		// for the migration: reference us to the old phpgw object
-		$GLOBALS['phpgw'] =& $this;
+		$GLOBALS['phpgw'] = & $this;
 
 		if ($GLOBALS['egw_info']['server']['system_charset'])
 		{
@@ -271,15 +271,15 @@ 
 		}
 
 		// Load the (depricated) app include files if they exists
-		if (EGW_APP_INC != "" && ! preg_match ('/phpgwapi/i', EGW_APP_INC) &&
-			file_exists(EGW_APP_INC . '/functions.inc.php') && !isset($_GET['menuaction']))
+		if (EGW_APP_INC != "" && !preg_match('/phpgwapi/i', EGW_APP_INC) &&
+			file_exists(EGW_APP_INC.'/functions.inc.php') && !isset($_GET['menuaction']))
 		{
-			include(EGW_APP_INC . '/functions.inc.php');
+			include(EGW_APP_INC.'/functions.inc.php');
 		}
 		if (!@$GLOBALS['egw_info']['flags']['noheader'] && !@$GLOBALS['egw_info']['flags']['noappheader'] &&
-			file_exists(EGW_APP_INC . '/header.inc.php') && !isset($_GET['menuaction']))
+			file_exists(EGW_APP_INC.'/header.inc.php') && !isset($_GET['menuaction']))
 		{
-			include(EGW_APP_INC . '/header.inc.php');
+			include(EGW_APP_INC.'/header.inc.php');
 		}
 	}
 
@@ -295,9 +295,9 @@ 
 	 */
 	function verify_session()
 	{
-		if($GLOBALS['egw_info']['server']['enforce_ssl'] === 'redirect' && !$_SERVER['HTTPS'])
+		if ($GLOBALS['egw_info']['server']['enforce_ssl'] === 'redirect' && !$_SERVER['HTTPS'])
 		{
-			Header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+			Header('Location: https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 			exit;
 		}
 		// check if we have a session, if not try to automatic create one
@@ -305,7 +305,7 @@ 
 
 		$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);
 		}
@@ -314,21 +314,21 @@ 
 			//echo "<p>account_callback='$account_callback', account=".print_r($account,true).", sessionid=$sessionid</p>\n"; exit;
 			// we forward to the same place after the re-login
 			if ($GLOBALS['egw_info']['server']['webserver_url'] && $GLOBALS['egw_info']['server']['webserver_url'] != '/' &&
-				($webserver_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'],PHP_URL_PATH)) && $webserver_path != '/')
+				($webserver_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'], PHP_URL_PATH)) && $webserver_path != '/')
 			{
 				// we have to use only path component, to cope with domains like http://egroupware.domain.com and /egroupware
-				list(,$relpath) = explode($webserver_path,parse_url($_SERVER['PHP_SELF'],PHP_URL_PATH),2);
+				list(,$relpath) = explode($webserver_path, parse_url($_SERVER['PHP_SELF'], PHP_URL_PATH), 2);
 			}
 			else	// the webserver-url is empty or just a slash '/' (eGW is installed in the docroot and no domain given)
 			{
 				$matches = null;
-				if (preg_match('/^https?:\/\/[^\/]*\/(.*)$/',$relpath=$_SERVER['PHP_SELF'],$matches))
+				if (preg_match('/^https?:\/\/[^\/]*\/(.*)$/', $relpath = $_SERVER['PHP_SELF'], $matches))
 				{
 					$relpath = $matches[1];
 				}
 			}
 			// this removes the sessiondata if its saved in the URL
-			$query = preg_replace('/[&]?sessionid(=|%3D)[^&]+&kp3(=|%3D)[^&]+&domain=.*$/','',$_SERVER['QUERY_STRING']);
+			$query = preg_replace('/[&]?sessionid(=|%3D)[^&]+&kp3(=|%3D)[^&]+&domain=.*$/', '', $_SERVER['QUERY_STRING']);
 			if ($GLOBALS['egw_info']['server']['http_auth_types'])
 			{
 				$redirect = '/phpgwapi/ntlm/index.php?';
@@ -355,9 +355,9 @@ 
 	 */
 	function check_app_rights()
 	{
-		$this->currentapp = $GLOBALS['egw_info']['flags']['currentapp'];	// some apps change it later
+		$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']] ||
@@ -387,25 +387,25 @@ 
 	 */
 	function define_egw_constants()
 	{
-		define('EGW_ACL_READ',1);
-		define('EGW_ACL_ADD',2);
-		define('EGW_ACL_EDIT',4);
-		define('EGW_ACL_DELETE',8);
-		define('EGW_ACL_PRIVATE',16);
-		define('EGW_ACL_GROUP_MANAGERS',32);
-		define('EGW_ACL_CUSTOM_1',64);
-		define('EGW_ACL_CUSTOM_2',128);
-		define('EGW_ACL_CUSTOM_3',256);
+		define('EGW_ACL_READ', 1);
+		define('EGW_ACL_ADD', 2);
+		define('EGW_ACL_EDIT', 4);
+		define('EGW_ACL_DELETE', 8);
+		define('EGW_ACL_PRIVATE', 16);
+		define('EGW_ACL_GROUP_MANAGERS', 32);
+		define('EGW_ACL_CUSTOM_1', 64);
+		define('EGW_ACL_CUSTOM_2', 128);
+		define('EGW_ACL_CUSTOM_3', 256);
 		// and the old ones
-		define('PHPGW_ACL_READ',1);
-		define('PHPGW_ACL_ADD',2);
-		define('PHPGW_ACL_EDIT',4);
-		define('PHPGW_ACL_DELETE',8);
-		define('PHPGW_ACL_PRIVATE',16);
-		define('PHPGW_ACL_GROUP_MANAGERS',32);
-		define('PHPGW_ACL_CUSTOM_1',64);
-		define('PHPGW_ACL_CUSTOM_2',128);
-		define('PHPGW_ACL_CUSTOM_3',256);
+		define('PHPGW_ACL_READ', 1);
+		define('PHPGW_ACL_ADD', 2);
+		define('PHPGW_ACL_EDIT', 4);
+		define('PHPGW_ACL_DELETE', 8);
+		define('PHPGW_ACL_PRIVATE', 16);
+		define('PHPGW_ACL_GROUP_MANAGERS', 32);
+		define('PHPGW_ACL_CUSTOM_1', 64);
+		define('PHPGW_ACL_CUSTOM_2', 128);
+		define('PHPGW_ACL_CUSTOM_3', 256);
 		// A few hacker resistant constants that will be used throught the program
 		if (file_exists(EGW_SERVER_ROOT.'/phpgwapi'))
 		{
@@ -418,14 +418,14 @@ 
 			define('EGW_IMAGES', $this->common->get_image_path());
 			define('EGW_APP_IMAGES_DIR', $this->common->get_image_dir());
 			// and the old ones
-			define('PHPGW_TEMPLATE_DIR',EGW_TEMPLATE_DIR);
-			define('PHPGW_IMAGES_DIR',EGW_IMAGES_DIR);
-			define('PHPGW_IMAGES_FILEDIR',EGW_IMAGES_FILEDIR);
-			define('PHPGW_APP_ROOT',EGW_APP_ROOT);
-			define('PHPGW_APP_INC',EGW_APP_INC);
-			define('PHPGW_APP_TPL',EGW_APP_TPL);
-			define('PHPGW_IMAGES',EGW_IMAGES);
-			define('PHPGW_APP_IMAGES_DIR',EGW_APP_IMAGES_DIR);
+			define('PHPGW_TEMPLATE_DIR', EGW_TEMPLATE_DIR);
+			define('PHPGW_IMAGES_DIR', EGW_IMAGES_DIR);
+			define('PHPGW_IMAGES_FILEDIR', EGW_IMAGES_FILEDIR);
+			define('PHPGW_APP_ROOT', EGW_APP_ROOT);
+			define('PHPGW_APP_INC', EGW_APP_INC);
+			define('PHPGW_APP_TPL', EGW_APP_TPL);
+			define('PHPGW_IMAGES', EGW_IMAGES);
+			define('PHPGW_APP_IMAGES_DIR', EGW_APP_IMAGES_DIR);
 		}
 	}
 
@@ -460,7 +460,7 @@ 
 	 * @param string $link_app =null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function link($url, $extravars = '', $link_app=null)
+	static function link($url, $extravars = '', $link_app = null)
 	{
 		return $GLOBALS['egw']->framework->link($url, $extravars, $link_app);
 	}
@@ -473,7 +473,7 @@ 
 	 * @param string $link_app =null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function redirect_link($url, $extravars='', $link_app=null)
+	static function redirect_link($url, $extravars = '', $link_app = null)
 	{
 		return $GLOBALS['egw']->framework->redirect_link($url, $extravars, $link_app);
 	}
@@ -486,7 +486,7 @@ 
 	 * @param string $url url to redirect to
 	 * @param string $link_app =null appname to redirect for, default currentapp
 	 */
-	static function redirect($url, $link_app=null)
+	static function redirect($url, $link_app = null)
 	{
 		Framework::redirect($url, $link_app);
 	}
@@ -500,14 +500,14 @@ 
 	 * @param  string	The key for the phrase
 	 * @see	Translation::translate()
 	 */
-	static function lang($key,$args=null)
+	static function lang($key, $args = null)
 	{
 		if (!is_array($args))
 		{
 			$args = func_get_args();
 			array_shift($args);
 		}
-		return Translation::translate($key,$args);
+		return Translation::translate($key, $args);
 	}
 
 	/**
@@ -526,7 +526,7 @@ 
 	 * @param callable $callback use array($classname, $method) for static methods
 	 * @param array $args =array()
 	 */
-	public static function on_shutdown($callback, array $args=array())
+	public static function on_shutdown($callback, array $args = array())
 	{
 		array_unshift($args, $callback);
 
@@ -541,7 +541,7 @@ 
 	{
 		if (!defined('EGW_SHUTDOWN'))
 		{
-			define('EGW_SHUTDOWN',True);
+			define('EGW_SHUTDOWN', True);
 
 			// send json response BEFORE flushing output
 			if (Json\Request::isJSONRequest())
@@ -550,7 +550,7 @@ 
 			}
 
 			// run all on_shutdown callbacks with session in their name (eg. egw_link::save_session_cache), do NOT stop on exceptions
-			foreach(self::$shutdown_callbacks as $n => $data)
+			foreach (self::$shutdown_callbacks as $n => $data)
 			{
 				try {
 					//error_log(__METHOD__."() running ".array2string($data));
@@ -581,7 +581,7 @@ 
 			}
 
 			// run all on_shutdown, do NOT stop on exceptions
-			foreach(self::$shutdown_callbacks as $data)
+			foreach (self::$shutdown_callbacks as $data)
 			{
 				try {
 					//error_log(__METHOD__."() running ".array2string($data));

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/Sqlfs/Utils.php

Spacing +43 added lines, -44 removed lines

@@ -26,7 +26,7 @@ 
 	 *
 	 * @param boolean $debug true to echo a message for each copied file
 	 */
-	static function migrate_db2fs($debug=true)
+	static function migrate_db2fs($debug = true)
 	{
 		if (!is_object(self::$pdo))
 		{
@@ -40,15 +40,15 @@ 
 		$fs_id = $fs_name = $fs_size = $fs_content = null;
 		$n = 0;
 		$stmt = self::$pdo->prepare($query);
-		$stmt->bindColumn(1,$fs_id);
-		$stmt->bindColumn(2,$fs_name);
-		$stmt->bindColumn(3,$fs_size);
-		$stmt->bindColumn(4,$fs_content,\PDO::PARAM_LOB);
+		$stmt->bindColumn(1, $fs_id);
+		$stmt->bindColumn(2, $fs_name);
+		$stmt->bindColumn(3, $fs_size);
+		$stmt->bindColumn(4, $fs_content, \PDO::PARAM_LOB);
 		$stmt->bindValue(':offset', $n, \PDO::PARAM_INT);
 
 		while ($stmt->execute())
 		{
-			foreach($stmt as $row)
+			foreach ($stmt as $row)
 			{
 				// hack to work around a current php bug (http://bugs.php.net/bug.php?id=40913)
 				// PDOStatement::bindColumn(,,\PDO::PARAM_LOB) is not working for MySQL, content is returned as string :-(
@@ -68,15 +68,15 @@ 
 					throw new Api\Exception\AssertionFailed(__METHOD__."(): fs_id=$fs_id ($fs_name, $fs_size bytes) content is NO resource! ".array2string($content));
 				}
 				$filename = self::_fs_path($fs_id);
-				if (!file_exists($fs_dir=Vfs::dirname($filename)))
+				if (!file_exists($fs_dir = Vfs::dirname($filename)))
 				{
-					self::mkdir_recursive($fs_dir,0700,true);
+					self::mkdir_recursive($fs_dir, 0700, true);
 				}
-				if (!($dest = fopen($filename,'w')))
+				if (!($dest = fopen($filename, 'w')))
 				{
 					throw new Api\Exception\AssertionFailed(__METHOD__."(): fopen($filename,'w') failed!");
 				}
-				if (($bytes = stream_copy_to_stream($content,$dest)) != $fs_size)
+				if (($bytes = stream_copy_to_stream($content, $dest)) != $fs_size)
 				{
 					throw new Api\Exception\AssertionFailed(__METHOD__."(): fs_id=$fs_id ($fs_name) $bytes bytes copied != size of $fs_size bytes!");
 				}
@@ -86,11 +86,11 @@ 
 
 				++$n;
 			}
-			if (!$n) break;	// just in case nothing is found, statement will execute just fine
+			if (!$n) break; // just in case nothing is found, statement will execute just fine
 
 			$stmt->bindValue(':offset', $n, \PDO::PARAM_INT);
 		}
-		unset($row);	// not used, as we access bound variables
+		unset($row); // not used, as we access bound variables
 		unset($stmt);
 
 		if ($n)	// delete all content in DB, if there was some AND no error (exception thrown!)
@@ -108,14 +108,14 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	public static function fsck($check_only=true)
+	public static function fsck($check_only = true)
 	{
 		if (!is_object(self::$pdo))
 		{
 			self::_pdo();
 		}
 		$msgs = array();
-		foreach(array(
+		foreach (array(
 			self::fsck_fix_required_nodes($check_only),
 			self::fsck_fix_multiple_active($check_only),
 			self::fsck_fix_unconnected($check_only),
@@ -141,7 +141,7 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	private static function fsck_fix_required_nodes($check_only=true)
+	private static function fsck_fix_required_nodes($check_only = true)
 	{
 		static $dirs = array(
 			'/' => 1,
@@ -150,7 +150,7 @@ 
 		);
 		$stmt = $delete_stmt = null;
 		$msgs = array();
-		foreach($dirs as $path => $id)
+		foreach ($dirs as $path => $id)
 		{
 			if (!($stat = self::url_stat($path, STREAM_URL_STAT_LINK)))
 			{
@@ -168,7 +168,7 @@ 
 					try {
 						$ok = $stmt->execute($data = array(
 							'fs_id' => $id,
-							'fs_name' => substr($path,1),
+							'fs_name' => substr($path, 1),
 							'fs_dir'  => $path == '/' ? 0 : $dirs['/'],
 							'fs_mode' => 05,
 							'fs_uid' => 0,
@@ -183,7 +183,7 @@ 
 					catch (\PDOException $e)
 					{
 						$ok = false;
-						unset($e);	// ignore exception
+						unset($e); // ignore exception
 					}
 					if (!$ok)	// can not insert it, try deleting it first
 					{
@@ -196,15 +196,14 @@ 
 						}
 						catch (\PDOException $e)
 						{
-							unset($e);	// ignore exception
+							unset($e); // ignore exception
 						}
 					}
-					$msgs[] = $ok ? lang('Required directory "%1" created.', $path) :
-						lang('Failed to create required directory "%1"!', $path);
+					$msgs[] = $ok ? lang('Required directory "%1" created.', $path) : lang('Failed to create required directory "%1"!', $path);
 				}
 			}
 			// check if directory is at least world readable and executable (r-x), we allow more but not less
-			elseif (($stat['mode'] & 05) != 05)
+			elseif (($stat['mode']&05) != 05)
 			{
 				if ($check_only)
 				{
@@ -244,20 +243,20 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	private static function fsck_fix_no_content($check_only=true)
+	private static function fsck_fix_no_content($check_only = true)
 	{
 		$stmt = null;
 		$msgs = array();
-		foreach(self::$pdo->query('SELECT fs_id FROM '.self::TABLE.
+		foreach (self::$pdo->query('SELECT fs_id FROM '.self::TABLE.
 			" WHERE fs_mime!='httpd/unix-directory' AND fs_content IS NULL AND fs_link IS NULL") as $row)
 		{
-			if (!file_exists($phy_path=self::_fs_path($row['fs_id'])))
+			if (!file_exists($phy_path = self::_fs_path($row['fs_id'])))
 			{
 				$path = self::id2path($row['fs_id']);
 				if ($check_only)
 				{
 					$msgs[] = lang('File %1 has no content in physical filesystem %2!',
-						$path.' (#'.$row['fs_id'].')',$phy_path);
+						$path.' (#'.$row['fs_id'].')', $phy_path);
 				}
 				else
 				{
@@ -269,12 +268,12 @@ 
 					if ($stmt->execute(array('fs_id' => $row['fs_id'])) &&
 						$stmt_props->execute(array('fs_id' => $row['fs_id'])))
 					{
-						$msgs[] = lang('File %1 has no content in physical filesystem %2 --> file removed!',$path,$phy_path);
+						$msgs[] = lang('File %1 has no content in physical filesystem %2 --> file removed!', $path, $phy_path);
 					}
 					else
 					{
 						$msgs[] = lang('File %1 has no content in physical filesystem %2 --> failed to remove file!',
-							$path.' (#'.$row['fs_id'].')',$phy_path);
+							$path.' (#'.$row['fs_id'].')', $phy_path);
 					}
 				}
 			}
@@ -304,11 +303,11 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	private static function fsck_fix_unconnected($check_only=true)
+	private static function fsck_fix_unconnected($check_only = true)
 	{
 		$lostnfound = null;
 		$msgs = array();
-		foreach(self::$pdo->query('SELECT fs.* FROM '.self::TABLE.' fs'.
+		foreach (self::$pdo->query('SELECT fs.* FROM '.self::TABLE.' fs'.
 			' LEFT JOIN '.self::TABLE.' dir ON dir.fs_id=fs.fs_dir'.
 			' WHERE fs.fs_id > 1 AND dir.fs_id IS NULL') as $row)
 		{
@@ -327,14 +326,14 @@ 
 					Vfs::$is_root = true;
 					if (!self::mkdir(self::LOST_N_FOUND, self::LOST_N_FOUND_MOD, 0) ||
 						!(!($admins = $GLOBALS['egw']->accounts->name2id(self::LOST_N_FOUND_GRP)) ||
-						   self::chgrp(self::LOST_N_FOUND, $admins) && self::chmod(self::LOST_N_FOUND,self::LOST_N_FOUND_MOD)) ||
+						   self::chgrp(self::LOST_N_FOUND, $admins) && self::chmod(self::LOST_N_FOUND, self::LOST_N_FOUND_MOD)) ||
 						!($lostnfound = self::url_stat(self::LOST_N_FOUND, STREAM_URL_STAT_QUIET)))
 					{
-						$msgs[] = lang("Can't create directory %1 to connect found unconnected nodes to it!",self::LOST_N_FOUND);
+						$msgs[] = lang("Can't create directory %1 to connect found unconnected nodes to it!", self::LOST_N_FOUND);
 					}
 					else
 					{
-						$msgs[] = lang('Successful created new directory %1 for unconnected nods.',self::LOST_N_FOUND);
+						$msgs[] = lang('Successful created new directory %1 for unconnected nods.', self::LOST_N_FOUND);
 					}
 					Vfs::$is_root = false;
 					if (!$lostnfound) break;
@@ -359,7 +358,7 @@ 
 		}
 		if ($check_only && $msgs)
 		{
-			$msgs[] = lang('Unconnected nodes will be moved to %1.',self::LOST_N_FOUND);
+			$msgs[] = lang('Unconnected nodes will be moved to %1.', self::LOST_N_FOUND);
 		}
 		return $msgs;
 	}
@@ -372,20 +371,20 @@ 
 	 * @param boolean $check_only =true
 	 * @return array with messages / found problems
 	 */
-	private static function fsck_fix_multiple_active($check_only=true)
+	private static function fsck_fix_multiple_active($check_only = true)
 	{
 		$stmt = $inactivate_msg_added = null;
 		$msgs = array();
-		foreach(self::$pdo->query('SELECT fs_dir,fs_name,COUNT(*) FROM '.self::TABLE.
+		foreach (self::$pdo->query('SELECT fs_dir,fs_name,COUNT(*) FROM '.self::TABLE.
 			' WHERE fs_active='.self::_pdo_boolean(true)." OR fs_mime='httpd/unix-directory'".
-			' GROUP BY fs_dir,'.(self::$pdo_type == 'mysql' ? 'BINARY ' : '').'fs_name'.	// fs_name is casesensitive!
+			' GROUP BY fs_dir,'.(self::$pdo_type == 'mysql' ? 'BINARY ' : '').'fs_name'.// fs_name is casesensitive!
 			' HAVING COUNT(*) > 1') as $row)
 		{
 			if (!isset($stmt))
 			{
 				$stmt = self::$pdo->prepare('SELECT *,(SELECT COUNT(*) FROM '.self::TABLE.' sub WHERE sub.fs_dir=fs.fs_id) AS children'.
 					' FROM '.self::TABLE.' fs'.
-					' WHERE fs.fs_dir=:fs_dir AND (fs.fs_active='.self::_pdo_boolean(true)." OR fs_mime='httpd/unix-directory')" .
+					' WHERE fs.fs_dir=:fs_dir AND (fs.fs_active='.self::_pdo_boolean(true)." OR fs_mime='httpd/unix-directory')".
 					' AND fs.fs_name'.self::$case_sensitive_equal.':fs_name'.
 					" ORDER BY fs.fs_mime='httpd/unix-directory' DESC,fs.fs_active DESC,children DESC,fs.fs_modified DESC");
 				$inactivate_stmt = self::$pdo->prepare('UPDATE '.self::TABLE.
@@ -399,14 +398,14 @@ 
 				'fs_dir'  => $row['fs_dir'],
 				'fs_name' => $row['fs_name'],
 			));
-			foreach($stmt as $n => $entry)
+			foreach ($stmt as $n => $entry)
 			{
 				if ($entry['fs_mime'] == 'httpd/unix-directory')
 				{
 					// by sorting active directores first (fs.fs_active DESC), we make sure active one is kept
 					if (!$n)
 					{
-						$dir = $entry;	// directory to keep
+						$dir = $entry; // directory to keep
 						$msgs[] = lang('%1 directories %2 found!', $row[2], self::id2path($entry['fs_id']));
 						if ($check_only) break;
 					}
@@ -422,7 +421,7 @@ 
 							$dir['children'] += $children;
 						}
 						self::$pdo->query('DELETE FROM '.self::TABLE.' WHERE fs_id='.(int)$entry['fs_id']);
-						$msgs[] = lang('Removed (now) empty directory fs_id=%1',$entry['fs_id']);
+						$msgs[] = lang('Removed (now) empty directory fs_id=%1', $entry['fs_id']);
 					}
 				}
 				elseif (isset($dir))	// file and directory with same name exist!
@@ -438,9 +437,9 @@ 
 					}
 					else
 					{
-						$cnt = ucfirst(lang('none of %1', $row[2]-1));
+						$cnt = ucfirst(lang('none of %1', $row[2] - 1));
 					}
-					$msgs[] = lang('%1 active file(s) with same name as directory inactivated!',$cnt);
+					$msgs[] = lang('%1 active file(s) with same name as directory inactivated!', $cnt);
 					break;
 				}
 				else	// newest file --> set for all other fs_active=false
@@ -456,7 +455,7 @@ 
 					}
 					else
 					{
-						$cnt = lang('none of %1', $row[2]-1);
+						$cnt = lang('none of %1', $row[2] - 1);
 					}
 					$msgs[] = lang('More then one active file %1 found, inactivating %2 older revisions!',
 						self::id2path($entry['fs_id']), $cnt);

Braces +41 added lines, -10 removed lines

@@ -80,22 +80,32 @@ 
 				{
 					throw new Api\Exception\AssertionFailed(__METHOD__."(): fs_id=$fs_id ($fs_name) $bytes bytes copied != size of $fs_size bytes!");
 				}
-				if ($debug) error_log("$fs_id: $fs_name: $bytes bytes copied to fs");
+				if ($debug)
+				{
+					error_log("$fs_id: $fs_name: $bytes bytes copied to fs");
+				}
 				fclose($dest);
 				fclose($content); unset($content);
 
 				++$n;
 			}
-			if (!$n) break;	// just in case nothing is found, statement will execute just fine
+			if (!$n)
+			{
+				break;
+			}
+			// just in case nothing is found, statement will execute just fine
 
 			$stmt->bindValue(':offset', $n, \PDO::PARAM_INT);
 		}
 		unset($row);	// not used, as we access bound variables
 		unset($stmt);
 
-		if ($n)	// delete all content in DB, if there was some AND no error (exception thrown!)
+		if ($n)
+		{
+			// delete all content in DB, if there was some AND no error (exception thrown!)
 		{
 			$query = 'UPDATE '.self::TABLE.' SET fs_content=NULL';
+		}
 			$stmt = self::$pdo->prepare($query);
 			$stmt->execute();
 		}
@@ -122,7 +132,10 @@ 
 			self::fsck_fix_no_content($check_only),
 		) as $check_msgs)
 		{
-			if ($check_msgs) $msgs = array_merge($msgs, $check_msgs);
+			if ($check_msgs)
+			{
+				$msgs = array_merge($msgs, $check_msgs);
+			}
 		}
 
 		foreach (Api\Hooks::process(array(
@@ -130,7 +143,10 @@ 
 			'check_only' => $check_only)
 		) as $app_msgs)
 		{
-			if ($app_msgs) $msgs = array_merge($msgs, $app_msgs);
+			if ($app_msgs)
+			{
+				$msgs = array_merge($msgs, $app_msgs);
+			}
 		}
 		return $msgs;
 	}
@@ -185,11 +201,14 @@ 
 						$ok = false;
 						unset($e);	// ignore exception
 					}
-					if (!$ok)	// can not insert it, try deleting it first
+					if (!$ok)
+					{
+						// can not insert it, try deleting it first
 					{
 						if (!isset($delete_stmt))
 						{
 							$delete_stmt = self::$pdo->prepare('DELETE FROM '.self::TABLE.' WHERE fs_id=:fs_id');
+					}
 						}
 						try {
 							$ok = $delete_stmt->execute(array('fs_id' => $id)) && $stmt->execute($data);
@@ -231,7 +250,10 @@ 
 		if (!$check_only && $msgs)
 		{
 			global $oProc;
-			if (!isset($oProc)) $oProc = new Api\Db\Schema();
+			if (!isset($oProc))
+			{
+				$oProc = new Api\Db\Schema();
+			}
 			// PostgreSQL seems to require to update the sequenz, after manually inserting id's
 			$oProc->UpdateSequence('egw_sqlfs', 'fs_id');
 		}
@@ -337,7 +359,10 @@ 
 						$msgs[] = lang('Successful created new directory %1 for unconnected nods.',self::LOST_N_FOUND);
 					}
 					Vfs::$is_root = false;
-					if (!$lostnfound) break;
+					if (!$lostnfound)
+					{
+						break;
+					}
 				}
 				$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_dir=:fs_dir WHERE fs_id=:fs_id');
 			}
@@ -408,7 +433,10 @@ 
 					{
 						$dir = $entry;	// directory to keep
 						$msgs[] = lang('%1 directories %2 found!', $row[2], self::id2path($entry['fs_id']));
-						if ($check_only) break;
+						if ($check_only)
+						{
+							break;
+						}
 					}
 					else
 					{
@@ -425,7 +453,9 @@ 
 						$msgs[] = lang('Removed (now) empty directory fs_id=%1',$entry['fs_id']);
 					}
 				}
-				elseif (isset($dir))	// file and directory with same name exist!
+				elseif (isset($dir))
+				{
+					// file and directory with same name exist!
 				{
 					if (!$check_only)
 					{
@@ -434,6 +464,7 @@ 
 							'fs_name' => $row['fs_name'],
 							'fs_id'   => $dir['fs_id'],
 						));
+				}
 						$cnt = $inactivate_stmt->rowCount();
 					}
 					else

api/src/WebDAV/Tools/_parse_lockinfo.php

Indentation +203 added lines, -203 removed lines

@@ -43,209 +43,209 @@
  */
 class _parse_lockinfo
 {
-    /**
-     * success state flag
-     *
-     * @var bool
-     * @access public
-     */
-    var $success = false;
-
-    /**
-     * lock type, currently only "write"
-     *
-     * @var string
-     * @access public
-     */
-    var $locktype = "";
-
-    /**
-     * lock scope, "shared" or "exclusive"
-     *
-     * @var string
-     * @access public
-     */
-    var $lockscope = "";
-
-    /**
-     * lock owner information
-     *
-     * @var string
-     * @access public
-     */
-    var $owner = "";
-
-    /**
-     * flag that is set during lock owner read
-     *
-     * @var bool
-     * @access private
-     */
-    var $collect_owner = false;
-
-    /**
-     * constructor
-     *
-     * @param  string  path of stream to read
-     * @access public
-     */
-    function __construct($path)
-    {
-        // we assume success unless problems occur
-        $this->success = true;
-
-        // remember if any input was parsed
-        $had_input = false;
-
-        // open stream
-        $f_in = fopen($path, "r");
-        if (!$f_in) {
-            $this->success = false;
-            return;
-        }
-
-        // create namespace aware parser
-        $xml_parser = xml_parser_create_ns("UTF-8", " ");
-
-        // set tag and data handlers
-        xml_set_element_handler($xml_parser,
-                                array(&$this, "_startElement"),
-                                array(&$this, "_endElement"));
-        xml_set_character_data_handler($xml_parser,
-                                       array(&$this, "_data"));
-
-        // we want a case sensitive parser
-        xml_parser_set_option($xml_parser,
-                              XML_OPTION_CASE_FOLDING, false);
-
-        // parse input
-        while ($this->success && !feof($f_in)) {
-            $line = fgets($f_in);
-            if (is_string($line)) {
-                $had_input = true;
-                $this->success &= xml_parse($xml_parser, $line, false);
-            }
-        }
-
-        // finish parsing
-        if ($had_input) {
-            $this->success &= xml_parse($xml_parser, "", true);
-        }
-
-        // check if required tags where found
-        $this->success &= !empty($this->locktype);
-        $this->success &= !empty($this->lockscope);
-
-        // free parser resource
-        xml_parser_free($xml_parser);
-
-        // close input stream
-        fclose($f_in);
-    }
-
-
-    /**
-     * tag start handler
-     *
-     * @param  resource  parser
-     * @param  string    tag name
-     * @param  array     tag attributes
-     * @return void
-     * @access private
-     */
-    function _startElement($parser, $name, $attrs)
-    {
-        // namespace handling
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-        } else {
-            $ns  = "";
-            $tag = $name;
-        }
-
-
-        if ($this->collect_owner) {
-            // everything within the <owner> tag needs to be collected
-            $ns_short = "";
-            $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
-                    $ns_short = "D:";
-                } else {
-                    $ns_attr = " xmlns='$ns'";
-                }
-            }
-            $this->owner .= "<$ns_short$tag$ns_attr>";
-        } else if ($ns == "DAV:") {
-            // parse only the essential tags
-            switch ($tag) {
-            case "write":
-                $this->locktype = $tag;
-                break;
-            case "exclusive":
-            case "shared":
-                $this->lockscope = $tag;
-                break;
-            case "owner":
-                $this->collect_owner = true;
-                break;
-            }
-        }
-    }
-
-    /**
-     * data handler
-     *
-     * @param  resource  parser
-     * @param  string    data
-     * @return void
-     * @access private
-     */
-    function _data($parser, $data)
-    {
-        // only the <owner> tag has data content
-        if ($this->collect_owner) {
-            $this->owner .= $data;
-        }
-    }
-
-    /**
-     * tag end handler
-     *
-     * @param  resource  parser
-     * @param  string    tag name
-     * @return void
-     * @access private
-     */
-    function _endElement($parser, $name)
-    {
-        // namespace handling
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-        } else {
-            $ns  = "";
-            $tag = $name;
-        }
-
-        // <owner> finished?
-        if (($ns == "DAV:") && ($tag == "owner")) {
-            $this->collect_owner = false;
-        }
-
-        // within <owner> we have to collect everything
-        if ($this->collect_owner) {
-            $ns_short = "";
-            $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
-                    $ns_short = "D:";
-                } else {
-                    $ns_attr = " xmlns='$ns'";
-                }
-            }
-            $this->owner .= "</$ns_short$tag$ns_attr>";
-        }
-    }
+	/**
+	 * success state flag
+	 *
+	 * @var bool
+	 * @access public
+	 */
+	var $success = false;
+
+	/**
+	 * lock type, currently only "write"
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $locktype = "";
+
+	/**
+	 * lock scope, "shared" or "exclusive"
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $lockscope = "";
+
+	/**
+	 * lock owner information
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $owner = "";
+
+	/**
+	 * flag that is set during lock owner read
+	 *
+	 * @var bool
+	 * @access private
+	 */
+	var $collect_owner = false;
+
+	/**
+	 * constructor
+	 *
+	 * @param  string  path of stream to read
+	 * @access public
+	 */
+	function __construct($path)
+	{
+		// we assume success unless problems occur
+		$this->success = true;
+
+		// remember if any input was parsed
+		$had_input = false;
+
+		// open stream
+		$f_in = fopen($path, "r");
+		if (!$f_in) {
+			$this->success = false;
+			return;
+		}
+
+		// create namespace aware parser
+		$xml_parser = xml_parser_create_ns("UTF-8", " ");
+
+		// set tag and data handlers
+		xml_set_element_handler($xml_parser,
+								array(&$this, "_startElement"),
+								array(&$this, "_endElement"));
+		xml_set_character_data_handler($xml_parser,
+									   array(&$this, "_data"));
+
+		// we want a case sensitive parser
+		xml_parser_set_option($xml_parser,
+							  XML_OPTION_CASE_FOLDING, false);
+
+		// parse input
+		while ($this->success && !feof($f_in)) {
+			$line = fgets($f_in);
+			if (is_string($line)) {
+				$had_input = true;
+				$this->success &= xml_parse($xml_parser, $line, false);
+			}
+		}
+
+		// finish parsing
+		if ($had_input) {
+			$this->success &= xml_parse($xml_parser, "", true);
+		}
+
+		// check if required tags where found
+		$this->success &= !empty($this->locktype);
+		$this->success &= !empty($this->lockscope);
+
+		// free parser resource
+		xml_parser_free($xml_parser);
+
+		// close input stream
+		fclose($f_in);
+	}
+
+
+	/**
+	 * tag start handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @param  array     tag attributes
+	 * @return void
+	 * @access private
+	 */
+	function _startElement($parser, $name, $attrs)
+	{
+		// namespace handling
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+		} else {
+			$ns  = "";
+			$tag = $name;
+		}
+
+
+		if ($this->collect_owner) {
+			// everything within the <owner> tag needs to be collected
+			$ns_short = "";
+			$ns_attr  = "";
+			if ($ns) {
+				if ($ns == "DAV:") {
+					$ns_short = "D:";
+				} else {
+					$ns_attr = " xmlns='$ns'";
+				}
+			}
+			$this->owner .= "<$ns_short$tag$ns_attr>";
+		} else if ($ns == "DAV:") {
+			// parse only the essential tags
+			switch ($tag) {
+			case "write":
+				$this->locktype = $tag;
+				break;
+			case "exclusive":
+			case "shared":
+				$this->lockscope = $tag;
+				break;
+			case "owner":
+				$this->collect_owner = true;
+				break;
+			}
+		}
+	}
+
+	/**
+	 * data handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    data
+	 * @return void
+	 * @access private
+	 */
+	function _data($parser, $data)
+	{
+		// only the <owner> tag has data content
+		if ($this->collect_owner) {
+			$this->owner .= $data;
+		}
+	}
+
+	/**
+	 * tag end handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @return void
+	 * @access private
+	 */
+	function _endElement($parser, $name)
+	{
+		// namespace handling
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+		} else {
+			$ns  = "";
+			$tag = $name;
+		}
+
+		// <owner> finished?
+		if (($ns == "DAV:") && ($tag == "owner")) {
+			$this->collect_owner = false;
+		}
+
+		// within <owner> we have to collect everything
+		if ($this->collect_owner) {
+			$ns_short = "";
+			$ns_attr  = "";
+			if ($ns) {
+				if ($ns == "DAV:") {
+					$ns_short = "D:";
+				} else {
+					$ns_attr = " xmlns='$ns'";
+				}
+			}
+			$this->owner .= "</$ns_short$tag$ns_attr>";
+		}
+	}
 }
 
 ?>

Switch Indentation +10 added lines, -10 removed lines

@@ -179,16 +179,16 @@
         } else if ($ns == "DAV:") {
             // parse only the essential tags
             switch ($tag) {
-            case "write":
-                $this->locktype = $tag;
-                break;
-            case "exclusive":
-            case "shared":
-                $this->lockscope = $tag;
-                break;
-            case "owner":
-                $this->collect_owner = true;
-                break;
+            	case "write":
+                	$this->locktype = $tag;
+                	break;
+            	case "exclusive":
+            	case "shared":
+                	$this->lockscope = $tag;
+                	break;
+            	case "owner":
+                	$this->collect_owner = true;
+                	break;
             }
         }
     }

Doc Comments +1 added lines

@@ -95,6 +95,7 @@
      *
      * @param  string  path of input stream
      * @param boolean $store_request =false if true whole request data will be made available in $this->request
+     * @param string $path
      * @access public
      */
     function __construct($path, $store_request=false)

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'";
                 }
             }

api/src/WebDAV/Tools/_parse_propfind.php

Indentation +207 added lines, -207 removed lines

@@ -42,244 +42,244 @@
  */
 class _parse_propfind
 {
-    /**
-     * success state flag
-     *
-     * @var bool
-     * @access public
-     */
-    var $success = false;
+	/**
+	 * success state flag
+	 *
+	 * @var bool
+	 * @access public
+	 */
+	var $success = false;
 
-    /**
-     * found properties are collected here
-     *
-     * @var array
-     * @access public
-     */
-    var $props = false;
+	/**
+	 * found properties are collected here
+	 *
+	 * @var array
+	 * @access public
+	 */
+	var $props = false;
 
-    /**
-     * found (CalDAV) filters are collected here
-     *
-     * @var array
-     * @access public
-     */
-    var $filters = false;
+	/**
+	 * found (CalDAV) filters are collected here
+	 *
+	 * @var array
+	 * @access public
+	 */
+	var $filters = false;
 
-    /**
-     * found other tags, eg. CalDAV calendar-multiget href's
-     *
-     * @var array
-     * @access public
-     */
-    var $other = false;
+	/**
+	 * found other tags, eg. CalDAV calendar-multiget href's
+	 *
+	 * @var array
+	 * @access public
+	 */
+	var $other = false;
 
-    /**
-     * what we are currently parsing: props or filters
-     *
-     * @var array
-     * @access private
-     */
-    var $use = 'props';
+	/**
+	 * what we are currently parsing: props or filters
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $use = 'props';
 
-    /**
-     * Root tag, usually 'propfind' for PROPFIND, but can be eg. 'calendar-query' or 'calendar-multiget' for CalDAV REPORT
-     *
-     * @var array with keys 'name' and 'ns'
-     */
-    var $root;
+	/**
+	 * Root tag, usually 'propfind' for PROPFIND, but can be eg. 'calendar-query' or 'calendar-multiget' for CalDAV REPORT
+	 *
+	 * @var array with keys 'name' and 'ns'
+	 */
+	var $root;
 
-    /**
-     * internal tag nesting depth counter
-     *
-     * @var int
-     * @access private
-     */
-    var $depth = 0;
+	/**
+	 * internal tag nesting depth counter
+	 *
+	 * @var int
+	 * @access private
+	 */
+	var $depth = 0;
 
-    /**
-     * On return whole request, if $store_request == true was specified in constructor
-     *
-     * @var string
-     */
-    var $request;
+	/**
+	 * On return whole request, if $store_request == true was specified in constructor
+	 *
+	 * @var string
+	 */
+	var $request;
 
-    /**
-     * constructor
-     *
-     * @access public
-     * @param string $path
-     * @param boolean $store_request =false if true whole request data will be made available in $this->request
-     */
-    function __construct($path, $store_request=false)
-    {
-        // success state flag
-        $this->success = true;
+	/**
+	 * constructor
+	 *
+	 * @access public
+	 * @param string $path
+	 * @param boolean $store_request =false if true whole request data will be made available in $this->request
+	 */
+	function __construct($path, $store_request=false)
+	{
+		// success state flag
+		$this->success = true;
 
-        // property storage array
-        $this->props = array();
+		// property storage array
+		$this->props = array();
 
-        // internal tag depth counter
-        $this->depth = 0;
+		// internal tag depth counter
+		$this->depth = 0;
 
-        // remember if any input was parsed
-        $had_input = false;
+		// remember if any input was parsed
+		$had_input = false;
 
-        // open input stream
-        $f_in = fopen($path, "r");
-        if (!$f_in) {
-            $this->success = false;
-            return;
-        }
+		// open input stream
+		$f_in = fopen($path, "r");
+		if (!$f_in) {
+			$this->success = false;
+			return;
+		}
 
-        // create XML parser
-        $xml_parser = xml_parser_create_ns("UTF-8", " ");
+		// create XML parser
+		$xml_parser = xml_parser_create_ns("UTF-8", " ");
 
-        // set tag and data handlers
-        xml_set_element_handler($xml_parser,
-                                array(&$this, "_startElement"),
-                                array(&$this, "_endElement"));
+		// set tag and data handlers
+		xml_set_element_handler($xml_parser,
+								array(&$this, "_startElement"),
+								array(&$this, "_endElement"));
 
 		xml_set_character_data_handler($xml_parser,
-            array(&$this,'_charData')
-        );
+			array(&$this,'_charData')
+		);
 
-        // we want a case sensitive parser
-        xml_parser_set_option($xml_parser,
-                              XML_OPTION_CASE_FOLDING, false);
+		// we want a case sensitive parser
+		xml_parser_set_option($xml_parser,
+							  XML_OPTION_CASE_FOLDING, false);
 
-        // parse input
-        while ($this->success && !feof($f_in)) {
-            $line = fgets($f_in);
-            if ($store_request) $this->request .= $line;
-            if (is_string($line)) {
-                $had_input = true;
-                $this->success &= xml_parse($xml_parser, $line, false);
-            }
-        }
+		// parse input
+		while ($this->success && !feof($f_in)) {
+			$line = fgets($f_in);
+			if ($store_request) $this->request .= $line;
+			if (is_string($line)) {
+				$had_input = true;
+				$this->success &= xml_parse($xml_parser, $line, false);
+			}
+		}
 
-        // finish parsing
-        if ($had_input) {
-            $this->success &= xml_parse($xml_parser, "", true);
-        }
+		// finish parsing
+		if ($had_input) {
+			$this->success &= xml_parse($xml_parser, "", true);
+		}
 
-        // free parser
-        xml_parser_free($xml_parser);
+		// free parser
+		xml_parser_free($xml_parser);
 
-        // close input stream
-        fclose($f_in);
+		// close input stream
+		fclose($f_in);
 
-        // if no input was parsed it was a request
-        if(!count($this->props)) $this->props = "all"; // default
-    }
+		// if no input was parsed it was a request
+		if(!count($this->props)) $this->props = "all"; // default
+	}
 
 
-    /**
-     * start tag handler
-     *
-     * @access private
-     * @param  resource  parser
-     * @param  string    tag name
-     * @param  array     tag attributes
-     */
-    function _startElement($parser, $name, $attrs)
-    {
-        // name space handling
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-            if ($ns == "")
-                $this->success = false;
-        } else {
-            $ns  = "";
-            $tag = $name;
-        }
+	/**
+	 * start tag handler
+	 *
+	 * @access private
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @param  array     tag attributes
+	 */
+	function _startElement($parser, $name, $attrs)
+	{
+		// name space handling
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+			if ($ns == "")
+				$this->success = false;
+		} else {
+			$ns  = "";
+			$tag = $name;
+		}
 
-        // record root tag
-        if ($this->depth == 0) {
-        	$this->root = array('name' => $tag, 'xmlns' => $ns, 'attrs' => $attrs);
-        }
-        // special tags at level 1: <allprop> and <propname>
-        if ($this->depth == 1) {
-         	$this->use = 'props';
-            switch ($tag)
-            {
-            	case "allprop":
-                	$this->props = "all";
+		// record root tag
+		if ($this->depth == 0) {
+			$this->root = array('name' => $tag, 'xmlns' => $ns, 'attrs' => $attrs);
+		}
+		// special tags at level 1: <allprop> and <propname>
+		if ($this->depth == 1) {
+		 	$this->use = 'props';
+			switch ($tag)
+			{
+				case "allprop":
+					$this->props = "all";
 					break;
-            	case "propname":
-               		$this->props = "names";
-               		break;
-            	case 'prop':
-           			break;
-            	case 'filter':
-            		$this->use = 'filters';
-            		$this->filters['attrs'] = $attrs;	// need attrs eg. <filters test="(anyof|alloff)">
-            		break;
-            	default:
-            		$this->use = 'other';
-            		break;
-            }
-        }
+				case "propname":
+			   		$this->props = "names";
+			   		break;
+				case 'prop':
+		   			break;
+				case 'filter':
+					$this->use = 'filters';
+					$this->filters['attrs'] = $attrs;	// need attrs eg. <filters test="(anyof|alloff)">
+					break;
+				default:
+					$this->use = 'other';
+					break;
+			}
+		}
 		//echo "$this->depth: use=$this->use $ns:$tag attrs=".array2string($attrs)."\n";
 
-        // requested properties are found at level 2
-        // CalDAV filters can be at deeper levels too and we need the attrs, same for other tags (eg. multiget href's)
-        if ($this->depth == 2 || $this->use == 'filters' && $this->depth >= 2 || $this->use == 'other' ||
-        	$this->use == 'props' && $this->depth >= 2) {
-            $prop = array("name" => $tag);
-            if ($ns)
-                $prop["xmlns"] = $ns;
-            if ($this->use != 'props' || $this->depth > 2) {
-            	$prop['attrs'] = $attrs;
-            	$prop['depth'] = $this->depth;
-            }
-            // collect sub-elements of props in the original props children attribute
-            // eg. required for CalDAV <calendar-data><expand start="..." end="..."/></calendar-data>
-            if ($this->use == 'props' && $this->depth > 2)
-            {
-            	$this->last_prop['children'][$tag] = $prop;
-            }
-            else
-            {
-	         	// this can happen if we have allprop and prop in one propfind:
-	        	// <allprop /><prop><blah /></prop>, eg. blah is not automatic returned by allprop
-	            if (!is_array($this->{$this->use}) && $this->{$this->use}) $this->{$this->use} = array($this->{$this->use});
-	            $this->{$this->use}[] =& $prop;
-	            $this->last_prop =& $prop;
-	            unset($prop);
-            }
-        }
+		// requested properties are found at level 2
+		// CalDAV filters can be at deeper levels too and we need the attrs, same for other tags (eg. multiget href's)
+		if ($this->depth == 2 || $this->use == 'filters' && $this->depth >= 2 || $this->use == 'other' ||
+			$this->use == 'props' && $this->depth >= 2) {
+			$prop = array("name" => $tag);
+			if ($ns)
+				$prop["xmlns"] = $ns;
+			if ($this->use != 'props' || $this->depth > 2) {
+				$prop['attrs'] = $attrs;
+				$prop['depth'] = $this->depth;
+			}
+			// collect sub-elements of props in the original props children attribute
+			// eg. required for CalDAV <calendar-data><expand start="..." end="..."/></calendar-data>
+			if ($this->use == 'props' && $this->depth > 2)
+			{
+				$this->last_prop['children'][$tag] = $prop;
+			}
+			else
+			{
+			 	// this can happen if we have allprop and prop in one propfind:
+				// <allprop /><prop><blah /></prop>, eg. blah is not automatic returned by allprop
+				if (!is_array($this->{$this->use}) && $this->{$this->use}) $this->{$this->use} = array($this->{$this->use});
+				$this->{$this->use}[] =& $prop;
+				$this->last_prop =& $prop;
+				unset($prop);
+			}
+		}
 
-        // increment depth count
-        $this->depth++;
-    }
+		// increment depth count
+		$this->depth++;
+	}
 
 
-    /**
-     * end tag handler
-     *
-     * @access private
-     * @param  resource  parser
-     * @param  string    tag name
-     */
-    function _endElement($parser, $name)
-    {
-        // here we only need to decrement the depth count
-        $this->depth--;
-    }
+	/**
+	 * end tag handler
+	 *
+	 * @access private
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 */
+	function _endElement($parser, $name)
+	{
+		// here we only need to decrement the depth count
+		$this->depth--;
+	}
 
 
-    /**
-     * char data handler for non prop tags, eg. href's in CalDAV multiget, or filter contents
-     *
-     * @access private
-     * @param  resource  parser
-     * @param  string    character data
-     */
-    function _charData($parser, $data)
-    {
-        if ($this->use != 'props' && ($n = count($this->{$this->use})) && ($data = trim($data))) {
-        	$this->{$this->use}[$n-1]['data'] = $data;
-        }
-    }
+	/**
+	 * char data handler for non prop tags, eg. href's in CalDAV multiget, or filter contents
+	 *
+	 * @access private
+	 * @param  resource  parser
+	 * @param  string    character data
+	 */
+	function _charData($parser, $data)
+	{
+		if ($this->use != 'props' && ($n = count($this->{$this->use})) && ($data = trim($data))) {
+			$this->{$this->use}[$n-1]['data'] = $data;
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -111,7 +111,7 @@ 
      * @param string $path
      * @param boolean $store_request =false if true whole request data will be made available in $this->request
      */
-    function __construct($path, $store_request=false)
+    function __construct($path, $store_request = false)
     {
         // success state flag
         $this->success = true;
@@ -141,7 +141,7 @@ 
                                 array(&$this, "_endElement"));
 
 		xml_set_character_data_handler($xml_parser,
-            array(&$this,'_charData')
+            array(&$this, '_charData')
         );
 
         // we want a case sensitive parser
@@ -170,7 +170,7 @@ 
         fclose($f_in);
 
         // if no input was parsed it was a request
-        if(!count($this->props)) $this->props = "all"; // default
+        if (!count($this->props)) $this->props = "all"; // default
     }
 
 
@@ -213,7 +213,7 @@ 
            			break;
             	case 'filter':
             		$this->use = 'filters';
-            		$this->filters['attrs'] = $attrs;	// need attrs eg. <filters test="(anyof|alloff)">
+            		$this->filters['attrs'] = $attrs; // need attrs eg. <filters test="(anyof|alloff)">
             		break;
             	default:
             		$this->use = 'other';
@@ -244,8 +244,8 @@ 
 	         	// this can happen if we have allprop and prop in one propfind:
 	        	// <allprop /><prop><blah /></prop>, eg. blah is not automatic returned by allprop
 	            if (!is_array($this->{$this->use}) && $this->{$this->use}) $this->{$this->use} = array($this->{$this->use});
-	            $this->{$this->use}[] =& $prop;
-	            $this->last_prop =& $prop;
+	            $this->{$this->use}[] = & $prop;
+	            $this->last_prop = & $prop;
 	            unset($prop);
             }
         }
@@ -279,7 +279,7 @@ 
     function _charData($parser, $data)
     {
         if ($this->use != 'props' && ($n = count($this->{$this->use})) && ($data = trim($data))) {
-        	$this->{$this->use}[$n-1]['data'] = $data;
+        	$this->{$this->use}[$n - 1]['data'] = $data;
         }
     }
 }

Braces +42 added lines, -16 removed lines

@@ -127,7 +127,8 @@ 
 
         // open input stream
         $f_in = fopen($path, "r");
-        if (!$f_in) {
+        if (!$f_in)
+        {
             $this->success = false;
             return;
         }
@@ -149,17 +150,23 @@ 
                               XML_OPTION_CASE_FOLDING, false);
 
         // parse input
-        while ($this->success && !feof($f_in)) {
+        while ($this->success && !feof($f_in))
+        {
             $line = fgets($f_in);
-            if ($store_request) $this->request .= $line;
-            if (is_string($line)) {
+            if ($store_request)
+            {
+            	$this->request .= $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);
         }
 
@@ -170,7 +177,11 @@ 
         fclose($f_in);
 
         // if no input was parsed it was a request
-        if(!count($this->props)) $this->props = "all"; // default
+        if(!count($this->props))
+        {
+        	$this->props = "all";
+        }
+        // default
     }
 
 
@@ -185,21 +196,28 @@ 
     function _startElement($parser, $name, $attrs)
     {
         // name space handling
-        if (strstr($name, " ")) {
+        if (strstr($name, " "))
+        {
             list($ns, $tag) = explode(" ", $name);
             if ($ns == "")
-                $this->success = false;
-        } else {
+            {
+                            $this->success = false;
+            }
+        }
+        else
+        {
             $ns  = "";
             $tag = $name;
         }
 
         // record root tag
-        if ($this->depth == 0) {
+        if ($this->depth == 0)
+        {
         	$this->root = array('name' => $tag, 'xmlns' => $ns, 'attrs' => $attrs);
         }
         // special tags at level 1: <allprop> and <propname>
-        if ($this->depth == 1) {
+        if ($this->depth == 1)
+        {
          	$this->use = 'props';
             switch ($tag)
             {
@@ -225,11 +243,15 @@ 
         // requested properties are found at level 2
         // CalDAV filters can be at deeper levels too and we need the attrs, same for other tags (eg. multiget href's)
         if ($this->depth == 2 || $this->use == 'filters' && $this->depth >= 2 || $this->use == 'other' ||
-        	$this->use == 'props' && $this->depth >= 2) {
+        	$this->use == 'props' && $this->depth >= 2)
+        {
             $prop = array("name" => $tag);
             if ($ns)
-                $prop["xmlns"] = $ns;
-            if ($this->use != 'props' || $this->depth > 2) {
+            {
+                            $prop["xmlns"] = $ns;
+            }
+            if ($this->use != 'props' || $this->depth > 2)
+            {
             	$prop['attrs'] = $attrs;
             	$prop['depth'] = $this->depth;
             }
@@ -243,7 +265,10 @@ 
             {
 	         	// this can happen if we have allprop and prop in one propfind:
 	        	// <allprop /><prop><blah /></prop>, eg. blah is not automatic returned by allprop
-	            if (!is_array($this->{$this->use}) && $this->{$this->use}) $this->{$this->use} = array($this->{$this->use});
+	            if (!is_array($this->{$this->use}) && $this->{$this->use})
+	            {
+	            	$this->{$this->use} = array($this->{$this->use});
+	            }
 	            $this->{$this->use}[] =& $prop;
 	            $this->last_prop =& $prop;
 	            unset($prop);
@@ -278,7 +303,8 @@ 
      */
     function _charData($parser, $data)
     {
-        if ($this->use != 'props' && ($n = count($this->{$this->use})) && ($data = trim($data))) {
+        if ($this->use != 'props' && ($n = count($this->{$this->use})) && ($data = trim($data)))
+        {
         	$this->{$this->use}[$n-1]['data'] = $data;
         }
     }

api/src/Header/UserAgent.php

Spacing +6 added lines, -6 removed lines

@@ -76,11 +76,11 @@ 
 	{
 		// should be Ok for all HTML 4 compatible browsers
 		$parts = $all_parts = null;
-		if(!preg_match('/compatible; ([a-z]+)[\/ ]+([0-9.]+)/i',$_SERVER['HTTP_USER_AGENT'],$parts))
+		if (!preg_match('/compatible; ([a-z]+)[\/ ]+([0-9.]+)/i', $_SERVER['HTTP_USER_AGENT'], $parts))
 		{
-			preg_match_all('/([a-z]+)\/([0-9.]+)/i',$_SERVER['HTTP_USER_AGENT'],$all_parts,PREG_SET_ORDER);
+			preg_match_all('/([a-z]+)\/([0-9.]+)/i', $_SERVER['HTTP_USER_AGENT'], $all_parts, PREG_SET_ORDER);
 			$parts = array_pop($all_parts);
-			foreach($all_parts as $p)
+			foreach ($all_parts as $p)
 			{
 				if ($p[1] == 'Chrome' && $parts[1] != 'Edge')
 				{
@@ -89,12 +89,12 @@ 
 				}
 			}
 		}
-		list(,self::$user_agent,self::$ua_version) = $parts;
+		list(,self::$user_agent, self::$ua_version) = $parts;
 		if ((self::$user_agent = strtolower(self::$user_agent)) == 'version') self::$user_agent = 'opera';
 		// IE no longer reports MSIE, but "Trident/7.0; rv:11.0"
-		if (self::$user_agent=='trident')
+		if (self::$user_agent == 'trident')
 		{
-			self::$user_agent='msie';
+			self::$user_agent = 'msie';
 			$matches = null;
 			self::$ua_version = preg_match('|Trident/[0-9.]+; rv:([0-9.]+)|i', $_SERVER['HTTP_USER_AGENT'], $matches) ?
 				$matches[1] : 11.0;

Braces +4 added lines, -1 removed lines

@@ -90,7 +90,10 @@
 			}
 		}
 		list(,self::$user_agent,self::$ua_version) = $parts;
-		if ((self::$user_agent = strtolower(self::$user_agent)) == 'version') self::$user_agent = 'opera';
+		if ((self::$user_agent = strtolower(self::$user_agent)) == 'version')
+		{
+			self::$user_agent = 'opera';
+		}
 		// IE no longer reports MSIE, but "Trident/7.0; rv:11.0"
 		if (self::$user_agent=='trident')
 		{

api/src/Header/Content.php

Spacing +13 added lines, -13 removed lines

@@ -38,7 +38,7 @@ 
 	 * @param boolean $force_download =true send content-disposition attachment header
 	 * @param boolean $no_content_type =false do not send actual content-type and content-length header, just content-disposition
 	 */
-	public static function safe(&$content, $path, &$mime='', &$length=0, $nocache=true, $force_download=true, $no_content_type=false)
+	public static function safe(&$content, $path, &$mime = '', &$length = 0, $nocache = true, $force_download = true, $no_content_type = false)
 	{
 		// change old/aliased mime-types to new one, eg. image/pdf to application/pdf
 		$mime = Api\MimeMagic::fix_mime_type($mime);
@@ -53,7 +53,7 @@ 
 			if (UserAgent::type() == 'chrome' || UserAgent::type() == 'msie' && UserAgent::version() >= 8)
 			{
 				$mime = 'text/plain';
-				header('X-Content-Type-Options: nosniff');	// stop IE & Chrome from content-type sniffing
+				header('X-Content-Type-Options: nosniff'); // stop IE & Chrome from content-type sniffing
 			}
 			// for the rest we change mime-type to text/html and let code below handle it safely
 			// this stops Safari and Firefox from using it as src attribute in a script tag
@@ -65,7 +65,7 @@ 
 				{
 					$data = fread($content, $length);
 					fclose($content);
-					$content =& $data;
+					$content = & $data;
 					unset($data);
 				}
 				$content = '<pre>'.$content;
@@ -79,12 +79,12 @@ 
 			if (UserAgent::type() == 'chrome' && UserAgent::version() >= 24 ||
 				// mobile FF 24 on Android does NOT honor CSP!
 				UserAgent::type() == 'firefox' && !UserAgent::mobile() && UserAgent::version() >= 24 ||
-				UserAgent::type() == 'safari' && !UserAgent::mobile() && UserAgent::version() >= 536 ||	// OS X
+				UserAgent::type() == 'safari' && !UserAgent::mobile() && UserAgent::version() >= 536 || // OS X
 				UserAgent::type() == 'safari' && UserAgent::mobile() && UserAgent::version() >= 9537)	// iOS 7
 			{
-				$csp = "script-src 'none'";	// forbid to execute any javascript
+				$csp = "script-src 'none'"; // forbid to execute any javascript
 				header("Content-Security-Policy: $csp");
-				header("X-Webkit-CSP: $csp");	// Chrome: <= 24, Safari incl. iOS
+				header("X-Webkit-CSP: $csp"); // Chrome: <= 24, Safari incl. iOS
 				//header("X-Content-Security-Policy: $csp");	// FF <= 22
 				//error_log(__METHOD__."('$options[path]') ".UserAgent::type().'/'.UserAgent::version().(UserAgent::mobile()?'/mobile':'').": using Content-Security-Policy: $csp");
 			}
@@ -117,25 +117,25 @@ 
 	 * @param boolean $nocache =true send headers to disallow browser/proxies to cache the download
 	 * @param boolean $forceDownload =true send headers to handle as attachment/download
 	 */
-	public static function type($fn,$mime='',$length=0,$nocache=True,$forceDownload=true)
+	public static function type($fn, $mime = '', $length = 0, $nocache = True, $forceDownload = true)
 	{
 		// if no mime-type is given or it's the default binary-type, guess it from the extension
-		if(empty($mime) || $mime == 'application/octet-stream')
+		if (empty($mime) || $mime == 'application/octet-stream')
 		{
 			$mime = Api\MimeMagic::filename2mime($fn);
 		}
-		if($fn)
+		if ($fn)
 		{
 			// Show this for all
-			self::disposition($fn,$forceDownload);
+			self::disposition($fn, $forceDownload);
 			header('Content-type: '.$mime);
 
-			if($length)
+			if ($length)
 			{
 				header('Content-length: '.$length);
 			}
 
-			if($nocache)
+			if ($nocache)
 			{
 				header('Pragma: no-cache');
 				header('Pragma: public');
@@ -151,7 +151,7 @@ 
 	 * @param string $fn filename
 	 * @param boolean $forceDownload =true send headers to handle as attachment/download
 	 */
-	public static function disposition($fn, $forceDownload=true)
+	public static function disposition($fn, $forceDownload = true)
 	{
 		if ($forceDownload)
 		{

Braces +10 added lines, -3 removed lines

@@ -80,9 +80,13 @@ 
 				// mobile FF 24 on Android does NOT honor CSP!
 				UserAgent::type() == 'firefox' && !UserAgent::mobile() && UserAgent::version() >= 24 ||
 				UserAgent::type() == 'safari' && !UserAgent::mobile() && UserAgent::version() >= 536 ||	// OS X
-				UserAgent::type() == 'safari' && UserAgent::mobile() && UserAgent::version() >= 9537)	// iOS 7
+				UserAgent::type() == 'safari' && UserAgent::mobile() && UserAgent::version() >= 9537)
 			{
-				$csp = "script-src 'none'";	// forbid to execute any javascript
+				// iOS 7
+			{
+				$csp = "script-src 'none'";
+			}
+			// forbid to execute any javascript
 				header("Content-Security-Policy: $csp");
 				header("X-Webkit-CSP: $csp");	// Chrome: <= 24, Safari incl. iOS
 				//header("X-Content-Security-Policy: $csp");	// FF <= 22
@@ -96,7 +100,10 @@ 
 		}
 		if ($no_content_type)
 		{
-			if ($force_download) self::disposition(Api\Vfs::basename($path), $force_download);
+			if ($force_download)
+			{
+				self::disposition(Api\Vfs::basename($path), $force_download);
+			}
 		}
 		else
 		{

api/src/Header/Referer.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 	 * @return string
 	 * @todo get "real" referer for jDots template
 	 */
-	static function get($default='',$referer='')
+	static function get($default = '', $referer = '')
 	{
 		// HTTP_REFERER seems NOT to get urldecoded
 		if (!$referer) $referer = urldecode($_SERVER['HTTP_REFERER']);
@@ -34,11 +34,11 @@ 
 		$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
 		if (empty($webserver_url) || $webserver_url{0} == '/')	// url is just a path
 		{
-			$referer = preg_replace('/^https?:\/\/[^\/]+/','',$referer);	// removing the domain part
+			$referer = preg_replace('/^https?:\/\/[^\/]+/', '', $referer); // removing the domain part
 		}
 		if (strlen($webserver_url) > 1)
 		{
-			list(,$referer) = explode($webserver_url,$referer,2);
+			list(,$referer) = explode($webserver_url, $referer, 2);
 		}
 		$ret = str_replace('/etemplate/process_exec.php', '/index.php', $referer);
 

Braces +14 added lines, -4 removed lines

@@ -29,12 +29,19 @@ 
 	static function get($default='',$referer='')
 	{
 		// HTTP_REFERER seems NOT to get urldecoded
-		if (!$referer) $referer = urldecode($_SERVER['HTTP_REFERER']);
+		if (!$referer)
+		{
+			$referer = urldecode($_SERVER['HTTP_REFERER']);
+		}
 
 		$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
-		if (empty($webserver_url) || $webserver_url{0} == '/')	// url is just a path
+		if (empty($webserver_url) || $webserver_url{0} == '/')
+		{
+			// url is just a path
 		{
-			$referer = preg_replace('/^https?:\/\/[^\/]+/','',$referer);	// removing the domain part
+			$referer = preg_replace('/^https?:\/\/[^\/]+/','',$referer);
+		}
+		// removing the domain part
 		}
 		if (strlen($webserver_url) > 1)
 		{
@@ -42,7 +49,10 @@ 
 		}
 		$ret = str_replace('/etemplate/process_exec.php', '/index.php', $referer);
 
-		if (empty($ret) || strpos($ret, 'cd=yes') !== false) $ret = $default;
+		if (empty($ret) || strpos($ret, 'cd=yes') !== false)
+		{
+			$ret = $default;
+		}
 
 		return $ret;
 	}

api/src/Etemplate/Widget/Entry.php

Spacing +8 added lines, -8 removed lines

@@ -60,7 +60,7 @@ 
 	 *
 	 * @param string $cname
 	 */
-	public function beforeSendToClient($cname, array $expand=array())
+	public function beforeSendToClient($cname, array $expand = array())
 	{
 		$attrs = $this->attrs;
 
@@ -68,14 +68,14 @@ 
 		$attrs['id'] = $this->id;
 
 		$form_name = self::form_name($cname, $this->id);
-		$data_id = $attrs['value'] ? self::form_name($cname, $attrs['value']) : self::form_name($cname, self::ID_PREFIX . $this->id);
+		$data_id = $attrs['value'] ? self::form_name($cname, $attrs['value']) : self::form_name($cname, self::ID_PREFIX.$this->id);
 
 		// No need to proceed
-		if(!$data_id) return;
+		if (!$data_id) return;
 
 		// Find out which record to load
 		$value = self::get_array(self::$request->content, $form_name, false, true);
-		if(!$value)
+		if (!$value)
 		{
 			// Try here...  legacy / fallback / just make it work
 			$value = self::get_array(self::$request->content, $data_id, true, false);
@@ -85,23 +85,23 @@ 
 		{
 			// Get the record itself
 			$data = self::get_array(self::$request->content, $data_id, true, false);
-			if(!$data)
+			if (!$data)
 			{
 				$data = static::get_entry($value, $attrs);
 			}
 		}
 
 		// Set the new value so transformer can find it.  Use prefix to avoid changing the original value
-		$new_value =& self::get_array(self::$request->content, self::ID_PREFIX .$this->id, true, false);
+		$new_value = & self::get_array(self::$request->content, self::ID_PREFIX.$this->id, true, false);
 		if (true) $new_value = $data;
-		$this->id = self::ID_PREFIX . $this->id . "[{$attrs['field']}]";
+		$this->id = self::ID_PREFIX.$this->id."[{$attrs['field']}]";
 
 		$old_type = self::getElementAttribute($this->id, 'type');
 
 		parent::beforeSendToClient($cname, $expand);
 
 		// Check for conflict - more than one with same id/field and different type
-		if($old_type && $old_type != $this->type)
+		if ($old_type && $old_type != $this->type)
 		{
 			//self::set_validation_error($this->id, lang('%1, duplicate ID', $this));
 		}

Braces +8 added lines, -2 removed lines

@@ -71,7 +71,10 @@ 
 		$data_id = $attrs['value'] ? self::form_name($cname, $attrs['value']) : self::form_name($cname, self::ID_PREFIX . $this->id);
 
 		// No need to proceed
-		if(!$data_id) return;
+		if(!$data_id)
+		{
+			return;
+		}
 
 		// Find out which record to load
 		$value = self::get_array(self::$request->content, $form_name, false, true);
@@ -93,7 +96,10 @@ 
 
 		// Set the new value so transformer can find it.  Use prefix to avoid changing the original value
 		$new_value =& self::get_array(self::$request->content, self::ID_PREFIX .$this->id, true, false);
-		if (true) $new_value = $data;
+		if (true)
+		{
+			$new_value = $data;
+		}
 		$this->id = self::ID_PREFIX . $this->id . "[{$attrs['field']}]";
 
 		$old_type = self::getElementAttribute($this->id, 'type');