EGroupware / egroupware

api/src/Contacts/Tracking.php

Spacing +22 added lines, -22 removed lines

@@ -106,17 +106,17 @@ 
 	 * @param array $old =null old/last state of the entry or null for a new entry
 	 * @return mixed
 	 */
-	function get_config($name,$data,$old=null)
+	function get_config($name, $data, $old = null)
 	{
-		unset($old);	// not used, but required by function signature
+		unset($old); // not used, but required by function signature
 
-		switch($name)
+		switch ($name)
 		{
 			case 'copy':
 				if ($data['is_contactform'])
 				{
-					$copy = preg_split('/, ?/',$data['email_contactform']);
-					if  ($data['email_copytoreceiver']) $copy[] = $data['email'];
+					$copy = preg_split('/, ?/', $data['email_contactform']);
+					if ($data['email_copytoreceiver']) $copy[] = $data['email'];
 					return $copy;
 				}
 				break;
@@ -144,27 +144,27 @@ 
 	 * @param array $changed_fields =null changed fields from ealier call to $this->changed_fields($data,$old), to not compute it again
 	 * @return int number of log-entries made
 	 */
-	protected function save_history(array $data,array $old=null,$deleted=null,array $changed_fields=null)
+	protected function save_history(array $data, array $old = null, $deleted = null, array $changed_fields = null)
 	{
 		if (is_null($changed_fields))
 		{
-			$changed_fields = self::changed_fields($data,$old);
+			$changed_fields = self::changed_fields($data, $old);
 		}
 		if (!$changed_fields) return 0;
 
-		foreach(array('adr_one_countryname' => 'adr_one_countrycode', 'adr_two_countryname' => 'adr_two_countrycode') as $name => $code)
+		foreach (array('adr_one_countryname' => 'adr_one_countrycode', 'adr_two_countryname' => 'adr_two_countrycode') as $name => $code)
 		{
 			// Only codes involved, but old text name is automatically added when loaded
-			if($old[$code] && $data[$code] && ($key = array_search($name, $changed_fields)) !== false)
+			if ($old[$code] && $data[$code] && ($key = array_search($name, $changed_fields)) !== false)
 			{
 				unset($changed_fields[$key]);
 				continue;
 			}
 
 			// Code and a text name
-			if(in_array($name, $changed_fields) && in_array($code, $changed_fields))
+			if (in_array($name, $changed_fields) && in_array($code, $changed_fields))
 			{
-				if($data[$code])
+				if ($data[$code])
 				{
 					$data[$name] = Api\Country::get_full_name($data[$code], true);
 				}
@@ -172,7 +172,7 @@ 
 			}
 		}
 		//error_log(__METHOD__.__LINE__.' ChangedFields:'.array2string($changed_fields));
-		return parent::save_history($data,$old,$deleted,$changed_fields);
+		return parent::save_history($data, $old, $deleted, $changed_fields);
 	}
 
 	/**
@@ -183,9 +183,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_message($data,$old,$receiver=null)
+	protected function get_message($data, $old, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
 		if (!$data['modified'] || !$old)
 		{
@@ -207,9 +207,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_subject($data,$old,$deleted=null,$receiver=null)
+	protected function get_subject($data, $old, $deleted = null, $receiver = null)
 	{
-		unset($old, $deleted, $receiver);	// not used, but required by function signature
+		unset($old, $deleted, $receiver); // not used, but required by function signature
 
 		if ($data['is_contactform'])
 		{
@@ -225,15 +225,15 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_details($data,$receiver=null)
+	function get_details($data, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
-		foreach($this->contacts->contact_fields as $name => $label)
+		foreach ($this->contacts->contact_fields as $name => $label)
 		{
 			if (!$data[$name] && $name != 'owner') continue;
 
-			switch($name)
+			switch ($name)
 			{
 				case 'n_prefix': case 'n_given': case 'n_middle': case 'n_family': case 'n_suffix':	// already in n_fn
 				case 'n_fileas': case 'id': case 'tid':
@@ -263,13 +263,13 @@ 
 					if ($data[$name])
 					{
 						$cats = array();
-						foreach(is_array($data[$name]) ? $data[$name] : explode(',',$data[$name]) as $cat_id)
+						foreach (is_array($data[$name]) ? $data[$name] : explode(',', $data[$name]) as $cat_id)
 						{
 							$cats[] = $GLOBALS['egw']->cats->id2name($cat_id);
 						}
 						$details[$name] = array(
 							'label' => $label,
-							'value' => explode(', ',$cats),
+							'value' => explode(', ', $cats),
 						);
 					}
 				case 'note':

api/src/Contacts/Ads.php

Spacing +17 added lines, -18 removed lines

@@ -35,8 +35,8 @@ 
 	 * minimum: $this->columns_to_search = array('n_family','n_given','org_name','email');
 	 */
 	var $search_attributes = array(
-		'n_family','n_middle','n_given','org_name','org_unit',
-		'adr_one_location','note','email','samaccountname',
+		'n_family', 'n_middle', 'n_given', 'org_name', 'org_unit',
+		'adr_one_location', 'note', 'email', 'samaccountname',
 	);
 
 	/**
@@ -50,7 +50,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $dn_attribute='cn';
+	var $dn_attribute = 'cn';
 
 	/**
 	 * Do NOT attempt to change DN (dn-attribute can NOT be part of schemas used in addressbook!)
@@ -82,11 +82,11 @@ 
 	 * @param array $ldap_config =null default use from $GLOBALS['egw_info']['server']
 	 * @param resource $ds =null ldap connection to use
 	 */
-	function __construct(array $ldap_config=null, $ds=null)
+	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'];
+		$this->accountName = $GLOBALS['egw_info']['user']['account_lid'];
 
 		if ($ldap_config)
 		{
@@ -94,7 +94,7 @@ 
 		}
 		else
 		{
-			$this->ldap_config =& $GLOBALS['egw_info']['server'];
+			$this->ldap_config = & $GLOBALS['egw_info']['server'];
 		}
 
 		$this->accounts_ads = $GLOBALS['egw']->accounts->backend;
@@ -119,15 +119,15 @@ 
 			'account_id'	=> 'objectsid',
 			'id'            => 'objectguid',
 			'uid'			=> 'objectguid',
-			'n_fn'          => 'displayname',	// leave CN used in DN untouched
-			'accountexpires', 'useraccountcontrol',	// needed to exclude deactivated or expired accounts
+			'n_fn'          => 'displayname', // leave CN used in DN untouched
+			'accountexpires', 'useraccountcontrol', // needed to exclude deactivated or expired accounts
 		));
 		unset($this->schema2egw['user']['n_fileas']);
 		unset($this->schema2egw['inetorgperson']);
 
