EGroupware / egroupware

admin/inc/class.admin_messages.inc.php

Spacing +36 added lines, -36 removed lines

@@ -24,11 +24,11 @@ 
 		$select_lang = $_POST['select_lang'];
 		$message     = get_magic_quotes_gpc() ? stripslashes($_POST['message']) : $_POST['message'];
 		$acl_ok = array();
-		if (!$GLOBALS['egw']->acl->check('mainscreen_messa',1,'admin'))
+		if (!$GLOBALS['egw']->acl->check('mainscreen_messa', 1, 'admin'))
 		{
 			$acl_ok['mainscreen'] = True;
 		}
-		if (!$GLOBALS['egw']->acl->check('mainscreen_messa',2,'admin'))
+		if (!$GLOBALS['egw']->acl->check('mainscreen_messa', 2, 'admin'))
 		{
 			$acl_ok['loginscreen'] = True;
 		}
@@ -38,16 +38,16 @@ 
 			$GLOBALS['egw']->redirect_link('/admin/index.php');
 		}
 
-		Framework::includeJS('ckeditor','ckeditor');
+		Framework::includeJS('ckeditor', 'ckeditor');
 
 		$GLOBALS['egw']->template->set_file(array('message' => 'mainscreen_message.tpl'));
-		$GLOBALS['egw']->template->set_block('message','form','form');
-		$GLOBALS['egw']->template->set_block('message','row','row');
-		$GLOBALS['egw']->template->set_block('message','row_2','row_2');
+		$GLOBALS['egw']->template->set_block('message', 'form', 'form');
+		$GLOBALS['egw']->template->set_block('message', 'row', 'row');
+		$GLOBALS['egw']->template->set_block('message', 'row_2', 'row_2');
 
 		if ($_POST['save'])
 		{
-			Api\Translation::write($select_lang,$section,$section.'_message',$message);
+			Api\Translation::write($select_lang, $section, $section.'_message', $message);
 			Framework::message(lang('message has been updated'));
 
 			$section = '';
@@ -59,10 +59,10 @@ 
 		switch ($section)
 		{
 			case 'mainscreen':
-				$GLOBALS['egw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Edit main screen message') . ': '.strtoupper($select_lang);
+				$GLOBALS['egw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Edit main screen message').': '.strtoupper($select_lang);
 				break;
 			case 'loginscreen':
-				$GLOBALS['egw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Edit login screen message') . ': '.strtoupper($select_lang);
+				$GLOBALS['egw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Edit login screen message').': '.strtoupper($select_lang);
 				break;
 			default:
 				$GLOBALS['egw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Main screen message');
@@ -72,70 +72,70 @@ 
 		{
 			echo $GLOBALS['egw']->framework->header();
 
-			$GLOBALS['egw']->template->set_var('form_action',$GLOBALS['egw']->link('/index.php','menuaction=admin.admin_messages.index'));
-			$GLOBALS['egw']->template->set_var('value',' ');
-			$GLOBALS['egw']->template->fp('rows','row_2',True);
+			$GLOBALS['egw']->template->set_var('form_action', $GLOBALS['egw']->link('/index.php', 'menuaction=admin.admin_messages.index'));
+			$GLOBALS['egw']->template->set_var('value', ' ');
+			$GLOBALS['egw']->template->fp('rows', 'row_2', True);
 
 			$langs = Api\Translation::get_installed_langs();
 			$langs['en'] .= ' ('.lang('All languages').')';
 			$lang_select = Api\Html::select('select_lang', 'en', $langs);
 
-			$GLOBALS['egw']->template->set_var('label',lang('Language'));
-			$GLOBALS['egw']->template->set_var('value',$lang_select);
-			$GLOBALS['egw']->template->fp('rows','row',True);
+			$GLOBALS['egw']->template->set_var('label', lang('Language'));
+			$GLOBALS['egw']->template->set_var('value', $lang_select);
+			$GLOBALS['egw']->template->fp('rows', 'row', True);
 
 			$select_section = '<select name="section">'."\n";
-			foreach(array_keys($acl_ok) as $key)
+			foreach (array_keys($acl_ok) as $key)
 			{
 				$select_section .= ' <option value="'.$key.'"'.
-					($key == $_POST['section'] ? ' selected' : '') . '>' .
-					($key == 'mainscreen' ? lang('Main screen') : lang("Login screen")) . "</option>\n";
+					($key == $_POST['section'] ? ' selected' : '').'>'.
+					($key == 'mainscreen' ? lang('Main screen') : lang("Login screen"))."</option>\n";
 			}
 			$select_section .= '</select>';
-			$GLOBALS['egw']->template->set_var('label',lang('Section'));
-			$GLOBALS['egw']->template->set_var('value',$select_section);
-			$GLOBALS['egw']->template->fp('rows','row',True);
+			$GLOBALS['egw']->template->set_var('label', lang('Section'));
+			$GLOBALS['egw']->template->set_var('value', $select_section);
+			$GLOBALS['egw']->template->fp('rows', 'row', True);
 
 			$GLOBALS['egw']->template->set_var('value',
 				Api\Html::submit_button('edit', lang('Edit'))."\n".Api\Html::submit_button('cancel', lang('Cancel')));
-			$GLOBALS['egw']->template->fp('rows','row_2',True);
+			$GLOBALS['egw']->template->fp('rows', 'row_2', True);
 		}
 		else
 		{
-			$current_message = Api\Translation::read($select_lang,$section,$section.'_message');
+			$current_message = Api\Translation::read($select_lang, $section, $section.'_message');
 			if ($_POST['no']) $current_message = strip_tags($current_message);
 			if (empty($_POST['no']) && ($_POST['yes'] || empty($current_message) ||
 				strlen($current_message) != strlen(strip_tags($current_message))))
 			{
-				 $text_or_htmlarea = Api\Html::fckEditorQuick('message','advanced',$current_message,'400px','800px');
+				 $text_or_htmlarea = Api\Html::fckEditorQuick('message', 'advanced', $current_message, '400px', '800px');
 				 $htmlarea_button = Api\Html::submit_button("no", lang('disable WYSIWYG-editor'));
 			}
 			else
 			{
-				 $text_or_htmlarea='<textarea name="message" style="width:100%; min-width:350px; height:300px;" wrap="virtual">' .
-					Api\Html::htmlspecialchars($current_message) . '</textarea>';
+				 $text_or_htmlarea = '<textarea name="message" style="width:100%; min-width:350px; height:300px;" wrap="virtual">'.
+					Api\Html::htmlspecialchars($current_message).'</textarea>';
 				 $htmlarea_button = Api\Html::submit_button("yes", lang('activate WYSIWYG-editor'));
 			}
 			echo $GLOBALS['egw']->framework->header();
 
-			$GLOBALS['egw']->template->set_var('form_action',$GLOBALS['egw']->link('/index.php','menuaction=admin.admin_messages.index'));
-			$GLOBALS['egw']->template->set_var('select_lang',$select_lang);
-			$GLOBALS['egw']->template->set_var('section',$section);
-			$GLOBALS['egw']->template->set_var('value','&nbsp;');
-			$GLOBALS['egw']->template->fp('rows','row_2',True);
+			$GLOBALS['egw']->template->set_var('form_action', $GLOBALS['egw']->link('/index.php', 'menuaction=admin.admin_messages.index'));
+			$GLOBALS['egw']->template->set_var('select_lang', $select_lang);
+			$GLOBALS['egw']->template->set_var('section', $section);
+			$GLOBALS['egw']->template->set_var('value', '&nbsp;');
+			$GLOBALS['egw']->template->fp('rows', 'row_2', True);
 
-			$GLOBALS['egw']->template->set_var('value',$text_or_htmlarea);
+			$GLOBALS['egw']->template->set_var('value', $text_or_htmlarea);
 
-			$GLOBALS['egw']->template->fp('rows','row_2',True);
+			$GLOBALS['egw']->template->fp('rows', 'row_2', True);
 
 			$GLOBALS['egw']->template->set_var('value',
 				Api\Html::submit_button('save', lang('Save'))."\n".Api\Html::submit_button('cancel', lang('Cancel')).
 				"\n".$htmlarea_button);
-			$GLOBALS['egw']->template->fp('rows','row_2',True);
+			$GLOBALS['egw']->template->fp('rows', 'row_2', True);
 		}
 
-		$GLOBALS['egw']->template->set_var('lang_cancel',lang('Cancel'));
-		$GLOBALS['egw']->template->pparse('out','form');
+		$GLOBALS['egw']->template->set_var('lang_cancel', lang('Cancel'));
+		$GLOBALS['egw']->template->pparse('out', 'form');
 
 		echo $GLOBALS['egw']->framework->footer();
 	}

Braces +8 added lines, -2 removed lines

@@ -52,10 +52,13 @@ 
 
 			$section = '';
 		}
