EGroupware / egroupware

api/src/Auth/Http.php

Spacing +4 added lines, -4 removed lines

@@ -29,9 +29,9 @@ 
 	 * @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, $passwd_type);	// not used, but required by interface
+		unset($passwd, $passwd_type); // not used, but required by interface
 
 		return isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER'] === $username;
 	}
@@ -44,9 +44,9 @@ 
 	 * @param int $account_id 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
 
 		return False;
 	}

api/src/Auth/Fallback.php

Spacing +18 added lines, -18 removed lines

@@ -41,7 +41,7 @@ 
 	 * @param string $primary ='ldap'
 	 * @param string $fallback ='sql'
 	 */
-	function __construct($primary='ldap',$fallback='sql')
+	function __construct($primary = 'ldap', $fallback = 'sql')
 	{
 		$this->primary_backend = Api\Auth::backend(str_replace('auth_', '', $primary));
 
@@ -55,26 +55,26 @@ 
 	 * @param string $passwd corresponding password
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
 		if ($this->primary_backend->authenticate($username, $passwd, $passwd_type))
 		{
-			Api\Cache::setInstance(__CLASS__,'backend_used-'.$username,'primary');
+			Api\Cache::setInstance(__CLASS__, 'backend_used-'.$username, 'primary');
 			// check if fallback has correct password, if not update it
 			if (($account_id = $GLOBALS['egw']->accounts->name2id($username)) &&
-				!$this->fallback_backend->authenticate($username,$passwd, $passwd_type))
+				!$this->fallback_backend->authenticate($username, $passwd, $passwd_type))
 			{
 				$backup_currentapp = $GLOBALS['egw_info']['flags']['currentapp'];
-				$GLOBALS['egw_info']['flags']['currentapp'] = 'admin';	// otherwise
+				$GLOBALS['egw_info']['flags']['currentapp'] = 'admin'; // otherwise
 				$this->fallback_backend->change_password('', $passwd, $account_id);
 				$GLOBALS['egw_info']['flags']['currentapp'] = $backup_currentapp;
 				//error_log(__METHOD__."('$username', \$passwd) updated password for #$account_id on fallback ".($ret ? 'successfull' : 'failed!'));
 			}
 			return true;
 		}
-		if ($this->fallback_backend->authenticate($username,$passwd, $passwd_type))
+		if ($this->fallback_backend->authenticate($username, $passwd, $passwd_type))
 		{
-			Api\Cache::setInstance(__CLASS__,'backend_used-'.$username,'fallback');
+			Api\Cache::setInstance(__CLASS__, 'backend_used-'.$username, 'fallback');
 			return true;
 		}
 		return false;
