EGroupware / egroupware

admin/inc/hook_config_validate.inc.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 /*
   Set global flag to indicate for which config settings we have equally named validation methods
 */
-$GLOBALS['egw_info']['server']['found_validation_hook'] = array('vfs_image_dir','fw_mobile_app_list');
+$GLOBALS['egw_info']['server']['found_validation_hook'] = array('vfs_image_dir', 'fw_mobile_app_list');
 
 /**
  * Check VFS dir exists and delete image map to recreate it, if vfs-image-dir changes
@@ -29,7 +29,7 @@ 
 	{
 		if (!Vfs::file_exists($vfs_image_dir) || !Vfs::is_dir($vfs_image_dir))
 		{
-			$GLOBALS['config_error'] = lang('VFS directory "%1" NOT found!',$vfs_image_dir);
+			$GLOBALS['config_error'] = lang('VFS directory "%1" NOT found!', $vfs_image_dir);
 			return;
 		}
 	}

admin/inc/class.admin_db_backup.inc.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
  		if (($f = $this->db_backup->fopen_backup()))
  		{
 			$this->db_backup->backup($f);
-			if(is_resource($f))
+			if (is_resource($f))
 				fclose($f);
 			/* Remove old backups. */
 			$this->db_backup->housekeeping();
@@ -41,7 +41,7 @@ 
 	function index()
 	{
 		$tpl_root = EGW_SERVER_ROOT.'/setup/templates/default';
-		$self = $GLOBALS['egw']->link('/index.php',array('menuaction'=>'admin.admin_db_backup.index'));
+		$self = $GLOBALS['egw']->link('/index.php', array('menuaction'=>'admin.admin_db_backup.index'));
 		Api\Translation::add_app('setup');
 		Api\Header\ContentSecurityPolicy::add('script-src', 'unsafe-inline');
 

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
  		{
 			$this->db_backup->backup($f);
 			if(is_resource($f))
-				fclose($f);
+			{
+							fclose($f);
+			}
 			/* Remove old backups. */
 			$this->db_backup->housekeeping();
 		}

admin/inc/class.admin_egw_user_record.inc.php

Spacing +10 added lines, -10 removed lines

@@ -35,8 +35,8 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
-		if(is_array($_identifier)) {
+	public function __construct($_identifier = '') {
+		if (is_array($_identifier)) {
 			$this->identifier = $_identifier['account_id'];
 		} else {
 			$this->identifier = $_identifier;
@@ -90,7 +90,7 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->user = $_record;
 		$this->account_groups = $GLOBALS['egw']->accounts->memberships($this->identifier, true);
 	}
@@ -119,8 +119,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function save($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
@@ -129,8 +129,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function copy($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
@@ -140,15 +140,15 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function move($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

Braces +31 added lines, -15 removed lines

@@ -35,10 +35,14 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
-		if(is_array($_identifier)) {
+	public function __construct( $_identifier='' )
+	{
+		if(is_array($_identifier))
+		{
 			$this->identifier = $_identifier['account_id'];
-		} else {
+		}
+		else
+		{
 			$this->identifier = $_identifier;
 		}
 		$this->set_record($GLOBALS['egw']->accounts->read($this->identifier));
@@ -49,7 +53,8 @@ 
 	 *
 	 * @param string $_attribute_name
 	 */
-	public function __get($_attribute_name) {
+	public function __get($_attribute_name)
+	{
 		return $this->user[$_attribute_name];
 	}
 
@@ -59,7 +64,8 @@ 
 	 * @param string $_attribute_name
 	 * @param data $data
 	 */
-	public function __set($_attribute_name, $data) {
+	public function __set($_attribute_name, $data)
+	{
 		$this->user[$_attribute_name] = $data;
 	}
 
@@ -71,7 +77,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		return $this->user;
 	}
 
@@ -80,7 +87,8 @@ 
 	 *
 	 *@return string title
 	 */
-	public function get_title() {
+	public function get_title()
+	{
 		return Api\Accounts::username($this->identifier);
 	}
 
@@ -90,7 +98,8 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record)
+	{
 		$this->user = $_record;
 		$this->account_groups = $GLOBALS['egw']->accounts->memberships($this->identifier, true);
 	}
@@ -100,7 +109,8 @@ 
 	 *
 	 * @return string identifier of current record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->identifier;
 	}
 
@@ -110,7 +120,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		return 'user';
 	}
 
@@ -119,7 +130,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -129,7 +141,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -140,7 +153,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -148,7 +162,8 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete ()
+	{
 
 	}
 
@@ -156,7 +171,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		unset ($this->user);
 	}
 }

admin/inc/class.admin_wizard_export_users_csv.inc.php

Indentation +13 added lines, -13 removed lines

@@ -18,20 +18,20 @@
 		parent::__construct();
 
 		// Field mapping
-                $this->export_fields = array(
+				$this->export_fields = array(
 			'account_id'		=> lang('Account ID'),
-                        'account_lid'		=> lang('LoginID'),
-                        'account_firstname'	=> lang('First Name'),
-                        'account_lastname'	=> lang('Last Name'),
-                        'account_email'		=> lang('email'),
-                        'account_pwd'		=> lang('Password'),
-                        'account_status'	=> lang('Status'),
-                        'account_primary_group'	=> lang('Primary Group'),
-                        'account_groups'	=> lang('Groups'),
-                        'account_expires'	=> lang('Expires'),
-                        'account_lastlogin'	=> lang('Last login'),
-                        'account_lastpwd_change'=> lang('Last password change'),
-                );
+						'account_lid'		=> lang('LoginID'),
+						'account_firstname'	=> lang('First Name'),
+						'account_lastname'	=> lang('Last Name'),
+						'account_email'		=> lang('email'),
+						'account_pwd'		=> lang('Password'),
+						'account_status'	=> lang('Status'),
+						'account_primary_group'	=> lang('Primary Group'),
+						'account_groups'	=> lang('Groups'),
+						'account_expires'	=> lang('Expires'),
+						'account_lastlogin'	=> lang('Last login'),
+						'account_lastpwd_change'=> lang('Last password change'),
+				);
 
 		// Custom fields - not really used in admin...
 		unset($this->export_fields['customfields']);

Braces +4 added lines, -2 removed lines

@@ -14,7 +14,8 @@ 
 
 class admin_wizard_export_users_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Field mapping
@@ -36,7 +37,8 @@ 
 		// Custom fields - not really used in admin...
 		unset($this->export_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('admin', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 		// Custom fields - not really used in admin...
 		unset($this->export_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('admin', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

admin/inc/class.admin_egw_group_record.inc.php

Spacing +11 added lines, -11 removed lines

@@ -34,8 +34,8 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
-		if(is_array($_identifier)) {
+	public function __construct($_identifier = '') {
+		if (is_array($_identifier)) {
 			$this->identifier = $_identifier['account_id'];
 		} else {
 			$this->identifier = $_identifier;
@@ -89,9 +89,9 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->group = $_record;
-		$this->group['account_members'] = $GLOBALS['egw']->accounts->members($this->group['account_id'],true);
+		$this->group['account_members'] = $GLOBALS['egw']->accounts->members($this->group['account_id'], true);
 	}
 
 	/**
@@ -118,8 +118,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function save($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
@@ -128,8 +128,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function copy($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
@@ -139,15 +139,15 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function move($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

Braces +31 added lines, -15 removed lines

@@ -34,10 +34,14 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
-		if(is_array($_identifier)) {
+	public function __construct( $_identifier='' )
+	{
+		if(is_array($_identifier))
+		{
 			$this->identifier = $_identifier['account_id'];
-		} else {
+		}
+		else
+		{
 			$this->identifier = $_identifier;
 		}
 		$this->set_record($GLOBALS['egw']->accounts->read($this->identifier));
@@ -48,7 +52,8 @@ 
 	 *
 	 * @param string $_attribute_name
 	 */
-	public function __get($_attribute_name) {
+	public function __get($_attribute_name)
+	{
 		return $this->group[$_attribute_name];
 	}
 
@@ -58,7 +63,8 @@ 
 	 * @param string $_attribute_name
 	 * @param data $data
 	 */
-	public function __set($_attribute_name, $data) {
+	public function __set($_attribute_name, $data)
+	{
 		$this->group[$_attribute_name] = $data;
 	}
 
@@ -70,7 +76,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		return $this->group;
 	}
 
@@ -79,7 +86,8 @@ 
 	 *
 	 *@return string title
 	 */
-	public function get_title() {
+	public function get_title()
+	{
 		return Api\Accounts::username($this->identifier);
 	}
 
@@ -89,7 +97,8 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record)
+	{
 		$this->group = $_record;
 		$this->group['account_members'] = $GLOBALS['egw']->accounts->members($this->group['account_id'],true);
 	}
@@ -99,7 +108,8 @@ 
 	 *
 	 * @return string identifier of current record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->identifier;
 	}
 
@@ -109,7 +119,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		return 'group';
 	}
 
@@ -118,7 +129,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -128,7 +140,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -139,7 +152,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -147,7 +161,8 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete ()
+	{
 
 	}
 
@@ -155,7 +170,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		unset ($this->group);
 	}
 }

admin/inc/class.admin_export_users_csv.inc.php

Spacing +6 added lines, -6 removed lines

@@ -21,13 +21,13 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$query = array(
 			'type'	=>	'accounts',
 		);
-		if($options['selection']['group_id']) {
+		if ($options['selection']['group_id']) {
 			$query['type'] = (int)$options['selection']['group_id'];
 		}
 		$selection = $GLOBALS['egw']->accounts->search($query);
@@ -43,14 +43,14 @@ 
 		// $_record is an array, that's what search() returns
 		foreach ($selection as $_record) {
 			$record = new admin_egw_user_record($_record);
-			if($options['convert']) {
+			if ($options['convert']) {
 				$never_expires = ($record->account_expires == -1);
 				importexport_export_csv::convert($record, admin_egw_user_record::$types, 'admin', $lookups);
-				if($never_expires) $record->account_expires = 'never';  // Has to be 'never' for admin_cmd_edit_user to parse it
+				if ($never_expires) $record->account_expires = 'never'; // Has to be 'never' for admin_cmd_edit_user to parse it
 			} 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);

Braces +34 added lines, -14 removed lines

@@ -21,13 +21,15 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$query = array(
 			'type'	=>	'accounts',
 		);
-		if($options['selection']['group_id']) {
+		if($options['selection']['group_id'])
+		{
 			$query['type'] = (int)$options['selection']['group_id'];
 		}
 		$selection = $GLOBALS['egw']->accounts->search($query);
@@ -41,16 +43,28 @@ 
 		);
 
 		// $_record is an array, that's what search() returns
-		foreach ($selection as $_record) {
+		foreach ($selection as $_record)
+		{
 			$record = new admin_egw_user_record($_record);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				$never_expires = ($record->account_expires == -1);
 				importexport_export_csv::convert($record, admin_egw_user_record::$types, 'admin', $lookups);
-				if($never_expires) $record->account_expires = 'never';  // Has to be 'never' for admin_cmd_edit_user to parse it
-			} else {
+				if($never_expires)
+				{
+					$record->account_expires = 'never';
+				}
+				// Has to be 'never' for admin_cmd_edit_user to parse it
+			}
+			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);
@@ -63,7 +77,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('User CSV export');
 	}
 
@@ -72,7 +87,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports users into a CSV File. ");
 	}
 
@@ -81,11 +97,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';
         }
 
@@ -95,7 +113,8 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		return false;
 	}
 
@@ -103,7 +122,8 @@ 
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'	=> 'admin.export_users_csv_selectors',
 			'preserv' => array('no_error_for_all'),

Doc Comments +2 added lines, -2 removed lines

@@ -19,7 +19,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;
@@ -88,7 +88,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

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

admin/inc/class.admin_wizard_import_users_csv.inc.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		$result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv);
-		$content['msg'] .= "\n*" ;
+		$content['msg'] .= "\n*";
 		
 		return $result;
 	}

admin/phpinfo.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 );
 include('../header.inc.php');
 
-if ($GLOBALS['egw']->acl->check('info_access',1,'admin'))
+if ($GLOBALS['egw']->acl->check('info_access', 1, 'admin'))
 {
 	$GLOBALS['egw']->redirect_link('/index.php');
 }

logout.php

Spacing +8 added lines, -8 removed lines

@@ -28,34 +28,34 @@
 
 $verified = $GLOBALS['egw']->session->verify();
 
-if(!($redirectTarget = Api\Cache::getSession('login', 'referer')))
+if (!($redirectTarget = Api\Cache::getSession('login', 'referer')))
 {
 	$redirectTarget = $GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=1&domain='.$GLOBALS['egw_info']['user']['domain'];
 }
-elseif(strpos($redirectTarget, '[?&]cd=') !== false)
+elseif (strpos($redirectTarget, '[?&]cd=') !== false)
 {
 	$redirectTarget = preg_replace('/([?&])cd=[^&]+/', '$1cd=1', $redirectTarget);
 }
 
-if($verified)
+if ($verified)
 {
 	Api\Hooks::process('logout');
-	$GLOBALS['egw']->session->destroy($GLOBALS['sessionid'],$GLOBALS['kp3']);
+	$GLOBALS['egw']->session->destroy($GLOBALS['sessionid'], $GLOBALS['kp3']);
 }
 
-Api\Session::egw_setcookie('eGW_remember','',0,'/');
+Api\Session::egw_setcookie('eGW_remember', '', 0, '/');
 Api\Session::egw_setcookie('sessionid');
 Api\Session::egw_setcookie('kp3');
 Api\Session::egw_setcookie('domain');
 
-if($GLOBALS['egw_info']['server']['auth_type'] == 'cas')
+if ($GLOBALS['egw_info']['server']['auth_type'] == 'cas')
 {
 	require_once('CAS/CAS.php');
 
 	phpCAS::client(CAS_VERSION_2_0,
 								$GLOBALS['egw_info']['server']['cas_server_host_name'],
-								(int) $GLOBALS['egw_info']['server']['cas_server_port'],
-								$GLOBALS['egw_info']['server']['cas_server_uri'] );
+								(int)$GLOBALS['egw_info']['server']['cas_server_port'],
+								$GLOBALS['egw_info']['server']['cas_server_uri']);
 	phpCAS::logout(array('url'=>$GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=1&domain='.$GLOBALS['egw_info']['user']['domain']));
 }