-		if ($_POST['cancel'])	// back to section/lang-selection
+		if ($_POST['cancel'])
+		{
+			// back to section/lang-selection
 		{
 			$message = $section = '';
 		}
+		}
 		switch ($section)
 		{
 			case 'mainscreen':
@@ -103,7 +106,10 @@ 
 		else
 		{
 			$current_message = Api\Translation::read($select_lang,$section,$section.'_message');
-			if ($_POST['no']) $current_message = strip_tags($current_message);
+			if ($_POST['no'])
+			{
+				$current_message = strip_tags($current_message);
+			}
 			if (empty($_POST['no']) && ($_POST['yes'] || empty($current_message) ||
 				strlen($current_message) != strlen(strip_tags($current_message))))
 			{

admin/inc/class.admin_customtranslation.inc.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param array $_content =null
 	 * @param string $msg =''
 	 */
-	function index(array $_content=null, $msg='')
+	function index(array $_content = null, $msg = '')
 	{
 		if (is_array($_content))
 		{
@@ -44,17 +44,17 @@ 
 				list($action) = each($_content['button']);
 				unset($_content['button']);
 			}
-			elseif($_content['rows']['delete'])
+			elseif ($_content['rows']['delete'])
 			{
 				list($action) = each($_content['rows']['delete']);
 				unset($_content['rows']['delete']);
 			}
-			switch($action)
+			switch ($action)
 			{
 				case 'save':
 				case 'apply':
 					$saved = 0;
-					foreach($_content['rows'] as $data)
+					foreach ($_content['rows'] as $data)
 					{
 						if (!empty($data['phrase']))
 						{
@@ -79,7 +79,7 @@ 
 			}
 		}
 		$content = array('rows' => array());
-		foreach(Api\Translation::load_app('custom', 'en') as $phrase => $translation)
+		foreach (Api\Translation::load_app('custom', 'en') as $phrase => $translation)
 		{
 			$content['rows'][++$row] = array(
 				'phrase' => $phrase,
@@ -91,7 +91,7 @@ 
 			'phrase' => '',
 			'translation' => '',
 		);
-		$readonlys["delete[$row]"] = true;	// no delete for empty row
+		$readonlys["delete[$row]"] = true; // no delete for empty row
 		$content['msg'] = $msg;
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Custom translation');

Braces +8 added lines, -2 removed lines

@@ -62,8 +62,14 @@
 							++$saved;
 						}
 					}
-					if ($saved) $msg = lang('%1 phrases saved.', $saved);
-					if ($action == 'apply') break;
+					if ($saved)
+					{
+						$msg = lang('%1 phrases saved.', $saved);
+					}
+					if ($action == 'apply')
+					{
+						break;
+					}
 					// fall through
 				case 'cancel':
 					Egw::redirect_link('/admin/index.php');

admin/inc/class.admin_cmd_change_account_id.inc.php

Spacing +40 added lines, -40 removed lines

@@ -50,20 +50,20 @@ 
 			$apps->read_installed_apps();
 		}
 		$changes = $setup_info = array();
-		foreach(array_keys($GLOBALS['egw_info']['apps']) as $app)
+		foreach (array_keys($GLOBALS['egw_info']['apps']) as $app)
 		{
-			if (!file_exists($path=EGW_SERVER_ROOT.'/'.$app.'/setup/setup.inc.php') || !include($path)) continue;
+			if (!file_exists($path = EGW_SERVER_ROOT.'/'.$app.'/setup/setup.inc.php') || !include($path)) continue;
 
-			foreach((array)$setup_info[$app]['tables'] as $table)
+			foreach ((array)$setup_info[$app]['tables'] as $table)
 			{
 				if (!($definition = $GLOBALS['egw']->db->get_table_definitions($app, $table))) continue;
 
 				$cf = array();
-				foreach($definition['fd'] as $col => $data)
+				foreach ($definition['fd'] as $col => $data)
 				{
 					if (!empty($data['meta']))
 					{
-						foreach((array)$data['meta'] as $key => $val)
+						foreach ((array)$data['meta'] as $key => $val)
 						{
 							list($type, $subtype) = explode('-', $val.'-');
 							if (in_array($type, array('account', 'user', 'group')))
@@ -87,7 +87,7 @@ 
 				if ($cf && !empty($cf['cfname']) && !empty($cf['cfvalue']) &&
 					($account_cfs = Api\Storage\Customfields::get_account_cfs($app == 'phpgwapi' ? 'addressbook' : $app)))
 				{
-					foreach($account_cfs as $type => $names)
+					foreach ($account_cfs as $type => $names)
 					{
 						unset($subtype);
 						list($type, $subtype) = explode('-', $type);
@@ -114,53 +114,53 @@ 
 	 * @throws Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$this->account),15);
 	 * @throws Api\Exception\WrongUserinput(lang("Application '%1' not found (maybe not installed or misspelled)!",$name),8);
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
-		foreach($this->change as $from => $to)
+		foreach ($this->change as $from => $to)
 		{
 			if (!(int)$from || !(int)$to)
 			{
-				throw new Api\Exception\WrongUserinput(lang("Account-id's have to be integers!"),16);
+				throw new Api\Exception\WrongUserinput(lang("Account-id's have to be integers!"), 16);
 			}
 			if (($from < 0) != ($to < 0))
 			{
-				throw new Api\Exception\WrongUserinput(lang("Can NOT change users into groups, same sign required!"),17);
+				throw new Api\Exception\WrongUserinput(lang("Can NOT change users into groups, same sign required!"), 17);
 			}
 			if (!($from_exists = $GLOBALS['egw']->accounts->exists($from)))
 			{
-				throw new Api\Exception\WrongUserinput(lang("Source account #%1 does NOT exist!", $from),18);
+				throw new Api\Exception\WrongUserinput(lang("Source account #%1 does NOT exist!", $from), 18);
 			}
 			if ($from_exists !== ($from > 0 ? 1 : 2))
 			{
-				throw new Api\Exception\WrongUserinput(lang("Group #%1 must have negative sign!", $from),19);
+				throw new Api\Exception\WrongUserinput(lang("Group #%1 must have negative sign!", $from), 19);
 			}
 			if ($GLOBALS['egw']->accounts->exists($to) && !isset($this->change[$to]))
 			{
-				throw new Api\Exception\WrongUserinput(lang("Destination account #%1 does exist and is NOT renamed itself! Can not merge Api\Accounts, it will violate unique contains. Delete with transfer of data instead.", $to),20);
+				throw new Api\Exception\WrongUserinput(lang("Destination account #%1 does exist and is NOT renamed itself! Can not merge Api\Accounts, it will violate unique contains. Delete with transfer of data instead.", $to), 20);
 			}
 		}
 		$columns2change = $this->get_changes();
 		$total = 0;
-		foreach($columns2change as $app => $data)
+		foreach ($columns2change as $app => $data)
 		{
-			if (!isset($GLOBALS['egw_info']['apps'][$app])) continue;	// $app is not installed
+			if (!isset($GLOBALS['egw_info']['apps'][$app])) continue; // $app is not installed
 
 			$db = clone($GLOBALS['egw']->db);
 			$db->set_app($app);
 			if ($check_only) $db->log_updates = true;
 
-			foreach($data as $table => $columns)
+			foreach ($data as $table => $columns)
 			{
-				$db->column_definitions = $db->get_table_definitions($app,$table);
+				$db->column_definitions = $db->get_table_definitions($app, $table);
 				$db->column_definitions = $db->column_definitions['fd'];
 				if (!$columns)
 				{
 					echo "$app: $table no columns with account-id's\n";
-					continue;	// noting to do for this table
+					continue; // noting to do for this table
 				}
 				if (!is_array($columns)) $columns = array($columns);
 
-				foreach($columns as $column)
+				foreach ($columns as $column)
 				{
 					$type = $where = null;
 					if (is_array($column))
@@ -170,14 +170,14 @@ 
 						$where = $column;
 						$column = array_shift($where);
 					}
-					$total += ($changed = self::_update_account_id($this->change,$db,$table,$column,$where,$type));
+					$total += ($changed = self::_update_account_id($this->change, $db, $table, $column, $where, $type));
 					if (!$check_only && $changed) echo "$app:\t$table.$column $changed id's changed\n";
 				}
 			}
 		}
 		if (!$check_only)
 		{
-			foreach($GLOBALS['egw_info']['apps'] as $app => $data)
+			foreach ($GLOBALS['egw_info']['apps'] as $app => $data)
 			{
 				$total += ($changed = Api\Storage\Customfields::change_account_ids($app, $this->change));
 				if ($changed) echo "$app:\t$changed id's in definition of private custom fields changed\n";
@@ -185,7 +185,7 @@ 
 		}
 		if ($total) Api\Cache::flush(Api\Cache::INSTANCE);
 
-		return lang("Total of %1 id's changed.",$total)."\n";
+		return lang("Total of %1 id's changed.", $total)."\n";
 	}
 
 	/**
@@ -199,16 +199,16 @@ 
 	 * @param string $type
 	 * @return int number of changed ids
 	 */
-	private static function _update_account_id(array $ids2change,Api\Db $db,$table,$column,array $where=null,$type=null)
+	private static function _update_account_id(array $ids2change, Api\Db $db, $table, $column, array $where = null, $type = null)
 	{
 		$update_sql = '';
-		foreach($ids2change as $from => $to)
+		foreach ($ids2change as $from => $to)
 		{
-			$update_sql .= "WHEN ".$db->quote($from,$db->column_definitions[$column]['type'])." THEN ".$db->quote($to,$db->column_definitions[$column]['type'])." ";
+			$update_sql .= "WHEN ".$db->quote($from, $db->column_definitions[$column]['type'])." THEN ".$db->quote($to, $db->column_definitions[$column]['type'])." ";
 		}
 		$update_sql .= 'END';
 
-		switch($type)
+		switch ($type)
 		{
 			case 'commasep':
 			case 'serialized':
@@ -217,23 +217,23 @@ 
 				$select[] = "$column IS NOT NULL";
 				$select[] = "$column != ''";
 				$change = array();
-				foreach($db->select($table,'DISTINCT '.$column,$select,__LINE__,__FILE__) as $row)
+				foreach ($db->select($table, 'DISTINCT '.$column, $select, __LINE__, __FILE__) as $row)
 				{
-					$ids = $type != 'serialized' ? explode(',',$old_ids=$row[$column]) : json_php_unserialize($old_ids=$row[$column]);
-					foreach($ids as $key => $id)
+					$ids = $type != 'serialized' ? explode(',', $old_ids = $row[$column]) : json_php_unserialize($old_ids = $row[$column]);
+					foreach ($ids as $key => $id)
 					{
 						if (isset($ids2change[$id])) $ids[$key] = $ids2change[$id];
 					}
-					$ids2 = $type != 'serialized' ? implode(',',$ids) : serialize($ids);
+					$ids2 = $type != 'serialized' ? implode(',', $ids) : serialize($ids);
 					if ($ids2 != $old_ids)
 					{
 						$change[$old_ids] = $ids2;
 					}
 				}
 				$changed = 0;
-				foreach($change as $from => $to)
+				foreach ($change as $from => $to)
 				{
-					$db->update($table,array($column=>$to),$where+array($column=>$from),__LINE__,__FILE__);
+					$db->update($table, array($column=>$to), $where + array($column=>$from), __LINE__, __FILE__);
 					$changed += $db->affected_rows();
 				}
 				break;
@@ -241,11 +241,11 @@ 
 			case 'abs':
 				if (!$where) $where = array();
 				$where[$column] = array();
-				foreach($ids2change as $from => $to)
+				foreach ($ids2change as $from => $to)
 				{
 					$where[$column][] = abs($from);
 				}
-				$db->update($table,$column.'= CASE '.$column.' '.preg_replace('/-([0-9]+)/','\1',$update_sql),$where,__LINE__,__FILE__);
+				$db->update($table, $column.'= CASE '.$column.' '.preg_replace('/-([0-9]+)/', '\1', $update_sql), $where, __LINE__, __FILE__);
 				$changed = $db->affected_rows();
 				break;
 
@@ -253,21 +253,21 @@ 
 				if (!$where) $where = array();
 				$where[$column] = array();
 				$update_sql = '';
-				foreach($ids2change as $from => $to)
+				foreach ($ids2change as $from => $to)
 				{
 					if ($from < 0) $from -= 2;
 					if ($to < 0) $to -= 2;
 					$where[$column][] = $from;
-					$update_sql .= 'WHEN '.$db->quote($from,$db->column_definitions[$column]['type']).' THEN '.$db->quote($to,$db->column_definitions[$column]['type']).' ';
+					$update_sql .= 'WHEN '.$db->quote($from, $db->column_definitions[$column]['type']).' THEN '.$db->quote($to, $db->column_definitions[$column]['type']).' ';
 				}
-				$db->update($table,$column.'= CASE '.$column.' '.$update_sql.'END',$where,__LINE__,__FILE__);
+				$db->update($table, $column.'= CASE '.$column.' '.$update_sql.'END', $where, __LINE__, __FILE__);
 				$changed = $db->affected_rows();
 				break;
 
 			default:
 				if (!$where) $where = array();
 				$where[$column] = array_keys($ids2change);
-				$db->update($table,$column.'= CASE '.$column.' '.$update_sql,$where,__LINE__,__FILE__);
+				$db->update($table, $column.'= CASE '.$column.' '.$update_sql, $where, __LINE__, __FILE__);
 				$changed = $db->affected_rows();
 				break;
 		}
@@ -282,10 +282,10 @@ 
 	function __tostring()
 	{
 		$change = array();
-		foreach($this->change as $from => $to)
+		foreach ($this->change as $from => $to)
 		{
 			$change[] = $from.'->'.$to;
 		}
-		return lang('Change account_id').': '.implode(', ',$change);
+		return lang('Change account_id').': '.implode(', ', $change);
 	}
 }

Braces +77 added lines, -19 removed lines

@@ -52,11 +52,17 @@ 
 		$changes = $setup_info = array();
 		foreach(array_keys($GLOBALS['egw_info']['apps']) as $app)
 		{
-			if (!file_exists($path=EGW_SERVER_ROOT.'/'.$app.'/setup/setup.inc.php') || !include($path)) continue;
+			if (!file_exists($path=EGW_SERVER_ROOT.'/'.$app.'/setup/setup.inc.php') || !include($path))
+			{
+				continue;
+			}
 
 			foreach((array)$setup_info[$app]['tables'] as $table)
 			{
-				if (!($definition = $GLOBALS['egw']->db->get_table_definitions($app, $table))) continue;
+				if (!($definition = $GLOBALS['egw']->db->get_table_definitions($app, $table)))
+				{
+					continue;
+				}
 
 				$cf = array();
 				foreach($definition['fd'] as $col => $data)
@@ -71,8 +77,14 @@ 
 								if (!is_numeric($key) || !empty($subtype))
 								{
 									$col = array($col);
-									if (!is_numeric($key)) $col[] = $key;
-									if (!empty($subtype)) $col['.type'] = $subtype;
+									if (!is_numeric($key))
+									{
+										$col[] = $key;
+									}
+									if (!empty($subtype))
+									{
+										$col['.type'] = $subtype;
+									}
 								}
 								$changes[$app][$table][] = $col;
 							}
@@ -92,13 +104,19 @@ 
 						unset($subtype);
 						list($type, $subtype) = explode('-', $type);
 						$col = array($cf['cfvalue']);
-						if (!empty($subtype)) $col['.type'] = $subtype;
+						if (!empty($subtype))
+						{
+							$col['.type'] = $subtype;
+						}
 						$col[$cf['cfname']] = $names;
 						$changes[$app][$table][] = $col;
 					}
 				}
 			}
-			if (isset($changes[$app])) ksort($changes[$app]);
+			if (isset($changes[$app]))
+			{
+				ksort($changes[$app]);
+			}
 		}
 		ksort($changes);
 		//print_r($changes);
@@ -143,11 +161,18 @@ 
 		$total = 0;
 		foreach($columns2change as $app => $data)
 		{
-			if (!isset($GLOBALS['egw_info']['apps'][$app])) continue;	// $app is not installed
+			if (!isset($GLOBALS['egw_info']['apps'][$app]))
+			{
+				continue;
+			}
+			// $app is not installed
 
 			$db = clone($GLOBALS['egw']->db);
 			$db->set_app($app);
-			if ($check_only) $db->log_updates = true;
+			if ($check_only)
+			{
+				$db->log_updates = true;
+			}
 
 			foreach($data as $table => $columns)
 			{
@@ -158,7 +183,10 @@ 
 					echo "$app: $table no columns with account-id's\n";
 					continue;	// noting to do for this table
 				}
-				if (!is_array($columns)) $columns = array($columns);
+				if (!is_array($columns))
+				{
+					$columns = array($columns);
+				}
 
 				foreach($columns as $column)
 				{
@@ -171,7 +199,10 @@ 
 						$column = array_shift($where);
 					}
 					$total += ($changed = self::_update_account_id($this->change,$db,$table,$column,$where,$type));
-					if (!$check_only && $changed) echo "$app:\t$table.$column $changed id's changed\n";
+					if (!$check_only && $changed)
+					{
+						echo "$app:\t$table.$column $changed id's changed\n";
+					}
 				}
 			}
 		}
@@ -180,10 +211,16 @@ 
 			foreach($GLOBALS['egw_info']['apps'] as $app => $data)
 			{
 				$total += ($changed = Api\Storage\Customfields::change_account_ids($app, $this->change));
-				if ($changed) echo "$app:\t$changed id's in definition of private custom fields changed\n";
+				if ($changed)
+				{
+					echo "$app:\t$changed id's in definition of private custom fields changed\n";
+				}
 			}
 		}
-		if ($total) Api\Cache::flush(Api\Cache::INSTANCE);
+		if ($total)
+		{
+			Api\Cache::flush(Api\Cache::INSTANCE);
+		}
 
 		return lang("Total of %1 id's changed.",$total)."\n";
 	}
