EGroupware / egroupware

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;

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)
 		{

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

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