EGroupware / egroupware

notifications/setup/tables_current.inc.php

Spacing +6 added lines, -6 removed lines

@@ -12,15 +12,15 @@
 $phpgw_baseline = array(
 	'egw_notificationpopup' => array(
 		'fd' => array(
-			'notify_id' => array('type' => 'auto','nullable' => False,'comment' => 'primary key'),
-			'account_id' => array('type' => 'int','meta' => 'user','precision' => '20','nullable' => False,'comment' => 'user to notify'),
-			'notify_message' => array('type' => 'varchar','precision' => '16384','comment' => 'notification message'),
-			'notify_created' => array('type' => 'timestamp','meta' => 'timestamp','default' => 'current_timestamp','comment' => 'creation time of notification'),
-			'notify_type' => array('type' => 'ascii','precision' => '32','comment' => 'notification type')
+			'notify_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'primary key'),
+			'account_id' => array('type' => 'int', 'meta' => 'user', 'precision' => '20', 'nullable' => False, 'comment' => 'user to notify'),
+			'notify_message' => array('type' => 'varchar', 'precision' => '16384', 'comment' => 'notification message'),
+			'notify_created' => array('type' => 'timestamp', 'meta' => 'timestamp', 'default' => 'current_timestamp', 'comment' => 'creation time of notification'),
+			'notify_type' => array('type' => 'ascii', 'precision' => '32', 'comment' => 'notification type')
 		),
 		'pk' => array('notify_id'),
 		'fk' => array(),
-		'ix' => array('account_id','notify_created'),
+		'ix' => array('account_id', 'notify_created'),
 		'uc' => array()
 	)
 );

notifications/setup/tables_update.inc.php

Spacing +14 added lines, -14 removed lines

@@ -12,7 +12,7 @@ 
 
 function notifications_upgrade0_5()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_notificationpopup','account_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_notificationpopup', 'account_id', array(
 		'type' => 'int',
 		'precision' => '20',
 		'nullable' => False
@@ -41,16 +41,16 @@ 
 
 function notifications_upgrade1_8()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_notificationpopup',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_notificationpopup', array(
 		'fd' => array(
-			'account_id' => array('type' => 'int','precision' => '20','nullable' => False),
+			'account_id' => array('type' => 'int', 'precision' => '20', 'nullable' => False),
 			'message' => array('type' => 'longtext')
 		),
 		'pk' => array(),
 		'fk' => array(),
 		'ix' => array('account_id'),
 		'uc' => array()
-	),'session_id');
+	), 'session_id');
 
 	return $GLOBALS['setup_info']['notifications']['currentver'] = '1.9.001';
 }
@@ -71,18 +71,18 @@ 
  */
 function notifications_upgrade1_9_002()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_notificationpopup',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_notificationpopup', array(
 		'fd' => array(
-			'notify_id' => array('type' => 'auto','nullable' => False,'comment' => 'primary key'),
-			'account_id' => array('type' => 'int','precision' => '20','nullable' => False,'comment' => 'user to notify'),
-			'notify_message' => array('type' => 'text','comment' => 'notification message'),
-			'notify_created' => array('type' => 'timestamp','default' => 'current_timestamp','comment' => 'creation time of notification')
+			'notify_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'primary key'),
+			'account_id' => array('type' => 'int', 'precision' => '20', 'nullable' => False, 'comment' => 'user to notify'),
+			'notify_message' => array('type' => 'text', 'comment' => 'notification message'),
+			'notify_created' => array('type' => 'timestamp', 'default' => 'current_timestamp', 'comment' => 'creation time of notification')
 		),
 		'pk' => array('notify_id'),
 		'fk' => array(),
-		'ix' => array('account_id','notify_created'),
+		'ix' => array('account_id', 'notify_created'),
 		'uc' => array()
-	),array(
+	), array(
 		'notify_message' => 'message',
 	));
 