@@ -212,7 +249,10 @@ 
 		{
 			case 'commasep':
 			case 'serialized':
-				if (!$where) $where = array();
+				if (!$where)
+				{
+					$where = array();
+				}
 				$select = $where;
 				$select[] = "$column IS NOT NULL";
 				$select[] = "$column != ''";
@@ -222,7 +262,10 @@ 
 					$ids = $type != 'serialized' ? explode(',',$old_ids=$row[$column]) : json_php_unserialize($old_ids=$row[$column]);
 					foreach($ids as $key => $id)
 					{
-						if (isset($ids2change[$id])) $ids[$key] = $ids2change[$id];
+						if (isset($ids2change[$id]))
+						{
+							$ids[$key] = $ids2change[$id];
+						}
 					}
 					$ids2 = $type != 'serialized' ? implode(',',$ids) : serialize($ids);
 					if ($ids2 != $old_ids)
@@ -239,7 +282,10 @@ 
 				break;
 
 			case 'abs':
-				if (!$where) $where = array();
+				if (!$where)
+				{
+					$where = array();
+				}
 				$where[$column] = array();
 				foreach($ids2change as $from => $to)
 				{
@@ -250,13 +296,22 @@ 
 				break;
 
 			case 'prefs':	// prefs groups are shifted down by 2 as -1 and -2 are for default and forced prefs
-				if (!$where) $where = array();
+				if (!$where)
+				{
+					$where = array();
+				}
 				$where[$column] = array();
 				$update_sql = '';
 				foreach($ids2change as $from => $to)
 				{
-					if ($from < 0) $from -= 2;
-					if ($to < 0) $to -= 2;
+					if ($from < 0)
+					{
+						$from -= 2;
+					}
+					if ($to < 0)
+					{
+						$to -= 2;
+					}
 					$where[$column][] = $from;
 					$update_sql .= 'WHEN '.$db->quote($from,$db->column_definitions[$column]['type']).' THEN '.$db->quote($to,$db->column_definitions[$column]['type']).' ';
 				}
@@ -265,7 +320,10 @@ 
 				break;
 
 			default:
-				if (!$where) $where = array();
+				if (!$where)
+				{
+					$where = array();
+				}
 				$where[$column] = array_keys($ids2change);
 				$db->update($table,$column.'= CASE '.$column.' '.$update_sql,$where,__LINE__,__FILE__);
 				$changed = $db->affected_rows();

admin/inc/class.admin_hooks.inc.php

Spacing +42 added lines, -42 removed lines

@@ -50,57 +50,57 @@ 
 				'link' => false,
 				'icon' => false
 			);
-			display_sidebox($appname,lang('Admin'),$file);
+			display_sidebox($appname, lang('Admin'), $file);
 			return;
 		}
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 
-			if (! $GLOBALS['egw']->acl->check('site_config_acce',1,'admin'))
+			if (!$GLOBALS['egw']->acl->check('site_config_acce', 1, 'admin'))
 			{
-				$file['Site Configuration']         = Egw::link('/index.php','menuaction=admin.admin_config.index&appname=admin&ajax=true');
+				$file['Site Configuration'] = Egw::link('/index.php', 'menuaction=admin.admin_config.index&appname=admin&ajax=true');
 			}
 
