EGroupware / egroupware

addressbook/inc/class.addressbook_contactform.inc.php

Doc Comments +11 added lines, -15 removed lines

@@ -30,14 +30,12 @@ 
 	/**
 	 * Shows the contactform and stores the submitted data
 	 *
-	 * @param array $content=null submitted eTemplate content
-	 * @param int $addressbook=null int owner-id of addressbook to save contacts too
-	 * @param array $fields=null field-names to show
-	 * @param string $msg=null message to show after submitting the form
-	 * @param string $email=null comma-separated email addresses
-	 * @param string $tpl_name=null custom etemplate to use
-	 * @param string $subject=null subject for email
-	 * @param string $copytoreceiver=false send a copy of notification to receiver
+	 * @param array $content submitted eTemplate content
+	 * @param int $addressbook int owner-id of addressbook to save contacts too
+	 * @param array $fields field-names to show
+	 * @param string $tpl_name custom etemplate to use
+	 * @param string $subject subject for email
+	 * @param string $copytoreceiver send a copy of notification to receiver
 	 * @return string html content
 	 */
 	function display(array $content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array())
@@ -49,13 +47,11 @@ 
 	 * Shows the contactform and stores the submitted data ($content is a var parameter, eg. for extending classes)
 	 *
 	 * @param array &$content=null submitted eTemplate content
-	 * @param int $addressbook=null int owner-id of addressbook to save contacts too
-	 * @param array $fields=null field-names to show
-	 * @param string $msg=null message to show after submitting the form
-	 * @param string $email=null comma-separated email addresses
-	 * @param string $tpl_name=null custom etemplate to use
-	 * @param string $subject=null subject for email
-	 * @param string $copytoreceiver=false send a copy of notification to receiver
+	 * @param int $addressbook int owner-id of addressbook to save contacts too
+	 * @param array $fields field-names to show
+	 * @param string $tpl_name custom etemplate to use
+	 * @param string $subject subject for email
+	 * @param string $copytoreceiver send a copy of notification to receiver
 	 * @return string html content
 	 */
 	function display_var(array &$content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array())

Braces +46 added lines, -13 removed lines

