EGroupware / egroupware

notifications/inc/class.notifications_popup.inc.php

Doc Comments -1 removed lines

@@ -121,7 +121,6 @@
 	 * saves notification into database so that the client can fetch it from there
 	 *
 	 * @param string $_message
-	 * @param array $_user_sessions
 	 */
 	private function save( $_message ) {
 		$result = $this->db->insert( self::_notification_table, array(

Spacing +28 added lines, -28 removed lines

@@ -83,8 +83,8 @@ 
 	 */
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
 		//error_log(__METHOD__."(".array2string($_sender).', '.array2string($_recipient).', '.array2string($config).',...)');
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
+		if (!is_object($_sender)) { throw new Exception("no sender given."); }
+		if (!is_object($_recipient)) { throw new Exception("no recipient given."); }
 		$this->sender = $_sender;
 		$this->recipient = $_recipient;
 		$this->config = $_config;
@@ -102,19 +102,19 @@ 
 	 */
 	public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false)
 	{
-		unset($_attachments);	// not used
+		unset($_attachments); // not used
 		// Check access log to see if user is still logged in
-		if ( !Api\Session::notifications_active($this->recipient->account_id) )
+		if (!Api\Session::notifications_active($this->recipient->account_id))
 		{
 			throw new Exception("User {$this->recipient->account_lid} isn't online. Can't send notification via popup");
 		}
 
-		$message = 	$this->render_infos($_subject)
+		$message = $this->render_infos($_subject)
 					.Api\Html::hr()
-					.(isset($_messages['popup'])&&!empty($_messages['popup'])?$_messages['popup']:$_messages['html'])
+					.(isset($_messages['popup']) && !empty($_messages['popup']) ? $_messages['popup'] : $_messages['html'])
 					.$this->render_links($_links);
 
-		$this->save( $message );
+		$this->save($message);
 	}
 
 	/**
@@ -123,12 +123,12 @@ 
 	 * @param string $_message
 	 * @param array $_user_sessions
 	 */
-	private function save( $_message ) {
-		$result = $this->db->insert( self::_notification_table, array(
+	private function save($_message) {
+		$result = $this->db->insert(self::_notification_table, array(
 			'account_id'     => $this->recipient->account_id,
 			'notify_message' => $_message,
 			'notify_type'	 => self::_type
-			), false,__LINE__,__FILE__,self::_appname);
+			), false, __LINE__, __FILE__, self::_appname);
 		if ($result === false) throw new Exception("Can't save notification into SQL table");
 	}
 
@@ -140,25 +140,25 @@ 
 	 * @return string html rendered link(s) as complete string with jspopup or a new window
 	 */
 	private function render_links($_links = false) {
-		if(!is_array($_links) || count($_links) == 0) { return false; }
+		if (!is_array($_links) || count($_links) == 0) { return false; }
 		$newline = "<br />";
 
 		$rendered_links = array();
-		foreach($_links as $link) {
-			if(!$link->popup) { $link->view['no_popup'] = 1; }
+		foreach ($_links as $link) {
+			if (!$link->popup) { $link->view['no_popup'] = 1; }
 
 			// do not expose sensitive data
-			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',
+			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/', '',
 				Api\Html::link('/index.php', $link->view));
 			// extract application-icon from menuaction
-			if($link->view['menuaction']) {
-				$menuaction_arr = explode('.',$link->view['menuaction']);
+			if ($link->view['menuaction']) {
+				$menuaction_arr = explode('.', $link->view['menuaction']);
 				$application = $menuaction_arr[0];
-				$image = $application ? Api\Html::image($application,'navbar',$link->text,'align="middle" style="width: 24px; margin-right: 0.5em;"') : '';
+				$image = $application ? Api\Html::image($application, 'navbar', $link->text, 'align="middle" style="width: 24px; margin-right: 0.5em;"') : '';
 			} else {
 				$image = '';
 			}
-			if($link->popup && !$GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
+			if ($link->popup && !$GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
 			{
 				$data = array(
 					"data-app = '{$link->app}'",
@@ -167,14 +167,14 @@ 
 					"data-popup = '{$link->popup}'"
 				);
 
-				$rendered_links[] = Api\Html::div($image.$link->text,implode(' ',$data),'link');
+				$rendered_links[] = Api\Html::div($image.$link->text, implode(' ', $data), 'link');
 			} else {
-				$rendered_links[] = Api\Html::div('<a href="'.$url.'" target="_blank">'.$image.$link->text.'</a>','','link');
+				$rendered_links[] = Api\Html::div('<a href="'.$url.'" target="_blank">'.$image.$link->text.'</a>', '', 'link');
 			}
 
 		}
-		if(count($rendered_links) > 0) {
-			return Api\Html::hr().Api\Html::bold(lang('Linked entries:')).$newline.implode($newline,$rendered_links);
+		if (count($rendered_links) > 0) {
+			return Api\Html::hr().Api\Html::bold(lang('Linked entries:')).$newline.implode($newline, $rendered_links);
 		}
 	}
 
@@ -187,9 +187,9 @@ 
 	 * @param int $height =400 height of the window
 	 * @return string javascript (using single quotes)
 	 */
-	private function jspopup($link,$target='_blank',$width=750,$height=410)
+	private function jspopup($link, $target = '_blank', $width = 750, $height = 410)
 	{
-		if($GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
+		if ($GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
 		{
 			return 'window.open('.($link == 'this.href' ? $link : "'".$link."'").','.
 				($target == 'this.target' ? $target : "'".$target."'").",$width,$height,'yes')";
@@ -213,8 +213,8 @@ 
 
 		$sender = $this->sender->account_fullname ? $this->sender->account_fullname : $this->sender_account_email;
 		$infos[] = lang('Message from').': '.$sender;
-		if(!empty($_subject)) { $infos[] = Api\Html::bold($_subject); }
-		return implode($newline,$infos);
+		if (!empty($_subject)) { $infos[] = Api\Html::bold($_subject); }
+		return implode($newline, $infos);
 	}
 
 	/**
@@ -223,8 +223,8 @@ 
 	 * @param settings array with keys account_id and new_owner (new_owner is optional)
 	 */
 	public static function deleteaccount($settings) {
-		$GLOBALS['egw']->db->delete( self::_notification_table, array(
+		$GLOBALS['egw']->db->delete(self::_notification_table, array(
 			'account_id'	=> $settings['account_id']
-		),__LINE__,__FILE__,self::_appname);
+		), __LINE__, __FILE__, self::_appname);
 	}
 }

Braces +43 added lines, -17 removed lines

@@ -21,7 +21,8 @@ 
  * out the table to look if there is a notificaton for this
  * client. The second stage is done in class.notifications_ajax.inc.php
  */
-class notifications_popup implements notifications_iface {
+class notifications_popup implements notifications_iface
+{
 
 	/**
 	 * Appname
@@ -81,10 +82,15 @@ 
 	 * @param object $_config
 	 * @param object $_preferences
 	 */
-	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
+	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
+	{
 		//error_log(__METHOD__."(".array2string($_sender).', '.array2string($_recipient).', '.array2string($config).',...)');
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
+		if(!is_object($_sender))
+		{
+throw new Exception("no sender given."); }
+		if(!is_object($_recipient))
+		{
+throw new Exception("no recipient given."); }
 		$this->sender = $_sender;
 		$this->recipient = $_recipient;
 		$this->config = $_config;
@@ -123,13 +129,17 @@ 
 	 * @param string $_message
 	 * @param array $_user_sessions
 	 */
-	private function save( $_message ) {
+	private function save( $_message )
+	{
 		$result = $this->db->insert( self::_notification_table, array(
 			'account_id'     => $this->recipient->account_id,
 			'notify_message' => $_message,
 			'notify_type'	 => self::_type
 			), false,__LINE__,__FILE__,self::_appname);
-		if ($result === false) throw new Exception("Can't save notification into SQL table");
+		if ($result === false)
+		{
+			throw new Exception("Can't save notification into SQL table");
+		}
 	}
 
 	/**
@@ -139,23 +149,32 @@ 
 	 * @param array $_links
 	 * @return string html rendered link(s) as complete string with jspopup or a new window
 	 */
-	private function render_links($_links = false) {
-		if(!is_array($_links) || count($_links) == 0) { return false; }
+	private function render_links($_links = false)
+	{
+		if(!is_array($_links) || count($_links) == 0)
+		{
+return false; }
 		$newline = "<br />";
 
 		$rendered_links = array();
-		foreach($_links as $link) {
-			if(!$link->popup) { $link->view['no_popup'] = 1; }
+		foreach($_links as $link)
+		{
+			if(!$link->popup)
+			{
+$link->view['no_popup'] = 1; }
 
 			// do not expose sensitive data
 			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',
 				Api\Html::link('/index.php', $link->view));
 			// extract application-icon from menuaction
-			if($link->view['menuaction']) {
+			if($link->view['menuaction'])
+			{
 				$menuaction_arr = explode('.',$link->view['menuaction']);
 				$application = $menuaction_arr[0];
 				$image = $application ? Api\Html::image($application,'navbar',$link->text,'align="middle" style="width: 24px; margin-right: 0.5em;"') : '';
-			} else {
+			}
+			else
+			{
 				$image = '';
 			}
 			if($link->popup && !$GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
@@ -168,12 +187,15 @@ 
 				);
 
 				$rendered_links[] = Api\Html::div($image.$link->text,implode(' ',$data),'link');
-			} else {
+			}
+			else
+			{
 				$rendered_links[] = Api\Html::div('<a href="'.$url.'" target="_blank">'.$image.$link->text.'</a>','','link');
 			}
 
 		}
-		if(count($rendered_links) > 0) {
+		if(count($rendered_links) > 0)
+		{
 			return Api\Html::hr().Api\Html::bold(lang('Linked entries:')).$newline.implode($newline,$rendered_links);
 		}
 	}
@@ -207,13 +229,16 @@ 
 	 * @param string $_subject
 	 * @return string html rendered info as complete string
 	 */
-	private function render_infos($_subject = false) {
+	private function render_infos($_subject = false)
+	{
 		$infos = array();
 		$newline = "<br />";
 
 		$sender = $this->sender->account_fullname ? $this->sender->account_fullname : $this->sender_account_email;
 		$infos[] = lang('Message from').': '.$sender;
-		if(!empty($_subject)) { $infos[] = Api\Html::bold($_subject); }
+		if(!empty($_subject))
+		{
+$infos[] = Api\Html::bold($_subject); }
 		return implode($newline,$infos);
 	}
 
@@ -222,7 +247,8 @@ 
 	 *
 	 * @param settings array with keys account_id and new_owner (new_owner is optional)
 	 */
-	public static function deleteaccount($settings) {
+	public static function deleteaccount($settings)
+	{
 		$GLOBALS['egw']->db->delete( self::_notification_table, array(
 			'account_id'	=> $settings['account_id']
 		),__LINE__,__FILE__,self::_appname);

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

@@ -106,7 +106,7 @@
 		// Check access log to see if user is still logged in
 		if ( !Api\Session::notifications_active($this->recipient->account_id) )
 		{
-			throw new Exception("User {$this->recipient->account_lid} isn't online. Can't send notification via popup");
+			throw new Exception("user {$this->recipient->account_lid} isn't online. Can't send notification via popup");
 		}
 
 		$message = 	$this->render_infos($_subject)

notifications/inc/class.notifications_winpopup.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -155,7 +155,7 @@ 
 	 * checks for a valid IPv4-address without CIDR notation
 	 *
 	 * @param string $_ip
-	 * @return true or false
+	 * @return integer or false
 	 */
 	private function valid_ip($_ip) {
 		return eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$',$_ip);
@@ -165,7 +165,7 @@ 
 	 * renders additional info from subject
 	 *
 	 * @param string $_subject
-	 * @return plain rendered info as complete string
+	 * @return string|false rendered info as complete string
 	 */
 	private function render_infos($_subject = false) {
 		$newline = "\n";

Spacing +21 added lines, -21 removed lines

@@ -81,12 +81,12 @@ 
 	 * @param object $_preferences
 	 */
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
-		if(!$this->netbios_command) {
-			throw new Exception(	'Winpopup plugin not configured yet. Skipped sending notification message. '.
+		if (!is_object($_sender)) { throw new Exception("no sender given."); }
+		if (!is_object($_recipient)) { throw new Exception("no recipient given."); }
+		if (!$this->netbios_command) {
+			throw new Exception('Winpopup plugin not configured yet. Skipped sending notification message. '.
 									'Please check var "netbios_command" in winpopup backend '.
-									'('.EGW_INCLUDE_ROOT. '/'. self::_appname. '/inc/class.notifications_winpopup.inc.php).');
+									'('.EGW_INCLUDE_ROOT.'/'.self::_appname.'/inc/class.notifications_winpopup.inc.php).');
 		}
 		$this->sender = $_sender;
 		$this->recipient = $_recipient;
@@ -104,19 +104,19 @@ 
 	 */
 	public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false)
 	{
-		unset($_links, $_attachments);	// not used
+		unset($_links, $_attachments); // not used
 
 		$user_sessions = array();
 		foreach (Api\Session::session_list(0, 'asc', 'session_dla', true) as $session) {
-			if ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain']) {
-				if($this->valid_ip($session['session_ip'])) {
+			if ($session['session_lid'] == $this->recipient->account_lid.'@'.$GLOBALS['egw_info']['user']['domain']) {
+				if ($this->valid_ip($session['session_ip'])) {
 					$user_sessions[] = $session['session_ip'];
 				}
 			}
 		}
-		if ( empty($user_sessions) ) throw new Exception("User #{$this->recipient->account_id} isn't online. Can't send notification via winpopup");
+		if (empty($user_sessions)) throw new Exception("User #{$this->recipient->account_id} isn't online. Can't send notification via winpopup");
 
-		$this->send_winpopup( $this->render_infos($_subject).$_messages['plain'], $user_sessions );
+		$this->send_winpopup($this->render_infos($_subject).$_messages['plain'], $user_sessions);
 		return true;
 	}
 
@@ -126,15 +126,15 @@ 
 	 * @param string $_message
 	 * @param array $_user_sessions
 	 */
-	private function send_winpopup( $_message, array $_user_sessions ) {
-		foreach($_user_sessions as $user_session) {
-			$ip_octets=explode(".",$user_session);
+	private function send_winpopup($_message, array $_user_sessions) {
+		foreach ($_user_sessions as $user_session) {
+			$ip_octets = explode(".", $user_session);
 			// format the ip_octets to 3 digits each
-			foreach($ip_octets as $id=>$ip_octet) {
-				if(strlen($ip_octet)==1) { $ip_octets[$id] = '00'.$ip_octet; }
-				if(strlen($ip_octet)==2) { $ip_octets[$id] = '0'.$ip_octet; }
+			foreach ($ip_octets as $id=>$ip_octet) {
+				if (strlen($ip_octet) == 1) { $ip_octets[$id] = '00'.$ip_octet; }
+				if (strlen($ip_octet) == 2) { $ip_octets[$id] = '0'.$ip_octet; }
 			}
-			$placeholders = array(	'/\[MESSAGE\]/' => escapeshellarg($_message), // prevent code injection
+			$placeholders = array('/\[MESSAGE\]/' => escapeshellarg($_message), // prevent code injection
 									'/\[1\]/' => $ip_octets[0],
 									'/\[2\]/' => $ip_octets[1],
 									'/\[3\]/' => $ip_octets[2],
@@ -144,8 +144,8 @@ 
 									);
 			$command = preg_replace(array_keys($placeholders), $placeholders, $this->netbios_command);
 			$output = $returncode = null;
-			exec($command,$output,$returncode);
-			if($returncode != 0) {
+			exec($command, $output, $returncode);
+			if ($returncode != 0) {
 				throw new Exception("Failed sending notification message via winpopup. Error while executing the specified command.");
 			}
 		}
@@ -158,7 +158,7 @@ 
 	 * @return true or false
 	 */
 	private function valid_ip($_ip) {
-		return eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$',$_ip);
+		return eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$', $_ip);
 	}
 
 	/**
@@ -169,7 +169,7 @@ 
 	 */
 	private function render_infos($_subject = false) {
 		$newline = "\n";
-		if(!empty($_subject)) { return $_subject.$newline; }
+		if (!empty($_subject)) { return $_subject.$newline; }
 		return false;
 	}
 }
\ No newline at end of file

Braces +43 added lines, -18 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * User notification via winpopup.
  */
-class notifications_winpopup implements notifications_iface {
+class notifications_winpopup implements notifications_iface
+{
 
 	/**
 	 * Appname
@@ -80,10 +81,16 @@ 
 	 * @param object $_config
 	 * @param object $_preferences
 	 */
-	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
-		if(!$this->netbios_command) {
+	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
+	{
+		if(!is_object($_sender))
+		{
+throw new Exception("no sender given."); }
+		if(!is_object($_recipient))
+		{
+throw new Exception("no recipient given."); }
+		if(!$this->netbios_command)
+		{
 			throw new Exception(	'Winpopup plugin not configured yet. Skipped sending notification message. '.
 									'Please check var "netbios_command" in winpopup backend '.
 									'('.EGW_INCLUDE_ROOT. '/'. self::_appname. '/inc/class.notifications_winpopup.inc.php).');
@@ -107,14 +114,20 @@ 
 		unset($_links, $_attachments);	// not used
 
 		$user_sessions = array();
-		foreach (Api\Session::session_list(0, 'asc', 'session_dla', true) as $session) {
-			if ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain']) {
-				if($this->valid_ip($session['session_ip'])) {
+		foreach (Api\Session::session_list(0, 'asc', 'session_dla', true) as $session)
+		{
+			if ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain'])
+			{
+				if($this->valid_ip($session['session_ip']))
+				{
 					$user_sessions[] = $session['session_ip'];
 				}
 			}
 		}
-		if ( empty($user_sessions) ) throw new Exception("User #{$this->recipient->account_id} isn't online. Can't send notification via winpopup");
+		if ( empty($user_sessions) )
+		{
+			throw new Exception("User #{$this->recipient->account_id} isn't online. Can't send notification via winpopup");
+		}
 
 		$this->send_winpopup( $this->render_infos($_subject).$_messages['plain'], $user_sessions );
 		return true;
@@ -126,13 +139,20 @@ 
 	 * @param string $_message
 	 * @param array $_user_sessions
 	 */
-	private function send_winpopup( $_message, array $_user_sessions ) {
-		foreach($_user_sessions as $user_session) {
+	private function send_winpopup( $_message, array $_user_sessions )
+	{
+		foreach($_user_sessions as $user_session)
+		{
 			$ip_octets=explode(".",$user_session);
 			// format the ip_octets to 3 digits each
-			foreach($ip_octets as $id=>$ip_octet) {
-				if(strlen($ip_octet)==1) { $ip_octets[$id] = '00'.$ip_octet; }
-				if(strlen($ip_octet)==2) { $ip_octets[$id] = '0'.$ip_octet; }
+			foreach($ip_octets as $id=>$ip_octet)
+			{
+				if(strlen($ip_octet)==1)
+				{
+$ip_octets[$id] = '00'.$ip_octet; }
+				if(strlen($ip_octet)==2)
+				{
+$ip_octets[$id] = '0'.$ip_octet; }
 			}
 			$placeholders = array(	'/\[MESSAGE\]/' => escapeshellarg($_message), // prevent code injection
 									'/\[1\]/' => $ip_octets[0],
@@ -145,7 +165,8 @@ 
 			$command = preg_replace(array_keys($placeholders), $placeholders, $this->netbios_command);
 			$output = $returncode = null;
 			exec($command,$output,$returncode);
-			if($returncode != 0) {
+			if($returncode != 0)
+			{
 				throw new Exception("Failed sending notification message via winpopup. Error while executing the specified command.");
 			}
 		}
@@ -157,7 +178,8 @@ 
 	 * @param string $_ip
 	 * @return true or false
 	 */
-	private function valid_ip($_ip) {
+	private function valid_ip($_ip)
+	{
 		return eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$',$_ip);
 	}
 
@@ -167,9 +189,12 @@ 
 	 * @param string $_subject
 	 * @return plain rendered info as complete string
 	 */
-	private function render_infos($_subject = false) {
+	private function render_infos($_subject = false)
+	{
 		$newline = "\n";
-		if(!empty($_subject)) { return $_subject.$newline; }
+		if(!empty($_subject))
+		{
+return $_subject.$newline; }
 		return false;
 	}
 }
\ No newline at end of file

pixelegg/inc/class.pixelegg_framework.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	 * Overwritten to load our slider.js
 	 *
 	 * @param array $extra
-	 * @return type
+	 * @return string|null
 	 */
 	function header(array $extra=array())
 	{

Spacing +10 added lines, -10 removed lines

@@ -41,12 +41,12 @@ 
 	 *
 	 * @param string $template ='pixelegg' name of the template
 	 */
-	function __construct($template=self::APP)
+	function __construct($template = self::APP)
 	{
-		parent::__construct($template);		// call the constructor of the extended class
+		parent::__construct($template); // call the constructor of the extended class
 
 		// search 'mobile' dirs first
-		if (Api\Header\UserAgent::mobile()) array_unshift ($this->template_dirs, 'mobile');
+		if (Api\Header\UserAgent::mobile()) array_unshift($this->template_dirs, 'mobile');
 	}
 
 	/**
@@ -57,7 +57,7 @@ 
 	 * @param array $extra
 	 * @return type
 	 */
-	function header(array $extra=array())
+	function header(array $extra = array())
 	{
 		// load our slider.js, but only if framework requested
 		if (!self::$header_done && $_GET['cd'] === 'yes' &&
@@ -79,9 +79,9 @@ 
 	{
 		if ($color[0] == '#') $color = ltrim($color, '#');
 
-		$R = hexdec(substr($color,0,2));
-		$G = hexdec(substr($color,2,2));
-		$B = hexdec(substr($color,4,2));
+		$R = hexdec(substr($color, 0, 2));
+		$G = hexdec(substr($color, 2, 2));
+		$B = hexdec(substr($color, 4, 2));
 
 		$Rs = round($R * (100 + $percent) / 100);
 		$Gs = round($G * (100 + $percent) / 100);
@@ -104,7 +104,7 @@ 
 	{
 		$ret = parent::_get_css();
 		// color to use
-		$color = str_replace('custom',$GLOBALS['egw_info']['user']['preferences']['common']['template_custom_color'],
+		$color = str_replace('custom', $GLOBALS['egw_info']['user']['preferences']['common']['template_custom_color'],
 			$GLOBALS['egw_info']['user']['preferences']['common']['template_color']);
 
 		// Create a dark variant of the color
@@ -129,7 +129,7 @@ 
 			$loginbox_color = $color_darker;
 		}
 
-		if (preg_match('/^(#[0-9A-F]+|[A-Z]+)$/i',$color))	// a little xss check
+		if (preg_match('/^(#[0-9A-F]+|[A-Z]+)$/i', $color))	// a little xss check
 		{
 			if (!Api\Header\UserAgent::mobile())
 			{
@@ -206,7 +206,7 @@ 
 	 * @param string $extra_vars for login url
 	 * @param string $change_passwd =null string with message to render input fields for password change
 	 */
-	function login_screen($extra_vars, $change_passwd=null)
+	function login_screen($extra_vars, $change_passwd = null)
 	{
 		if (empty($GLOBALS['loginscreenmessage']))
 		{

Braces +24 added lines, -6 removed lines

@@ -46,7 +46,10 @@ 
 		parent::__construct($template);		// call the constructor of the extended class
 
 		// search 'mobile' dirs first
-		if (Api\Header\UserAgent::mobile()) array_unshift ($this->template_dirs, 'mobile');
+		if (Api\Header\UserAgent::mobile())
+		{
+			array_unshift ($this->template_dirs, 'mobile');
+		}
 	}
 
 	/**
@@ -77,7 +80,10 @@ 
 	 */
 	function _color_shader($color, $percent)
 	{
-		if ($color[0] == '#') $color = ltrim($color, '#');
+		if ($color[0] == '#')
+		{
+			$color = ltrim($color, '#');
+		}
 
 		$R = hexdec(substr($color,0,2));
 		$G = hexdec(substr($color,2,2));
@@ -87,9 +93,18 @@ 
 		$Gs = round($G * (100 + $percent) / 100);
 		$Bs = round($B * (100 + $percent) / 100);
 
-		if ($Rs > 255) $Rs = 255;
-		if ($Gs > 255) $Gs = 255;
-		if ($Bs > 255) $Bs = 255;
+		if ($Rs > 255)
+		{
+			$Rs = 255;
+		}
+		if ($Gs > 255)
+		{
+			$Gs = 255;
+		}
+		if ($Bs > 255)
+		{
+			$Bs = 255;
+		}
 
 		return '#'.sprintf('%02X%02X%02X', $Rs, $Gs, $Bs);
 	}
@@ -129,7 +144,9 @@ 
 			$loginbox_color = $color_darker;
 		}
 
-		if (preg_match('/^(#[0-9A-F]+|[A-Z]+)$/i',$color))	// a little xss check
+		if (preg_match('/^(#[0-9A-F]+|[A-Z]+)$/i',$color))
+		{
+			// a little xss check
 		{
 			if (!Api\Header\UserAgent::mobile())
 			{
@@ -168,6 +185,7 @@ 
 
 
 ";
+		}
 				if ($GLOBALS['egw_info']['user']['preferences']['common']['theme'] == 'traditional')
 				{
 					$ret['app_css'] .= ".dialogFooterToolbar {background-color: $color !important;}";

preferences/inc/class.preferences_settings.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -292,7 +292,7 @@
 	 * @param array &$sel_options
 	 * @param array &$readonlys
 	 * @param array &$types on return setting-name => setting-type
-	 * @param etemplate $tpl
+	 * @param Etemplate $tpl
 	 * @throws Api\Exception\WrongParameter
 	 * @return array content
 	 */

Spacing +56 added lines, -57 removed lines

@@ -45,7 +45,7 @@ 
 	 * @param array $content =null
 	 * @param string $msg =''
 	 */
-	function index(array $content=null, $msg='')
+	function index(array $content = null, $msg = '')
 	{
 		$tpl = new Etemplate('preferences.settings');
 		if (!is_array($content))
@@ -70,7 +70,7 @@ 
 			{
 				list($button) = each($content['button']);
 				$appname = $content['old_appname'] ? $content['old_appname'] : 'common';
-				switch($button)
+				switch ($button)
 				{
 					case 'save':
 					case 'apply':
@@ -79,10 +79,10 @@ 
 						{
 							throw new Api\Exception\NoPermission\Admin;
 						}
-						list($type,$account_id) = explode(':', $content['old_type']);
+						list($type, $account_id) = explode(':', $content['old_type']);
 						// merge prefs of all tabs together again
 						$prefs = array();
-						foreach($content as $name => $val)
+						foreach ($content as $name => $val)
 						{
 							if (is_array($val) && strpos($name, 'tab') === 0)
 							{
@@ -100,7 +100,7 @@ 
 						$old_values = array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'], array_flip($require_reload));
 
 						$attribute = $type == 'group' ? 'user' : $type;
-						if (!($msg=$this->process_array($GLOBALS['egw']->preferences->$attribute, $prefs, $content['types'], $appname, $attribute)))
+						if (!($msg = $this->process_array($GLOBALS['egw']->preferences->$attribute, $prefs, $content['types'], $appname, $attribute)))
 						{
 							$msg_type = 'success';
 							$msg = lang('Preferences saved.');
@@ -124,14 +124,14 @@ 
 						// update client-side Api\Preferences in response
 						Framework::ajax_get_preference($appname);
 				}
-				if (in_array($button, array('save','cancel')))
+				if (in_array($button, array('save', 'cancel')))
 				{
 					Api\Json\Response::get()->call('egw.message', $msg, $msg_type);
 					Framework::window_close();
 				}
 			}
 			$appname = $content['appname'] ? $content['appname'] : 'common';
-			list($type,$account_id) = explode(':', $content['type']);
+			list($type, $account_id) = explode(':', $content['type']);
 			//_debug_array($prefs);
 		}
 		if ($account_id && $account_id != $GLOBALS['egw']->preferences->get_account_id())
@@ -150,7 +150,7 @@ 
 		$preserve['current_app'] = $content['current_app'];
 		$GLOBALS['egw_info']['flags']['currentapp'] = $content['current_app'] == 'common' ?
 			'preferences' : $content['current_app'];
-		Framework::includeCSS('preferences','app');
+		Framework::includeCSS('preferences', 'app');
 
 		// if not just saved, call validation before, to be able to show failed validation of current prefs
 		if (!isset($button))
@@ -182,7 +182,7 @@ 
 	 * @param boolean $only_verify =false
 	 * @return string with verification error or null on success
 	 */
-	function process_array(array &$repository, array $values, array $types, $appname, $type, $only_verify=false)
+	function process_array(array &$repository, array $values, array $types, $appname, $type, $only_verify = false)
 	{
 		//fetch application specific settings from a hook
 		$settings = Api\Hooks::single(array(
@@ -195,10 +195,10 @@ 
 
 		unset($prefs['']);
 		//_debug_array($values);exit;
-		foreach($values as $var => $value)
+		foreach ($values as $var => $value)
 		{
 			// type specific validation
-			switch((string)$types[$var])
+			switch ((string)$types[$var])
 			{
 				case 'password':	// dont write empty password-fields
 					if (empty($value)) continue 2;
@@ -211,7 +211,7 @@ 
 						// empty is always allowed
 
 						// If forced, empty == not set
-						if($type == 'forced')
+						if ($type == 'forced')
 						{
 							unset($prefs[$var]);
 							// need to call preferences::delete, to also set affective prefs!
@@ -223,19 +223,19 @@ 
 					{
 						if ($value[0] != '/' || !Vfs::stat($value) || Vfs::is_dir($value))
 						{
-							$error = lang('%1 is no existing vfs file!',htmlspecialchars($value));
+							$error = lang('%1 is no existing vfs file!', htmlspecialchars($value));
 						}
 					}
 					else
 					{
 						// split multiple comma or whitespace separated directories
 						// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
-						foreach($types[$var] == 'vfs_dir' ? array($value) : preg_split('/[,\s]+\//', $value) as $n => $dir)
+						foreach ($types[$var] == 'vfs_dir' ? array($value) : preg_split('/[,\s]+\//', $value) as $n => $dir)
 						{
-							if ($n) $dir = '/'.$dir;	// re-adding trailing slash removed by split
+							if ($n) $dir = '/'.$dir; // re-adding trailing slash removed by split
 							if ($dir[0] != '/' || !Vfs::stat($dir) || !Vfs::is_dir($dir))
 							{
-								$error .= ($error ? ' ' : '').lang('%1 is no existing vfs directory!',$dir);
+								$error .= ($error ? ' ' : '').lang('%1 is no existing vfs directory!', $dir);
 							}
 						}
 					}
@@ -249,7 +249,7 @@ 
 
 			if (isset($value) && $value !== '' && $value !== '**NULL**' && $value !== array())
 			{
-				if (is_array($value) && !$settings[$var]['no_sel_options']) $value = implode(',',$value);	// multiselect
+				if (is_array($value) && !$settings[$var]['no_sel_options']) $value = implode(',', $value); // multiselect
 
 				$prefs[$var] = $value;
 
@@ -269,7 +269,7 @@ 
 		// if you return something else than False, it is treated as an error-msg and
 		// displayed to the user (the prefs are not saved)
 		//
-		if(($error .= Api\Hooks::single(array(
+		if (($error .= Api\Hooks::single(array(
 				'location' => 'verify_settings',
 				'prefs'    => &$repository[$appname],
 				'type'     => $type,
@@ -281,7 +281,7 @@ 
 			return $error;
 		}
 
-		if (!$only_verify) $GLOBALS['egw']->preferences->save_repository(True,$type);
+		if (!$only_verify) $GLOBALS['egw']->preferences->save_repository(True, $type);
 
 		// certain common prefs (language, template, ...) require the session to be re-created
 		if ($appname == 'common' && !$only_verify)
@@ -317,19 +317,19 @@ 
 		$sel_options = $readonlys = $content = $tabs = array();
 		// disable all but first tab and name current tab "tab1", for apps not using sections
 		$tab = 'tab1';
-		foreach($this->settings as $setting)
+		foreach ($this->settings as $setting)
 		{
 			if (!is_array($setting)) continue;
 			if ($type != 'forced' && (string)$GLOBALS['egw']->preferences->forced[$appname][$setting['name']] !== '')
 			{
-				continue;	// forced preferences are not displayed, unless we edit them
+				continue; // forced preferences are not displayed, unless we edit them
 			}
 			$types[$setting['name']] = $old_type = $setting['type'];
 
-			switch($old_type)
+			switch ($old_type)
 			{
 				case 'section':
-					$tab = 'tab'.(1+count($tabs));
+					$tab = 'tab'.(1 + count($tabs));
 					$tabs[] = array(
 						'id' => $tab,
 						'template' => 'preferences.settings.tab1',
@@ -344,24 +344,24 @@ 
 					if (is_array($setting['values'])) $vars += $setting['values'];
 					$GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']] =
 						$GLOBALS['egw']->preferences->lang_notify($GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']], $vars);
-					$types[$setting['name']] = $vars;	// store vars for re-translation, instead type "notify"
+					$types[$setting['name']] = $vars; // store vars for re-translation, instead type "notify"
 					if ($setting['help'] && ($setting['run_lang'] || !isset($setting['run_lang'])))
 					{
 						$setting['help'] = lang($setting['help']);
 					}
 					$setting['help'] .= '<p><b>'.lang('Substitutions and their meanings:').'</b>';
-					foreach($vars as $var => $var_help)
+					foreach ($vars as $var => $var_help)
 					{
 						$lname = ($lname = lang($var)) == $var.'*' ? $var : $lname;
 						$setting['help'] .= "<br>\n".'<b>$$'.$lname.'$$</b>: '.$var_help;
 					}
 					$setting['help'] .= "</p>\n";
-					$setting['run_lang'] = false;	// already done now
+					$setting['run_lang'] = false; // already done now
 					// handle as textarea
 				case 'textarea':
 					$setting['type'] = is_a($tpl, 'etemplate') ? 'textarea' : 'textbox';
 					$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'multiline', 'true');
-					$tpl->setElementAttribute($tab. '[' . $setting['name'] . ']','width', '99%' );
+					$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'width', '99%');
 					// anyway setting via css: width: 99%, height: 5em
 					// for old eT use size attribute
 					if (is_a($tpl, 'etemplate') && (!empty($setting['cols']) || !empty($setting['rows'])))
@@ -383,7 +383,7 @@ 
 				case 'multiselect':
 					$setting['type'] = 'select';
 					$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'rows', 5);
-					if (!isset($setting['size'])) $setting['size'] = '5';	// old eT
+					if (!isset($setting['size'])) $setting['size'] = '5'; // old eT
 					break;
 				case 'color':
 					$setting['type'] = 'colorpicker';
@@ -391,7 +391,7 @@ 
 				case 'date-duration':
 					if (!isset($setting['size'])) $setting['size'] = 'm,dhm,24,1';
 					$attrs = explode(',', $setting['size']);
-					foreach(array("data_format","display_format", "hours_per_day", "empty_not_0", "short_labels") as $n => $name)
+					foreach (array("data_format", "display_format", "hours_per_day", "empty_not_0", "short_labels") as $n => $name)
 					{
 						if ((string)$attrs[$n] !== '') $tpl->setElementAttribute($tab.'['.$setting['name'].']', $name, $attrs[$n]);
 					}
@@ -399,7 +399,7 @@ 
 				case 'taglist':
 					if ($setting['no_sel_options'])
 					{
-						$tpl->setElementAttribute ($tab.'['.$setting['name'].']', 'autocomplete_url', '');
+						$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'autocomplete_url', '');
 					}
 					break;
 			}
@@ -408,17 +408,17 @@ 
 			{
 				if ($old_type != 'multiselect' && $old_type != 'notify')
 				{
-					switch($type)
+					switch ($type)
 					{
 						case 'user':
-							$setting['values'] = array('' => lang('Use default'))+$setting['values'];
+							$setting['values'] = array('' => lang('Use default')) + $setting['values'];
 							break;
 						case 'default':
 						case 'group':
-							$setting['values'] = array('' => lang('No default'))+$setting['values'];
+							$setting['values'] = array('' => lang('No default')) + $setting['values'];
 							break;
 						case 'forced';
-							$setting['values'] = array('**NULL**' => lang('Users choice'))+$setting['values'];
+							$setting['values'] = array('**NULL**' => lang('Users choice')) + $setting['values'];
 							break;
 					}
 				}
@@ -427,8 +427,7 @@ 
 			if ($type == 'user')
 			{
 				$default = $GLOBALS['egw']->preferences->group[$appname][$setting['name']] ?
-					$GLOBALS['egw']->preferences->group[$appname][$setting['name']] :
-					$GLOBALS['egw']->preferences->default[$appname][$setting['name']];
+					$GLOBALS['egw']->preferences->group[$appname][$setting['name']] : $GLOBALS['egw']->preferences->default[$appname][$setting['name']];
 
 				// replace default value(s) for selectboxes with selectbox labels
 				if (isset($setting['values']) && is_array($setting['values']))
@@ -448,7 +447,7 @@ 
 				'name' => $setting['name'],
 				'type' => $setting['type'],
 				'label' => preg_replace('|<br[ /]*>|i', "\n", $setting['label']),
-				'help' => lang($setting['help']),	// is html
+				'help' => lang($setting['help']), // is html
 				'default' => !empty($default) ? lang('Default').': '.$default : null,
 				'onchange' => $setting['onchange'],
 			);
@@ -473,7 +472,7 @@ 
 
 		$content['appname'] = $appname;
 		$sel_options['appname'] = array();
-		foreach(Api\Hooks::implemented('settings') as $app)
+		foreach (Api\Hooks::implemented('settings') as $app)
 		{
 			if ($app != 'preferences' && $GLOBALS['egw_info']['user']['apps'][$app])
 			{
@@ -499,7 +498,7 @@ 
 				$user_apps = $GLOBALS['egw']->acl->get_user_applications($id);
 				$sel_options['appname'] = array_intersect_key($sel_options['appname'], $user_apps);
 			}
-			foreach($GLOBALS['egw']->accounts->search(array('type' => 'groups', 'order' => 'account_lid')) as $account_id => $group)
+			foreach ($GLOBALS['egw']->accounts->search(array('type' => 'groups', 'order' => 'account_lid')) as $account_id => $group)
 			{
 				$sel_options['type']['group:'.$account_id] = lang('Preferences').' '.Api\Accounts::format_username($group['account_lid'], '', '', $account_id);
 			}
@@ -522,7 +521,7 @@ 
 	 * @param boolean $lang =true
 	 * @return string comma-separated and translated labels
 	 */
-	protected static function get_default_label($default, array $values, $lang=true)
+	protected static function get_default_label($default, array $values, $lang = true)
 	{
 		// explode comma-separated multiple default values
 		if (!is_array($default) && !isset($values[$default]) && strpos($default, ',') !== false)
@@ -533,7 +532,7 @@ 
 		{
 			$labels = (array)$default;
 		}
-		foreach($labels as &$def)
+		foreach ($labels as &$def)
 		{
 			if (isset($values[$def]))
 			{
@@ -541,7 +540,7 @@ 
 			}
 			else	// value could be in an optgroup
 			{
-				foreach($values as $value)
+				foreach ($values as $value)
 				{
 					if (is_array($value) && !isset($value['label']) && isset($value[$def]))
 					{
@@ -567,16 +566,16 @@ 
 	 * @param int|string $account_id =null account_id for user or group prefs, or "forced" or "default"
 	 * @return boolean
 	 */
-	protected function call_hook($appname, $type='user', $account_id=null)
+	protected function call_hook($appname, $type = 'user', $account_id = null)
 	{
 		$this->appname = $appname == 'common' ? 'preferences' : $appname;
 
 		// Set framework here to make sure we get the right settings for user's [newly] selected template
 		$GLOBALS['egw_info']['server']['template_set'] = $GLOBALS['egw']->preferences->data['common']['template_set'];
 		Api\Translation::add_app($this->appname);
-		if($this->appname != 'preferences')
+		if ($this->appname != 'preferences')
 		{
-			Api\Translation::add_app('preferences');	// we need the prefs translations too
+			Api\Translation::add_app('preferences'); // we need the prefs translations too
 		}
 
 		// make type available, to hooks from Egw\Applications can use it, eg. activesync
@@ -585,7 +584,7 @@ 
 			'type' => $type,
 			'account_id' => $account_id,
 		);
-		$GLOBALS['type'] = $type;	// old global variable
+		$GLOBALS['type'] = $type; // old global variable
 
 		// calling app specific settings hook
 		$settings = Api\Hooks::single($hook_data, $this->appname);
@@ -594,30 +593,30 @@ 
 		{
 			$this->settings = array_merge($this->settings, $settings);
 		}
-		elseif(isset($GLOBALS['settings']) && is_array($GLOBALS['settings']) && $GLOBALS['settings'])
+		elseif (isset($GLOBALS['settings']) && is_array($GLOBALS['settings']) && $GLOBALS['settings'])
 		{
 			$this->settings = array_merge($this->settings, $GLOBALS['settings']);
 		}
 		else
 		{
-			return False;	// no settings returned
+			return False; // no settings returned
 		}
 
 		// calling settings hook all apps can answer (for a specific app)
 		$hook_data['location'] = 'settings_'.$this->appname;
-		foreach(Api\Hooks::process($hook_data, $this->appname,true) as $settings)
+		foreach (Api\Hooks::process($hook_data, $this->appname, true) as $settings)
 		{
 			if (isset($settings) && is_array($settings) && $settings)
 			{
-				$this->settings = array_merge($this->settings,$settings);
+				$this->settings = array_merge($this->settings, $settings);
 			}
 		}
 		/* Remove ui-only settings */
-		if($this->xmlrpc)
+		if ($this->xmlrpc)
 		{
-			foreach($this->settings as $key => $valarray)
+			foreach ($this->settings as $key => $valarray)
 			{
-				if(!$valarray['xmlrpc'])
+				if (!$valarray['xmlrpc'])
 				{
 					unset($this->settings[$key]);
 				}
@@ -629,10 +628,10 @@ 
 			 This is not handled by the hooks class and is only valid if not using xml-rpc.
 			*/
 			$tmpl_settings = EGW_SERVER_ROOT.$GLOBALS['egw']->framework->template_dir.'/hook_settings.inc.php';
-			if($this->appname == 'preferences' && file_exists($tmpl_settings))
+			if ($this->appname == 'preferences' && file_exists($tmpl_settings))
 			{
 				include($tmpl_settings);
-				$this->settings = array_merge($this->settings,$GLOBALS['settings']);
+				$this->settings = array_merge($this->settings, $GLOBALS['settings']);
 			}
 		}
 		// check if we have a default/forced value from the settings hook,
@@ -653,9 +652,9 @@ 
 		}
 		if ($need_update)
 		{
-			$GLOBALS['egw']->preferences->save_repository(false,'default',true);
+			$GLOBALS['egw']->preferences->save_repository(false, 'default', true);
 		}
-		if($this->debug)
+		if ($this->debug)
 		{
 			_debug_array($this->settings);
 		}

Braces +67 added lines, -16 removed lines

@@ -164,9 +164,15 @@ 
 		$data = $this->get_content($appname, $type, $sel_options, $readonlys, $preserve['types'], $tpl);
 		$preserve['appname'] = $preserve['old_appname'] = $data['appname'];
 		$preserve['type'] = $preserve['old_type'] = $data['type'];
-		if (isset($old_tab)) $data['tabs'] = $old_tab;
+		if (isset($old_tab))
+		{
+			$data['tabs'] = $old_tab;
+		}
 
-		if ($msg) Framework::message($msg, $msg_type ? $msg_type : 'error');
+		if ($msg)
+		{
+			Framework::message($msg, $msg_type ? $msg_type : 'error');
+		}
 
 		$tpl->exec('preferences.preferences_settings.index', $data, $sel_options, $readonlys, $preserve, 2);
 	}
@@ -201,7 +207,10 @@ 
 			switch((string)$types[$var])
 			{
 				case 'password':	// dont write empty password-fields
-					if (empty($value)) continue 2;
+					if (empty($value))
+					{
+						continue 2;
+					}
 					break;
 				case 'vfs_file':
 				case 'vfs_dir':
@@ -215,7 +224,10 @@ 
 						{
 							unset($prefs[$var]);
 							// need to call preferences::delete, to also set affective prefs!
-							if (!$only_verify) $GLOBALS['egw']->preferences->delete($appname, $var, $type);
+							if (!$only_verify)
+							{
+								$GLOBALS['egw']->preferences->delete($appname, $var, $type);
+							}
 							continue 2;
 						}
 					}
@@ -232,7 +244,11 @@ 
 						// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
 						foreach($types[$var] == 'vfs_dir' ? array($value) : preg_split('/[,\s]+\//', $value) as $n => $dir)
 						{
-							if ($n) $dir = '/'.$dir;	// re-adding trailing slash removed by split
+							if ($n)
+							{
+								$dir = '/'.$dir;
+							}
+							// re-adding trailing slash removed by split
 							if ($dir[0] != '/' || !Vfs::stat($dir) || !Vfs::is_dir($dir))
 							{
 								$error .= ($error ? ' ' : '').lang('%1 is no existing vfs directory!',$dir);
@@ -249,19 +265,29 @@ 
 
 			if (isset($value) && $value !== '' && $value !== '**NULL**' && $value !== array())
 			{
-				if (is_array($value) && !$settings[$var]['no_sel_options']) $value = implode(',',$value);	// multiselect
+				if (is_array($value) && !$settings[$var]['no_sel_options'])
+				{
+					$value = implode(',',$value);
+				}
+				// multiselect
 
 				$prefs[$var] = $value;
 
 				// need to call preferences::add, to also set affective prefs!
-				if (!$only_verify) $GLOBALS['egw']->preferences->add($appname, $var, $prefs[$var], $type);
+				if (!$only_verify)
+				{
+					$GLOBALS['egw']->preferences->add($appname, $var, $prefs[$var], $type);
+				}
 			}
 			else
 			{
 				unset($prefs[$var]);
 
 				// need to call preferences::delete, to also set affective prefs!
-				if (!$only_verify) $GLOBALS['egw']->preferences->delete($appname, $var, $type);
+				if (!$only_verify)
+				{
+					$GLOBALS['egw']->preferences->delete($appname, $var, $type);
+				}
 			}
 		}
 
@@ -281,7 +307,10 @@ 
 			return $error;
 		}
 
-		if (!$only_verify) $GLOBALS['egw']->preferences->save_repository(True,$type);
+		if (!$only_verify)
+		{
+			$GLOBALS['egw']->preferences->save_repository(True,$type);
+		}
 
 		// certain common prefs (language, template, ...) require the session to be re-created
 		if ($appname == 'common' && !$only_verify)
@@ -319,7 +348,10 @@ 
 		$tab = 'tab1';
 		foreach($this->settings as $setting)
 		{
-			if (!is_array($setting)) continue;
+			if (!is_array($setting))
+			{
+				continue;
+			}
 			if ($type != 'forced' && (string)$GLOBALS['egw']->preferences->forced[$appname][$setting['name']] !== '')
 			{
 				continue;	// forced preferences are not displayed, unless we edit them
@@ -341,7 +373,10 @@ 
 
 				case 'notify':
 					$vars = $GLOBALS['egw']->preferences->vars;
-					if (is_array($setting['values'])) $vars += $setting['values'];
+					if (is_array($setting['values']))
+					{
+						$vars += $setting['values'];
+					}
 					$GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']] =
 						$GLOBALS['egw']->preferences->lang_notify($GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']], $vars);
 					$types[$setting['name']] = $vars;	// store vars for re-translation, instead type "notify"
@@ -383,17 +418,27 @@ 
 				case 'multiselect':
 					$setting['type'] = 'select';
 					$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'rows', 5);
-					if (!isset($setting['size'])) $setting['size'] = '5';	// old eT
+					if (!isset($setting['size']))
+					{
+						$setting['size'] = '5';
+					}
+					// old eT
 					break;
 				case 'color':
 					$setting['type'] = 'colorpicker';
 					break;
 				case 'date-duration':
-					if (!isset($setting['size'])) $setting['size'] = 'm,dhm,24,1';
+					if (!isset($setting['size']))
+					{
+						$setting['size'] = 'm,dhm,24,1';
+					}
 					$attrs = explode(',', $setting['size']);
 					foreach(array("data_format","display_format", "hours_per_day", "empty_not_0", "short_labels") as $n => $name)
 					{
-						if ((string)$attrs[$n] !== '') $tpl->setElementAttribute($tab.'['.$setting['name'].']', $name, $attrs[$n]);
+						if ((string)$attrs[$n] !== '')
+						{
+							$tpl->setElementAttribute($tab.'['.$setting['name'].']', $name, $attrs[$n]);
+						}
 					}
 					break;
 				case 'taglist':
@@ -435,10 +480,13 @@ 
 				{
 					$default = self::get_default_label($default, $setting['values']);
 				}
-				if (is_array($types[$setting['name']]))	// translate the substitution names
+				if (is_array($types[$setting['name']]))
+				{
+					// translate the substitution names
 				{
 					$default = $GLOBALS['egw']->preferences->lang_notify($default, $types[$setting['name']]);
 				}
+				}
 			}
 			if ($setting['help'] && ($setting['run_lang'] || !isset($setting['run_lang'])))
 			{
@@ -550,7 +598,10 @@ 
 					}
 				}
 			}
-			if ($lang) $def = lang($def);
+			if ($lang)
+			{
+				$def = lang($def);
+			}
 		}
 		$label = implode(', ', $labels);
 		//error_log(__METHOD__."(".array2string($default).', '.array2string($values).") returning $label");

redirect.php

Doc Comments +4 added lines

@@ -24,6 +24,10 @@
 
 	if(!function_exists('html_entity_decode'))
 	{
+
+		/**
+		 * @param integer $quote_style
+		 */
 		function html_entity_decode($given_html, $quote_style = ENT_QUOTES)
 		{
 			$trans_table = array_flip(get_html_translation_table( HTML_SPECIALCHARS, $quote_style));

Spacing +9 added lines, -9 removed lines

@@ -22,11 +22,11 @@ 
 	  "<a href=\"$webserverURL/redirect.php?go=".htmlentities(urlencode('http://www.egroupware.org')).'">'
 	*/
 
-	if(!function_exists('html_entity_decode'))
+	if (!function_exists('html_entity_decode'))
 	{
 		function html_entity_decode($given_html, $quote_style = ENT_QUOTES)
 		{
-			$trans_table = array_flip(get_html_translation_table( HTML_SPECIALCHARS, $quote_style));
+			$trans_table = array_flip(get_html_translation_table(HTML_SPECIALCHARS, $quote_style));
 			$trans_table['&#39;'] = "'";
 			return(strtr($given_html, $trans_table));
 		}
@@ -45,17 +45,17 @@ 
 
 	/* Only allow redirects from inside this eGroupware installation. */
 	$valid_referer = array();
-	$path = preg_replace('/\/[^\/]*$/','',$_SERVER['PHP_SELF']) . '/';
+	$path = preg_replace('/\/[^\/]*$/', '', $_SERVER['PHP_SELF']).'/';
 	array_push($valid_referer, $path);
-	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_ADDR'] . $path);
-	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . $path);
+	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_ADDR'].$path);
+	array_push($valid_referer, ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_NAME'].$path);
 
 	$referrer = trim($_SERVER['HTTP_REFERER']);
 	if ((!isset($_SERVER['HTTP_REFERER'])) || (empty($referrer)))
 	{
 		echo "Only usable from within eGroupware.\n";
 	}
-	else if($_GET['go'])
+	else if ($_GET['go'])
 	{
 		$allow = false;
 		foreach ($valid_referer as $urlRoot)
@@ -69,15 +69,15 @@ 
 		}
 		if ($allow)
 		{
-			$url= html_entity_decode(urldecode($_GET['go']));
+			$url = html_entity_decode(urldecode($_GET['go']));
 			unset($_GET['go']);
 			/* Only add "&" if there is something to append. */
 			if (!empty($_GET))
 			{
-				$url=$url."&".http_build_query($_GET);
+				$url = $url."&".http_build_query($_GET);
 			}
 
-			Header('Location: ' . html_entity_decode(urldecode($url)));
+			Header('Location: '.html_entity_decode(urldecode($url)));
 			exit;
 		}
 		else

remote.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +6 added lines, -6 removed lines

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

resources/inc/class.resources_acl_bo.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -43,7 +43,6 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param int $user=null account_id of user whos rights to return, or null for current user
 	 * @param boolean $session
 	 */
 	function __construct($session=False, $user=null)
@@ -77,7 +76,7 @@ 
 	*
 	* @author Cornelius Weiss <egw@von-und-zu-weiss.de>
 	* @param int $perm_type one of Acl::READ, Acl::ADD, Acl::EDIT, Acl::DELETE, self::DIRECT_BOOKING
-	* @param int $parent_id=0 cat_id of parent to return only children of that category
+	* @param int $parent_id cat_id of parent to return only children of that category
 	* @return array cat_id => cat_name
 	* TODO mark subcats and so on!
 	*/

Indentation +25 added lines, -25 removed lines

@@ -73,14 +73,14 @@ 
 	}
 
 	/**
-	* get list of cats where current user has given rights
-	*
-	* @author Cornelius Weiss <egw@von-und-zu-weiss.de>
-	* @param int $perm_type one of Acl::READ, Acl::ADD, Acl::EDIT, Acl::DELETE, self::DIRECT_BOOKING
-	* @param int $parent_id=0 cat_id of parent to return only children of that category
-	* @return array cat_id => cat_name
-	* TODO mark subcats and so on!
-	*/
+	 * get list of cats where current user has given rights
+	 *
+	 * @author Cornelius Weiss <egw@von-und-zu-weiss.de>
+	 * @param int $perm_type one of Acl::READ, Acl::ADD, Acl::EDIT, Acl::DELETE, self::DIRECT_BOOKING
+	 * @param int $parent_id=0 cat_id of parent to return only children of that category
+	 * @return array cat_id => cat_name
+	 * TODO mark subcats and so on!
+	 */
 	function get_cats($perm_type,$parent_id=0)
 	{
 		$cats = $this->egw_cats->return_sorted_array(0,false,'','','',true,$parent_id);
@@ -105,24 +105,24 @@ 
 
 
 	/**
-	* gets name of category
-	*
-	* @author Lukas Weiss <wnz.gh05t@users.sourceforge.net>
-	* @param int $cat_id
-	* @return mixed name of category
-	*/
+	 * gets name of category
+	 *
+	 * @author Lukas Weiss <wnz.gh05t@users.sourceforge.net>
+	 * @param int $cat_id
+	 * @return mixed name of category
+	 */
 	static public function get_cat_name($cat_id)
 	{
 		return $GLOBALS['egw']->categories->id2name($cat_id);
 	}
 
 	/**
-	* gets userid of admin for given category
-	*
-	* @author Cornelius Weiss <egw@von-und-zu-weiss.de>
-	* @param int $cat_id
-	* @return int userid of cat admin
-	*/
+	 * gets userid of admin for given category
+	 *
+	 * @author Cornelius Weiss <egw@von-und-zu-weiss.de>
+	 * @param int $cat_id
+	 * @return int userid of cat admin
+	 */
 	static public function get_cat_admin($cat_id)
 	{
 		$cat_rights = self::get_rights($cat_id);
@@ -194,11 +194,11 @@ 
 	}
 
 	/**
-	* gets all rights from all user for given cat
-	*
-	* @param int $cat_id
-	* @return array userid => right
-	*/
+	 * gets all rights from all user for given cat
+	 *
+	 * @param int $cat_id
+	 * @return array userid => right
+	 */
 	static public function get_rights($cat_id)
 	{
 		return $GLOBALS['egw']->acl->get_all_rights('L'.$cat_id,'resources');

Braces +12 added lines, -4 removed lines

@@ -85,9 +85,13 @@ 
 	{
 		$cats = $this->egw_cats->return_sorted_array(0,false,'','','',true,$parent_id);
 		#_debug_array($cats);
-		if (!is_array($cats)) $cats = array();
+		if (!is_array($cats))
+		{
+			$cats = array();
+		}
 		$perm_cats = array();
-		foreach($cats as $key=>$cat) {
+		foreach($cats as $key=>$cat)
+		{
 			#echo "key:$key"._debug_array($value)."<br>";
 			#_debug_array($cat)."hier<br>";
 			if($this->is_permitted($cat['id'],$perm_type))
@@ -215,14 +219,18 @@ 
 			'order' => $this->order,
 			'limit' => $this->limit,
 		);
-		if($this->debug) { echo '<br>Read:'; _debug_array($data); }
+		if($this->debug)
+		{
+echo '<br>Read:'; _debug_array($data); }
 		Api\Cache::setSession('resources_acl', 'session_data', $data);
 	}
 
 	function read_sessiondata()
 	{
 		$data = Api\Cache::getSession('resources_acl', 'session_data');
-		if($this->debug) { echo '<br>Read:'; _debug_array($data); }
+		if($this->debug)
+		{
+echo '<br>Read:'; _debug_array($data); }
 
 		$this->start  = $data['start'];
 		$this->query  = $data['query'];

Spacing +28 added lines, -28 removed lines

@@ -46,17 +46,17 @@ 
 	 * @param int $user=null account_id of user whos rights to return, or null for current user
 	 * @param boolean $session
 	 */
-	function __construct($session=False, $user=null)
+	function __construct($session = False, $user = null)
 	{
 		$this->egw_cats = new Api\Categories($user, 'resources');
 		$this->debug = False;
 
 		//all this is only needed when called from uiacl.
-		if($session)
+		if ($session)
 		{
 			$this->read_sessiondata();
 			$this->use_session = True;
-			foreach(array('start','query','sort','order') as $var)
+			foreach (array('start', 'query', 'sort', 'order') as $var)
 			{
 				if (isset($_POST[$var]))
 				{
@@ -68,7 +68,7 @@ 
 				}
 			}
 			$this->save_sessiondata();
-			$this->cats = $this->egw_cats->return_sorted_array(0,false,'','','',true);
+			$this->cats = $this->egw_cats->return_sorted_array(0, false, '', '', '', true);
 		}
 	}
 
@@ -81,18 +81,18 @@ 
 	* @return array cat_id => cat_name
 	* TODO mark subcats and so on!
 	*/
-	function get_cats($perm_type,$parent_id=0)
+	function get_cats($perm_type, $parent_id = 0)
 	{
-		$cats = $this->egw_cats->return_sorted_array(0,false,'','','',true,$parent_id);
+		$cats = $this->egw_cats->return_sorted_array(0, false, '', '', '', true, $parent_id);
 		#_debug_array($cats);
 		if (!is_array($cats)) $cats = array();
 		$perm_cats = array();
-		foreach($cats as $key=>$cat) {
+		foreach ($cats as $key=>$cat) {
 			#echo "key:$key"._debug_array($value)."<br>";
 			#_debug_array($cat)."hier<br>";
-			if($this->is_permitted($cat['id'],$perm_type))
+			if ($this->is_permitted($cat['id'], $perm_type))
 			{
-				$s = str_repeat('&nbsp; ',$cat['level']) . stripslashes($cat['name']);
+				$s = str_repeat('&nbsp; ', $cat['level']).stripslashes($cat['name']);
 				if ($cat['app_name'] == 'phpgw' || $cat['owner'] == '-1')
 				{
 					$s .= ' &#9830;';
@@ -100,7 +100,7 @@ 
 				$perm_cats[$cat['id']] = $s;
 			}
 		}
-		return isset($perm_cats)?$perm_cats:array();
+		return isset($perm_cats) ? $perm_cats : array();
 	}
 
 
@@ -128,13 +128,13 @@ 
 		$cat_rights = self::get_rights($cat_id);
 		foreach ($cat_rights as $userid => $right)
 		{
-			if ($right & self::CAT_ADMIN)
+			if ($right&self::CAT_ADMIN)
 			{
 				return $userid;
 			}
 		}
 		// check for an inherited cat admin
-		if (($parent = $GLOBALS['egw']->categories->id2name($cat_id,'parent')))
+		if (($parent = $GLOBALS['egw']->categories->id2name($cat_id, 'parent')))
 		{
 			return self::get_cat_admin($parent);
 		}
@@ -161,10 +161,10 @@ 
 		{
 			if (is_null(self::$resource_acl))
 			{
-				self::$resource_acl = $GLOBALS['egw']->acl->get_all_location_rights($GLOBALS['egw_info']['user']['account_id'],'resources',true);
+				self::$resource_acl = $GLOBALS['egw']->acl->get_all_location_rights($GLOBALS['egw_info']['user']['account_id'], 'resources', true);
 			}
 			self::$permissions[$cat_id] = (int)self::$resource_acl['L'.$cat_id];
-			if (($parent = $GLOBALS['egw']->categories->id2name($cat_id,'parent')))
+			if (($parent = $GLOBALS['egw']->categories->id2name($cat_id, 'parent')))
 			{
 				self::$permissions[$cat_id] |= self::get_permissions($parent);
 			}
@@ -182,7 +182,7 @@ 
 	 * @param int $right
 	 * @return boolean user is permitted or not for right
 	 */
-	static public function is_permitted($cat_id,$right)
+	static public function is_permitted($cat_id, $right)
 	{
 		if (!isset(self::$permissions[$cat_id]))
 		{
@@ -190,7 +190,7 @@ 
 		}
 		//echo "<p>".__METHOD__."($cat_id,$right) = ".self::$permissions[$cat_id]." & $right = ".(self::$permissions[$cat_id] & $right)."</p>\n";
 
-		return (boolean) (self::$permissions[$cat_id] & $right);
+		return (boolean)(self::$permissions[$cat_id]&$right);
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	*/
 	static public function get_rights($cat_id)
 	{
-		return $GLOBALS['egw']->acl->get_all_rights('L'.$cat_id,'resources');
+		return $GLOBALS['egw']->acl->get_all_rights('L'.$cat_id, 'resources');
 	}
 
 
@@ -215,14 +215,14 @@ 
 			'order' => $this->order,
 			'limit' => $this->limit,
 		);
-		if($this->debug) { echo '<br>Read:'; _debug_array($data); }
+		if ($this->debug) { echo '<br>Read:'; _debug_array($data); }
 		Api\Cache::setSession('resources_acl', 'session_data', $data);
 	}
 
 	function read_sessiondata()
 	{
 		$data = Api\Cache::getSession('resources_acl', 'session_data');
-		if($this->debug) { echo '<br>Read:'; _debug_array($data); }
+		if ($this->debug) { echo '<br>Read:'; _debug_array($data); }
 
 		$this->start  = $data['start'];
 		$this->query  = $data['query'];
@@ -231,7 +231,7 @@ 
 		$this->limit = $data['limit'];
 	}
 
-	public static function set_rights($cat_id,$read,$write,$calread,$calbook,$admin)
+	public static function set_rights($cat_id, $read, $write, $calread, $calbook, $admin)
 	{
 		// Clear cache
 		unset(self::$permissions[$cat_id]);
@@ -242,19 +242,19 @@ 
 		$calbookcat = $calbook ? $calbook : array();
 		$admincat = $admin ? $admin : array();
 
-		$GLOBALS['egw']->acl->delete_repository('resources','L' . $cat_id,false);
+		$GLOBALS['egw']->acl->delete_repository('resources', 'L'.$cat_id, false);
 
-		foreach(array_unique(array_merge($readcat, $writecat, $calreadcat, $calbookcat, $admincat)) as $account_id)
+		foreach (array_unique(array_merge($readcat, $writecat, $calreadcat, $calbookcat, $admincat)) as $account_id)
 		{
 			$rights = false;
-			$rights = in_array($account_id,$readcat) ? ($rights | Acl::READ) : false;
-			$rights = in_array($account_id,$writecat) ? ($rights | Acl::READ | Acl::ADD | Acl::EDIT | Acl::DELETE): $rights;
-			$rights = in_array($account_id,$calreadcat) ? ($rights | self::CAL_READ) : $rights;
-			$rights = in_array($account_id,$calbookcat) ? ($rights | self::DIRECT_BOOKING | self::CAL_READ) : $rights;
-			$rights = in_array($account_id,$admincat) ? ($rights = 511) : $rights;
+			$rights = in_array($account_id, $readcat) ? ($rights|Acl::READ) : false;
+			$rights = in_array($account_id, $writecat) ? ($rights|Acl::READ|Acl::ADD|Acl::EDIT|Acl::DELETE) : $rights;
+			$rights = in_array($account_id, $calreadcat) ? ($rights|self::CAL_READ) : $rights;
+			$rights = in_array($account_id, $calbookcat) ? ($rights|self::DIRECT_BOOKING|self::CAL_READ) : $rights;
+			$rights = in_array($account_id, $admincat) ? ($rights = 511) : $rights;
 			if ($rights)
 			{
-				$GLOBALS['egw']->acl->add_repository('resources','L'.$cat_id,$account_id,$rights);
+				$GLOBALS['egw']->acl->add_repository('resources', 'L'.$cat_id, $account_id, $rights);
 			}
 		}
 	}

resources/inc/class.resources_import_csv.inc.php

Doc Comments +2 added lines, -4 removed lines

@@ -28,9 +28,7 @@ 
 
 	/**
 	 * imports entries according to given definition object.
-	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function init(importexport_definition $_definition ) {
 
@@ -52,7 +50,7 @@ 
 	*
 	* Updates the count of actions taken
 	*
-	* @return boolean success
+	* @return null|boolean success
 	*/
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{

Indentation +17 added lines, -17 removed lines

@@ -45,15 +45,15 @@ 
 	}
 
 	/**
-	* Import a single record
-	*
-	* You don't need to worry about mappings or translations, they've been done already.
-	* You do need to handle the conditions and the actions taken.
-	*
-	* Updates the count of actions taken
-	*
-	* @return boolean success
-	*/
+	 * Import a single record
+	 *
+	 * You don't need to worry about mappings or translations, they've been done already.
+	 * You do need to handle the conditions and the actions taken.
+	 *
+	 * Updates the count of actions taken
+	 *
+	 * @return boolean success
+	 */
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
 		// Check for an un-matched accessory of, try again on just name
@@ -250,14 +250,14 @@ 
 	}
 
 	/**
-        * Returns warnings that were encountered during importing
-        * Maximum of one warning message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => warning message
-        *       )
-        */
-        public function get_warnings() {
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
+		public function get_warnings() {
 		return $this->warnings;
 	}
 }

Spacing +32 added lines, -32 removed lines

@@ -16,7 +16,7 @@ 
 /**
  * class to import resources from CSV
  */
-class resources_import_csv extends importexport_basic_import_csv  {
+class resources_import_csv extends importexport_basic_import_csv {
 
 
 	/**
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * imports entries according to given definition object.
@@ -32,7 +32,7 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition $_definition ) {
+	public function init(importexport_definition $_definition) {
 
 		// fetch the resource bo
 		$this->bo = new resources_bo();
@@ -54,33 +54,33 @@ 
 	*
 	* @return boolean success
 	*/
-	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
+	protected function import_record(importexport_iface_egw_record&$record, &$import_csv)
 	{
 		// Check for an un-matched accessory of, try again on just name
-		if(!is_numeric($record->accessory_of))
+		if (!is_numeric($record->accessory_of))
 		{
 			$accessory_of = $record->accessory_of;
 
 			// Look for exact match in just name
-			$results = $this->bo->so->search(array('name' => $record->accessory_of),array('res_id','name'));
-			if(count($results) >= 1)
+			$results = $this->bo->so->search(array('name' => $record->accessory_of), array('res_id', 'name'));
+			if (count($results) >= 1)
 			{
 				// More than 1 result?  Bad names.  Pick one.
-				foreach($results as $result)
+				foreach ($results as $result)
 				{
-					if($result['name'] == $record->accessory_of)
+					if ($result['name'] == $record->accessory_of)
 					{
 						$record->accessory_of = $result['res_id'];
 						break;
 					}
 				}
-				if(is_numeric($record->accessory_of))
+				if (is_numeric($record->accessory_of))
 				{
 					// Import/Export conversion gave a warning, so cancel it
-					$pattern = lang('Unable to link to %1 "%2"',lang('resources'),$accessory_of) . ' - ('.lang('too many matches') . '|'.lang('no matches') . ')';
+					$pattern = lang('Unable to link to %1 "%2"', lang('resources'), $accessory_of).' - ('.lang('too many matches').'|'.lang('no matches').')';
 					$this->warnings[$import_csv->get_current_position()] = preg_replace($pattern, '', $this->warnings[$import_csv->get_current_position()], 1);
 					// If that was the only warning, clear it for this row
-					if(trim($this->warnings[$import_csv->get_current_position()]) == '')
+					if (trim($this->warnings[$import_csv->get_current_position()]) == '')
 					{
 						unset($this->warnings[$import_csv->get_current_position()]);
 					}
@@ -92,7 +92,7 @@ 
 		// Check for a new category, it needs permissions set
 		$category = $GLOBALS['egw']->categories->read($record->cat_id);
 
-		if($category['last_mod'] >= $this->start_time) {
+		if ($category['last_mod'] >= $this->start_time) {
 			// New category.  Give read & write permissions to the current user's default group
 			$this->acl_bo->set_rights($record['cat_id'],
 				array($GLOBALS['egw_info']['user']['account_primary_group']),
@@ -104,37 +104,37 @@ 
 			// Refresh ACL
 			//$GLOBALS['egw']->acl->read_repository();
 		}
-		if(!$record->accessory_of) $record->accessory_of = -1;
+		if (!$record->accessory_of) $record->accessory_of = -1;
 		//error_log(__METHOD__.__LINE__.array2string($_definition->plugin_options['conditions']));
 		if ($this->definition->plugin_options['conditions']) {
 
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+			foreach ($this->definition->plugin_options['conditions'] as $condition) {
 				$results = array();
-				switch ( $condition['type'] ) {
+				switch ($condition['type']) {
 					// exists
 					case 'exists' :
-						if($record->{$condition['string']}) {
+						if ($record->{$condition['string']}) {
 							$results = $this->bo->so->search(
-								array( $condition['string'] => $record->{$condition['string']}),
+								array($condition['string'] => $record->{$condition['string']}),
 								False
 							);
 						}
 
-						if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+						if (is_array($results) && count(array_keys($results)) >= 1) {
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$results as $resource ) {
+							foreach ((array)$results as $resource) {
 								$record->res_id = $resource['res_id'];
-								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $resource['cat_id'] ) ) $resource['cat_id'] = explode( ',', $resource['cat_id'] );
-									if ( !is_array( $record->cat_id ) ) $record->cat_id = explode( ',', $record->cat_id );
-									$record->cat_id = implode( ',', array_unique( array_merge( $record->cat_id, $resource['cat_id'] ) ) );
+								if ($_definition->plugin_options['update_cats'] == 'add') {
+									if (!is_array($resource['cat_id'])) $resource['cat_id'] = explode(',', $resource['cat_id']);
+									if (!is_array($record->cat_id)) $record->cat_id = explode(',', $record->cat_id);
+									$record->cat_id = implode(',', array_unique(array_merge($record->cat_id, $resource['cat_id'])));
 								}
-								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+								$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 							}
 						} else {
 							$action = $condition['false'];
-							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+							$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 						}
 						break;
 
@@ -147,7 +147,7 @@ 
 			}
 		} else {
 			// unconditional insert
-			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+			$success = $this->action('insert', $record, $import_csv->get_current_position());
 		}
 		return $success;
 	}
@@ -159,7 +159,7 @@ 
 	 * @param importexport_iface_egw_record $record Entry record
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action($_action, importexport_iface_egw_record&$record, $record_num = 0) {
 		$_data = $record->get_record_array();
 		switch ($_action) {
 			case 'none' :
@@ -173,17 +173,17 @@ 
 
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if ($_action == 'insert') {
 					// Backend doesn't like inserting with ID specified, it can overwrite
 					unset($_data['res_id']);
 				}
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
 				} else {
-					$result = $this->bo->save( $_data );
-					if($result && !is_numeric($result)) {
+					$result = $this->bo->save($_data);
+					if ($result && !is_numeric($result)) {
 						$this->errors[$record_num] = $result;
 						return false;
 					} else {

Braces +70 added lines, -29 removed lines

@@ -16,7 +16,8 @@ 
 /**
  * class to import resources from CSV
  */
-class resources_import_csv extends importexport_basic_import_csv  {
+class resources_import_csv extends importexport_basic_import_csv
+{
 
 
 	/**
@@ -32,7 +33,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition $_definition ) {
+	public function init(importexport_definition $_definition )
+	{
 
 		// fetch the resource bo
 		$this->bo = new resources_bo();
@@ -92,7 +94,8 @@ 
 		// Check for a new category, it needs permissions set
 		$category = $GLOBALS['egw']->categories->read($record->cat_id);
 
-		if($category['last_mod'] >= $this->start_time) {
+		if($category['last_mod'] >= $this->start_time)
+		{
 			// New category.  Give read & write permissions to the current user's default group
 			$this->acl_bo->set_rights($record['cat_id'],
 				array($GLOBALS['egw_info']['user']['account_primary_group']),
@@ -104,35 +107,53 @@ 
 			// Refresh ACL
 			//$GLOBALS['egw']->acl->read_repository();
 		}
-		if(!$record->accessory_of) $record->accessory_of = -1;
+		if(!$record->accessory_of)
+		{
+			$record->accessory_of = -1;
+		}
 		//error_log(__METHOD__.__LINE__.array2string($_definition->plugin_options['conditions']));
-		if ($this->definition->plugin_options['conditions']) {
+		if ($this->definition->plugin_options['conditions'])
+		{
 
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+			foreach ( $this->definition->plugin_options['conditions'] as $condition )
+			{
 				$results = array();
-				switch ( $condition['type'] ) {
+				switch ( $condition['type'] )
+				{
 					// exists
 					case 'exists' :
-						if($record->{$condition['string']}) {
+						if($record->{$condition['string']})
+						{
 							$results = $this->bo->so->search(
 								array( $condition['string'] => $record->{$condition['string']}),
 								False
 							);
 						}
 
-						if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+						if ( is_array( $results ) && count( array_keys( $results )) >= 1)
+						{
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$results as $resource ) {
+							foreach ( (array)$results as $resource )
+							{
 								$record->res_id = $resource['res_id'];
-								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $resource['cat_id'] ) ) $resource['cat_id'] = explode( ',', $resource['cat_id'] );
-									if ( !is_array( $record->cat_id ) ) $record->cat_id = explode( ',', $record->cat_id );
+								if ( $_definition->plugin_options['update_cats'] == 'add' )
+								{
+									if ( !is_array( $resource['cat_id'] ) )
+									{
+										$resource['cat_id'] = explode( ',', $resource['cat_id'] );
+									}
+									if ( !is_array( $record->cat_id ) )
+									{
+										$record->cat_id = explode( ',', $record->cat_id );
+									}
 									$record->cat_id = implode( ',', array_unique( array_merge( $record->cat_id, $resource['cat_id'] ) ) );
 								}
 								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 							}
-						} else {
+						}
+						else
+						{
 							$action = $condition['false'];
 							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 						}
@@ -143,9 +164,14 @@ 
 						die('condition / action not supported!!!');
 						break;
 				}
-				if ($action['last']) break;
+				if ($action['last'])
+				{
+					break;
+				}
 			}
-		} else {
+		}
+		else
+		{
 			// unconditional insert
 			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 		}
@@ -159,9 +185,11 @@ 
 	 * @param importexport_iface_egw_record $record Entry record
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
+	{
 		$_data = $record->get_record_array();
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'update' :
@@ -173,20 +201,27 @@ 
 
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if($_action == 'insert')
+				{
 					// Backend doesn't like inserting with ID specified, it can overwrite
 					unset($_data['res_id']);
 				}
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
-				} else {
+				}
+				else
+				{
 					$result = $this->bo->save( $_data );
-					if($result && !is_numeric($result)) {
+					if($result && !is_numeric($result))
+					{
 						$this->errors[$record_num] = $result;
 						return false;
-					} else {
+					}
+					else
+					{
 						$this->results[$_action]++;
 						return true;
 					}
@@ -202,7 +237,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Resources CSV import');
 	}
 
@@ -211,7 +247,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports a list of resources from a CSV file.");
 	}
 
@@ -220,7 +257,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -236,7 +274,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -245,7 +284,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -257,7 +297,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 }

resources/inc/class.resources_so.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 *
 	 * @param string $key key of value to get
 	 * @param int $res_id resource id
-	 * @return mixed value of key and resource, false if key or id not found.
+	 * @return integer value of key and resource, false if key or id not found.
 	 */
 	function get_value($key,$res_id)
 	{

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;

Braces +8 added lines, -2 removed lines

@@ -51,7 +51,10 @@ 
 	 */
 	function read($res_id)
 	{
-		if (is_array($res_id) && count($res_id) == 1 && isset($res_id['res_id'])) $res_id = $res_id['res_id'];
+		if (is_array($res_id) && count($res_id) == 1 && isset($res_id['res_id']))
+		{
+			$res_id = $res_id['res_id'];
+		}
 
 		/*if (!is_array($res_id) && $res_id == $this->data['res_id'])
 		{
@@ -90,7 +93,10 @@ 
 	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;