-			if (! $GLOBALS['egw']->acl->check('account_access',1,'admin'))
+			if (!$GLOBALS['egw']->acl->check('account_access', 1, 'admin'))
 			{
-				$file['User Accounts']              = array(
+				$file['User Accounts'] = array(
 					'id' => '/accounts',
 					'icon' => Api\Image::find('addressbook', 'accounts'),
 				);
 			}
 
-			if (! $GLOBALS['egw']->acl->check('account_access',16,'admin'))
+			if (!$GLOBALS['egw']->acl->check('account_access', 16, 'admin'))
 			{
-				$file['Bulk password reset']        = Egw::link('/index.php','menuaction=admin.admin_passwordreset.index&ajax=true');
+				$file['Bulk password reset'] = Egw::link('/index.php', 'menuaction=admin.admin_passwordreset.index&ajax=true');
 			}
 
-			if (! $GLOBALS['egw']->acl->check('group_access',1,'admin'))
+			if (!$GLOBALS['egw']->acl->check('group_access', 1, 'admin'))
 			{
-				$file['User Groups']                = array(
+				$file['User Groups'] = array(
 					'id' => '/groups',
 					'icon' => Api\Image::find('addressbook', 'group'),
 					'child' => 1,
 				);
 			}
 
-			if (! $GLOBALS['egw']->acl->check('global_categorie',1,'admin'))
+			if (!$GLOBALS['egw']->acl->check('global_categorie', 1, 'admin'))
 			{
-				$file['Global Categories']          = Egw::link('/index.php','menuaction=admin.admin_categories.index&appname=phpgw&ajax=true');
+				$file['Global Categories'] = Egw::link('/index.php', 'menuaction=admin.admin_categories.index&appname=phpgw&ajax=true');
 			}
 
-			if (!$GLOBALS['egw']->acl->check('mainscreen_messa',1,'admin') || !$GLOBALS['egw']->acl->check('mainscreen_messa',2,'admin'))
+			if (!$GLOBALS['egw']->acl->check('mainscreen_messa', 1, 'admin') || !$GLOBALS['egw']->acl->check('mainscreen_messa', 2, 'admin'))
 			{
-				$file['Change Main Screen Message'] = Egw::link('/index.php','menuaction=admin.admin_messages.index');
+				$file['Change Main Screen Message'] = Egw::link('/index.php', 'menuaction=admin.admin_messages.index');
 			}
 
-			if (! $GLOBALS['egw']->acl->check('current_sessions',1,'admin'))
+			if (!$GLOBALS['egw']->acl->check('current_sessions', 1, 'admin'))
 			{
-				$file['View Sessions'] = Egw::link('/index.php','menuaction=admin.admin_accesslog.sessions&ajax=true');
+				$file['View Sessions'] = Egw::link('/index.php', 'menuaction=admin.admin_accesslog.sessions&ajax=true');
 			}
 
-			if (! $GLOBALS['egw']->acl->check('access_log_acces',1,'admin'))
+			if (!$GLOBALS['egw']->acl->check('access_log_acces', 1, 'admin'))
 			{
-				$file['View Access Log'] = Egw::link('/index.php','menuaction=admin.admin_accesslog.index&ajax=true');
+				$file['View Access Log'] = Egw::link('/index.php', 'menuaction=admin.admin_accesslog.index&ajax=true');
 			}
 
 			/* disable old EGroupware error_log, as it is not used anymore
@@ -109,48 +109,48 @@ 
 				$file['View Error Log']  = Egw::link('/index.php','menuaction=admin.uilog.list_log');
 			}*/
 
-			if (! $GLOBALS['egw']->acl->check('applications_acc',16,'admin'))
+			if (!$GLOBALS['egw']->acl->check('applications_acc', 16, 'admin'))
 			{
 				$file['Clear cache and register hooks'] = array(
 					'id' => 'admin/clear_cache',
 					'no_lang' => true,
-					'link' => "javascript:egw.message('".lang('Clear cache and register hooks') . "<br />" .lang('Please wait...')."','info'); " .
+					'link' => "javascript:egw.message('".lang('Clear cache and register hooks')."<br />".lang('Please wait...')."','info'); ".
 						"egw.json('admin.admin_hooks.ajax_clear_cache').sendRequest(true);"
 				 );
 			}
 
-			if (! $GLOBALS['egw']->acl->check('asyncservice_acc',1,'admin'))
+			if (!$GLOBALS['egw']->acl->check('asyncservice_acc', 1, 'admin'))
 			{
-				$file['Asynchronous timed services'] = Egw::link('/index.php','menuaction=admin.admin_asyncservice.index');
+				$file['Asynchronous timed services'] = Egw::link('/index.php', 'menuaction=admin.admin_asyncservice.index');
 			}
 
-			if (! $GLOBALS['egw']->acl->check('db_backup_access',1,'admin'))
+			if (!$GLOBALS['egw']->acl->check('db_backup_access', 1, 'admin'))
 			{
-				$file['DB backup and restore'] = Egw::link('/index.php','menuaction=admin.admin_db_backup.index');
+				$file['DB backup and restore'] = Egw::link('/index.php', 'menuaction=admin.admin_db_backup.index');
 			}
 
-			if (! $GLOBALS['egw']->acl->check('info_access',1,'admin'))
+			if (!$GLOBALS['egw']->acl->check('info_access', 1, 'admin'))
 			{
-				$file['phpInfo']         = "javascript:egw.openPopup('" . Egw::link('/admin/phpinfo.php','',false) . "',960,600,'phpinfoWindow')";
+				$file['phpInfo'] = "javascript:egw.openPopup('".Egw::link('/admin/phpinfo.php', '', false)."',960,600,'phpinfoWindow')";
 			}
-			$file['Admin queue and history'] = Egw::link('/index.php','menuaction=admin.admin_cmds.index&ajax=true');
-			$file['Remote administration instances'] = Egw::link('/index.php','menuaction=admin.admin_cmds.remotes&ajax=true');
-			$file['Custom translation'] = Egw::link('/index.php','menuaction=admin.admin_customtranslation.index');
-			$file['Changelog and versions'] = Egw::link('/index.php','menuaction=api.EGroupware\\Api\\Framework\\About.index&ajax=true');
+			$file['Admin queue and history'] = Egw::link('/index.php', 'menuaction=admin.admin_cmds.index&ajax=true');
+			$file['Remote administration instances'] = Egw::link('/index.php', 'menuaction=admin.admin_cmds.remotes&ajax=true');
+			$file['Custom translation'] = Egw::link('/index.php', 'menuaction=admin.admin_customtranslation.index');
+			$file['Changelog and versions'] = Egw::link('/index.php', 'menuaction=api.EGroupware\\Api\\Framework\\About.index&ajax=true');
 
-			$file['Submit statistic information'] = Egw::link('/index.php','menuaction=admin.admin_statistics.submit');
+			$file['Submit statistic information'] = Egw::link('/index.php', 'menuaction=admin.admin_statistics.submit');
 
 			if ($location == 'admin')
 			{
-				display_section($appname,$file);
+				display_section($appname, $file);
 			}
 			else
 			{
-				foreach($file as &$url)
+				foreach ($file as &$url)
 				{
 					if (is_array($url) && $url['link']) $url = $url['link'];
 				}
-				display_sidebox($appname,lang('Admin'),$file);
+				display_sidebox($appname, lang('Admin'), $file);
 			}
 		}
 	}