-		foreach($this->schema2egw as $attributes)
+		foreach ($this->schema2egw as $attributes)
 		{
-			$this->all_attributes = array_merge($this->all_attributes,array_values($attributes));
+			$this->all_attributes = array_merge($this->all_attributes, array_values($attributes));
 		}
 		$this->all_attributes = array_values(array_unique($this->all_attributes));
 
@@ -139,9 +139,9 @@ 
 	 *
 	 * @param boolean $admin =false true (re-)connect with admin not user credentials, eg. to modify accounts
 	 */
-	function connect($admin=false)
+	function connect($admin = false)
 	{
-		unset($admin);	// not used, but required by function signature
+		unset($admin); // not used, but required by function signature
 
 		$this->ds = $this->accounts_ads->ldap_connection();
 	}
@@ -174,15 +174,14 @@ 
 	function read($_contact_id)
 	{
 		if (is_array($_contact_id) && isset($_contact_id['account_id']) ||
-			!is_array($_contact_id) && substr($_contact_id,0,8) == 'account:')
+			!is_array($_contact_id) && substr($_contact_id, 0, 8) == 'account:')
 		{
-			$account_id = (int)(is_array($_contact_id) ? $_contact_id['account_id'] : substr($_contact_id,8));
+			$account_id = (int)(is_array($_contact_id) ? $_contact_id['account_id'] : substr($_contact_id, 8));
 			$_contact_id = $GLOBALS['egw']->accounts->id2name($account_id, 'person_id');
 		}
-		$contact_id = !is_array($_contact_id) ? $_contact_id :
-			(isset ($_contact_id['id']) ? $_contact_id['id'] : $_contact_id['uid']);
+		$contact_id = !is_array($_contact_id) ? $_contact_id : (isset ($_contact_id['id']) ? $_contact_id['id'] : $_contact_id['uid']);
 
