EGroupware / egroupware

api/src/Etemplate/Widget/Checkbox.php

Spacing +11 added lines, -11 removed lines

@@ -44,7 +44,7 @@ 
 	 * @param array &$validated=array() validated content
 	 * @return boolean true if no validation error, false otherwise
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
@@ -56,28 +56,28 @@ 
 		if (!$this->is_readonly($cname, $form_name))
 		{
 			$value = self::get_array($content, $form_name);
-			if (!isset($value))	return;	// value not transmitted --> nothing to validate
-			$valid =& self::get_array($validated, $form_name, true);
+			if (!isset($value))	return; // value not transmitted --> nothing to validate
+			$valid = & self::get_array($validated, $form_name, true);
 
 			if (!$value && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!'),'');
+				self::set_validation_error($form_name, lang('Field must not be empty !!!'), '');
 			}
 			$type = $this->type ? $this->type : $this->attrs['type'];
 			$value_attr = $type == 'radio' ? 'set_value' : 'selected_value';
 			// defaults for set and unset values
 			$selected_value = true;
 			$unselected_value = false;
-			if (array_key_exists($value_attr, $this->attrs) || array_key_exists('unselected_value',$this->attrs))
+			if (array_key_exists($value_attr, $this->attrs) || array_key_exists('unselected_value', $this->attrs))
 			{
-				if(array_key_exists($value_attr, $this->attrs))
+				if (array_key_exists($value_attr, $this->attrs))
 				{
 					// Expand any content stuff
-					$selected_value = self::expand_name($this->attrs[$value_attr], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'],$expand['cont']);
+					$selected_value = self::expand_name($this->attrs[$value_attr], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
 				}
-				if(array_key_exists('unselected_value',$this->attrs))
+				if (array_key_exists('unselected_value', $this->attrs))
 				{
-					$unselected_value = self::expand_name($this->attrs['unselected_value'], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'],$expand['cont']);
+					$unselected_value = self::expand_name($this->attrs['unselected_value'], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
 				}
 			}
 			if ($type == 'radio')
@@ -87,14 +87,14 @@ 
 				{
 					$valid = $value;
 				}
-				elseif ( !$options && $selected_value && $value == $selected_value)
+				elseif (!$options && $selected_value && $value == $selected_value)
 				{
 					// Options set in template, not in sel_options
 					$valid = $selected_value;
 				}
 				elseif (!isset($valid))
 				{
-					$valid = '';	// do not overwrite value of an other radio-button of the same group (identical name)!
+					$valid = ''; // do not overwrite value of an other radio-button of the same group (identical name)!
 				}
 			}
 			elseif (in_array((string)$selected_value, (array)$value))

api/src/Etemplate/WidgetBrowser.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
 		Api\Framework::includeCSS('/api/templates/default/etemplate2.css');
 
-		Api\Framework::includeCSS('api','widget_browser',false);
+		Api\Framework::includeCSS('api', 'widget_browser', false);
 
 		// load translations
 		Api\Translation::add_app('etemplate');

api/src/MimeMagic.php

Spacing +9 added lines, -9 removed lines

@@ -46,7 +46,7 @@ 
 		{
 			return $mime;
 		}
-		return lang('%1 file',strtoupper($ext)).' ('.$mime.')';
+		return lang('%1 file', strtoupper($ext)).' ('.$mime.')';
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	{
 		if (empty($_ext))
 		{
-			return 'text/plain';//assume no extension is a text file
+			return 'text/plain'; //assume no extension is a text file
 		}
 		$ext = strtolower($_ext);
 		if (!array_key_exists($ext, self::$mime_extension_map))
@@ -188,24 +188,24 @@ 
 	 */
 	public static function analyze_data($data)
 	{
-		if(!is_writeable(@$GLOBALS['egw_info']['server']['temp_dir']))
+		if (!is_writeable(@$GLOBALS['egw_info']['server']['temp_dir']))
 		{
 			//nothing we can do but bail out
 			return false;
 		}
 
 		mt_srand(time());
-		$filename = $GLOBALS['egw_info']['server']['temp_dir'] . '/'
-			. md5( time() + mt_rand() ) . '.tmp';
+		$filename = $GLOBALS['egw_info']['server']['temp_dir'].'/'
+			. md5(time() + mt_rand()).'.tmp';
 
 		$fp = @fopen($filename, 'ab');
-		if(!$fp || !$data)
+		if (!$fp || !$data)
 		{
 			//houston we have a problem - bail out
 			return false;
 		}
 
-		if(!fwrite($fp, $data))
+		if (!fwrite($fp, $data))
 		{
 			//bail out again
 			return false;
@@ -215,7 +215,7 @@ 
 
 		$mime = self::analyze_file($filename);
 
-		unlink($filename);//remove the temp file
+		unlink($filename); //remove the temp file
 
 		return $mime;
 	}
@@ -233,7 +233,7 @@ 
 	 * @var array of extenstion to mime mappings
 	 */
 	static $mime_extension_map = array(
-		'txt'				=> 'text/plain',	// should be first, so text/plain maps back to .txt
+		'txt'				=> 'text/plain', // should be first, so text/plain maps back to .txt
 		'3dml'              => 'text/vnd.in3d.3dml',
 		'3ds'               => 'image/x-3ds',
 		'3g2'               => 'video/3gpp2',

api/src/Exception.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 class Exception extends \Exception
 {
 	// nothing fancy yet
-	function __construct($msg=null,$code=100,\Exception $previous=null)
+	function __construct($msg = null, $code = 100, \Exception $previous = null)
 	{
 		return parent::__construct($msg, $code, $previous);
 	}

api/src/Cache/Memcache.php

Spacing +16 added lines, -16 removed lines

@@ -54,26 +54,26 @@ 
 	 * @throws Exception if connection to backend could not be established
 	 * @param array $params eg. array('localhost'[,'localhost:11211',...])
 	 */
-	function __construct(array $params=null)
+	function __construct(array $params = null)
 	{
-		check_load_extension('memcache',true);
+		check_load_extension('memcache', true);
 		$this->memcache = new \Memcache();
 
-		if (!$params) $params = array('localhost');	// some reasonable default
+		if (!$params) $params = array('localhost'); // some reasonable default
 
 		$ok = false;
-		foreach($params as $host_port)
+		foreach ($params as $host_port)
 		{
-			$parts = explode(':',$host_port);
+			$parts = explode(':', $host_port);
 			$host = array_shift($parts);
-			$port = $parts ? array_shift($parts) : 11211;	// default port
+			$port = $parts ? array_shift($parts) : 11211; // default port
 
-			$ok = $this->memcache->addServer($host,$port) || $ok;
+			$ok = $this->memcache->addServer($host, $port) || $ok;
 			//error_log(__METHOD__."(".array2string($params).") memcache->addServer('$host',$port) = ".(int)$ok);
 		}
 		if (!$ok)
 		{
-			throw new Exception (__METHOD__.'('.array2string($params).") Can't open connection to any memcached server!");
+			throw new Exception(__METHOD__.'('.array2string($params).") Can't open connection to any memcached server!");
 		}
 		$this->igbinary_available = function_exists('igbinary_serialize') && function_exists('igbinary_unserialize');
 	}
@@ -86,7 +86,7 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error, incl. key already exists in cache
 	 */
-	function add(array $keys,$data,$expiration=0)
+	function add(array $keys, $data, $expiration = 0)
 	{
 		return $this->memcache->add(self::key($keys),
 			$this->igbinary_available ? igbinary_serialize($data) : serialize($data),
@@ -101,7 +101,7 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error
 	 */
-	function set(array $keys,$data,$expiration=0)
+	function set(array $keys, $data, $expiration = 0)
 	{
 		return $this->memcache->set(self::key($keys),
 			$this->igbinary_available ? igbinary_serialize($data) : serialize($data),
@@ -116,7 +116,7 @@ 
 	 */
 	function get(array $keys)
 	{
-		if (($data = $this->memcache->get($key=self::key($keys))) === false)
+		if (($data = $this->memcache->get($key = self::key($keys))) === false)
 		{
 			//error_log(__METHOD__."(".array2string($keys).") key='$key' NOT found!");
 			return null;
@@ -135,7 +135,7 @@ 
 	{
 		$locations = array_pop($keys);
 		$prefix = self::key($keys);
-		foreach($locations as &$location)
+		foreach ($locations as &$location)
 		{
 			$location = $prefix.'::'.$location;
 		}
@@ -144,10 +144,10 @@ 
 			return array();
 		}
 		$ret = array();
-		$prefix_len = strlen($prefix)+2;
-		foreach($multiple as $location => $data)
+		$prefix_len = strlen($prefix) + 2;
+		foreach ($multiple as $location => $data)
 		{
-			$key = substr($location,$prefix_len);
+			$key = substr($location, $prefix_len);
 			//error_log(__METHOD__."(".array2string($locations).") key='$key' found ".bytes($data)." bytes).");
 			$ret[$key] = $this->igbinary_available && $data[1] !== ':' ? igbinary_unserialize($data) : unserialize($data);
 		}
@@ -175,6 +175,6 @@ 
 	 */
 	private function key(array $keys)
 	{
-		return implode('::',$keys);
+		return implode('::', $keys);
 	}
 }

api/src/Cache/Base.php

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
 	 * @param boolean $verbose =false true: echo failed checks
 	 * @return int number of failed checks
 	 */
-	function check($verbose=false)
+	function check($verbose = false)
 	{
 		// set us up as provider for Api\Cache class
 		$GLOBALS['egw_info']['server']['install_id'] = md5(microtime(true));
@@ -37,27 +37,27 @@ 
 		Api\Cache::$default_provider = get_class($this);
 
 		$failed = 0;
-		foreach(array(
+		foreach (array(
 			Api\Cache::TREE => 'tree',
 			Api\Cache::INSTANCE => 'instance',
 		) as $level => $label)
 		{
 			$locations = array();
-			foreach(array('string',123,true,false,null,array(),array(1,2,3)) as $data)
+			foreach (array('string', 123, true, false, null, array(), array(1, 2, 3)) as $data)
 			{
 				$location = md5(microtime(true).$label.serialize($data));
-				$get_before_set = $this->get(array($level,__CLASS__,$location));
+				$get_before_set = $this->get(array($level, __CLASS__, $location));
 				if (!is_null($get_before_set))
 				{
 					if ($verbose) echo "$label: get_before_set=".array2string($get_before_set)." != NULL\n";
 					++$failed;
 				}
-				if (($set = $this->set(array($level,__CLASS__,$location), $data, 10)) !== true)
+				if (($set = $this->set(array($level, __CLASS__, $location), $data, 10)) !== true)
 				{
 					if ($verbose) echo "$label: set returned ".array2string($set)." !== TRUE\n";
 					++$failed;
 				}
-				$get_after_set = $this->get(array($level,__CLASS__,$location));
+				$get_after_set = $this->get(array($level, __CLASS__, $location));
 				if ($get_after_set !== $data)
 				{
 					if ($verbose) echo "$label: get_after_set=".array2string($get_after_set)." !== ".array2string($data)."\n";
@@ -65,25 +65,25 @@ 
 				}
 				if (is_a($this, 'EGroupware\Api\Cache\ProviderMultiple'))
 				{
-					$mget_after_set = $this->mget(array($level,__CLASS__,array($location)));
+					$mget_after_set = $this->mget(array($level, __CLASS__, array($location)));
 					if ($mget_after_set[$location] !== $data)
 					{
 						if ($verbose) echo "$label: mget_after_set['$location']=".array2string($mget_after_set[$location])." !== ".array2string($data)."\n";
 						++$failed;
 					}
 				}
-				$add_after_set = $this->add(array($level,__CLASS__,$location), 'other-data');
+				$add_after_set = $this->add(array($level, __CLASS__, $location), 'other-data');
 				if ($add_after_set !== false)
 				{
 					if ($verbose) echo "$label: add_after_set=".array2string($add_after_set)."\n";
 					++$failed;
 				}
-				if (($delete = $this->delete(array($level,__CLASS__,$location))) !== true)
+				if (($delete = $this->delete(array($level, __CLASS__, $location))) !== true)
 				{
 					if ($verbose) echo "$label: delete returned ".array2string($delete)." !== TRUE\n";
 					++$failed;
 				}
-				$get_after_delete = $this->get(array($level,__CLASS__,$location));
+				$get_after_delete = $this->get(array($level, __CLASS__, $location));
 				if (!is_null($get_after_delete))
 				{
 					if ($verbose) echo "$label: get_after_delete=".array2string($get_after_delete)." != NULL\n";
@@ -93,7 +93,7 @@ 
 				if (is_a($this, 'EGroupware\Api\Cache\ProviderMultiple'))
 				{
 					$locations[$location] = $data;
-					$mget_after_delete = $this->mget(array($level,__CLASS__,array($location)));
+					$mget_after_delete = $this->mget(array($level, __CLASS__, array($location)));
 					if (isset($mget_after_delete[$location]))
 					{
 						if ($verbose) echo "$label: mget_after_delete['$location']=".array2string($mget_after_delete[$location])." != NULL\n";
@@ -104,7 +104,7 @@ 
 				{
 					$locations[$location] = $data;
 				}
-				$add_after_delete = $this->add(array($level,__CLASS__,$location), $data, 10);
+				$add_after_delete = $this->add(array($level, __CLASS__, $location), $data, 10);
 				if ($add_after_delete !== true)
 				{
 					if ($verbose) echo "$label: add_after_delete=".array2string($add_after_delete)."\n";
@@ -112,7 +112,7 @@ 
 				}
 				else
 				{
-					$get_after_add = $this->get(array($level,__CLASS__,$location));
+					$get_after_add = $this->get(array($level, __CLASS__, $location));
 					if ($get_after_add !== $data)
 					{
 						if ($verbose) echo "$label: get_after_add=".array2string($get_after_add)." !== ".array2string($data)."\n";
@@ -122,11 +122,11 @@ 
 			}
 			// get all above in one request
 			$keys = array_keys($locations);
-			$keys_bogus = array_merge(array('not-set'),array_keys($locations),array('not-set-too'));
+			$keys_bogus = array_merge(array('not-set'), array_keys($locations), array('not-set-too'));
 			if (is_a($this, 'EGroupware\Api\Cache\ProviderMultiple'))
 			{
-				$mget = $this->mget(array($level,__CLASS__,$keys));
-				$mget_bogus = $this->mget(array($level,__CLASS__,$keys_bogus));
+				$mget = $this->mget(array($level, __CLASS__, $keys));
+				$mget_bogus = $this->mget(array($level, __CLASS__, $keys_bogus));
 			/* Api\Cache::getCache() gives a different result, as it does NOT use $level direkt
 			}
 			else
@@ -160,7 +160,7 @@ 
 	 */
 	function flush(array $keys)
 	{
-		unset($keys);	// required by function signature
+		unset($keys); // required by function signature
 		return false;
 	}
 }

api/src/Cache/Provider.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error, incl. key already exists in cache
 	 */
-	function add(array $keys,$data,$expiration=0);
+	function add(array $keys, $data, $expiration = 0);
 
 	/**
 	 * Stores some data in the cache
@@ -48,7 +48,7 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error
 	 */
-	function set(array $keys,$data,$expiration=0);
+	function set(array $keys, $data, $expiration = 0);
 
 	/**
 	 * Get some data from the cache

api/src/Auth/Fallbackmail2sql.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	/**
 	 * Constructor
 	 */
-	function __construct($primary='mail', $fallback='sql')
+	function __construct($primary = 'mail', $fallback = 'sql')
 	{
 		parent::__construct($primary, $fallback);
 	}

api/src/Auth/Nis.php

Spacing +8 added lines, -8 removed lines

@@ -26,22 +26,22 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
-		unset($passwd_type);	// not used but required by interface
+		unset($passwd_type); // not used but required by interface
 
 		$domain = yp_get_default_domain();
-		if(!empty($GLOBALS['egw_info']['server']['nis_domain']))
+		if (!empty($GLOBALS['egw_info']['server']['nis_domain']))
 		{
 			$domain = $GLOBALS['egw_info']['server']['nis_domain'];
 		}
 
 		$map = "passwd.byname";
-		if(!empty($GLOBALS['egw_info']['server']['nis_map']))
+		if (!empty($GLOBALS['egw_info']['server']['nis_map']))
 		{
 			$map = $GLOBALS['egw_info']['server']['nis_map'];
 		}
-		$entry = yp_match( $domain, $map, $username );
+		$entry = yp_match($domain, $map, $username);
 
 		/*
 		 * we assume that the map is structured in the usual
@@ -63,11 +63,11 @@ 
 	 * @param int $account_id =0 account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
-		unset($old_passwd, $new_passwd, $account_id);	// not used but required by interface
+		unset($old_passwd, $new_passwd, $account_id); // not used but required by interface
 
 		// can't change passwords unless server runs as root (bad idea)
-		return( False );
+		return(False);
 	}
 }