@@ -57,28 +57,41 @@ 
 	function display_var(array &$content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array())
 	{
 		#error_log( "<p>addressbook_contactform::display(".print_r($content,true).",$addressbook,".print_r($fields,true).",$msg,$tpl_name)</p>\n");
-		if (empty($tpl_name) && !empty($content['tpl_form_name'])) $tpl_name =$content['tpl_form_name'];
+		if (empty($tpl_name) && !empty($content['tpl_form_name']))
+		{
+			$tpl_name =$content['tpl_form_name'];
+		}
 		$tpl = new etemplate($tpl_name ? $tpl_name : 'addressbook.contactform');
 		// initializing some fields
-		if (!$fields) $fields = array('org_name','n_fn','email','tel_work','url','note','captcha');
+		if (!$fields)
+		{
+			$fields = array('org_name','n_fn','email','tel_work','url','note','captcha');
+		}
 		$submitted = false;
 		// check if submitted
 		if (is_array($content))
 		{
 			if ((isset($content['captcha_result']) && $content['captcha'] != $content['captcha_result']) ||	// no correct captcha OR
 				(time() - $content['start_time'] < 10 &&				// bot indicator (less then 10 sec to fill out the form and
-				!$GLOBALS['egw_info']['etemplate']['java_script']))	// javascript disabled)
+				!$GLOBALS['egw_info']['etemplate']['java_script']))
+			{
+				// javascript disabled)
 			{
 				$submitted = "truebutfalse";
+			}
 				$tpl->set_validation_error('captcha',lang('Wrong - try again ...'));
 			}
 			elseif ($content['submitit'])
 			{
 				$submitted = true;
 				$contact = new addressbook_bo();
-				if ($content['owner'])	// save the contact in the addressbook
+				if ($content['owner'])
+				{
+					// save the contact in the addressbook
 				{
-					$content['private'] = 0;	// in case default_private is set
+					$content['private'] = 0;
+				}
+				// in case default_private is set
 					if (($id = $contact->save($content)))
 					{
 						// check for fileuploads and attach the found files
@@ -136,9 +149,12 @@ 
 			$custom = 1;
 			foreach($fields as $name)
 			{
-				if ($name[0] == '#')	// custom field
+				if ($name[0] == '#')
+				{
+					// custom field
 				{
 					static $contact;
+				}
 					if (is_null($contact))
 					{
 						$contact = new addressbook_bo();
@@ -169,12 +185,19 @@ 
 			unset($content['submitit']);
 			$custom = 1;
 			// fieldnames are "defined" by the commit attempt, that way, we do not have to remember them
-			foreach($content as $name => $value) {
+			foreach($content as $name => $value)
+			{
 				$preserv[$name]=$value;
-				if ($name[0] == '#')     // custom field
+				if ($name[0] == '#')
+				{
+					// custom field
 				{
 					static $contact;
-					if (is_null($contact)) $contact = new addressbook_bo();
+				}
+					if (is_null($contact))
+					{
+						$contact = new addressbook_bo();
+					}
 					$content['show']['custom'.$custom] = true;
 					$content['customfield'][$custom] = $name;
 					$content['customlabel'][$custom] = $contact->customfields[substr($name,1)]['label'];
@@ -197,15 +220,25 @@ 
 		}
 		$content['addr_format'] = $GLOBALS['egw_info']['user']['preferences']['addressbook']['addr_format'];
 
-		if ($addressbook) $preserv['owner'] = $addressbook;
-		if ($msg) $preserv['msg'] = $msg;
+		if ($addressbook)
+		{
+			$preserv['owner'] = $addressbook;
+		}
+		if ($msg)
+		{
+			$preserv['msg'] = $msg;
+		}
 
 		// a simple calculation captcha
 		$num1 = rand(1,99);
 		$num2 = rand(1,99);
-		if ($num2 > $num1)	// keep the result positive
+		if ($num2 > $num1)
+		{
+			// keep the result positive
 		{
-			$n = $num1; $num1 = $num2; $num2 = $n;
+			$n = $num1;
+		}
+		$num1 = $num2; $num2 = $n;
 		}
 		if (in_array('captcha',$fields))
 		{

addressbook/inc/class.addressbook_hooks.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -423,7 +423,7 @@ 
 	 * Register addressbook for group-acl
 	 *
 	 * @param array $args hook-params (not used)
-	 * @return boolean|string true=standard group acl link, of string with link
+	 * @return boolean true=standard group acl link, of string with link
 	 */
 	static function group_acl($args)
 	{
@@ -437,7 +437,7 @@ 
 	 * For which groups should no group acl be used: addressbook always
 	 *
 	 * @param string|array $data
-	 * @return boolean|array true, false or array with group-account_id's
+	 * @return boolean true, false or array with group-account_id's
 	 */
 	static function not_enum_group_acls($data)
 	{

addressbook/inc/class.addressbook_import_contacts_csv.inc.php

Doc Comments +2 added lines, -4 removed lines

@@ -44,9 +44,7 @@ 
 
 	/**
 	 * imports entries according to given definition object.
-	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function init(importexport_definition &$_definition ) {
 
@@ -84,7 +82,7 @@ 
 	 *
 	 * Updates the count of actions taken
 	 *
-	 * @return boolean success
+	 * @return null|boolean success
 	 */
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{

Braces +127 added lines, -51 removed lines

@@ -14,7 +14,8 @@ 
 /**
  * class import_csv for addressbook
  */
-class addressbook_import_contacts_csv extends importexport_basic_import_csv  {
+class addressbook_import_contacts_csv extends importexport_basic_import_csv
+{
 
 	/**
 	 * conditions for actions
@@ -45,7 +46,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition &$_definition ) {
+	public function init(importexport_definition &$_definition )
+	{
 
 		// fetch the addressbook bo
 		$this->bocontacts = new addressbook_bo();
@@ -87,22 +89,29 @@ 
 	{
 
 		// Set owner, unless it's supposed to come from CSV file
-		if($this->definition->plugin_options['owner_from_csv'] && $record->owner) {
-			if(!is_numeric($record->owner)) {
+		if($this->definition->plugin_options['owner_from_csv'] && $record->owner)
+		{
+			if(!is_numeric($record->owner))
+			{
 				// Automatically handle text owner without explicit translation
 				$new_owner = importexport_helper_functions::account_name2id($record->owner);
-				if($new_owner == '') {
+				if($new_owner == '')
+				{
 					$this->errors[$import_csv->get_current_position()] = lang(
 						'Unable to convert "%1" to account ID.  Using plugin setting (%2) for owner.',
 						$record->owner,
 						common::grab_owner_name($this->user)
 					);
 					$record->owner = $this->user;
-				} else {
+				}
+				else
+				{
 					$record->owner = $new_owner;
 				}
 			}
-		} else {
+		}
+		else
+		{
 			$record->owner = $this->user;
 		}
 
@@ -138,26 +147,41 @@ 
 		// Also handle categories in their own field
 		$record_array = $record->get_record_array();
 		$more_categories = array();
-		foreach($this->definition->plugin_options['field_mapping'] as $number => $field_name) {
+		foreach($this->definition->plugin_options['field_mapping'] as $number => $field_name)
+		{
 			if(!array_key_exists($field_name, $record_array) ||
-				substr($field_name,0,3) != 'cat' || !$record->$field_name || $field_name == 'cat_id') continue;
+				substr($field_name,0,3) != 'cat' || !$record->$field_name || $field_name == 'cat_id')
+			{
+				continue;
+			}
 			list($cat, $cat_id) = explode('-', $field_name);
-			if(is_numeric($record->$field_name) && $record->$field_name != 1) {
+			if(is_numeric($record->$field_name) && $record->$field_name != 1)
+			{
 				// Column has a single category ID
 				$more_categories[] = $record->$field_name;
-			} elseif($record->$field_name == '1' ||
-				(!is_numeric($record->$field_name) && strtolower($record->$field_name) == strtolower(lang('Yes')))) {
+			}
+			elseif($record->$field_name == '1' ||
+				(!is_numeric($record->$field_name) && strtolower($record->$field_name) == strtolower(lang('Yes'))))
+			{
 				// Each category got its own column.  '1' is the database value, lang('yes') is the human value
 				$more_categories[] = $cat_id;
-			} else {
+			}
+			else
+			{
 				// Text categories
 				$more_categories = array_merge($more_categories, importexport_helper_functions::cat_name2id(is_array($record->$field_name) ? $record->$field_name : explode(',',$record->$field_name), $cat_id));
 			}
 		}
-		if(count($more_categories) > 0) $record->cat_id = array_merge(is_array($record->cat_id) ? $record->cat_id : explode(',',$record->cat_id), $more_categories);
+		if(count($more_categories) > 0)
+		{
+			$record->cat_id = array_merge(is_array($record->cat_id) ? $record->cat_id : explode(',',$record->cat_id), $more_categories);
+		}
 
 		// Private set but missing causes hidden entries
-		if(array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == '')) unset($record->private);
+		if(array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == ''))
+		{
+			unset($record->private);
+		}
 
 		// Format birthday as backend requires - converter should give timestamp
 		if($record->bday && is_numeric($record->bday))
@@ -166,17 +190,24 @@ 
 			$record->bday = $time->format('Y-m-d');
 		}
 
-		if ( $this->definition->plugin_options['conditions'] ) {
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+		if ( $this->definition->plugin_options['conditions'] )
+		{
+			foreach ( $this->definition->plugin_options['conditions'] as $condition )
+			{
 				$contacts = array();
-				switch ( $condition['type'] ) {
+				switch ( $condition['type'] )
+				{
 					// exists
 					case 'exists' :
-						if($record_array[$condition['string']]) {
+						if($record_array[$condition['string']])
+						{
 							$searchcondition = array( $condition['string'] => $record_array[$condition['string']]);
 							// if we use account_id for the condition, we need to set the owner for filtering, as this
 							// enables addressbook_so to decide what backend is to be used
-							if ($condition['string']=='account_id') $searchcondition['owner']=0;
+							if ($condition['string']=='account_id')
+							{
+								$searchcondition['owner']=0;
+							}
 							$contacts = $this->bocontacts->search(
 								//array( $condition['string'] => $record[$condition['string']],),
 								'',
@@ -185,19 +216,30 @@ 
 								$searchcondition
 							);
 						}
-						if ( is_array( $contacts ) && count( array_keys( $contacts ) ) >= 1 ) {
+						if ( is_array( $contacts ) && count( array_keys( $contacts ) ) >= 1 )
+						{
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$contacts as $contact ) {
+							foreach ( (array)$contacts as $contact )
+							{
 								$record->id = $contact['id'];
-								if ( $this->definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $contact['cat_id'] ) ) $contact['cat_id'] = explode( ',', $contact['cat_id'] );
-									if ( !is_array( $record_array['cat_id'] ) ) $record->cat_id = explode( ',', $record->cat_id );
+								if ( $this->definition->plugin_options['update_cats'] == 'add' )
+								{
+									if ( !is_array( $contact['cat_id'] ) )
+									{
+										$contact['cat_id'] = explode( ',', $contact['cat_id'] );
+									}
+									if ( !is_array( $record_array['cat_id'] ) )
+									{
+										$record->cat_id = explode( ',', $record->cat_id );
+									}
 									$record->cat_id = implode( ',', array_unique( array_merge( $record->cat_id, $contact['cat_id'] ) ) );
 								}
 								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 							}
-						} else {
+						}
+						else
+						{
 							$action = $condition['false'];
 							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 						}
@@ -224,9 +266,14 @@ 
 						die('condition / action not supported!!!');
 						break;
 				}
-				if ($action['stop']) break;
+				if ($action['stop'])
+				{
+					break;
+				}
 			}
-		} else {
+		}
+		else
+		{
 			// unconditional insert
 			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 		}
@@ -240,15 +287,18 @@ 
 	 * @param importexport_iface_egw_record $record contact data for the action
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
+	{
 		$_data = $record->get_record_array();
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'delete':
 				if($_data['id'])
 				{
-					if ( $this->dry_run ) {
+					if ( $this->dry_run )
+					{
 						//print_r($_data);
 						$this->results[$_action]++;
 						return true;
@@ -269,13 +319,20 @@ 
 				// Only update if there are changes
 				$old = $this->bocontacts->read($_data['id']);
 				// if we get countrycodes as countryname, try to translate them -> the rest should be handled by bo classes.
-				foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
-					if (strlen(trim($_data[$c_prefix.'countryname']))==2) $_data[$c_prefix.'countryname'] = $GLOBALS['egw']->country->get_full_name(trim($_data[$c_prefix.'countryname']),$translated=true);
+				foreach(array('adr_one_', 'adr_two_') as $c_prefix)
+				{
+					if (strlen(trim($_data[$c_prefix.'countryname']))==2)
+					{
+						$_data[$c_prefix.'countryname'] = $GLOBALS['egw']->country->get_full_name(trim($_data[$c_prefix.'countryname']),$translated=true);
+					}
 				}
 				// Don't change a user account into a contact
-				if($old['owner'] == 0) {
+				if($old['owner'] == 0)
+				{
 					unset($_data['owner']);
-				} elseif(!$this->definition->plugin_options['change_owner']) {
+				}
+				elseif(!$this->definition->plugin_options['change_owner'])
+				{
 					// Don't change addressbook of an existing contact
 					unset($_data['owner']);
 				}
@@ -283,9 +340,12 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0) {
+				if(count($changed) == 0)
+				{
 					return true;
-				} else {
+				}
+				else
+				{
 					//error_log(__METHOD__.__LINE__.array2string($changed).' Old:'.$old['adr_one_countryname'].' ('.$old['adr_one_countrycode'].') New:'.$_data['adr_one_countryname'].' ('.$_data['adr_one_countryname'].')');
 				}
 				
@@ -294,24 +354,32 @@ 
 
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if($_action == 'insert')
+				{
 					// Addressbook backend doesn't like inserting with ID specified, it screws up the owner & etag
 					unset($_data['id']);
 				}
-				if(!isset($_data['org_name'])) {
+				if(!isset($_data['org_name']))
+				{
 					// org_name is a trigger to update n_fileas
 					$_data['org_name'] = '';
 				}
 
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
-				} else {
+				}
+				else
+				{
 					$result = $this->bocontacts->save( $_data, $this->is_admin);
-					if(!$result) {
+					if(!$result)
+					{
 						$this->errors[$record_num] = $this->bocontacts->error;
-					} else {
+					}
+					else
+					{
 						$this->results[$_action]++;
 						// This does nothing (yet?) but update the identifier
 						$record->save($result);
@@ -329,7 +397,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Addressbook CSV import');
 	}
 
@@ -338,7 +407,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports contacts into your Addressbook from a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.");
 	}
 
@@ -347,7 +417,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -363,7 +434,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -372,7 +444,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -384,7 +457,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 
@@ -396,7 +470,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -408,7 +483,8 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
                 return $this->results;
         }
 } // end of iface_export_plugin

admin/inc/class.admin_accesslog.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -255,11 +255,10 @@
 	 *
 	 * @param type $action
 	 * @param type $checked
-	 * @param type $use_all
 	 * @param type $success
 	 * @param int $failed
 	 * @param type $action_msg
-	 * @return type number of failed
+	 * @return boolean number of failed
 	 */
 	function action($action,$checked,&$success,&$failed,&$action_msg)
 	{

Braces +22 added lines, -7 removed lines

@@ -67,9 +67,13 @@ 
 	{
 		$heartbeat_limit = Api\Session::heartbeat_limit();
 
-		if ($query['session_list'])	// filter active sessions
+		if ($query['session_list'])
+		{
+			// filter active sessions
 		{
-			$query['col_filter']['lo'] = null;	// not logged out
+			$query['col_filter']['lo'] = null;
+		}
+		// not logged out
 			$query['col_filter'][0] = 'session_dla > '.(int)(time() - $GLOBALS['egw_info']['server']['sessions_timeout']);
 			switch((string)$query['session_list'])
 			{
@@ -100,12 +104,16 @@ 
 			{
 				$row['sessionstatus'] = $row['session_php'];
 			}
-			if ($row['lo']) {
+			if ($row['lo'])
+			{
 				$row['total'] = ($row['lo'] - $row['li']) / 60;
 				$row['sessionstatus'] = 'logged out';
 			}
 			// eg. for bad login or password
-			if (!$row['account_id']) $row['alt_loginid'] = ($row['loginid']?$row['loginid']:lang('none'));
+			if (!$row['account_id'])
+			{
+				$row['alt_loginid'] = ($row['loginid']?$row['loginid']:lang('none'));
+			}
 
 			// do not allow to kill or select own session
 			if ($GLOBALS['egw']->session->sessionid_access_log == $row['sessionid'] && $query['session_list'])
@@ -142,7 +150,10 @@ 
 	function index(array $content=null, $msg='', $sessions_list=false)
 	{
 
-		if (is_array($content)) $sessions_list = $content['nm']['session_list'];
+		if (is_array($content))
+		{
+			$sessions_list = $content['nm']['session_list'];
+		}
 
 		// check if user has access to requested functionality
 		if ($GLOBALS['egw']->acl->check($sessions_list ? 'current_sessions' : 'access_log_acces',1,'admin'))
@@ -215,7 +226,8 @@ 
 				$success = $failed = $action = $action_msg = null;
 				if ($this->action($content['nm']['action'],$content['nm']['selected']
 					,$success,$failed,$action_msg,$msg))
-				{ // In case of action success
+				{
+// In case of action success
 					switch ($action_msg)
 					{
 						case'deleted':
@@ -225,12 +237,15 @@ 
 							$msg = lang('%1 sessions killed',$success);
 					}
 				}
-				elseif($failed) // In case of action failiure
+				elseif($failed)
+				{
+					// In case of action failiure
 				{
 					switch ($action_msg)
 					{
 						case'deleted':
 							$msg = lang('Error deleting log entry!');
+				}
 							break;
 						case'killed':
 							$msg = lang('Permission denied!');

admin/inc/class.admin_categories.inc.php

Doc Comments +2 added lines

@@ -679,6 +679,8 @@
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like '%1 entries deleted'
 	 * @param array $query get_rows parameter
+	 * @param integer $success
+	 * @param integer $failed
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
 	function action($_action, $checked, $use_all, &$success, &$failed, &$action_msg, array $query)

Braces +64 added lines, -17 removed lines

@@ -144,8 +144,14 @@ 
 			{
 				case 'save':
 				case 'apply':
-					if(is_array($content['owner'])) $content['owner'] = implode(',',$content['owner']);
-					if($content['owner'] == '') $content['owner'] = 0;
+					if(is_array($content['owner']))
+					{
+						$content['owner'] = implode(',',$content['owner']);
+					}
+					if($content['owner'] == '')
+					{
+						$content['owner'] = 0;
+					}
 					if ($content['id'] && self::$acl_edit)
 					{
 
@@ -234,7 +240,10 @@ 
 			egw_framework::refresh_opener($msg, $change_color ? null : $refresh_app, $content['id'], $change_color ? null : 'update', $this->appname);
 		}
 		$content['msg'] = $msg;
-		if(!$content['appname']) $content['appname'] = $appname;
+		if(!$content['appname'])
+		{
+			$content['appname'] = $appname;
+		}
 		if($content['data']['icon'])
 		{
 			$content['icon_url'] = $content['base_url'] . $content['data']['icon'];
@@ -290,7 +299,9 @@ 
 			// Allow admins access to all categories as parent
 			$content['all_cats'] = 'all_no_acl';
 			$readonlys['owner'] = false;
-		} else {
+		}
+		else
+		{
 			$readonlys['owner'] = true;
 			$readonlys['access'] = $content['owner'] != $GLOBALS['egw_info']['user']['account_id'];
 		}
@@ -301,7 +312,10 @@ 
 			$appname != $content['appname'] || // Can't edit a category from a different app
 			 ($this->appname != 'admin' && $content['owner'] != $GLOBALS['egw_info']['user']['account_id']);
 		// Make sure $content['owner'] is an array otherwise it wont show up values in the multiselectbox
-		if (!is_array($content['owner'])) $content['owner'] = explode(',',$content['owner']);
+		if (!is_array($content['owner']))
+		{
+			$content['owner'] = explode(',',$content['owner']);
+		}
 		$tmpl = new etemplate_new('admin.categories.edit');
 		$tmpl->exec($this->edit_link,$content,$sel_options,$readonlys,$content+array(
 			'old_parent' => $content['old_parent'] ? $content['old_parent'] : $content['parent'], 'appname' => $appname
@@ -360,9 +374,15 @@ 
 		{
 			$globalcat = false;
 		}
-		if ($globalcat && $query['filter']) $filter['access'] = 'public';
+		if ($globalcat && $query['filter'])
+		{
+			$filter['access'] = 'public';
+		}
 		// new column-filter access has highest priority
-		if (!empty($query['col_filter']['access']))$filter['access'] = $query['col_filter']['access'];
+		if (!empty($query['col_filter']['access']))
+		{
+			$filter['access'] = $query['col_filter']['access'];
+		}
 
 		egw_cache::setSession(__CLASS__.$query['appname'],'nm',$query);
 
@@ -391,7 +411,10 @@ 
 
 			$row['level_spacer'] = str_repeat('    ',$row['level']);
 
-			if ($row['data']['icon']) $row['icon_url'] = self::icon_url($row['data']['icon']);
+			if ($row['data']['icon'])
+			{
+				$row['icon_url'] = self::icon_url($row['data']['icon']);
+			}
 
 			$row['subs'] = count($row['children']);
 
@@ -422,13 +445,19 @@ 
 			$readonlys['nm']["add[$row[id]]"]    = !self::$acl_add_sub;
 			$readonlys['nm']["delete[$row[id]]"] = !self::$acl_delete;
 		}
-		if (true) $rows = $count <= $query['num_rows'] ? array_values($rows) : array_slice($rows, $query['start'], $query['num_rows']);
+		if (true)
+		{
+			$rows = $count <= $query['num_rows'] ? array_values($rows) : array_slice($rows, $query['start'], $query['num_rows']);
+		}
 		// make appname available for actions
 		$rows['appname'] = $query['appname'];
 		$rows['edit_link'] = $this->edit_link;
 
 		// disable access column for global categories
-		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'admin') $rows['no_access'] = true;
+		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'admin')
+		{
+			$rows['no_access'] = true;
+		}
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang($this->appname).' - '.lang('categories').
 			($query['appname'] != categories::GLOBAL_APPNAME ? ': '.lang($query['appname']) : '');
@@ -445,11 +474,18 @@ 
 	public function index(array $content=null,$msg='')
 	{
 		//_debug_array($_GET);
-		if ($this->appname != 'admin') translation::add_app('admin');	// need admin translations
+		if ($this->appname != 'admin')
+		{
+			translation::add_app('admin');
+		}
+		// need admin translations
 
 		if(!isset($content))
 		{
-			if (isset($_GET['msg'])) $msg = $_GET['msg'];
+			if (isset($_GET['msg']))
+			{
+				$msg = $_GET['msg'];
+			}
 
 			$appname = categories::GLOBAL_APPNAME;
 			foreach(array($content['nm']['appname'], $_GET['cats_app'], $_GET['appname']) as $field)
@@ -590,7 +626,8 @@ 
 			$readonlys['nm']['rows']['owner'] = true;
 			$readonlys['nm']['col_filter']['owner'] = true;
 		}
-		if($appname == categories::GLOBAL_APPNAME) {
+		if($appname == categories::GLOBAL_APPNAME)
+		{
 			$sel_options['app'] = array(''=>'');
 			$readonlys['nm']['rows']['app'] = true;
 		}
@@ -608,7 +645,8 @@ 
 		));
 	}
 
-	protected function get_actions($appname=categories::GLOBAL_APPNAME) {
+	protected function get_actions($appname=categories::GLOBAL_APPNAME)
+	{
 
 		$actions = array(
 			'open' => array(        // does edit if allowed, otherwise view
@@ -719,11 +757,17 @@ 
 				list($add_remove, $ids_csv) = explode('_', $settings, 2);
 				$ids = explode(',', $ids_csv);
 				// Adding 'All users' removes all the others
-				if($add_remove == 'add' && array_search(categories::GLOBAL_ACCOUNT,$ids) !== false) $ids = array(categories::GLOBAL_ACCOUNT);
+				if($add_remove == 'add' && array_search(categories::GLOBAL_ACCOUNT,$ids) !== false)
+				{
+					$ids = array(categories::GLOBAL_ACCOUNT);
+				}
 
 				foreach($checked as $id)
 				{
-					if (!$data = $cats->read($id)) continue;
+					if (!$data = $cats->read($id))
+					{
+						continue;
+					}
 					$data['owner'] = explode(',',$data['owner']);
 					if(array_search(categories::GLOBAL_ACCOUNT,$data['owner']) !== false || $data['owner'][0] > 0)
 					{
@@ -763,7 +807,10 @@ 
 				continue;
 			}
 			// Skip apps that don't show in the app bar, they [usually] don't have categories
-			if($data['status'] > 1 || in_array($app, array('home','admin','felamimail','sitemgr','sitemgr-link'))) continue;
+			if($data['status'] > 1 || in_array($app, array('home','admin','felamimail','sitemgr','sitemgr-link')))
+			{
+				continue;
+			}
 			if ($GLOBALS['egw_info']['user']['apps'][$app])
 			{
 				$apps[$app] = $data['title'] ? $data['title'] : lang($app);

admin/inc/class.admin_statistics.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -291,7 +291,7 @@
 	 * Check if next submission is due, in which case we call submit and NOT return to the admin hook
 	 *
 	 * @param boolean $redirect should we redirect or return true
-	 * @return boolean true if statistic submission is due
+	 * @return boolean|null true if statistic submission is due
 	 */
 	public static function check($redirect=true)
 	{

Braces +8 added lines, -2 removed lines

@@ -203,9 +203,12 @@ 
 			{
 				continue;	// --> ignore to not submit too much
 			}
-			if (($users = self::gather_app_users($app)))	// ignore apps noone is allowed to run
+			if (($users = self::gather_app_users($app)))
+			{
+				// ignore apps noone is allowed to run
 			{
 				$data['apps'][$app] = $app.':'.round(100.0*$users/$data['users']).'%';
+			}
 				if (($entries = self::gather_app_entries($app)))
 				{
 					$data['apps'][$app] .= ':'.$entries;
@@ -302,7 +305,10 @@ 
 		{
 			return false;
 		}
-		if (!$redirect) return true;
+		if (!$redirect)
+		{
+			return true;
+		}
 
 		//die('Due for new statistics submission: last_submit='.$config[self::CONFIG_LAST_SUBMIT ].', postpone='.$config[self::CONFIG_POSTPONE_SUBMIT].', '.function_backtrace());
 		Egw::redirect_link('/index.php',array(

admin/inc/class.admin_ui.inc.php

Doc Comments +4 added lines

@@ -491,6 +491,10 @@
 	protected static function call_hook()
 	{
 		self::$hook_data = array();
+
+		/**
+		 * @param string $appname
+		 */
 		function display_section($appname,$file,$file2=False)
 		{
 			admin_ui::$hook_data[$appname] = $file2 ? $file2 : $file;

Braces +85 added lines, -21 removed lines

@@ -48,7 +48,10 @@ 
 		}
 		$tpl = new Etemplate('admin.index');
 
-		if (!is_array($content)) $content = array();
+		if (!is_array($content))
+		{
+			$content = array();
+		}
 		$content['nm'] = array(
 			'get_rows' => 'admin_ui::get_users',
 			'no_cat' => true,
@@ -132,7 +135,9 @@ 
 				'group' => 2,
 			),
 		);
-		if (!$GLOBALS['egw']->acl->check('account_access',64,'admin'))	// no rights to set ACL-rights
+		if (!$GLOBALS['egw']->acl->check('account_access',64,'admin'))
+		{
+			// no rights to set ACL-rights
 		{
 			$actions['deny'] = array(
 				'caption'   => 'Deny access',
@@ -143,6 +148,7 @@ 
 				'group'     => 2,
 			);
 		}
+		}
 		$group = 5;	// allow to place actions in different groups by hook, this is the default
 		// supporting both old way using $GLOBALS['menuData'] and new just returning data in hook
 		$apps = array_unique(array_merge(array('admin'), Api\Hooks::implemented('edit_group')));
@@ -150,7 +156,10 @@ 
 		{
 			$GLOBALS['menuData'] = $data = array();
 			$data = Api\Hooks::single('edit_group', $app);
-			if (!is_array($data)) $data = $GLOBALS['menuData'];
+			if (!is_array($data))
+			{
+				$data = $GLOBALS['menuData'];
+			}
 			//error_log(__METHOD__."() app $app returned ".array2string($data));
 			foreach($data as $item)
 			{
@@ -170,15 +179,33 @@ 
 					{
 						$item['popup'] = $matches[2].'x'.$matches[3];
 						$item['onExecute'] = 'javaScript:nm_action';
-						if (isset($matches[5])) $item['tooltip'] = $matches[5];
+						if (isset($matches[5]))
+						{
+							$item['tooltip'] = $matches[5];
+						}
 						unset($item['options']);
 					}
 				}
-				if (empty($item['icon'])) $item['icon'] = $app.'/navbar';
-				if (empty($item['group'])) $item['group'] = $group;
-				if (empty($item['onExecute'])) $item['onExecute'] = 'javaScript:app.admin.group';
-				if (!isset($item['allowOnMultiple'])) $item['allowOnMultiple'] = false;
-				if (!isset($item['enableId'])) $item['enableId'] = '^/groups/-\\d+';
+				if (empty($item['icon']))
+				{
+					$item['icon'] = $app.'/navbar';
+				}
+				if (empty($item['group']))
+				{
+					$item['group'] = $group;
+				}
+				if (empty($item['onExecute']))
+				{
+					$item['onExecute'] = 'javaScript:app.admin.group';
+				}
+				if (!isset($item['allowOnMultiple']))
+				{
+					$item['allowOnMultiple'] = false;
+				}
+				if (!isset($item['enableId']))
+				{
+					$item['enableId'] = '^/groups/-\\d+';
+				}
 
 				$actions[$item['id']] = $item;
 			}
@@ -231,7 +258,10 @@ 
 			{
 				$GLOBALS['menuData'] = $data = array();
 				$data = Api\Hooks::single('edit_user', $app);
-				if (!is_array($data)) $data = $GLOBALS['menuData'];
+				if (!is_array($data))
+				{
+					$data = $GLOBALS['menuData'];
+				}
 				foreach($data as $item)
 				{
 					// allow hook to return "real" actions, but still support legacy: description, url, extradata, options
@@ -249,15 +279,30 @@ 
 						if ($item['options'] && preg_match('/(egw_openWindowCentered2?|window.open)\([^)]+,(\d+),(\d+).*(title="([^"]+)")?/', $item['options'], $matches))
 						{
 							$item['popup'] = $matches[2].'x'.$matches[3];
-							if (isset($matches[5])) $item['tooltip'] = $matches[5];
+							if (isset($matches[5]))
+							{
+								$item['tooltip'] = $matches[5];
+							}
 							unset($item['options']);
 						}
 					}
-					if (empty($item['icon'])) $item['icon'] = $app.'/navbar';
-					if (empty($item['group'])) $item['group'] = $group;
-					if (empty($item['onExecute'])) $item['onExecute'] = $item['popup'] ?
+					if (empty($item['icon']))
+					{
+						$item['icon'] = $app.'/navbar';
+					}
+					if (empty($item['group']))
+					{
+						$item['group'] = $group;
+					}
+					if (empty($item['onExecute']))
+					{
+						$item['onExecute'] = $item['popup'] ?
 						'javaScript:nm_action' : 'javaScript:app.admin.iframe_location';
-					if (!isset($item['allowOnMultiple'])) $item['allowOnMultiple'] = false;
+					}
+					if (!isset($item['allowOnMultiple']))
+					{
+						$item['allowOnMultiple'] = false;
+					}
 
 					$actions[$item['id']] = $item;
 				}
@@ -313,7 +358,10 @@ 
 						($row['account_expires'] != -1 ? lang('Expires').' '.Api\DateTime::to($row['account_expires'], true) :
 							lang('Enabled')));
 
-			if (!self::$accounts->is_active($row)) $row['status_class'] = 'adminAccountInactive';
+			if (!self::$accounts->is_active($row))
+			{
+				$row['status_class'] = 'adminAccountInactive';
+			}
 		}
 
 		return self::$accounts->total;
@@ -367,7 +415,10 @@ 
 							'link' => $data,
 						);
 					}
-					if (empty($data['text'])) $data['text'] = $text;
+					if (empty($data['text']))
+					{
+						$data['text'] = $text;
+					}
 					if (empty($data['id']))
 					{
 						$data['id'] = $root.($app == 'admin' ? 'admin' : 'apps/'.$app).'/';
@@ -392,7 +443,11 @@ 
 					unset($data['icon']);
 					$parent =& $tree['item'];
 					$parts = explode('/', $data['id']);
-					if ($data['id'][0] == '/') array_shift($parts);	// remove root
+					if ($data['id'][0] == '/')
+					{
+						array_shift($parts);
+					}
+					// remove root
 					array_pop($parts);
 					$path = '';
 					foreach($parts as $part)
@@ -411,14 +466,23 @@ 
 								'item' => array(),
 								'child' => 1,
 							);
-							if ($path == '/admin') $parent[$path]['open'] = true;
+							if ($path == '/admin')
+							{
+								$parent[$path]['open'] = true;
+							}
 						}
 						$parent =& $parent[$path]['item'];
 					}
 					$data['text'] = lang($data['text']);
-					if (!empty($data['tooltip'])) $data['tooltip'] = lang($data['tooltip']);
+					if (!empty($data['tooltip']))
+					{
+						$data['tooltip'] = lang($data['tooltip']);
+					}
 					// make sure keys are unique, as we overwrite tree entries otherwise
-					if (isset($parent[$data['id']])) $data['id'] .= md5($data['link']);
+					if (isset($parent[$data['id']]))
+					{
+						$data['id'] .= md5($data['link']);
+					}
 					$parent[$data['id']] = self::fix_userdata($data);
 				}
 			}

api/src/Vfs/Filesystem/StreamWrapper.php

Doc Comments +3 added lines, -3 removed lines

@@ -271,7 +271,7 @@ 
 	 *
 	 * If you have cached data in your stream but not yet stored it into the underlying storage, you should do so now.
 	 *
-	 * @return booelan TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored.
+	 * @return boolean TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored.
 	 */
 	function stream_flush ( )
 	{
@@ -507,7 +507,7 @@ 
 	 *
 	 * @param string $url URL that was passed to opendir() and that this object is expected to explore.
 	 * @param int $options
-	 * @return booelan
+	 * @return boolean
 	 */
 	function dir_opendir ( $url, $options )
 	{
@@ -616,7 +616,7 @@ 
 	 * It should reset the output generated by dir_readdir(). i.e.:
 	 * The next call to dir_readdir() should return the first entry in the location returned by dir_opendir().
 	 *
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function dir_rewinddir ( )
 	{

Braces +90 added lines, -22 removed lines

@@ -131,14 +131,20 @@ 
 		$read_only = str_replace('b','',$mode) == 'r';
 
 		// check access rights, based on the eGW mount perms
-		if (!($stat = self::url_stat($url,0)) || $mode[0] == 'x')	// file not found or file should NOT exist
+		if (!($stat = self::url_stat($url,0)) || $mode[0] == 'x')
+		{
+			// file not found or file should NOT exist
 		{
 			$dir = Vfs::dirname($url);
+		}
 			if ($mode[0] == 'r' ||	// does $mode require the file to exist (r,r+)
 				$mode[0] == 'x' ||	// or file should not exist, but does
-				!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=self::url_stat($dir,0)))	// or we are not allowed to 																																			create it
+				!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=self::url_stat($dir,0)))
+			{
+				// or we are not allowed to 																																			create it
 			{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file does not exist or can not be created!");
+			}
 				if (!($options & STREAM_URL_STAT_QUIET))
 				{
 					trigger_error(__METHOD__."($url,$mode,$options) file does not exist or can not be created!",E_USER_WARNING);
@@ -146,9 +152,12 @@ 
 				return false;
 			}
 		}
-		elseif (!$read_only && !Vfs::check_access($url,Vfs::WRITABLE,$stat))	// we are not allowed to edit it
+		elseif (!$read_only && !Vfs::check_access($url,Vfs::WRITABLE,$stat))
+		{
+			// we are not allowed to edit it
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file can not be edited!");
+		}
 			if (!($options & STREAM_URL_STAT_QUIET))
 			{
 				trigger_error(__METHOD__."($url,$mode,$options) file can not be edited!",E_USER_WARNING);
@@ -157,7 +166,10 @@ 
 		}
 		if (!$read_only && self::deny_script($url))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) permission denied, file is a script!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$mode,$options) permission denied, file is a script!");
+			}
 			if (!($options & STREAM_URL_STAT_QUIET))
 			{
 				trigger_error(__METHOD__."($url,$mode,$options) permission denied, file is a script!",E_USER_WARNING);
@@ -168,7 +180,10 @@ 
 		// open the "real" file
 		if (!($this->opened_stream = fopen($path=Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH)),$mode,$options)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) fopen('$path','$mode',$options) returned false!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$mode,$options) fopen('$path','$mode',$options) returned false!");
+			}
 			return false;
 		}
 		$this->opened_stream_url = $url;
@@ -313,7 +328,10 @@ 
 		// check access rights (file need to exist and directory need to be writable
 		if (!file_exists($path) || is_dir($path) || !Vfs::check_access(Vfs::dirname($url),Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		return unlink($path);
@@ -339,18 +357,27 @@ 
 		// check access rights
 		if (!($from_stat = self::url_stat($url_from,0)) || !Vfs::check_access(Vfs::dirname($url_from),Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $from[path] permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to): $from[path] permission denied!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		$to_dir = Vfs::dirname($url_to);
 		if (!Vfs::check_access($to_dir,Vfs::WRITABLE,$to_dir_stat = self::url_stat($to_dir,0)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $to_dir permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to): $to_dir permission denied!");
+			}
 			return false;	// no permission or parent-dir does not exist
 		}
 		if (self::deny_script($url_to))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to) permission denied, file is a script!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to) permission denied, file is a script!");
+			}
 			return false;
 		}
 		// the filesystem stream-wrapper does NOT allow to rename files to directories, as this makes problems
@@ -359,13 +386,19 @@ 
 			($to_stat['mime'] === self::DIR_MIME_TYPE) !== ($from_stat['mime'] === self::DIR_MIME_TYPE))
 		{
 			$is_dir = $to_stat['mime'] === self::DIR_MIME_TYPE ? 'a' : 'no';
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) $to[path] is $is_dir directory!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_to,$url_from) $to[path] is $is_dir directory!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		// if destination file already exists, delete it
 		if ($to_stat && !self::unlink($url_to))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
+			}
 			return false;
 		}
 		return rename(Vfs::decodePath($from['path']),Vfs::decodePath($to['path']));
@@ -400,7 +433,10 @@ 
 		// check access rights (in real filesystem AND by mount perms)
 		if (file_exists($path) || !file_exists($parent) || !is_writable($parent) || !Vfs::check_access($parent_url,Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;
 		}
 		return mkdir($path, 0700, $recursive);	// setting mode 0700 allows (only) apache to write into the dir
@@ -426,7 +462,10 @@ 
 		// check access rights (in real filesystem AND by mount perms)
 		if (!file_exists($path) || !is_writable($parent) || !Vfs::check_access(Vfs::dirname($url),Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;
 		}
 		return rmdir($path);
@@ -448,7 +487,10 @@ 
 		// check access rights (in real filesystem AND by mount perms)
 		if (!file_exists($path) || !is_writable($parent) || !Vfs::check_access(Vfs::dirname($url),Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;
 		}
 		return touch($path,$time,$atime);
@@ -511,7 +553,10 @@ 
 	 */
 	function dir_opendir ( $url, $options )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$options)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$options)");
+		}
 
 		$this->opened_dir = null;
 
@@ -521,7 +566,10 @@ 
 
 		if (!($this->opened_dir = opendir($path)))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__."($url,$options) opendir('$path') failed!");
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__."($url,$options) opendir('$path') failed!");
+			}
 			return false;
 		}
 		return true;
@@ -577,7 +625,10 @@ 
 				$stat['mode'] = $stat[2] = $stat['mode'] & ~0222;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$flags) path=$path, mount_mode=".sprintf('0%o',$mode).", mode=".sprintf('0%o',$stat['mode']).'='.Vfs::int2mode($stat['mode']));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$flags) path=$path, mount_mode=".sprintf('0%o',$mode).", mode=".sprintf('0%o',$stat['mode']).'='.Vfs::int2mode($stat['mode']));
+		}
 		return $stat;
 	}
 
@@ -598,14 +649,23 @@ 
 
 			$ignore = !($file === false ||							// stop if no more dirs or
 				($file != '.' && $file != '..' ));					// file not . or ..
-			if (self::LOG_LEVEL > 1 && $ignore) error_log(__METHOD__.'() ignoring '.array2string($file));
+			if (self::LOG_LEVEL > 1 && $ignore)
+			{
+				error_log(__METHOD__.'() ignoring '.array2string($file));
+			}
 		}
 		while ($ignore);
 
 		// encode special chars messing up url's
-		if ($file !== false) $file = Vfs::encodePathComponent($file);
+		if ($file !== false)
+		{
+			$file = Vfs::encodePathComponent($file);
+		}
 
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'() returning '.array2string($file));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'() returning '.array2string($file));
+		}
 
 		return $file;
 	}
@@ -760,9 +820,17 @@ 
 		list($url,$query) = explode('?',$_url,2);
 		$get = null;
 		parse_str($query,$get);
-		if (empty($get['url'])) return false;	// no download url given for this mount-point
+		if (empty($get['url']))
+		{
+			return false;
+		}
+		// no download url given for this mount-point
 
-		if (!($mount_url = Vfs::mount_url($_url))) return false;	// no mount url found, should not happen
+		if (!($mount_url = Vfs::mount_url($_url)))
+		{
+			return false;
+		}
+		// no mount url found, should not happen
 		list($mount_url) = explode('?',$mount_url);
 
 		$relpath = substr($url,strlen($mount_url));

api/src/Vfs/Links/StreamWrapper.php

Doc Comments +1 added lines, -1 removed lines

@@ -316,7 +316,7 @@
 	 *
 	 * @param string $url URL that was passed to opendir() and that this object is expected to explore.
 	 * @param $options
-	 * @return booelan
+	 * @return boolean
 	 */
 	function dir_opendir ( $url, $options )
 	{

Braces +26 added lines, -7 removed lines

@@ -26,7 +26,9 @@ 
  */
 if (!class_exists('EGroupware\\Api\\Vfs\\Links\\LinksParent', false))
 {
-	class LinksParent extends Vfs\Sqlfs\StreamWrapper {}
+	class LinksParent extends Vfs\Sqlfs\StreamWrapper
+	{
+}
 }
 
 /**
@@ -116,7 +118,10 @@ 
 			$access = Api\Link::file_access($app,$id,$required,$rel_path,Vfs::$user);
 			$what = "from Api\Link::file_access('$app',$id,$required,'$rel_path,".Vfs::$user.")";
 		}
-		if (self::DEBUG) error_log(__METHOD__."($url,$check) user=".Vfs::$user." ($what) ".($access?"access granted ($app:$id:$rel_path)":'no access!!!'));
+		if (self::DEBUG)
+		{
+			error_log(__METHOD__."($url,$check) user=".Vfs::$user." ($what) ".($access?"access granted ($app:$id:$rel_path)":'no access!!!'));
+		}
 		return $access;
 	}
 
@@ -180,7 +185,10 @@ 
 				);
 			}
 		}
-		if (self::DEBUG) error_log(__METHOD__."('$url', $flags) calling parent::url_stat(,,".array2string($eacl_check).') returning '.array2string($ret));
+		if (self::DEBUG)
+		{
+			error_log(__METHOD__."('$url', $flags) calling parent::url_stat(,,".array2string($eacl_check).') returning '.array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -238,19 +246,30 @@ 
 
 		if($path[0] != '/')
 		{
-			if (strpos($path,'?') !== false) $query = Vfs::parse_url($path,PHP_URL_QUERY);
+			if (strpos($path,'?') !== false)
+			{
+				$query = Vfs::parse_url($path,PHP_URL_QUERY);
+			}
 			$path = Vfs::parse_url($path,PHP_URL_PATH).($query ? '?'.$query : '');
 		}
 		list(,$apps,$app,$id) = explode('/',$path);
 
 		$ret = false;
-		if ($apps == 'apps' && $app && !$id || self::check_extended_acl($path,Vfs::WRITABLE))	// app directory itself is allways ok
+		if ($apps == 'apps' && $app && !$id || self::check_extended_acl($path,Vfs::WRITABLE))
+		{
+			// app directory itself is allways ok
 		{
-			$current_is_root = Vfs::$is_root; Vfs::$is_root = true;
+			$current_is_root = Vfs::$is_root;
+		}
+		Vfs::$is_root = true;
 			$current_user = Vfs::$user; Vfs::$user = 0;
 
 			$ret = parent::mkdir($path,0,$options|STREAM_MKDIR_RECURSIVE);
-			if ($id) parent::chmod($path,0);	// no other rights
+			if ($id)
+			{
+				parent::chmod($path,0);
+			}
+			// no other rights
 
 			Vfs::$user = $current_user;
 			Vfs::$is_root = $current_is_root;