-		$rows = $this->_searchLDAP($this->allContactsDN, $filter=$this->id_filter($contact_id), $this->all_attributes, Ldap::ALL);
+		$rows = $this->_searchLDAP($this->allContactsDN, $filter = $this->id_filter($contact_id), $this->all_attributes, Ldap::ALL);
 		//error_log(__METHOD__."('$contact_id') _searchLDAP($this->allContactsDN, '$filter',...)=".array2string($rows));
 		return $rows ? $rows[0] : false;
 	}

api/src/Contacts/Univention.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 * @param array $keys if given $keys are copied to data before saveing => allows a save as
 	 * @return int 0 on success and errno != 0 else
 	 */
-	function save($keys=null)
+	function save($keys = null)
 	{
 		// UCS lowercases email when storing
 		$keys['email'] = strtolower(!empty($keys['email']) ? $keys['email'] : $this->data['email']);

api/src/Vfs/Dav/Directory.php

Spacing +4 added lines, -4 removed lines

@@ -66,10 +66,10 @@ 
 	function getChild($name)
 	{
 		//error_log(__METHOD__."('$name') this->path=$this->path, this->vfs_path=$this->vfs_path");
-		$path = $this->vfs_path . '/' . $name;
-		$vfs_path = $this->vfs_path . '/' . Vfs::encodePathComponent($name);
+		$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))
 		{
@@ -88,6 +88,6 @@ 
 	 */
 	function getQuotaInfo()
 	{
-		return [ false, false ];
+		return [false, false];
 	}
 }

api/src/WebDAV/Tools/_parse_proppatch.php

Spacing +5 added lines, -5 removed lines

@@ -97,7 +97,7 @@ 
      * @param boolean $store_request =false if true whole request data will be made available in $this->request
      * @access public
      */
-    function __construct($path, $store_request=false)
+    function __construct($path, $store_request = false)
     {
         $this->success = true;
 
@@ -123,7 +123,7 @@ 
         xml_parser_set_option($xml_parser,
                               XML_OPTION_CASE_FOLDING, false);
 
-        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)) {
@@ -132,7 +132,7 @@ 
             }
         }
 
-        if($had_input) {
+        if ($had_input) {
             $this->success &= xml_parse($xml_parser, "", true);
         }
 
@@ -169,7 +169,7 @@ 
             $prop = array("name" => $tag);
             $this->current = array("name" => $tag, "ns" => $ns, "status"=> 200);
             if ($this->mode == "set") {
-                $this->current["val"] = "";     // default set val
+                $this->current["val"] = ""; // default set val
             }
         }
 
@@ -177,7 +177,7 @@ 
             $this->current["val"] .= "<$tag";
             if (isset($attr)) {
                 foreach ($attr as $key => $val) {
-                    $this->current["val"] .= ' '.$key.'="'.str_replace('"','&quot;', $val).'"';
+                    $this->current["val"] .= ' '.$key.'="'.str_replace('"', '&quot;', $val).'"';
                 }
             }
             $this->current["val"] .= ">";

api/src/WebDAV/Tools/_parse_propfind.php

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

api/src/WebDAV/Server/Filesystem.php

Spacing +21 added lines, -21 removed lines

