EGroupware / egroupware

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_wizard.inc.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 		parent::__construct();
 
 		// need emailadmin's app.css file
-		Framework::includeCSS('admin','app');
+		Framework::includeCSS('admin', 'app');
 
 		// and translations
 		Api\Translation::add_app('admin');

mail/inc/class.mail_integration.inc.php

Spacing +48 added lines, -48 removed lines

@@ -65,10 +65,10 @@ 
 	 * @param int $_icServerID mail profile id
 	 * @throws Api\Exception\AssertionFailed
 	 */
-	public static function integrate ($_to_emailAddress=false,$_subject=false,$_body=false,$_attachments=false,$_date=false,$_rawMail=null,$_icServerID=null)
+	public static function integrate($_to_emailAddress = false, $_subject = false, $_body = false, $_attachments = false, $_date = false, $_rawMail = null, $_icServerID = null)
 	{
 		// App name which is called for integration
-		$app = isset($GLOBALS['egw_info']['user']['apps'][$_GET['app']])? $_GET['app'] : null;
+		$app = isset($GLOBALS['egw_info']['user']['apps'][$_GET['app']]) ? $_GET['app'] : null;
 
 		// preset app entry id, selected by user from app_entry_dialog
 		$app_entry_id = $_GET['entry_id'];
@@ -77,7 +77,7 @@ 
 		if (!$_date)
 		{
 			$time = time();
-			$_date = Api\DateTime::server2user($time->now,'ts');
+			$_date = Api\DateTime::server2user($time->now, 'ts');
 		}
 
 		// For dealing with multiple files of the same name
@@ -91,11 +91,11 @@ 
 			$sessionLocation = 'mail';
 			$mailbox = base64_decode($_GET['mailbox']);
 
-			if (!($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions']==='text_only')&&is_array($_attachments))
+			if (!($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions'] === 'text_only') && is_array($_attachments))
 			{
 				// initialize mail open connection requirements
-				if (!isset($_icServerID)) $_icServerID =& Api\Cache::getSession($sessionLocation,'activeProfileID');
-				$mo = mail_bo::getInstance(true,$_icServerID);
+				if (!isset($_icServerID)) $_icServerID = & Api\Cache::getSession($sessionLocation, 'activeProfileID');
+				$mo = mail_bo::getInstance(true, $_icServerID);
 				$mo->openConnection();
 				$messagePartId = $messageFolder = null;
 				foreach ($_attachments as $attachment)
@@ -103,16 +103,16 @@ 
 					//error_log(__METHOD__.__LINE__.array2string($attachment));
 					if (trim(strtoupper($attachment['type'])) == 'MESSAGE/RFC822' && !empty($attachment['uid']) && !empty($attachment['folder']))
 					{
-						$mo->reopen(($attachment['folder']?$attachment['folder']:$mailbox));
+						$mo->reopen(($attachment['folder'] ? $attachment['folder'] : $mailbox));
 
 						// get the message itself, and attach it, as we are able to display it in egw
 						// instead of fetching only the attachments attached files (as we did previously)
-						$message = $mo->getMessageRawBody($attachment['uid'],$attachment['partID'],($attachment['folder']?$attachment['folder']:$mailbox));
-						$headers = $mo->getMessageHeader($attachment['uid'],$attachment['partID'],true,false,($attachment['folder']?$attachment['folder']:$mailbox));
+						$message = $mo->getMessageRawBody($attachment['uid'], $attachment['partID'], ($attachment['folder'] ? $attachment['folder'] : $mailbox));
+						$headers = $mo->getMessageHeader($attachment['uid'], $attachment['partID'], true, false, ($attachment['folder'] ? $attachment['folder'] : $mailbox));
 						$subject = mail_bo::adaptSubjectForImport($headers['SUBJECT']);
-						$attachment_file =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
-						$tmpfile = fopen($attachment_file,'w');
-						fwrite($tmpfile,$message);
+						$attachment_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'], $GLOBALS['egw_info']['flags']['currentapp']."_");
+						$tmpfile = fopen($attachment_file, 'w');
+						fwrite($tmpfile, $message);
 						fclose($tmpfile);
 						$size = filesize($attachment_file);
 						$attachments[] = array(
@@ -132,23 +132,23 @@ 
 							$messageUid = $attachment['uid'];
 							$messagePartId = $attachment['partID'];
 							$mo->reopen($attachment['folder']);
-							$attachmentData = $mo->getAttachment($attachment['uid'],$attachment['partID'],$is_winmail,false,false,$attachment['folder']);
-							$attachment['file'] =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
-							$tmpfile = fopen($attachment['file'],'w');
-							fwrite($tmpfile,$attachmentData['attachment']);
+							$attachmentData = $mo->getAttachment($attachment['uid'], $attachment['partID'], $is_winmail, false, false, $attachment['folder']);
+							$attachment['file'] = tempnam($GLOBALS['egw_info']['server']['temp_dir'], $GLOBALS['egw_info']['flags']['currentapp']."_");
+							$tmpfile = fopen($attachment['file'], 'w');
+							fwrite($tmpfile, $attachmentData['attachment']);
 							fclose($tmpfile);
 						}
 						//make sure we search for our attached file in our configured temp_dir
-						if (isset($attachment['file']) && parse_url($attachment['file'],PHP_URL_SCHEME) != 'vfs' &&
+						if (isset($attachment['file']) && parse_url($attachment['file'], PHP_URL_SCHEME) != 'vfs' &&
 							file_exists($GLOBALS['egw_info']['server']['temp_dir'].SEP.basename($attachment['file'])))
 						{
 							$attachment['file'] = $GLOBALS['egw_info']['server']['temp_dir'].SEP.basename($attachment['file']);
 						}
-						if(in_array($attachment['name'], $file_list))
+						if (in_array($attachment['name'], $file_list))
 						{
 							$dupe_count[$attachment['name']]++;
-							$attachment['name'] = pathinfo($attachment['name'], PATHINFO_FILENAME) .
-								' ('.($dupe_count[$attachment['name']] + 1).')' . '.' .
+							$attachment['name'] = pathinfo($attachment['name'], PATHINFO_FILENAME).
+								' ('.($dupe_count[$attachment['name']] + 1).')'.'.'.
 								pathinfo($attachment['name'], PATHINFO_EXTENSION);
 						}
 						$attachments[] = array(
@@ -166,7 +166,7 @@ 
 					//error_log(__METHOD__.__LINE__."#".$messageUid.'#'.$messageFolder);
 					try // message may be deleted already, as it maybe done by autosave
 					{
-						$mo->deleteMessages(array($messageUid),$messageFolder);
+						$mo->deleteMessages(array($messageUid), $messageFolder);
 					}
 					catch (Api\Exception $e)
 					{
@@ -178,7 +178,7 @@ 
 			}
 			// this one adds the mail itself (as message/rfc822 (.eml) file) to the app as additional attachment
 			// this is done to have a simple archive functionality (ToDo: opening .eml in email module)
-			if ($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions']==='add_raw' &&
+			if ($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions'] === 'add_raw' &&
 				$_rawMail && file_exists($_rawMail))
 			{
 				$subject = mail_bo::adaptSubjectForImport($_subject);
@@ -193,24 +193,24 @@ 
 			}
 
 			$toaddr = array();
-			foreach(array('to','cc','bcc') as $x)
+			foreach (array('to', 'cc', 'bcc') as $x)
 			{
 				if (is_array($_to_emailAddress[$x]) && !empty($_to_emailAddress[$x]))
 				{
-					$toaddr = array_merge($toaddr,$_to_emailAddress[$x]);
+					$toaddr = array_merge($toaddr, $_to_emailAddress[$x]);
 				}
 			}
 			$body_striped = strip_tags($_body); //we need to fix broken tags (or just stuff like "<800 USD/p" )
-			$body_decoded = htmlspecialchars_decode($body_striped,ENT_QUOTES);
+			$body_decoded = htmlspecialchars_decode($body_striped, ENT_QUOTES);
 			$body = mail_bo::createHeaderInfoSection(array('FROM'=>$_to_emailAddress['from'],
-				'TO'=>(!empty($_to_emailAddress['to'])?implode(',',$_to_emailAddress['to']):null),
-				'CC'=>(!empty($_to_emailAddress['cc'])?implode(',',$_to_emailAddress['cc']):null),
-				'BCC'=>(!empty($_to_emailAddress['bcc'])?implode(',',$_to_emailAddress['bcc']):null),
+				'TO'=>(!empty($_to_emailAddress['to']) ? implode(',', $_to_emailAddress['to']) : null),
+				'CC'=>(!empty($_to_emailAddress['cc']) ? implode(',', $_to_emailAddress['cc']) : null),
+				'BCC'=>(!empty($_to_emailAddress['bcc']) ? implode(',', $_to_emailAddress['bcc']) : null),
 				'SUBJECT'=>$_subject,
 				'DATE'=>mail_bo::_strtotime($_date))).$body_decoded;
 
 			$mailcontent = array(
-				'mailaddress' => implode(',',$toaddr),
+				'mailaddress' => implode(',', $toaddr),
 				'subject' => $_subject,
 				'message' => $body,
 				'attachments' => $attachments,
@@ -225,28 +225,28 @@ 
 			$hA = mail_ui::splitRowID($_GET['rowid']);
 			$sessionLocation = $hA['app']; // THIS is part of the row ID, we may use this for validation
 			// Check the mail app
-			if ($sessionLocation != 'mail') throw new Api\Exception\AssertionFailed(lang('Application mail expected but got: %1',$sessionLocation));
+			if ($sessionLocation != 'mail') throw new Api\Exception\AssertionFailed(lang('Application mail expected but got: %1', $sessionLocation));
 			$uid = $hA['msgUID'];
 			$mailbox = $hA['folder'];
 			$icServerID = $hA['profileID'];
 
 			if ($uid && $mailbox)
 			{
-				if (!isset($icServerID)) $icServerID =& Api\Cache::getSession($sessionLocation,'activeProfileID');
-				$mo	= mail_bo::getInstance(true,$icServerID);
+				if (!isset($icServerID)) $icServerID = & Api\Cache::getSession($sessionLocation, 'activeProfileID');
+				$mo = mail_bo::getInstance(true, $icServerID);
 				$mo->openConnection();
 				$mo->reopen($mailbox);
-				$mailcontent = mail_bo::get_mailcontent($mo,$uid,'',$mailbox,false,true,(!($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions']==='text_only')));
+				$mailcontent = mail_bo::get_mailcontent($mo, $uid, '', $mailbox, false, true, (!($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions'] === 'text_only')));
 				// this one adds the mail itself (as message/rfc822 (.eml) file) to the app as additional attachment
 				// this is done to have a simple archive functionality (ToDo: opening .eml in email module)
-				if ($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions']==='add_raw')
+				if ($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions'] === 'add_raw')
 				{
-					$message = $mo->getMessageRawBody($uid, '',$mailbox);
-					$headers = $mo->getMessageHeader($uid, '',true,false,$mailbox);
+					$message = $mo->getMessageRawBody($uid, '', $mailbox);
+					$headers = $mo->getMessageHeader($uid, '', true, false, $mailbox);
 					$subject = mail_bo::adaptSubjectForImport($headers['SUBJECT']);
-					$attachment_file =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."mail_integrate");
-					$tmpfile = fopen($attachment_file,'w');
-					fwrite($tmpfile,$message);
+					$attachment_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'], $GLOBALS['egw_info']['flags']['currentapp']."mail_integrate");
+					$tmpfile = fopen($attachment_file, 'w');
+					fwrite($tmpfile, $message);
 					fclose($tmpfile);
 					$size = filesize($attachment_file);
 					$mailcontent['attachments'][] = array(
@@ -263,11 +263,11 @@ 
 		}
 
 		// Convert addresses to email and personal
-		$addresses = imap_rfc822_parse_adrlist($mailcontent['mailaddress'],'');
+		$addresses = imap_rfc822_parse_adrlist($mailcontent['mailaddress'], '');
 		foreach ($addresses as $address)
 		{
-			$email = sprintf('%s@%s',trim($address->mailbox),trim($address->host));
-			$data_addresses[] = array (
+			$email = sprintf('%s@%s', trim($address->mailbox), trim($address->host));
+			$data_addresses[] = array(
 				'email' => $email,
 				'name' => !empty($address->personal) ? $address->personal : $email
 			);
@@ -277,7 +277,7 @@ 
 		$data_message = preg_replace_callback(
 			'/[-_+=~\.]{'.self::MAX_LINE_CHARS.',}/m',
 			function($matches) {
-				return substr($matches[0],0,self::MAX_LINE_CHARS);
+				return substr($matches[0], 0, self::MAX_LINE_CHARS);
 			},
 			$mailcontent['message']
 		);
@@ -285,7 +285,7 @@ 
 		// Get attachments ready for integration as link
 		if (is_array($mailcontent['attachments']))
 		{
-			foreach($mailcontent['attachments'] as $key => $attachment)
+			foreach ($mailcontent['attachments'] as $key => $attachment)
 			{
 				$data_attachments[$key] = array(
 					'name' => $mailcontent['attachments'][$key]['name'],
@@ -296,28 +296,28 @@ 
 				if ($uid && !$mailcontent['attachments'][$key]['add_raw'])
 				{
 					$data_attachments[$key]['egw_data'] = Link::set_data($mailcontent['attachments'][$key]['mimeType'],
-						'EGroupware\\Api\\Mail::getAttachmentAccount',array($icServerID, $mailbox, $uid, $attachment['partID'], $is_winmail, true),true);
+						'EGroupware\\Api\\Mail::getAttachmentAccount', array($icServerID, $mailbox, $uid, $attachment['partID'], $is_winmail, true), true);
 				}
 				unset($mailcontent['attachments'][$key]['add_raw']);
 			}
 		}
 
 		// Check if the hook is registered
-		if (Api\Hooks::exists('mail_import',$app) == 0)
+		if (Api\Hooks::exists('mail_import', $app) == 0)
 		{
 			// Try to register hook
 			Api\Hooks::read(true);
 		}
 
 		// Get the registered hook method of requested app for integration
-		$hook = Api\Hooks::single(array('location' => 'mail_import'),$app);
+		$hook = Api\Hooks::single(array('location' => 'mail_import'), $app);
 
 		// Load Api\Translation for the app since the original URL
 		// is from mail integration and only loads mail Api\Translation
 		Api\Translation::add_app($app);
 
 		// Execute import mail with provided content
-		ExecMethod($hook['menuaction'],array (
+		ExecMethod($hook['menuaction'], array(
 			'addresses' => $data_addresses,
 			'attachments' => $data_attachments,
 			'message' => $data_message,

Braces +16 added lines, -5 removed lines

@@ -18,7 +18,8 @@ 
  * to be used to integrate mail's message into other applications
  *
  */
-class mail_integration {
+class mail_integration
+{
 
 	/**
 	 * Public functions
@@ -94,7 +95,10 @@ 
 			if (!($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions']==='text_only')&&is_array($_attachments))
 			{
 				// initialize mail open connection requirements
-				if (!isset($_icServerID)) $_icServerID =& Api\Cache::getSession($sessionLocation,'activeProfileID');
+				if (!isset($_icServerID))
+				{
+					$_icServerID =& Api\Cache::getSession($sessionLocation,'activeProfileID');
+				}
 				$mo = mail_bo::getInstance(true,$_icServerID);
 				$mo->openConnection();
 				$messagePartId = $messageFolder = null;
@@ -225,14 +229,20 @@ 
 			$hA = mail_ui::splitRowID($_GET['rowid']);
 			$sessionLocation = $hA['app']; // THIS is part of the row ID, we may use this for validation
 			// Check the mail app
-			if ($sessionLocation != 'mail') throw new Api\Exception\AssertionFailed(lang('Application mail expected but got: %1',$sessionLocation));
+			if ($sessionLocation != 'mail')
+			{
+				throw new Api\Exception\AssertionFailed(lang('Application mail expected but got: %1',$sessionLocation));
+			}
 			$uid = $hA['msgUID'];
 			$mailbox = $hA['folder'];
 			$icServerID = $hA['profileID'];
 
 			if ($uid && $mailbox)
 			{
-				if (!isset($icServerID)) $icServerID =& Api\Cache::getSession($sessionLocation,'activeProfileID');
+				if (!isset($icServerID))
+				{
+					$icServerID =& Api\Cache::getSession($sessionLocation,'activeProfileID');
+				}
 				$mo	= mail_bo::getInstance(true,$icServerID);
 				$mo->openConnection();
 				$mo->reopen($mailbox);
@@ -276,7 +286,8 @@ 
 		// shorten long (> self::max_line_chars) lines of "line" chars (-_+=~) in mails
 		$data_message = preg_replace_callback(
 			'/[-_+=~\.]{'.self::MAX_LINE_CHARS.',}/m',
-			function($matches) {
+			function($matches)
+			{
 				return substr($matches[0],0,self::MAX_LINE_CHARS);
 			},
 			$mailcontent['message']

mail/inc/class.mail_hooks.inc.php

Indentation +10 added lines, -10 removed lines

@@ -69,16 +69,16 @@ 
 	}
 
 	/**
-     * Hook called by link-class to include mail in the appregistry of the linkage
-     *
-     * @param array|string $location location and other parameters (not used)
-     * @return array with method-names
-     */
-    static function search_link($location)
-    {
+	 * Hook called by link-class to include mail in the appregistry of the linkage
+	 *
+	 * @param array|string $location location and other parameters (not used)
+	 * @return array with method-names
+	 */
+	static function search_link($location)
+	{
 		unset($location);	// not used, but required by function signature
 
-        return array(
+		return array(
 			'view'  => array(
 				'menuaction' => 'mail.mail_ui.displayMessage',
 			),
@@ -107,8 +107,8 @@ 
 			),
 			'entry' => 'Mail',
 			'entries' => 'Mails',
-        );
-    }
+		);
+	}
 
 	/**
 	 * Settings hook

Spacing +46 added lines, -46 removed lines

@@ -36,7 +36,7 @@ 
 
 			if (true /* ToDo check ACL available */ || $account['acc_imap_type'] == 'managementserver_imap')
 			{
-				$actions[] = array (
+				$actions[] = array(
 					'id' => 'mail_acl',
 					'caption' => 'Folder ACL',
 					'icon' => 'lock',
@@ -51,7 +51,7 @@ 
 			}
 			if ($account['acc_sieve_enabled'] || $account['acc_imap_type'] == 'managementserver_imap')
 			{
-				$actions[] = array (
+				$actions[] = array(
 					'id' => 'mail_vacation',
 					'caption' => 'Vacation notice',
 					'icon' => 'mail/navbar',
@@ -76,7 +76,7 @@ 
      */
     static function search_link($location)
     {
-		unset($location);	// not used, but required by function signature
+		unset($location); // not used, but required by function signature
 
         return array(
 			'view'  => array(
@@ -131,7 +131,7 @@ 
 			'0' => lang('no'),
 			'1' => lang('yes')
 		);
-		$no_yes_copy = array_merge($no_yes,array('2'=>lang('yes, offer copy option')));
+		$no_yes_copy = array_merge($no_yes, array('2'=>lang('yes, offer copy option')));
 
 		$forwardOptions = array(
 			'asmail' => lang('forward as attachment'),
@@ -139,7 +139,7 @@ 
 		);
 		$trustServersUnseenOptions = array_merge(
 			$no_yes,
-			array('2' => lang('yes') . ' - ' . lang('but check shared folders'))
+			array('2' => lang('yes').' - '.lang('but check shared folders'))
 		);
 
 		$deleteOptions = array(
@@ -364,7 +364,7 @@ 
 	 */
 	static function admin($hook_data)
 	{
-		unset($hook_data);	// not used, but required by function signature
+		unset($hook_data); // not used, but required by function signature
 
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 		// Only Modify the $file and $title variables.....
@@ -374,9 +374,9 @@ 
 			$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
 
 		$file = Array(
-			'Site Configuration' => Egw::link('/index.php',array('menuaction'=>'admin.uiconfig.index','appname'=>'mail')),
+			'Site Configuration' => Egw::link('/index.php', array('menuaction'=>'admin.uiconfig.index', 'appname'=>'mail')),
 		);
-		display_section($appname,$title,$file);
+		display_section($appname, $title, $file);
 	}
 
 	/**
@@ -386,13 +386,13 @@ 
 	 */
 	static function sidebox_menu($hook_data)
 	{
-		unset($hook_data);	// not used, but required by function signature
+		unset($hook_data); // not used, but required by function signature
 
 		//error_log(__METHOD__);
 		// always show the side bar
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 		$appname = 'mail';
-		$menu_title = $GLOBALS['egw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
+		$menu_title = $GLOBALS['egw_info']['apps'][$appname]['title'].' '.lang('Menu');
 /*
 		$file = array();
 		$profileID = 0;
@@ -427,7 +427,7 @@ 
 			}
 		}
 */
-		$file=array();
+		$file = array();
 		// Destination div for folder tree
 		$file[] = array(
 			'no_lang' => true,
@@ -447,7 +447,7 @@ 
 		);
 
 		$file += array(
-			'import message' => "javascript:egw_openWindowCentered2('".Egw::link('/index.php', $linkData,false)."','importMessageDialog',600,100,'no','$appname');",
+			'import message' => "javascript:egw_openWindowCentered2('".Egw::link('/index.php', $linkData, false)."','importMessageDialog',600,100,'no','$appname');",
 		);
 
 
@@ -455,20 +455,20 @@ 
 		if (self::access('createaccount'))
 		{
 			$file += array(
-				'create new account' => "javascript:egw_openWindowCentered2('" .
+				'create new account' => "javascript:egw_openWindowCentered2('".
 					Egw::link('/index.php', array('menuaction' => 'mail.mail_wizard.add'), '').
 					"','_blank',640,480,'yes')",
 			);
 		}
 		// display them all
-		display_sidebox($appname,$menu_title,$file);
+		display_sidebox($appname, $menu_title, $file);
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && !Api\Header\UserAgent::mobile())
 		{
 			$file = Array(
-				'Site Configuration' => Egw::link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
+				'Site Configuration' => Egw::link('/index.php', 'menuaction=admin.uiconfig.index&appname='.$appname),
 			);
-			display_sidebox($appname,lang('Admin'),$file);
+			display_sidebox($appname, lang('Admin'), $file);
 		}
 		Api\Hooks::pgp_encryption_menu('mail');
 
@@ -482,31 +482,31 @@ 
 	static function notification_check_mailbox()
 	{
 		// should not run more often then every 3 minutes;
-		$lastRun = Api\Cache::getCache(Api\Cache::INSTANCE,'email','mailNotifyLastRun'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*24*2);
+		$lastRun = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'mailNotifyLastRun'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), $expiration = 60 * 60 * 24 * 2);
 		$currentTime = time();
-		if (!empty($lastRun) && $lastRun>$currentTime-3*60)
+		if (!empty($lastRun) && $lastRun > $currentTime - 3 * 60)
 		{
 			//error_log(__METHOD__.__LINE__." Job should not run too often; we limit this to once every 3 Minutes :". ($currentTime-$lastRun). " Seconds to go!");
 			return true;
 		}
 		$accountsToSearchObj = Mail\Account::search(true, true);
 
-		foreach($accountsToSearchObj as $acc_id => $identity_name)
+		foreach ($accountsToSearchObj as $acc_id => $identity_name)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$acc_id.':'.$identity_name);
-				$folders2notify[$acc_id] = Mail\Notifications::read($acc_id);// read all, even those set for acc_id 0 (folders for all acounts?)
-			$accountsToSearchArray[$acc_id] = str_replace(array('<','>'),array('[',']'),$identity_name);
+				$folders2notify[$acc_id] = Mail\Notifications::read($acc_id); // read all, even those set for acc_id 0 (folders for all acounts?)
+			$accountsToSearchArray[$acc_id] = str_replace(array('<', '>'), array('[', ']'), $identity_name);
 		}
-		$notified_mail_uidsCache = Api\Cache::getCache(Api\Cache::INSTANCE,'email','notified_mail_uids'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*24*2);
+		$notified_mail_uidsCache = Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'notified_mail_uids'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), $expiration = 60 * 60 * 24 * 2);
 		//error_log(__METHOD__.__LINE__.array2string($notified_mail_uidsCache));
 		if (!is_array($folders2notify)) return true;
 		foreach ($folders2notify as $nFKey =>$notifyfolders)
 		{
 			try
 			{
-				$currentRecipient = (object)$GLOBALS['egw']->accounts->read(($notifyfolders['notify_account_id']?$notifyfolders['notify_account_id']:$GLOBALS['egw_info']['user']['account_id']));
+				$currentRecipient = (object)$GLOBALS['egw']->accounts->read(($notifyfolders['notify_account_id'] ? $notifyfolders['notify_account_id'] : $GLOBALS['egw_info']['user']['account_id']));
 				$notify_folders = $notifyfolders['notify_folders'];
-				if(count($notify_folders) == 0) {
+				if (count($notify_folders) == 0) {
 					continue; //no folders configured for notifying
 				}
 				//error_log(__METHOD__.__LINE__.' '.$nFKey.' =>'.array2string($notifyfolders));
@@ -514,14 +514,14 @@ 
 				//error_log(__METHOD__.__LINE__.' (user: '.$currentRecipient->account_lid.') Active Profile:'.$activeProfile);
 				try
 				{
-					$bomail = Mail::getInstance(false, $activeProfile,false);
+					$bomail = Mail::getInstance(false, $activeProfile, false);
 				} catch (Exception $e)
 				{
 					error_log(__METHOD__.__LINE__.' (user: '.$currentRecipient->account_lid.') notification for Profile:'.$activeProfile.' failed.'.$e->getMessage());
 					continue; //fail silently
 				}
 				//error_log(__METHOD__.__LINE__.' '.$nFKey.' =>'.array2string($bomail->icServer->params));
-				$icServerParams=$bomail->icServer->params;
+				$icServerParams = $bomail->icServer->params;
 				if (empty($icServerParams['acc_imap_host']))
 				{
 					error_log(__METHOD__.__LINE__.' (user: '.$currentRecipient->account_lid.') notification for Profile:'.$activeProfile.' failed: NO IMAP HOST configured!');
@@ -542,41 +542,41 @@ 
 				//$notified_mail_uidsCache = array();
 				$recent_messages = array();
 				$folder_status = array();
-				foreach($notify_folders as $id=>$notify_folder) {
+				foreach ($notify_folders as $id=>$notify_folder) {
 					if (empty($notify_folder)) continue;
-					if(!is_array($notified_mail_uidsCache[$activeProfile][$notify_folder])) {
+					if (!is_array($notified_mail_uidsCache[$activeProfile][$notify_folder])) {
 						$notified_mail_uidsCache[$activeProfile][$notify_folder] = array();
 					}
 					$folder_status[$notify_folder] = $bomail->getFolderStatus($notify_folder);
-					$cutoffdate = time() - (60*60*24*14); // last 14 days
-					$_filter = array('status'=>array('UNSEEN','UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
+					$cutoffdate = time() - (60 * 60 * 24 * 14); // last 14 days
+					$_filter = array('status'=>array('UNSEEN', 'UNDELETED'), 'type'=>"SINCE", 'string'=> date("d-M-Y", $cutoffdate));
 					//error_log(__METHOD__.__LINE__.' (user: '.$currentRecipient->account_lid.') Mailbox:'.$notify_folder.' filter:'.array2string($_filter));
 					// $_folderName, $_startMessage, $_numberOfMessages, $_sort, $_reverse, $_filter, $_thisUIDOnly=null, $_cacheResult=true
-					$headers = $bomail->getHeaders($notify_folder, 1, 999, 0, true, $_filter,null,false);
-					if(is_array($headers['header']) && count($headers['header']) > 0) {
-						foreach($headers['header'] as $id=>$header) {
+					$headers = $bomail->getHeaders($notify_folder, 1, 999, 0, true, $_filter, null, false);
+					if (is_array($headers['header']) && count($headers['header']) > 0) {
+						foreach ($headers['header'] as $id=>$header) {
 							//error_log(__METHOD__.__LINE__.' Found Message:'.$header['uid'].' Subject:'.$header['subject']);
 							// check if unseen mail has already been notified
-							$headerrowid = mail_ui::generateRowID($activeProfile, $notify_folder, $header['uid'], $_prependApp=false);
-						 	if(!in_array($headerrowid, $notified_mail_uidsCache[$activeProfile][$notify_folder])) {
+							$headerrowid = mail_ui::generateRowID($activeProfile, $notify_folder, $header['uid'], $_prependApp = false);
+						 	if (!in_array($headerrowid, $notified_mail_uidsCache[$activeProfile][$notify_folder])) {
 						 		// got a REAL recent message
 						 		$header['folder'] = $notify_folder;
 						 		$header['folder_display_name'] = $folder_status[$notify_folder]['displayName'];
-						 		$header['folder_base64'] =  base64_encode($notify_folder);
+						 		$header['folder_base64'] = base64_encode($notify_folder);
 						 		$recent_messages[] = $header;
 						 	}
 						}
 					}
 				}
 				//error_log(__METHOD__.__LINE__.' Found Messages for Profile'.$activeProfile.':'.array2string($recent_messages).'<->'.array2string($notified_mail_uidsCache[$activeProfile]));
-				if(count($recent_messages) > 0) {
+				if (count($recent_messages) > 0) {
 					// create notify message
 					$notification_subject = lang("You've got new mail").':'.$accountsToSearchArray[$activeProfile];
 					$values = array();
 					$values[] = array(); // content array starts at index 1
-					foreach($recent_messages as $id=>$recent_message) {
+					foreach ($recent_messages as $id=>$recent_message) {
 						//error_log(__METHOD__.__LINE__.' Found Message for Profile '.$activeProfile.':'.array2string($recent_message));
-						$values[] =	array(
+						$values[] = array(
 							'mail_uid'				=> $recent_message['uid'],
 							'mail_folder' 			=> $recent_message['folder_display_name'],
 							'mail_folder_base64' 	=> $recent_message['folder_base64'],
@@ -585,7 +585,7 @@ 
 							'mail_received'			=> $recent_message['date'],
 						);
 						// save notification status
-						$notified_mail_uidsCache[$activeProfile][$recent_message['folder']][] = mail_ui::generateRowID($activeProfile, $recent_message['folder'], $recent_message['uid'], $_prependApp=false);
+						$notified_mail_uidsCache[$activeProfile][$recent_message['folder']][] = mail_ui::generateRowID($activeProfile, $recent_message['folder'], $recent_message['uid'], $_prependApp = false);
 					}
 					// create etemplate
 					$tpl = new etemplate('mail.checkmailbox');
@@ -601,13 +601,13 @@ 
 					$notification->set_skip_backends(array('email'));
 					$notification->send();
 				}
-				Api\Cache::setCache(Api\Cache::INSTANCE,'email','notified_mail_uids'.trim($GLOBALS['egw_info']['user']['account_id']),$notified_mail_uidsCache, $expiration=60*60*24*2);
+				Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'notified_mail_uids'.trim($GLOBALS['egw_info']['user']['account_id']), $notified_mail_uidsCache, $expiration = 60 * 60 * 24 * 2);
 			} catch (Exception $e) {
 				// fail silently per server, if possible
 				error_log(__METHOD__.__LINE__.' Notification on new messages for Profile '.$activeProfile.' ('.$accountsToSearchArray[$activeProfile].') failed:'.$e->getMessage());
 			}
 		}
-		Api\Cache::setCache(Api\Cache::INSTANCE,'email','mailNotifyLastRun'.trim($GLOBALS['egw_info']['user']['account_id']),time(), $expiration=60*60*24*2);
+		Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'mailNotifyLastRun'.trim($GLOBALS['egw_info']['user']['account_id']), time(), $expiration = 60 * 60 * 24 * 2);
 		//error_log(__METHOD__.__LINE__.array2string($notified_mail_uidsCache));
 		return true;
 	}
@@ -623,21 +623,21 @@ 
 	 */
 	public static function access($feature)
 	{
-		static $config=null;
+		static $config = null;
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] || $GLOBALS['egw_info']['user']['apps']['emailadmin'])
 		{
-			return true;	// allways give admins or emailadmins all rights, even if they are in a denied group
+			return true; // allways give admins or emailadmins all rights, even if they are in a denied group
 		}
 		if (!isset($config)) $config = (array)Api\Config::read('mail');
 		//error_log(__METHOD__.__LINE__.' '.$feature.':'.array2string($config['deny_'.$feature]));
 		if (!empty($config['deny_'.$feature]))
 		{
 			//error_log(__METHOD__.__LINE__.' feature:'.$feature.':'.array2string($config['deny_'.$feature]));
-			$denied_groups = (is_array($config['deny_'.$feature])?$config['deny_'.$feature]:explode(',', $config['deny_'.$feature]));
+			$denied_groups = (is_array($config['deny_'.$feature]) ? $config['deny_'.$feature] : explode(',', $config['deny_'.$feature]));
 			//error_log(__METHOD__.__LINE__.array2string($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true)));
 			//error_log(__METHOD__.__LINE__.array2string(array_intersect($denied_groups, $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true))));
 			// since access asks positively, the stored deny_$feature must return false if we find the denied group in the users membership-list
-			return (array_intersect($denied_groups, $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true))?false:true);
+			return (array_intersect($denied_groups, $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true)) ? false : true);
 		}
 		return true;
 	}

Braces +56 added lines, -20 removed lines

@@ -118,13 +118,18 @@ 
 	static function settings($hook_data)
 	{
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
-		if (!$hook_data['setup'])	// does not work on setup time
+		if (!$hook_data['setup'])
+		{
+			// does not work on setup time
 		{
 			$folderList = array();
+		}
 
 			$profileID = 0;
 			if (isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID']))
-				$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
+			{
+							$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
+			}
 		}
 
 		$no_yes = array(
@@ -176,7 +181,10 @@ 
 		);
 
 		// otherwise we get warnings during setup
-		if (!is_array($folderList)) $folderList = array();
+		if (!is_array($folderList))
+		{
+			$folderList = array();
+		}
 
 		// modify folderlist, add a none entry, to be able to force the regarding settings, if no folders apply
 		$folderList['none'] = lang('no folders');
@@ -353,7 +361,10 @@ 
 				'default' => '0'
 			),
 		);
-		if (!$GLOBALS['egw_info']['apps']['stylite']) unset($settingsArray['attachVCardAtCompose']);
+		if (!$GLOBALS['egw_info']['apps']['stylite'])
+		{
+			unset($settingsArray['attachVCardAtCompose']);
+		}
 		return $settingsArray;
 	}
 
@@ -371,7 +382,9 @@ 
 		$title = $appname = 'mail';
 		$profileID = 0;
 		if (isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID']))
-			$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
+		{
+					$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
+		}
 
 		$file = Array(
 			'Site Configuration' => Egw::link('/index.php',array('menuaction'=>'admin.uiconfig.index','appname'=>'mail')),
@@ -499,14 +512,18 @@ 
 		}
 		$notified_mail_uidsCache = Api\Cache::getCache(Api\Cache::INSTANCE,'email','notified_mail_uids'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*24*2);
 		//error_log(__METHOD__.__LINE__.array2string($notified_mail_uidsCache));
-		if (!is_array($folders2notify)) return true;
+		if (!is_array($folders2notify))
+		{
+			return true;
+		}
 		foreach ($folders2notify as $nFKey =>$notifyfolders)
 		{
 			try
 			{
 				$currentRecipient = (object)$GLOBALS['egw']->accounts->read(($notifyfolders['notify_account_id']?$notifyfolders['notify_account_id']:$GLOBALS['egw_info']['user']['account_id']));
 				$notify_folders = $notifyfolders['notify_folders'];
-				if(count($notify_folders) == 0) {
+				if(count($notify_folders) == 0)
+				{
 					continue; //no folders configured for notifying
 				}
 				//error_log(__METHOD__.__LINE__.' '.$nFKey.' =>'.array2string($notifyfolders));
@@ -515,7 +532,8 @@ 
 				try
 				{
 					$bomail = Mail::getInstance(false, $activeProfile,false);
-				} catch (Exception $e)
+				}
+				catch (Exception $e)
 				{
 					error_log(__METHOD__.__LINE__.' (user: '.$currentRecipient->account_lid.') notification for Profile:'.$activeProfile.' failed.'.$e->getMessage());
 					continue; //fail silently
@@ -530,11 +548,15 @@ 
 				try
 				{
 					$bomail->openConnection($activeProfile);
-				} catch (Exception $e) {
+				}
+				catch (Exception $e) {
 					// TODO: This is ugly. Log a bit nicer!
 					$error = $e->getMessage();
 					error_log(__METHOD__.__LINE__.' # '.' (user: '.$currentRecipient->account_lid.'): cannot connect to mailbox with Profile:'.$activeProfile.'. Please check your prefs!');
-					if (!empty($error)) error_log(__METHOD__.__LINE__.' # '.$error);
+					if (!empty($error))
+					{
+						error_log(__METHOD__.__LINE__.' # '.$error);
+					}
 					error_log(__METHOD__.__LINE__.' # Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid']);
 					return false; // cannot connect to mailbox
 				}
@@ -542,9 +564,14 @@ 
 				//$notified_mail_uidsCache = array();
 				$recent_messages = array();
 				$folder_status = array();
-				foreach($notify_folders as $id=>$notify_folder) {
-					if (empty($notify_folder)) continue;
-					if(!is_array($notified_mail_uidsCache[$activeProfile][$notify_folder])) {
+				foreach($notify_folders as $id=>$notify_folder)
+				{
+					if (empty($notify_folder))
+					{
+						continue;
+					}
+					if(!is_array($notified_mail_uidsCache[$activeProfile][$notify_folder]))
+					{
 						$notified_mail_uidsCache[$activeProfile][$notify_folder] = array();
 					}
 					$folder_status[$notify_folder] = $bomail->getFolderStatus($notify_folder);
@@ -553,12 +580,15 @@ 
 					//error_log(__METHOD__.__LINE__.' (user: '.$currentRecipient->account_lid.') Mailbox:'.$notify_folder.' filter:'.array2string($_filter));
 					// $_folderName, $_startMessage, $_numberOfMessages, $_sort, $_reverse, $_filter, $_thisUIDOnly=null, $_cacheResult=true
 					$headers = $bomail->getHeaders($notify_folder, 1, 999, 0, true, $_filter,null,false);
-					if(is_array($headers['header']) && count($headers['header']) > 0) {
-						foreach($headers['header'] as $id=>$header) {
+					if(is_array($headers['header']) && count($headers['header']) > 0)
+					{
+						foreach($headers['header'] as $id=>$header)
+						{
 							//error_log(__METHOD__.__LINE__.' Found Message:'.$header['uid'].' Subject:'.$header['subject']);
 							// check if unseen mail has already been notified
 							$headerrowid = mail_ui::generateRowID($activeProfile, $notify_folder, $header['uid'], $_prependApp=false);
-						 	if(!in_array($headerrowid, $notified_mail_uidsCache[$activeProfile][$notify_folder])) {
+						 	if(!in_array($headerrowid, $notified_mail_uidsCache[$activeProfile][$notify_folder]))
+						 	{
 						 		// got a REAL recent message
 						 		$header['folder'] = $notify_folder;
 						 		$header['folder_display_name'] = $folder_status[$notify_folder]['displayName'];
@@ -569,12 +599,14 @@ 
 					}
 				}
 				//error_log(__METHOD__.__LINE__.' Found Messages for Profile'.$activeProfile.':'.array2string($recent_messages).'<->'.array2string($notified_mail_uidsCache[$activeProfile]));
-				if(count($recent_messages) > 0) {
+				if(count($recent_messages) > 0)
+				{
 					// create notify message
 					$notification_subject = lang("You've got new mail").':'.$accountsToSearchArray[$activeProfile];
 					$values = array();
 					$values[] = array(); // content array starts at index 1
-					foreach($recent_messages as $id=>$recent_message) {
+					foreach($recent_messages as $id=>$recent_message)
+					{
 						//error_log(__METHOD__.__LINE__.' Found Message for Profile '.$activeProfile.':'.array2string($recent_message));
 						$values[] =	array(
 							'mail_uid'				=> $recent_message['uid'],
@@ -602,7 +634,8 @@ 
 					$notification->send();
 				}
 				Api\Cache::setCache(Api\Cache::INSTANCE,'email','notified_mail_uids'.trim($GLOBALS['egw_info']['user']['account_id']),$notified_mail_uidsCache, $expiration=60*60*24*2);
-			} catch (Exception $e) {
+			}
+			catch (Exception $e) {
 				// fail silently per server, if possible
 				error_log(__METHOD__.__LINE__.' Notification on new messages for Profile '.$activeProfile.' ('.$accountsToSearchArray[$activeProfile].') failed:'.$e->getMessage());
 			}
@@ -628,7 +661,10 @@ 
 		{
 			return true;	// allways give admins or emailadmins all rights, even if they are in a denied group
 		}
-		if (!isset($config)) $config = (array)Api\Config::read('mail');
+		if (!isset($config))
+		{
+			$config = (array)Api\Config::read('mail');
+		}
 		//error_log(__METHOD__.__LINE__.' '.$feature.':'.array2string($config['deny_'.$feature]));
 		if (!empty($config['deny_'.$feature]))
 		{

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -373,7 +373,7 @@ 
 		if (isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID']))
 			$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
 
-		$file = Array(
+		$file = array(
 			'Site Configuration' => Egw::link('/index.php',array('menuaction'=>'admin.uiconfig.index','appname'=>'mail')),
 		);
 		display_section($appname,$title,$file);
@@ -465,7 +465,7 @@ 
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && !Api\Header\UserAgent::mobile())
 		{
-			$file = Array(
+			$file = array(
 				'Site Configuration' => Egw::link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
 			);
 			display_sidebox($appname,lang('Admin'),$file);

mail/index.php

Indentation +1 added lines, -1 removed lines

@@ -11,4 +11,4 @@
  * @version $Id$
  */
 header('Location: ../index.php?menuaction=mail.mail_ui.index'.
-    	(isset($_GET['sessionid']) ? '&sessionid='.$_GET['sessionid'].'&kp3='.$_GET['kp3'] : ''));
+		(isset($_GET['sessionid']) ? '&sessionid='.$_GET['sessionid'].'&kp3='.$_GET['kp3'] : ''));

pixelegg/stylesheet2svg.php

Spacing +6 added lines, -6 removed lines

@@ -32,11 +32,11 @@ 
 }
 if ($args[0] == '-c')
 {
-	$color = explode(',',$args[1]);
+	$color = explode(',', $args[1]);
 	array_shift($args);
 	array_shift($args);
 }
-foreach($args as $path)
+foreach ($args as $path)
 {
 	if (!preg_match('|^([^/]+)/.*/(.*).svg$|', $path, $matches) || !($svg = file_get_contents($path)))
 	{
@@ -53,11 +53,11 @@ 
 	$svg = preg_replace('/(<svg.*) id="[^"]+"/', '\\1 id="'.$id.'"', $svg);
 	
 	// Replace fill color with color[0]
-	$svg = preg_replace('/(<.*) fill="[^"]*"/','\\1 fill="'.$color[0] .'"', $svg);
+	$svg = preg_replace('/(<.*) fill="[^"]*"/', '\\1 fill="'.$color[0].'"', $svg);
 	// Replace stroke color with color[1]
-	$svg = preg_replace('/(<.*) stroke="[^"]*"/', '\\1 stroke="'.$color[1] .'"', $svg);
+	$svg = preg_replace('/(<.*) stroke="[^"]*"/', '\\1 stroke="'.$color[1].'"', $svg);
 	
-	error_log(__METHOD__."svg: ". var_dump($svg));
+	error_log(__METHOD__."svg: ".var_dump($svg));
 	// store image again
 	file_put_contents($path, $svg);
 	echo "$path: added $style_url and id=\"$id\"\n";
@@ -69,7 +69,7 @@ 
 	array_pop($i_parts);
 	$rel_parts = $s_parts = explode('/', $stylesheet);
 
-	foreach($i_parts as $n => $i_part)
+	foreach ($i_parts as $n => $i_part)
 	{
 		if (isset($s_parts[$n]) && $s_parts[$n] === $i_part)
 		{

Braces +8 added lines, -2 removed lines

@@ -10,18 +10,24 @@
  * @version $Id$
  */
 
-if (php_sapi_name() !== 'cli') die("This is a commandline ONLY tool!\n");
+if (php_sapi_name() !== 'cli')
+{
+	die("This is a commandline ONLY tool!\n");
+}
 
 $args = $_SERVER['argv'];
 $prog = array_shift($args);
 
-if ($_SERVER['argc'] <= 1 || $prog != 'pixelegg/stylesheet2svg.php') die("
+if ($_SERVER['argc'] <= 1 || $prog != 'pixelegg/stylesheet2svg.php')
+{
+	die("
 Usage: pixelegg/stylesheet2svg [-s stylesheet|-c color] svg-image(s)
 Add an external stylesheet to an svg image and sets id of svg tag to app_image
 Examples:
 - pixelegg/stylesheet2svg -s pixelegg/less/svg.css */templates/pixelegg/images/*.svg pixelegg/images/*.svg
 - pixelegg/stylesheet2svg -c '#6e6e6e,#939393' */templates/pixelegg/images/*.svg pixelegg/images/*.svg
 \n");
+}
 
 $stylesheet = 'pixelegg/less/svg.css';
 if ($args[0] == '-s')

pixelegg/hook_settings.inc.php

Spacing +9 added lines, -9 removed lines

@@ -15,7 +15,7 @@ 
 $apps = $no_navbar_apps = array();
 if (!$hook_data['setup'] && !isset($GLOBALS['egw_setup']))	// does not work on setup time
 {
-	foreach(ExecMethod('pixelegg.pixelegg_framework.navbar_apps') as $app => $data)
+	foreach (ExecMethod('pixelegg.pixelegg_framework.navbar_apps') as $app => $data)
 	{
 		if (!$data['noNavbar'])
 		{
@@ -39,9 +39,9 @@ 
 	'#b4b4b4' => lang('Gray'),
 );
 asort($colors);
-$colors['custom'] = lang('Custom color');	// custom allways last
+$colors['custom'] = lang('Custom color'); // custom allways last
 $template_colors = array();
-foreach($colors as $color => $label)
+foreach ($colors as $color => $label)
 {
 	$template_colors[$color] = $label.' ('.$color.') '.lang('Sidebox, header, and logo');
 }
@@ -51,7 +51,7 @@ 
 $GLOBALS['settings'] = array(
 	'prefssection' => array(
 		'type'   => 'section',
-		'title'  => lang('Preferences for the %1 template set','Pixelegg'),
+		'title'  => lang('Preferences for the %1 template set', 'Pixelegg'),
 		'no_lang'=> true,
 		'xmlrpc' => False,
 		'admin'  => False,
@@ -100,7 +100,7 @@ 
 		'label' => 'Custom color',
 		'no_lang' => true,
 		'name' => 'template_custom_color',
-		'help' => lang('Use eg. %1 or %2','#FF0000','orange'),
+		'help' => lang('Use eg. %1 or %2', '#FF0000', 'orange'),
 		'xmlrpc' => True,
 		'admin'  => False,
 	),
@@ -109,7 +109,7 @@ 
 		'label' => 'Custom sidebar menu active color, defaults to above color darkened',
 		'no_lang' => true,
 		'name' => 'sidebox_custom_color',
-		'help' => lang('Use eg. %1 or %2','#FF0000','orange'),
+		'help' => lang('Use eg. %1 or %2', '#FF0000', 'orange'),
 		'xmlrpc' => True,
 		'admin'  => False,
 	),
@@ -118,11 +118,11 @@ 
 		'label' => 'Custom login box color, defaults to above color darkened',
 		'no_lang' => true,
 		'name' => 'loginbox_custom_color',
-		'help' => lang('Use eg. %1 or %2','#FF0000','orange'),
+		'help' => lang('Use eg. %1 or %2', '#FF0000', 'orange'),
 		'xmlrpc' => True,
 		'admin'  => False,
 	),
-	'navbar_format' => false,	// not used in JDots (defined in common prefs)
-	'default_app' => false,		// not used in JDots, as we can have multiple tabs open ...
+	'navbar_format' => false, // not used in JDots (defined in common prefs)
+	'default_app' => false, // not used in JDots, as we can have multiple tabs open ...
 );
 unset($apps);

Braces +4 added lines, -1 removed lines

@@ -13,13 +13,16 @@
  * @todo extend Stylite template preferences instead of this copy (simple include fails)
  */
 $apps = $no_navbar_apps = array();
-if (!$hook_data['setup'] && !isset($GLOBALS['egw_setup']))	// does not work on setup time
+if (!$hook_data['setup'] && !isset($GLOBALS['egw_setup']))
+{
+	// does not work on setup time
 {
 	foreach(ExecMethod('pixelegg.pixelegg_framework.navbar_apps') as $app => $data)
 	{
 		if (!$data['noNavbar'])
 		{
 			$apps[$app] = $data['title'];
+}
 		}
 		else
 		{

resources/sitemgr/class.module_resources_reservation.inc.php

Indentation +7 added lines, -7 removed lines

@@ -98,13 +98,13 @@
 	}
 
 	/**
-	* generate the module content AND process submitted forms
-	* Overridden from parent to pass arguments
-	*
-	* @param array &$arguments $arguments['arg1']-$arguments['arg3'] will be passed for non-submitted forms (first call)
-	* @param array $properties
-	* @return string the Api\Html content
-	*/
+	 * generate the module content AND process submitted forms
+	 * Overridden from parent to pass arguments
+	 *
+	 * @param array &$arguments $arguments['arg1']-$arguments['arg3'] will be passed for non-submitted forms (first call)
+	 * @param array $properties
+	 * @return string the Api\Html content
+	 */
 	function get_content(&$arguments,$properties)
 	{
 		list($app) = explode('.',$this->etemplate_method);

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));
 	}
 
 }

Braces +4 added lines, -1 removed lines

@@ -126,7 +126,10 @@
 		{
 				$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));

resources/setup/setup.inc.php

Spacing +16 added lines, -16 removed lines

@@ -11,32 +11,32 @@
  * @version $Id$
  */
 
-$setup_info['resources']['name']	= 'resources';
-$setup_info['resources']['title']	= 'Resources';
-$setup_info['resources']['version']	= '16.1';
-$setup_info['resources']['app_order']	= 5;
-$setup_info['resources']['tables']	= array('egw_resources','egw_resources_extra');
+$setup_info['resources']['name'] = 'resources';
+$setup_info['resources']['title'] = 'Resources';
+$setup_info['resources']['version'] = '16.1';
+$setup_info['resources']['app_order'] = 5;
+$setup_info['resources']['tables']	= array('egw_resources', 'egw_resources_extra');
 $setup_info['resources']['enable']	= 1;
-$setup_info['resources']['index']	= 'resources.resources_ui.index&ajax=true' ;
+$setup_info['resources']['index'] = 'resources.resources_ui.index&ajax=true';
 
 $setup_info['resources']['author']	= 'Cornelius Weiss';
-$setup_info['resources']['license']	= 'GPL';
+$setup_info['resources']['license'] = 'GPL';
 $setup_info['resources']['description'] = 'A resource management and booking system, which integrates into eGroupWare\'s calendar.';
-$setup_info['resources']['note']	= '';
-$setup_info['resources']['maintainer']	= array(
+$setup_info['resources']['note'] = '';
+$setup_info['resources']['maintainer'] = array(
 	'name' => 'eGroupware coreteam',
 	'email' => 'egroupware-developers@lists.sf.net'
 );
 
-$setup_info['resources']['hooks']['categories']	= 'resources_hooks::categories';
-$setup_info['resources']['hooks']['admin']		= 'resources.resources_hooks.admin_prefs_sidebox';
-$setup_info['resources']['hooks']['sidebox_menu']	= 'resources.resources_hooks.admin_prefs_sidebox';
-$setup_info['resources']['hooks']['search_link']	= 'resources.resources_hooks.search_link';
-$setup_info['resources']['hooks']['calendar_resources']	= 'resources.resources_hooks.calendar_resources';
-$setup_info['resources']['hooks']['delete_category']	= 'resources.resources_hooks.delete_category';
+$setup_info['resources']['hooks']['categories'] = 'resources_hooks::categories';
+$setup_info['resources']['hooks']['admin'] = 'resources.resources_hooks.admin_prefs_sidebox';
+$setup_info['resources']['hooks']['sidebox_menu'] = 'resources.resources_hooks.admin_prefs_sidebox';
+$setup_info['resources']['hooks']['search_link'] = 'resources.resources_hooks.search_link';
+$setup_info['resources']['hooks']['calendar_resources'] = 'resources.resources_hooks.calendar_resources';
+$setup_info['resources']['hooks']['delete_category'] = 'resources.resources_hooks.delete_category';
 $setup_info['resources']['hooks']['settings'] = 'resources_hooks::settings';
 
-$setup_info['resources']['depends'][]	= array(
+$setup_info['resources']['depends'][] = array(
 	 'appname' => 'api',
 	 'versions' => Array('16.1')
 );

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
 $setup_info['resources']['depends'][]	= array(
 	 'appname' => 'api',
-	 'versions' => Array('16.1')
+	 'versions' => array('16.1')
 );