EGroupware / egroupware

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_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']));
 }
 

share.php

Spacing +3 added lines, -3 removed lines

@@ -18,10 +18,10 @@ 
 	'flags' => array(
 		'disable_Template_class' => true,
 		'noheader'  => true,
-		'nonavbar' => 'always',	// true would cause eTemplate to reset it to false for non-popups!
+		'nonavbar' => 'always', // true would cause eTemplate to reset it to false for non-popups!
 		'currentapp' => 'filemanager',
 		'autocreate_session_callback' => 'EGroupware\\Api\\Vfs\\Sharing::create_session',
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
 	)
 );
 
@@ -29,6 +29,6 @@ 
 
 if (!$GLOBALS['egw']->sharing)
 {
-	Sharing::create_session(true);	// true = mount into existing session
+	Sharing::create_session(true); // true = mount into existing session
 }
 $GLOBALS['egw']->sharing->ServeRequest();

files/webdav.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
 {
 	if (isset($_GET['auth']))
 	{
-		list($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']) = explode(':',base64_decode($_GET['auth']),2);
+		list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode($_GET['auth']), 2);
 	}
 	return Api\Header\Authenticate::autocreate_session_callback($account);
 }
@@ -45,8 +45,8 @@ 
 		'noheader'  => True,
 		'currentapp' => preg_match('|/webdav.php/apps/([A-Za-z0-9_-]+)/|', $_SERVER['REQUEST_URI'], $matches) ? $matches[1] : 'filemanager',
 		'autocreate_session_callback' => 'check_access',
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
-		'auth_realm' => 'EGroupware WebDAV server',	// cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
+		'auth_realm' => 'EGroupware WebDAV server', // cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
 	)
 );
 
@@ -74,12 +74,12 @@ 
 
 // temporary mount ownCloud default /clientsync as /home/$user, if not explicitly mounted
 // so ownCloud dir contains users home-dir by default
-if (strpos($_SERVER['REQUEST_URI'],'/webdav.php/clientsync') !== false &&
-	($fstab=Vfs::mount()) && !isset($fstab['/clientsync']))
+if (strpos($_SERVER['REQUEST_URI'], '/webdav.php/clientsync') !== false &&
+	($fstab = Vfs::mount()) && !isset($fstab['/clientsync']))
 {
 	$is_root_backup = Vfs::$is_root;
 	Vfs::$is_root = true;
-	$ok = Vfs::mount($url='vfs://default/home/$user', $clientsync='/clientsync', null, false);
+	$ok = Vfs::mount($url = 'vfs://default/home/$user', $clientsync = '/clientsync', null, false);
 	Vfs::$is_root = $is_root_backup;
 	//error_log("mounting ownCloud default '$clientsync' as '$url' ".($ok ? 'successful' : 'failed!'));
 }

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
  * Create a session or if the user has no account return authenticate header and 401 Unauthorized
  *
  * @param array &$account
- * @return int session-id
+ * @return string session-id
  */
 function check_access(&$account)
 {

timesheet/setup/default_records.inc.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
  * @version $Id$
  */
 
-foreach(array(
+foreach (array(
 	'history'     => 'history',
 ) as $name => $value)
 {
@@ -19,10 +19,10 @@ 
 			'config_app' => 'timesheet',
 			'config_name' => $name,
 			'config_value' => $value,
-		),array(
+		), array(
 			'config_app' => 'timesheet',
 			'config_name' => $name,
-		),__LINE__,__FILE__
+		), __LINE__, __FILE__
 	);
 }
 

timesheet/inc/class.timesheet_wizard_export_csv.inc.php

Spacing +1 added lines, -1 removed lines

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

Braces +4 added lines, -2 removed lines

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