@@ -160,7 +160,7 @@ 
 	 */
 	function ajax_clear_cache()
 	{
-		if ($GLOBALS['egw']->acl->check('applications_acc',16,'admin'))
+		if ($GLOBALS['egw']->acl->check('applications_acc', 16, 'admin'))
 		{
 			$GLOBALS['egw']->redirect_link('/index.php');
 		}
@@ -168,9 +168,9 @@ 
 
 		Api\Image::invalidate();
 
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// Egw object in setup is limited
+		if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// Egw object in setup is limited
 		{
-			$GLOBALS['egw']->invalidate_session_cache();	// in case with cache the egw_info array in the session
+			$GLOBALS['egw']->invalidate_session_cache(); // in case with cache the egw_info array in the session
 		}
 		// allow apps to hook into "Admin >> Clear cache and register hooks"
 		Api\Hooks::process('clear_cache', array(), true);
@@ -195,7 +195,7 @@ 
 			'icon' => 'lock',
 		);
 
-		if (!$GLOBALS['egw']->acl->check('current_sessions',1,'admin'))	// no rights to view
+		if (!$GLOBALS['egw']->acl->check('current_sessions', 1, 'admin'))	// no rights to view
 		{
 			$actions[] = array(
 				'description' => 'Login History',
@@ -205,7 +205,7 @@ 
 			);
 		}
 