@@ -151,7 +151,7 @@ 
     function PROPFIND(&$options, &$files)
     {
         // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
+        $fspath = $this->base.$options["path"];
 
         // sanity check
         if (!file_exists($fspath)) {
@@ -198,7 +198,7 @@ 
     function fileinfo($path)
     {
         // map URI path to filesystem path
-        $fspath = $this->base . $path;
+        $fspath = $this->base.$path;
 
         // create result array
         $info = array();
@@ -210,11 +210,11 @@ 
         $info["props"][] = $this->mkprop("displayname", strtoupper($path));
 
         // creation and modification time
-        $info["props"][] = $this->mkprop("creationdate",    filectime($fspath));
+        $info["props"][] = $this->mkprop("creationdate", filectime($fspath));
         $info["props"][] = $this->mkprop("getlastmodified", filemtime($fspath));
 
         // Microsoft extensions: last access time and 'hidden' status
-        $info["props"][] = $this->mkprop("lastaccessed",    fileatime($fspath));
+        $info["props"][] = $this->mkprop("lastaccessed", fileatime($fspath));
         $info["props"][] = $this->mkprop("ishidden", ('.' === substr(basename($fspath), 0, 1)));
 
         // type and size (caller already made sure that path exists)
@@ -341,8 +341,8 @@ 
             // so we test the format of the returned string
 
             // the reply begins with the requested filename
-            if (!strncmp($reply, "$fspath: ", strlen($fspath)+2)) {
-                $reply = substr($reply, strlen($fspath)+2);
+            if (!strncmp($reply, "$fspath: ", strlen($fspath) + 2)) {
+                $reply = substr($reply, strlen($fspath) + 2);
                 // followed by the mime type (maybe including options)
                 if (preg_match('|^[[:alnum:]_-]+/[[:alnum:]_-]+;?.*|', $reply, $matches)) {
                     $mime_type = $matches[0];
@@ -392,7 +392,7 @@ 
     function HEAD(&$options)
     {
         // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
+        $fspath = $this->base.$options["path"];
 
         // sanity check
         if (!file_exists($fspath)) return false;
@@ -421,7 +421,7 @@ 
     function GET(&$options)
     {
         // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
+        $fspath = $this->base.$options["path"];
 
         // is this a collection?
         if (is_dir($fspath)) {
@@ -504,14 +504,14 @@ 
      */
     function PUT(&$options)
     {
-        $fspath = $this->base . $options["path"];
+        $fspath = $this->base.$options["path"];
 
         $dir = dirname($fspath);
         if (!file_exists($dir) || !is_dir($dir)) {
             return "409 Conflict"; // TODO right status code for both?
         }
 
-        $options["new"] = ! file_exists($fspath);
+        $options["new"] = !file_exists($fspath);
 
         if ($options["new"] && !$this->_is_writable($dir)) {
             return "403 Forbidden";
@@ -537,7 +537,7 @@ 
      */
     function MKCOL($options)
     {
-        $path   = $this->base .$options["path"];
+        $path   = $this->base.$options["path"];
         $parent = dirname($path);
         $name   = basename($path);
 
@@ -549,7 +549,7 @@ 
             return "403 Forbidden";
         }
 
-        if ( file_exists($parent."/".$name) ) {
+        if (file_exists($parent."/".$name)) {
             return "405 Method not allowed";
         }
 
@@ -574,7 +574,7 @@ 
      */
     function DELETE($options)
     {
-        $path = $this->base . "/" .$options["path"];
+        $path = $this->base."/".$options["path"];
 
         if (!file_exists($path)) {
             return "404 Not found";
@@ -613,7 +613,7 @@ 
      * @param  array  general parameter passing array
      * @return bool   true on success
      */
-    function COPY($options, $del=false)
+    function COPY($options, $del = false)
     {
         // TODO Property updates still broken (Litmus should detect this?)
 
@@ -626,7 +626,7 @@ 
             return "502 bad gateway";
         }
 
-        $source = $this->base . $options["path"];
+        $source = $this->base.$options["path"];
         if (!file_exists($source)) {
             return "404 Not found";
         }
@@ -646,7 +646,7 @@ 
             }
         }
 
-        $dest         = $this->base . $options["dest"];
+        $dest         = $this->base.$options["dest"];
         $destdir      = dirname($dest);
 
         if (!file_exists($destdir) || !is_dir($destdir)) {
@@ -795,7 +795,7 @@ 
     function LOCK(&$options)
     {
         // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
+        $fspath = $this->base.$options["path"];
 
         // TODO recursive locks on directories not supported yet
         // makes litmus test "32. lock_collection" fail
@@ -803,7 +803,7 @@ 
             return "409 Conflict";
         }
 
-        $options["timeout"] = time()+300; // 5min. hardcoded
+        $options["timeout"] = time() + 300; // 5min. hardcoded
 
         if (isset($options["update"])) { // Lock Update
             $where = "WHERE path = '$options[path]' AND token = '$options[update]'";
@@ -822,7 +822,7 @@ 
 
                 $options['owner'] = $row['owner'];
                 $options['scope'] = $row["exclusivelock"] ? "exclusive" : "shared";
-                $options['type']  = $row["exclusivelock"] ? "write"     : "read";
+                $options['type']  = $row["exclusivelock"] ? "write" : "read";
 
                 return true;
             } else {
@@ -837,7 +837,7 @@ 
                           , modified = ".time()."
                           , owner   = '$options[owner]'
                           , expires = '$options[timeout]'
-                          , exclusivelock  = " .($options['scope'] === "exclusive" ? "1" : "0")
+                          , exclusivelock  = ".($options['scope'] === "exclusive" ? "1" : "0")
             ;
         mysql_query($query);
 
@@ -881,7 +881,7 @@ 
             mysql_free_result($res);
 
             if ($row) {
-                $result = array( "type"    => "write",
+                $result = array("type"    => "write",
                                  "scope"   => $row["exclusivelock"] ? "exclusive" : "shared",
                                  "depth"   => 0,
                                  "owner"   => $row['owner'],

api/src/Header/ContentSecurityPolicy.php

Spacing +11 added lines, -11 removed lines

@@ -33,7 +33,7 @@ 
 		'script-src'  => array("'unsafe-eval'"),
 		'style-src'   => array("'unsafe-inline'"),
 		'connect-src' => array(),
-		'frame-src'   => null,	// NOT array(), to allow setting no default frame-src!
+		'frame-src'   => null, // NOT array(), to allow setting no default frame-src!
 	);
 
 	/**
@@ -55,7 +55,7 @@ 
 				$attrs = array('www.egroupware.org');
 				if (($app_additional = Api\Hooks::process('csp-frame-src')))
 				{
-					foreach($app_additional as $addtional)
+					foreach ($app_additional as $addtional)
 					{
 						if ($addtional) $attrs = array_unique(array_merge($attrs, $addtional));
 					}
@@ -63,11 +63,11 @@ 
 			}
 			self::$sources[$source] = array();
 		}
-		foreach((array)$attrs as $attr)
+		foreach ((array)$attrs as $attr)
 		{
 			if (in_array($attr, array('none', 'self', 'unsafe-eval', 'unsafe-inline')))
 			{
-				$attr = "'$attr'";	// automatic add quotes
+				$attr = "'$attr'"; // automatic add quotes
 			}
 			if (!in_array($attr, self::$sources[$source]))
 			{
@@ -88,7 +88,7 @@ 
 	 *
 	 * @param string|array $set =array() 'unsafe-eval' and/or 'unsafe-inline' (without quotes!) or URL (incl. protocol!)
 	 */
-	public static function add_script_src($set=null)
+	public static function add_script_src($set = null)
 	{
 		self::add('script-src', $set);
 	}
@@ -100,7 +100,7 @@ 
 	 *
 	 * @param string|array $set =array() 'unsafe-inline' (without quotes!) and/or URL (incl. protocol!)
 	 */
-	public static function add_style_src($set=null)
+	public static function add_style_src($set = null)
 	{
 		self::add('style-src', $set);
 	}
@@ -110,7 +110,7 @@ 
 	 *
 	 * @param string|array $set =array() URL (incl. protocol!)
 	 */
-	public static function add_connect_src($set=null)
+	public static function add_connect_src($set = null)
 	{
 		self::add('connect-src', $set);
 	}
@@ -123,7 +123,7 @@ 
 	 * @param string|array $set =array() URL (incl. protocol!)
 	 * @return string with attributes eg. "'unsafe-inline'"
 	 */
-	public static function add_frame_src($set=null)
+	public static function add_frame_src($set = null)
 	{
 		self::add('frame-src', $set);
 	}
@@ -135,10 +135,10 @@ 
 	 */
 	public static function send()
 	{
-		self::add('frame-src', null);	// set defaults for frame-src
+		self::add('frame-src', null); // set defaults for frame-src
 
 		$policies = array();
-		foreach(self::$sources as $source => $urls)
+		foreach (self::$sources as $source => $urls)
 		{
 			$policies[] = "$source 'self' ".implode(' ', $urls);
 		}
@@ -152,7 +152,7 @@ 
 		// recommendaton ist to not send regular AND deprecated headers together, as they can cause unexpected behavior
 		if ($user_agent == 'chrome' && $version < 25 || $user_agent == 'safari' && $version < 7)
 		{
-			header("X-Webkit-CSP: $csp");	// Chrome: <= 24, Safari incl. iOS
+			header("X-Webkit-CSP: $csp"); // Chrome: <= 24, Safari incl. iOS
 		}
 		elseif ($user_agent == 'firefox' && $version < 23 || $user_agent == 'msie')	// Edge is reported as 'edge'!
 		{

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;