@@ -91,9 +91,9 @@ 
 	 * @param int $account_id 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)
 	{
-		if(!$account_id)
+		if (!$account_id)
 		{
 			$account_id = $GLOBALS['egw_info']['user']['account_id'];
 			$username = $GLOBALS['egw_info']['user']['account_lid'];
@@ -102,7 +102,7 @@ 
 		{
 			$username = $GLOBALS['egw']->accounts->id2name($account_id);
 		}
-		if (Api\Cache::getInstance(__CLASS__,'backend_used-'.$username) == 'primary')
+		if (Api\Cache::getInstance(__CLASS__, 'backend_used-'.$username) == 'primary')
 		{
 			if (($ret = $this->primary_backend->change_password($old_passwd, $new_passwd, $account_id)))
 			{
@@ -126,14 +126,14 @@ 
 	 */
 	function getLastPwdChange($username)
 	{
-		if (Api\Cache::getInstance(__CLASS__,'backend_used-'.$username) == 'primary')
+		if (Api\Cache::getInstance(__CLASS__, 'backend_used-'.$username) == 'primary')
 		{
-			if (method_exists($this->primary_backend,'getLastPwdChange'))
+			if (method_exists($this->primary_backend, 'getLastPwdChange'))
 			{
 				return $this->primary_backend->getLastPwdChange($username);
 			}
 		}
-		if (method_exists($this->fallback_backend,'getLastPwdChange'))
+		if (method_exists($this->fallback_backend, 'getLastPwdChange'))
 		{
 			return $this->fallback_backend->getLastPwdChange($username);
 		}
@@ -148,9 +148,9 @@ 
 	 * @param int $lastpwdchange must be a unixtimestamp
 	 * @return boolean true if account_lastpwd_change successful changed, false otherwise
 	 */
-	function setLastPwdChange($account_id=0, $passwd=NULL, $lastpwdchange=NULL)
+	function setLastPwdChange($account_id = 0, $passwd = NULL, $lastpwdchange = NULL)
 	{
-		if(!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
+		if (!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
 		{
 			$account_id = $GLOBALS['egw_info']['user']['account_id'];
 			$username = $GLOBALS['egw_info']['user']['account_lid'];
@@ -159,14 +159,14 @@ 
 		{
 			$username = $GLOBALS['egw']->accounts->id2name($account_id);
 		}
-		if (Api\Cache::getInstance(__CLASS__,'backend_used-'.$username) == 'primary')
+		if (Api\Cache::getInstance(__CLASS__, 'backend_used-'.$username) == 'primary')
 		{
-			if (method_exists($this->primary_backend,'setLastPwdChange'))
+			if (method_exists($this->primary_backend, 'setLastPwdChange'))
 			{
 				return $this->primary_backend->setLastPwdChange($username);
 			}
 		}
-		if (method_exists($this->fallback_backend,'setLastPwdChange'))
+		if (method_exists($this->fallback_backend, 'setLastPwdChange'))
 		{
 			return $this->fallback_backend->setLastPwdChange($account_id, $passwd, $lastpwdchange);
 		}

api/src/Cache/Apcu.php

Spacing +12 added lines, -12 removed lines

@@ -46,7 +46,7 @@ 
 	{
 		if (!function_exists('apcu_fetch'))	// apc >= 3.0
 		{
-			throw new Exception (__METHOD__.'('.array2string($params).") No function apcu_fetch()!");
+			throw new Exception(__METHOD__.'('.array2string($params).") No function apcu_fetch()!");
 		}
 	}
 
@@ -65,7 +65,7 @@ 
 		{
 			$size = ini_get('apc.shm_size');
 
-			switch(strtoupper(substr($size, -1)))
+			switch (strtoupper(substr($size, -1)))
 			{
 				case 'G':
 					$size *= 1024;
@@ -91,9 +91,9 @@ 
 	 * @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 apcu_add(self::key($keys),$data,$expiration);
+		return apcu_add(self::key($keys), $data, $expiration);
 	}
 
 	/**
@@ -104,9 +104,9 @@ 
 	 * @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 apcu_store(self::key($keys),$data,$expiration);
+		return apcu_store(self::key($keys), $data, $expiration);
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	function get(array $keys)
 	{
 		$success = null;
-		$data = apcu_fetch($key=self::key($keys),$success);
+		$data = apcu_fetch($key = self::key($keys), $success);
 
 		if (!$success)
 		{
@@ -160,12 +160,12 @@ 
 		// APCu > 5 has APCUIterator
 		if (class_exists('APCUIterator'))
 		{
-			$iterator = new \APCUIterator($preg='/^'.preg_quote(self::key($keys).'/'));
+			$iterator = new \APCUIterator($preg = '/^'.preg_quote(self::key($keys).'/'));
 		}
 		// APC >= 3.1.1, but also seems to be missing if apc is disabled eg. for cli
-		elseif(class_exists('APCIterator'))
+		elseif (class_exists('APCIterator'))
 		{
-			$iterator = new \APCIterator('user', $preg='/^'.preg_quote(self::key($keys).'/'));
+			$iterator = new \APCIterator('user', $preg = '/^'.preg_quote(self::key($keys).'/'));
 		}
 		else
 		{
@@ -173,7 +173,7 @@ 
 
 			return false;
 		}
-		foreach($iterator as $item)
+		foreach ($iterator as $item)
 		{
 			//error_log(__METHOD__."(".array2string($keys).") preg='$preg': calling apcu_delete('$item[key]')");
 			apcu_delete($item['key']);
@@ -189,6 +189,6 @@ 
 	 */
 	private static function key(array $keys)
 	{
-		return implode('::',$keys);
+		return implode('::', $keys);
 	}
 }

api/src/Cache/Apc.php

Spacing +9 added lines, -9 removed lines

@@ -46,7 +46,7 @@ 
 	{
 		if (!function_exists('apc_fetch'))	// apc >= 3.0
 		{
-			throw new Exception (__METHOD__.'('.array2string($params).") No function apc_fetch()!");
+			throw new Exception(__METHOD__.'('.array2string($params).") No function apc_fetch()!");
 		}
 	}
 
@@ -66,7 +66,7 @@ 
 			// ancent APC (3.1.3) in Debian 6/Squezze has size in MB without a unit
 			if (is_numeric($size) && $size <= 1048576) $size .= 'M';
 
-			switch(strtoupper(substr($size, -1)))
+			switch (strtoupper(substr($size, -1)))
 			{
 				case 'G':
 					$size *= 1024;
@@ -92,9 +92,9 @@ 
 	 * @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 apc_add(self::key($keys),$data,$expiration);
+		return apc_add(self::key($keys), $data, $expiration);
 	}
 
 	/**
@@ -105,9 +105,9 @@ 
 	 * @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 apc_store(self::key($keys),$data,$expiration);
+		return apc_store(self::key($keys), $data, $expiration);
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	function get(array $keys)
 	{
 		$success = null;
-		$data = apc_fetch($key=self::key($keys),$success);
+		$data = apc_fetch($key = self::key($keys), $success);
 
 		if (!$success)
 		{
@@ -160,7 +160,7 @@ 
 			return false;
 		}
 		//error_log(__METHOD__."(".array2string($keys).")");
-		foreach(new \APCIterator('user', $preg='/^'.preg_quote(self::key($keys).'/')) as $item)
+		foreach (new \APCIterator('user', $preg = '/^'.preg_quote(self::key($keys).'/')) as $item)
 		{
 			//error_log(__METHOD__."(".array2string($keys).") preg='$preg': calling apc_delete('$item[key]')");
 			apc_delete($item['key']);
@@ -176,6 +176,6 @@ 
 	 */
 	private static function key(array $keys)
 	{
-		return implode('::',$keys);
+		return implode('::', $keys);
 	}
 }

api/templates/default/images/mime128.php

Spacing +3 added lines, -3 removed lines

@@ -43,9 +43,9 @@
 	'ppt' => 'application/vnd.ms-powerpoint',
 	'qt' => 'video/quicktime',
 );
-$src_dir=__DIR__.'/MimeTypes-Link-Icons/images';
-$dst_dir=__DIR__;
-foreach(scandir($src_dir) as $file)
+$src_dir = __DIR__.'/MimeTypes-Link-Icons/images';
+$dst_dir = __DIR__;
+foreach (scandir($src_dir) as $file)
 {
 	if (preg_match('/^([^-]+)-icon-128x128.png$/', $file, $matches))
 	{

calendar/importexport/class.import_events_csv.inc.php

Spacing +58 added lines, -58 removed lines

@@ -10,28 +10,28 @@ 
  * @version $Id: $
  */
 
-require_once(EGW_INCLUDE_ROOT. '/importexport/inc/class.iface_import_plugin.inc.php');
+require_once(EGW_INCLUDE_ROOT.'/importexport/inc/class.iface_import_plugin.inc.php');
 require_once(EGW_INCLUDE_ROOT.'/importexport/inc/class.import_csv.inc.php');
 
 
 /**
  * class import_csv for addressbook
  */
-class import_events_csv implements iface_import_plugin  {
+class import_events_csv implements iface_import_plugin {
 
 	private static $plugin_options = array(
-		'fieldsep', 			// char
-		'charset', 				// string
-		'event_owner', 			// int account_id or -1 for leave untuched
-		'owner_joins_event',	// bool
-		'update_cats', 			// string {override|add} overides record
+		'fieldsep', // char
+		'charset', // string
+		'event_owner', // int account_id or -1 for leave untuched
+		'owner_joins_event', // bool
+		'update_cats', // string {override|add} overides record
 								// with cat(s) from csv OR add the cat from
 								// csv file to exeisting cat(s) of record
-		'num_header_lines',		// int number of header lines
-		'trash_users_records',	// trashes all events of events owner before import
-		'field_conversion', 	// array( $csv_col_num => conversion)
-		'field_mapping',		// array( $csv_col_num => adb_filed)
-		'conditions',			/* => array containing condition arrays:
+		'num_header_lines', // int number of header lines
+		'trash_users_records', // trashes all events of events owner before import
+		'field_conversion', // array( $csv_col_num => conversion)
+		'field_mapping', // array( $csv_col_num => adb_filed)
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // record['uid'] exists
 				'true' => array(
 					'action' => update,
@@ -47,14 +47,14 @@ 
 	/**
 	 * actions wich could be done to data entries
 	 */
-	private static $actions = array( 'none', 'update', 'insert', 'delete', );
+	private static $actions = array('none', 'update', 'insert', 'delete',);
 
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
-	private static $conditions = array( 'exists', 'empty', );
+	private static $conditions = array('exists', 'empty',);
 
 	/**
 	 * @var definition
@@ -97,8 +97,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, definition $_definition ) {
-		$import_csv = new import_csv( $_stream, array(
+	public function import($_stream, definition $_definition) {
+		$import_csv = new import_csv($_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
 		));
@@ -106,11 +106,11 @@ 
 		$this->definition = $_definition;
 
 		// user, is admin ?
-		$this->is_admin = isset( $GLOBALS['egw_info']['user']['apps']['admin'] ) && $GLOBALS['egw_info']['user']['apps']['admin'];
+		$this->is_admin = isset($GLOBALS['egw_info']['user']['apps']['admin']) && $GLOBALS['egw_info']['user']['apps']['admin'];
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
 
 		// fetch the calendar bo
 		$this->bocalupdate = new calendar_boupdate();
@@ -122,24 +122,24 @@ 
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) ) {
-			$import_csv->skip_records( $_definition->plugin_options['num_header_lines'] );
+		if (isset($_definition->plugin_options['num_header_lines'])) {
+			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
 		}
 
 		// set eventOwner
 		$plugin_options = $_definition->plugin_options;
-		$plugin_options['events_owner'] = isset( $_definition->plugin_options['events_owner'] ) ?
+		$plugin_options['events_owner'] = isset($_definition->plugin_options['events_owner']) ?
 			$_definition->plugin_options['events_owner'] : $this->user;
 		$_definition->plugin_options = $plugin_options;
 
 		// trash_users_records ?
-		if ( $_definition->plugin_options['trash_users_records'] === true ) {
-			if ( !$_definition->plugin_options['dry_run'] ) {
+		if ($_definition->plugin_options['trash_users_records'] === true) {
+			if (!$_definition->plugin_options['dry_run']) {
 				$socal = new calendar_socal();
-				$this->bocalupdate->so->deleteaccount( $_definition->plugin_options['events_owner']);
-				unset( $socal );
+				$this->bocalupdate->so->deleteaccount($_definition->plugin_options['events_owner']);
+				unset($socal);
 			} else {
-				$lid = $GLOBALS['egw']->accounts->id2name( $_definition->plugin_options['events_owner'] );
+				$lid = $GLOBALS['egw']->accounts->id2name($_definition->plugin_options['events_owner']);
 				echo "Attension: All Events of '$lid' would be deleted!\n";
 			}
 		}
@@ -147,44 +147,44 @@ 
 		$this->errors = array();
 		$this->results = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ($record = $import_csv->get_record()) {
 
 			// don't import empty events
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if (count(array_unique($record)) < 2) continue;
 
-			if ( $_definition->plugin_options['events_owner'] != -1 ) {
+			if ($_definition->plugin_options['events_owner'] != -1) {
 				$record['owner'] = $_definition->plugin_options['events_owner'];
-			} else unset( $record['owner'] );
+			} else unset($record['owner']);
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
-					switch ( $condition['type'] ) {
+			if ($_definition->plugin_options['conditions']) {
+				foreach ($_definition->plugin_options['conditions'] as $condition) {
+					switch ($condition['type']) {
 						// exists
 						case 'exists' :
 
-							if ( is_array( $event = $this->bocalupdate->read( $record['uid'], null, $this->is_admin ) ) ) {
+							if (is_array($event = $this->bocalupdate->read($record['uid'], null, $this->is_admin))) {
 								// apply action to event matching this exists condition
 								$record['id'] = $event['id'];
 
-								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $event['cat_id'] ) ) $event['cat_id'] = explode( ',', $event['cat_id'] );
-									if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
-									$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $event['cat_id'] ) ) );
+								if ($_definition->plugin_options['update_cats'] == 'add') {
+									if (!is_array($event['cat_id'])) $event['cat_id'] = explode(',', $event['cat_id']);
+									if (!is_array($record['cat_id'])) $record['cat_id'] = explode(',', $record['cat_id']);
+									$record['cat_id'] = implode(',', array_unique(array_merge($record['cat_id'], $event['cat_id'])));
 								}
 
 								// check if entry is modiefied
-								$event = array_intersect_key( $event, $record );
-								$diff = array_diff( $event, $record );
-								if( !empty( $diff ) ) $record['modified'] = time();
+								$event = array_intersect_key($event, $record);
+								$diff = array_diff($event, $record);
+								if (!empty($diff)) $record['modified'] = time();
 
 								$action = $condition['true'];
 							} else $action = $condition['false'];
 
-							$this->action( $action['action'], $record );
+							$this->action($action['action'], $record);
 							break;
 						case 'empty' :
-							$action = empty( $record[$condition['string']] ) ? $condition['true'] : $condition['false'];
-							$this->action( $action['action'], $record );
+							$action = empty($record[$condition['string']]) ? $condition['true'] : $condition['false'];
+							$this->action($action['action'], $record);
 							break;
 
 						// not supported action
@@ -196,7 +196,7 @@ 
 				}
 			} else {
 				// unconditional insert
-				$this->action( 'insert', $record );
+				$this->action('insert', $record);
 			}
 		}
 	}
@@ -208,8 +208,8 @@ 
 	 * @param array $_data event data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data ) {
-		switch ( $_action ) {
+	private function action($_action, $_data) {
+		switch ($_action) {
 			case 'none' :
 				return true;
 
@@ -217,32 +217,32 @@ 
 			case 'insert' :
 
 				// paticipants handling
-				$participants = $_data['participants'] ? split( '[,;]', $_data['participants'] ) : array();
+				$participants = $_data['participants'] ? split('[,;]', $_data['participants']) : array();
 				$_data['participants'] = array();
-				if ( $this->definition->plugin_options['owner_joins_event'] && $this->definition->plugin_options['events_owner'] > 0 ) {
+				if ($this->definition->plugin_options['owner_joins_event'] && $this->definition->plugin_options['events_owner'] > 0) {
 					$_data['participants'][$this->definition->plugin_options['events_owner']] = 'A';
 				}
-				foreach( $participants as $participant ) {
-					list( $participant, $status ) = explode( '=', $participant );
-					$valid_staties = array('U'=>'U','u'=>'U','A'=>'A','a'=>'A','R'=>'R','r'=>'R','T'=>'T','t'=>'T');
-					$status = isset( $valid_staties[$status] ) ? $valid_staties[$status] : 'U';
-					if ( $participant && is_numeric($participant ) ) {
+				foreach ($participants as $participant) {
+					list($participant, $status) = explode('=', $participant);
+					$valid_staties = array('U'=>'U', 'u'=>'U', 'A'=>'A', 'a'=>'A', 'R'=>'R', 'r'=>'R', 'T'=>'T', 't'=>'T');
+					$status = isset($valid_staties[$status]) ? $valid_staties[$status] : 'U';
+					if ($participant && is_numeric($participant)) {
 						$_data['participants'][$participant] = $status;
 					}
 				}
 				// no valid participants so far --> add the importing user/owner
-				if ( empty( $_data['participants'] ) ) {
+				if (empty($_data['participants'])) {
 					$_data['participants'][$this->user] = 'A';
 				}
 
 				// are we serious?
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					print_r($_data);
 					$this->results[$_action]++;
 				} else {
 					$messages = array();
-					$result = $this->bocalupdate->update( $_data, true, !$_data['modified'], $this->is_admin, true, $messages);
-					if(!$result) {
+					$result = $this->bocalupdate->update($_data, true, !$_data['modified'], $this->is_admin, true, $messages);
+					if (!$result) {
 						$this->errors = implode(',', $messages);
 					} else {
 						$this->results[$_action]++;

api/src/Vfs/Hooks.php

Spacing +15 added lines, -15 removed lines

@@ -45,11 +45,11 @@ 
 		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
 		// create a user-dir
 		Api\Vfs::$is_root = true;
-		if (Api\Vfs::file_exists($dir='/home/'.$data['account_lid']) || Api\Vfs::mkdir($dir, 0700, 0))
+		if (Api\Vfs::file_exists($dir = '/home/'.$data['account_lid']) || Api\Vfs::mkdir($dir, 0700, 0))
 		{
-			Api\Vfs::chown($dir,(int)$data['account_id']);
-			Api\Vfs::chgrp($dir,0);
-			Api\Vfs::chmod($dir,0700);	// only user has access
+			Api\Vfs::chown($dir, (int)$data['account_id']);
+			Api\Vfs::chgrp($dir, 0);
+			Api\Vfs::chmod($dir, 0700); // only user has access
 		}
 		Api\Vfs::$is_root = false;
 	}
@@ -67,11 +67,11 @@ 
 		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
 		if (empty($data['account_lid']) || empty($data['old_loginid']) || $data['account_lid'] == $data['old_loginid'])
 		{
-			return;	// nothing to do here
+			return; // nothing to do here
 		}
 		// rename the user-dir
 		Api\Vfs::$is_root = true;
-		Api\Vfs::rename('/home/'.$data['old_loginid'],'/home/'.$data['account_lid']);
+		Api\Vfs::rename('/home/'.$data['old_loginid'], '/home/'.$data['account_lid']);
 		Api\Vfs::$is_root = false;
 	}
 
@@ -90,15 +90,15 @@ 
 		if ($data['new_owner'] && ($new_lid = $GLOBALS['egw']->accounts->id2name($data['new_owner'])))
 		{
 			// copy content of user-dir to new owner's user-dir as old-home-$name
-			for ($i=''; file_exists(Api\Vfs::PREFIX.($new_dir = '/home/'.$new_lid.'/old-home-'.$data['account_lid'].$i)); $i++)
+			for ($i = ''; file_exists(Api\Vfs::PREFIX.($new_dir = '/home/'.$new_lid.'/old-home-'.$data['account_lid'].$i)); $i++)
 			{
 
 			}
-			Api\Vfs::rename('/home/'.$data['account_lid'],$new_dir);
+			Api\Vfs::rename('/home/'.$data['account_lid'], $new_dir);
 			// make the new owner the owner of the dir and it's content
 			Api\Vfs::find($new_dir, array(), 'EGroupware\Api\Vfs::chown', $data['new_owner']);
 		}
-		elseif(!empty($data['account_lid']) && $data['account_lid'] != '/')
+		elseif (!empty($data['account_lid']) && $data['account_lid'] != '/')
 		{
 			// delete the user-directory
 			Api\Vfs::remove('/home/'.$data['account_lid']);
@@ -124,11 +124,11 @@ 
 
 		// create a group-dir
 		Api\Vfs::$is_root = true;
-		if (Api\Vfs::file_exists($dir='/home/'.$data['account_lid']) || Api\Vfs::mkdir($dir, 0070, 0))
+		if (Api\Vfs::file_exists($dir = '/home/'.$data['account_lid']) || Api\Vfs::mkdir($dir, 0070, 0))
 		{
-			Api\Vfs::chown($dir,0);
-			Api\Vfs::chgrp($dir,abs($data['account_id']));	// gid in Vfs is positiv!
-			Api\Vfs::chmod($dir,0070);	// only group has access
+			Api\Vfs::chown($dir, 0);
+			Api\Vfs::chgrp($dir, abs($data['account_id'])); // gid in Vfs is positiv!
+			Api\Vfs::chmod($dir, 0070); // only group has access
 		}
 		Api\Vfs::$is_root = false;
 	}
@@ -161,7 +161,7 @@ 
 		{
 			// rename the group-dir
 			Api\Vfs::$is_root = true;
-			Api\Vfs::rename('/home/'.$data['old_name'],'/home/'.$data['account_lid']);
+			Api\Vfs::rename('/home/'.$data['old_name'], '/home/'.$data['account_lid']);
 			Api\Vfs::$is_root = false;
 		}
 	}
@@ -177,7 +177,7 @@ 
 	{
 		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
 
-		if(empty($data['account_lid']) || $data['account_lid'] == '/')
+		if (empty($data['account_lid']) || $data['account_lid'] == '/')
 		{
 			throw new Api\Exception\AssertionFailed(__METHOD__.'('.array2string($data).') account_lid NOT set!');
 		}

api/src/Framework/IncludeMgr.php

Spacing +12 added lines, -12 removed lines

@@ -80,7 +80,7 @@ 
 	private function parse_file($file)
 	{
 		// file is from url and can contain query-params, eg. /phpgwapi/inc/jscalendar-setup.php?dateformat=d.m.Y&lang=de
-		if (strpos($file,'?') !== false) list($file) = explode('?',$file);
+		if (strpos($file, '?') !== false) list($file) = explode('?', $file);
 
 		// Mark the file as parsed
 		$this->parsed_files[$file] = true;
@@ -256,7 +256,7 @@ 
 	 * @param array $modules pathes to include
 	 * @param boolean $append =true false: prepend modules before already included ones, keeping their order
 	 */
-	private function include_module(array $modules, $append=true)
+	private function include_module(array $modules, $append = true)
 	{
 		if (self::$DEBUG_MODE)
 		{
@@ -295,17 +295,17 @@ 
 	 * @returns the correct path on the server if the file is found or false, if the
 	 *  file is not found or no further processing is needed.
 	 */
-	private function translate_params($package, $file=null, $app='api')
+	private function translate_params($package, $file = null, $app = 'api')
 	{
 		if ($package[0] == '/' && is_readable(EGW_SERVER_ROOT.parse_url($path = $package, PHP_URL_PATH)) ||
 			// fix old /phpgwapi/js/ path by replacing it with /api/js/
 			substr($package, 0, 13) == '/phpgwapi/js/' && is_readable(EGW_SERVER_ROOT.parse_url($path = str_replace('/phpgwapi/js/', '/api/js/', $package), PHP_URL_PATH)) ||
 			$package[0] == '/' && is_readable(EGW_SERVER_ROOT.($path = $package)) ||
-			$package == '.' && is_readable(EGW_SERVER_ROOT.($path="/$app/js/$file.js")) ||
-			is_readable(EGW_SERVER_ROOT.($path="/$app/js/$package/$file.js")) ||
+			$package == '.' && is_readable(EGW_SERVER_ROOT.($path = "/$app/js/$file.js")) ||
+			is_readable(EGW_SERVER_ROOT.($path = "/$app/js/$package/$file.js")) ||
 			// fix not found by using app='api'
-			$app != 'api' && is_readable(EGW_SERVER_ROOT.($path="/api/js/$package/$file.js")) ||
-			$app != 'phpgwapi' && is_readable(EGW_SERVER_ROOT.($path="/phpgwapi/js/$package/$file.js")))
+			$app != 'api' && is_readable(EGW_SERVER_ROOT.($path = "/api/js/$package/$file.js")) ||
+			$app != 'phpgwapi' && is_readable(EGW_SERVER_ROOT.($path = "/phpgwapi/js/$package/$file.js")))
 		{
 			// normalise /./ to /
 			$path = str_replace('/./', '/', $path);
@@ -316,7 +316,7 @@ 
 			// 	adding the ctime to all js files...
 			if (is_array($file))
 			{
-				foreach($file as $name => $val)
+				foreach ($file as $name => $val)
 				{
 					$args .= (empty($args) ? '?' : '&').$name.'='.urlencode($val);
 				}
@@ -359,7 +359,7 @@ 
 	 * @param string $app ='phpgwapi' application directory to search - default = phpgwapi
 	 * @param boolean $append =true true append file, false prepend (add as first) file used eg. for template itself
 	 */
-	public function include_js_file($package, $file = null, $app = 'phpgwapi', $append=true)
+	public function include_js_file($package, $file = null, $app = 'phpgwapi', $append = true)
 	{
 		// Translate the given parameters into a valid path - false is returned
 		// if the file is not found or the file is already included/has already
@@ -387,7 +387,7 @@ 
 	 * @param array $files
 	 * @param boolean $clear_files =false if true clear list of files, before including given ones
 	 */
-	public function include_files(array $files, $clear_files=false)
+	public function include_files(array $files, $clear_files = false)
 	{
 		if ($clear_files) $this->included_files = array();
 
@@ -403,7 +403,7 @@ 
 	 * @param boolean $clear_files =false if true clear list of files after returning them
 	 * @return array
 	 */
-	public function get_included_files($clear_files=false)
+	public function get_included_files($clear_files = false)
 	{
 		$ret = array_keys($this->included_files);
 		if ($clear_files) $this->included_files = array();
@@ -436,7 +436,7 @@ 
 
 	$paths = !empty($_GET['path']) ? (array)$_GET['path'] : (array)'/stylite/js/filemanager/filemanager.js';
 
-	foreach($paths as $path)
+	foreach ($paths as $path)
 	{
 		echo "\t<h1>".htmlspecialchars($path)."</h1>\n";
 		$mgr->include_js_file($path);

api/src/loader/common.php

Spacing +32 added lines, -32 removed lines

@@ -29,7 +29,7 @@ 
 	{
 		return stripslashes($var);
 	}
-	foreach($var as $key => $val)
+	foreach ($var as $key => $val)
 	{
 		$var[$key] = is_array($val) ? array_stripslashes($val) : stripslashes($val);
 	}
@@ -49,7 +49,7 @@ 
 
 	if (is_null($func_overload)) $func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
 
-	return $func_overload & 2 ? mb_strlen($str,'ascii') : strlen($str);
+	return $func_overload&2 ? mb_strlen($str, 'ascii') : strlen($str);
 }
 
 /**
@@ -60,7 +60,7 @@ 
  * @param int $len
  * @return string
  */
-function cut_bytes(&$data,$offset,$len=null)
+function cut_bytes(&$data, $offset, $len = null)
 {
 	static $func_overload = null;
 
@@ -68,9 +68,9 @@ 
 
 	if (is_null($len))
 	{
-		return $func_overload & 2 ? mb_substr($data,$offset,bytes($data),'ascii') : substr($data,$offset);
+		return $func_overload&2 ? mb_substr($data, $offset, bytes($data), 'ascii') : substr($data, $offset);
 	}
-	return $func_overload & 2 ? mb_substr($data,$offset,$len,'ascii') : substr($data,$offset,$len);
+	return $func_overload&2 ? mb_substr($data, $offset, $len, 'ascii') : substr($data, $offset, $len);
 }
 
 if (!function_exists('imap_rfc822_parse_adrlist'))
@@ -102,10 +102,10 @@ 
 	{
 		$addresses = array();
 		$pending = '';
-		foreach(explode(',', $address) as $part)
+		foreach (explode(',', $address) as $part)
 		{
 			$trimmed = trim(($pending ? $pending.',' : '').$part);
-			if (($trimmed[0] == '"' && substr($trimmed, -1) != '>')||strpos($part, '@')===false)
+			if (($trimmed[0] == '"' && substr($trimmed, -1) != '>') || strpos($part, '@') === false)
 			{
 				$pending .= ($pending ? $pending.',' : '').$part;
 				continue;
@@ -158,7 +158,7 @@ 
 		//if (!preg_match('/^[!#$%&\'*+/0-9=?A-Z^_`a-z{|}~-]+$/u', $personal))	// that's how I read the rfc(2)822
 		if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))	// but quoting is never wrong, so quote more then necessary
 		{
-			$personal = '"'.str_replace(array('\\', '"'),array('\\\\', '\\"'), $personal).'"';
+			$personal = '"'.str_replace(array('\\', '"'), array('\\\\', '\\"'), $personal).'"';
 		}
 		return ($personal ? $personal.' <' : '').$mailbox.($host ? '@'.$host : '').($personal ? '>' : '');
 	}
@@ -179,7 +179,7 @@ 
 	{
 		return array((object)array(
 			'text' => Horde_Mime::decode($text),
-			'charset' => Api\Translation::charset(),	// is already in our internal encoding!
+			'charset' => Api\Translation::charset(), // is already in our internal encoding!
 		));
 	}
 }
@@ -208,7 +208,7 @@ 
 	 * @param int $len
 	 * @return string
 	 */
-	function mb_substr(&$data, $offset, $len=null)
+	function mb_substr(&$data, $offset, $len = null)
 	{
 		return is_null($len) ? substr($data, $offset) : substr($data, $offset, $len);
 	}
@@ -236,7 +236,7 @@ 
 			return 'NULL';
 		case 'object':
 		case 'array':
-			return str_replace(array("\n",'    '/*,'Array'*/),'',print_r($var,true));
+			return str_replace(array("\n", '    '/*,'Array'*/), '', print_r($var, true));
 	}
 	return 'UNKNOWN TYPE!';
 }
@@ -249,14 +249,14 @@ 
  * @return boolean true if loaded now, false otherwise
  * @throws Api\Exception\AssertionFailed
  */
-function check_load_extension($extension,$throw=false)
+function check_load_extension($extension, $throw = false)
 {
 	if (!defined('PHP_SHLIB_PREFIX'))
 	{
-		define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
+		define('PHP_SHLIB_PREFIX', PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
 	}
 	// we check for the existens of 'dl', as multithreaded webservers dont have it and some hosters disable it !!!
-	$loaded = extension_loaded($extension) || function_exists('dl') && @dl($dl=PHP_SHLIB_PREFIX.$extension.'.'.PHP_SHLIB_SUFFIX);
+	$loaded = extension_loaded($extension) || function_exists('dl') && @dl($dl = PHP_SHLIB_PREFIX.$extension.'.'.PHP_SHLIB_SUFFIX);
 
 	if (!$loaded && $throw)
 	{
@@ -284,7 +284,7 @@ 
  * @param int/string $default_id either a name or an id
  * @return int account_id
  */
-function get_account_id($account_id = '',$default_id = '')
+function get_account_id($account_id = '', $default_id = '')
 {
 	if (gettype($account_id) == 'integer')
 	{
@@ -294,7 +294,7 @@ 
 	{
 		if ($default_id == '')
 		{
-			return (isset($GLOBALS['egw_info']['user']['account_id'])?$GLOBALS['egw_info']['user']['account_id']:0);
+			return (isset($GLOBALS['egw_info']['user']['account_id']) ? $GLOBALS['egw_info']['user']['account_id'] : 0);
 		}
 		elseif (is_string($default_id))
 		{
@@ -304,7 +304,7 @@ 
 	}
 	elseif (is_string($account_id))
 	{
-		if((int)$account_id && $GLOBALS['egw']->accounts->exists((int)$account_id) == True)
+		if ((int)$account_id && $GLOBALS['egw']->accounts->exists((int)$account_id) == True)
 		{
 			return (int)$account_id;
 		}
@@ -322,9 +322,9 @@ 
  * @param boolean $print =true print or return the content
  * @return string if !$print
  */
-function _debug_array($array,$print=True)
+function _debug_array($array, $print = True)
 {
-	$output = '<pre>'.print_r($array,true)."</pre>\n";
+	$output = '<pre>'.print_r($array, true)."</pre>\n";
 
 	if ($print)
 	{
@@ -343,28 +343,28 @@ 
  * @param int $remove =0 number of levels to remove
  * @return string function-names separated by slashes (beginning with the calling function not this one)
  */
-function function_backtrace($remove=0)
+function function_backtrace($remove = 0)
 {
 	if (function_exists('debug_backtrace'))
 	{
 		$backtrace = debug_backtrace();
 		//echo "function_backtrace($remove)<pre>".print_r($backtrace,True)."</pre>\n";
-		foreach($backtrace as $n => $level)
+		foreach ($backtrace as $n => $level)
 		{
 			if ($remove-- < 0)
 			{
-				$ret[] = (isset($level['class'])?$level['class'].$level['type']:'').$level['function'].
-					($n > 0 && isset($backtrace[$n-1]['line']) ? ':'.$backtrace[$n-1]['line'] : '').	// add line number of call
+				$ret[] = (isset($level['class']) ? $level['class'].$level['type'] : '').$level['function'].
+					($n > 0 && isset($backtrace[$n - 1]['line']) ? ':'.$backtrace[$n - 1]['line'] : '').// add line number of call
 					(!$level['class'] && !is_object($level['args'][0]) && $level['function'] != 'unserialize' ?
-					'('.substr(str_replace(EGW_SERVER_ROOT,'',(string)$level['args'][0]),0,64).')' : '');
+					'('.substr(str_replace(EGW_SERVER_ROOT, '', (string)$level['args'][0]), 0, 64).')' : '');
 			}
 		}
 		if (is_array($ret))
 		{
-			return implode(' / ',$ret);
+			return implode(' / ', $ret);
 		}
 	}
-	return $_GET['menuaction'] ? $_GET['menuaction'] : str_replace(EGW_SERVER_ROOT,'',$_SERVER['SCRIPT_FILENAME']);
+	return $_GET['menuaction'] ? $_GET['menuaction'] : str_replace(EGW_SERVER_ROOT, '', $_SERVER['SCRIPT_FILENAME']);
 }
 
 if (!function_exists('lang') || defined('NO_LANG'))	// setup declares an own version
@@ -376,14 +376,14 @@ 
 	 * @param string $vars =null multiple values to replace the placeholders
 	 * @return string translated message with placeholders replaced
 	 */
-	function lang($key,$vars=null)
+	function lang($key, $vars = null)
 	{
-		if(!is_array($vars))
+		if (!is_array($vars))
 		{
 			$vars = func_get_args();
-			array_shift($vars);	// remove $key
+			array_shift($vars); // remove $key
 		}
-		return Api\Translation::translate($key,$vars);
+		return Api\Translation::translate($key, $vars);
 	}
 }
 
@@ -413,9 +413,9 @@ 
 	 *
 	 * @deprecated use $GLOBALS['egw']->framework->sidebox()
 	 */
-	function display_sidebox($appname,$menu_title,$_file)
+	function display_sidebox($appname, $menu_title, $_file)
 	{
 		$file = str_replace('preferences.uisettings.index', 'preferences.preferences_settings.index', $_file);
-		$GLOBALS['egw']->framework->sidebox($appname,$menu_title,$file);
+		$GLOBALS['egw']->framework->sidebox($appname, $menu_title, $file);
 	}
 }