-		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[] = array(
 				'description' => 'Deny access',
@@ -229,18 +229,18 @@ 
 			$emailadmin = Api\Mail\Account::get_default();
 			if ($emailadmin->acc_smtp_type && $emailadmin->acc_smtp_type !== 'EGroupware\Api\Mail\Smtp')
 			{
-				$actions[] = array (
+				$actions[] = array(
 					'id'       => 'mail_activeAccounts',
 					'caption'  => '(de)activate mail accounts',
 					'icon'    => 'mail/navbar',
-					'children' => array (
-						'active' => array (
+					'children' => array(
+						'active' => array(
 							'caption'		  => 'activate',
 							'onExecute'	  	  => 'javaScript:app.admin.emailadminActiveAccounts',
 							'icon'			  => 'check',
 							'allowOnMultiple' => true
 						),
-						'inactive' => array (
+						'inactive' => array(
 							'caption'		  => 'deactivate',
 							'onExecute'		  => 'javaScript:app.admin.emailadminActiveAccounts',
 							'icon'			  => 'bullet',

Braces +18 added lines, -5 removed lines

@@ -148,7 +148,10 @@ 
 			{
 				foreach($file as &$url)
 				{
-					if (is_array($url) && $url['link']) $url = $url['link'];
+					if (is_array($url) && $url['link'])
+					{
+						$url = $url['link'];
+					}
 				}
 				display_sidebox($appname,lang('Admin'),$file);
 			}
@@ -168,9 +171,13 @@ 
 
 		Api\Image::invalidate();
 
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// Egw object in setup is limited
+		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
 		{
-			$GLOBALS['egw']->invalidate_session_cache();	// in case with cache the egw_info array in the session
+			// Egw object in setup is limited
+		{
+			$GLOBALS['egw']->invalidate_session_cache();
+		}
+		// in case with cache the egw_info array in the session
 		}
 		// allow apps to hook into "Admin >> Clear cache and register hooks"
 		Api\Hooks::process('clear_cache', array(), true);
@@ -195,7 +202,9 @@ 
 			'icon' => 'lock',
 		);
 
-		if (!$GLOBALS['egw']->acl->check('current_sessions',1,'admin'))	// no rights to view
+		if (!$GLOBALS['egw']->acl->check('current_sessions',1,'admin'))
+		{
+			// no rights to view
 		{
 			$actions[] = array(
 				'description' => 'Login History',
@@ -204,8 +213,11 @@ 
 				'icon'        => 'timesheet',
 			);
 		}
+		}
 
-		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[] = array(
 				'description' => 'Deny access',
@@ -214,6 +226,7 @@ 
 				'icon'        => 'cancel',
 			);
 		}
+		}
 
 		// currently no way to deny Admins access to administrate mail
 		// we could add a deny check as for other admin functionality

admin/inc/class.admin_export_groups_csv.inc.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$query = array(
@@ -40,12 +40,12 @@ 
 		// $_record is an array, that's what search() returns
 		foreach ($selection as $_record) {
 			$record = new admin_egw_group_record($_record);
-			if($options['convert']) {
+			if ($options['convert']) {
 				importexport_export_csv::convert($record, admin_egw_group_record::$types, 'admin', $lookups);
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach ($record->get_record_array() as $key => $value) {
+					if (is_array($value)) $record->$key = implode(',', $value);
 				}
  			}
 			$export_object->export_record($record);

Doc Comments +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
@@ -132,7 +132,7 @@ 
 	 * return html for options.
 	 * this way the plugin has all opportunities for options tab
 	 *
-	 * @return string html
+	 * @return boolean html
 	 */
 	public function get_options_etpl() {
 		return false;

Indentation +2 added lines, -2 removed lines

@@ -125,8 +125,8 @@
 	}
 
 	public static function get_mimetype() {
-                return 'text/csv';
-        }
+				return 'text/csv';
+		}
 
 	/**
 	 * return html for options.

Braces +27 added lines, -12 removed lines

@@ -21,7 +21,8 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$query = array(
@@ -38,14 +39,22 @@ 
 		);
 
 		// $_record is an array, that's what search() returns
-		foreach ($selection as $_record) {
+		foreach ($selection as $_record)
+		{
 			$record = new admin_egw_group_record($_record);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				importexport_export_csv::convert($record, admin_egw_group_record::$types, 'admin', $lookups);
-			} else {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach($record->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
  			}
 			$export_object->export_record($record);
@@ -58,7 +67,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Group CSV export');
 	}
 
@@ -67,7 +77,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports groups into a CSV File. ");
 	}
 
@@ -76,11 +87,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
                 return 'text/csv';
         }
 
@@ -90,7 +103,8 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		return false;
 	}
 
@@ -98,7 +112,8 @@ 
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'preserv' => array('no_error_for_no_selection'),
 		);

admin/inc/class.admin_account.inc.php

Spacing +14 added lines, -16 removed lines

@@ -40,11 +40,10 @@ 
 	{
 		if ((string)$content['owner'] === '0' && $GLOBALS['egw_info']['user']['apps']['admin'])
 		{
-			$deny_edit = $content['account_id'] ? $GLOBALS['egw']->acl->check('account_access', 16, 'admin') :
-				$GLOBALS['egw']->acl->check('account_access', 4, 'admin');
+			$deny_edit = $content['account_id'] ? $GLOBALS['egw']->acl->check('account_access', 16, 'admin') : $GLOBALS['egw']->acl->check('account_access', 4, 'admin');
 			//error_log(__METHOD__."() contact_id=$content[contact_id], account_id=$content[account_id], deny_edit=".array2string($deny_edit));
 
-			if (!$content['account_id'] && $deny_edit) return;	// no right to add new Api\Accounts, should not happen by AB ACL
+			if (!$content['account_id'] && $deny_edit) return; // no right to add new Api\Accounts, should not happen by AB ACL
 
 			// load our translations
 			Api\Translation::add_app('admin');
@@ -58,7 +57,7 @@ 
 					throw new Api\Exception\NotFound('Account data NOT found!');
 				}
 				if ($account['account_expires'] == -1) $account['account_expires'] = '';
-				unset($account['account_pwd']);	// do NOT send to client
+				unset($account['account_pwd']); // do NOT send to client
 				$account['memberships'] = array_keys($account['memberships']);
 				$acl = new Acl($content['account_id']);
 				$acl->read_repository();
@@ -78,7 +77,7 @@ 
 					'account_status' => 'A',
 					'memberships' => array(),
 					'anonymous' => false,
-					'changepassword' => true,	//old default: (bool)$GLOBALS['egw_info']['server']['change_pwd_every_x_days'],
+					'changepassword' => true, //old default: (bool)$GLOBALS['egw_info']['server']['change_pwd_every_x_days'],
 					'mustchangepassword' => false,
 					'account_primary_group' => $GLOBALS['egw']->accounts->name2id('Default'),
 					'homedirectory' => $GLOBALS['egw_info']['server']['ldap_account_home'],
@@ -99,7 +98,7 @@ 
 
 			if ($deny_edit)
 			{
-				foreach(array_keys($account) as $key)
+				foreach (array_keys($account) as $key)
 				{
 					$readonlys[$key] = true;
 				}
@@ -131,11 +130,11 @@ 
 	{
 		if ($content['old_account'] && $content['old_account'] == array_diff_key($content, $content['old_account']))
 		{
-			return '';	// no need to save account data, if nothing changed
+			return ''; // no need to save account data, if nothing changed
 		}
 		//error_log(__METHOD__."(".array2string($content).")");
 		$account = array();
-		foreach(array(
+		foreach (array(
 			// need to copy/rename some fields named different in account and contact
 			'n_given' => 'account_firstname',
 			'n_family' => 'account_lastname',
@@ -152,11 +151,10 @@ 
 		{
 			if (is_int($c_name)) $c_name = $a_name;
 
-			switch($a_name)
+			switch ($a_name)
 			{
 				case 'account_expires':
-					$account[$a_name] = $content[$c_name] ? $content[$c_name] :
-						($content['account_status'] ? 'never' : 'already');
+					$account[$a_name] = $content[$c_name] ? $content[$c_name] : ($content['account_status'] ? 'never' : 'already');
 					break;
 
 				case 'changepassword':	// boolean values: admin_cmd_edit_user understands '' as NOT set
@@ -171,7 +169,7 @@ 
 			}
 		}
 		// Make sure primary group is in account groups
-		if($account['account_primary_group'] && !array_search($account['account_primary_group'], (array)$account['account_groups']))
+		if ($account['account_primary_group'] && !array_search($account['account_primary_group'], (array)$account['account_groups']))
 		{
 			$account['account_groups'][] = $account['account_primary_group'];
 		}
@@ -204,7 +202,7 @@ 
 	 *
 	 * @param array $content =null
 	 */
-	public static function delete(array $content=null)
+	public static function delete(array $content = null)
 	{
 		if (!is_array($content))
 		{
@@ -221,7 +219,7 @@ 
 			}
 			//error_log(__METHOD__."() \$_GET[account_id]=$_GET[account_id], \$_GET[contact_id]=$_GET[contact_id] content=".array2string($content));
 		}
-		if ($GLOBALS['egw']->acl->check('account_access',32,'admin') || !($content['account_id'] > 0) ||
+		if ($GLOBALS['egw']->acl->check('account_access', 32, 'admin') || !($content['account_id'] > 0) ||
 			$GLOBALS['egw_info']['user']['account_id'] == $content['account_id'])
 		{
 			Framework::window_close(lang('Permission denied!!!'));
@@ -275,7 +273,7 @@ 
 			}
 		}
 
-		if (!$data['account_lid'] && !$data['account_id']) return;	// makes no sense to check before
+		if (!$data['account_lid'] && !$data['account_id']) return; // makes no sense to check before
 
 		// set home-directory when account_lid is entered, but only for new Api\Accounts
 		if ($changed == 'account_lid' && !$data['account_id'] &&
@@ -294,7 +292,7 @@ 
 			$cmd = new admin_cmd_edit_user($data['account_id'], $data);
 			$cmd->run(null, false, false, true);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			Api\Json\Response::get()->data($e->getMessage());
 		}

Braces +26 added lines, -6 removed lines

@@ -44,20 +44,30 @@ 
 				$GLOBALS['egw']->acl->check('account_access', 4, 'admin');
 			//error_log(__METHOD__."() contact_id=$content[contact_id], account_id=$content[account_id], deny_edit=".array2string($deny_edit));
 
-			if (!$content['account_id'] && $deny_edit) return;	// no right to add new Api\Accounts, should not happen by AB ACL
+			if (!$content['account_id'] && $deny_edit)
+			{
+				return;
+			}
+			// no right to add new Api\Accounts, should not happen by AB ACL
 
 			// load our translations
 			Api\Translation::add_app('admin');
 
-			if ($content['id'])	// existing account
+			if ($content['id'])
+			{
+				// existing account
 			{
 				// invalidate account, before reading it, to code with changed to DB or LDAP outside EGw
 				Api\Accounts::cache_invalidate((int)$content['account_id']);
+			}
 				if (!($account = $GLOBALS['egw']->accounts->read($content['account_id'])))
 				{
 					throw new Api\Exception\NotFound('Account data NOT found!');
 				}
-				if ($account['account_expires'] == -1) $account['account_expires'] = '';
+				if ($account['account_expires'] == -1)
+				{
+					$account['account_expires'] = '';
+				}
 				unset($account['account_pwd']);	// do NOT send to client
 				$account['memberships'] = array_keys($account['memberships']);
 				$acl = new Acl($content['account_id']);
@@ -150,7 +160,10 @@ 
 			'homedirectory', 'loginshell',
 		) as $c_name => $a_name)
 		{
-			if (is_int($c_name)) $c_name = $a_name;
+			if (is_int($c_name))
+			{
+				$c_name = $a_name;
+			}
 
 			switch($a_name)
 			{
@@ -269,13 +282,20 @@ 
 		if (!$data['account_id'] && in_array($changed, array('n_given', 'n_family', 'account_lid')))
 		{
 			$email = Api\Accounts::email($data['account_firstname'], $data['account_lastname'], $data['account_lid']);
-			if ($email && $email[0] != '@' && strpos($email, '@'))	// only add valid email addresses
+			if ($email && $email[0] != '@' && strpos($email, '@'))
+			{
+				// only add valid email addresses
 			{
 				Api\Json\Response::get()->assign('addressbook-edit_email', 'value', $email);
 			}
+			}
 		}
 
-		if (!$data['account_lid'] && !$data['account_id']) return;	// makes no sense to check before
+		if (!$data['account_lid'] && !$data['account_id'])
+		{
+			return;
+		}
+		// makes no sense to check before
 
 		// set home-directory when account_lid is entered, but only for new Api\Accounts
 		if ($changed == 'account_lid' && !$data['account_id'] &&

admin/inc/hook_acl_manager.inc.php

Spacing +12 added lines, -12 removed lines

@@ -14,7 +14,7 @@ 
 		'List config settings'   => 1,
 		'Change config settings' => 2
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['account_access'] = array(
 	'name' => 'Deny access to user accounts',
@@ -27,7 +27,7 @@ 
 		'Delete account'  => 32,
 		'change ACL Rights' => 64
 	)
-);	// was already there and seems to work ralfbecker
+); // was already there and seems to work ralfbecker
 
 $GLOBALS['acl_manager']['admin']['group_access'] = array(
 	'name' => 'Deny access to groups',
@@ -39,7 +39,7 @@ 
 		'Edit group'    => 16,
 		'Delete group'  => 32
 	)
-);	// was already there and seems to work ralfbecker
+); // was already there and seems to work ralfbecker
 
 $GLOBALS['acl_manager']['admin']['applications_acc'] = array(
 	'name' => 'Deny access to applications',
@@ -52,7 +52,7 @@ 
 */
 		'Register application hooks' => 16
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['global_categorie'] = array(
 	'name' => 'Deny access to global categories',
@@ -65,7 +65,7 @@ 
 		'Delete category'   => 32,
 		'Add sub-category'  => 64
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['mainscreen_messa'] = array(
 	'name' => 'Deny access to mainscreen message',
@@ -73,7 +73,7 @@ 
 		'Main screen message' => 1,
 		'Login message'       => 2
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['current_sessions'] = array(
 	'name' => 'Deny access to current sessions',
@@ -83,40 +83,40 @@ 
 		'Show session IP address' => 4,
 		'Kill session'            => 8
 	)
-);	// checked and working ralfbecker
+); // checked and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['access_log_acces'] = array(
 	'name' => 'Deny access to access log',
 	'rights' => array(
 		'Show access log' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['error_log_access'] = array(
 	'name' => 'Deny access to error log',
 	'rights' => array(
 		'Show error log' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['asyncservice_acc'] = array(
 	'name' => 'Deny access to asynchronous timed services',
 	'rights' => array(
 		'Asynchronous timed services' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['db_backup_access'] = array(
 	'name' => 'Deny access to DB backup and restore',
 	'rights' => array(
 		'DB backup and restore' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['info_access'] = array(
 	'name' => 'Deny access to phpinfo',
 	'rights' => array(
 		'Show phpinfo()' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 

admin/inc/class.admin_config.inc.php

Spacing +17 added lines, -17 removed lines

@@ -19,7 +19,7 @@ 
 {
 	var $public_functions = array('index' => True);
 
-	function index($_content=null)
+	function index($_content = null)
 	{
 		if (is_array($_content))
 		{
@@ -33,7 +33,7 @@ 
 		{
 			throw new Api\Exception\WrongParameter("Wrong or missing appname parameter!");
 		}
-		if ($GLOBALS['egw']->acl->check('site_config_acce',1,'admin'))
+		if ($GLOBALS['egw']->acl->check('site_config_acce', 1, 'admin'))
 		{
 			Api\Framework::redirect_link('/index.php');
 		}
@@ -44,7 +44,7 @@ 
 			Api\Translation::add_app($_appname);
 		}
 
-		switch($_appname)
+		switch ($_appname)
 		{
 			case 'admin':
 			case 'addressbook':
@@ -66,7 +66,7 @@ 
 
 		$c = new Api\Config($config_appname);
 		$c->read_repository();
-		if ($_content['cancel'] || ($_content['save'] || $_content['apply']) && $GLOBALS['egw']->acl->check('site_config_acce',2,'admin'))
+		if ($_content['cancel'] || ($_content['save'] || $_content['apply']) && $GLOBALS['egw']->acl->check('site_config_acce', 2, 'admin'))
 		{
 			Api\Framework::redirect_link('/admin/index.php?ajax=true');
 		}
@@ -79,9 +79,9 @@ 
 			/* Load hook file with functions to validate each config (one/none/all) */
 			Api\Hooks::single(array(
 				'location' => 'config_validate',
-			)+$_content['newsettings'], $appname);
+			) + $_content['newsettings'], $appname);
 
-			foreach($_content['newsettings'] as $key => $config)
+			foreach ($_content['newsettings'] as $key => $config)
 			{
 				if ($config)
 				{
@@ -89,26 +89,26 @@ 
 					if (in_array($key, (array)$GLOBALS['egw_info']['server']['found_validation_hook'], true) && function_exists($key))
 					{
 						call_user_func($key, $config, $c);
-						if($GLOBALS['config_error'])
+						if ($GLOBALS['config_error'])
 						{
-							$errors .= lang($GLOBALS['config_error']) . "\n";
+							$errors .= lang($GLOBALS['config_error'])."\n";
 							$GLOBALS['config_error'] = False;
 						}
 					}
 				}
 				// don't erase passwords, since we also don't print them
-				elseif(strpos($key,'passwd') === false && strpos($key,'password') === false && strpos($key,'root_pw') === false)
+				elseif (strpos($key, 'passwd') === false && strpos($key, 'password') === false && strpos($key, 'root_pw') === false)
 				{
 					unset($c->config_data[$key]);
 				}
 			}
-			if(in_array('final_validation', (array)$GLOBALS['egw_info']['server']['found_validation_hook']) &&
+			if (in_array('final_validation', (array)$GLOBALS['egw_info']['server']['found_validation_hook']) &&
 				function_exists('final_validation'))
 			{
 				final_validation($_content['newsettings']);
-				if($GLOBALS['config_error'])
+				if ($GLOBALS['config_error'])
 				{
-					$errors .= lang($GLOBALS['config_error']) . "\n";
+					$errors .= lang($GLOBALS['config_error'])."\n";
 					$GLOBALS['config_error'] = False;
 				}
 				unset($GLOBALS['egw_info']['server']['found_validation_hook']);
@@ -116,7 +116,7 @@ 
 
 			$c->save_repository();
 
-			if(!$errors && !$_content['apply'])
+			if (!$errors && !$_content['apply'])
 			{
 				Api\Framework::message(lang('Configuration saved.'), 'success');
 				Api\Framework::redirect_link('/index.php', array(
@@ -126,9 +126,9 @@ 
 			}
 		}
 
-		if($errors)
+		if ($errors)
 		{
-			Api\Framework::message(lang('Error') . ': ' . $errors, 'error');
+			Api\Framework::message(lang('Error').': '.$errors, 'error');
 			unset($errors);
 			unset($GLOBALS['config_error']);
 		}
@@ -160,13 +160,13 @@ 
 		// for security reasons we do not send all config to client-side, but only ones mentioned in templates
 		$matches = null;
 		preg_match_all('/id="newsettings\[([^]]+)\]"/', file_get_contents($path), $matches, PREG_PATTERN_ORDER);
-		foreach($matches[1] as $name)
+		foreach ($matches[1] as $name)
 		{
 			$content['newsettings'][$name] = $config[$name];
 		}
 
 		// make everything readonly and remove save/apply button, if user has not rights to store config
-		if ($GLOBALS['egw']->acl->check('site_config_acce',2,'admin'))
+		if ($GLOBALS['egw']->acl->check('site_config_acce', 2, 'admin'))
 		{
 			$readonlys[__ALL__] = true;
 			$readonlys['cancel'] = false;

Braces +4 added lines, -1 removed lines

@@ -146,7 +146,10 @@
 		$ret = Api\Hooks::single($config, $appname);
 		if (is_array($ret))
 		{
-			if (isset($ret['sel_options'])) $sel_options = $ret['sel_options'];
+			if (isset($ret['sel_options']))
+			{
+				$sel_options = $ret['sel_options'];
+			}
 			$config = array_merge($config, $ret);
 		}
 

admin/inc/class.admin_wizard_export_groups_csv.inc.php

Indentation +2 added lines, -2 removed lines

@@ -18,11 +18,11 @@
 		parent::__construct();
 
 		// Field mapping
-                $this->export_fields = array(
+				$this->export_fields = array(
 			'account_id'		=> lang('Account ID'),
 			'account_lid'		=> lang('Group Name'),
 			'account_members'	=> lang('Members'),
-                );
+				);
 
 		// Custom fields - not really used in admin...
 		unset($this->export_fields['customfields']);

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
                 );
 
 		$custom = Api\Storage\Customfields::get('resources', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 

Braces +4 added lines, -2 removed lines

@@ -14,7 +14,8 @@ 
 
 class infolog_wizard_export_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Field mapping
@@ -27,7 +28,8 @@ 
 		// Custom fields
 		unset($this->export_fields['custom']); // Heading, not a real field
 		$custom = Api\Storage\Customfields::get('infolog', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}