@@ -92,7 +92,7 @@ 
 
 function notifications_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_notificationpopup','notify_type',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_notificationpopup', 'notify_type', array(
 		'type' => 'varchar',
 		'precision' => '32',
 		'comment' => 'notification type'
@@ -109,12 +109,12 @@ 
 
 function notifications_upgrade14_1()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_notificationpopup','notify_message',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_notificationpopup', 'notify_message', array(
 		'type' => 'varchar',
 		'precision' => '16384',
 		'comment' => 'notification message'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_notificationpopup','notify_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_notificationpopup', 'notify_type', array(
 		'type' => 'ascii',
 		'precision' => '32',
 		'comment' => 'notification type'

notifications/inc/hook_after_navbar.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,16 +20,16 @@
 	$notification_config = Api\Config::read('notifications');
 	Api\Translation::add_app('notifications');
 	$popup_poll_interval = empty($notification_config['popup_poll_interval']) ? 60 : $notification_config['popup_poll_interval'];
-	echo '<script src="'. $GLOBALS['egw_info']['server']['webserver_url']. '/notifications/js/notificationajaxpopup.js?'.
-		filemtime(EGW_SERVER_ROOT.'/notifications/js/notificationajaxpopup.js'). '" type="text/javascript" id="notifications_script_id" data-poll-interval="'.$popup_poll_interval.'"></script>';
+	echo '<script src="'.$GLOBALS['egw_info']['server']['webserver_url'].'/notifications/js/notificationajaxpopup.js?'.
+		filemtime(EGW_SERVER_ROOT.'/notifications/js/notificationajaxpopup.js').'" type="text/javascript" id="notifications_script_id" data-poll-interval="'.$popup_poll_interval.'"></script>';
 	echo '
 		<div id="egwpopup" style="display: none; z-index: 999;">
-			<div id="egwpopup_header">'.lang('Notification'). '<span style="float:right;">'.
-				Api\Html::submit_button('egwpopup_close_button', 'X', '', true, 'id="egwpopup_close_button"', 'close.button') .
+			<div id="egwpopup_header">'.lang('Notification').'<span style="float:right;">'.
+				Api\Html::submit_button('egwpopup_close_button', 'X', '', true, 'id="egwpopup_close_button"', 'close.button').
 			'</span></div>
 			<div id="egwpopup_message"></div>
 			<div id="egwpopup_footer">
-				<input id="egwpopup_ok_button" type="button" value="'. lang('ok'). '">
+				<input id="egwpopup_ok_button" type="button" value="'. lang('ok').'">
 			</div>
 		</div>
 	';

notifications/inc/class.notifications_push.inc.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
 
 	public static function get()
 	{
-		$already_send =& Api\Cache::getSession(__CLASS__, 'already_send');
+		$already_send = & Api\Cache::getSession(__CLASS__, 'already_send');
 		$max_id = Api\Cache::getInstance(__CLASS__, 'max_id');
 
 		if (!isset($already_send))
@@ -57,7 +57,7 @@ 
 		{
 			$response = Json\Response::get();
 
-			foreach(self::$db->select(self::TABLE, '*', array(
+			foreach (self::$db->select(self::TABLE, '*', array(
 				'account_id' => array(0, $GLOBALS['egw_info']['user']['account_id']),
 				'notify_type' => self::TYPE,
 				'notify_id > '.(int)$already_send,
@@ -121,7 +121,7 @@ 
 	 */
 	public static function init_static()
 	{
-		self::$db =& $GLOBALS['egw']->db;
+		self::$db = & $GLOBALS['egw']->db;
 	}
 }
 notifications_push::init_static();

notifications/inc/class.notifications_ajax.inc.php

Spacing +13 added lines, -13 removed lines

@@ -140,11 +140,11 @@ 
 	{
 		if ($notify_id)
 		{
-			$this->db->delete(self::_notification_table,array(
+			$this->db->delete(self::_notification_table, array(
 				'notify_id' => $notify_id,
 				'account_id' => $this->recipient->account_id,
 				'notify_type' => self::_type
-			),__LINE__,__FILE__,self::_appname);
+			), __LINE__, __FILE__, self::_appname);
 		}
 	}
 
@@ -159,27 +159,27 @@ 
 				'account_id' => $this->recipient->account_id,
 				'notify_type' => self::_type
 			),
-			__LINE__,__FILE__,false,'',self::_appname);
-		if ($rs->NumRows() > 0)	{
+			__LINE__, __FILE__, false, '', self::_appname);
+		if ($rs->NumRows() > 0) {
 			foreach ($rs as $notification) {
 				$message = null;
-				if($browserNotify)
+				if ($browserNotify)
 				{
 					$message = $notification['notify_message'];
 
 					// Check for a link - doesn't work in notification
-					if(strpos($message, lang('Linked entries:')))
+					if (strpos($message, lang('Linked entries:')))
 					{
 						$message = substr_replace($message, '', strpos($message, lang('Linked entries:')));
 					}
-					$message2 = preg_replace('#</?a[^>]*>#is','',$message);
+					$message2 = preg_replace('#</?a[^>]*>#is', '', $message);
 
-					$message3 = 'data:text/html;charset=' . Api\Translation::charset() .';base64,'.base64_encode($message2);
+					$message3 = 'data:text/html;charset='.Api\Translation::charset().';base64,'.base64_encode($message2);
 				}
-				$this->response->apply('app.notifications.append',array($notification['notify_id'],$notification['notify_message'],$message3));
+				$this->response->apply('app.notifications.append', array($notification['notify_id'], $notification['notify_message'], $message3));
 			}
 
-			switch($this->preferences[self::_appname]['egwpopup_verbosity']) {
+			switch ($this->preferences[self::_appname]['egwpopup_verbosity']) {
 				case 'low':
 					$this->response->apply('app.notifications.bell', array('active'));
 					break;
@@ -202,8 +202,8 @@ 
 	 * @return boolean true
 	 */
 	private function restore_session_data() {
-		$session_data = $GLOBALS['egw']->session->appsession('session_data',self::_appname);
-		if(is_array($session_data)) {
+		$session_data = $GLOBALS['egw']->session->appsession('session_data', self::_appname);
+		if (is_array($session_data)) {
 			$this->session_data = $session_data;
 		} else {
 			$this->session_data = $this->session_data_defaults;
@@ -218,7 +218,7 @@ 
 	 * @return boolean true
 	 */
 	private function save_session_data() {
-		$GLOBALS['egw']->session->appsession('session_data',self::_appname,$this->session_data);
+		$GLOBALS['egw']->session->appsession('session_data', self::_appname, $this->session_data);
 		return true;
 	}
 }

Braces +21 added lines, -10 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * Ajax methods for notifications
  */
-class notifications_ajax {
+class notifications_ajax
+{
 	/**
 	 * Appname
 	 */
@@ -91,7 +92,8 @@ 
 	 * constructor
 	 *
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		$this->response = Api\Json\Response::get();
 		$this->recipient = (object)$GLOBALS['egw']->accounts->read($GLOBALS['egw_info']['user']['account_id']);
 
@@ -153,15 +155,18 @@ 
 	 *
 	 * @return boolean true or false
 	 */
-	private function get_egwpopup($browserNotify = false) {
+	private function get_egwpopup($browserNotify = false)
+	{
 		$message = '';
 		$rs = $this->db->select(self::_notification_table, '*', array(
 				'account_id' => $this->recipient->account_id,
 				'notify_type' => self::_type
 			),
 			__LINE__,__FILE__,false,'',self::_appname);
-		if ($rs->NumRows() > 0)	{
-			foreach ($rs as $notification) {
+		if ($rs->NumRows() > 0)
+		{
+			foreach ($rs as $notification)
+			{
 				$message = null;
 				if($browserNotify)
 				{
@@ -179,7 +184,8 @@ 
 				$this->response->apply('app.notifications.append',array($notification['notify_id'],$notification['notify_message'],$message3));
 			}
 
-			switch($this->preferences[self::_appname]['egwpopup_verbosity']) {
+			switch($this->preferences[self::_appname]['egwpopup_verbosity'])
+			{
 				case 'low':
 					$this->response->apply('app.notifications.bell', array('active'));
 					break;
@@ -201,11 +207,15 @@ 
 	 *
 	 * @return boolean true
 	 */
-	private function restore_session_data() {
+	private function restore_session_data()
+	{
 		$session_data = $GLOBALS['egw']->session->appsession('session_data',self::_appname);
-		if(is_array($session_data)) {
+		if(is_array($session_data))
+		{
 			$this->session_data = $session_data;
-		} else {
+		}
+		else
+		{
 			$this->session_data = $this->session_data_defaults;
 		}
 
@@ -217,7 +227,8 @@ 
 	 *
 	 * @return boolean true
 	 */
-	private function save_session_data() {
+	private function save_session_data()
+	{
 		$GLOBALS['egw']->session->appsession('session_data',self::_appname,$this->session_data);
 		return true;
 	}

notifications/inc/class.notifications_jdesk_ajax.inc.php

Spacing +6 added lines, -6 removed lines

@@ -133,11 +133,11 @@ 
 	{
 		if ($notify_id)
 		{
-			$this->db->delete(self::_notification_table,array(
+			$this->db->delete(self::_notification_table, array(
 				'notify_id' => $notify_id,
 				'account_id' => $this->recipient->account_id,
 				'notify_type' => self::_type
-			),__LINE__,__FILE__,self::_appname);
+			), __LINE__, __FILE__, self::_appname);
 		}
 	}
 
@@ -148,7 +148,7 @@ 
 	 */
 	private function get_egwpopup($browserNotify = false)
 	{
-		unset($browserNotify);	// not used
+		unset($browserNotify); // not used
 
 		$message = '';
 
@@ -156,9 +156,9 @@ 
 				'account_id' => $this->recipient->account_id,
 				'notify_type' => self::_type
 			),
-			__LINE__,__FILE__,false,'',self::_appname);
+			__LINE__, __FILE__, false, '', self::_appname);
 
-		if( $rs->NumRows() > 0 )
+		if ($rs->NumRows() > 0)
 		{
 			foreach ($rs as $notification)
 			{
@@ -170,7 +170,7 @@ 
 				$this->response->data($jmessage);
 			}
 
-			switch( $this->preferences[self::_appname]['egwpopup_verbosity'] )
+			switch ($this->preferences[self::_appname]['egwpopup_verbosity'])
 			{
 				case 'low':
 

Braces +5 added lines, -2 removed lines

@@ -14,7 +14,8 @@ 
 /**
  * jdesk Json methods for notifications
  */
-class notifications_jdesk_ajax {
+class notifications_jdesk_ajax
+{
 
 	public $public_functions = array(
 		'get_notification'	=> true
@@ -92,7 +93,9 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {}
+	public function __destruct()
+	{
+}
 
 	/**
 	 * public AJAX trigger function to be called by the JavaScript client

notifications/inc/hook_admin.inc.php

Spacing +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
 
 use EGroupware\Api\Egw;
 
-$file = Array(	'Site Configuration' => Egw::link('/index.php', array(
+$file = Array('Site Configuration' => Egw::link('/index.php', array(
 	'menuaction'	=> 'admin.admin_config.index',
 	'appname'		=> $appname,
 	'ajax'          => 'true',
 )));
-display_section($appname,$file);
+display_section($appname, $file);

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

@@ -11,7 +11,7 @@
 
 use EGroupware\Api\Egw;
 
-$file = Array(	'Site Configuration' => Egw::link('/index.php', array(
+$file = array(	'Site Configuration' => Egw::link('/index.php', array(
 	'menuaction'	=> 'admin.admin_config.index',
 	'appname'		=> $appname,
 	'ajax'          => 'true',

status.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
  * @version $Id$
  */
 // forward for not existing or empty header to setup
-if(!file_exists('header.inc.php') || !filesize('header.inc.php'))
+if (!file_exists('header.inc.php') || !filesize('header.inc.php'))
 {
 	Header('Location: setup/index.php');
 	exit;

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

Braces +6 added lines, -2 removed lines

@@ -43,7 +43,10 @@ 
 // switching off caching by default
 // if caching is enabled mail_times will always provit from previous running horde_times!
 $cache = isset($_GET['cache']) && $_GET['cache'];
-if (!$cache) unset(emailadmin_imap::$default_params['cache']);
+if (!$cache)
+{
+	unset(emailadmin_imap::$default_params['cache']);
+}
 
 $accounttime = microtime(true);
 
@@ -106,7 +109,8 @@ 
 	}
 	stream_set_timeout($stream, 20);
 
-	if (function_exists('stream_set_read_buffer')) {
+	if (function_exists('stream_set_read_buffer'))
+	{
 		stream_set_read_buffer($stream, 0);
 	}
 	stream_set_write_buffer($stream, 0);