EGroupware / egroupware

mail/profile.php

Spacing +9 added lines, -9 removed lines

@@ -62,10 +62,10 @@ 
 Header('Content-Type: application/json; charset=utf-8');
 echo json_encode($times, JSON_PRETTY_PRINT);
 
-function php_times($account, array &$times, $prefix='php_')
+function php_times($account, array &$times, $prefix = 'php_')
 {
 	$starttime = microtime(true);
-	switch($account->acc_imap_ssl & ~emailadmin_account::SSL_VERIFY)
+	switch ($account->acc_imap_ssl&~emailadmin_account::SSL_VERIFY)
 	{
 		case emailadmin_account::SSL_SSL:
 			$schema = 'ssl';
@@ -80,7 +80,7 @@ 
 	}
 	$error_number = $error_string = null;
 	$stream = stream_socket_client(
-		$schema . '://' . $account->acc_imap_host . ':' . $account->acc_imap_port,
+		$schema.'://'.$account->acc_imap_host.':'.$account->acc_imap_port,
 		$error_number,
 		$error_string,
 		20,
@@ -98,7 +98,7 @@ 
 	$connect_response = fgets($stream);
 
 	// starttls (untested)
-	if ($stream && ($account->acc_imap_ssl & ~emailadmin_account::SSL_VERIFY) == emailadmin_account::SSL_STARTTLS)
+	if ($stream && ($account->acc_imap_ssl&~emailadmin_account::SSL_VERIFY) == emailadmin_account::SSL_STARTTLS)
 	{
 		fwrite($stream, "10 STARTTLS\r\n");
 		stream_socket_enable_crypto($stream, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
@@ -128,7 +128,7 @@ 
 	unset($connect_response, $starttls_response, $login_response, $error_number, $error_string);
 }
 
-function mail_times($acc_id, array &$times, $prefix='mail_')
+function mail_times($acc_id, array &$times, $prefix = 'mail_')
 {
 	global $cache;
 	$starttime = microtime(true);
@@ -183,7 +183,7 @@ 
 	$mail_ui->mail_bo->icServer->logout();
 }
 
-function horde_times(emailadmin_account $account, array &$times, $prefix='horde_')
+function horde_times(emailadmin_account $account, array &$times, $prefix = 'horde_')
 {
 	$starttime = microtime(true);
 	$imap = $account->imapServer();
@@ -215,12 +215,12 @@ 
 	$imap->logout();
 }
 
-function horde_fetch(Horde_Imap_Client_Socket $client, $mailbox='INBOX')
+function horde_fetch(Horde_Imap_Client_Socket $client, $mailbox = 'INBOX')
 {
 	$squery = new Horde_Imap_Client_Search_Query();
 	// using a date filter to limit returned uids, gives huge speed improvement on big mailboxes, because less uids returned
 	//$squery->dateSearch(new DateTime('-30days'), Horde_Imap_Client_Search_Query::DATE_SINCE, false, false);
-	$squery->flag('DELETED', $set=false);
+	$squery->flag('DELETED', $set = false);
 	$sorted = $client->search($mailbox, $squery, array(
 		'sort' => array(Horde_Imap_Client::SORT_REVERSE, Horde_Imap_Client::SORT_SEQUENCE),
 	));
@@ -229,7 +229,7 @@ 
 	$first20uids->add(array_slice($sorted['match']->ids, 0, 20));
 
 	$fquery = new Horde_Imap_Client_Fetch_Query();
-	$fquery->headers('headers', array('Subject', 'From', 'To', 'Cc', 'Date'), array('peek' => true,'cache' => true));
+	$fquery->headers('headers', array('Subject', 'From', 'To', 'Cc', 'Date'), array('peek' => true, 'cache' => true));
 	$fquery->structure();
 	$fquery->flags();
 	$fquery->imapDate();

mail/setup/default_records.inc.php

Spacing +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
 // if no rows/rights found, give Default group rights
 if (!$GLOBALS['egw_setup']->db->affected_rows())
 {
-	$defaultgroup = $GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
-	$GLOBALS['egw_setup']->add_acl('mail','run',$defaultgroup);
+	$defaultgroup = $GLOBALS['egw_setup']->add_account('Default', 'Default', 'Group', False, False);
+	$GLOBALS['egw_setup']->add_acl('mail', 'run', $defaultgroup);
 }
 
 // change common/default_app pref to mail, if it was felamimail

mail/inc/class.mail_acl.inc.php

Spacing +40 added lines, -40 removed lines

@@ -33,12 +33,12 @@ 
 	 *
 	 */
 	var $aclRightsAbbrvs = array(
-		'lrs'		=> array('label'=>'readable','title'=>'Allows a user to read the contents of the mailbox.'),
-		'lprs'		=> array('label'=>'post','title'=>'Allows a user to read the mailbox and post to it through the delivery system by sending mail to the submission address of the mailbox.'),
-		'ilprs'		=> array('label'=>'append','title'=>'Allows a user to read the mailbox and append messages to it, either via IMAP or through the delivery system.'),
-		'ilprsw'	=> array('label'=>'write','title'=>'Allows a user to read the maibox, post to it, append messages to it, and delete messages or the mailbox itself. The only right not given is the right to change the ACL of the mailbox.'),
-		'aeiklprstwx'=> array('label'=>'all','title'=>'The user has all possible rights on the mailbox. This is usually granted to users only on the mailboxes they own.'),
-		'custom'	=> array('label'=>'custom','title'=>'User defined combination of rights for the ACL'),
+		'lrs'		=> array('label'=>'readable', 'title'=>'Allows a user to read the contents of the mailbox.'),
+		'lprs'		=> array('label'=>'post', 'title'=>'Allows a user to read the mailbox and post to it through the delivery system by sending mail to the submission address of the mailbox.'),
+		'ilprs'		=> array('label'=>'append', 'title'=>'Allows a user to read the mailbox and append messages to it, either via IMAP or through the delivery system.'),
+		'ilprsw'	=> array('label'=>'write', 'title'=>'Allows a user to read the maibox, post to it, append messages to it, and delete messages or the mailbox itself. The only right not given is the right to change the ACL of the mailbox.'),
+		'aeiklprstwx'=> array('label'=>'all', 'title'=>'The user has all possible rights on the mailbox. This is usually granted to users only on the mailboxes they own.'),
+		'custom'	=> array('label'=>'custom', 'title'=>'User defined combination of rights for the ACL'),
 	);
 
 	/**
@@ -61,12 +61,12 @@ 
 	 * @param array $msg = ''
 	 *
 	 */
-	function edit(array $content=null ,$msg='')
+	function edit(array $content = null, $msg = '')
 	{
 		$tmpl = new Etemplate('mail.acl');
 		if (!is_array($content))
 		{
-			$acc_id = $_GET['acc_id']?$_GET['acc_id']:$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
+			$acc_id = $_GET['acc_id'] ? $_GET['acc_id'] : $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
 			if (isset($_GET['account_id']) && !isset($GLOBALS['egw_info']['user']['apps']['admin']))
 			{
 				Framework::window_close(lang('Permission denied'));
@@ -81,7 +81,7 @@ 
 		$account = Mail\Account::read($acc_id, $account_id);
 		$this->imap = $account->imapServer(isset($account_id) ? (int)$account_id : false);
 
-		$mailbox = $_GET['mailbox']? base64_decode($_GET['mailbox']): $content['mailbox'][0];
+		$mailbox = $_GET['mailbox'] ? base64_decode($_GET['mailbox']) : $content['mailbox'][0];
 		if (empty($mailbox))
 		{
 			$mailbox = $this->imap->isAdminConnection ? $this->imap->getUserMailboxString($this->imap->isAdminConnection) : 'INBOX';
@@ -111,14 +111,14 @@ 
 
 					foreach ($rights as $right)
 					{
-						$content['grid'][$n]['acl_'. $right] = true;
+						$content['grid'][$n]['acl_'.$right] = true;
 					}
-					$virtualD = array('e','t');
-					$content['grid'][$n]['acl_c'] = array_diff($virtuals['c'],array_intersect($rights,$virtuals['c']))? false: true; //c=kx more information rfc4314, Obsolote Rights
-					$content['grid'][$n]['acl_d'] = array_diff($virtualD,array_intersect($rights,$virtuals['d']))? false: true; //d=et more information rfc4314, Obsolote Rights
+					$virtualD = array('e', 't');
+					$content['grid'][$n]['acl_c'] = array_diff($virtuals['c'], array_intersect($rights, $virtuals['c'])) ? false : true; //c=kx more information rfc4314, Obsolote Rights
+					$content['grid'][$n]['acl_d'] = array_diff($virtualD, array_intersect($rights, $virtuals['d'])) ? false : true; //d=et more information rfc4314, Obsolote Rights
 
 					sort($rights);
-					$acl_abbrvs = implode('',$rights);
+					$acl_abbrvs = implode('', $rights);
 
 					if (array_key_exists($acl_abbrvs, $this->aclRightsAbbrvs))
 					{
@@ -159,7 +159,7 @@ 
 				case 'apply':
 					if ($content)
 					{
-						$validation_err = $this->update_acl($content,$msg);
+						$validation_err = $this->update_acl($content, $msg);
 						if ($validation_err)
 						{
 							foreach ($validation_err as &$row)
@@ -193,7 +193,7 @@ 
 					}
 					else
 					{
-						error_log(__METHOD__.__LINE__. "()" . "The remove_acl suppose to return an array back, something is wrong there");
+						error_log(__METHOD__.__LINE__."()"."The remove_acl suppose to return an array back, something is wrong there");
 					}
 					Framework::message($msg);
 			}
@@ -202,7 +202,7 @@ 
 		$sel_options['acl'] = $this->aclRightsAbbrvs;
 
 		//Make the account owner's fields all readonly as owner has all rights and should not be able to change them
-		foreach($content['grid'] as $key => $fields)
+		foreach ($content['grid'] as $key => $fields)
 		{
 			if ($fields['acc_id'] == $this->imap->acc_imap_username ||
 					$fields['acc_id'][0] == $this->imap->acc_imap_username)
@@ -235,7 +235,7 @@ 
 			));
 		}
 
-		$tmpl->exec('mail.mail_acl.edit', $content, $sel_options, $readonlys, $preserv,2);
+		$tmpl->exec('mail.mail_acl.edit', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 		$mailbox = $imap->isAdminConnection ? $imap->getUserMailboxString($imap->isAdminConnection) : 'INBOX';
 
 		$folders = array();
-		foreach(self::getSubfolders($mailbox, $imap) as $folder)
+		foreach (self::getSubfolders($mailbox, $imap) as $folder)
 		{
 			if (stripos($folder, $_GET['query']) !== false)
 			{
@@ -282,7 +282,7 @@ 
 	 * @param string $msg Message
 	 *
 	 */
-	function update_acl ($content, &$msg)
+	function update_acl($content, &$msg)
 	{
 		$validator = array();
 
@@ -298,14 +298,14 @@ 
 			{
 				if ($value[$key] == true)
 				{
-					$right = explode("acl_" ,$key);
+					$right = explode("acl_", $key);
 					if ($right[1] === 'c') $right[1] = 'kx'; // c = kx , rfc 4314
 					if ($right[1] === 'd') $right[1] = 'et'; // d = et , rfc 4314
-					$options['rights'] .=  $right[1];
+					$options['rights'] .= $right[1];
 				}
 			}
 			$username = $content['grid'][$keys]['acc_id'] == $this->imap->acc_imap_username
-				?$content['grid'][$keys]['acc_id']:$content['grid'][$keys]['acc_id'][0];
+				? $content['grid'][$keys]['acc_id'] : $content['grid'][$keys]['acc_id'][0];
 			//error_log(__METHOD__."(".__LINE__.") setACL($content[mailbox], $username, ".array2string($options).", $recursive)");
 			if (is_numeric($username) && ($u = $this->imap->getMailBoxUserName($username)))
 			{
@@ -314,7 +314,7 @@ 
 			if (!empty($username))
 			{
 				//error_log(__METHOD__."() setACL($content[mailbox], $username, ".array2string($options).", $recursive)");
-				if (($ret=$this->setACL($content['mailbox'], $username, $options, $recursive, $msg)))
+				if (($ret = $this->setACL($content['mailbox'], $username, $options, $recursive, $msg)))
 				{
 					$msg = lang("The Folder %1 's ACLs saved", $content['mailbox']);
 
@@ -326,7 +326,7 @@ 
 			}
 			else
 			{
-				if($keys !== count($content['grid']))
+				if ($keys !== count($content['grid']))
 				{
 					array_push($validator, $keys);
 					$msg = lang("Error:Could not save the ACL! Because some names are empty!");
@@ -343,7 +343,7 @@ 
 	 * Retrive Folder ACL rights
 	 * @todo rights 'c' and 'd' should be fixed
 	 */
-	function retrive_acl ($mailbox, &$msg)
+	function retrive_acl($mailbox, &$msg)
 	{
 		if (($acl = $this->getACL($mailbox)))
 		 {
@@ -368,7 +368,7 @@ 
 	 */
 	function remove_acl($content, &$msg)
 	{
-		$row_num = array_keys($content['grid']['delete'],"pressed");
+		$row_num = array_keys($content['grid']['delete'], "pressed");
 		if ($row_num) $row_num = $row_num[0];
 		$recursive = $content['grid'][$row_num]['acl_recursive'];
 		$identifier = $content['grid'][$row_num]['acc_id'][0];
@@ -378,24 +378,24 @@ 
 			$identifier = $u;
 		}
 		//error_log(__METHOD__.__LINE__."(".$content['mailbox'].", ".$identifier.", ".$recursive.")");
-		if(($res = $this->deleteACL($content['mailbox'], $identifier,$recursive)))
+		if (($res = $this->deleteACL($content['mailbox'], $identifier, $recursive)))
 		{
 			unset($content['grid'][$row_num]);
 			unset($content['grid']['delete']);
 			if ($recursive)
 			{
-				$msg = lang("The %1 's acl, including its subfolders, removed from the %2",$content['mailbox'],$identifier);
+				$msg = lang("The %1 's acl, including its subfolders, removed from the %2", $content['mailbox'], $identifier);
 			}
 			else
 			{
-				$msg = lang("The %1 's acl removed from the %2",$content['mailbox'],$identifier);
+				$msg = lang("The %1 's acl removed from the %2", $content['mailbox'], $identifier);
 			}
 
 			return array_combine(range(1, count($content['grid'])), array_values($content['grid']));
 		}
 		else
 		{
-			$msg = lang("An error happend while trying to remove ACL rights from the account %1!",$identifier);
+			$msg = lang("An error happend while trying to remove ACL rights from the account %1!", $identifier);
 			return false;
 		}
 	}
@@ -410,7 +410,7 @@ 
 	 *
 	 * @return Boolean FALSE in case of any exceptions and TRUE in case of success
 	 */
-	function deleteACL ($mailbox, $identifier, $recursive)
+	function deleteACL($mailbox, $identifier, $recursive)
 	{
 		if ($recursive)
 		{
@@ -420,7 +420,7 @@ 
 		{
 			$folders = (array)$mailbox;
 		}
-		foreach($folders as $sbFolders)
+		foreach ($folders as $sbFolders)
 		{
 			try
 			{
@@ -428,7 +428,7 @@ 
 			}
 			catch (Exception $e)
 			{
-				error_log(__METHOD__. "Could not delete ACL rights of folder " . $mailbox . " for account ". $identifier ." because of " .$e->getMessage());
+				error_log(__METHOD__."Could not delete ACL rights of folder ".$mailbox." for account ".$identifier." because of ".$e->getMessage());
 				return false;
 			}
 		}
@@ -471,7 +471,7 @@ 
 	 * @return Boolean FALSE in case of any exceptions and TRUE in case of success,
 	 *
 	 */
-	function setACL($mailbox, $identifier,$options, $recursive, &$msg)
+	function setACL($mailbox, $identifier, $options, $recursive, &$msg)
 	{
 		if ($recursive)
 		{
@@ -481,16 +481,16 @@ 
 		{
 			$folders = (array)$mailbox;
 		}
-		foreach($folders as $sbFolders)
+		foreach ($folders as $sbFolders)
 		{
 			try
 			{
-				$this->imap->setACL($sbFolders,$identifier,$options);
+				$this->imap->setACL($sbFolders, $identifier, $options);
 			}
 			catch (Exception $e)
 			{
 				$msg = $e->getMessage();
-				error_log(__METHOD__. "Could not set ACL rights on folder " . $mailbox . " for account ". $identifier . " because of " .$e->getMessage());
+				error_log(__METHOD__."Could not set ACL rights on folder ".$mailbox." for account ".$identifier." because of ".$e->getMessage());
 				return false;
 			}
 		}
@@ -503,14 +503,14 @@ 
 	 * @param String $mailbox folder name that needs to be read
 	 * @return Boolean FALSE in case of any exceptions and if TRUE in case of success,
 	 */
-	function getACL ($mailbox)
+	function getACL($mailbox)
 	{
 		try
 		{
 			$acl = $this->imap->getACL($mailbox);
 			return $acl;
 		} catch (Exception $e) {
-			error_log(__METHOD__. "Could not get ACL rights from folder " . $mailbox . " because of " .$e->getMessage());
+			error_log(__METHOD__."Could not get ACL rights from folder ".$mailbox." because of ".$e->getMessage());
 			return false;
 		}
 	}

resources/sitemgr/class.module_resources_reservation.inc.php

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
 		$categories = new Api\Categories('', 'resources');
 		$cat_list = $categories->return_sorted_array();
 		$cat_options = array();
-		foreach($cat_list as $category)
+		foreach ($cat_list as $category)
 		{
 			$cat_options[$category['id']] = $category['name'];
 		}
@@ -54,7 +54,7 @@ 
 			'email_message' => array(
 				'type' => 'textarea',
 				'large' => true,
-				'label' => lang('Confirmation email text').'<br />%1 = ' . lang('Event start').'<br/>%2 = link<br />%3 = '.lang('expiry'),
+				'label' => lang('Confirmation email text').'<br />%1 = '.lang('Event start').'<br/>%2 = link<br />%3 = '.lang('expiry'),
 				'params' => array(
 					'rows'	=> 8,
 					'cols'	=> 110
@@ -65,7 +65,7 @@ 
 				'label' => lang('Confirmed addressbook.').' ('.lang('The anonymous user needs add rights for it!').')',
 				'options' => array(
 					'' => lang('None'),
-				)+registration_bo::get_allowed_addressbooks(registration_bo::CONFIRMED)
+				) + registration_bo::get_allowed_addressbooks(registration_bo::CONFIRMED)
 			),
 			'include_group' => array(
 				'type' => 'select',
@@ -90,7 +90,7 @@ 
 		// Add resources from selected category
 		$bo = new resources_bo();
 		$bo->get_rows($query, $list, $readonlys);
-		foreach($list as $resource)
+		foreach ($list as $resource)
 		{
 			$this->arguments['resource']['options'][$resource['res_id']] = $resource['name'];
 		}
@@ -105,9 +105,9 @@ 
 	* @param array $properties
 	* @return string the Api\Html content
 	*/
-	function get_content(&$arguments,$properties)
+	function get_content(&$arguments, $properties)
 	{
-		list($app) = explode('.',$this->etemplate_method);
+		list($app) = explode('.', $this->etemplate_method);
 		Api\Translation::add_app($app);
 
 		$extra = "<style type=\"text/css\">\n<!--\n@import url(".$GLOBALS['egw_info']['server']['webserver_url'].
@@ -122,14 +122,14 @@ 
 		$extra .= "-->\n</style>\n";
 		$extra .= '<script src="'.$GLOBALS['egw_info']['server']['webserver_url'].'/etemplate/js/etemplate.js" type="text/javascript"></script>'."\n";
 		$ret = false;
-		if($_POST['etemplate_exec_id'])
+		if ($_POST['etemplate_exec_id'])
 		{
 				$ret = ExecMethod('etemplate.etemplate.process_exec');
 		}
-		if($_GET['date']) $arguments['date'] = strtotime($_GET['date']);
+		if ($_GET['date']) $arguments['date'] = strtotime($_GET['date']);
 		$arguments['link'] = $this->link();
 		$arguments['sitemgr_version'] = $this->block->version;
-		return $extra.($ret ? $ret : ExecMethod2($this->etemplate_method,null,$arguments));
+		return $extra.($ret ? $ret : ExecMethod2($this->etemplate_method, null, $arguments));
 	}
 
 }

resources/setup/tables_current.inc.php

Spacing +24 added lines, -24 removed lines

@@ -14,26 +14,26 @@ 
 $phpgw_baseline = array(
 	'egw_resources' => array(
 		'fd' => array(
-			'res_id' => array('type' => 'auto','nullable' => False),
-			'name' => array('type' => 'varchar','precision' => '100'),
-			'short_description' => array('type' => 'varchar','precision' => '100'),
-			'cat_id' => array('type' => 'int','meta' => 'category','precision' => '11','nullable' => False),
-			'quantity' => array('type' => 'int','precision' => '11','default' => '1'),
-			'useable' => array('type' => 'int','precision' => '11','default' => '1'),
-			'location' => array('type' => 'varchar','precision' => '100'),
-			'bookable' => array('type' => 'varchar','precision' => '1'),
-			'buyable' => array('type' => 'varchar','precision' => '1'),
-			'prize' => array('type' => 'varchar','precision' => '200'),
+			'res_id' => array('type' => 'auto', 'nullable' => False),
+			'name' => array('type' => 'varchar', 'precision' => '100'),
+			'short_description' => array('type' => 'varchar', 'precision' => '100'),
+			'cat_id' => array('type' => 'int', 'meta' => 'category', 'precision' => '11', 'nullable' => False),
+			'quantity' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'useable' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'location' => array('type' => 'varchar', 'precision' => '100'),
+			'bookable' => array('type' => 'varchar', 'precision' => '1'),
+			'buyable' => array('type' => 'varchar', 'precision' => '1'),
+			'prize' => array('type' => 'varchar', 'precision' => '200'),
 			'long_description' => array('type' => 'longtext'),
-			'picture_src' => array('type' => 'varchar','precision' => '20'),
-			'accessory_of' => array('type' => 'int','precision' => '11','default' => '-1'),
-			'storage_info' => array('type' => 'varchar','precision' => '200'),
-			'inventory_number' => array('type' => 'varchar','precision' => '20'),
-			'deleted' => array('type' => 'int','meta' => 'timestamp','precision' => '8'),
-			'res_creator' => array('type' => 'int','meta' => 'user','precision' => '11'),
-			'res_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8'),
-			'res_modifier' => array('type' => 'int','meta' => 'user','precision' => '11'),
-			'res_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8')
+			'picture_src' => array('type' => 'varchar', 'precision' => '20'),
+			'accessory_of' => array('type' => 'int', 'precision' => '11', 'default' => '-1'),
+			'storage_info' => array('type' => 'varchar', 'precision' => '200'),
+			'inventory_number' => array('type' => 'varchar', 'precision' => '20'),
+			'deleted' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8'),
+			'res_creator' => array('type' => 'int', 'meta' => 'user', 'precision' => '11'),
+			'res_created' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8'),
+			'res_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '11'),
+			'res_modified' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8')
 		),
 		'pk' => array('res_id'),
 		'fk' => array(),
@@ -42,12 +42,12 @@ 
 	),
 	'egw_resources_extra' => array(
 		'fd' => array(
-			'extra_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'extra_name' => array('type' => 'varchar','meta' => 'cfname','precision' => '40','nullable' => False),
-			'extra_owner' => array('type' => 'int','meta' => 'account','precision' => '4','nullable' => False,'default' => '-1'),
-			'extra_value' => array('type' => 'varchar','meta' => 'cfvalue','precision' => '255','nullable' => False,'default' => '')
+			'extra_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'extra_name' => array('type' => 'varchar', 'meta' => 'cfname', 'precision' => '40', 'nullable' => False),
+			'extra_owner' => array('type' => 'int', 'meta' => 'account', 'precision' => '4', 'nullable' => False, 'default' => '-1'),
+			'extra_value' => array('type' => 'varchar', 'meta' => 'cfvalue', 'precision' => '255', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('extra_id','extra_name','extra_owner'),
+		'pk' => array('extra_id', 'extra_name', 'extra_owner'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()

resources/inc/class.resources_wizard_import_csv.inc.php

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

resources/inc/class.resources_wizard_export_csv.inc.php

Spacing +6 added lines, -6 removed lines

@@ -26,26 +26,26 @@ 
 
 		// Custom fields
 		$custom = Api\Storage\Customfields::get('resources', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}
 
 	public function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv) {
-		if($this->debug || true) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		if ($this->debug || true) error_log(get_class($this).'::wizard_step50->$content '.print_r($content, true));
 		// return
 		if ($content['step'] == 'wizard_step50')
 		{
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step50($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step50($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step
@@ -57,7 +57,7 @@ 
 			unset ($preserv['button']);
 			$fields = array('pm_used_time', 'pm_planned_time', 'pm_replanned_time');
 			$sel_options = array_fill_keys($fields, array('h' => lang('hours'), 'd' => lang('days')));
-			foreach($fields as $field) {
+			foreach ($fields as $field) {
 				$content[$field] = $content[$field] ? $content[$field] : $content['plugin_options'][$field];
 			}
 		}

resources/inc/class.resources_so.inc.php

Spacing +6 added lines, -7 removed lines

@@ -22,10 +22,10 @@ 
 {
 	function __construct()
 	{
-		parent::__construct('resources','egw_resources', 'egw_resources_extra', '',
-			'extra_name', 'extra_value', 'extra_id' );
+		parent::__construct('resources', 'egw_resources', 'egw_resources_extra', '',
+			'extra_name', 'extra_value', 'extra_id');
 
-		$this->columns_to_search = array('name','short_description','inventory_number','long_description','location');
+		$this->columns_to_search = array('name', 'short_description', 'inventory_number', 'long_description', 'location');
 	}
 
 	/**
@@ -35,10 +35,9 @@ 
 	 * @param int $res_id resource id
 	 * @return mixed value of key and resource, false if key or id not found.
 	 */
-	function get_value($key,$res_id)
+	function get_value($key, $res_id)
 	{
-		return $res_id == $this->data['res_id'] ? $this->data[$key] :
-			$this->db->select($this->table_name,$key,array('res_id' => $res_id),__LINE__,__FILE__)->fetchColumn();
+		return $res_id == $this->data['res_id'] ? $this->data[$key] : $this->db->select($this->table_name, $key, array('res_id' => $res_id), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -90,7 +89,7 @@ 
 	function save($resource)
 	{
 		$this->data = $resource;
-		if(parent::save() != 0) return false;
+		if (parent::save() != 0) return false;
 		$res_id = $this->data['res_id'];
 
 		return $res_id;

resources/inc/class.resources_egw_record.inc.php

Spacing +8 added lines, -8 removed lines

@@ -34,9 +34,9 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
+	public function __construct($_identifier = '') {
 		$this->identifier = $_identifier;
-		if($this->identifier) {
+		if ($this->identifier) {
 			$this->record = ExecMethod('resources.resources_bo.read', $this->identifier);
 		}
 	}
@@ -90,7 +90,7 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->record = $_record;
 	}
 
@@ -111,7 +111,7 @@ 
 	 */
 	public function get_icon() {
 		$bo = new resources_bo();
-		if(!$icon = $bo->get_picture($this->identifier,$this->picture_src))
+		if (!$icon = $bo->get_picture($this->identifier, $this->picture_src))
 		{
 			$icon = 'resources/navbar';
 		}
@@ -123,7 +123,7 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save($_dst_identifier) {
 
 	}
 
@@ -133,7 +133,7 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy($_dst_identifier) {
 
 	}
 
@@ -144,7 +144,7 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move($_dst_identifier) {
 
 	}
 
@@ -152,7 +152,7 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}