EGroupware / egroupware

jdots/inc/class.jdots_framework.inc.php

Doc Comments +1 added lines, -5 removed lines

@@ -115,6 +115,7 @@ 
 	/**
 	 * Sets the sidebox width accoringly to the app_specific_sidebar_width setting, either
      * in the current application or globaly
+	 * @param integer $val
 	 */
 	private static function set_sidebar_width($app, $val)
 	{
@@ -427,11 +428,6 @@ 
 	/**
 	* Add menu items to the topmenu template class to be displayed
 	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
 	*/
 	function _add_topmenu_item(array $app_data,$alt_label=null)
 	{

Indentation +19 added lines, -19 removed lines

@@ -114,7 +114,7 @@ 
 
 	/**
 	 * Sets the sidebox width accoringly to the app_specific_sidebar_width setting, either
-     * in the current application or globaly
+	 * in the current application or globaly
 	 */
 	private static function set_sidebar_width($app, $val)
 	{
@@ -408,16 +408,16 @@ 
 	}
 
 	/**
-	* called by hooks to add an icon in the topmenu info location
-	*
-	* @param string $id unique element id
-	* @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
-	* @param string $iconlink where the icon links to
-	* @param booleon $blink set true to make the icon blink
-	* @param mixed $tooltip string containing the tooltip html, or null of no tooltip
-	* @todo implement in a reasonable way for jdots
-	* @return void
-	*/
+	 * called by hooks to add an icon in the topmenu info location
+	 *
+	 * @param string $id unique element id
+	 * @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
+	 * @param string $iconlink where the icon links to
+	 * @param booleon $blink set true to make the icon blink
+	 * @param mixed $tooltip string containing the tooltip html, or null of no tooltip
+	 * @todo implement in a reasonable way for jdots
+	 * @return void
+	 */
 	function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null)
 	{
 		unset($id,$icon_src,$iconlink,$blink,$tooltip);	// not used
@@ -425,14 +425,14 @@ 
 	}
 
 	/**
-	* Add menu items to the topmenu template class to be displayed
-	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
-	*/
+	 * Add menu items to the topmenu template class to be displayed
+	 *
+	 * @param array $app application data
+	 * @param mixed $alt_label string with alternative menu item label default value = null
+	 * @param string $urlextra string with alternate additional code inside <a>-tag
+	 * @access protected
+	 * @return void
+	 */
 	function _add_topmenu_item(array $app_data,$alt_label=null)
 	{
 		switch($app_data['name'])

Spacing +80 added lines, -80 removed lines

@@ -50,11 +50,11 @@ 
 	 *
 	 * @param string $template = 'idots' 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
 
-		$this->template_dir = '/'.$template;		// we are packaged as an application
+		$this->template_dir = '/'.$template; // we are packaged as an application
 	}
 
 	/**
@@ -132,16 +132,16 @@ 
 	public static function app_from_url($url)
 	{
 		$matches = null;
-		if (preg_match('/menuaction=([a-z0-9_-]+)\./i',$url,$matches))
+		if (preg_match('/menuaction=([a-z0-9_-]+)\./i', $url, $matches))
 		{
 			return $matches[1];
 		}
 		if ($GLOBALS['egw_info']['server']['webserver_url'] &&
-			($webserver_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'],PHP_URL_PATH)))
+			($webserver_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'], PHP_URL_PATH)))
 		{
-			list(,$url) = explode($webserver_path, parse_url($url,PHP_URL_PATH),2);
+			list(,$url) = explode($webserver_path, parse_url($url, PHP_URL_PATH), 2);
 		}
-		if (preg_match('/\/([^\/]+)\/([^\/]+\.php)?(\?|\/|$)/',$url,$matches))
+		if (preg_match('/\/([^\/]+)\/([^\/]+\.php)?(\?|\/|$)/', $url, $matches))
 		{
 			return $matches[1];
 		}
@@ -157,7 +157,7 @@ 
 	 * @param string $link_app = null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function link($url = '', $extravars = '', $link_app=null)
+	static function link($url = '', $extravars = '', $link_app = null)
 	{
 		if (is_null($link_app)) $link_app = self::$link_app;
 		$link = parent::link($url, $extravars);
@@ -168,7 +168,7 @@ 
 			// Link gets handled in JS, so quotes need slashes as well as url-encoded
 			// encoded ampersands in get parameters (%26) need to be encoded twise,
 			// so they are still encoded when assigned to window.location
-			$link_with_slashes = str_replace(array('%27','%26'), array('\%27','%2526'), $link);
+			$link_with_slashes = str_replace(array('%27', '%26'), array('\%27', '%2526'), $link);
 
 			//$link = "javascript:window.egw_link_handler?egw_link_handler('$link','$link_app'):parent.egw_link_handler('$link','$link_app');";
 			$link = "javascript:egw_link_handler('$link_with_slashes','$link_app')";
@@ -187,12 +187,12 @@ 
 		$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']);
 		// use active tab or header, beside sidebox
-		if (($use_active_tab = $color[0] == '@')) $color = substr($color,1);
+		if (($use_active_tab = $color[0] == '@')) $color = substr($color, 1);
 
-		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
 		{
 			$ret['app_css'] .= "
 /**
@@ -234,7 +234,7 @@ 
 	protected function _get_csp_frame_src()
 	{
 		$srcs = array();
-		foreach($GLOBALS['egw']->hooks->process('csp-frame-src') as $src)
+		foreach ($GLOBALS['egw']->hooks->process('csp-frame-src') as $src)
 		{
 			if ($src) $srcs = array_merge($srcs, $src);
 		}
@@ -247,7 +247,7 @@ 
 	 * @param array $extra = array() extra attributes passed as data-attribute to egw.js
 	 * @return string with html
 	 */
-	function header(array $extra=array())
+	function header(array $extra = array())
 	{
 		// make sure header is output only once
 		if (self::$header_done) return '';
@@ -272,8 +272,8 @@ 
 		{
 			$this->tpl->set_file(array('_head' => 'head.tpl'));
 		}
-		$this->tpl->set_block('_head','head');
-		$this->tpl->set_block('_head','framework');
+		$this->tpl->set_block('_head', 'head');
+		$this->tpl->set_block('_head', 'framework');
 
 		// should we draw the framework, or just a header
 		$do_framework = isset($_GET['cd']) && $_GET['cd'] === 'yes';
@@ -290,7 +290,7 @@ 
 		{
 			//echo __METHOD__.__LINE__.' do framework ...'.'<br>';
 			// framework javascript classes only need for framework
-			self::validate_file('jquery','jquery-ui');
+			self::validate_file('jquery', 'jquery-ui');
 			self::validate_file('framework', 'fw', self::JS_INCLUDE_APP);
 			self::validate_file('framework', 'fw_browser', self::JS_INCLUDE_APP);
 			self::validate_file('framework', 'fw_ui', self::JS_INCLUDE_APP);
@@ -303,12 +303,12 @@ 
 				self::validate_file('.', 'fw_'.static::APP, static::JS_INCLUDE_APP);
 			}
 			self::validate_file('.', 'egw_fw_classes', self::JS_INCLUDE_APP);
-			self::validate_file('.','etemplate2','etemplate');
+			self::validate_file('.', 'etemplate2', 'etemplate');
 
 			// Need to load this here to get enhanced selectboxes working
 			self::validate_file('/phpgwapi/js/jquery/chosen/chosen.jquery.js');
 
-			egw_cache::unsetSession(__CLASS__,'sidebox_md5');	// sideboxes need to be send again
+			egw_cache::unsetSession(__CLASS__, 'sidebox_md5'); // sideboxes need to be send again
 
 			// load jscalendar for calendar users
 			if ($GLOBALS['egw_info']['user']['apps']['calendar'])
@@ -318,7 +318,7 @@ 
 			// load dhtmlxtree for pm or email users
 			if ($GLOBALS['egw_info']['user']['apps']['projectmanager'] || $GLOBALS['egw_info']['user']['apps']['felamimail'])
 			{
-				$GLOBALS['egw_info']['flags']['java_script'] .= html::tree(null,null);
+				$GLOBALS['egw_info']['flags']['java_script'] .= html::tree(null, null);
 			}
 			$extra['navbar-apps'] = $this->get_navbar_apps($_SERVER['REQUEST_URI']);
 		}
@@ -327,7 +327,7 @@ 
 		// - if not we need to check if we have an opener (are a popup window)
 		// - as popups can open further popups, we need to decend all the way down until we find a framework
 		// - only if we cant find a framework in all openers, we redirect to create a new framework
-		if(!$do_framework)
+		if (!$do_framework)
 		{
 			// fetch sidebox from application and set it in extra data, if we are no popup
 			if (!$GLOBALS['egw_info']['flags']['nonavbar'])
@@ -337,12 +337,12 @@ 
 			// for remote manual never check/create framework
 			if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('manual', 'login', 'logout', 'sitemgr')))
 			{
-				if (empty($GLOBALS['egw_info']['flags']['java_script'])) $GLOBALS['egw_info']['flags']['java_script']='';
+				if (empty($GLOBALS['egw_info']['flags']['java_script'])) $GLOBALS['egw_info']['flags']['java_script'] = '';
 				$extra['check-framework'] = $_GET['cd'] !== 'no';
 			}
 		}
 		$this->tpl->set_var($this->_get_header($extra));
-		$content = $this->tpl->fp('out','head').$content;
+		$content = $this->tpl->fp('out', 'head').$content;
 
 		if (!$do_framework)
 		{
@@ -351,10 +351,10 @@ 
 
 		// topmenu
 		$vars = $this->_get_navbar($apps = $this->_get_navbar_apps());
-		$this->tpl->set_var($this->topmenu($vars,$apps));
+		$this->tpl->set_var($this->topmenu($vars, $apps));
 
 		// hook after_navbar (eg. notifications)
-		$this->tpl->set_var('hook_after_navbar',$this->_get_after_navbar());
+		$this->tpl->set_var('hook_after_navbar', $this->_get_after_navbar());
 
 		//Global sidebar width
 		$this->tpl->set_var('sidebox_width', self::get_global_sidebar_width());
@@ -371,7 +371,7 @@ 
 
 		// add framework div's
 		$this->tpl->set_var($this->_get_footer());
-		$content .= $this->tpl->fp('out','framework');
+		$content .= $this->tpl->fp('out', 'framework');
 		$content .= self::footer(false);
 
 		echo $content;
@@ -390,14 +390,14 @@ 
 	 * @param array $apps
 	 * @return array
 	 */
-	function topmenu(array $vars,array $apps)
+	function topmenu(array $vars, array $apps)
 	{
 		$this->topmenu_items = $this->topmenu_info_items = array();
 
-		parent::topmenu($vars,$apps);
-		$vars['topmenu_items'] = "<ul>\n<li>".implode("</li>\n<li>",$this->topmenu_items)."</li>\n</ul>";
+		parent::topmenu($vars, $apps);
+		$vars['topmenu_items'] = "<ul>\n<li>".implode("</li>\n<li>", $this->topmenu_items)."</li>\n</ul>";
 		$vars['topmenu_info_items'] = '';
-		foreach($this->topmenu_info_items as $id => $item)
+		foreach ($this->topmenu_info_items as $id => $item)
 		{
 			$vars['topmenu_info_items'] .= '<div class="topmenu_info_item"'.
 				(is_numeric($id) ? '' : ' id="topmenu_info_'.$id.'"').'>'.$item."</div>\n";
@@ -418,9 +418,9 @@ 
 	* @todo implement in a reasonable way for jdots
 	* @return void
 	*/
-	function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null)
+	function topmenu_info_icon($id, $icon_src, $iconlink, $blink = false, $tooltip = null)
 	{
-		unset($id,$icon_src,$iconlink,$blink,$tooltip);	// not used
+		unset($id, $icon_src, $iconlink, $blink, $tooltip); // not used
 		// not yet implemented, only used in admin/inc/hook_topmenu_info.inc.php to notify about pending updates
 	}
 
@@ -433,9 +433,9 @@ 
 	* @access protected
 	* @return void
 	*/
-	function _add_topmenu_item(array $app_data,$alt_label=null)
+	function _add_topmenu_item(array $app_data, $alt_label = null)
 	{
-		switch($app_data['name'])
+		switch ($app_data['name'])
 		{
 			case 'logout':
 				if (html::$ua_mobile || $GLOBALS['egw_info']['user']['preferences']['common']['theme'] == 'mobile')
@@ -444,7 +444,7 @@ 
 				}
 				else
 				{
-					return;	// no need for logout in topmenu on jdots
+					return; // no need for logout in topmenu on jdots
 				}
 				break;
 
@@ -453,7 +453,7 @@ 
 				break;
 
 			default:
-				if (strpos($app_data['url'],'logout.php') === false && substr($app_data['url'], 0, 11) != 'javascript:')
+				if (strpos($app_data['url'], 'logout.php') === false && substr($app_data['url'], 0, 11) != 'javascript:')
 				{
 					$app_data['url'] = "javascript:egw_link_handler('".$app_data['url']."','".
 						(isset($GLOBALS['egw_info']['user']['apps'][$app_data['name']]) ?
@@ -463,7 +463,7 @@ 
 		$id = $app_data['id'] ? $app_data['id'] : ($app_data['name'] ? $app_data['name'] : $app_data['title']);
 		$title = html::$ua_mobile || $GLOBALS['egw_info']['user']['preferences']['common']['theme'] == 'mobile'
 			? '' : htmlspecialchars($alt_label ? $alt_label : $app_data['title']);
-		$this->topmenu_items[] = '<a id="topmenu_' . $id . '" href="'.htmlspecialchars($app_data['url']).'" title="'.$app_data['title'].'">'.$title.'</a>';
+		$this->topmenu_items[] = '<a id="topmenu_'.$id.'" href="'.htmlspecialchars($app_data['url']).'" title="'.$app_data['title'].'">'.$title.'</a>';
 	}
 
 	/**
@@ -474,11 +474,11 @@ 
 	 * @access protected
 	 * @return void
 	 */
-	function _add_topmenu_info_item($content, $id=null)
+	function _add_topmenu_info_item($content, $id = null)
 	{
-		if(strpos($content,'menuaction=admin.admin_accesslog.sessions') !== false)
+		if (strpos($content, 'menuaction=admin.admin_accesslog.sessions') !== false)
 		{
-			$content = preg_replace('/href="([^"]+)"/',"href=\"javascript:egw_link_handler('\\1','admin')\"",$content);
+			$content = preg_replace('/href="([^"]+)"/', "href=\"javascript:egw_link_handler('\\1','admin')\"", $content);
 		}
 		if ($id)
 		{
@@ -497,10 +497,10 @@ 
 	 */
 	function ajax_tz_selection($tz)
 	{
-		egw_time::setUserPrefs($tz);	// throws exception, if tz is invalid
+		egw_time::setUserPrefs($tz); // throws exception, if tz is invalid
 
 		$GLOBALS['egw']->preferences->read_repository();
-		$GLOBALS['egw']->preferences->add('common','tz',$tz);
+		$GLOBALS['egw']->preferences->add('common', 'tz', $tz);
 		$GLOBALS['egw']->preferences->save_repository();
 	}
 
@@ -552,13 +552,13 @@ 
 		// only send admin sidebox, for admin index url (when clicked on admin),
 		// not for other admin pages, called eg. from sidebox menu of other apps
 		// --> that way we always stay in the app, and NOT open admin sidebox for an app tab!!!
-		if ($app == 'admin' && substr($_SERVER['PHP_SELF'],-16) != '/admin/index.php' &&
+		if ($app == 'admin' && substr($_SERVER['PHP_SELF'], -16) != '/admin/index.php' &&
 			$_GET['menuaction'] != 'admin.admin_ui.index')
 		{
 			//error_log(__METHOD__."() app=$app, menuaction=$_GET[menuaction], PHP_SELF=$_SERVER[PHP_SELF] --> sidebox request ignored");
 			return;
 		}
-		$md5_session =& egw_cache::getSession(__CLASS__,'sidebox_md5');
+		$md5_session = & egw_cache::getSession(__CLASS__, 'sidebox_md5');
 
 		//Set the sidebox content
 		$sidebox = $this->get_sidebox($app);
@@ -567,7 +567,7 @@ 
 		if ($md5_session[$app] !== $md5)
 		{
 			//error_log(__METHOD__."() header changed md5_session[$app]!=='$md5' --> setting it on egw_framework::\$extra[setSidebox]");
-			$md5_session[$app] = $md5;	// update md5 in session
+			$md5_session[$app] = $md5; // update md5 in session
 			egw_framework::$extra['setSidebox'] = array($app, $sidebox, $md5);
 		}
 		//else error_log(__METHOD__."() md5_session[$app]==='$md5' --> nothing to do");
@@ -581,9 +581,9 @@ 
 	 * @return boolean $consider_navbar_not_yet_called_as_true=true ignored by jdots, we only care for cd=yes GET param
 	 * @return boolean
 	 */
-	public function isTop($consider_navbar_not_yet_called_as_true=true)
+	public function isTop($consider_navbar_not_yet_called_as_true = true)
 	{
-		unset($consider_navbar_not_yet_called_as_true);	// not used
+		unset($consider_navbar_not_yet_called_as_true); // not used
 		return isset($_GET['cd']) && $_GET['cd'] === 'yes';
 	}
 
@@ -609,7 +609,7 @@ 
 	 * @param array $file
 	 * @param string $type = null 'admin', 'preferences', 'favorites', ...
 	 */
-	public function sidebox($appname,$menu_title,$file,$type=null)
+	public function sidebox($appname, $menu_title, $file, $type = null)
 	{
 		if (!isset($file['menuOpened'])) $file['menuOpened'] = (boolean)$this->sidebox_menu_opened;
 		//error_log(__METHOD__."('$appname', '$menu_title', file[menuOpened]=$file[menuOpened], ...) this->sidebox_menu_opened=$this->sidebox_menu_opened");
@@ -619,7 +619,7 @@ 
 		if (($type == 'admin' || $menu_title == lang('Admin')) && $appname != 'admin')
 		{
 			$file = preg_replace("/^(javascript:egw_link_handler\(')(.*)menuaction=([^&]+)(.*)(','[^']+'\))$/",
-				'$1$2menuaction=admin.admin_ui.index&load=$3$4&ajax=true\',\'admin\')', $file_was=$file);
+				'$1$2menuaction=admin.admin_ui.index&load=$3$4&ajax=true\',\'admin\')', $file_was = $file);
 		}
 
 		$this->sideboxes[$appname][$menu_title] = $file;
@@ -654,15 +654,15 @@ 
 			self::$link_app = $appname;
 			// allow other apps to hook into sidebox menu of an app, hook-name: sidebox_$appname
 			$this->sidebox_menu_opened = true;
-			$GLOBALS['egw']->hooks->process('sidebox_'.$appname,array($appname),true);	// true = call independent of app-permissions
+			$GLOBALS['egw']->hooks->process('sidebox_'.$appname, array($appname), true); // true = call independent of app-permissions
 
 			// calling the old hook
 			$this->sidebox_menu_opened = true;
-			$GLOBALS['egw']->hooks->single('sidebox_menu',$appname);
+			$GLOBALS['egw']->hooks->single('sidebox_menu', $appname);
 			self::$link_app = null;
 
 			// allow other apps to hook into sidebox menu of every app: sidebox_all
-			$GLOBALS['egw']->hooks->process('sidebox_all',array($GLOBALS['egw_info']['flags']['currentapp']),true);
+			$GLOBALS['egw']->hooks->process('sidebox_all', array($GLOBALS['egw_info']['flags']['currentapp']), true);
 		}
 		//If there still is no sidebox content, return null here
 		if (!isset($this->sideboxes[$appname]))
@@ -671,17 +671,17 @@ 
 		}
 
 		$data = array();
-		foreach($this->sideboxes[$appname] as $menu_name => &$file)
+		foreach ($this->sideboxes[$appname] as $menu_name => &$file)
 		{
 			$current_menu = array(
-				'menu_name' => md5($menu_name),	// can contain html tags and javascript!
+				'menu_name' => md5($menu_name), // can contain html tags and javascript!
 				'title' => $menu_name,
 				'entries' => array(),
 				'opened' => (boolean)$file['menuOpened'],
 			);
-			foreach($file as $item_text => $item_link)
+			foreach ($file as $item_text => $item_link)
 			{
-				if ($item_text === 'menuOpened' ||	// flag, not menu entry
+				if ($item_text === 'menuOpened' || // flag, not menu entry
 					$item_text === '_NewLine_' || $item_link === '_NewLine_')
 				{
 					continue;
@@ -692,14 +692,14 @@ 
 				}
 
 				$var = array();
-				$var['icon_or_star'] = $GLOBALS['egw_info']['server']['webserver_url'] . $this->template_dir.'/images/bullet.png';
+				$var['icon_or_star'] = $GLOBALS['egw_info']['server']['webserver_url'].$this->template_dir.'/images/bullet.png';
 				$var['target'] = '';
-				if(is_array($item_link))
+				if (is_array($item_link))
 				{
-					if(isset($item_link['icon']))
+					if (isset($item_link['icon']))
 					{
 						$app = isset($item_link['app']) ? $item_link['app'] : $appname;
-						$var['icon_or_star'] = $item_link['icon'] ? common::image($app,$item_link['icon']) : False;
+						$var['icon_or_star'] = $item_link['icon'] ? common::image($app, $item_link['icon']) : False;
 					}
 					$var['lang_item'] = isset($item_link['no_lang']) && $item_link['no_lang'] ? $item_link['text'] : lang($item_link['text']);
 					$var['item_link'] = $item_link['link'];
@@ -735,7 +735,7 @@ 
 	public function ajax_tab_changed_state($tablist)
 	{
 		$tabs = array();
-		foreach($tablist as $data)
+		foreach ($tablist as $data)
 		{
 			$tabs[] = $data['appName'];
 			if ($data['active']) $active = $data['appName'];
@@ -744,7 +744,7 @@ 
 		// used eg. in phpFreeChat to leave the chat
 		if (($old_tabs = egw_cache::getSession(__CLASS__, 'open_tabs')))
 		{
-			foreach(array_diff(explode(',',$old_tabs),$tabs) as $app)
+			foreach (array_diff(explode(',', $old_tabs), $tabs) as $app)
 			{
 				//error_log("Tab '$app' closed, old_tabs=$old_tabs");
 				$GLOBALS['egw']->hooks->single(array(
@@ -753,7 +753,7 @@ 
 				), $app);
 			}
 		}
-		$open = implode(',',$tabs);
+		$open = implode(',', $tabs);
 
 		if ($open != $GLOBALS['egw_info']['user']['preferences']['common']['open_tabs'] ||
 			$active != $GLOBALS['egw_info']['user']['preferences']['common']['active_tab'])
@@ -820,7 +820,7 @@ 
 		$i = 0;
 
 		//Parse the "$apps" array for valid content (security)
-		foreach($apps as $app)
+		foreach ($apps as $app)
 		{
 			//Check whether the app really exists and add it to the $app_arr var
 			if ($GLOBALS['egw_info']['user']['apps'][$app])
@@ -880,7 +880,7 @@ 
 	 */
 	public function navbar_apps()
 	{
-		$apps = parent::_get_navbar_apps(common::svg_usable());	// use svg if usable in browser
+		$apps = parent::_get_navbar_apps(common::svg_usable()); // use svg if usable in browser
 		//$apps += $this->jdots_remote_apps();	currently not used/usable
 
 		//Add its sidebox width to each app
@@ -888,10 +888,10 @@ 
 		{
 			$data['sideboxwidth'] = self::get_sidebar_width($app);
 			// overwrite icon with svg, if supported by browser
-			unset($data['icon_hover']);	// not used in jdots
+			unset($data['icon_hover']); // not used in jdots
 		}
 
-		unset($apps['logout']);	// never display it
+		unset($apps['logout']); // never display it
 		if (isset($apps['about'])) $apps['about']['noNavbar'] = true;
 		if (isset($apps['preferences'])) $apps['preferences']['noNavbar'] = true;
 		if (isset($apps['manual'])) $apps['manual']['noNavbar'] = true;
@@ -940,7 +940,7 @@ 
 		}
 
 		// check if user called a specific url --> open it as active tab
-		$last_direct_url =& egw_cache::getSession(__CLASS__, 'last_direct_url');
+		$last_direct_url = & egw_cache::getSession(__CLASS__, 'last_direct_url');
 		if ($url !== $last_direct_url)
 		{
 			$active_tab = $url_tab = self::app_from_url($url);
@@ -953,9 +953,9 @@ 
 		if ($active_tab && array_key_exists($active_tab, $apps))
 		{
 			// Do not remove cd=yes if it's an ajax=true app
-			if (strpos( $apps[$active_tab]['url'],'ajax=true') !== False)
+			if (strpos($apps[$active_tab]['url'], 'ajax=true') !== False)
 			{
-				$url = preg_replace('/[&?]cd=yes/','',$url);
+				$url = preg_replace('/[&?]cd=yes/', '', $url);
 			}
 			$apps[$active_tab]['openOnce'] = $url;
 			$store_prefs = true;
@@ -970,8 +970,8 @@ 
 		{
 			$open_tabs = $GLOBALS['egw_info']['user']['preferences']['common']['open_tabs'];
 		}
-		$open_tabs = $open_tabs ? explode(',',$open_tabs) : array();
-		if ($active_tab && !in_array($active_tab,$open_tabs))
+		$open_tabs = $open_tabs ? explode(',', $open_tabs) : array();
+		if ($active_tab && !in_array($active_tab, $open_tabs))
 		{
 			$open_tabs[] = $active_tab;
 			$store_prefs = true;
@@ -979,14 +979,14 @@ 
 		if ($store_prefs)
 		{
 			$GLOBALS['egw']->preferences->read_repository();
-			$GLOBALS['egw']->preferences->change('common', 'open_tabs', implode(',',$open_tabs));
+			$GLOBALS['egw']->preferences->change('common', 'open_tabs', implode(',', $open_tabs));
 			$GLOBALS['egw']->preferences->change('common', 'active_tab', $active_tab);
 			$GLOBALS['egw']->preferences->save_repository(true);
 		}
 
 		//error_log(__METHOD__."('$url') url_tab='$url_tab', active_tab=$active_tab, open_tabs=".array2string($open_tabs));
 		// Restore Tabs
-		foreach($open_tabs as $n => $app)
+		foreach ($open_tabs as $n => $app)
 		{
 			if (isset($apps[$app]))		// user might no longer have app rights
 			{
@@ -1013,10 +1013,10 @@ 
 	 * @param boolean $no_framework = true
 	 * @return string
 	 */
-	function footer($no_framework=true)
+	function footer($no_framework = true)
 	{
 		//error_log(__METHOD__."($no_framework) footer_done=".array2string(self::$footer_done).' '.function_backtrace());
-		if (self::$footer_done) return;	// prevent (multiple) footers
+		if (self::$footer_done) return; // prevent (multiple) footers
 		self::$footer_done = true;
 
 		if (!isset($GLOBALS['egw_info']['flags']['nofooter']) || !$GLOBALS['egw_info']['flags']['nofooter'])
@@ -1028,7 +1028,7 @@ 
 			}
 		}
 		return $footer.
-			$GLOBALS['egw_info']['flags']['need_footer']."\n".	// eg. javascript, which need to be at the end of the page
+			$GLOBALS['egw_info']['flags']['need_footer']."\n".// eg. javascript, which need to be at the end of the page
 			"</body>\n</html>\n";
 	}
 
@@ -1066,14 +1066,14 @@ 
 		if ($parts['query'])
 		{
 			$_SERVER['REQUEST_URI'] = '?'.$parts['query'];
-			parse_str($parts['query'],$_GET);
+			parse_str($parts['query'], $_GET);
 		}
 
 		if (!isset($_GET['menuaction']))
 		{
 			throw new egw_exception_wrong_parameter(__METHOD__."('$link') no menuaction set!");
 		}
-		list($app,$class,$method) = explode('.',$_GET['menuaction']);
+		list($app, $class, $method) = explode('.', $_GET['menuaction']);
 
 		if (!isset($GLOBALS['egw_info']['user']['apps'][$app]))
 		{
@@ -1085,7 +1085,7 @@ 
 
 		$GLOBALS[$class] = $obj = CreateObject($app.'.'.$class);
 
-		if(!is_array($obj->public_functions) || !$obj->public_functions[$method])
+		if (!is_array($obj->public_functions) || !$obj->public_functions[$method])
 		{
 			throw new egw_exception_no_permission("Bad menuaction {$_GET['menuaction']}, not listed in public_functions!");
 		}

Braces +64 added lines, -16 removed lines

@@ -97,7 +97,9 @@ 
 
 		//Width may not be smaller than MIN_SIDEBAR_WIDTH
 		if ($width < self::MIN_SIDEBAR_WIDTH)
-			$width = self::MIN_SIDEBAR_WIDTH;
+		{
+					$width = self::MIN_SIDEBAR_WIDTH;
+		}
 
 		return $width;
 	}
@@ -159,7 +161,10 @@ 
 	 */
 	static function link($url = '', $extravars = '', $link_app=null)
 	{
-		if (is_null($link_app)) $link_app = self::$link_app;
+		if (is_null($link_app))
+		{
+			$link_app = self::$link_app;
+		}
 		$link = parent::link($url, $extravars);
 
 		// $link_app === true --> detect application, otherwise use given application
@@ -190,9 +195,14 @@ 
 		$color = str_replace('custom',$GLOBALS['egw_info']['user']['preferences']['common']['template_custom_color'],
 			$GLOBALS['egw_info']['user']['preferences']['common']['template_color']);
 		// use active tab or header, beside sidebox
-		if (($use_active_tab = $color[0] == '@')) $color = substr($color,1);
+		if (($use_active_tab = $color[0] == '@'))
+		{
+			$color = substr($color,1);
+		}
 
-		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
 		{
 			$ret['app_css'] .= "
 /**
@@ -221,6 +231,7 @@ 
 	background-color: $color;
 }");
 		}
+		}
 		return $ret;
 	}
 
@@ -236,7 +247,10 @@ 
 		$srcs = array();
 		foreach($GLOBALS['egw']->hooks->process('csp-frame-src') as $src)
 		{
-			if ($src) $srcs = array_merge($srcs, $src);
+			if ($src)
+			{
+				$srcs = array_merge($srcs, $src);
+			}
 		}
 		return $srcs;
 	}
@@ -250,7 +264,10 @@ 
 	function header(array $extra=array())
 	{
 		// make sure header is output only once
-		if (self::$header_done) return '';
+		if (self::$header_done)
+		{
+			return '';
+		}
 		self::$header_done = true;
 
 		$this->send_headers();
@@ -337,7 +354,10 @@ 
 			// for remote manual never check/create framework
 			if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('manual', 'login', 'logout', 'sitemgr')))
 			{
-				if (empty($GLOBALS['egw_info']['flags']['java_script'])) $GLOBALS['egw_info']['flags']['java_script']='';
+				if (empty($GLOBALS['egw_info']['flags']['java_script']))
+				{
+					$GLOBALS['egw_info']['flags']['java_script']='';
+				}
 				$extra['check-framework'] = $_GET['cd'] !== 'no';
 			}
 		}
@@ -611,7 +631,10 @@ 
 	 */
 	public function sidebox($appname,$menu_title,$file,$type=null)
 	{
-		if (!isset($file['menuOpened'])) $file['menuOpened'] = (boolean)$this->sidebox_menu_opened;
+		if (!isset($file['menuOpened']))
+		{
+			$file['menuOpened'] = (boolean)$this->sidebox_menu_opened;
+		}
 		//error_log(__METHOD__."('$appname', '$menu_title', file[menuOpened]=$file[menuOpened], ...) this->sidebox_menu_opened=$this->sidebox_menu_opened");
 		$this->sidebox_menu_opened = false;
 
@@ -738,7 +761,10 @@ 
 		foreach($tablist as $data)
 		{
 			$tabs[] = $data['appName'];
-			if ($data['active']) $active = $data['appName'];
+			if ($data['active'])
+			{
+				$active = $data['appName'];
+			}
 		}
 		// send app a notification, that it's tab got closed
 		// used eg. in phpFreeChat to leave the chat
@@ -892,10 +918,22 @@ 
 		}
 
 		unset($apps['logout']);	// never display it
-		if (isset($apps['about'])) $apps['about']['noNavbar'] = true;
-		if (isset($apps['preferences'])) $apps['preferences']['noNavbar'] = true;
-		if (isset($apps['manual'])) $apps['manual']['noNavbar'] = true;
-		if (isset($apps['home'])) $apps['home']['noNavbar'] = true;
+		if (isset($apps['about']))
+		{
+			$apps['about']['noNavbar'] = true;
+		}
+		if (isset($apps['preferences']))
+		{
+			$apps['preferences']['noNavbar'] = true;
+		}
+		if (isset($apps['manual']))
+		{
+			$apps['manual']['noNavbar'] = true;
+		}
+		if (isset($apps['home']))
+		{
+			$apps['home']['noNavbar'] = true;
+		}
 
 		// no need for website icon, if we have sitemgr
 		if (isset($apps['sitemgr']) && isset($apps['sitemgr-link']))
@@ -963,7 +1001,10 @@ 
 		else
 		{
 			$active_tab = $GLOBALS['egw_info']['user']['preferences']['common']['active_tab'];
-			if (!$active_tab) $active_tab = $default_app;
+			if (!$active_tab)
+			{
+				$active_tab = $default_app;
+			}
 		}
 		// if we have the open tabs in the session, use it instead the maybe forced common prefs open_tabs
 		if (!($open_tabs = egw_cache::getSession(__CLASS__, 'open_tabs')))
@@ -988,9 +1029,12 @@ 
 		// Restore Tabs
 		foreach($open_tabs as $n => $app)
 		{
-			if (isset($apps[$app]))		// user might no longer have app rights
+			if (isset($apps[$app]))
+			{
+				// user might no longer have app rights
 			{
 				$apps[$app]['opened'] = $n;
+			}
 				if ($app == $active_tab)
 				{
 					$apps[$app]['active'] = true;
@@ -1016,7 +1060,11 @@ 
 	function footer($no_framework=true)
 	{
 		//error_log(__METHOD__."($no_framework) footer_done=".array2string(self::$footer_done).' '.function_backtrace());
-		if (self::$footer_done) return;	// prevent (multiple) footers
+		if (self::$footer_done)
+		{
+			return;
+		}
+		// prevent (multiple) footers
 		self::$footer_done = true;
 
 		if (!isset($GLOBALS['egw_info']['flags']['nofooter']) || !$GLOBALS['egw_info']['flags']['nofooter'])

mail/inc/class.mail_activesync.inc.php

Doc Comments +3 added lines, -10 removed lines

@@ -309,13 +309,7 @@ 
      * the new message as any other new message in a folder.
      *
      * @param string $rfc822 mail
-     * @param array $smartdata=array() values for keys:
-     * 	'task': 'forward', 'new', 'reply'
-     *  'itemid': id of message if it's an reply or forward
-     *  'folderid': folder
-     *  'replacemime': false = send as is, false = decode and recode for whatever reason ???
-	 *	'saveinsentitems': 1 or absent?
-     * @param boolean|double $protocolversion=false
+     * @param boolean|double $protocolversion
      * @return boolean true on success, false on error
      *
      * @see eg. BackendIMAP::SendMail()
@@ -1762,7 +1756,7 @@ 
 	 * @param string $displayname => new folder name (to be created, or to be renamed to)
 	 * @param string $type folder type, ignored in IMAP
 	 *
-	 * @return array|boolean stat array or false on error
+	 * @return boolean stat array or false on error
 	 */
 	public function ChangeFolder($id, $oldid, $displayname, $type)
 	{
@@ -1777,7 +1771,7 @@ 
 	 * @param string $id of the folder to delete
 	 *
 	 * @return
-	 * @TODO check what is to be returned
+	 boolean @TODO check what is to be returned
 	 */
 	public function DeleteFolder($parentid, $id)
 	{
@@ -1811,7 +1805,6 @@ 
 	 *
 	 * @param int $account mail account id
 	 * @param string $folder
-	 * @param int $id=0
 	 * @return string
 	 * @throws egw_exception_wrong_parameter
 	 */

Indentation +60 added lines, -60 removed lines

@@ -300,28 +300,28 @@ 
 		return $folderlist;
 	}
 
-    /**
-     * Sends a message which is passed as rfc822. You basically can do two things
-     * 1) Send the message to an SMTP server as-is
-     * 2) Parse the message yourself, and send it some other way
-     * It is up to you whether you want to put the message in the sent items folder. If you
-     * want it in 'sent items', then the next sync on the 'sent items' folder should return
-     * the new message as any other new message in a folder.
-     *
-     * @param string $rfc822 mail
-     * @param array $smartdata=array() values for keys:
-     * 	'task': 'forward', 'new', 'reply'
-     *  'itemid': id of message if it's an reply or forward
-     *  'folderid': folder
-     *  'replacemime': false = send as is, false = decode and recode for whatever reason ???
+	/**
+	 * Sends a message which is passed as rfc822. You basically can do two things
+	 * 1) Send the message to an SMTP server as-is
+	 * 2) Parse the message yourself, and send it some other way
+	 * It is up to you whether you want to put the message in the sent items folder. If you
+	 * want it in 'sent items', then the next sync on the 'sent items' folder should return
+	 * the new message as any other new message in a folder.
+	 *
+	 * @param string $rfc822 mail
+	 * @param array $smartdata=array() values for keys:
+	 * 	'task': 'forward', 'new', 'reply'
+	 *  'itemid': id of message if it's an reply or forward
+	 *  'folderid': folder
+	 *  'replacemime': false = send as is, false = decode and recode for whatever reason ???
 	 *	'saveinsentitems': 1 or absent?
-     * @param boolean|double $protocolversion=false
-     * @return boolean true on success, false on error
-     *
-     * @see eg. BackendIMAP::SendMail()
-     * @todo implement either here or in mail backend
-     * 	(maybe sending here and storing to sent folder in plugin, as sending is supposed to always work in EGroupware)
-     */
+	 * @param boolean|double $protocolversion=false
+	 * @return boolean true on success, false on error
+	 *
+	 * @see eg. BackendIMAP::SendMail()
+	 * @todo implement either here or in mail backend
+	 * 	(maybe sending here and storing to sent folder in plugin, as sending is supposed to always work in EGroupware)
+	 */
 	public function SendMail($rfc822, $smartdata=array(), $protocolversion = false)
 	{
 		//$this->debugLevel=3;
@@ -339,7 +339,7 @@ 
 		}
 
 		if ($protocolversion < 14.0)
-    		debugLog("IMAP-SendMail: " . (isset($rfc822) ? $rfc822 : ""). "task: ".(isset($smartdata['task']) ? $smartdata['task'] : "")." itemid: ".(isset($smartdata['itemid']) ? $smartdata['itemid'] : "")." folder: ".(isset($smartdata['folderid']) ? $smartdata['folderid'] : ""));
+			debugLog("IMAP-SendMail: " . (isset($rfc822) ? $rfc822 : ""). "task: ".(isset($smartdata['task']) ? $smartdata['task'] : "")." itemid: ".(isset($smartdata['itemid']) ? $smartdata['itemid'] : "")." folder: ".(isset($smartdata['folderid']) ? $smartdata['folderid'] : ""));
 		if ($this->debugLevel>0) debugLog("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
 		//error_log("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
 
@@ -445,8 +445,8 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($mailObject));
 		// if this is a multipart message with a boundary, we must use the original body
 		//if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' mailObject after Inital Parse:'.array2string($mailObject));
-        if ($use_orgbody) {
-    	    if ($this->debugLevel>0) debugLog("IMAP-Sendmail: use_orgbody = true ContentType:".$ContentType);
+		if ($use_orgbody) {
+			if ($this->debugLevel>0) debugLog("IMAP-Sendmail: use_orgbody = true ContentType:".$ContentType);
  			// if it is a ClientSideMeetingRequest, we report it as send at all times
 			if (stripos($ContentType,'text/calendar') !== false )
 			{
@@ -459,7 +459,7 @@ 
 				foreach ((array)$tA as $k => $p) if (stripos($p,"method=")!==false) $cSMRMethod= trim(str_replace('METHOD=','',strtoupper($p)));
 				$ClientSideMeetingRequest = true;
 			}
-        }
+		}
 		// now handle the addressee list
 		$toCount = 0;
 		//error_log(__METHOD__.__LINE__.array2string($toMailAddr));
@@ -539,7 +539,7 @@ 
 			$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
 			$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
 			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+			if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
 				// may be html
 				if ($this->debugLevel>0) debugLog("MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
 				$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
@@ -586,7 +586,7 @@ 
 			$this->splitID($smartdata['folderid'], $account, $folder);
 
 			$this->mail->reopen($folder);
-            // receive entire mail (header + body)
+			// receive entire mail (header + body)
 			// get message headers for specified message
 			$headers	= $this->mail->getMessageEnvelope($uid, $_partID, true, $folder);
 			// build a new mime message, forward entire old mail as file
@@ -672,7 +672,7 @@ 
 		}
 		//advanced debugging
 		// Horde SMTP Class uses utf-8 by default.
-        //debugLog("IMAP-SendMail: parsed message: ". print_r($message,1));
+		//debugLog("IMAP-SendMail: parsed message: ". print_r($message,1));
 		if ($this->debugLevel>2) debugLog("IMAP-SendMail: MailObject:".array2string($mailObject));
 
 		// set a higher timeout for big messages
@@ -765,7 +765,7 @@ 
 						//$asf = false;
 						debugLog(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$mailObject->getHeader('Subject'),$folderName));
 					}
-			        debugLog("IMAP-SendMail: Outgoing mail saved in configured 'Sent' folder '".$folderName."': ". (($asf)?"success":"failed"));
+					debugLog("IMAP-SendMail: Outgoing mail saved in configured 'Sent' folder '".$folderName."': ". (($asf)?"success":"failed"));
 				}
 				//$this->mail->closeConnection();
 			}
@@ -854,7 +854,7 @@ 
 				if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
 				$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
 				if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' html_only:'.$body);
-			    if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+				if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
 					// may be html
 					if ($this->debugLevel>0) debugLog("MIME Body".' Type:html (fetched with html_only)');
 					$css = $this->mail->getStyles($bodyStruct);
@@ -954,14 +954,14 @@ 
 					if ($output->airsyncbasenativebodytype==2) { //html
 						if ($this->debugLevel>0) debugLog("HTML Body with requested pref 4");
 						$html = '<html>'.
-	    					    '<head>'.
-						        '<meta name="Generator" content="Z-Push">'.
-						        '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'.
+								'<head>'.
+								'<meta name="Generator" content="Z-Push">'.
+								'<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'.
 								$css.
-							    '</head>'.
-							    '<body>'.
-						        str_replace("\n","<BR>",str_replace("\r","", str_replace("\r\n","<BR>",$body))).
-							    '</body>'.
+								'</head>'.
+								'<body>'.
+								str_replace("\n","<BR>",str_replace("\r","", str_replace("\r\n","<BR>",$body))).
+								'</body>'.
 								'</html>';
 						$mailObject->setHtmlBody(str_replace("\n","\r\n", str_replace("\r","",$html)),null,false);
 						if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__." MIME Body (constructed)-> ".$mailObject->findBody('html')->getContents());
@@ -1040,7 +1040,7 @@ 
 					*/
 					$output->airsyncbasebody->type = 1;
 					if(isset($bodypreference[1]["TruncationSize"]) &&
-			    		strlen($plainBody) > $bodypreference[1]["TruncationSize"])
+						strlen($plainBody) > $bodypreference[1]["TruncationSize"])
 					{
 						$plainBody = utf8_truncate($plainBody, $bodypreference[1]["TruncationSize"]);
 						$output->airsyncbasebody->truncated = 1;
@@ -1200,8 +1200,8 @@ 
 	 * the exact string that is returned in the 'AttName' property of an SyncAttachment. So, you should
 	 * encode any information you need to find the attachment in that 'attname' property.
 	 *
-     * @param string $fid - id
-     * @param string $attname - should contain (folder)id
+	 * @param string $fid - id
+	 * @param string $attname - should contain (folder)id
 	 * @return true, prints the content of the attachment
 	 */
 	function GetAttachmentData($fid,$attname) {
@@ -1226,8 +1226,8 @@ 
 	 * the exact string that is returned in the 'AttName' property of an SyncAttachment. So, you should
 	 * encode any information you need to find the attachment in that 'attname' property.
 	 *
-     * @param string $fid - id
-     * @param string $attname - should contain (folder)id
+	 * @param string $fid - id
+	 * @param string $attname - should contain (folder)id
 	 * @return SyncAirSyncBaseFileAttachment-object
 	 */
 	function ItemOperationsGetAttachmentData($fid,$attname) {
@@ -1651,24 +1651,24 @@ 
 		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
 
 		$changes = array();
-        debugLog("AlterPingChanges on $folderid ($folder) stat: ". $syncstate);
-        $this->mail->reopen($folder);
-
-        $status = $this->mail->getFolderStatus($folder,$ignoreStatusCache=true);
-        if (!$status) {
-            debugLog("AlterPingChanges: could not stat folder $folder ");
-            return false;
-        } else {
-            $newstate = "M:". $status['messages'] ."-R:". $status['recent'] ."-U:". $status['unseen']."-NUID:".$status['uidnext']."-UIDV:".$status['uidvalidity'];
-
-            // message number is different - change occured
-            if ($syncstate != $newstate) {
-                $syncstate = $newstate;
-                debugLog("AlterPingChanges: Change FOUND!");
-                // build a dummy change
-                $changes = array(array("type" => "fakeChange"));
-            }
-        }
+		debugLog("AlterPingChanges on $folderid ($folder) stat: ". $syncstate);
+		$this->mail->reopen($folder);
+
+		$status = $this->mail->getFolderStatus($folder,$ignoreStatusCache=true);
+		if (!$status) {
+			debugLog("AlterPingChanges: could not stat folder $folder ");
+			return false;
+		} else {
+			$newstate = "M:". $status['messages'] ."-R:". $status['recent'] ."-U:". $status['unseen']."-NUID:".$status['uidnext']."-UIDV:".$status['uidvalidity'];
+
+			// message number is different - change occured
+			if ($syncstate != $newstate) {
+				$syncstate = $newstate;
+				debugLog("AlterPingChanges: Change FOUND!");
+				// build a dummy change
+				$changes = array(array("type" => "fakeChange"));
+			}
+		}
 		//error_log(__METHOD__."('$folderid','$syncstate_was') syncstate='$syncstate' returning ".array2string($changes));
 		return $changes;
 	}

Spacing +335 added lines, -336 removed lines

@@ -97,23 +97,23 @@ 
 		$this->backend = $backend;
 		if (!isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Noprefs set: using 0 as default');
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' Noprefs set: using 0 as default');
 			// globals preferences add appname varname value
-			$GLOBALS['egw']->preferences->add('activesync','mail-ActiveSyncProfileID',0,'user');
+			$GLOBALS['egw']->preferences->add('activesync', 'mail-ActiveSyncProfileID', 0, 'user');
 			// save prefs
 			$GLOBALS['egw']->preferences->save_repository(true);
 		}
-		if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' ActiveProfileID:'.array2string(self::$profileID));
+		if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' ActiveProfileID:'.array2string(self::$profileID));
 
 		if (is_null(self::$profileID))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' self::ProfileID isNUll:'.array2string(self::$profileID));
-			self::$profileID =& egw_cache::getSession('mail','activeSyncProfileID');
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' ActiveProfileID (after reading Cache):'.array2string(self::$profileID));
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' self::ProfileID isNUll:'.array2string(self::$profileID));
+			self::$profileID = & egw_cache::getSession('mail', 'activeSyncProfileID');
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' ActiveProfileID (after reading Cache):'.array2string(self::$profileID));
 		}
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Pref for ProfileID:'.array2string($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']));
+			if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' Pref for ProfileID:'.array2string($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']));
 			if ($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID'] == 'G')
 			{
 				self::$profileID = 'G'; // this should trigger the fetch of the first negative profile (or if no negative profile is available the firstb there is)
@@ -123,7 +123,7 @@ 
 				self::$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID'];
 			}
 		}
-		if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Profile Selected (after reading Prefs):'.array2string(self::$profileID));
+		if ($this->debugLevel > 1) error_log(__METHOD__.__LINE__.' Profile Selected (after reading Prefs):'.array2string(self::$profileID));
 
 		// verify we are on an existing profile, if not running in setup (settings can not be static according to interface!)
 		if (!isset($GLOBALS['egw_setup']))
@@ -131,12 +131,12 @@ 
 			try {
 				emailadmin_account::read(self::$profileID);
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				unset($e);
 				self::$profileID = emailadmin_account::get_default_acc_id();
 			}
 		}
-		if ($this->debugLevel>0) error_log(__METHOD__.'::'.__LINE__.' ProfileSelected:'.self::$profileID);
+		if ($this->debugLevel > 0) error_log(__METHOD__.'::'.__LINE__.' ProfileSelected:'.self::$profileID);
 		//$this->debugLevel=0;
 	}
 
@@ -208,13 +208,13 @@ 
 			$this->__construct($this->backend);
 
 			try {
-				$this->_connect(0,true);
+				$this->_connect(0, true);
 				$this->_disconnect();
 
 				if (!$this->_wasteID) $errors[] = lang('No valid %1 folder configured!', '<b>'.lang('trash').'</b>');
 				if (!$this->_sentID) $errors[] = lang('No valid %1 folder configured!', '<b>'.lang('send').'</b>');
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				$errors[] = lang('Can not open IMAP connection').': '.$e->getMessage();
 			}
 			if ($errors)
@@ -232,7 +232,7 @@ 
 	 * @param int $account integer id of account to use
 	 * @todo support different accounts
 	 */
-	private function _connect($account=0)
+	private function _connect($account = 0)
 	{
 		if (is_null($account)) $account = 0;
 		if ($this->mail && $this->account != $account) $this->_disconnect();
@@ -245,10 +245,10 @@ 
 			$this->account = $account;
 			// todo: tell mail which account to use
 			//error_log(__METHOD__.__LINE__.' create object with ProfileID:'.array2string(self::$profileID));
-			$this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+			$this->mail = mail_bo::getInstance(false, self::$profileID, true, false, true);
 		}
 		if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId)) self::$profileID = $this->mail->icServer->ImapServerId;
-		$this->mail->openConnection(self::$profileID,false);
+		$this->mail->openConnection(self::$profileID, false);
 
 		$this->_wasteID = $this->mail->getTrashFolder(false);
 		//error_log(__METHOD__.__LINE__.' TrashFolder:'.$this->_wasteID);
@@ -283,16 +283,16 @@ 
 		/*foreach($available_accounts as $account)*/ $account = 0;
 		{
 			$this->_connect($account);
-			if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false,$_alwaysGetDefaultFolders=true);
+			if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true, false, $_alwaysGetDefaultFolders = true);
 			//debugLog(__METHOD__.__LINE__.array2string($this->folders));
 
 			foreach ($this->folders as $folder => $folderObj) {
 				$folderlist[] = $f = array(
-					'id'     => $this->createID($account,$folder),
+					'id'     => $this->createID($account, $folder),
 					'mod'    => $folderObj->shortDisplayName,
-					'parent' => $this->getParentID($account,$folder),
+					'parent' => $this->getParentID($account, $folder),
 				);
-				if ($this->debugLevel>0) debugLog(__METHOD__."() returning ".array2string($f));
+				if ($this->debugLevel > 0) debugLog(__METHOD__."() returning ".array2string($f));
 			}
 		}
 		//debugLog(__METHOD__."() returning ".array2string($folderlist));
@@ -322,65 +322,65 @@ 
      * @todo implement either here or in mail backend
      * 	(maybe sending here and storing to sent folder in plugin, as sending is supposed to always work in EGroupware)
      */
-	public function SendMail($rfc822, $smartdata=array(), $protocolversion = false)
+	public function SendMail($rfc822, $smartdata = array(), $protocolversion = false)
 	{
 		//$this->debugLevel=3;
 		$ClientSideMeetingRequest = false;
 		$allowSendingInvitations = 'sendifnocalnotif';
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']) &&
-			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']=='nosend')
+			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'] == 'nosend')
 		{
 			$allowSendingInvitations = false;
 		}
 		elseif (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']) &&
-			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']!='nosend')
+			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'] != 'nosend')
 		{
 			$allowSendingInvitations = $GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'];
 		}
 
 		if ($protocolversion < 14.0)
-    		debugLog("IMAP-SendMail: " . (isset($rfc822) ? $rfc822 : ""). "task: ".(isset($smartdata['task']) ? $smartdata['task'] : "")." itemid: ".(isset($smartdata['itemid']) ? $smartdata['itemid'] : "")." folder: ".(isset($smartdata['folderid']) ? $smartdata['folderid'] : ""));
-		if ($this->debugLevel>0) debugLog("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
+    		debugLog("IMAP-SendMail: ".(isset($rfc822) ? $rfc822 : "")."task: ".(isset($smartdata['task']) ? $smartdata['task'] : "")." itemid: ".(isset($smartdata['itemid']) ? $smartdata['itemid'] : "")." folder: ".(isset($smartdata['folderid']) ? $smartdata['folderid'] : ""));
+		if ($this->debugLevel > 0) debugLog("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
 		//error_log("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
 
 		// initialize our mail_bo
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID, true, false, true);
 		$activeMailProfiles = $this->mail->getAccountIdentities(self::$profileID);
 		// use the standardIdentity
-		$activeMailProfile = mail_bo::getStandardIdentityForProfile($activeMailProfiles,self::$profileID);
+		$activeMailProfile = mail_bo::getStandardIdentityForProfile($activeMailProfiles, self::$profileID);
 
-		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' ProfileID:'.self::$profileID.' ActiveMailProfile:'.array2string($activeMailProfile));
+		if ($this->debugLevel > 2) debugLog(__METHOD__.__LINE__.' ProfileID:'.self::$profileID.' ActiveMailProfile:'.array2string($activeMailProfile));
 
 		// initialize the new egw_mailer object for sending
 		$mailObject = new egw_mailer();
-		$this->mail->parseRawMessageIntoMailObject($mailObject,$rfc822);
+		$this->mail->parseRawMessageIntoMailObject($mailObject, $rfc822);
 		// Horde SMTP Class uses utf-8 by default. as we set charset always to utf-8
-		$mailObject->Sender  = $activeMailProfile['ident_email'];
-		$mailObject->From 	= $activeMailProfile['ident_email'];
-		$mailObject->FromName = $mailObject->EncodeHeader(mail_bo::generateIdentityString($activeMailProfile,false));
+		$mailObject->Sender = $activeMailProfile['ident_email'];
+		$mailObject->From = $activeMailProfile['ident_email'];
+		$mailObject->FromName = $mailObject->EncodeHeader(mail_bo::generateIdentityString($activeMailProfile, false));
 		$mailObject->AddCustomHeader('X-Mailer: mail-Activesync');
 
 
 		// prepare addressee list; moved the adding of addresses to the mailobject down
 		// to
 
-		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("To")) as $addressObject) {
+		foreach (emailadmin_imapbase::parseAddressList($mailObject->getHeader("To")) as $addressObject) {
 			if (!$addressObject->valid) continue;
-			if ($this->debugLevel>0) debugLog("Header Sentmail To: ".array2string($addressObject) );
+			if ($this->debugLevel > 0) debugLog("Header Sentmail To: ".array2string($addressObject));
 			//$mailObject->AddAddress($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$toMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// CC
-		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("Cc")) as $addressObject) {
+		foreach (emailadmin_imapbase::parseAddressList($mailObject->getHeader("Cc")) as $addressObject) {
 			if (!$addressObject->valid) continue;
-			if ($this->debugLevel>0) debugLog("Header Sentmail CC: ".array2string($addressObject) );
+			if ($this->debugLevel > 0) debugLog("Header Sentmail CC: ".array2string($addressObject));
 			//$mailObject->AddCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$ccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// BCC
-		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("Bcc")) as $addressObject) {
+		foreach (emailadmin_imapbase::parseAddressList($mailObject->getHeader("Bcc")) as $addressObject) {
 			if (!$addressObject->valid) continue;
-			if ($this->debugLevel>0) debugLog("Header Sentmail BCC: ".array2string($addressObject) );
+			if ($this->debugLevel > 0) debugLog("Header Sentmail BCC: ".array2string($addressObject));
 			//$mailObject->AddBCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$bccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
@@ -389,7 +389,7 @@ 
 		$use_orgbody = false;
 
 		$k = 'Content-Type';
-		$ContentType =$mailObject->getHeader('Content-Type');
+		$ContentType = $mailObject->getHeader('Content-Type');
 		//error_log(__METHOD__.__LINE__." Header Sentmail original Header (filtered): " . $k.  " = ".trim($ContentType));
 		// if the message is a multipart message, then we should use the sent body
 		if (preg_match("/multipart/i", $ContentType)) {
@@ -409,26 +409,26 @@ 
 			$k == "Content-Type" && preg_match("/multipart/i", $ContentType))) {
 			$use_orgbody = true;
 		}
-		$Body =  $AltBody = "";
+		$Body = $AltBody = "";
 		// get body of the transmitted message
 		// if this is a simple message, no structure at all
 		if (preg_match("/text/i", $ContentType))
 		{
-			$simpleBodyType = (preg_match("/html/i", $ContentType)?'text/html':'text/plain');
+			$simpleBodyType = (preg_match("/html/i", $ContentType) ? 'text/html' : 'text/plain');
 			$bodyObj = $mailObject->findBody(preg_match("/html/i", $ContentType) ? 'html' : 'plain');
-			$body = $bodyObj ?$bodyObj->getContents() : null;
-			$body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]", $body);
-			if  ($simpleBodyType == "text/plain")
+			$body = $bodyObj ? $bodyObj->getContents() : null;
+			$body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "[$2]", $body);
+			if ($simpleBodyType == "text/plain")
 			{
 				$Body = $body;
 				$AltBody = "<pre>".nl2br($body)."</pre>";
-				if ($this->debugLevel>1) debugLog("IMAP-Sendmail: fetched Body as :". $simpleBodyType.'=> Created AltBody');
+				if ($this->debugLevel > 1) debugLog("IMAP-Sendmail: fetched Body as :".$simpleBodyType.'=> Created AltBody');
 			}
 			else
 			{
 				$AltBody = $body;
-				$Body =  trim(translation::convertHTMLToText($body));
-				if ($this->debugLevel>1) debugLog("IMAP-Sendmail: fetched Body as :". $simpleBodyType.'=> Created Body');
+				$Body = trim(translation::convertHTMLToText($body));
+				if ($this->debugLevel > 1) debugLog("IMAP-Sendmail: fetched Body as :".$simpleBodyType.'=> Created Body');
 			}
 		}
 		else
@@ -437,60 +437,60 @@ 
 			$Body = ($text_body = $mailObject->findBody('plain')) ? $text_body->getContents() : null;
 			$AltBody = ($html_body = $mailObject->findBody('html')) ? $html_body->getContents() : null;
 			// prefer plain over html
-			$Body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]", $Body);
-			$AltBody = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]", $AltBody);
+			$Body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "[$2]", $Body);
+			$AltBody = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "[$2]", $AltBody);
 		}
-		if ($this->debugLevel>1 && $Body) debugLog("IMAP-Sendmail: fetched Body as with MessageContentType:". $ContentType.'=>'.$Body);
-		if ($this->debugLevel>1 && $AltBody) debugLog("IMAP-Sendmail: fetched AltBody as with MessageContentType:". $ContentType.'=>'.$AltBody);
+		if ($this->debugLevel > 1 && $Body) debugLog("IMAP-Sendmail: fetched Body as with MessageContentType:".$ContentType.'=>'.$Body);
+		if ($this->debugLevel > 1 && $AltBody) debugLog("IMAP-Sendmail: fetched AltBody as with MessageContentType:".$ContentType.'=>'.$AltBody);
 		//error_log(__METHOD__.__LINE__.array2string($mailObject));
 		// if this is a multipart message with a boundary, we must use the original body
 		//if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' mailObject after Inital Parse:'.array2string($mailObject));
         if ($use_orgbody) {
-    	    if ($this->debugLevel>0) debugLog("IMAP-Sendmail: use_orgbody = true ContentType:".$ContentType);
+    	    if ($this->debugLevel > 0) debugLog("IMAP-Sendmail: use_orgbody = true ContentType:".$ContentType);
  			// if it is a ClientSideMeetingRequest, we report it as send at all times
-			if (stripos($ContentType,'text/calendar') !== false )
+			if (stripos($ContentType, 'text/calendar') !== false)
 			{
 				$body = ($text_body = $mailObject->findBody('calendar')) ? $text_body->getContents() : null;
 				$Body = $body;
 				$AltBody = "<pre>".nl2br($body)."</pre>";
-				if ($this->debugLevel>0) debugLog("IMAP-Sendmail: we have a Client Side Meeting Request");
+				if ($this->debugLevel > 0) debugLog("IMAP-Sendmail: we have a Client Side Meeting Request");
 				// try figuring out the METHOD -> [ContentType] => text/calendar; name=meeting.ics; method=REQUEST
-				$tA = explode(' ',$ContentType);
-				foreach ((array)$tA as $k => $p) if (stripos($p,"method=")!==false) $cSMRMethod= trim(str_replace('METHOD=','',strtoupper($p)));
+				$tA = explode(' ', $ContentType);
+				foreach ((array)$tA as $k => $p) if (stripos($p, "method=") !== false) $cSMRMethod = trim(str_replace('METHOD=', '', strtoupper($p)));
 				$ClientSideMeetingRequest = true;
 			}
         }
 		// now handle the addressee list
 		$toCount = 0;
 		//error_log(__METHOD__.__LINE__.array2string($toMailAddr));
-		foreach((array)$toMailAddr as $address) {
-			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
-				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress,(isset($cSMRMethod)?$cSMRMethod:'REQUEST'))) continue;
+		foreach ((array)$toMailAddr as $address) {
+			foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($address) : $address)) as $addressObject) {
+				$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
+				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress, (isset($cSMRMethod) ? $cSMRMethod : 'REQUEST'))) continue;
 				$mailObject->AddAddress($emailAddress, $addressObject->personal);
 				$toCount++;
 			}
 		}
 		$ccCount = 0;
-		foreach((array)$ccMailAddr as $address) {
-			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+		foreach ((array)$ccMailAddr as $address) {
+			foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($address) : $address)) as $addressObject) {
+				$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress)) continue;
 				$mailObject->AddCC($emailAddress, $addressObject->personal);
 				$ccCount++;
 			}
 		}
 		$bccCount = 0;
-		foreach((array)$bccMailAddr as $address) {
-			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+		foreach ((array)$bccMailAddr as $address) {
+			foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($address) : $address)) as $addressObject) {
+				$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress)) continue;
 				$mailObject->AddBCC($emailAddress, $addressObject->personal);
 				$bccCount++;
 			}
 		}
-		if ($toCount+$ccCount+$bccCount == 0) return 0; // noone to send mail to
-		if ($ClientSideMeetingRequest === true && $allowSendingInvitations===false) return true;
+		if ($toCount + $ccCount + $bccCount == 0) return 0; // noone to send mail to
+		if ($ClientSideMeetingRequest === true && $allowSendingInvitations === false) return true;
 		// as we use our mailer (horde mailer) it is detecting / setting the mimetype by itself while creating the mail
 /*
 		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' retrieved Body:'.$body);
@@ -498,29 +498,29 @@ 
 		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' retrieved Body (modified):'.$body);
 */
 		// add signature!! -----------------------------------------------------------------
-		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' ActiveMailProfile:'.array2string($activeMailProfile));
+		if ($this->debugLevel > 2) debugLog(__METHOD__.__LINE__.' ActiveMailProfile:'.array2string($activeMailProfile));
 		try
 		{
 			$acc = emailadmin_account::read($this->mail->icServer->ImapServerId);
 			//error_log(__METHOD__.__LINE__.array2string($acc));
-			$_signature = emailadmin_account::read_identity($acc['ident_id'],true);
+			$_signature = emailadmin_account::read_identity($acc['ident_id'], true);
 		}
 		catch (Exception $e)
 		{
-			$_signature=array();
+			$_signature = array();
 		}
 		$signature = $_signature['ident_signature'];
 		if ((isset($preferencesArray['disableRulerForSignatureSeparation']) &&
 			$preferencesArray['disableRulerForSignatureSeparation']) ||
-			empty($signature) || trim(translation::convertHTMLToText($signature)) =='')
+			empty($signature) || trim(translation::convertHTMLToText($signature)) == '')
 		{
 			$disableRuler = true;
 		}
 		$beforePlain = $beforeHtml = "";
-		$beforeHtml = ($disableRuler ?'&nbsp;<br>':'&nbsp;<br><hr style="border:dotted 1px silver; width:90%; border:dotted 1px silver;">');
-		$beforePlain = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n");
-		$sigText = emailadmin_imapbase::merge($signature,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
-		if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Signature to use:'.$sigText);
+		$beforeHtml = ($disableRuler ? '&nbsp;<br>' : '&nbsp;<br><hr style="border:dotted 1px silver; width:90%; border:dotted 1px silver;">');
+		$beforePlain = ($disableRuler ? "\r\n\r\n" : "\r\n\r\n-- \r\n");
+		$sigText = emailadmin_imapbase::merge($signature, array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'], 'person_id')));
+		if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' Signature to use:'.$sigText);
 		$sigTextHtml = $beforeHtml.$sigText;
 		$sigTextPlain = $beforePlain.translation::convertHTMLToText($sigText);
 		$isreply = $isforward = false;
@@ -532,26 +532,26 @@ 
 		{
 			// now get on, and fetch the original mail
 			$uid = $smartdata['itemid'];
-			if ($this->debugLevel>0) debugLog("IMAP Smartreply is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+			if ($this->debugLevel > 0) debugLog("IMAP Smartreply is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
 			$this->splitID($smartdata['folderid'], $account, $folder);
 
 			$this->mail->reopen($folder);
 			$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
-			$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+			$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail, $bodyStruct, true, false);
+			if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/html')) {
 				// may be html
-				if ($this->debugLevel>0) debugLog("MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+				if ($this->debugLevel > 0) debugLog("MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
 				$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 				$isreply = true;
 			}
 			// plain text Message part
-			if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain, fetch text:');
+			if ($this->debugLevel > 0) debugLog("MIME Body".' Type:plain, fetch text:');
 			// if the new part of the message is html, we must preserve it, and handle that the original mail is text/plain
-			$bodyStruct = $this->mail->getMessageBody($uid,'never_display');//'never_display');
-			$bodyBUFF = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-			if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain')) {
-				if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+			$bodyStruct = $this->mail->getMessageBody($uid, 'never_display'); //'never_display');
+			$bodyBUFF = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
+			if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/plain')) {
+				if ($this->debugLevel > 0) debugLog("MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
 				$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 				$isreply = true;
 			}
@@ -559,12 +559,12 @@ 
 			{
 				$isreply = true;
 				$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-				if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+				if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
 			}
 		}
 
 		// how to forward and other prefs
-		$preferencesArray =& $GLOBALS['egw_info']['user']['preferences']['mail'];
+		$preferencesArray = & $GLOBALS['egw_info']['user']['preferences']['mail'];
 
 		// forward -------------------------------------------------------------------------
 		if ($smartdata['task'] == 'forward' && isset($smartdata['itemid']) &&
@@ -574,7 +574,7 @@ 
 		{
 			//force the default for the forwarding -> asmail
 			if (is_array($preferencesArray)) {
-				if (!array_key_exists('message_forwarding',$preferencesArray)
+				if (!array_key_exists('message_forwarding', $preferencesArray)
 					|| !isset($preferencesArray['message_forwarding'])
 					|| empty($preferencesArray['message_forwarding'])) $preferencesArray['message_forwarding'] = 'asmail';
 			} else {
@@ -582,19 +582,19 @@ 
 			}
 			// construct the uid of the message out of the itemid - seems to be the uid, no construction needed
 			$uid = $smartdata['itemid'];
-			if ($this->debugLevel>0) debugLog("IMAP Smartfordward is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+			if ($this->debugLevel > 0) debugLog("IMAP Smartfordward is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
 			$this->splitID($smartdata['folderid'], $account, $folder);
 
 			$this->mail->reopen($folder);
             // receive entire mail (header + body)
 			// get message headers for specified message
-			$headers	= $this->mail->getMessageEnvelope($uid, $_partID, true, $folder);
+			$headers = $this->mail->getMessageEnvelope($uid, $_partID, true, $folder);
 			// build a new mime message, forward entire old mail as file
 			if ($preferencesArray['message_forwarding'] == 'asmail')
 			{
-				$rawHeader='';
-				$rawHeader      = $this->mail->getMessageRawHeader($smartdata['itemid'], $_partID,$folder);
-				$rawBody        = $this->mail->getMessageRawBody($smartdata['itemid'], $_partID,$folder);
+				$rawHeader = '';
+				$rawHeader      = $this->mail->getMessageRawHeader($smartdata['itemid'], $_partID, $folder);
+				$rawBody        = $this->mail->getMessageRawBody($smartdata['itemid'], $_partID, $folder);
 				$mailObject->AddStringAttachment($rawHeader.$rawBody, $headers['SUBJECT'].'.eml', 'message/rfc822');
 				$AltBody = $AltBody."</br>".lang("See Attachments for Content of the Orignial Mail").$sigTextHtml;
 				$Body = $Body."\r\n".lang("See Attachments for Content of the Orignial Mail").$sigTextPlain;
@@ -604,49 +604,49 @@ 
 			{
 				// now get on, and fetch the original mail
 				$uid = $smartdata['itemid'];
-				if ($this->debugLevel>0) debugLog("IMAP Smartreply is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+				if ($this->debugLevel > 0) debugLog("IMAP Smartreply is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
 				$this->splitID($smartdata['folderid'], $account, $folder);
 
 				$this->mail->reopen($folder);
 				$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
-				$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-				if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+				$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail, $bodyStruct, true, false);
+				if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/html')) {
 					// may be html
-					if ($this->debugLevel>0) debugLog("MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+					if ($this->debugLevel > 0) debugLog("MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
 					$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 					$isforward = true;
 				}
 				// plain text Message part
-				if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain, fetch text:');
+				if ($this->debugLevel > 0) debugLog("MIME Body".' Type:plain, fetch text:');
 				// if the new part of the message is html, we must preserve it, and handle that the original mail is text/plain
-				$bodyStruct = $this->mail->getMessageBody($uid,'never_display');//'never_display');
-				$bodyBUFF = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-				if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain')) {
-					if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+				$bodyStruct = $this->mail->getMessageBody($uid, 'never_display'); //'never_display');
+				$bodyBUFF = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
+				if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/plain')) {
+					if ($this->debugLevel > 0) debugLog("MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
 					$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 					$isforward = true;
 				}
 				if (!empty($bodyBUFF) && empty($bodyBUFFHtml) && !empty($AltBody))
 				{
 					$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-					if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+					if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
 					$isforward = true;
 				}
 				// get all the attachments and add them too.
 				// start handle Attachments
 				//												$_uid, $_partID=null, Horde_Mime_Part $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=false, $resolveTNEF=true, $_folderName=''
-				$attachments = $this->mail->getMessageAttachments($uid, null,          null,								true,						false,				 true			, $folder);
+				$attachments = $this->mail->getMessageAttachments($uid, null, null, true, false, true, $folder);
 				$attachmentNames = false;
-				if (is_array($attachments) && count($attachments)>0)
+				if (is_array($attachments) && count($attachments) > 0)
 				{
-					if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$uid.' found:'.count($attachments));
-					foreach((array)$attachments as $key => $attachment)
+					if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$uid.' found:'.count($attachments));
+					foreach ((array)$attachments as $key => $attachment)
 					{
-						if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+						if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
 						$attachmentNames .= $attachment['name']."\n";
 						$attachmentData = '';
-						$attachmentData	= $this->mail->getAttachment($uid, $attachment['partID'],0,false,false,$folder);
+						$attachmentData	= $this->mail->getAttachment($uid, $attachment['partID'], 0, false, false, $folder);
 						/*$x =*/ $mailObject->AddStringAttachment($attachmentData['attachment'], $mailObject->EncodeHeader($attachment['name']), $attachment['mimeType']);
 						//debugLog(__METHOD__.__LINE__.' added part with number:'.$x);
 					}
@@ -662,18 +662,18 @@ 
 		// now set the body
 		if ($AltBody && ($html_body = $mailObject->findBody('html')))
 		{
-			if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__.' -> '.$AltBody);
-			$html_body->setContents($AltBody,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+			if ($this->debugLevel > 1) debugLog(__METHOD__.__LINE__.' -> '.$AltBody);
+			$html_body->setContents($AltBody, array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		if ($Body && ($text_body = $mailObject->findBody('plain')))
 		{
-			if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__.' -> '.$Body);
-			$text_body->setContents($Body,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
+			if ($this->debugLevel > 1) debugLog(__METHOD__.__LINE__.' -> '.$Body);
+			$text_body->setContents($Body, array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		//advanced debugging
 		// Horde SMTP Class uses utf-8 by default.
         //debugLog("IMAP-SendMail: parsed message: ". print_r($message,1));
-		if ($this->debugLevel>2) debugLog("IMAP-SendMail: MailObject:".array2string($mailObject));
+		if ($this->debugLevel > 2) debugLog("IMAP-SendMail: MailObject:".array2string($mailObject));
 
 		// set a higher timeout for big messages
 		@set_time_limit(120);
@@ -683,15 +683,15 @@ 
 		try {
 			$mailObject->Send();
 		}
-		catch(phpmailerException $e) {
-			debugLog("The email could not be sent. Last-SMTP-error: ". $e->getMessage());
+		catch (phpmailerException $e) {
+			debugLog("The email could not be sent. Last-SMTP-error: ".$e->getMessage());
 			$send = false;
 		}
 
-		if (( $smartdata['task'] == 'reply' || $smartdata['task'] == 'forward') && $send == true)
+		if (($smartdata['task'] == 'reply' || $smartdata['task'] == 'forward') && $send == true)
 		{
 			$uid = $smartdata['itemid'];
-			if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' tASK:'.$smartdata['task']." FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+			if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' tASK:'.$smartdata['task']." FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
 			$this->splitID($smartdata['folderid'], $account, $folder);
 			//error_log(__METHOD__.__LINE__.' Folder:'.$folder.' Uid:'.$uid);
 			$this->mail->reopen($folder);
@@ -699,25 +699,25 @@ 
 			// unless your templatefolder is a subfolder of your draftfolder, and the message is in there
 			if ($this->mail->isDraftFolder($folder) && !$this->mail->isTemplateFolder($folder))
 			{
-				$this->mail->deleteMessages(array($uid),$folder);
+				$this->mail->deleteMessages(array($uid), $folder);
 			} else {
-				$this->mail->flagMessages("answered", array($uid),$folder);
-				if ($smartdata['task']== "forward")
+				$this->mail->flagMessages("answered", array($uid), $folder);
+				if ($smartdata['task'] == "forward")
 				{
-					$this->mail->flagMessages("forwarded", array($uid),$folder);
+					$this->mail->flagMessages("forwarded", array($uid), $folder);
 				}
 			}
 		}
 
-		$asf = ($send ? true:false); // initalize accordingly
-		if (($smartdata['saveinsentitems']==1 || !isset($smartdata['saveinsentitems'])) && $send==true && $this->mail->mailPreferences['sendOptions'] != 'send_only')
+		$asf = ($send ? true : false); // initalize accordingly
+		if (($smartdata['saveinsentitems'] == 1 || !isset($smartdata['saveinsentitems'])) && $send == true && $this->mail->mailPreferences['sendOptions'] != 'send_only')
 		{
 			$asf = false;
 			$sentFolder = $this->mail->getSentFolder();
 			if ($this->_sentID) {
 				$folderArray[] = $this->_sentID;
 			}
-			else if(isset($sentFolder) && $sentFolder != 'none')
+			else if (isset($sentFolder) && $sentFolder != 'none')
 			{
 				$folderArray[] = $sentFolder;
 			}
@@ -729,43 +729,43 @@ 
 				$asf = true;
 			}
 			if (count($folderArray) > 0) {
-				foreach((array)$bccMailAddr as $address) {
-					foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
-						$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+				foreach ((array)$bccMailAddr as $address) {
+					foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($address) : $address)) as $addressObject) {
+						$emailAddress = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 						$mailAddr[] = array($emailAddress, $addressObject->personal);
 					}
 				}
-				$BCCmail='';
-				if (count($mailAddr)>0) $BCCmail = $mailObject->AddrAppend("Bcc",$mailAddr);
-				foreach($folderArray as $folderName) {
-					if($this->mail->isSentFolder($folderName)) {
+				$BCCmail = '';
+				if (count($mailAddr) > 0) $BCCmail = $mailObject->AddrAppend("Bcc", $mailAddr);
+				foreach ($folderArray as $folderName) {
+					if ($this->mail->isSentFolder($folderName)) {
 						$flags = '\\Seen';
-					} elseif($this->mail->isDraftFolder($folderName)) {
+					} elseif ($this->mail->isDraftFolder($folderName)) {
 						$flags = '\\Draft';
 					} else {
 						$flags = '';
 					}
 					$asf = true;
 					//debugLog(__METHOD__.__LINE__.'->'.array2string($this->mail->icServer));
-					$this->mail->openConnection(self::$profileID,false);
+					$this->mail->openConnection(self::$profileID, false);
 					if ($this->mail->folderExists($folderName)) {
 						try
 						{
-							$this->mail->appendMessage($folderName,$mailObject->getRaw(), null,
+							$this->mail->appendMessage($folderName, $mailObject->getRaw(), null,
 									$flags);
 						}
 						catch (egw_exception_wrong_userinput $e)
 						{
 							//$asf = false;
-							debugLog(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3",$mailObject->getHeader('Subject'),$folderName,$e->getMessage()));
+							debugLog(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Could not save message to folder %2 due to: %3", $mailObject->getHeader('Subject'), $folderName, $e->getMessage()));
 						}
 					}
 					else
 					{
 						//$asf = false;
-						debugLog(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.",$mailObject->getHeader('Subject'),$folderName));
+						debugLog(__METHOD__.__LINE__.'->'.lang("Import of message %1 failed. Destination Folder %2 does not exist.", $mailObject->getHeader('Subject'), $folderName));
 					}
-			        debugLog("IMAP-SendMail: Outgoing mail saved in configured 'Sent' folder '".$folderName."': ". (($asf)?"success":"failed"));
+			        debugLog("IMAP-SendMail: Outgoing mail saved in configured 'Sent' folder '".$folderName."': ".(($asf) ? "success" : "failed"));
 				}
 				//$this->mail->closeConnection();
 			}
@@ -779,8 +779,8 @@ 
 		}
 		else
 		{
-			debugLog(__METHOD__." returning ".($ClientSideMeetingRequest ? true : 120)." (MailSubmissionFailed)".($ClientSideMeetingRequest ?" is ClientSideMeetingRequest (we ignore the failure)":""));
-			return ($ClientSideMeetingRequest ? true : 120);   //MAIL Submission failed, see MS-ASCMD
+			debugLog(__METHOD__." returning ".($ClientSideMeetingRequest ? true : 120)." (MailSubmissionFailed)".($ClientSideMeetingRequest ? " is ClientSideMeetingRequest (we ignore the failure)" : ""));
+			return ($ClientSideMeetingRequest ? true : 120); //MAIL Submission failed, see MS-ASCMD
 		}
 
 	}
@@ -792,39 +792,39 @@ 
 	 *
 	 * @see activesync_plugin_read::GetMessage()
 	 */
-	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
+	public function GetMessage($folderid, $id, $truncsize, $bodypreference = false, $optionbodypreference = false, $mimesupport = 0)
 	{
 		//$this->debugLevel=4;
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID, true, false, true);
 		debugLog(__METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' TruncSize:'.$truncsize.' Bodypreference: '.array2string($bodypreference));
-		$rv = $this->splitID($folderid,$account,$_folderName,$xid);
+		$rv = $this->splitID($folderid, $account, $_folderName, $xid);
 		$this->mail->reopen($_folderName);
 		$stat = $this->StatMessage($folderid, $id);
-		if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.array2string($stat));
+		if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.array2string($stat));
 		// StatMessage should reopen the folder in question, so we dont need folderids in the following statements.
 		if ($stat)
 		{
 			debugLog(__METHOD__.__LINE__." Message $id with stat ".array2string($stat));
 			// initialize the object
 			$output = new SyncMail();
-			$headers = $this->mail->getMessageHeader($id,'',true,true,$_folderName);
+			$headers = $this->mail->getMessageHeader($id, '', true, true, $_folderName);
 			if (empty($headers))
 			{
 				error_log(__METHOD__.__LINE__.' Retrieval of Headers Failed! for .'.$this->account.'/'.$GLOBALS['egw_info']['user']['account_lid'].' ServerID:'.self::$profileID.'FolderID:'.$folderid.'/'.$_folderName.' ID:'.$id.' TruncSize:'.$truncsize.' Bodypreference: '.array2string($bodypreference).' Stat was:'.array2string($stat));
-				return $output;//empty object
+				return $output; //empty object
 			}
 			//$rawHeaders = $this->mail->getMessageRawHeader($id);
 			// simple style
 			// start AS12 Stuff (bodypreference === false) case = old behaviour
-			if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__. ' for message with ID:'.$id.' with headers:'.array2string($headers));
+			if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' for message with ID:'.$id.' with headers:'.array2string($headers));
 			if ($bodypreference === false) {
-				$bodyStruct = $this->mail->getMessageBody($id, 'only_if_no_text', '', null, true,$_folderName);
-				$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
+				$bodyStruct = $this->mail->getMessageBody($id, 'only_if_no_text', '', null, true, $_folderName);
+				$body = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
 				//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
-				if (stripos($body,'<style')!==false) $body = preg_replace("/<style.*?<\/style>/is", "", $body); // in case there is only a html part
+				if (stripos($body, '<style') !== false) $body = preg_replace("/<style.*?<\/style>/is", "", $body); // in case there is only a html part
 				// remove all other html
 				$body = strip_tags($body);
-				if(strlen($body) > $truncsize) {
+				if (strlen($body) > $truncsize) {
 					$body = utf8_truncate($body, $truncsize);
 					$output->bodytruncated = 1;
 				}
@@ -838,60 +838,60 @@ 
 			else // style with bodypreferences
 			{
 				if (isset($bodypreference[1]) && !isset($bodypreference[1]["TruncationSize"]))
-					$bodypreference[1]["TruncationSize"] = 1024*1024;
+					$bodypreference[1]["TruncationSize"] = 1024 * 1024;
 				if (isset($bodypreference[2]) && !isset($bodypreference[2]["TruncationSize"]))
-					$bodypreference[2]["TruncationSize"] = 1024*1024;
+					$bodypreference[2]["TruncationSize"] = 1024 * 1024;
 				if (isset($bodypreference[3]) && !isset($bodypreference[3]["TruncationSize"]))
-					$bodypreference[3]["TruncationSize"] = 1024*1024;
+					$bodypreference[3]["TruncationSize"] = 1024 * 1024;
 				if (isset($bodypreference[4]) && !isset($bodypreference[4]["TruncationSize"]))
-					$bodypreference[4]["TruncationSize"] = 1024*1024;
+					$bodypreference[4]["TruncationSize"] = 1024 * 1024;
 				// set the protocoll class
 				$output->airsyncbasebody = new SyncAirSyncBaseBody();
-				if ($this->debugLevel>0) debugLog("airsyncbasebody!");
+				if ($this->debugLevel > 0) debugLog("airsyncbasebody!");
 				// fetch the body (try to gather data only once)
-				$css ='';
-				$bodyStruct = $this->mail->getMessageBody($id, 'html_only', '', null, true,$_folderName);
-				if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
-				$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-				if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' html_only:'.$body);
-			    if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+				$css = '';
+				$bodyStruct = $this->mail->getMessageBody($id, 'html_only', '', null, true, $_folderName);
+				if ($this->debugLevel > 2) debugLog(__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
+				$body = $this->mail->getdisplayableBody($this->mail, $bodyStruct, true, false);
+				if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' html_only:'.$body);
+			    if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType'] == 'text/html')) {
 					// may be html
-					if ($this->debugLevel>0) debugLog("MIME Body".' Type:html (fetched with html_only)');
+					if ($this->debugLevel > 0) debugLog("MIME Body".' Type:html (fetched with html_only)');
 					$css = $this->mail->getStyles($bodyStruct);
-					$output->airsyncbasenativebodytype=2;
+					$output->airsyncbasenativebodytype = 2;
 				} else {
 					// plain text Message
-					if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain, fetch text (HTML, if no text available)');
-					$output->airsyncbasenativebodytype=1;
-					$bodyStruct = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
-					if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
-					$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-					if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' never display html(plain text only):'.$body);
+					if ($this->debugLevel > 0) debugLog("MIME Body".' Type:plain, fetch text (HTML, if no text available)');
+					$output->airsyncbasenativebodytype = 1;
+					$bodyStruct = $this->mail->getMessageBody($id, 'never_display', '', null, true, $_folderName); //'only_if_no_text');
+					if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
+					$body = $this->mail->getdisplayableBody($this->mail, $bodyStruct, false, false);
+					if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' never display html(plain text only):'.$body);
 				}
 				// whatever format decode (using the correct encoding)
-				if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__."MIME Body".' Type:'.($output->airsyncbasenativebodytype==2?' html ':' plain ').$body);
+				if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__."MIME Body".' Type:'.($output->airsyncbasenativebodytype == 2 ? ' html ' : ' plain ').$body);
 				//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
 				// prepare plaintextbody
 				if ($output->airsyncbasenativebodytype == 2)
 				{
-					$bodyStructplain = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
-					if($bodyStructplain[0]['error']==1)
+					$bodyStructplain = $this->mail->getMessageBody($id, 'never_display', '', null, true, $_folderName); //'only_if_no_text');
+					if ($bodyStructplain[0]['error'] == 1)
 					{
 						$plainBody = translation::convertHTMLToText($body); // always display with preserved HTML
 					}
 					else
 					{
-						$plainBody = $this->mail->getdisplayableBody($this->mail,$bodyStructplain,false,false);
+						$plainBody = $this->mail->getdisplayableBody($this->mail, $bodyStructplain, false, false);
 					}
 				}
 				//if ($this->debugLevel>0) debugLog("MIME Body".$body);
-				$plainBody = preg_replace("/<style.*?<\/style>/is", "", (strlen($plainBody)?$plainBody:$body));
+				$plainBody = preg_replace("/<style.*?<\/style>/is", "", (strlen($plainBody) ? $plainBody : $body));
 				// remove all other html
-				$plainBody = preg_replace("/<br.*>/is","\r\n",$plainBody);
+				$plainBody = preg_replace("/<br.*>/is", "\r\n", $plainBody);
 				$plainBody = strip_tags($plainBody);
-				if ($this->debugLevel>3 && $output->airsyncbasenativebodytype==1) debugLog(__METHOD__.__LINE__.' Plain Text:'.$plainBody);
+				if ($this->debugLevel > 3 && $output->airsyncbasenativebodytype == 1) debugLog(__METHOD__.__LINE__.' Plain Text:'.$plainBody);
 				//$body = str_replace("\n","\r\n", str_replace("\r","",$body)); // do we need that?
-				if (isset($bodypreference[4]) && ($mimesupport==2 || ($mimesupport ==1 && stristr($headers['CONTENT-TYPE'],'signed') !== false)))
+				if (isset($bodypreference[4]) && ($mimesupport == 2 || ($mimesupport == 1 && stristr($headers['CONTENT-TYPE'], 'signed') !== false)))
 				{
 					debugLog(__METHOD__.__LINE__." bodypreference 4 requested");
 					$output->airsyncbasebody->type = 4;
@@ -903,7 +903,7 @@ 
 						// we create a complete new rfc822 message here to pass a clean one to the client.
 						// this strips a lot of information, but ...
 						$Header = $Body = '';
-						if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." Creation of Mailobject.");
+						if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__." Creation of Mailobject.");
 						//if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__." Using data from ".$rawHeaders.$rawBody);
 						//$this->mail->parseRawMessageIntoMailObject($mailObject,$rawHeaders.$rawBody,$Header,$Body);
 						//debugLog(__METHOD__.__LINE__.array2string($headers));
@@ -916,33 +916,33 @@ 
 						$mailObject->Subject = $headers['SUBJECT'];
 						$mailObject->MessageID = $headers['MESSAGE-ID'];
 						// from
-						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['FROM']):$headers['FROM'])) as $addressObject) {
+						foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($headers['FROM']) : $headers['FROM'])) as $addressObject) {
 							//debugLog(__METHOD__.__LINE__.'Address to add (FROM):'.array2string($addressObject));
 							if (!$addressObject->valid) continue;
-							$mailObject->From = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
+							$mailObject->From = $addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : '');
 							$mailObject->FromName = $addressObject->personal;
 //error_log(__METHOD__.__LINE__.'Address to add (FROM):'.array2string($addressObject));
 						}
 						// to
-						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['TO']):$headers['TO'])) as $addressObject) {
+						foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($headers['TO']) : $headers['TO'])) as $addressObject) {
 							//debugLog(__METHOD__.__LINE__.'Address to add (TO):'.array2string($addressObject));
 							if (!$addressObject->valid) continue;
-							$mailObject->AddAddress($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
+							$mailObject->AddAddress($addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : ''), $addressObject->personal);
 						}
 						// CC
-						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['CC']):$headers['CC'])) as $addressObject) {
+						foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($headers['CC']) : $headers['CC'])) as $addressObject) {
 							//debugLog(__METHOD__.__LINE__.'Address to add (CC):'.array2string($addressObject));
 							if (!$addressObject->valid) continue;
-							$mailObject->AddCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
+							$mailObject->AddCC($addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : ''), $addressObject->personal);
 						}
 						//	AddReplyTo
-						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['REPLY-TO']):$headers['REPLY-TO'])) as $addressObject) {
+						foreach (emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc() ? stripslashes($headers['REPLY-TO']) : $headers['REPLY-TO'])) as $addressObject) {
 							//debugLog(__METHOD__.__LINE__.'Address to add (ReplyTO):'.array2string($addressObject));
 							if (!$addressObject->valid) continue;
-							$mailObject->AddReplyTo($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
+							$mailObject->AddReplyTo($addressObject->mailbox.($addressObject->host ? '@'.$addressObject->host : ''), $addressObject->personal);
 						}
 						$Header = $Body = ''; // we do not use Header and Body we use the MailObject
-						if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." Creation of Mailobject succeeded.");
+						if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__." Creation of Mailobject succeeded.");
 					}
 					catch (egw_exception_assertion_failed $e)
 					{
@@ -950,9 +950,9 @@ 
 						$Header = $Body = '';
 					}
 
-					if ($this->debugLevel>0) debugLog("MIME Body -> ".$body); // body is retrieved up
-					if ($output->airsyncbasenativebodytype==2) { //html
-						if ($this->debugLevel>0) debugLog("HTML Body with requested pref 4");
+					if ($this->debugLevel > 0) debugLog("MIME Body -> ".$body); // body is retrieved up
+					if ($output->airsyncbasenativebodytype == 2) { //html
+						if ($this->debugLevel > 0) debugLog("HTML Body with requested pref 4");
 						$html = '<html>'.
 	    					    '<head>'.
 						        '<meta name="Generator" content="Z-Push">'.
@@ -960,30 +960,30 @@ 
 								$css.
 							    '</head>'.
 							    '<body>'.
-						        str_replace("\n","<BR>",str_replace("\r","", str_replace("\r\n","<BR>",$body))).
+						        str_replace("\n", "<BR>", str_replace("\r", "", str_replace("\r\n", "<BR>", $body))).
 							    '</body>'.
 								'</html>';
-						$mailObject->setHtmlBody(str_replace("\n","\r\n", str_replace("\r","",$html)),null,false);
-						if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__." MIME Body (constructed)-> ".$mailObject->findBody('html')->getContents());
-						$mailObject->setBody(empty($plainBody)?strip_tags($body):$plainBody);
+						$mailObject->setHtmlBody(str_replace("\n", "\r\n", str_replace("\r", "", $html)), null, false);
+						if ($this->debugLevel > 2) debugLog(__METHOD__.__LINE__." MIME Body (constructed)-> ".$mailObject->findBody('html')->getContents());
+						$mailObject->setBody(empty($plainBody) ? strip_tags($body) : $plainBody);
 					}
-					if ($output->airsyncbasenativebodytype==1) { //plain
-						if ($this->debugLevel>0) debugLog("Plain Body with requested pref 4");
+					if ($output->airsyncbasenativebodytype == 1) { //plain
+						if ($this->debugLevel > 0) debugLog("Plain Body with requested pref 4");
 						$mailObject->setBody($plainBody);
 					}
 					// we still need the attachments to be added ( if there are any )
 					// start handle Attachments
 					//												$_uid, $_partID=null, Horde_Mime_Part $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=false, $resolveTNEF=true, $_folderName=''
-					$attachments = $this->mail->getMessageAttachments($id, null,          null,								true,						false,					 true				, $_folderName);
-					if (is_array($attachments) && count($attachments)>0)
+					$attachments = $this->mail->getMessageAttachments($id, null, null, true, false, true, $_folderName);
+					if (is_array($attachments) && count($attachments) > 0)
 					{
 						debugLog(__METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$id.' found:'.count($attachments));
 						//error_log(__METHOD__.__LINE__.array2string($attachments));
-						foreach((array)$attachments as $key => $attachment)
+						foreach ((array)$attachments as $key => $attachment)
 						{
-							if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+							if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
 							$attachmentData = '';
-							$attachmentData	= $this->mail->getAttachment($id, $attachment['partID'],0,false,false,$_folderName);
+							$attachmentData	= $this->mail->getAttachment($id, $attachment['partID'], 0, false, false, $_folderName);
 							$mailObject->AddStringAttachment($attachmentData['attachment'], $mailObject->EncodeHeader($attachment['name']), $attachment['mimeType']);
 						}
 					}
@@ -991,13 +991,13 @@ 
 					$Header = $mailObject->getMessageHeader();
 					//debugLog(__METHOD__.__LINE__.' MailObject-Header:'.array2string($Header));
 					$Body = trim($mailObject->getMessageBody()); // philip thinks this is needed, so lets try if it does any good/harm
-					if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' MailObject:'.array2string($mailObject));
-					if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__." Setting Mailobjectcontent to output:".$Header.self::$LE.self::$LE.$Body);
+					if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' MailObject:'.array2string($mailObject));
+					if ($this->debugLevel > 2) debugLog(__METHOD__.__LINE__." Setting Mailobjectcontent to output:".$Header.self::$LE.self::$LE.$Body);
 					$output->airsyncbasebody->data = $Header.self::$LE.self::$LE.$Body;
 				}
 				else if (isset($bodypreference[2]))
 				{
-					if ($this->debugLevel>0) debugLog("HTML Body with requested pref 2");
+					if ($this->debugLevel > 0) debugLog("HTML Body with requested pref 2");
 					// Send HTML if requested and native type was html
 					$output->airsyncbasebody->type = 2;
 					$htmlbody = '<html>'.
@@ -1007,7 +1007,7 @@ 
 						$css.
 						'</head>'.
 						'<body>';
-					if ($output->airsyncbasenativebodytype==2)
+					if ($output->airsyncbasenativebodytype == 2)
 					{
 						// as we fetch html, and body is HTML, we may not need to handle this
 						$htmlbody .= $body;
@@ -1015,14 +1015,14 @@ 
 					else
 					{
 						// html requested but got only plaintext, so fake html
-						$htmlbody .= str_replace("\n","<BR>",str_replace("\r","<BR>", str_replace("\r\n","<BR>",$plainBody)));
+						$htmlbody .= str_replace("\n", "<BR>", str_replace("\r", "<BR>", str_replace("\r\n", "<BR>", $plainBody)));
 					}
 					$htmlbody .= '</body>'.
 							'</html>';
 
-					if(isset($bodypreference[2]["TruncationSize"]) && strlen($html) > $bodypreference[2]["TruncationSize"])
+					if (isset($bodypreference[2]["TruncationSize"]) && strlen($html) > $bodypreference[2]["TruncationSize"])
 					{
-						$htmlbody = utf8_truncate($htmlbody,$bodypreference[2]["TruncationSize"]);
+						$htmlbody = utf8_truncate($htmlbody, $bodypreference[2]["TruncationSize"]);
 						$output->airsyncbasebody->truncated = 1;
 					}
 					$output->airsyncbasebody->data = $htmlbody;
@@ -1030,7 +1030,7 @@ 
 				else
 				{
 					// Send Plaintext as Fallback or if original body is plainttext
-					if ($this->debugLevel>0) debugLog("Plaintext Body:".$plainBody);
+					if ($this->debugLevel > 0) debugLog("Plaintext Body:".$plainBody);
 					/* we use plainBody (set above) instead
 					$bodyStruct = $this->mail->getMessageBody($id,'only_if_no_text'); //'never_display');
 					$plain = $this->mail->getdisplayableBody($this->mail,$bodyStruct);
@@ -1039,7 +1039,7 @@ 
 					//$plain = str_replace("\n","\r\n",str_replace("\r","",$plain));
 					*/
 					$output->airsyncbasebody->type = 1;
-					if(isset($bodypreference[1]["TruncationSize"]) &&
+					if (isset($bodypreference[1]["TruncationSize"]) &&
 			    		strlen($plainBody) > $bodypreference[1]["TruncationSize"])
 					{
 						$plainBody = utf8_truncate($plainBody, $bodypreference[1]["TruncationSize"]);
@@ -1060,21 +1060,20 @@ 
 			debugLog(__METHOD__.__LINE__.' gather Header info:'.$headers['SUBJECT'].' from:'.$headers['DATE']);
 			$output->read = $stat["flags"];
 			$output->subject = $this->messages[$id]['subject'];
-			$output->importance = $this->messages[$id]['priority'] > 3 ? 0 :
-				($this->messages[$id]['priority'] < 3 ? 2 : 1) ;
-			$output->datereceived = $this->mail->_strtotime($headers['DATE'],'ts',true);
-			$output->displayto = ($headers['TO'] ? $headers['TO']:null); //$stat['FETCHED_HEADER']['to_name']
+			$output->importance = $this->messages[$id]['priority'] > 3 ? 0 : ($this->messages[$id]['priority'] < 3 ? 2 : 1);
+			$output->datereceived = $this->mail->_strtotime($headers['DATE'], 'ts', true);
+			$output->displayto = ($headers['TO'] ? $headers['TO'] : null); //$stat['FETCHED_HEADER']['to_name']
 			// $output->to = $this->messages[$id]['to_address']; //$stat['FETCHED_HEADER']['to_name']
 			// $output->from = $this->messages[$id]['sender_address']; //$stat['FETCHED_HEADER']['sender_name']
 //error_log(__METHOD__.__LINE__.' To:'.$headers['TO']);
 			$output->to = $headers['TO'];
 //error_log(__METHOD__.__LINE__.' From:'.$headers['FROM']);
 			$output->from = $headers['FROM'];
-			$output->cc = ($headers['CC'] ? $headers['CC']:null);
-			$output->reply_to = ($headers['REPLY_TO']?$headers['REPLY_TO']:null);
+			$output->cc = ($headers['CC'] ? $headers['CC'] : null);
+			$output->reply_to = ($headers['REPLY_TO'] ? $headers['REPLY_TO'] : null);
 			$output->messageclass = "IPM.Note";
-			if (stripos($this->messages[$id]['mimetype'],'multipart')!== false &&
-				stripos($this->messages[$id]['mimetype'],'signed')!== false)
+			if (stripos($this->messages[$id]['mimetype'], 'multipart') !== false &&
+				stripos($this->messages[$id]['mimetype'], 'signed') !== false)
 			{
 				$output->messageclass = "IPM.Note.SMIME.MultipartSigned";
 			}
@@ -1089,61 +1088,61 @@ 
 			}
 
 			$output->internetcpid = 65001;
-			$output->contentclass="urn:content-classes:message";
+			$output->contentclass = "urn:content-classes:message";
 			// end AS12 Stuff
 
 			// start handle Attachments (include text/calendar multipart alternative)
-			$attachments = $this->mail->getMessageAttachments($id, $_partID='', $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=true, true, $_folderName);
-			if (is_array($attachments) && count($attachments)>0)
+			$attachments = $this->mail->getMessageAttachments($id, $_partID = '', $_structure = null, $fetchEmbeddedImages = true, $fetchTextCalendar = true, true, $_folderName);
+			if (is_array($attachments) && count($attachments) > 0)
 			{
 				debugLog(__METHOD__.__LINE__.' gather Attachments for MessageID:'.$id.' found:'.count($attachments));
 				//error_log(__METHOD__.__LINE__.array2string($attachments));
 				foreach ($attachments as $key => $attach)
 				{
-					if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
+					if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
 
 					// pass meeting requests to calendar plugin
 					if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
 						isset($GLOBALS['egw_info']['user']['apps']['calendar']) &&
-						($attachment = $this->mail->getAttachment($id, $attach['partID'],0,false,false,$_folderName)) &&
+						($attachment = $this->mail->getAttachment($id, $attach['partID'], 0, false, false, $_folderName)) &&
 						($output->meetingrequest = calendar_activesync::meetingRequest($attachment['attachment'])))
 					{
 						$output->messageclass = "IPM.Schedule.Meeting.Request";
-						continue;	// do NOT add attachment as attachment
+						continue; // do NOT add attachment as attachment
 					}
-					if(isset($output->_mapping['POOMMAIL:Attachments'])) {
+					if (isset($output->_mapping['POOMMAIL:Attachments'])) {
 						$attachment = new SyncAttachment();
-					} else if(isset($output->_mapping['AirSyncBase:Attachments'])) {
+					} else if (isset($output->_mapping['AirSyncBase:Attachments'])) {
 						$attachment = new SyncAirSyncBaseAttachment();
 					}
 					$attachment->attsize = $attach['size'];
 					$attachment->displayname = $attach['name'];
-					$attachment->attname = $folderid . ":" . $id . ":" . $attach['partID'];//$key;
+					$attachment->attname = $folderid.":".$id.":".$attach['partID']; //$key;
 					//error_log(__METHOD__.__LINE__.'->'.$folderid . ":" . $id . ":" . $attach['partID']);
 					$attachment->attmethod = 1;
-					$attachment->attoid = "";//isset($part->headers['content-id']) ? trim($part->headers['content-id']) : "";
-					if (!empty($attach['cid']) && $attach['cid'] <> 'NIL' )
+					$attachment->attoid = ""; //isset($part->headers['content-id']) ? trim($part->headers['content-id']) : "";
+					if (!empty($attach['cid']) && $attach['cid'] <> 'NIL')
 					{
-						$attachment->isinline=true;
-						$attachment->attmethod=6;
-						$attachment->contentid= $attach['cid'];
+						$attachment->isinline = true;
+						$attachment->attmethod = 6;
+						$attachment->contentid = $attach['cid'];
 						//	debugLog("'".$part->headers['content-id']."'  ".$attachment->contentid);
 						$attachment->contenttype = trim($attach['mimeType']);
 						//	debugLog("'".$part->headers['content-type']."'  ".$attachment->contentid);
 					} else {
-						$attachment->attmethod=1;
+						$attachment->attmethod = 1;
 					}
 
 					if (isset($output->_mapping['POOMMAIL:Attachments'])) {
 						array_push($output->attachments, $attachment);
-					} else if(isset($output->_mapping['AirSyncBase:Attachments'])) {
+					} else if (isset($output->_mapping['AirSyncBase:Attachments'])) {
 						array_push($output->airsyncbaseattachments, $attachment);
 					}
 				}
 			}
 			//$this->debugLevel=0;
 			// end handle Attachments
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.array2string($output));
+			if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.array2string($output));
 			return $output;
 		}
 		return false;
@@ -1173,16 +1172,16 @@ 
 			return false;
 		}
 		$ret = false;
-		foreach($this->mail->getMessageAttachments($requestid, $_partID='', $_structure=null, $fetchEmbeddedImages=true, $fetchTextCalendar=true) as $key => $attach)
+		foreach ($this->mail->getMessageAttachments($requestid, $_partID = '', $_structure = null, $fetchEmbeddedImages = true, $fetchTextCalendar = true) as $key => $attach)
 		{
 			if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
-				($attachment = $this->mail->getAttachment($requestid, $attach['partID'],0,false)))
+				($attachment = $this->mail->getAttachment($requestid, $attach['partID'], 0, false)))
 			{
 				debugLog(__METHOD__."($requestid, '$folderid', $response) iCal found, calling now backend->MeetingResponse('$attachment[attachment]')");
 
 				// calling backend again with iCal attachment, to let calendar add the event
 				if (($ret = $this->backend->MeetingResponse($attachment['attachment'],
-					$this->backend->createID('calendar',$GLOBALS['egw_info']['user']['account_id']),
+					$this->backend->createID('calendar', $GLOBALS['egw_info']['user']['account_id']),
 					$response, $calendarid)))
 				{
 					$ret = $calendarid;
@@ -1204,17 +1203,17 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return true, prints the content of the attachment
 	 */
-	function GetAttachmentData($fid,$attname) {
+	function GetAttachmentData($fid, $attname) {
 		debugLog("getAttachmentData: $fid (attname: '$attname')");
 		error_log(__METHOD__.__LINE__." Fid: $fid (attname: '$attname')");
 		list($folderid, $id, $part) = explode(":", $attname);
 
 		$this->splitID($folderid, $account, $folder);
 
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID, true, false, true);
 
 		$this->mail->reopen($folder);
-		$attachment = $this->mail->getAttachment($id,$part,0,false,false,$folder);
+		$attachment = $this->mail->getAttachment($id, $part, 0, false, false, $folder);
 		print $attachment['attachment'];
 		unset($attachment);
 		return true;
@@ -1230,17 +1229,17 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return SyncAirSyncBaseFileAttachment-object
 	 */
-	function ItemOperationsGetAttachmentData($fid,$attname) {
+	function ItemOperationsGetAttachmentData($fid, $attname) {
 		debugLog("ItemOperationsGetAttachmentData: (attname: '$attname')");
 
 		list($folderid, $id, $part) = explode(":", $attname);
 
 		$this->splitID($folderid, $account, $folder);
 
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID, true, false, true);
 
 		$this->mail->reopen($folder);
-		$att = $this->mail->getAttachment($id,$part,0,false,false,$folder);
+		$att = $this->mail->getAttachment($id, $part, 0, false, false, $folder);
 		$attachment = new SyncAirSyncBaseFileAttachment();
 		/*
 		debugLog(__METHOD__.__LINE__.array2string($att));
@@ -1302,17 +1301,17 @@ 
 		$this->splitID($folderid, $account, $srcFolder);
 		$this->splitID($newfolderid, $account, $destFolder);
 		debugLog("IMAP-MoveMessage: (SourceFolder: '$srcFolder'  id: '$id'  DestFolder: '$destFolder' )");
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID, true, false, true);
 		$this->mail->reopen($destFolder);
 		$status = $this->mail->getFolderStatus($destFolder);
 		$uidNext = $status['uidnext'];
 		$this->mail->reopen($srcFolder);
 
 		// move message
-		$rv = $this->mail->moveMessages($destFolder,(array)$id,true,$srcFolder,true);
+		$rv = $this->mail->moveMessages($destFolder, (array)$id, true, $srcFolder, true);
 		debugLog(__METHOD__.__LINE__.array2string($rv)); // this may be true, so try using the nextUID value by examine
 		// return the new id "as string""
-		return ($rv===true ? $uidNext : $rv[$id]) . "";
+		return ($rv === true ? $uidNext : $rv[$id])."";
 	}
 
 	/**
@@ -1320,86 +1319,86 @@ 
 	 *
 	 *  @ToDo loop over available email accounts
 	 */
-	public function GetMessageList($folderid, $cutoffdate=NULL)
+	public function GetMessageList($folderid, $cutoffdate = NULL)
 	{
 		static $cutdate;
-		if (!empty($cutoffdate) && $cutoffdate >0 && (empty($cutdate) || $cutoffdate != $cutdate))  $cutdate = $cutoffdate;
-		debugLog (__METHOD__.' for Folder:'.$folderid.' SINCE:'.$cutdate.'/'.date("d-M-Y", $cutdate));
+		if (!empty($cutoffdate) && $cutoffdate > 0 && (empty($cutdate) || $cutoffdate != $cutdate))  $cutdate = $cutoffdate;
+		debugLog(__METHOD__.' for Folder:'.$folderid.' SINCE:'.$cutdate.'/'.date("d-M-Y", $cutdate));
 		if (empty($cutdate))
 		{
-			$cutdate = egw_time::to('now','ts')-(3600*24*28*3);
+			$cutdate = egw_time::to('now', 'ts') - (3600 * 24 * 28 * 3);
 			debugLog(__METHOD__.' Client set no truncationdate. Using 12 weeks.'.date("d-M-Y", $cutdate));
 		}
 		return $this->fetchMessages($folderid, $cutdate);
 	}
 
-	private function fetchMessages($folderid, $cutoffdate=NULL, $_id=NULL)
+	private function fetchMessages($folderid, $cutoffdate = NULL, $_id = NULL)
 	{
-		if ($this->debugLevel>1) $gstarttime = microtime (true);
+		if ($this->debugLevel > 1) $gstarttime = microtime(true);
 		//debugLog(__METHOD__.__LINE__);
 		$rv_messages = array();
 		// if the message is still available within the class, we use it instead of fetching it again
-		if (is_array($_id) && count($_id)==1 && is_array($this->messages) && isset($this->messages[$_id[0]]) && is_array($this->messages[$_id[0]]))
+		if (is_array($_id) && count($_id) == 1 && is_array($this->messages) && isset($this->messages[$_id[0]]) && is_array($this->messages[$_id[0]]))
 		{
 			//debugLog(__METHOD__.__LINE__." the message ".$_id[0]." is still available within the class, we use it instead of fetching it again");
 			$rv_messages = array('header'=>array($this->messages[$_id[0]]));
 		}
 		if (empty($rv_messages))
 		{
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if ($this->debugLevel > 1) $starttime = microtime(true);
 			$this->_connect($this->account);
-			if ($this->debugLevel>1)
+			if ($this->debugLevel > 1)
 			{
 				$endtime = microtime(true) - $starttime;
-				debugLog(__METHOD__. " connect took : ".$endtime.' for account:'.$this->account);
+				debugLog(__METHOD__." connect took : ".$endtime.' for account:'.$this->account);
 			}
 			$messagelist = array();
 			// if not connected, any further action must fail
-			if (!empty($cutoffdate)) $_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
-			if ($this->debugLevel>1) $starttime = microtime (true);
-			$rv = $this->splitID($folderid,$account,$_folderName,$id);
-			if ($this->debugLevel>1)
+			if (!empty($cutoffdate)) $_filter = array('status'=>array('UNDELETED'), 'type'=>"SINCE", 'string'=> date("d-M-Y", $cutoffdate));
+			if ($this->debugLevel > 1) $starttime = microtime(true);
+			$rv = $this->splitID($folderid, $account, $_folderName, $id);
+			if ($this->debugLevel > 1)
 			{
 				$endtime = microtime(true) - $starttime;
-				debugLog(__METHOD__. " splitID took : ".$endtime.' for FolderID:'.$folderid);
+				debugLog(__METHOD__." splitID took : ".$endtime.' for FolderID:'.$folderid);
 			}
-			if ($this->debugLevel>1) debugLog(__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
-			if ($this->debugLevel>1) $starttime = microtime (true);
-			$_numberOfMessages = (empty($cutoffdate)?250:99999);
-			$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=1, $_numberOfMessages, $_sort=0, $_reverse=false, $_filter, $_id);
-			if ($this->debugLevel>1)
+			if ($this->debugLevel > 1) debugLog(__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
+			if ($this->debugLevel > 1) $starttime = microtime(true);
+			$_numberOfMessages = (empty($cutoffdate) ? 250 : 99999);
+			$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage = 1, $_numberOfMessages, $_sort = 0, $_reverse = false, $_filter, $_id);
+			if ($this->debugLevel > 1)
 			{
 				$endtime = microtime(true) - $starttime;
-				debugLog(__METHOD__. " getHeaders call took : ".$endtime.' for FolderID:'.$_folderName);
+				debugLog(__METHOD__." getHeaders call took : ".$endtime.' for FolderID:'.$_folderName);
 			}
 		}
-		if ($_id == NULL && $this->debugLevel>1)  debugLog(__METHOD__." found :". count($rv_messages['header']));
+		if ($_id == NULL && $this->debugLevel > 1)  debugLog(__METHOD__." found :".count($rv_messages['header']));
 		//debugLog(__METHOD__.__LINE__.' Result:'.array2string($rv_messages));
 		foreach ((array)$rv_messages['header'] as $k => $vars)
 		{
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
 			$this->messages[$vars['uid']] = $vars;
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' MailID:'.$k.'->'.array2string($vars));
+			if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.' MailID:'.$k.'->'.array2string($vars));
 			if (!empty($vars['deleted'])) continue; // cut of deleted messages
 			if ($cutoffdate && $vars['date'] < $cutoffdate) continue; // message is out of range for cutoffdate, ignore it
-			if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
 			$mess["mod"] = $vars['date'];
 			$mess["id"] = $vars['uid'];
 			// 'seen' aka 'read' is the only flag we want to know about
 			$mess["flags"] = 0;
 			// outlook supports additional flags, set them to 0
 			$mess["olflags"] = 0;
-			if($vars["seen"]) $mess["flags"] = 1;
-			if($vars["flagged"]) $mess["olflags"] = 2;
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.array2string($mess));
+			if ($vars["seen"]) $mess["flags"] = 1;
+			if ($vars["flagged"]) $mess["olflags"] = 2;
+			if ($this->debugLevel > 3) debugLog(__METHOD__.__LINE__.array2string($mess));
 			$messagelist[$vars['uid']] = $mess;
 			unset($mess);
 		}
 
-		if ($this->debugLevel>1)
+		if ($this->debugLevel > 1)
 		{
 			$endtime = microtime(true) - $gstarttime;
-			debugLog(__METHOD__. " total time used : ".$endtime.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
+			debugLog(__METHOD__." total time used : ".$endtime.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
 		}
 		return $messagelist;
 	}
@@ -1413,7 +1412,7 @@ 
 	public function getSearchResultsMailbox($searchquery)
 	{
 		if (!is_array($searchquery)) return array();
-		if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.array2string($searchquery));
+		if ($this->debugLevel > 0) debugLog(__METHOD__.__LINE__.array2string($searchquery));
 		// 19.10.2011 16:28:59 [24502] mail_activesync::getSearchResultsMailbox1408
 		//Array(
 		//	[query] => Array(
@@ -1437,22 +1436,22 @@ 
 		} else {
 			$rebuildresults = false;
 		}
-		if ($this->debugLevel>0) debugLog( 'RebuildResults ['.$rebuildresults.']' );
+		if ($this->debugLevel > 0) debugLog('RebuildResults ['.$rebuildresults.']');
 
 		if (isset($searchquery['deeptraversal'])) {
 			$deeptraversal = $searchquery['deeptraversal'];
 		} else {
 			$deeptraversal = false;
 		}
-		if ($this->debugLevel>0) debugLog( 'DeepTraversal ['.$deeptraversal.']' );
+		if ($this->debugLevel > 0) debugLog('DeepTraversal ['.$deeptraversal.']');
 
 		if (isset($searchquery['range'])) {
-			$range = explode("-",$searchquery['range']);
+			$range = explode("-", $searchquery['range']);
 			$limit = $range[1] - $range[0] + 1;
 		} else {
 			$range = false;
 		}
-		if ($this->debugLevel>0) debugLog( 'Range ['.print_r($range, true).']' );
+		if ($this->debugLevel > 0) debugLog('Range ['.print_r($range, true).']');
 
 		//foreach($searchquery['query'] as $k => $value) {
 		//	$query = $value;
@@ -1464,38 +1463,38 @@ 
 		// other types may be possible - we support quicksearch first (freeText in subject and from (or TO in Sent Folder))
 		if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID]))
 		{
-			emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),$callback=null,$callback_params=array(),$expiration=60*60*10);
-			if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID]=true;
+			emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), $callback = null, $callback_params = array(), $expiration = 60 * 60 * 10);
+			if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID] = true;
 		}
 
 		if (isset($searchquery['query'][0]['value']['Search:FreeText']))
 		{
-			$type = (emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID]?'quick':'subject');
+			$type = (emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID] ? 'quick' : 'subject');
 			$searchText = $searchquery['query'][0]['value']['Search:FreeText'];
 		}
 		if (!$folderid)
 		{
-			$_folderName = ($this->mail->sessionData['mailbox']?$this->mail->sessionData['mailbox']:'INBOX');
-			$folderid = $this->createID($account=0,$_folderName);
+			$_folderName = ($this->mail->sessionData['mailbox'] ? $this->mail->sessionData['mailbox'] : 'INBOX');
+			$folderid = $this->createID($account = 0, $_folderName);
 		}
 //if ($searchquery['query'][0]['value'][subquery][0][op]=='Search:GreaterThan');
 //if (isset($searchquery['query'][0]['value'][subquery][0][value][POOMMAIL:DateReceived]));
 //if ($searchquery['query'][0]['value'][subquery][1][op]=='Search:LessThan');
 //if (isset($searchquery['query'][0]['value'][subquery][1][value][POOMMAIL:DateReceived]));
 //$_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
-		$rv = $this->splitID($folderid,$account,$_folderName,$id);
+		$rv = $this->splitID($folderid, $account, $_folderName, $id);
 		$this->_connect($account);
-		$_filter = array('type'=> (emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID]?'quick':'subject'),
+		$_filter = array('type'=> (emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID] ? 'quick' : 'subject'),
 						 'string'=> $searchText,
 						 'status'=>'any',
 						);
 
 		//$_filter[] = array('type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
-		if ($this->debugLevel>1) debugLog (__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
-		$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=1, $_numberOfMessages=($limit?$limit:9999999), $_sort=0, $_reverse=false, $_filter, $_id=NULL);
+		if ($this->debugLevel > 1) debugLog(__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
+		$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage = 1, $_numberOfMessages = ($limit ? $limit : 9999999), $_sort = 0, $_reverse = false, $_filter, $_id = NULL);
 		//debugLog(__METHOD__.__LINE__.array2string($rv_messages));
-		$list=array();
-		foreach((array)$rv_messages['header'] as $i => $vars)
+		$list = array();
+		foreach ((array)$rv_messages['header'] as $i => $vars)
 		{
 			$list[] = array(
 				"uniqueid" => $folderid.':'.$vars['uid'],
@@ -1506,7 +1505,7 @@ 
 		}
 		//error_log(__METHOD__.__LINE__.array2string($list));
 		//debugLog(__METHOD__.__LINE__.array2string($list));
-		return $list;//array('rows'=>$list,'status'=>1,'global_search_status'=>1);//array();
+		return $list; //array('rows'=>$list,'status'=>1,'global_search_status'=>1);//array();
 	}
 
 	/**
@@ -1516,20 +1515,20 @@ 
 	 * @param string $folder
 	 * @return string
 	 */
-	private function getParentID($account,$folder)
+	private function getParentID($account, $folder)
 	{
 		$this->_connect($account);
-		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false);
+		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true, false);
 
 		$mailFolder = $this->folders[$folder];
 		if (!isset($mailFolder)) return false;
-		$delimiter = (isset($mailFolder->delimiter)?$mailFolder->delimiter:$this->mail->getHierarchyDelimiter());
-		$parent = explode($delimiter,$folder);
+		$delimiter = (isset($mailFolder->delimiter) ? $mailFolder->delimiter : $this->mail->getHierarchyDelimiter());
+		$parent = explode($delimiter, $folder);
 		array_pop($parent);
-		$parent = implode($delimiter,$parent);
+		$parent = implode($delimiter, $parent);
 
 		$id = $parent ? $this->createID($account, $parent) : '0';
-		if ($this->debugLevel>1) debugLog(__METHOD__."('$folder') --> parent=$parent --> $id");
+		if ($this->debugLevel > 1) debugLog(__METHOD__."('$folder') --> parent=$parent --> $id");
 		return $id;
 	}
 
@@ -1548,48 +1547,48 @@ 
 		try {
 			$this->splitID($id, $account, $folder);
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			debugLog(__METHOD__.__LINE__.' failed for '.$e->getMessage());
-			return $folderObj=false;
+			return $folderObj = false;
 		}
 		$this->_connect($account);
-		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false);
+		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true, false);
 
 		$mailFolder = $this->folders[$folder];
-		if (!isset($mailFolder)) return $folderObj=false;
+		if (!isset($mailFolder)) return $folderObj = false;
 
 		$folderObj = new SyncFolder();
 		$folderObj->serverid = $id;
-		$folderObj->parentid = $this->getParentID($account,$folder);
+		$folderObj->parentid = $this->getParentID($account, $folder);
 		$folderObj->displayname = $mailFolder->shortDisplayName;
-		if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
+		if ($this->debugLevel > 1) debugLog(__METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
 		// get folder-type
-		foreach($this->folders as $inbox => $mailFolder) break;
+		foreach ($this->folders as $inbox => $mailFolder) break;
 		if ($folder == $inbox)
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_INBOX;
 		}
-		elseif($this->mail->isDraftFolder($folder, false))
+		elseif ($this->mail->isDraftFolder($folder, false))
 		{
 			//debugLog(__METHOD__.' isDraft');
 			$folderObj->type = SYNC_FOLDER_TYPE_DRAFTS;
 			$folderObj->parentid = 0; // required by devices
 		}
-		elseif($this->mail->isTrashFolder($folder, false))
+		elseif ($this->mail->isTrashFolder($folder, false))
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_WASTEBASKET;
 			$this->_wasteID = $folder;
 			//error_log(__METHOD__.__LINE__.' TrashFolder:'.$this->_wasteID);
 			$folderObj->parentid = 0; // required by devices
 		}
-		elseif($this->mail->isSentFolder($folder, false))
+		elseif ($this->mail->isSentFolder($folder, false))
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_SENTMAIL;
 			$folderObj->parentid = 0; // required by devices
 			$this->_sentID = $folder;
 			//error_log(__METHOD__.__LINE__.' SentFolder:'.$this->_sentID);
 		}
-		elseif($this->mail->isOutbox($folder, false))
+		elseif ($this->mail->isOutbox($folder, false))
 		{
 			//debugLog(__METHOD__.' isOutbox');
 			$folderObj->type = SYNC_FOLDER_TYPE_OUTBOX;
@@ -1601,7 +1600,7 @@ 
 			$folderObj->type = SYNC_FOLDER_TYPE_USER_MAIL;
 		}
 
-		if ($this->debugLevel>1) debugLog(__METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
+		if ($this->debugLevel > 1) debugLog(__METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
 		return $folderObj;
 	}
 
@@ -1648,18 +1647,18 @@ 
 		if (is_numeric($account)) $type = 'mail';
 		if ($type != 'mail') return false;
 
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID, true, false, true);
 
 		$changes = array();
-        debugLog("AlterPingChanges on $folderid ($folder) stat: ". $syncstate);
+        debugLog("AlterPingChanges on $folderid ($folder) stat: ".$syncstate);
         $this->mail->reopen($folder);
 
-        $status = $this->mail->getFolderStatus($folder,$ignoreStatusCache=true);
+        $status = $this->mail->getFolderStatus($folder, $ignoreStatusCache = true);
         if (!$status) {
             debugLog("AlterPingChanges: could not stat folder $folder ");
             return false;
         } else {
-            $newstate = "M:". $status['messages'] ."-R:". $status['recent'] ."-U:". $status['unseen']."-NUID:".$status['uidnext']."-UIDV:".$status['uidvalidity'];
+            $newstate = "M:".$status['messages']."-R:".$status['recent']."-U:".$status['unseen']."-NUID:".$status['uidnext']."-UIDV:".$status['uidvalidity'];
 
             // message number is different - change occured
             if ($syncstate != $newstate) {
@@ -1718,7 +1717,7 @@ 
 			$error = $e->getMessage();
 			debugLog(__METHOD__.__LINE__." $_messageUID, $folder ->".$error);
 			// if the server thinks the message does not exist report deletion as success
-			if (stripos($error,'[NONEXISTENT]')!==false) return true;
+			if (stripos($error, '[NONEXISTENT]') !== false) return true;
 			return false;
 		}
 
@@ -1748,8 +1747,8 @@ 
 
 		$_messageUID = (array)$id;
 		$this->_connect($this->account);
-		$rv = $this->mail->flagMessages((($flags) ? "read" : "unread"), $_messageUID,$folder);
-		debugLog("IMAP-SetReadFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as " . (($flags) ? "read" : "unread") . "-->". $rv);
+		$rv = $this->mail->flagMessages((($flags) ? "read" : "unread"), $_messageUID, $folder);
+		debugLog("IMAP-SetReadFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as ".(($flags) ? "read" : "unread")."-->".$rv);
 
 		return $rv;
 	}
@@ -1800,8 +1799,8 @@ 
 		$_messageUID = (array)$id;
 		$this->_connect($this->account);
 		$this->splitID($folderid, $account, $folder);
-		$rv = $this->mail->flagMessages((($flags->flagstatus == 2) ? "flagged" : "unflagged"), $_messageUID,$folder);
-		debugLog("IMAP-SetFlaggedFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as " . (($flags->flagstatus == 2) ? "flagged" : "unflagged") . "-->". $rv);
+		$rv = $this->mail->flagMessages((($flags->flagstatus == 2) ? "flagged" : "unflagged"), $_messageUID, $folder);
+		debugLog("IMAP-SetFlaggedFlag -> set ".array2string($_messageUID).' in Folder '.$folder." as ".(($flags->flagstatus == 2) ? "flagged" : "unflagged")."-->".$rv);
 
 		return $rv;
 	}
@@ -1815,17 +1814,17 @@ 
 	 * @return string
 	 * @throws egw_exception_wrong_parameter
 	 */
-	private function createID($account,$folder,$id=0)
+	private function createID($account, $folder, $id = 0)
 	{
 		if (!is_numeric($folder))
 		{
 			// convert string $folder in numeric id
-			$folder = $this->folder2hash($account,$f=$folder);
+			$folder = $this->folder2hash($account, $f = $folder);
 		}
 
 		$str = $this->backend->createID($account, $folder, $id);
 
-		if ($this->debugLevel>1) debugLog(__METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
+		if ($this->debugLevel > 1) debugLog(__METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
 
 		return $str;
 	}
@@ -1839,14 +1838,14 @@ 
 	 * @param int &$id=null
 	 * @throws egw_exception_wrong_parameter
 	 */
-	private function splitID($str,&$account,&$folder,&$id=null)
+	private function splitID($str, &$account, &$folder, &$id = null)
 	{
 		$this->backend->splitID($str, $account, $folder, $id);
 
 		// convert numeric folder-id back to folder name
-		$folder = $this->hash2folder($account,$f=$folder);
+		$folder = $this->hash2folder($account, $f = $folder);
 
-		if ($this->debugLevel>1) debugLog(__METHOD__."('$str','$account','$folder',$id)");
+		if ($this->debugLevel > 1) debugLog(__METHOD__."('$str','$account','$folder',$id)");
 	}
 
 	/**
@@ -1863,9 +1862,9 @@ 
 	 * @param string $folder
 	 * @return int
 	 */
-	private function folder2hash($account,$folder)
+	private function folder2hash($account, $folder)
 	{
-		if(!isset($this->folderHashes)) $this->readFolderHashes();
+		if (!isset($this->folderHashes)) $this->readFolderHashes();
 
 		if (($index = array_search($folder, (array)$this->folderHashes[$account])) === false)
 		{
@@ -1886,9 +1885,9 @@ 
 	 * @param int $index
 	 * @return string NULL if not used so far
 	 */
-	private function hash2folder($account,$index)
+	private function hash2folder($account, $index)
 	{
-		if(!isset($this->folderHashes)) $this->readFolderHashes();
+		if (!isset($this->folderHashes)) $this->readFolderHashes();
 
 		return $this->folderHashes[$account][$index];
 	}
@@ -1903,9 +1902,9 @@ 
 		if (file_exists($file = $this->hashFile()) &&
 			($hashes = file_get_contents($file)))
 		{
-			$this->folderHashes = json_decode($hashes,true);
+			$this->folderHashes = json_decode($hashes, true);
 			// fallback in case hashes have been serialized instead of being json-encoded
-			if (json_last_error()!=JSON_ERROR_NONE)
+			if (json_last_error() != JSON_ERROR_NONE)
 			{
 				//error_log(__METHOD__.__LINE__." error decoding with json");
 				$this->folderHashes = unserialize($hashes);
@@ -1925,7 +1924,7 @@ 
 	private function storeFolderHashes()
 	{
 		// make sure $this->folderHashes is an array otherwise json_encode may fail on decode for string,integer,float or boolean
-		return file_put_contents($this->hashFile(), json_encode((is_array($this->folderHashes)?$this->folderHashes:array($this->folderHashes))));
+		return file_put_contents($this->hashFile(), json_encode((is_array($this->folderHashes) ? $this->folderHashes : array($this->folderHashes))));
 	}
 
 	/**

Braces +682 added lines, -196 removed lines

@@ -91,29 +91,47 @@ 
 	 */
 	public function __construct(BackendEGW $backend)
 	{
-		if ($GLOBALS['egw_setup']) return;
+		if ($GLOBALS['egw_setup'])
+		{
+			return;
+		}
 
 		//$this->debugLevel=2;
 		$this->backend = $backend;
 		if (!isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Noprefs set: using 0 as default');
+			if ($this->debugLevel>1)
+			{
+				error_log(__METHOD__.__LINE__.' Noprefs set: using 0 as default');
+			}
 			// globals preferences add appname varname value
 			$GLOBALS['egw']->preferences->add('activesync','mail-ActiveSyncProfileID',0,'user');
 			// save prefs
 			$GLOBALS['egw']->preferences->save_repository(true);
 		}
-		if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' ActiveProfileID:'.array2string(self::$profileID));
+		if ($this->debugLevel>1)
+		{
+			error_log(__METHOD__.__LINE__.' ActiveProfileID:'.array2string(self::$profileID));
+		}
 
 		if (is_null(self::$profileID))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' self::ProfileID isNUll:'.array2string(self::$profileID));
+			if ($this->debugLevel>1)
+			{
+				error_log(__METHOD__.__LINE__.' self::ProfileID isNUll:'.array2string(self::$profileID));
+			}
 			self::$profileID =& egw_cache::getSession('mail','activeSyncProfileID');
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' ActiveProfileID (after reading Cache):'.array2string(self::$profileID));
+			if ($this->debugLevel>1)
+			{
+				error_log(__METHOD__.__LINE__.' ActiveProfileID (after reading Cache):'.array2string(self::$profileID));
+			}
 		}
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']))
 		{
-			if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Pref for ProfileID:'.array2string($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']));
+			if ($this->debugLevel>1)
+			{
+				error_log(__METHOD__.__LINE__.' Pref for ProfileID:'.array2string($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID']));
+			}
 			if ($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID'] == 'G')
 			{
 				self::$profileID = 'G'; // this should trigger the fetch of the first negative profile (or if no negative profile is available the firstb there is)
@@ -123,7 +141,10 @@ 
 				self::$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-ActiveSyncProfileID'];
 			}
 		}
-		if ($this->debugLevel>1) error_log(__METHOD__.__LINE__.' Profile Selected (after reading Prefs):'.array2string(self::$profileID));
+		if ($this->debugLevel>1)
+		{
+			error_log(__METHOD__.__LINE__.' Profile Selected (after reading Prefs):'.array2string(self::$profileID));
+		}
 
 		// verify we are on an existing profile, if not running in setup (settings can not be static according to interface!)
 		if (!isset($GLOBALS['egw_setup']))
@@ -136,7 +157,10 @@ 
 				self::$profileID = emailadmin_account::get_default_acc_id();
 			}
 		}
-		if ($this->debugLevel>0) error_log(__METHOD__.'::'.__LINE__.' ProfileSelected:'.self::$profileID);
+		if ($this->debugLevel>0)
+		{
+			error_log(__METHOD__.'::'.__LINE__.' ProfileSelected:'.self::$profileID);
+		}
 		//$this->debugLevel=0;
 	}
 
@@ -211,8 +235,14 @@ 
 				$this->_connect(0,true);
 				$this->_disconnect();
 
-				if (!$this->_wasteID) $errors[] = lang('No valid %1 folder configured!', '<b>'.lang('trash').'</b>');
-				if (!$this->_sentID) $errors[] = lang('No valid %1 folder configured!', '<b>'.lang('send').'</b>');
+				if (!$this->_wasteID)
+				{
+					$errors[] = lang('No valid %1 folder configured!', '<b>'.lang('trash').'</b>');
+				}
+				if (!$this->_sentID)
+				{
+					$errors[] = lang('No valid %1 folder configured!', '<b>'.lang('send').'</b>');
+				}
 			}
 			catch(Exception $e) {
 				$errors[] = lang('Can not open IMAP connection').': '.$e->getMessage();
@@ -234,8 +264,14 @@ 
 	 */
 	private function _connect($account=0)
 	{
-		if (is_null($account)) $account = 0;
-		if ($this->mail && $this->account != $account) $this->_disconnect();
+		if (is_null($account))
+		{
+			$account = 0;
+		}
+		if ($this->mail && $this->account != $account)
+		{
+			$this->_disconnect();
+		}
 
 		$this->_wasteID = false;
 		$this->_sentID = false;
@@ -247,7 +283,10 @@ 
 			//error_log(__METHOD__.__LINE__.' create object with ProfileID:'.array2string(self::$profileID));
 			$this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
 		}
-		if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId)) self::$profileID = $this->mail->icServer->ImapServerId;
+		if (self::$profileID == 0 && isset($this->mail->icServer->ImapServerId) && !empty($this->mail->icServer->ImapServerId))
+		{
+			self::$profileID = $this->mail->icServer->ImapServerId;
+		}
 		$this->mail->openConnection(self::$profileID,false);
 
 		$this->_wasteID = $this->mail->getTrashFolder(false);
@@ -264,7 +303,10 @@ 
 	private function _disconnect()
 	{
 		debugLog(__METHOD__);
-		if ($this->mail) $this->mail->closeConnection();
+		if ($this->mail)
+		{
+			$this->mail->closeConnection();
+		}
 
 		unset($this->mail);
 		unset($this->account);
@@ -283,16 +325,23 @@ 
 		/*foreach($available_accounts as $account)*/ $account = 0;
 		{
 			$this->_connect($account);
-			if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false,$_alwaysGetDefaultFolders=true);
+			if (!isset($this->folders))
+			{
+				$this->folders = $this->mail->getFolderObjects(true,false,$_alwaysGetDefaultFolders=true);
+			}
 			//debugLog(__METHOD__.__LINE__.array2string($this->folders));
 
-			foreach ($this->folders as $folder => $folderObj) {
+			foreach ($this->folders as $folder => $folderObj)
+			{
 				$folderlist[] = $f = array(
 					'id'     => $this->createID($account,$folder),
 					'mod'    => $folderObj->shortDisplayName,
 					'parent' => $this->getParentID($account,$folder),
 				);
-				if ($this->debugLevel>0) debugLog(__METHOD__."() returning ".array2string($f));
+				if ($this->debugLevel>0)
+				{
+					debugLog(__METHOD__."() returning ".array2string($f));
+				}
 			}
 		}
 		//debugLog(__METHOD__."() returning ".array2string($folderlist));
@@ -339,17 +388,28 @@ 
 		}
 
 		if ($protocolversion < 14.0)
-    		debugLog("IMAP-SendMail: " . (isset($rfc822) ? $rfc822 : ""). "task: ".(isset($smartdata['task']) ? $smartdata['task'] : "")." itemid: ".(isset($smartdata['itemid']) ? $smartdata['itemid'] : "")." folder: ".(isset($smartdata['folderid']) ? $smartdata['folderid'] : ""));
-		if ($this->debugLevel>0) debugLog("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
+		{
+		    		debugLog("IMAP-SendMail: " . (isset($rfc822) ? $rfc822 : ""). "task: ".(isset($smartdata['task']) ? $smartdata['task'] : "")." itemid: ".(isset($smartdata['itemid']) ? $smartdata['itemid'] : "")." folder: ".(isset($smartdata['folderid']) ? $smartdata['folderid'] : ""));
+		}
+		if ($this->debugLevel>0)
+		{
+			debugLog("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
+		}
 		//error_log("IMAP-Sendmail: Smartdata = ".array2string($smartdata));
 
 		// initialize our mail_bo
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		}
 		$activeMailProfiles = $this->mail->getAccountIdentities(self::$profileID);
 		// use the standardIdentity
 		$activeMailProfile = mail_bo::getStandardIdentityForProfile($activeMailProfiles,self::$profileID);
 
-		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' ProfileID:'.self::$profileID.' ActiveMailProfile:'.array2string($activeMailProfile));
+		if ($this->debugLevel>2)
+		{
+			debugLog(__METHOD__.__LINE__.' ProfileID:'.self::$profileID.' ActiveMailProfile:'.array2string($activeMailProfile));
+		}
 
 		// initialize the new egw_mailer object for sending
 		$mailObject = new egw_mailer();
@@ -364,23 +424,44 @@ 
 		// prepare addressee list; moved the adding of addresses to the mailobject down
 		// to
 
-		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("To")) as $addressObject) {
-			if (!$addressObject->valid) continue;
-			if ($this->debugLevel>0) debugLog("Header Sentmail To: ".array2string($addressObject) );
+		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("To")) as $addressObject)
+		{
+			if (!$addressObject->valid)
+			{
+				continue;
+			}
+			if ($this->debugLevel>0)
+			{
+				debugLog("Header Sentmail To: ".array2string($addressObject) );
+			}
 			//$mailObject->AddAddress($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$toMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// CC
-		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("Cc")) as $addressObject) {
-			if (!$addressObject->valid) continue;
-			if ($this->debugLevel>0) debugLog("Header Sentmail CC: ".array2string($addressObject) );
+		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("Cc")) as $addressObject)
+		{
+			if (!$addressObject->valid)
+			{
+				continue;
+			}
+			if ($this->debugLevel>0)
+			{
+				debugLog("Header Sentmail CC: ".array2string($addressObject) );
+			}
 			//$mailObject->AddCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$ccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
 		// BCC
-		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("Bcc")) as $addressObject) {
-			if (!$addressObject->valid) continue;
-			if ($this->debugLevel>0) debugLog("Header Sentmail BCC: ".array2string($addressObject) );
+		foreach(emailadmin_imapbase::parseAddressList($mailObject->getHeader("Bcc")) as $addressObject)
+		{
+			if (!$addressObject->valid)
+			{
+				continue;
+			}
+			if ($this->debugLevel>0)
+			{
+				debugLog("Header Sentmail BCC: ".array2string($addressObject) );
+			}
 			//$mailObject->AddBCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 			$bccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal);
 		}
@@ -392,12 +473,14 @@ 
 		$ContentType =$mailObject->getHeader('Content-Type');
 		//error_log(__METHOD__.__LINE__." Header Sentmail original Header (filtered): " . $k.  " = ".trim($ContentType));
 		// if the message is a multipart message, then we should use the sent body
-		if (preg_match("/multipart/i", $ContentType)) {
+		if (preg_match("/multipart/i", $ContentType))
+		{
 			$use_orgbody = true;
 		}
 
 		// save the original content-type header for the body part when forwarding
-		if ($smartdata['task'] == 'forward' && $smartdata['itemid'] && !$use_orgbody) {
+		if ($smartdata['task'] == 'forward' && $smartdata['itemid'] && !$use_orgbody)
+		{
 			//continue; // ignore
 		}
 		// horde/egw_ mailer does everything as utf-8, the following should not be needed
@@ -406,7 +489,8 @@ 
 		// if the message is a multipart message, then we should use the sent body
 		if (($smartdata['task'] == 'new' || $smartdata['task'] == 'reply' || $smartdata['task'] == 'forward') &&
 			((isset($smartdata['replacemime']) && $smartdata['replacemime'] == true) ||
-			$k == "Content-Type" && preg_match("/multipart/i", $ContentType))) {
+			$k == "Content-Type" && preg_match("/multipart/i", $ContentType)))
+		{
 			$use_orgbody = true;
 		}
 		$Body =  $AltBody = "";
@@ -422,13 +506,19 @@ 
 			{
 				$Body = $body;
 				$AltBody = "<pre>".nl2br($body)."</pre>";
-				if ($this->debugLevel>1) debugLog("IMAP-Sendmail: fetched Body as :". $simpleBodyType.'=> Created AltBody');
+				if ($this->debugLevel>1)
+				{
+					debugLog("IMAP-Sendmail: fetched Body as :". $simpleBodyType.'=> Created AltBody');
+				}
 			}
 			else
 			{
 				$AltBody = $body;
 				$Body =  trim(translation::convertHTMLToText($body));
-				if ($this->debugLevel>1) debugLog("IMAP-Sendmail: fetched Body as :". $simpleBodyType.'=> Created Body');
+				if ($this->debugLevel>1)
+				{
+					debugLog("IMAP-Sendmail: fetched Body as :". $simpleBodyType.'=> Created Body');
+				}
 			}
 		}
 		else
@@ -440,57 +530,95 @@ 
 			$Body = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]", $Body);
 			$AltBody = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","[$2]", $AltBody);
 		}
-		if ($this->debugLevel>1 && $Body) debugLog("IMAP-Sendmail: fetched Body as with MessageContentType:". $ContentType.'=>'.$Body);
-		if ($this->debugLevel>1 && $AltBody) debugLog("IMAP-Sendmail: fetched AltBody as with MessageContentType:". $ContentType.'=>'.$AltBody);
+		if ($this->debugLevel>1 && $Body)
+		{
+			debugLog("IMAP-Sendmail: fetched Body as with MessageContentType:". $ContentType.'=>'.$Body);
+		}
+		if ($this->debugLevel>1 && $AltBody)
+		{
+			debugLog("IMAP-Sendmail: fetched AltBody as with MessageContentType:". $ContentType.'=>'.$AltBody);
+		}
 		//error_log(__METHOD__.__LINE__.array2string($mailObject));
 		// if this is a multipart message with a boundary, we must use the original body
 		//if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' mailObject after Inital Parse:'.array2string($mailObject));
-        if ($use_orgbody) {
-    	    if ($this->debugLevel>0) debugLog("IMAP-Sendmail: use_orgbody = true ContentType:".$ContentType);
+        if ($use_orgbody)
+        {
+    	    if ($this->debugLevel>0)
+    	    {
+    	    	debugLog("IMAP-Sendmail: use_orgbody = true ContentType:".$ContentType);
+    	    }
  			// if it is a ClientSideMeetingRequest, we report it as send at all times
 			if (stripos($ContentType,'text/calendar') !== false )
 			{
 				$body = ($text_body = $mailObject->findBody('calendar')) ? $text_body->getContents() : null;
 				$Body = $body;
 				$AltBody = "<pre>".nl2br($body)."</pre>";
-				if ($this->debugLevel>0) debugLog("IMAP-Sendmail: we have a Client Side Meeting Request");
+				if ($this->debugLevel>0)
+				{
+					debugLog("IMAP-Sendmail: we have a Client Side Meeting Request");
+				}
 				// try figuring out the METHOD -> [ContentType] => text/calendar; name=meeting.ics; method=REQUEST
 				$tA = explode(' ',$ContentType);
-				foreach ((array)$tA as $k => $p) if (stripos($p,"method=")!==false) $cSMRMethod= trim(str_replace('METHOD=','',strtoupper($p)));
+				foreach ((array)$tA as $k => $p)
+				{
+					if (stripos($p,"method=")!==false) $cSMRMethod= trim(str_replace('METHOD=','',strtoupper($p)));
+				}
 				$ClientSideMeetingRequest = true;
 			}
         }
 		// now handle the addressee list
 		$toCount = 0;
 		//error_log(__METHOD__.__LINE__.array2string($toMailAddr));
-		foreach((array)$toMailAddr as $address) {
-			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
+		foreach((array)$toMailAddr as $address)
+		{
+			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject)
+			{
 				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
-				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress,(isset($cSMRMethod)?$cSMRMethod:'REQUEST'))) continue;
+				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress,(isset($cSMRMethod)?$cSMRMethod:'REQUEST')))
+				{
+					continue;
+				}
 				$mailObject->AddAddress($emailAddress, $addressObject->personal);
 				$toCount++;
 			}
 		}
 		$ccCount = 0;
-		foreach((array)$ccMailAddr as $address) {
-			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
+		foreach((array)$ccMailAddr as $address)
+		{
+			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject)
+			{
 				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
-				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress)) continue;
+				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress))
+				{
+					continue;
+				}
 				$mailObject->AddCC($emailAddress, $addressObject->personal);
 				$ccCount++;
 			}
 		}
 		$bccCount = 0;
-		foreach((array)$bccMailAddr as $address) {
-			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
+		foreach((array)$bccMailAddr as $address)
+		{
+			foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject)
+			{
 				$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
-				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress)) continue;
+				if ($ClientSideMeetingRequest === true && $allowSendingInvitations == 'sendifnocalnotif' && calendar_boupdate::email_update_requested($emailAddress))
+				{
+					continue;
+				}
 				$mailObject->AddBCC($emailAddress, $addressObject->personal);
 				$bccCount++;
 			}
 		}
-		if ($toCount+$ccCount+$bccCount == 0) return 0; // noone to send mail to
-		if ($ClientSideMeetingRequest === true && $allowSendingInvitations===false) return true;
+		if ($toCount+$ccCount+$bccCount == 0)
+		{
+			return 0;
+		}
+		// noone to send mail to
+		if ($ClientSideMeetingRequest === true && $allowSendingInvitations===false)
+		{
+			return true;
+		}
 		// as we use our mailer (horde mailer) it is detecting / setting the mimetype by itself while creating the mail
 /*
 		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' retrieved Body:'.$body);
@@ -498,7 +626,10 @@ 
 		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' retrieved Body (modified):'.$body);
 */
 		// add signature!! -----------------------------------------------------------------
-		if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' ActiveMailProfile:'.array2string($activeMailProfile));
+		if ($this->debugLevel>2)
+		{
+			debugLog(__METHOD__.__LINE__.' ActiveMailProfile:'.array2string($activeMailProfile));
+		}
 		try
 		{
 			$acc = emailadmin_account::read($this->mail->icServer->ImapServerId);
@@ -520,7 +651,10 @@ 
 		$beforeHtml = ($disableRuler ?'&nbsp;<br>':'&nbsp;<br><hr style="border:dotted 1px silver; width:90%; border:dotted 1px silver;">');
 		$beforePlain = ($disableRuler ?"\r\n\r\n":"\r\n\r\n-- \r\n");
 		$sigText = emailadmin_imapbase::merge($signature,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
-		if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Signature to use:'.$sigText);
+		if ($this->debugLevel>0)
+		{
+			debugLog(__METHOD__.__LINE__.' Signature to use:'.$sigText);
+		}
 		$sigTextHtml = $beforeHtml.$sigText;
 		$sigTextPlain = $beforePlain.translation::convertHTMLToText($sigText);
 		$isreply = $isforward = false;
@@ -532,26 +666,43 @@ 
 		{
 			// now get on, and fetch the original mail
 			$uid = $smartdata['itemid'];
-			if ($this->debugLevel>0) debugLog("IMAP Smartreply is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+			if ($this->debugLevel>0)
+			{
+				debugLog("IMAP Smartreply is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+			}
 			$this->splitID($smartdata['folderid'], $account, $folder);
 
 			$this->mail->reopen($folder);
 			$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
 			$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+			if ($this->debugLevel>3)
+			{
+				debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+			}
+		    if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html'))
+		    {
 				// may be html
-				if ($this->debugLevel>0) debugLog("MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+				if ($this->debugLevel>0)
+				{
+					debugLog("MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+				}
 				$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 				$isreply = true;
 			}
 			// plain text Message part
-			if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain, fetch text:');
+			if ($this->debugLevel>0)
+			{
+				debugLog("MIME Body".' Type:plain, fetch text:');
+			}
 			// if the new part of the message is html, we must preserve it, and handle that the original mail is text/plain
 			$bodyStruct = $this->mail->getMessageBody($uid,'never_display');//'never_display');
 			$bodyBUFF = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-			if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain')) {
-				if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+			if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain'))
+			{
+				if ($this->debugLevel>0)
+				{
+					debugLog("MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+				}
 				$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 				$isreply = true;
 			}
@@ -559,7 +710,10 @@ 
 			{
 				$isreply = true;
 				$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-				if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+				if ($this->debugLevel>0)
+				{
+					debugLog(__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+				}
 			}
 		}
 
@@ -573,16 +727,25 @@ 
 			(isset($smartdata['replacemime']) && $smartdata['replacemime'] == false)))
 		{
 			//force the default for the forwarding -> asmail
-			if (is_array($preferencesArray)) {
+			if (is_array($preferencesArray))
+			{
 				if (!array_key_exists('message_forwarding',$preferencesArray)
 					|| !isset($preferencesArray['message_forwarding'])
-					|| empty($preferencesArray['message_forwarding'])) $preferencesArray['message_forwarding'] = 'asmail';
-			} else {
+					|| empty($preferencesArray['message_forwarding']))
+				{
+					$preferencesArray['message_forwarding'] = 'asmail';
+				}
+			}
+			else
+			{
 				$preferencesArray['message_forwarding'] = 'asmail';
 			}
 			// construct the uid of the message out of the itemid - seems to be the uid, no construction needed
 			$uid = $smartdata['itemid'];
-			if ($this->debugLevel>0) debugLog("IMAP Smartfordward is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+			if ($this->debugLevel>0)
+			{
+				debugLog("IMAP Smartfordward is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+			}
 			$this->splitID($smartdata['folderid'], $account, $folder);
 
 			$this->mail->reopen($folder);
@@ -604,33 +767,53 @@ 
 			{
 				// now get on, and fetch the original mail
 				$uid = $smartdata['itemid'];
-				if ($this->debugLevel>0) debugLog("IMAP Smartreply is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+				if ($this->debugLevel>0)
+				{
+					debugLog("IMAP Smartreply is called with FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+				}
 				$this->splitID($smartdata['folderid'], $account, $folder);
 
 				$this->mail->reopen($folder);
 				$bodyStruct = $this->mail->getMessageBody($uid, 'html_only');
 				$bodyBUFFHtml = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-				if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
-				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+				if ($this->debugLevel>3)
+				{
+					debugLog(__METHOD__.__LINE__.' html_only:'.$bodyBUFFHtml);
+				}
+				if ($bodyBUFFHtml != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html'))
+				{
 					// may be html
-					if ($this->debugLevel>0) debugLog("MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+					if ($this->debugLevel>0)
+					{
+						debugLog("MIME Body".' Type:html (fetched with html_only):'.$bodyBUFFHtml);
+					}
 					$AltBody = $AltBody."</br>".$bodyBUFFHtml.$sigTextHtml;
 					$isforward = true;
 				}
 				// plain text Message part
-				if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain, fetch text:');
+				if ($this->debugLevel>0)
+				{
+					debugLog("MIME Body".' Type:plain, fetch text:');
+				}
 				// if the new part of the message is html, we must preserve it, and handle that the original mail is text/plain
 				$bodyStruct = $this->mail->getMessageBody($uid,'never_display');//'never_display');
 				$bodyBUFF = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-				if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain')) {
-					if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+				if ($bodyBUFF != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/plain'))
+				{
+					if ($this->debugLevel>0)
+					{
+						debugLog("MIME Body".' Type:plain (fetched with never_display):'.$bodyBUFF);
+					}
 					$Body = $Body."\r\n".$bodyBUFF.$sigTextPlain;
 					$isforward = true;
 				}
 				if (!empty($bodyBUFF) && empty($bodyBUFFHtml) && !empty($AltBody))
 				{
 					$AltBody = $AltBody."</br><pre>".nl2br($bodyBUFF).'</pre>'.$sigTextHtml;
-					if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+					if ($this->debugLevel>0)
+					{
+						debugLog(__METHOD__.__LINE__." no html Body found use modified plaintext body for txt/html: ".$AltBody);
+					}
 					$isforward = true;
 				}
 				// get all the attachments and add them too.
@@ -640,10 +823,16 @@ 
 				$attachmentNames = false;
 				if (is_array($attachments) && count($attachments)>0)
 				{
-					if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$uid.' found:'.count($attachments));
+					if ($this->debugLevel>0)
+					{
+						debugLog(__METHOD__.__LINE__.' gather Attachments for BodyCreation of/for MessageID:'.$uid.' found:'.count($attachments));
+					}
 					foreach((array)$attachments as $key => $attachment)
 					{
-						if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+						if ($this->debugLevel>0)
+						{
+							debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+						}
 						$attachmentNames .= $attachment['name']."\n";
 						$attachmentData = '';
 						$attachmentData	= $this->mail->getAttachment($uid, $attachment['partID'],0,false,false,$folder);
@@ -662,18 +851,27 @@ 
 		// now set the body
 		if ($AltBody && ($html_body = $mailObject->findBody('html')))
 		{
-			if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__.' -> '.$AltBody);
+			if ($this->debugLevel>1)
+			{
+				debugLog(__METHOD__.__LINE__.' -> '.$AltBody);
+			}
 			$html_body->setContents($AltBody,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		if ($Body && ($text_body = $mailObject->findBody('plain')))
 		{
-			if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__.' -> '.$Body);
+			if ($this->debugLevel>1)
+			{
+				debugLog(__METHOD__.__LINE__.' -> '.$Body);
+			}
 			$text_body->setContents($Body,array('encoding'=>Horde_Mime_Part::DEFAULT_ENCODING));
 		}
 		//advanced debugging
 		// Horde SMTP Class uses utf-8 by default.
         //debugLog("IMAP-SendMail: parsed message: ". print_r($message,1));
-		if ($this->debugLevel>2) debugLog("IMAP-SendMail: MailObject:".array2string($mailObject));
+		if ($this->debugLevel>2)
+		{
+			debugLog("IMAP-SendMail: MailObject:".array2string($mailObject));
+		}
 
 		// set a higher timeout for big messages
 		@set_time_limit(120);
@@ -691,7 +889,10 @@ 
 		if (( $smartdata['task'] == 'reply' || $smartdata['task'] == 'forward') && $send == true)
 		{
 			$uid = $smartdata['itemid'];
-			if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' tASK:'.$smartdata['task']." FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+			if ($this->debugLevel>0)
+			{
+				debugLog(__METHOD__.__LINE__.' tASK:'.$smartdata['task']." FolderID:".$smartdata['folderid'].' and ItemID:'.$smartdata['itemid']);
+			}
 			$this->splitID($smartdata['folderid'], $account, $folder);
 			//error_log(__METHOD__.__LINE__.' Folder:'.$folder.' Uid:'.$uid);
 			$this->mail->reopen($folder);
@@ -700,7 +901,9 @@ 
 			if ($this->mail->isDraftFolder($folder) && !$this->mail->isTemplateFolder($folder))
 			{
 				$this->mail->deleteMessages(array($uid),$folder);
-			} else {
+			}
+			else
+			{
 				$this->mail->flagMessages("answered", array($uid),$folder);
 				if ($smartdata['task']== "forward")
 				{
@@ -714,7 +917,8 @@ 
 		{
 			$asf = false;
 			$sentFolder = $this->mail->getSentFolder();
-			if ($this->_sentID) {
+			if ($this->_sentID)
+			{
 				$folderArray[] = $this->_sentID;
 			}
 			else if(isset($sentFolder) && $sentFolder != 'none')
@@ -728,27 +932,40 @@ 
 				// we dont try guessing
 				$asf = true;
 			}
-			if (count($folderArray) > 0) {
-				foreach((array)$bccMailAddr as $address) {
-					foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject) {
+			if (count($folderArray) > 0)
+			{
+				foreach((array)$bccMailAddr as $address)
+				{
+					foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($address):$address)) as $addressObject)
+					{
 						$emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
 						$mailAddr[] = array($emailAddress, $addressObject->personal);
 					}
 				}
 				$BCCmail='';
-				if (count($mailAddr)>0) $BCCmail = $mailObject->AddrAppend("Bcc",$mailAddr);
-				foreach($folderArray as $folderName) {
-					if($this->mail->isSentFolder($folderName)) {
+				if (count($mailAddr)>0)
+				{
+					$BCCmail = $mailObject->AddrAppend("Bcc",$mailAddr);
+				}
+				foreach($folderArray as $folderName)
+				{
+					if($this->mail->isSentFolder($folderName))
+					{
 						$flags = '\\Seen';
-					} elseif($this->mail->isDraftFolder($folderName)) {
+					}
+					elseif($this->mail->isDraftFolder($folderName))
+					{
 						$flags = '\\Draft';
-					} else {
+					}
+					else
+					{
 						$flags = '';
 					}
 					$asf = true;
 					//debugLog(__METHOD__.__LINE__.'->'.array2string($this->mail->icServer));
 					$this->mail->openConnection(self::$profileID,false);
-					if ($this->mail->folderExists($folderName)) {
+					if ($this->mail->folderExists($folderName))
+					{
 						try
 						{
 							$this->mail->appendMessage($folderName,$mailObject->getRaw(), null,
@@ -795,12 +1012,18 @@ 
 	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
 	{
 		//$this->debugLevel=4;
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		}
 		debugLog(__METHOD__.__LINE__.' FolderID:'.$folderid.' ID:'.$id.' TruncSize:'.$truncsize.' Bodypreference: '.array2string($bodypreference));
 		$rv = $this->splitID($folderid,$account,$_folderName,$xid);
 		$this->mail->reopen($_folderName);
 		$stat = $this->StatMessage($folderid, $id);
-		if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.array2string($stat));
+		if ($this->debugLevel>3)
+		{
+			debugLog(__METHOD__.__LINE__.array2string($stat));
+		}
 		// StatMessage should reopen the folder in question, so we dont need folderids in the following statements.
 		if ($stat)
 		{
@@ -816,15 +1039,24 @@ 
 			//$rawHeaders = $this->mail->getMessageRawHeader($id);
 			// simple style
 			// start AS12 Stuff (bodypreference === false) case = old behaviour
-			if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__. ' for message with ID:'.$id.' with headers:'.array2string($headers));
-			if ($bodypreference === false) {
+			if ($this->debugLevel>0)
+			{
+				debugLog(__METHOD__.__LINE__. ' for message with ID:'.$id.' with headers:'.array2string($headers));
+			}
+			if ($bodypreference === false)
+			{
 				$bodyStruct = $this->mail->getMessageBody($id, 'only_if_no_text', '', null, true,$_folderName);
 				$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
 				//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
-				if (stripos($body,'<style')!==false) $body = preg_replace("/<style.*?<\/style>/is", "", $body); // in case there is only a html part
+				if (stripos($body,'<style')!==false)
+				{
+					$body = preg_replace("/<style.*?<\/style>/is", "", $body);
+				}
+				// in case there is only a html part
 				// remove all other html
 				$body = strip_tags($body);
-				if(strlen($body) > $truncsize) {
+				if(strlen($body) > $truncsize)
+				{
 					$body = utf8_truncate($body, $truncsize);
 					$output->bodytruncated = 1;
 				}
@@ -838,38 +1070,73 @@ 
 			else // style with bodypreferences
 			{
 				if (isset($bodypreference[1]) && !isset($bodypreference[1]["TruncationSize"]))
-					$bodypreference[1]["TruncationSize"] = 1024*1024;
+				{
+									$bodypreference[1]["TruncationSize"] = 1024*1024;
+				}
 				if (isset($bodypreference[2]) && !isset($bodypreference[2]["TruncationSize"]))
-					$bodypreference[2]["TruncationSize"] = 1024*1024;
+				{
+									$bodypreference[2]["TruncationSize"] = 1024*1024;
+				}
 				if (isset($bodypreference[3]) && !isset($bodypreference[3]["TruncationSize"]))
-					$bodypreference[3]["TruncationSize"] = 1024*1024;
+				{
+									$bodypreference[3]["TruncationSize"] = 1024*1024;
+				}
 				if (isset($bodypreference[4]) && !isset($bodypreference[4]["TruncationSize"]))
-					$bodypreference[4]["TruncationSize"] = 1024*1024;
+				{
+									$bodypreference[4]["TruncationSize"] = 1024*1024;
+				}
 				// set the protocoll class
 				$output->airsyncbasebody = new SyncAirSyncBaseBody();
-				if ($this->debugLevel>0) debugLog("airsyncbasebody!");
+				if ($this->debugLevel>0)
+				{
+					debugLog("airsyncbasebody!");
+				}
 				// fetch the body (try to gather data only once)
 				$css ='';
 				$bodyStruct = $this->mail->getMessageBody($id, 'html_only', '', null, true,$_folderName);
-				if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
+				if ($this->debugLevel>2)
+				{
+					debugLog(__METHOD__.__LINE__.' html_only Struct:'.array2string($bodyStruct));
+				}
 				$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,true,false);
-				if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' html_only:'.$body);
-			    if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html')) {
+				if ($this->debugLevel>3)
+				{
+					debugLog(__METHOD__.__LINE__.' html_only:'.$body);
+				}
+			    if ($body != "" && (is_array($bodyStruct) && $bodyStruct[0]['mimeType']=='text/html'))
+			    {
 					// may be html
-					if ($this->debugLevel>0) debugLog("MIME Body".' Type:html (fetched with html_only)');
+					if ($this->debugLevel>0)
+					{
+						debugLog("MIME Body".' Type:html (fetched with html_only)');
+					}
 					$css = $this->mail->getStyles($bodyStruct);
 					$output->airsyncbasenativebodytype=2;
-				} else {
+				}
+				else
+				{
 					// plain text Message
-					if ($this->debugLevel>0) debugLog("MIME Body".' Type:plain, fetch text (HTML, if no text available)');
+					if ($this->debugLevel>0)
+					{
+						debugLog("MIME Body".' Type:plain, fetch text (HTML, if no text available)');
+					}
 					$output->airsyncbasenativebodytype=1;
 					$bodyStruct = $this->mail->getMessageBody($id,'never_display', '', null, true,$_folderName); //'only_if_no_text');
-					if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
+					if ($this->debugLevel>3)
+					{
+						debugLog(__METHOD__.__LINE__.' plain text Struct:'.array2string($bodyStruct));
+					}
 					$body = $this->mail->getdisplayableBody($this->mail,$bodyStruct,false,false);
-					if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' never display html(plain text only):'.$body);
+					if ($this->debugLevel>3)
+					{
+						debugLog(__METHOD__.__LINE__.' never display html(plain text only):'.$body);
+					}
 				}
 				// whatever format decode (using the correct encoding)
-				if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__."MIME Body".' Type:'.($output->airsyncbasenativebodytype==2?' html ':' plain ').$body);
+				if ($this->debugLevel>3)
+				{
+					debugLog(__METHOD__.__LINE__."MIME Body".' Type:'.($output->airsyncbasenativebodytype==2?' html ':' plain ').$body);
+				}
 				//$body = html_entity_decode($body,ENT_QUOTES,$this->mail->detect_encoding($body));
 				// prepare plaintextbody
 				if ($output->airsyncbasenativebodytype == 2)
@@ -889,7 +1156,10 @@ 
 				// remove all other html
 				$plainBody = preg_replace("/<br.*>/is","\r\n",$plainBody);
 				$plainBody = strip_tags($plainBody);
-				if ($this->debugLevel>3 && $output->airsyncbasenativebodytype==1) debugLog(__METHOD__.__LINE__.' Plain Text:'.$plainBody);
+				if ($this->debugLevel>3 && $output->airsyncbasenativebodytype==1)
+				{
+					debugLog(__METHOD__.__LINE__.' Plain Text:'.$plainBody);
+				}
 				//$body = str_replace("\n","\r\n", str_replace("\r","",$body)); // do we need that?
 				if (isset($bodypreference[4]) && ($mimesupport==2 || ($mimesupport ==1 && stristr($headers['CONTENT-TYPE'],'signed') !== false)))
 				{
@@ -903,7 +1173,10 @@ 
 						// we create a complete new rfc822 message here to pass a clean one to the client.
 						// this strips a lot of information, but ...
 						$Header = $Body = '';
-						if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." Creation of Mailobject.");
+						if ($this->debugLevel>0)
+						{
+							debugLog(__METHOD__.__LINE__." Creation of Mailobject.");
+						}
 						//if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__." Using data from ".$rawHeaders.$rawBody);
 						//$this->mail->parseRawMessageIntoMailObject($mailObject,$rawHeaders.$rawBody,$Header,$Body);
 						//debugLog(__METHOD__.__LINE__.array2string($headers));
@@ -916,33 +1189,52 @@ 
 						$mailObject->Subject = $headers['SUBJECT'];
 						$mailObject->MessageID = $headers['MESSAGE-ID'];
 						// from
-						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['FROM']):$headers['FROM'])) as $addressObject) {
+						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['FROM']):$headers['FROM'])) as $addressObject)
+						{
 							//debugLog(__METHOD__.__LINE__.'Address to add (FROM):'.array2string($addressObject));
-							if (!$addressObject->valid) continue;
+							if (!$addressObject->valid)
+							{
+								continue;
+							}
 							$mailObject->From = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : '');
 							$mailObject->FromName = $addressObject->personal;
 //error_log(__METHOD__.__LINE__.'Address to add (FROM):'.array2string($addressObject));
 						}
 						// to
-						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['TO']):$headers['TO'])) as $addressObject) {
+						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['TO']):$headers['TO'])) as $addressObject)
+						{
 							//debugLog(__METHOD__.__LINE__.'Address to add (TO):'.array2string($addressObject));
-							if (!$addressObject->valid) continue;
+							if (!$addressObject->valid)
+							{
+								continue;
+							}
 							$mailObject->AddAddress($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 						}
 						// CC
-						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['CC']):$headers['CC'])) as $addressObject) {
+						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['CC']):$headers['CC'])) as $addressObject)
+						{
 							//debugLog(__METHOD__.__LINE__.'Address to add (CC):'.array2string($addressObject));
-							if (!$addressObject->valid) continue;
+							if (!$addressObject->valid)
+							{
+								continue;
+							}
 							$mailObject->AddCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 						}
 						//	AddReplyTo
-						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['REPLY-TO']):$headers['REPLY-TO'])) as $addressObject) {
+						foreach(emailadmin_imapbase::parseAddressList((get_magic_quotes_gpc()?stripslashes($headers['REPLY-TO']):$headers['REPLY-TO'])) as $addressObject)
+						{
 							//debugLog(__METHOD__.__LINE__.'Address to add (ReplyTO):'.array2string($addressObject));
-							if (!$addressObject->valid) continue;
+							if (!$addressObject->valid)
+							{
+								continue;
+							}
 							$mailObject->AddReplyTo($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal);
 						}
 						$Header = $Body = ''; // we do not use Header and Body we use the MailObject
-						if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__." Creation of Mailobject succeeded.");
+						if ($this->debugLevel>0)
+						{
+							debugLog(__METHOD__.__LINE__." Creation of Mailobject succeeded.");
+						}
 					}
 					catch (egw_exception_assertion_failed $e)
 					{
@@ -950,9 +1242,18 @@ 
 						$Header = $Body = '';
 					}
 
-					if ($this->debugLevel>0) debugLog("MIME Body -> ".$body); // body is retrieved up
-					if ($output->airsyncbasenativebodytype==2) { //html
-						if ($this->debugLevel>0) debugLog("HTML Body with requested pref 4");
+					if ($this->debugLevel>0)
+					{
+						debugLog("MIME Body -> ".$body);
+					}
+					// body is retrieved up
+					if ($output->airsyncbasenativebodytype==2)
+					{
+//html
+						if ($this->debugLevel>0)
+						{
+							debugLog("HTML Body with requested pref 4");
+						}
 						$html = '<html>'.
 	    					    '<head>'.
 						        '<meta name="Generator" content="Z-Push">'.
@@ -964,11 +1265,19 @@ 
 							    '</body>'.
 								'</html>';
 						$mailObject->setHtmlBody(str_replace("\n","\r\n", str_replace("\r","",$html)),null,false);
-						if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__." MIME Body (constructed)-> ".$mailObject->findBody('html')->getContents());
+						if ($this->debugLevel>2)
+						{
+							debugLog(__METHOD__.__LINE__." MIME Body (constructed)-> ".$mailObject->findBody('html')->getContents());
+						}
 						$mailObject->setBody(empty($plainBody)?strip_tags($body):$plainBody);
 					}
-					if ($output->airsyncbasenativebodytype==1) { //plain
-						if ($this->debugLevel>0) debugLog("Plain Body with requested pref 4");
+					if ($output->airsyncbasenativebodytype==1)
+					{
+//plain
+						if ($this->debugLevel>0)
+						{
+							debugLog("Plain Body with requested pref 4");
+						}
 						$mailObject->setBody($plainBody);
 					}
 					// we still need the attachments to be added ( if there are any )
@@ -981,7 +1290,10 @@ 
 						//error_log(__METHOD__.__LINE__.array2string($attachments));
 						foreach((array)$attachments as $key => $attachment)
 						{
-							if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+							if ($this->debugLevel>0)
+							{
+								debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
+							}
 							$attachmentData = '';
 							$attachmentData	= $this->mail->getAttachment($id, $attachment['partID'],0,false,false,$_folderName);
 							$mailObject->AddStringAttachment($attachmentData['attachment'], $mailObject->EncodeHeader($attachment['name']), $attachment['mimeType']);
@@ -991,13 +1303,22 @@ 
 					$Header = $mailObject->getMessageHeader();
 					//debugLog(__METHOD__.__LINE__.' MailObject-Header:'.array2string($Header));
 					$Body = trim($mailObject->getMessageBody()); // philip thinks this is needed, so lets try if it does any good/harm
-					if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' MailObject:'.array2string($mailObject));
-					if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__." Setting Mailobjectcontent to output:".$Header.self::$LE.self::$LE.$Body);
+					if ($this->debugLevel>3)
+					{
+						debugLog(__METHOD__.__LINE__.' MailObject:'.array2string($mailObject));
+					}
+					if ($this->debugLevel>2)
+					{
+						debugLog(__METHOD__.__LINE__." Setting Mailobjectcontent to output:".$Header.self::$LE.self::$LE.$Body);
+					}
 					$output->airsyncbasebody->data = $Header.self::$LE.self::$LE.$Body;
 				}
 				else if (isset($bodypreference[2]))
 				{
-					if ($this->debugLevel>0) debugLog("HTML Body with requested pref 2");
+					if ($this->debugLevel>0)
+					{
+						debugLog("HTML Body with requested pref 2");
+					}
 					// Send HTML if requested and native type was html
 					$output->airsyncbasebody->type = 2;
 					$htmlbody = '<html>'.
@@ -1030,7 +1351,10 @@ 
 				else
 				{
 					// Send Plaintext as Fallback or if original body is plainttext
-					if ($this->debugLevel>0) debugLog("Plaintext Body:".$plainBody);
+					if ($this->debugLevel>0)
+					{
+						debugLog("Plaintext Body:".$plainBody);
+					}
 					/* we use plainBody (set above) instead
 					$bodyStruct = $this->mail->getMessageBody($id,'only_if_no_text'); //'never_display');
 					$plain = $this->mail->getdisplayableBody($this->mail,$bodyStruct);
@@ -1100,7 +1424,10 @@ 
 				//error_log(__METHOD__.__LINE__.array2string($attachments));
 				foreach ($attachments as $key => $attach)
 				{
-					if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
+					if ($this->debugLevel>0)
+					{
+						debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attach));
+					}
 
 					// pass meeting requests to calendar plugin
 					if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
@@ -1111,9 +1438,12 @@ 
 						$output->messageclass = "IPM.Schedule.Meeting.Request";
 						continue;	// do NOT add attachment as attachment
 					}
-					if(isset($output->_mapping['POOMMAIL:Attachments'])) {
+					if(isset($output->_mapping['POOMMAIL:Attachments']))
+					{
 						$attachment = new SyncAttachment();
-					} else if(isset($output->_mapping['AirSyncBase:Attachments'])) {
+					}
+					else if(isset($output->_mapping['AirSyncBase:Attachments']))
+					{
 						$attachment = new SyncAirSyncBaseAttachment();
 					}
 					$attachment->attsize = $attach['size'];
@@ -1130,20 +1460,28 @@ 
 						//	debugLog("'".$part->headers['content-id']."'  ".$attachment->contentid);
 						$attachment->contenttype = trim($attach['mimeType']);
 						//	debugLog("'".$part->headers['content-type']."'  ".$attachment->contentid);
-					} else {
+					}
+					else
+					{
 						$attachment->attmethod=1;
 					}
 
-					if (isset($output->_mapping['POOMMAIL:Attachments'])) {
+					if (isset($output->_mapping['POOMMAIL:Attachments']))
+					{
 						array_push($output->attachments, $attachment);
-					} else if(isset($output->_mapping['AirSyncBase:Attachments'])) {
+					}
+					else if(isset($output->_mapping['AirSyncBase:Attachments']))
+					{
 						array_push($output->airsyncbaseattachments, $attachment);
 					}
 				}
 			}
 			//$this->debugLevel=0;
 			// end handle Attachments
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.array2string($output));
+			if ($this->debugLevel>3)
+			{
+				debugLog(__METHOD__.__LINE__.array2string($output));
+			}
 			return $output;
 		}
 		return false;
@@ -1204,14 +1542,18 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return true, prints the content of the attachment
 	 */
-	function GetAttachmentData($fid,$attname) {
+	function GetAttachmentData($fid,$attname)
+	{
 		debugLog("getAttachmentData: $fid (attname: '$attname')");
 		error_log(__METHOD__.__LINE__." Fid: $fid (attname: '$attname')");
 		list($folderid, $id, $part) = explode(":", $attname);
 
 		$this->splitID($folderid, $account, $folder);
 
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		}
 
 		$this->mail->reopen($folder);
 		$attachment = $this->mail->getAttachment($id,$part,0,false,false,$folder);
@@ -1230,14 +1572,18 @@ 
      * @param string $attname - should contain (folder)id
 	 * @return SyncAirSyncBaseFileAttachment-object
 	 */
-	function ItemOperationsGetAttachmentData($fid,$attname) {
+	function ItemOperationsGetAttachmentData($fid,$attname)
+	{
 		debugLog("ItemOperationsGetAttachmentData: (attname: '$attname')");
 
 		list($folderid, $id, $part) = explode(":", $attname);
 
 		$this->splitID($folderid, $account, $folder);
 
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = mail_bo::getInstance(false, self::$profileID,true,false,true);
+		}
 
 		$this->mail->reopen($folder);
 		$att = $this->mail->getAttachment($id,$part,0,false,false,$folder);
@@ -1249,7 +1595,8 @@ 
 			return $attachment;
 		}
 		*/
-		if (is_array($att)) {
+		if (is_array($att))
+		{
 			$attachment->_data = $att['attachment'];
 			$attachment->contenttype = trim($att['type']);
 		}
@@ -1297,12 +1644,16 @@ 
 	 * at all on the source folder, and the destination folder will show the new message
 	 *
 	 */
-	function MoveMessage($folderid, $id, $newfolderid) {
+	function MoveMessage($folderid, $id, $newfolderid)
+	{
 		debugLog("IMAP-MoveMessage: (sfid: '$folderid'  id: '$id'  dfid: '$newfolderid' )");
 		$this->splitID($folderid, $account, $srcFolder);
 		$this->splitID($newfolderid, $account, $destFolder);
 		debugLog("IMAP-MoveMessage: (SourceFolder: '$srcFolder'  id: '$id'  DestFolder: '$destFolder' )");
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		}
 		$this->mail->reopen($destFolder);
 		$status = $this->mail->getFolderStatus($destFolder);
 		$uidNext = $status['uidnext'];
@@ -1323,7 +1674,10 @@ 
 	public function GetMessageList($folderid, $cutoffdate=NULL)
 	{
 		static $cutdate;
-		if (!empty($cutoffdate) && $cutoffdate >0 && (empty($cutdate) || $cutoffdate != $cutdate))  $cutdate = $cutoffdate;
+		if (!empty($cutoffdate) && $cutoffdate >0 && (empty($cutdate) || $cutoffdate != $cutdate))
+		{
+			$cutdate = $cutoffdate;
+		}
 		debugLog (__METHOD__.' for Folder:'.$folderid.' SINCE:'.$cutdate.'/'.date("d-M-Y", $cutdate));
 		if (empty($cutdate))
 		{
@@ -1335,7 +1689,10 @@ 
 
 	private function fetchMessages($folderid, $cutoffdate=NULL, $_id=NULL)
 	{
-		if ($this->debugLevel>1) $gstarttime = microtime (true);
+		if ($this->debugLevel>1)
+		{
+			$gstarttime = microtime (true);
+		}
 		//debugLog(__METHOD__.__LINE__);
 		$rv_messages = array();
 		// if the message is still available within the class, we use it instead of fetching it again
@@ -1346,7 +1703,10 @@ 
 		}
 		if (empty($rv_messages))
 		{
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if ($this->debugLevel>1)
+			{
+				$starttime = microtime (true);
+			}
 			$this->_connect($this->account);
 			if ($this->debugLevel>1)
 			{
@@ -1355,16 +1715,28 @@ 
 			}
 			$messagelist = array();
 			// if not connected, any further action must fail
-			if (!empty($cutoffdate)) $_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if (!empty($cutoffdate))
+			{
+				$_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
+			}
+			if ($this->debugLevel>1)
+			{
+				$starttime = microtime (true);
+			}
 			$rv = $this->splitID($folderid,$account,$_folderName,$id);
 			if ($this->debugLevel>1)
 			{
 				$endtime = microtime(true) - $starttime;
 				debugLog(__METHOD__. " splitID took : ".$endtime.' for FolderID:'.$folderid);
 			}
-			if ($this->debugLevel>1) debugLog(__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
-			if ($this->debugLevel>1) $starttime = microtime (true);
+			if ($this->debugLevel>1)
+			{
+				debugLog(__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id).'/'.$id);
+			}
+			if ($this->debugLevel>1)
+			{
+				$starttime = microtime (true);
+			}
 			$_numberOfMessages = (empty($cutoffdate)?250:99999);
 			$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=1, $_numberOfMessages, $_sort=0, $_reverse=false, $_filter, $_id);
 			if ($this->debugLevel>1)
@@ -1373,25 +1745,54 @@ 
 				debugLog(__METHOD__. " getHeaders call took : ".$endtime.' for FolderID:'.$_folderName);
 			}
 		}
-		if ($_id == NULL && $this->debugLevel>1)  debugLog(__METHOD__." found :". count($rv_messages['header']));
+		if ($_id == NULL && $this->debugLevel>1)
+		{
+			debugLog(__METHOD__." found :". count($rv_messages['header']));
+		}
 		//debugLog(__METHOD__.__LINE__.' Result:'.array2string($rv_messages));
 		foreach ((array)$rv_messages['header'] as $k => $vars)
 		{
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel>3)
+			{
+				debugLog(__METHOD__.__LINE__.' ID to process:'.$vars['uid'].' Subject:'.$vars['subject']);
+			}
 			$this->messages[$vars['uid']] = $vars;
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.' MailID:'.$k.'->'.array2string($vars));
-			if (!empty($vars['deleted'])) continue; // cut of deleted messages
-			if ($cutoffdate && $vars['date'] < $cutoffdate) continue; // message is out of range for cutoffdate, ignore it
-			if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
+			if ($this->debugLevel>3)
+			{
+				debugLog(__METHOD__.__LINE__.' MailID:'.$k.'->'.array2string($vars));
+			}
+			if (!empty($vars['deleted']))
+			{
+				continue;
+			}
+			// cut of deleted messages
+			if ($cutoffdate && $vars['date'] < $cutoffdate)
+			{
+				continue;
+			}
+			// message is out of range for cutoffdate, ignore it
+			if ($this->debugLevel>0)
+			{
+				debugLog(__METHOD__.__LINE__.' ID to report:'.$vars['uid'].' Subject:'.$vars['subject']);
+			}
 			$mess["mod"] = $vars['date'];
 			$mess["id"] = $vars['uid'];
 			// 'seen' aka 'read' is the only flag we want to know about
 			$mess["flags"] = 0;
 			// outlook supports additional flags, set them to 0
 			$mess["olflags"] = 0;
-			if($vars["seen"]) $mess["flags"] = 1;
-			if($vars["flagged"]) $mess["olflags"] = 2;
-			if ($this->debugLevel>3) debugLog(__METHOD__.__LINE__.array2string($mess));
+			if($vars["seen"])
+			{
+				$mess["flags"] = 1;
+			}
+			if($vars["flagged"])
+			{
+				$mess["olflags"] = 2;
+			}
+			if ($this->debugLevel>3)
+			{
+				debugLog(__METHOD__.__LINE__.array2string($mess));
+			}
 			$messagelist[$vars['uid']] = $mess;
 			unset($mess);
 		}
@@ -1412,8 +1813,14 @@ 
 	 */
 	public function getSearchResultsMailbox($searchquery)
 	{
-		if (!is_array($searchquery)) return array();
-		if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.array2string($searchquery));
+		if (!is_array($searchquery))
+		{
+			return array();
+		}
+		if ($this->debugLevel>0)
+		{
+			debugLog(__METHOD__.__LINE__.array2string($searchquery));
+		}
 		// 19.10.2011 16:28:59 [24502] mail_activesync::getSearchResultsMailbox1408
 		//Array(
 		//	[query] => Array(
@@ -1432,27 +1839,45 @@ 
 		//	[rebuildresults] => 1
 		//	[deeptraversal] =>
 		//	[range] => 0-999)
-		if (isset($searchquery['rebuildresults'])) {
+		if (isset($searchquery['rebuildresults']))
+		{
 			$rebuildresults = $searchquery['rebuildresults'];
-		} else {
+		}
+		else
+		{
 			$rebuildresults = false;
 		}
-		if ($this->debugLevel>0) debugLog( 'RebuildResults ['.$rebuildresults.']' );
+		if ($this->debugLevel>0)
+		{
+			debugLog( 'RebuildResults ['.$rebuildresults.']' );
+		}
 
-		if (isset($searchquery['deeptraversal'])) {
+		if (isset($searchquery['deeptraversal']))
+		{
 			$deeptraversal = $searchquery['deeptraversal'];
-		} else {
+		}
+		else
+		{
 			$deeptraversal = false;
 		}
-		if ($this->debugLevel>0) debugLog( 'DeepTraversal ['.$deeptraversal.']' );
+		if ($this->debugLevel>0)
+		{
+			debugLog( 'DeepTraversal ['.$deeptraversal.']' );
+		}
 
-		if (isset($searchquery['range'])) {
+		if (isset($searchquery['range']))
+		{
 			$range = explode("-",$searchquery['range']);
 			$limit = $range[1] - $range[0] + 1;
-		} else {
+		}
+		else
+		{
 			$range = false;
 		}
-		if ($this->debugLevel>0) debugLog( 'Range ['.print_r($range, true).']' );
+		if ($this->debugLevel>0)
+		{
+			debugLog( 'Range ['.print_r($range, true).']' );
+		}
 
 		//foreach($searchquery['query'] as $k => $value) {
 		//	$query = $value;
@@ -1465,7 +1890,10 @@ 
 		if (is_null(emailadmin_imapbase::$supportsORinQuery) || !isset(emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID]))
 		{
 			emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),$callback=null,$callback_params=array(),$expiration=60*60*10);
-			if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID]=true;
+			if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID]))
+			{
+				emailadmin_imapbase::$supportsORinQuery[$this->mail->profileID]=true;
+			}
 		}
 
 		if (isset($searchquery['query'][0]['value']['Search:FreeText']))
@@ -1491,7 +1919,10 @@ 
 						);
 
 		//$_filter[] = array('type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
-		if ($this->debugLevel>1) debugLog (__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
+		if ($this->debugLevel>1)
+		{
+			debugLog (__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter));
+		}
 		$rv_messages = $this->mail->getHeaders($_folderName, $_startMessage=1, $_numberOfMessages=($limit?$limit:9999999), $_sort=0, $_reverse=false, $_filter, $_id=NULL);
 		//debugLog(__METHOD__.__LINE__.array2string($rv_messages));
 		$list=array();
@@ -1519,17 +1950,26 @@ 
 	private function getParentID($account,$folder)
 	{
 		$this->_connect($account);
-		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false);
+		if (!isset($this->folders))
+		{
+			$this->folders = $this->mail->getFolderObjects(true,false);
+		}
 
 		$mailFolder = $this->folders[$folder];
-		if (!isset($mailFolder)) return false;
+		if (!isset($mailFolder))
+		{
+			return false;
+		}
 		$delimiter = (isset($mailFolder->delimiter)?$mailFolder->delimiter:$this->mail->getHierarchyDelimiter());
 		$parent = explode($delimiter,$folder);
 		array_pop($parent);
 		$parent = implode($delimiter,$parent);
 
 		$id = $parent ? $this->createID($account, $parent) : '0';
-		if ($this->debugLevel>1) debugLog(__METHOD__."('$folder') --> parent=$parent --> $id");
+		if ($this->debugLevel>1)
+		{
+			debugLog(__METHOD__."('$folder') --> parent=$parent --> $id");
+		}
 		return $id;
 	}
 
@@ -1543,7 +1983,10 @@ 
 	{
 		static $last_id;
 		static $folderObj;
-		if (isset($last_id) && $last_id === $id) return $folderObj;
+		if (isset($last_id) && $last_id === $id)
+		{
+			return $folderObj;
+		}
 
 		try {
 			$this->splitID($id, $account, $folder);
@@ -1553,18 +1996,30 @@ 
 			return $folderObj=false;
 		}
 		$this->_connect($account);
-		if (!isset($this->folders)) $this->folders = $this->mail->getFolderObjects(true,false);
+		if (!isset($this->folders))
+		{
+			$this->folders = $this->mail->getFolderObjects(true,false);
+		}
 
 		$mailFolder = $this->folders[$folder];
-		if (!isset($mailFolder)) return $folderObj=false;
+		if (!isset($mailFolder))
+		{
+			return $folderObj=false;
+		}
 
 		$folderObj = new SyncFolder();
 		$folderObj->serverid = $id;
 		$folderObj->parentid = $this->getParentID($account,$folder);
 		$folderObj->displayname = $mailFolder->shortDisplayName;
-		if ($this->debugLevel>1) debugLog(__METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
+		if ($this->debugLevel>1)
+		{
+			debugLog(__METHOD__.__LINE__." ID: $id, Account:$account, Folder:$folder");
+		}
 		// get folder-type
-		foreach($this->folders as $inbox => $mailFolder) break;
+		foreach($this->folders as $inbox => $mailFolder)
+		{
+			break;
+		}
 		if ($folder == $inbox)
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_INBOX;
@@ -1601,7 +2056,10 @@ 
 			$folderObj->type = SYNC_FOLDER_TYPE_USER_MAIL;
 		}
 
-		if ($this->debugLevel>1) debugLog(__METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
+		if ($this->debugLevel>1)
+		{
+			debugLog(__METHOD__."($id) --> $folder --> type=$folderObj->type, parentID=$folderObj->parentid, displayname=$folderObj->displayname");
+		}
 		return $folderObj;
 	}
 
@@ -1645,24 +2103,37 @@ 
 	{
 		debugLog(__METHOD__.' called with '.$folderid);
 		$this->splitID($folderid, $account, $folder);
-		if (is_numeric($account)) $type = 'mail';
-		if ($type != 'mail') return false;
+		if (is_numeric($account))
+		{
+			$type = 'mail';
+		}
+		if ($type != 'mail')
+		{
+			return false;
+		}
 
-		if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		if (!isset($this->mail))
+		{
+			$this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
+		}
 
 		$changes = array();
         debugLog("AlterPingChanges on $folderid ($folder) stat: ". $syncstate);
         $this->mail->reopen($folder);
 
         $status = $this->mail->getFolderStatus($folder,$ignoreStatusCache=true);
-        if (!$status) {
+        if (!$status)
+        {
             debugLog("AlterPingChanges: could not stat folder $folder ");
             return false;
-        } else {
+        }
+        else
+        {
             $newstate = "M:". $status['messages'] ."-R:". $status['recent'] ."-U:". $status['unseen']."-NUID:".$status['uidnext']."-UIDV:".$status['uidvalidity'];
 
             // message number is different - change occured
-            if ($syncstate != $newstate) {
+            if ($syncstate != $newstate)
+            {
                 $syncstate = $newstate;
                 debugLog("AlterPingChanges: Change FOUND!");
                 // build a dummy change
@@ -1718,7 +2189,10 @@ 
 			$error = $e->getMessage();
 			debugLog(__METHOD__.__LINE__." $_messageUID, $folder ->".$error);
 			// if the server thinks the message does not exist report deletion as success
-			if (stripos($error,'[NONEXISTENT]')!==false) return true;
+			if (stripos($error,'[NONEXISTENT]')!==false)
+			{
+				return true;
+			}
 			return false;
 		}
 
@@ -1825,7 +2299,10 @@ 
 
 		$str = $this->backend->createID($account, $folder, $id);
 
-		if ($this->debugLevel>1) debugLog(__METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
+		if ($this->debugLevel>1)
+		{
+			debugLog(__METHOD__."($account,'$f',$id) type=$account, folder=$folder --> '$str'");
+		}
 
 		return $str;
 	}
@@ -1846,7 +2323,10 @@ 
 		// convert numeric folder-id back to folder name
 		$folder = $this->hash2folder($account,$f=$folder);
 
-		if ($this->debugLevel>1) debugLog(__METHOD__."('$str','$account','$folder',$id)");
+		if ($this->debugLevel>1)
+		{
+			debugLog(__METHOD__."('$str','$account','$folder',$id)");
+		}
 	}
 
 	/**
@@ -1865,7 +2345,10 @@ 
 	 */
 	private function folder2hash($account,$folder)
 	{
-		if(!isset($this->folderHashes)) $this->readFolderHashes();
+		if(!isset($this->folderHashes))
+		{
+			$this->readFolderHashes();
+		}
 
 		if (($index = array_search($folder, (array)$this->folderHashes[$account])) === false)
 		{
@@ -1888,7 +2371,10 @@ 
 	 */
 	private function hash2folder($account,$index)
 	{
-		if(!isset($this->folderHashes)) $this->readFolderHashes();
+		if(!isset($this->folderHashes))
+		{
+			$this->readFolderHashes();
+		}
 
 		return $this->folderHashes[$account][$index];
 	}

mail/inc/class.mail_tree.inc.php

Doc Comments +7 added lines, -7 removed lines

@@ -50,7 +50,7 @@ 
 	/**
 	 * Mail tree constructor
 	 *
-	 * @param object $mail_ui
+	 * @param mail_ui $mail_ui
 	 */
 	function __construct($mail_ui) {
 		$this->ui = $mail_ui;
@@ -62,7 +62,7 @@ 
 	 * @param string $_profileID icServer profile id
 	 * @param string $_err error message to be shown on tree node
 	 * @param mixed $_path
-	 * @param mixed $_parent
+	 * @param string $_parent
 	 * @return array returns an array of tree node
 	 */
 	static function treeLeafNoConnectionArray($_profileID, $_err, $_path, $_parent)
@@ -94,7 +94,7 @@ 
 	/**
 	 * Get folder data from path
 	 *
-	 * @param string $path a node path
+	 * @param string $_path a node path
 	 * @return array returns an array of data extracted from given node path
 	 */
 	static function pathToFolderData ($_path, $_hDelimiter)
@@ -131,7 +131,7 @@ 
 	/**
 	 * Check if the given tree id is account node (means root)
 	 *
-	 * @param type $_node a tree id node
+	 * @param string|null $_node a tree id node
 	 * @return boolean returns true if the node is account node otherwise false
 	 */
 	private static function isAccountNode ($_node)
@@ -163,7 +163,7 @@ 
 	 *
 	 * @param string $_parent = null no parent node means root with the first level of folders
 	 * @param string $_profileID = '' icServer id
-	 * @param int|boolean $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
+	 * @param integer $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
 	 *  false|0 leaves them in closed state
 	 * @param $_noCheckboxNS = false no checkbox for namesapaces makes sure to not put checkbox for namespaces node
 	 * @param boolean $_subscribedOnly = false get only subscribed folders
@@ -444,7 +444,7 @@ 
 	 *
 	 * @param type $_profileID = null Null means all accounts and giving profileid means fetches node for the account
 	 * @param type $_noCheckbox = false option to switch checkbox of
-	 * @param type $_openTopLevel = 0 option to either start the node opened (1) or closed (0)
+	 * @param integer $_openTopLevel = 0 option to either start the node opened (1) or closed (0)
 	 *
 	 * @return array an array of baseNodes of accounts
 	 */
@@ -491,7 +491,7 @@ 
 	 *
 	 * @param string $_parent = null no parent node means root with the first level of folders
 	 * @param string $_profileID = '' active profile / acc_id
-	 * @param int|boolean $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
+	 * @param integer $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
 	 *  false|0 leaves them in closed state
 	 * @param boolean $_subscribedOnly = false get only subscribed folders
 	 * @param boolean $_allInOneGo = false, true will get all folders (dependes on subscribedOnly option) of the account in one go

Braces +56 added lines, -15 removed lines

@@ -52,7 +52,8 @@ 
 	 *
 	 * @param object $mail_ui
 	 */
-	function __construct($mail_ui) {
+	function __construct($mail_ui)
+	{
 		$this->ui = $mail_ui;
 	}
 
@@ -99,7 +100,10 @@ 
 	 */
 	static function pathToFolderData ($_path, $_hDelimiter)
 	{
-		if (!strpos($_path, self::$delimiter)) $_path = self::$delimiter.$_path;
+		if (!strpos($_path, self::$delimiter))
+		{
+			$_path = self::$delimiter.$_path;
+		}
 		list(,$path) = explode(self::$delimiter, $_path);
 		$path_chain = $parts = explode($_hDelimiter, $path);
 		$name = array_pop($parts);
@@ -124,7 +128,10 @@ 
 		$hasChildren = 0;
 		if (in_array('\haschildren', $_node['ATTRIBUTES']) ||
 				in_array('\Haschildren', $_node['ATTRIBUTES']) ||
-				in_array('\HasChildren', $_node['ATTRIBUTES'])) $hasChildren = 1;
+				in_array('\HasChildren', $_node['ATTRIBUTES']))
+		{
+			$hasChildren = 1;
+		}
 		return $hasChildren;
 	}
 
@@ -137,7 +144,10 @@ 
 	private static function isAccountNode ($_node)
 	{
 		list(,$leaf) = explode(self::$delimiter, $_node);
-		if ($leaf || $_node == null) return false;
+		if ($leaf || $_node == null)
+		{
+			return false;
+		}
 		return true;
 	}
 
@@ -178,14 +188,18 @@ 
 		$tree = array(tree::ID=> $_parent?$_parent:0,tree::CHILDREN => array());
 		$hDelimiter = $this->ui->mail_bo->getHierarchyDelimiter();
 
-		if ($_parent) list($_profileID) = explode(self::$delimiter, $_parent);
+		if ($_parent)
+		{
+			list($_profileID) = explode(self::$delimiter, $_parent);
+		}
 
 		if (is_numeric($_profileID) && $_profileID != $this->ui->mail_bo->profileID)
 		{
 			try
 			{
 				$this->ui->changeProfile($_profileID);
-			} catch (Exception $ex) {
+			}
+			catch (Exception $ex) {
 				return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(),array($_profileID), '');
 			}
 		}
@@ -201,9 +215,12 @@ 
 				'Junk'      => $this->ui->mail_bo->getJunkFolder(false),
 				'Outbox'    => $this->ui->mail_bo->getOutboxFolder(false),
 			);
-			if ($_parent && !self::isAccountNode($_parent)) // Single node loader
+			if ($_parent && !self::isAccountNode($_parent))
+			{
+				// Single node loader
 			{
 				$nodeInfo = self::pathToFolderData($_parent, $hDelimiter);
+			}
 				$folders = $this->ui->mail_bo->getFolderArrays($nodeInfo['mailbox'],false,$_allInOneGo?0:2, $_subscribedOnly);
 
 				$childrenNode = array();
@@ -228,15 +245,21 @@ 
 			}
 			else //Top Level Nodes loader
 			{
-				if (self::isAccountNode($_parent)) // An account called for open
+				if (self::isAccountNode($_parent))
+				{
+					// An account called for open
 				{
 					$_openTopLevel = 1;
+				}
 					$tree = self::getAccountsRootNode($_profileID, $_noCheckboxNS, $_openTopLevel);
 				}
 				else // Initial accounts|root nodes
 				{
 					$tree = self::getAccountsRootNode($_profileID, $_noCheckboxNS, $_openTopLevel);
-					if (!$_profileID && !$_openTopLevel) return $tree;
+					if (!$_profileID && !$_openTopLevel)
+					{
+						return $tree;
+					}
 				}
 
 				//List of folders
@@ -326,19 +349,28 @@ 
 			{
 				$helper = array_slice($parents,1,null,true);
 				$parent = $parents[0].self::$delimiter.implode($del, $helper);
-				if ($parent) $parent .= $del;
+				if ($parent)
+				{
+					$parent .= $del;
+				}
 			}
 			else
 			{
 				$parent = implode(self::$delimiter, $parents);
-				if ($parent) $parent .= self::$delimiter;
+				if ($parent)
+				{
+					$parent .= self::$delimiter;
+				}
 			}
 
 			if (!is_array($insert) || !isset($insert['item']))
 			{
 				// throwing an exeption here seems to be unrecoverable,
 				// even if the cause is a something that can be handeled by the mailserver
-				if (mail_bo::$debug) error_log(__METHOD__.':'.__LINE__." id=$data[id]: Parent '$parent' of '$component' not found!");
+				if (mail_bo::$debug)
+				{
+					error_log(__METHOD__.':'.__LINE__." id=$data[id]: Parent '$parent' of '$component' not found!");
+				}
 				// should we hit the break? if in personal: sure, something is wrong with the folderstructure
 				// if in shared or others we may proceed as access to folders may very well be limited to
 				// a single folder within the tree
@@ -349,11 +381,17 @@ 
 					// we want to create the node in question as we meet the above considerations
 					if ($nsp['type']!='personal' && $nsp['prefix_present'] && stripos($parent,$data['path'][0].self::$delimiter.$nsp['prefix'])===0)
 					{
-						if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' about to create:'.$parent.' in '.$data['path'][0].self::$delimiter.$nsp['prefix']);
+						if (mail_bo::$debug)
+						{
+							error_log(__METHOD__.__LINE__.' about to create:'.$parent.' in '.$data['path'][0].self::$delimiter.$nsp['prefix']);
+						}
 						$break=false;
 					}
 				}
-				if ($break) break;
+				if ($break)
+				{
+					break;
+				}
 			}
 			if ($insert['item'])
 			{
@@ -454,7 +492,10 @@ 
 
 		foreach(emailadmin_account::search(true, false) as $acc_id => $accObj)
 		{
-			if (!$accObj->is_imap()|| $_profileID && $acc_id != $_profileID) continue;
+			if (!$accObj->is_imap()|| $_profileID && $acc_id != $_profileID)
+			{
+				continue;
+			}
 			$identity = emailadmin_account::identity_name($accObj,true,$GLOBALS['egw_info']['user']['acount_id']);
 			// Open top level folders for active account
 			$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id?1:0;

Spacing +43 added lines, -43 removed lines

@@ -68,7 +68,7 @@ 
 	static function treeLeafNoConnectionArray($_profileID, $_err, $_path, $_parent)
 	{
 		$baseNode = array('id' => $_profileID);
-		$leaf =  array(
+		$leaf = array(
 			'id' => $_profileID.self::$delimiter.'INBOX',
 			'text' => $_err,
 			'tooltip' => $_err,
@@ -80,7 +80,7 @@ 
 		);
 		self::setOutStructure($leaf, $baseNode, self::$delimiter);
 
-		return ($baseNode?$baseNode:array( // fallback not connected array
+		return ($baseNode ? $baseNode : array( // fallback not connected array
 						'id'=>0,
 						'item'=> array(
 							'text'=>'INBOX',
@@ -97,13 +97,13 @@ 
 	 * @param string $path a node path
 	 * @return array returns an array of data extracted from given node path
 	 */
-	static function pathToFolderData ($_path, $_hDelimiter)
+	static function pathToFolderData($_path, $_hDelimiter)
 	{
 		if (!strpos($_path, self::$delimiter)) $_path = self::$delimiter.$_path;
 		list(,$path) = explode(self::$delimiter, $_path);
 		$path_chain = $parts = explode($_hDelimiter, $path);
 		$name = array_pop($parts);
-		return array (
+		return array(
 			'name' => $name,
 			'mailbox' => $path,
 			'parent' => implode($_hDelimiter, $parts),
@@ -119,7 +119,7 @@ 
 	 * @param array $_node array of a node
 	 * @return int returns 1 if it has children flag set otherwise 0
 	 */
-	private static function nodeHasChildren ($_node)
+	private static function nodeHasChildren($_node)
 	{
 		$hasChildren = 0;
 		if (in_array('\haschildren', $_node['ATTRIBUTES']) ||
@@ -134,7 +134,7 @@ 
 	 * @param type $_node a tree id node
 	 * @return boolean returns true if the node is account node otherwise false
 	 */
-	private static function isAccountNode ($_node)
+	private static function isAccountNode($_node)
 	{
 		list(,$leaf) = explode(self::$delimiter, $_node);
 		if ($leaf || $_node == null) return false;
@@ -172,10 +172,10 @@ 
 	 *
 	 * @return array returns an array of mail tree structure according to provided node
 	 */
-	function getTree ($_parent = null, $_profileID = '', $_openTopLevel = 1, $_noCheckboxNS = false, $_subscribedOnly= false, $_allInOneGo = false, $_checkSubscribed = true)
+	function getTree($_parent = null, $_profileID = '', $_openTopLevel = 1, $_noCheckboxNS = false, $_subscribedOnly = false, $_allInOneGo = false, $_checkSubscribed = true)
 	{
 		//Init mail folders
-		$tree = array(tree::ID=> $_parent?$_parent:0,tree::CHILDREN => array());
+		$tree = array(tree::ID=> $_parent ? $_parent : 0, tree::CHILDREN => array());
 		$hDelimiter = $this->ui->mail_bo->getHierarchyDelimiter();
 
 		if ($_parent) list($_profileID) = explode(self::$delimiter, $_parent);
@@ -186,7 +186,7 @@ 
 			{
 				$this->ui->changeProfile($_profileID);
 			} catch (Exception $ex) {
-				return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(),array($_profileID), '');
+				return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(), array($_profileID), '');
 			}
 		}
 
@@ -198,7 +198,7 @@ 
 			if ($_parent && !self::isAccountNode($_parent)) // Single node loader
 			{
 				$nodeInfo = self::pathToFolderData($_parent, $hDelimiter);
-				$folders = $this->ui->mail_bo->getFolderArrays($nodeInfo['mailbox'],false,$_allInOneGo?0:2, $_subscribedOnly);
+				$folders = $this->ui->mail_bo->getFolderArrays($nodeInfo['mailbox'], false, $_allInOneGo ? 0 : 2, $_subscribedOnly);
 
 				$childrenNode = array();
 				foreach ($folders as &$node)
@@ -207,14 +207,14 @@ 
 					$nodeData = self::pathToFolderData($nodeId, $node['delimiter']);
 					$childrenNode[] = array(
 						tree::ID=> $nodeId,
-						tree::AUTOLOAD_CHILDREN => $_allInOneGo?false:self::nodeHasChildren($node),
+						tree::AUTOLOAD_CHILDREN => $_allInOneGo ? false : self::nodeHasChildren($node),
 						tree::CHILDREN =>array(),
 						tree::LABEL => $nodeData['text'],
 						tree::TOOLTIP => $nodeData['tooltip'],
 						tree::IMAGE_LEAF => self::$leafImages['folderLeaf'],
 						tree::IMAGE_FOLDER_OPEN => self::$leafImages['folderOpen'],
 						tree::IMAGE_FOLDER_CLOSED => self::$leafImages['folderClose'],
-						tree::CHECKED => $_checkSubscribed?$node['SUBSCRIBED']:false,
+						tree::CHECKED => $_checkSubscribed ? $node['SUBSCRIBED'] : false,
 						'parent' => $_parent
 					);
 				}
@@ -234,7 +234,7 @@ 
 				}
 
 				//List of folders
-				$foldersList = $this->ui->mail_bo->getFolderArrays(null, true, $_allInOneGo?0:2,$_subscribedOnly, true);
+				$foldersList = $this->ui->mail_bo->getFolderArrays(null, true, $_allInOneGo ? 0 : 2, $_subscribedOnly, true);
 
 				// User defined folders based on account
 				$definedFolders = array(
@@ -254,14 +254,14 @@ 
 
 					$data = array(
 						tree::ID=>$_profileID.self::$delimiter.$folder['MAILBOX'],
-						tree::AUTOLOAD_CHILDREN => $_allInOneGo?false:self::nodeHasChildren($folder),
+						tree::AUTOLOAD_CHILDREN => $_allInOneGo ? false : self::nodeHasChildren($folder),
 						tree::CHILDREN =>array(),
 						tree::LABEL =>lang($folder['MAILBOX']),
-						tree::OPEN => self::getNodeLevel($folder['MAILBOX'], $folder['delimiter']) <= $_openTopLevel?1:0,
+						tree::OPEN => self::getNodeLevel($folder['MAILBOX'], $folder['delimiter']) <= $_openTopLevel ? 1 : 0,
 						tree::TOOLTIP => lang($folder['MAILBOX']),
-						tree::CHECKED => $_checkSubscribed?$folder['SUBSCRIBED']:false,
+						tree::CHECKED => $_checkSubscribed ? $folder['SUBSCRIBED'] : false,
 						tree::NOCHECKBOX => 0,
-						'parent' => $parent?$_profileID.self::$delimiter.implode($folder['delimiter'], $parent):$_profileID,
+						'parent' => $parent ? $_profileID.self::$delimiter.implode($folder['delimiter'], $parent) : $_profileID,
 						'path' => $path,
 						'folderarray' => $folder
 					);
@@ -299,7 +299,7 @@ 
 		catch (Exception $ex) // Catch exceptions
 		{
 			//mail_ui::callWizard($ex->getMessage(), false, 'error');
-			return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(),array($_profileID), '');
+			return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(), array($_profileID), '');
 		}
 
 		return $tree;
@@ -316,19 +316,19 @@ 
 	 *					as clearance for access may be limited to a single branch-node of a tree
 	 * @return void
 	 */
-	static function setOutStructure($data, &$out, $del='.', $createMissingParents=true, $nameSpace=array(), $definedFolders= array())
+	static function setOutStructure($data, &$out, $del = '.', $createMissingParents = true, $nameSpace = array(), $definedFolders = array())
 	{
 		//error_log(__METHOD__."(".array2string($data).', '.array2string($out).", '$del')");
 		$components = $data['path'];
-		array_pop($components);	// remove own name
+		array_pop($components); // remove own name
 
 		$insert = &$out;
 		$parents = array();
-		foreach($components as $component)
+		foreach ($components as $component)
 		{
-			if (count($parents)>1)
+			if (count($parents) > 1)
 			{
-				$helper = array_slice($parents,1,null,true);
+				$helper = array_slice($parents, 1, null, true);
 				$parent = $parents[0].self::$delimiter.implode($del, $helper);
 				if ($parent) $parent .= $del;
 			}
@@ -351,21 +351,21 @@ 
 				{
 					// if (appropriately padded) namespace prefix of (others or shared) is the leading part of parent
 					// we want to create the node in question as we meet the above considerations
-					if ($nsp['type']!='personal' && $nsp['prefix_present'] && stripos($parent,$data['path'][0].self::$delimiter.$nsp['prefix'])===0)
+					if ($nsp['type'] != 'personal' && $nsp['prefix_present'] && stripos($parent, $data['path'][0].self::$delimiter.$nsp['prefix']) === 0)
 					{
 						if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' about to create:'.$parent.' in '.$data['path'][0].self::$delimiter.$nsp['prefix']);
-						$break=false;
+						$break = false;
 					}
 				}
 				if ($break) break;
 			}
 			if ($insert['item'])
 			{
-				foreach($insert['item'] as &$item)
+				foreach ($insert['item'] as &$item)
 				{
 					if ($item['id'] == $parent.$component)
 					{
-						$insert =& $item;
+						$insert = & $item;
 						break;
 					}
 				}
@@ -375,9 +375,9 @@ 
 				if ($createMissingParents)
 				{
 					unset($item);
-					$item = array('id' => $parent.$component, 'text' => $component, 'im0' => "folderNoSelectClosed.gif",'im1' => "folderNoSelectOpen.gif",'im2' => "folderNoSelectClosed.gif",'tooltip' => lang('no access'));
-					$insert['item'][] =& $item;
-					$insert =& $item;
+					$item = array('id' => $parent.$component, 'text' => $component, 'im0' => "folderNoSelectClosed.gif", 'im1' => "folderNoSelectOpen.gif", 'im2' => "folderNoSelectClosed.gif", 'tooltip' => lang('no access'));
+					$insert['item'][] = & $item;
+					$insert = & $item;
 				}
 				else
 				{
@@ -410,7 +410,7 @@ 
 					$data[tree::IMAGE_FOLDER_OPEN] =
 					$data [tree::IMAGE_FOLDER_CLOSED] = "MailFolder".$key.".png";
 			}
-			elseif(stripos(array2string($data['folderarray']['attributes']),'\noselect')!== false)
+			elseif (stripos(array2string($data['folderarray']['attributes']), '\noselect') !== false)
 			{
 				$data[tree::IMAGE_LEAF] = self::$leafImages['folderNoSelectClosed'];
 				$data[tree::IMAGE_FOLDER_OPEN] = self::$leafImages['folderNoSelectOpen'];
@@ -452,20 +452,20 @@ 
 	 *
 	 * @return array an array of baseNodes of accounts
 	 */
-	static function getAccountsRootNode($_profileID = null, $_noCheckbox = false, $_openTopLevel = 0 )
+	static function getAccountsRootNode($_profileID = null, $_noCheckbox = false, $_openTopLevel = 0)
 	{
 		$roots = array(tree::ID => 0, tree::CHILDREN => array());
 
-		foreach(emailadmin_account::search(true, false) as $acc_id => $accObj)
+		foreach (emailadmin_account::search(true, false) as $acc_id => $accObj)
 		{
-			if (!$accObj->is_imap()|| $_profileID && $acc_id != $_profileID) continue;
-			$identity = emailadmin_account::identity_name($accObj,true,$GLOBALS['egw_info']['user']['acount_id']);
+			if (!$accObj->is_imap() || $_profileID && $acc_id != $_profileID) continue;
+			$identity = emailadmin_account::identity_name($accObj, true, $GLOBALS['egw_info']['user']['acount_id']);
 			// Open top level folders for active account
-			$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id?1:0;
+			$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id ? 1 : 0;
 
 			$baseNode = array(
 							tree::ID=> (string)$acc_id,
-							tree::LABEL => str_replace(array('<','>'),array('[',']'),$identity),
+							tree::LABEL => str_replace(array('<', '>'), array('[', ']'), $identity),
 							tree::TOOLTIP => '('.$acc_id.') '.htmlspecialchars_decode($identity),
 							tree::IMAGE_LEAF => self::$leafImages['folderAccount'],
 							tree::IMAGE_FOLDER_OPEN => self::$leafImages['folderAccount'],
@@ -474,15 +474,15 @@ 
 							tree::CHILDREN => array(), // dynamic loading on unfold
 							tree::AUTOLOAD_CHILDREN => true,
 							'parent' => '',
-							tree::OPEN => $_openTopLevel?$_openTopLevel:$openActiveAccount,
+							tree::OPEN => $_openTopLevel ? $_openTopLevel : $openActiveAccount,
 							// mark on account if Sieve is enabled
 							'data' => array(
 										'sieve' => $accObj->imapServer()->acc_sieve_enabled,
-										'spamfolder'=> $accObj->imapServer()->acc_folder_junk?true:false
+										'spamfolder'=> $accObj->imapServer()->acc_folder_junk ? true : false
 									),
 							tree::NOCHECKBOX  => $_noCheckbox
 			);
-			self::setOutStructure($baseNode, $roots,self::$delimiter);
+			self::setOutStructure($baseNode, $roots, self::$delimiter);
 		}
 		return $roots;
 	}
@@ -501,15 +501,15 @@ 
 	 * @param boolean $_allInOneGo = false, true will get all folders (dependes on subscribedOnly option) of the account in one go
 	 * @return type an array of tree
 	 */
-	function getInitialIndexTree ($_parent = null, $_profileID = '', $_openTopLevel = 1, $_subscribedOnly= false, $_allInOneGo = false)
+	function getInitialIndexTree($_parent = null, $_profileID = '', $_openTopLevel = 1, $_subscribedOnly = false, $_allInOneGo = false)
 	{
 		$tree = $this->getTree($_parent, '', $_openTopLevel, false, $_subscribedOnly, $_allInOneGo);
-		$branches = $this->getTree($_profileID, $_profileID,1,false,$_subscribedOnly,$_allInOneGo);
+		$branches = $this->getTree($_profileID, $_profileID, 1, false, $_subscribedOnly, $_allInOneGo);
 		foreach ($tree[tree::CHILDREN] as &$account)
 		{
 			if ($account[tree::ID] == $_profileID)
 			{
-				$account = array_merge($account , $branches);
+				$account = array_merge($account, $branches);
 			}
 		}
 		return $tree;

notifications/inc/class.notifications_jdesk_ajax.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 	 * this function calls all other recurring AJAX notifications methods
 	 * to have ONE single recurring AJAX call per user
 	 *
-	 * @return xajax response
+	 * @return string response
 	 */
 	public function get_notifications($browserNotify = false)
 	{

Spacing +6 added lines, -6 removed lines

@@ -74,7 +74,7 @@ 
 	 */
 	public function __construct()
 	{
-		if( class_exists('xajaxResponse') )
+		if (class_exists('xajaxResponse'))
 		{
 			$this->response = new xajaxResponse();
 		}
@@ -137,11 +137,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);
 		}
 	}
 
@@ -158,9 +158,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)
 			{
@@ -172,7 +172,7 @@ 
 				$this->response->data($jmessage);
 			}
 
-			switch( $this->preferences[self::_appname]['egwpopup_verbosity'] )
+			switch ($this->preferences[self::_appname]['egwpopup_verbosity'])
 			{
 				case 'low':
 

Braces +7 added lines, -3 removed lines

@@ -12,7 +12,8 @@ 
 /**
  * jdesk Json methods for notifications
  */
-class notifications_jdesk_ajax {
+class notifications_jdesk_ajax
+{
 
 	public $public_functions = array(
 		'get_notification'	=> true
@@ -94,7 +95,9 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {}
+	public function __destruct()
+	{
+}
 
 	/**
 	 * public AJAX trigger function to be called by the JavaScript client
@@ -150,7 +153,8 @@ 
 	 *
 	 * @return boolean true or false
 	 */
-	private function get_egwpopup($browserNotify = false) {
+	private function get_egwpopup($browserNotify = false)
+	{
 
 		$message = '';
 

notifications/inc/class.notifications_jpopup.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
 	* renders additional infos from sender and subject
 	*
 	* @param string $_subject
-	* @return html rendered info as complete string
+	* @return string rendered info as complete string
 	*/
 	private function render_infos($_subject = false) {
 		$infos = array();
@@ -149,7 +149,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(

Indentation +50 added lines, -50 removed lines

@@ -14,63 +14,63 @@ 
 {
 
 	/**
-	* Appname
-	*/
+	 * Appname
+	 */
 	const _appname = 'notifications';
 
 	/**
-	* Notification table in SQL database
-	*/
+	 * Notification table in SQL database
+	 */
 	const _notification_table = 'egw_notificationpopup';
 
 	/**
-	* Notification type
-	*/
+	 * Notification type
+	 */
 	const _type = 'jpopup';
 
 	/**
-	* holds account object for user who sends the message
-	*
-	* @var object
-	*/
+	 * holds account object for user who sends the message
+	 *
+	 * @var object
+	 */
 	private $sender;
 
 	/**
-	* holds account object for user to notify
-	*
-	* @var object
-	*/
+	 * holds account object for user to notify
+	 *
+	 * @var object
+	 */
 	private $recipient;
 
 	/**
-	* holds config object (sitewide application config)
-	*
-	* @var object
-	*/
+	 * holds config object (sitewide application config)
+	 *
+	 * @var object
+	 */
 	private $config;
 
 	/**
-	* holds preferences object of user to notify
-	*
-	* @var object
-	*/
+	 * holds preferences object of user to notify
+	 *
+	 * @var object
+	 */
 	private $preferences;
 
 	/**
-	* holds db object of SQL database
-	*
-	* @var egw_db
-	*/
+	 * holds db object of SQL database
+	 *
+	 * @var egw_db
+	 */
 	private $db;
 
 	/**
-	* constructor of notifications_egwpopup
-	*
-	* @param object $_sender
-	* @param object $_recipient
-	* @param object $_config
-	* @param object $_preferences
-	*/
+	 * constructor of notifications_egwpopup
+	 *
+	 * @param object $_sender
+	 * @param object $_recipient
+	 * @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."); }
@@ -84,13 +84,13 @@ 
 	}
 
 	/**
-	* sends notification if user is online
-	*
-	* @param array $_messages
-	* @param string $_subject
-	* @param array $_links
-	* @param array $_attachments
-	*/
+	 * sends notification if user is online
+	 *
+	 * @param array $_messages
+	 * @param string $_subject
+	 * @param array $_links
+	 * @param array $_attachments
+	 */
 	public function send(array $_messages, $_subject=false, $_links=false, $_attachments=false)
 	{
 		$jmessage = array();
@@ -130,11 +130,11 @@ 
 	}
 
 	/**
-	* renders additional infos from sender and subject
-	*
-	* @param string $_subject
-	* @return html rendered info as complete string
-	*/
+	 * renders additional infos from sender and subject
+	 *
+	 * @param string $_subject
+	 * @return html rendered info as complete string
+	 */
 	private function render_infos($_subject = false) {
 		$infos = array();
 		$newline = "<br />";
@@ -146,11 +146,11 @@ 
 	}
 
 	/**
-	* saves notification into database so that the client can fetch it from there
-	*
-	* @param string $_message
-	* @param array $_user_sessions
-	*/
+	 * 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(
 			'account_id'     => $this->recipient->account_id,

Spacing +20 added lines, -20 removed lines

@@ -73,14 +73,14 @@ 
 	*/
 	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 (!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->recipient = $_recipient;
 		$this->config		= $_config;
-		$this->preferences	= $_preferences;
-		$this->db			= $GLOBALS['egw']->db;
+		$this->preferences = $_preferences;
+		$this->db = $GLOBALS['egw']->db;
 	}
 
 	/**
@@ -91,17 +91,17 @@ 
 	* @param array $_links
 	* @param array $_attachments
 	*/
-	public function send(array $_messages, $_subject=false, $_links=false, $_attachments=false)
+	public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false)
 	{
 		$jmessage = array();
 
 		// app-message
-		if( ($_links != null) && (count($_links) > 0) )
+		if (($_links != null) && (count($_links) > 0))
 		{
-			$tlink		= $_links[0];
-			$appname	= "";
+			$tlink = $_links[0];
+			$appname = "";
 
-			if( key_exists('menuaction', $tlink->view) )
+			if (key_exists('menuaction', $tlink->view))
 			{
 				$tmp = explode(".", $tlink->view['menuaction']);
 				$appname = $tmp[0];
@@ -109,9 +109,9 @@ 
 
 			$link = array();
 
-			foreach( $tlink->view as $pkey => $pvalue )
+			foreach ($tlink->view as $pkey => $pvalue)
 			{
-				$link[] = $pkey . '=' . $pvalue;
+				$link[] = $pkey.'='.$pvalue;
 			}
 
 			// TODO more links?
@@ -122,11 +122,11 @@ 
 			.html::hr()
 			.$_messages['html'];
 
-		$jmessage['msghtml']	= $message;
-		$jmessage['app']		= $appname;
+		$jmessage['msghtml'] = $message;
+		$jmessage['app'] = $appname;
 
 
-		$this->save( serialize($jmessage) );
+		$this->save(serialize($jmessage));
 	}
 
 	/**
@@ -141,8 +141,8 @@ 
 
 		$sender = $this->sender->account_fullname ? $this->sender->account_fullname : $this->sender_account_email;
 		$infos[] = lang('Message from').': '.$sender;
-		if(!empty($_subject)) { $infos[] = html::bold($_subject); }
-		return implode($newline,$infos);
+		if (!empty($_subject)) { $infos[] = html::bold($_subject); }
+		return implode($newline, $infos);
 	}
 
 	/**
@@ -151,12 +151,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");
 	}
 }

Braces +17 added lines, -6 removed lines

@@ -73,8 +73,12 @@ 
 	*/
 	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( !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;
@@ -135,13 +139,16 @@ 
 	* @param string $_subject
 	* @return 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[] = html::bold($_subject); }
+		if(!empty($_subject))
+		{
+$infos[] = html::bold($_subject); }
 		return implode($newline,$infos);
 	}
 
@@ -151,12 +158,16 @@ 
 	* @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");
+		}
 	}
 }

phpgwapi/inc/adodb/adodb-csvlib.inc.php

Doc Comments +4 added lines, -3 removed lines

@@ -82,9 +82,9 @@ 
 /**
 * Open CSV file and convert it into Data. 
 *
-* @param url  		file/ftp/http url
-* @param err		returns the error message
-* @param timeout	dispose if recordset has been alive for $timeout secs
+* @param url  		string url
+* @param err		string|false the error message
+* @param timeout	integer if recordset has been alive for $timeout secs
 *
 * @return		recordset, or false if error occured. If no
 *			error occurred in sql INSERT/UPDATE/DELETE, 
@@ -261,6 +261,7 @@ 
 
 	/**
 	* Save a file $filename and its $contents (normally for caching) with file locking
+	* @param string $filename
 	*/
 	function adodb_write_file($filename, $contents,$debug=false)
 	{ 

Indentation +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 */
 
 	/**
- 	 * convert a recordset into special format
+	 * convert a recordset into special format
 	 *
 	 * @param rs	the recordset
 	 *
@@ -260,8 +260,8 @@ 
 	
 
 	/**
-	* Save a file $filename and its $contents (normally for caching) with file locking
-	*/
+	 * Save a file $filename and its $contents (normally for caching) with file locking
+	 */
 	function adodb_write_file($filename, $contents,$debug=false)
 	{ 
 	# http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows

Switch Indentation +24 added lines, -24 removed lines

@@ -152,32 +152,32 @@
 						$tdiff = (integer)( $meta[1]+$timeout - time());
 						if ($tdiff <= 2) {
 							switch($tdiff) {
-							case 4:
-							case 3:
-								if ((rand() & 31) == 0) {
+								case 4:
+								case 3:
+									if ((rand() & 31) == 0) {
+										fclose($fp);
+										$err = "Timeout 3";
+										return $false;
+									}
+									break;
+								case 2: 
+									if ((rand() & 15) == 0) {
+										fclose($fp);
+										$err = "Timeout 2";
+										return $false;
+									}
+									break;
+								case 1:
+									if ((rand() & 3) == 0) {
+										fclose($fp);
+										$err = "Timeout 1";
+										return $false;
+									}
+									break;
+								default: 
 									fclose($fp);
-									$err = "Timeout 3";
+									$err = "Timeout 0";
 									return $false;
-								}
-								break;
-							case 2: 
-								if ((rand() & 15) == 0) {
-									fclose($fp);
-									$err = "Timeout 2";
-									return $false;
-								}
-								break;
-							case 1:
-								if ((rand() & 3) == 0) {
-									fclose($fp);
-									$err = "Timeout 1";
-									return $false;
-								}
-								break;
-							default: 
-								fclose($fp);
-								$err = "Timeout 0";
-								return $false;
 							} // switch
 							
 						} // if check flush cache

Spacing +37 added lines, -37 removed lines

@@ -31,7 +31,7 @@ 
 	 *
 	 * @return	the CSV formated data
 	 */
-	function _rs2serialize(&$rs,$conn=false,$sql='')
+	function _rs2serialize(&$rs, $conn = false, $sql = '')
 	{
 		$max = ($rs) ? $rs->FieldCount() : 0;
 		
@@ -54,7 +54,7 @@ 
 		$line = "====1,$tt,$sql\n";
 		
 		if ($rs->databaseType == 'array') {
-			$rows =& $rs->_array;
+			$rows = & $rs->_array;
 		} else {
 			$rows = array();
 			while (!$rs->EOF) {	
@@ -63,8 +63,8 @@ 
 			} 
 		}
 		
-		for($i=0; $i < $max; $i++) {
-			$o =& $rs->FetchField($i);
+		for ($i = 0; $i < $max; $i++) {
+			$o = & $rs->FetchField($i);
 			$flds[] = $o;
 		}
 	
@@ -73,7 +73,7 @@ 
 		$rs2 = new $class();
 		$rs2->sql = $rs->sql;
 		$rs2->oldProvider = $rs->dataProvider; 
-		$rs2->InitArrayFields($rows,$flds);
+		$rs2->InitArrayFields($rows, $flds);
 		$rs2->fetchMode = $savefetch;
 		return $line.serialize($rs2);
 	}
@@ -90,11 +90,11 @@ 
 *			error occurred in sql INSERT/UPDATE/DELETE, 
 *			empty recordset is returned
 */
-	function &csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array')
+	function &csv2rs($url, &$err, $timeout = 0, $rsclass = 'ADORecordSet_array')
 	{
 		$false = false;
 		$err = false;
-		$fp = @fopen($url,'rb');
+		$fp = @fopen($url, 'rb');
 		if (!$fp) {
 			$err = $url.' file/URL not found';
 			return $false;
@@ -105,8 +105,8 @@ 
 		
 		if ($meta = fgetcsv($fp, 32000, ",")) {
 			// check if error message
-			if (strncmp($meta[0],'****',4) === 0) {
-				$err = trim(substr($meta[0],4,1024));
+			if (strncmp($meta[0], '****', 4) === 0) {
+				$err = trim(substr($meta[0], 4, 1024));
 				fclose($fp);
 				return $false;
 			}
@@ -114,7 +114,7 @@ 
 			// $meta[0] is -1 means return an empty recordset
 			// $meta[1] contains a time 
 	
-			if (strncmp($meta[0], '====',4) === 0) {
+			if (strncmp($meta[0], '====', 4) === 0) {
 			
 				if ($meta[0] == "====-1") {
 					if (sizeof($meta) < 5) {
@@ -129,7 +129,7 @@ 
 						return $false;
 					}
 					
-					$rs = new $rsclass($val=true);
+					$rs = new $rsclass($val = true);
 					$rs->fields = array();
 					$rs->timeCreated = $meta[1];
 					$rs->EOF = true;
@@ -148,27 +148,27 @@ 
 			# -1 sec after timeout give processes 1/4 chance of timing out
 			# +0 sec after timeout, give processes 100% chance of timing out
 				if (sizeof($meta) > 1) {
-					if($timeout >0){ 
-						$tdiff = (integer)( $meta[1]+$timeout - time());
+					if ($timeout > 0) { 
+						$tdiff = (integer)($meta[1] + $timeout - time());
 						if ($tdiff <= 2) {
-							switch($tdiff) {
+							switch ($tdiff) {
 							case 4:
 							case 3:
-								if ((rand() & 31) == 0) {
+								if ((rand()&31) == 0) {
 									fclose($fp);
 									$err = "Timeout 3";
 									return $false;
 								}
 								break;
 							case 2: 
-								if ((rand() & 15) == 0) {
+								if ((rand()&15) == 0) {
 									fclose($fp);
 									$err = "Timeout 2";
 									return $false;
 								}
 								break;
 							case 1:
-								if ((rand() & 3) == 0) {
+								if ((rand()&3) == 0) {
 									fclose($fp);
 									$err = "Timeout 1";
 									return $false;
@@ -190,9 +190,9 @@ 
 					// slurp in the data
 					$MAXSIZE = 128000;
 					
-					$text = fread($fp,$MAXSIZE);
+					$text = fread($fp, $MAXSIZE);
 					if (strlen($text)) {
-						while ($txt = fread($fp,$MAXSIZE)) {
+						while ($txt = fread($fp, $MAXSIZE)) {
 							$text .= $txt;
 						}
 					}
@@ -217,9 +217,9 @@ 
 
 			// Get Column definitions
 			$flds = array();
-			foreach($meta as $o) {
-				$o2 = explode(':',$o);
-				if (sizeof($o2)!=3) {
+			foreach ($meta as $o) {
+				$o2 = explode(':', $o);
+				if (sizeof($o2) != 3) {
 					$arr[] = $meta;
 					$flds = false;
 					break;
@@ -240,7 +240,7 @@ 
 		$MAXSIZE = 128000;
 		
 		$text = '';
-		while ($txt = fread($fp,$MAXSIZE)) {
+		while ($txt = fread($fp, $MAXSIZE)) {
 			$text .= $txt;
 		}
 			
@@ -254,7 +254,7 @@ 
 		}
 		$rs = new $rsclass();
 		$rs->timeCreated = $ttl;
-		$rs->InitArrayFields($arr,$flds);
+		$rs->InitArrayFields($arr, $flds);
 		return $rs;
 	}
 	
@@ -262,7 +262,7 @@ 
 	/**
 	* Save a file $filename and its $contents (normally for caching) with file locking
 	*/
-	function adodb_write_file($filename, $contents,$debug=false)
+	function adodb_write_file($filename, $contents, $debug = false)
 	{ 
 	# http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
 	# So to simulate locking, we assume that rename is an atomic operation.
@@ -275,35 +275,35 @@ 
 	# 2. unlink($filename) fails -- ok, rename will fail
 	# 3. adodb reads stale file because unlink fails -- ok, $rs timeout occurs
 	# 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and  cache updated
-		if (strncmp(PHP_OS,'WIN',3) === 0) {
+		if (strncmp(PHP_OS, 'WIN', 3) === 0) {
 			// skip the decimal place
-			$mtime = substr(str_replace(' ','_',microtime()),2); 
+			$mtime = substr(str_replace(' ', '_', microtime()), 2); 
 			// getmypid() actually returns 0 on Win98 - never mind!
 			$tmpname = $filename.uniqid($mtime).getmypid();
-			if (!($fd = @fopen($tmpname,'a'))) return false;
-			$ok = ftruncate($fd,0);			
-			if (!fwrite($fd,$contents)) $ok = false;
+			if (!($fd = @fopen($tmpname, 'a'))) return false;
+			$ok = ftruncate($fd, 0);			
+			if (!fwrite($fd, $contents)) $ok = false;
 			fclose($fd);
-			chmod($tmpname,0644);
+			chmod($tmpname, 0644);
 			// the tricky moment
 			@unlink($filename);
-			if (!@rename($tmpname,$filename)) {
+			if (!@rename($tmpname, $filename)) {
 				unlink($tmpname);
 				$ok = false;
 			}
 			if (!$ok) {
-				if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed'));
+				if ($debug) ADOConnection::outp(" Rename $tmpname ".($ok ? 'ok' : 'failed'));
 			}
 			return $ok;
 		}
 		if (!($fd = @fopen($filename, 'a'))) return false;
 		if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) {
-			$ok = fwrite( $fd, $contents );
+			$ok = fwrite($fd, $contents);
 			fclose($fd);
-			chmod($filename,0644);
-		}else {
+			chmod($filename, 0644);
+		} else {
 			fclose($fd);
-			if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename<br>\n");
+			if ($debug)ADOConnection::outp(" Failed acquiring lock for $filename<br>\n");
 			$ok = false;
 		}
 	

Braces +115 added lines, -47 removed lines

@@ -1,7 +1,10 @@ 
 <?php
 
 // security - hide paths
-if (!defined('ADODB_DIR')) die();
+if (!defined('ADODB_DIR'))
+{
+	die();
+}
 
 global $ADODB_INCLUDED_CSV;
 $ADODB_INCLUDED_CSV = 1;
@@ -35,15 +38,23 @@ 
 	{
 		$max = ($rs) ? $rs->FieldCount() : 0;
 		
-		if ($sql) $sql = urlencode($sql);
+		if ($sql)
+		{
+			$sql = urlencode($sql);
+		}
 		// metadata setup
 		
-		if ($max <= 0 || $rs->dataProvider == 'empty') { // is insert/update/delete
-			if (is_object($conn)) {
+		if ($max <= 0 || $rs->dataProvider == 'empty')
+		{
+// is insert/update/delete
+			if (is_object($conn))
+			{
 				$sql .= ','.$conn->Affected_Rows();
 				$sql .= ','.$conn->Insert_ID();
-			} else
-				$sql .= ',,';
+			}
+			else {
+							$sql .= ',,';
+			}
 			
 			$text = "====-1,0,$sql\n";
 			return $text;
@@ -53,17 +64,22 @@ 
 		## changed format from ====0 to ====1
 		$line = "====1,$tt,$sql\n";
 		
-		if ($rs->databaseType == 'array') {
+		if ($rs->databaseType == 'array')
+		{
 			$rows =& $rs->_array;
-		} else {
+		}
+		else
+		{
 			$rows = array();
-			while (!$rs->EOF) {	
+			while (!$rs->EOF)
+			{
 				$rows[] = $rs->fields;
 				$rs->MoveNext();
 			} 
 		}
 		
-		for($i=0; $i < $max; $i++) {
+		for($i=0; $i < $max; $i++)
+		{
 			$o =& $rs->FetchField($i);
 			$flds[] = $o;
 		}
@@ -95,7 +111,8 @@ 
 		$false = false;
 		$err = false;
 		$fp = @fopen($url,'rb');
-		if (!$fp) {
+		if (!$fp)
+		{
 			$err = $url.' file/URL not found';
 			return $false;
 		}
@@ -103,9 +120,11 @@ 
 		$arr = array();
 		$ttl = 0;
 		
-		if ($meta = fgetcsv($fp, 32000, ",")) {
+		if ($meta = fgetcsv($fp, 32000, ","))
+		{
 			// check if error message
-			if (strncmp($meta[0],'****',4) === 0) {
+			if (strncmp($meta[0],'****',4) === 0)
+			{
 				$err = trim(substr($meta[0],4,1024));
 				fclose($fp);
 				return $false;
@@ -114,17 +133,21 @@ 
 			// $meta[0] is -1 means return an empty recordset
 			// $meta[1] contains a time 
 	
-			if (strncmp($meta[0], '====',4) === 0) {
+			if (strncmp($meta[0], '====',4) === 0)
+			{
 			
-				if ($meta[0] == "====-1") {
-					if (sizeof($meta) < 5) {
+				if ($meta[0] == "====-1")
+				{
+					if (sizeof($meta) < 5)
+					{
 						$err = "Corrupt first line for format -1";
 						fclose($fp);
 						return $false;
 					}
 					fclose($fp);
 					
-					if ($timeout > 0) {
+					if ($timeout > 0)
+					{
 						$err = " Illegal Timeout $timeout ";
 						return $false;
 					}
@@ -147,28 +170,35 @@ 
 			# -2 sec before timeout, give processes 1/16 chance of timing out
 			# -1 sec after timeout give processes 1/4 chance of timing out
 			# +0 sec after timeout, give processes 100% chance of timing out
-				if (sizeof($meta) > 1) {
-					if($timeout >0){ 
+				if (sizeof($meta) > 1)
+				{
+					if($timeout >0)
+					{
 						$tdiff = (integer)( $meta[1]+$timeout - time());
-						if ($tdiff <= 2) {
-							switch($tdiff) {
+						if ($tdiff <= 2)
+						{
+							switch($tdiff)
+							{
 							case 4:
 							case 3:
-								if ((rand() & 31) == 0) {
+								if ((rand() & 31) == 0)
+								{
 									fclose($fp);
 									$err = "Timeout 3";
 									return $false;
 								}
 								break;
 							case 2: 
-								if ((rand() & 15) == 0) {
+								if ((rand() & 15) == 0)
+								{
 									fclose($fp);
 									$err = "Timeout 2";
 									return $false;
 								}
 								break;
 							case 1:
-								if ((rand() & 3) == 0) {
+								if ((rand() & 3) == 0)
+								{
 									fclose($fp);
 									$err = "Timeout 1";
 									return $false;
@@ -186,20 +216,27 @@ 
 				}
 				//================================================
 				// new cache format - use serialize extensively...
-				if ($meta[0] === '====1') {
+				if ($meta[0] === '====1')
+				{
 					// slurp in the data
 					$MAXSIZE = 128000;
 					
 					$text = fread($fp,$MAXSIZE);
-					if (strlen($text)) {
-						while ($txt = fread($fp,$MAXSIZE)) {
+					if (strlen($text))
+					{
+						while ($txt = fread($fp,$MAXSIZE))
+						{
 							$text .= $txt;
 						}
 					}
 					fclose($fp);
 					$rs = unserialize($text);
-					if (is_object($rs)) $rs->timeCreated = $ttl;
-					else {
+					if (is_object($rs))
+					{
+						$rs->timeCreated = $ttl;
+					}
+					else
+					{
 						$err = "Unable to unserialize recordset";
 						//echo htmlspecialchars($text),' !--END--!<p>';
 					}
@@ -208,7 +245,8 @@ 
 				
 				$meta = false;
 				$meta = fgetcsv($fp, 32000, ",");
-				if (!$meta) {
+				if (!$meta)
+				{
 					fclose($fp);
 					$err = "Unexpected EOF 1";
 					return $false;
@@ -217,9 +255,11 @@ 
 
 			// Get Column definitions
 			$flds = array();
-			foreach($meta as $o) {
+			foreach($meta as $o)
+			{
 				$o2 = explode(':',$o);
-				if (sizeof($o2)!=3) {
+				if (sizeof($o2)!=3)
+				{
 					$arr[] = $meta;
 					$flds = false;
 					break;
@@ -230,7 +270,9 @@ 
 				$fld->max_length = $o2[2];
 				$flds[] = $fld;
 			}
-		} else {
+		}
+		else
+		{
 			fclose($fp);
 			$err = "Recordset had unexpected EOF 2";
 			return $false;
@@ -240,16 +282,21 @@ 
 		$MAXSIZE = 128000;
 		
 		$text = '';
-		while ($txt = fread($fp,$MAXSIZE)) {
+		while ($txt = fread($fp,$MAXSIZE))
+		{
 			$text .= $txt;
 		}
 			
 		fclose($fp);
 		@$arr = unserialize($text);
 		//var_dump($arr);
-		if (!is_array($arr)) {
+		if (!is_array($arr))
+		{
 			$err = "Recordset had unexpected EOF (in serialized recordset)";
-			if (get_magic_quotes_runtime()) $err .= ". Magic Quotes Runtime should be disabled!";
+			if (get_magic_quotes_runtime())
+			{
+				$err .= ". Magic Quotes Runtime should be disabled!";
+			}
 			return $false;
 		}
 		$rs = new $rsclass();
@@ -263,7 +310,7 @@ 
 	* Save a file $filename and its $contents (normally for caching) with file locking
 	*/
 	function adodb_write_file($filename, $contents,$debug=false)
-	{ 
+	{
 	# http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
 	# So to simulate locking, we assume that rename is an atomic operation.
 	# First we delete $filename, then we create a $tempfile write to it and 
@@ -275,35 +322,56 @@ 
 	# 2. unlink($filename) fails -- ok, rename will fail
 	# 3. adodb reads stale file because unlink fails -- ok, $rs timeout occurs
 	# 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and  cache updated
-		if (strncmp(PHP_OS,'WIN',3) === 0) {
+		if (strncmp(PHP_OS,'WIN',3) === 0)
+		{
 			// skip the decimal place
 			$mtime = substr(str_replace(' ','_',microtime()),2); 
 			// getmypid() actually returns 0 on Win98 - never mind!
 			$tmpname = $filename.uniqid($mtime).getmypid();
-			if (!($fd = @fopen($tmpname,'a'))) return false;
+			if (!($fd = @fopen($tmpname,'a')))
+			{
+				return false;
+			}
 			$ok = ftruncate($fd,0);			
-			if (!fwrite($fd,$contents)) $ok = false;
+			if (!fwrite($fd,$contents))
+			{
+				$ok = false;
+			}
 			fclose($fd);
 			chmod($tmpname,0644);
 			// the tricky moment
 			@unlink($filename);
-			if (!@rename($tmpname,$filename)) {
+			if (!@rename($tmpname,$filename))
+			{
 				unlink($tmpname);
 				$ok = false;
 			}
-			if (!$ok) {
-				if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed'));
+			if (!$ok)
+			{
+				if ($debug)
+				{
+					ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed'));
+				}
 			}
 			return $ok;
 		}
-		if (!($fd = @fopen($filename, 'a'))) return false;
-		if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) {
+		if (!($fd = @fopen($filename, 'a')))
+		{
+			return false;
+		}
+		if (flock($fd, LOCK_EX) && ftruncate($fd, 0))
+		{
 			$ok = fwrite( $fd, $contents );
 			fclose($fd);
 			chmod($filename,0644);
-		}else {
+		}
+		else
+		{
 			fclose($fd);
-			if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename<br>\n");
+			if ($debug)
+			{
+				ADOConnection::outp( " Failed acquiring lock for $filename<br>\n");
+			}
 			$ok = false;
 		}
 	

phpgwapi/inc/adodb/adodb-datadict.inc.php

Doc Comments +35 added lines, -1 removed lines

@@ -196,18 +196,27 @@ 
 		return $this->connection->MetaTables();
 	}
 
+	/**
+	 * @return string
+	 */
 	function MetaColumns($tab, $upper=true, $schema=false)
 	{
 		if (!$this->connection->IsConnected()) return array();
 		return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema);
 	}
 
+	/**
+	 * @param string $tab
+	 */
 	function MetaPrimaryKeys($tab,$owner=false,$intkey=false)
 	{
 		if (!$this->connection->IsConnected()) return array();
 		return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey);
 	}
 
+	/**
+	 * @param string $table
+	 */
 	function MetaIndexes($table, $primary = false, $owner = false)
 	{
 		if (!$this->connection->IsConnected()) return array();
@@ -304,6 +313,11 @@ 
 		N:  Numeric or decimal number
 	*/
 
+	/**
+	 * @param string $meta
+	 *
+	 * @return string
+	 */
 	function ActualType($meta)
 	{
 		return $meta;
@@ -325,6 +339,10 @@ 
 	/*
 	 Generates the SQL to create index. Returns an array of sql strings.
 	*/
+
+	/**
+	 * @param string $tabname
+	 */
 	function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false)
 	{
 		if (!is_array($flds)) {
@@ -339,6 +357,9 @@ 
 		return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions));
 	}
 
+	/**
+	 * @param string $tabname
+	 */
 	function DropIndexSQL ($idxname, $tabname = NULL)
 	{
 		return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname)));
@@ -349,6 +370,10 @@ 
 		$this->schema = $schema;
 	}
 
+	/**
+	 * @param string $tabname
+	 * @param string $flds
+	 */
 	function AddColumnSQL($tabname, $flds)
 	{
 		$tabname = $this->TableName ($tabname);
@@ -392,7 +417,7 @@ 
 	 * @param string $oldcolumn column-name to be renamed
 	 * @param string $newcolumn new column-name
 	 * @param string $flds='' complete column-defintion-string like for AddColumnSQL, only used by mysql atm., default=''
-	 * @return array with SQL strings
+	 * @return string[] with SQL strings
 	 */
 	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
 	{
@@ -433,6 +458,10 @@ 
 		return array (sprintf($this->dropTable, $this->TableName($tabname)));
 	}
 
+	/**
+	 * @param string $tabname
+	 * @param string $newname
+	 */
 	function RenameTableSQL($tabname,$newname)
 	{
 		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
@@ -613,6 +642,11 @@ 
 
 
 	// return string must begin with space
+
+	/**
+	 * @param boolean $fautoinc
+	 * @param boolean $funsigned
+	 */
 	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
 		$suffix = '';

Switch Indentation +101 added lines, -101 removed lines

@@ -65,92 +65,92 @@ 
 	while ($pos < $max) {
 		$ch = substr($args,$pos,1);
 		switch($ch) {
-		case ' ':
-		case "\t":
-		case "\n":
-		case "\r":
-			if (!$quoted) {
-				if ($intoken) {
-					$intoken = false;
-					$tokens[$stmtno][] = implode('',$tokarr);
+			case ' ':
+			case "\t":
+			case "\n":
+			case "\r":
+				if (!$quoted) {
+					if ($intoken) {
+						$intoken = false;
+						$tokens[$stmtno][] = implode('',$tokarr);
+					}
+					break;
 				}
+
+				$tokarr[] = $ch;
 				break;
-			}
 
-			$tokarr[] = $ch;
-			break;
+			case '`':
+				if ($intoken) $tokarr[] = $ch;
+			case '(':
+			case ')':
+			case '"':
+			case "'":
 
-		case '`':
-			if ($intoken) $tokarr[] = $ch;
-		case '(':
-		case ')':
-		case '"':
-		case "'":
+				if ($intoken) {
+					if (empty($endquote)) {
+						$tokens[$stmtno][] = implode('',$tokarr);
+						if ($ch == '(') $endquote = ')';
+						else $endquote = $ch;
+						$quoted = true;
+						$intoken = true;
+						$tokarr = array();
+					} else if ($endquote == $ch) {
+						$ch2 = substr($args,$pos+1,1);
+						if ($ch2 == $endquote) {
+							$pos += 1;
+							$tokarr[] = $ch2;
+						} else {
+							$quoted = false;
+							$intoken = false;
+							$tokens[$stmtno][] = implode('',$tokarr);
+							$endquote = '';
+						}
+					} else
+						$tokarr[] = $ch;
+
+				}else {
 
-			if ($intoken) {
-				if (empty($endquote)) {
-					$tokens[$stmtno][] = implode('',$tokarr);
 					if ($ch == '(') $endquote = ')';
 					else $endquote = $ch;
 					$quoted = true;
 					$intoken = true;
 					$tokarr = array();
-				} else if ($endquote == $ch) {
-					$ch2 = substr($args,$pos+1,1);
-					if ($ch2 == $endquote) {
-						$pos += 1;
-						$tokarr[] = $ch2;
-					} else {
-						$quoted = false;
-						$intoken = false;
-						$tokens[$stmtno][] = implode('',$tokarr);
-						$endquote = '';
-					}
-				} else
-					$tokarr[] = $ch;
+					if ($ch == '`') $tokarr[] = '`';
+				}
+				break;
 
-			}else {
+			default:
 
-				if ($ch == '(') $endquote = ')';
-				else $endquote = $ch;
-				$quoted = true;
-				$intoken = true;
-				$tokarr = array();
-				if ($ch == '`') $tokarr[] = '`';
-			}
-			break;
+				if (!$intoken) {
+					if ($ch == $endstmtchar) {
+						$stmtno += 1;
+						$tokens[$stmtno] = array();
+						break;
+					}
 
-		default:
+					$intoken = true;
+					$quoted = false;
+					$endquote = false;
+					$tokarr = array();
 
-			if (!$intoken) {
-				if ($ch == $endstmtchar) {
-					$stmtno += 1;
-					$tokens[$stmtno] = array();
-					break;
 				}
 
-				$intoken = true;
-				$quoted = false;
-				$endquote = false;
-				$tokarr = array();
-
-			}
-
-			if ($quoted) $tokarr[] = $ch;
-			else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch;
-			else {
-				if ($ch == $endstmtchar) {
+				if ($quoted) $tokarr[] = $ch;
+				else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch;
+				else {
+					if ($ch == $endstmtchar) {
+						$tokens[$stmtno][] = implode('',$tokarr);
+						$stmtno += 1;
+						$tokens[$stmtno] = array();
+						$intoken = false;
+						$tokarr = array();
+						break;
+					}
 					$tokens[$stmtno][] = implode('',$tokarr);
-					$stmtno += 1;
-					$tokens[$stmtno] = array();
+					$tokens[$stmtno][] = $ch;
 					$intoken = false;
-					$tokarr = array();
-					break;
 				}
-				$tokens[$stmtno][] = implode('',$tokarr);
-				$tokens[$stmtno][] = $ch;
-				$intoken = false;
-			}
 		}
 		$pos += 1;
 	}
@@ -469,15 +469,15 @@ 
 				$f1 = array();
 				foreach($f0 as $token) {
 					switch (strtoupper($token)) {
-					case 'CONSTRAINT':
-					case 'DEFAULT':
-						$hasparam = $token;
-						break;
-					default:
-						if ($hasparam) $f1[$hasparam] = $token;
-						else $f1[] = $token;
-						$hasparam = false;
-						break;
+						case 'CONSTRAINT':
+						case 'DEFAULT':
+							$hasparam = $token;
+							break;
+						default:
+							if ($hasparam) $f1[$hasparam] = $token;
+							else $f1[] = $token;
+							$hasparam = false;
+							break;
 					}
 				}
 				$flds[] = $f1;
@@ -511,31 +511,31 @@ 
 				else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v);
 
 				switch($attr) {
-				case '0':
-				case 'NAME': 	$fname = $v; break;
-				case '1':
-				case 'TYPE': 	$ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;
-
-				case 'SIZE':
-								$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
-								if ($dotat === false) $fsize = $v;
-								else {
-									$fsize = substr($v,0,$dotat);
-									$fprec = substr($v,$dotat+1);
-								}
-								break;
-				case 'UNSIGNED': $funsigned = true; break;
-				case 'AUTOINCREMENT':
-				case 'AUTO':	$fautoinc = true; $fnotnull = true; break;
-				case 'KEY':
-				case 'PRIMARY':	$fprimary = $v; $fnotnull = true; break;
-				case 'DEF':
-				case 'DEFAULT': $fdefault = $v; break;
-				case 'NOTNULL': $fnotnull = $v; break;
-				case 'NOQUOTE': $fnoquote = $v; break;
-				case 'DEFDATE': $fdefdate = $v; break;
-				case 'DEFTIMESTAMP': $fdefts = $v; break;
-				case 'CONSTRAINT': $fconstraint = $v; break;
+					case '0':
+					case 'NAME': 	$fname = $v; break;
+					case '1':
+					case 'TYPE': 	$ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;
+
+					case 'SIZE':
+									$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
+									if ($dotat === false) $fsize = $v;
+									else {
+										$fsize = substr($v,0,$dotat);
+										$fprec = substr($v,$dotat+1);
+									}
+									break;
+					case 'UNSIGNED': $funsigned = true; break;
+					case 'AUTOINCREMENT':
+					case 'AUTO':	$fautoinc = true; $fnotnull = true; break;
+					case 'KEY':
+					case 'PRIMARY':	$fprimary = $v; $fnotnull = true; break;
+					case 'DEF':
+					case 'DEFAULT': $fdefault = $v; break;
+					case 'NOTNULL': $fnotnull = $v; break;
+					case 'NOQUOTE': $fnoquote = $v; break;
+					case 'DEFDATE': $fdefdate = $v; break;
+					case 'DEFTIMESTAMP': $fdefts = $v; break;
+					case 'CONSTRAINT': $fconstraint = $v; break;
 				} //switch
 			} // foreach $fld
 

Spacing +119 added lines, -119 removed lines

@@ -24,7 +24,7 @@ 
 {
 $str = "`zcol ACOL` NUMBER(32,2) DEFAULT 'The \"cow\" (and Jim''s dog) jumps over the moon' PRIMARY, INTI INT AUTO DEFAULT 0, zcol2\"afs ds";
 print "<p>$str</p>";
-$a= Lens_ParseArgs($str);
+$a = Lens_ParseArgs($str);
 print "<pre>";
 print_r($a);
 print "</pre>";
@@ -51,7 +51,7 @@ 
 	@param tokenchars     Include the following characters in tokens apart from A-Z and 0-9
 	@returns 2 dimensional array containing parsed tokens.
 */
-function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
+function Lens_ParseArgs($args, $endstmtchar = ',', $tokenchars = '_.-')
 {
 	$pos = 0;
 	$intoken = false;
@@ -63,8 +63,8 @@ 
 	$quoted = false;
 
 	while ($pos < $max) {
-		$ch = substr($args,$pos,1);
-		switch($ch) {
+		$ch = substr($args, $pos, 1);
+		switch ($ch) {
 		case ' ':
 		case "\t":
 		case "\n":
@@ -72,7 +72,7 @@ 
 			if (!$quoted) {
 				if ($intoken) {
 					$intoken = false;
-					$tokens[$stmtno][] = implode('',$tokarr);
+					$tokens[$stmtno][] = implode('', $tokarr);
 				}
 				break;
 			}
@@ -89,27 +89,27 @@ 
 
 			if ($intoken) {
 				if (empty($endquote)) {
-					$tokens[$stmtno][] = implode('',$tokarr);
+					$tokens[$stmtno][] = implode('', $tokarr);
 					if ($ch == '(') $endquote = ')';
 					else $endquote = $ch;
 					$quoted = true;
 					$intoken = true;
 					$tokarr = array();
 				} else if ($endquote == $ch) {
-					$ch2 = substr($args,$pos+1,1);
+					$ch2 = substr($args, $pos + 1, 1);
 					if ($ch2 == $endquote) {
 						$pos += 1;
 						$tokarr[] = $ch2;
 					} else {
 						$quoted = false;
 						$intoken = false;
-						$tokens[$stmtno][] = implode('',$tokarr);
+						$tokens[$stmtno][] = implode('', $tokarr);
 						$endquote = '';
 					}
 				} else
 					$tokarr[] = $ch;
 
-			}else {
+			} else {
 
 				if ($ch == '(') $endquote = ')';
 				else $endquote = $ch;
@@ -137,24 +137,24 @@ 
 			}
 
 			if ($quoted) $tokarr[] = $ch;
-			else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch;
+			else if (ctype_alnum($ch) || strpos($tokenchars, $ch) !== false) $tokarr[] = $ch;
 			else {
 				if ($ch == $endstmtchar) {
-					$tokens[$stmtno][] = implode('',$tokarr);
+					$tokens[$stmtno][] = implode('', $tokarr);
 					$stmtno += 1;
 					$tokens[$stmtno] = array();
 					$intoken = false;
 					$tokarr = array();
 					break;
 				}
-				$tokens[$stmtno][] = implode('',$tokarr);
+				$tokens[$stmtno][] = implode('', $tokarr);
 				$tokens[$stmtno][] = $ch;
 				$intoken = false;
 			}
 		}
 		$pos += 1;
 	}
-	if ($intoken) $tokens[$stmtno][] = implode('',$tokarr);
+	if ($intoken) $tokens[$stmtno][] = implode('', $tokarr);
 
 	return $tokens;
 }
@@ -169,23 +169,23 @@ 
 	var $addCol = ' ADD';
 	var $alterCol = ' ALTER COLUMN';
 	var $dropCol = ' DROP COLUMN';
-	var $renameColumn = 'ALTER TABLE %s RENAME COLUMN %s TO %s';	// table, old-column, new-column, column-definitions (not used by default)
+	var $renameColumn = 'ALTER TABLE %s RENAME COLUMN %s TO %s'; // table, old-column, new-column, column-definitions (not used by default)
 	var $nameRegex = '\w';
 	var $nameRegexBrackets = 'a-zA-Z0-9_\(\)';
 	var $schema = false;
 	var $serverInfo = array();
 	var $autoIncrement = false;
 	var $dataProvider;
-	var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changetablesql
-	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob
+	var $invalidResizeTypes4 = array('CLOB', 'BLOB', 'TEXT', 'DATE', 'TIME'); // for changetablesql
+	var $blobSize = 100; /// any varchar/char field this size or greater is treated as a blob
 							/// in other words, we use a text area for editting.
 
-	function GetCommentSQL($table,$col)
+	function GetCommentSQL($table, $col)
 	{
 		return false;
 	}
 
-	function SetCommentSQL($table,$col,$cmt)
+	function SetCommentSQL($table, $col, $cmt)
 	{
 		return false;
 	}
@@ -196,13 +196,13 @@ 
 		return $this->connection->MetaTables();
 	}
 
-	function MetaColumns($tab, $upper=true, $schema=false)
+	function MetaColumns($tab, $upper = true, $schema = false)
 	{
 		if (!$this->connection->IsConnected()) return array();
 		return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema);
 	}
 
-	function MetaPrimaryKeys($tab,$owner=false,$intkey=false)
+	function MetaPrimaryKeys($tab, $owner = false, $intkey = false)
 	{
 		if (!$this->connection->IsConnected()) return array();
 		return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey);
@@ -214,12 +214,12 @@ 
 		return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner);
 	}
 
-	function MetaType($t,$len=-1,$fieldobj=false)
+	function MetaType($t, $len = -1, $fieldobj = false)
 	{
-		return ADORecordSet::MetaType($t,$len,$fieldobj);
+		return ADORecordSet::MetaType($t, $len, $fieldobj);
 	}
 
-	function NameQuote($name = NULL,$allowBrackets=false)
+	function NameQuote($name = NULL, $allowBrackets = false)
 	{
 		if (!is_string($name)) {
 			return FALSE;
@@ -227,23 +227,23 @@ 
 
 		$name = trim($name);
 
-		if ( !is_object($this->connection) ) {
+		if (!is_object($this->connection)) {
 			return $name;
 		}
 
 		$quote = $this->connection->nameQuote;
 
 		// if name is of the form `name`, quote it
-		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
-			return $quote . $matches[1] . $quote;
+		if (preg_match('/^`(.+)`$/', $name, $matches)) {
+			return $quote.$matches[1].$quote;
 		}
 
 		// if brackets are allowed, quote only the rest,
 		// to allow to limit indexes on colums, eg "column(32)"
-		if ($allowBrackets && preg_match('/^(.*) *(\(\d+\))$/',$name,$matches)) {
-			return $quote . $matches[1] . $quote . ' '. $matches[2];
+		if ($allowBrackets && preg_match('/^(.*) *(\(\d+\))$/', $name, $matches)) {
+			return $quote.$matches[1].$quote.' '.$matches[2];
 		}
-		return $quote . $name . $quote;
+		return $quote.$name.$quote;
 
 		// not used stock ADOdb code, which only quotes names with special chars,
 		// which does not help with column names using reserved words, eg. "timestamp" in phpfreechat
@@ -251,8 +251,8 @@ 
 		// if name contains special characters, quote it
 		$regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex;
 
-		if ( !preg_match('/^[' . $regex . ']+$/', $name) ) {
-			return $quote . $name . $quote;
+		if (!preg_match('/^['.$regex.']+$/', $name)) {
+			return $quote.$name.$quote;
 		}
 
 		return $name;
@@ -260,8 +260,8 @@ 
 
 	function TableName($name)
 	{
-		if ( $this->schema ) {
-			return $this->NameQuote($this->schema) .'.'. $this->NameQuote($name);
+		if ($this->schema) {
+			return $this->NameQuote($this->schema).'.'.$this->NameQuote($name);
 		}
 		return $this->NameQuote($name);
 	}
@@ -272,7 +272,7 @@ 
 		$rez = 2;
 		$conn = &$this->connection;
 		$saved = $conn->debug;
-		foreach($sql as $line) {
+		foreach ($sql as $line) {
 
 			if ($this->debug) $conn->debug = true;
 			$ok = $conn->Execute($line);
@@ -309,12 +309,12 @@ 
 		return $meta;
 	}
 
-	function CreateDatabase($dbname,$options=false)
+	function CreateDatabase($dbname, $options = false)
 	{
 		$options = $this->_Options($options);
 		$sql = array();
 
-		$s = 'CREATE DATABASE ' . $this->NameQuote($dbname);
+		$s = 'CREATE DATABASE '.$this->NameQuote($dbname);
 		if (isset($options[$this->upperName]))
 			$s .= ' '.$options[$this->upperName];
 
@@ -328,18 +328,18 @@ 
 	function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false)
 	{
 		if (!is_array($flds)) {
-			$flds = explode(',',$flds);
+			$flds = explode(',', $flds);
 		}
 
-		foreach($flds as $key => $fld) {
+		foreach ($flds as $key => $fld) {
 			# some indexes can use partial fields, eg. index first 32 chars of "name" with NAME(32)
-			$flds[$key] = $this->NameQuote($fld,$allowBrackets=true);
+			$flds[$key] = $this->NameQuote($fld, $allowBrackets = true);
 		}
 
 		return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions));
 	}
 
-	function DropIndexSQL ($idxname, $tabname = NULL)
+	function DropIndexSQL($idxname, $tabname = NULL)
 	{
 		return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname)));
 	}
@@ -351,12 +351,12 @@ 
 
 	function AddColumnSQL($tabname, $flds)
 	{
-		$tabname = $this->TableName ($tabname);
+		$tabname = $this->TableName($tabname);
 		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
-		foreach($lines as $v) {
-			$sql[] = $alter . $v;
+		list($lines, $pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE '.$tabname.$this->addCol.' ';
+		foreach ($lines as $v) {
+			$sql[] = $alter.$v;
 		}
 		return $sql;
 	}
@@ -372,14 +372,14 @@ 
 	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''
 	 * @return array with SQL strings
 	 */
-	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	function AlterColumnSQL($tabname, $flds, $tableflds = '', $tableoptions = '')
 	{
-		$tabname = $this->TableName ($tabname);
+		$tabname = $this->TableName($tabname);
 		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
-		foreach($lines as $v) {
-			$sql[] = $alter . $v;
+		list($lines, $pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE '.$tabname.$this->alterCol.' ';
+		foreach ($lines as $v) {
+			$sql[] = $alter.$v;
 		}
 		return $sql;
 	}
@@ -394,15 +394,15 @@ 
 	 * @param string $flds='' complete column-defintion-string like for AddColumnSQL, only used by mysql atm., default=''
 	 * @return array with SQL strings
 	 */
-	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
+	function RenameColumnSQL($tabname, $oldcolumn, $newcolumn, $flds = '')
 	{
-		$tabname = $this->TableName ($tabname);
+		$tabname = $this->TableName($tabname);
 		if ($flds) {
-			list($lines,$pkey) = $this->_GenFields($flds);
+			list($lines, $pkey) = $this->_GenFields($flds);
 			list(,$first) = each($lines);
-			list(,$column_def) = preg_split("/[\t ]+/",$first,2);
+			list(,$column_def) = preg_split("/[\t ]+/", $first, 2);
 		}
-		return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
+		return array(sprintf($this->renameColumn, $tabname, $this->NameQuote($oldcolumn), $this->NameQuote($newcolumn), $column_def));
 	}
 
 	/**
@@ -416,58 +416,58 @@ 
 	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''
 	 * @return array with SQL strings
 	 */
-	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	function DropColumnSQL($tabname, $flds, $tableflds = '', $tableoptions = '')
 	{
-		$tabname = $this->TableName ($tabname);
-		if (!is_array($flds)) $flds = explode(',',$flds);
+		$tabname = $this->TableName($tabname);
+		if (!is_array($flds)) $flds = explode(',', $flds);
 		$sql = array();
-		$alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' ';
-		foreach($flds as $v) {
-			$sql[] = $alter . $this->NameQuote($v);
+		$alter = 'ALTER TABLE '.$tabname.$this->dropCol.' ';
+		foreach ($flds as $v) {
+			$sql[] = $alter.$this->NameQuote($v);
 		}
 		return $sql;
 	}
 
 	function DropTableSQL($tabname)
 	{
-		return array (sprintf($this->dropTable, $this->TableName($tabname)));
+		return array(sprintf($this->dropTable, $this->TableName($tabname)));
 	}
 
-	function RenameTableSQL($tabname,$newname)
+	function RenameTableSQL($tabname, $newname)
 	{
-		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
+		return array(sprintf($this->renameTable, $this->TableName($tabname), $this->TableName($newname)));
 	}
 
 	/*
 	 Generate the SQL to create table. Returns an array of sql strings.
 	*/
-	function CreateTableSQL($tabname, $flds, $tableoptions=false)
+	function CreateTableSQL($tabname, $flds, $tableoptions = false)
 	{
 		if (!$tableoptions) $tableoptions = array();
 
-		list($lines,$pkey) = $this->_GenFields($flds, true);
+		list($lines, $pkey) = $this->_GenFields($flds, true);
 
 		$taboptions = $this->_Options($tableoptions);
-		$tabname = $this->TableName ($tabname);
-		$sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
+		$tabname = $this->TableName($tabname);
+		$sql = $this->_TableSQL($tabname, $lines, $pkey, $taboptions);
 
-		$tsql = $this->_Triggers($tabname,$taboptions);
-		foreach($tsql as $s) $sql[] = $s;
+		$tsql = $this->_Triggers($tabname, $taboptions);
+		foreach ($tsql as $s) $sql[] = $s;
 
 		return $sql;
 	}
 
-	function _GenFields($flds,$widespacing=false)
+	function _GenFields($flds, $widespacing = false)
 	{
 		if (is_string($flds)) {
 			$padding = '     ';
 			$txt = $flds.$padding;
 			$flds = array();
-			$flds0 = Lens_ParseArgs($txt,',');
+			$flds0 = Lens_ParseArgs($txt, ',');
 			$hasparam = false;
-			foreach($flds0 as $f0) {
+			foreach ($flds0 as $f0) {
 				$f1 = array();
-				foreach($f0 as $token) {
+				foreach ($f0 as $token) {
 					switch (strtoupper($token)) {
 					case 'CONSTRAINT':
 					case 'DEFAULT':
@@ -487,7 +487,7 @@ 
 		$this->autoIncrement = false;
 		$lines = array();
 		$pkey = array();
-		foreach($flds as $fld) {
+		foreach ($flds as $fld) {
 			$fld = _array_change_key_case($fld);
 
 			$fname = false;
@@ -506,22 +506,22 @@ 
 
 			//-----------------
 			// Parse attributes
-			foreach($fld as $attr => $v) {
+			foreach ($fld as $attr => $v) {
 				if ($attr == 2 && is_numeric($v)) $attr = 'SIZE';
 				else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v);
 
-				switch($attr) {
+				switch ($attr) {
 				case '0':
 				case 'NAME': 	$fname = $v; break;
 				case '1':
 				case 'TYPE': 	$ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;
 
 				case 'SIZE':
-								$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
+								$dotat = strpos($v, '.'); if ($dotat === false) $dotat = strpos($v, ',');
 								if ($dotat === false) $fsize = $v;
 								else {
-									$fsize = substr($v,0,$dotat);
-									$fprec = substr($v,$dotat+1);
+									$fsize = substr($v, 0, $dotat);
+									$fprec = substr($v, $dotat + 1);
 								}
 								break;
 				case 'UNSIGNED': $funsigned = true; break;
@@ -568,33 +568,33 @@ 
 			//--------------------
 			// CONSTRUCT FIELD SQL
 			if ($fdefts) {
-				if (substr($this->connection->databaseType,0,5) == 'mysql') {
+				if (substr($this->connection->databaseType, 0, 5) == 'mysql') {
 					$ftype = 'TIMESTAMP';
 				} else {
 					$fdefault = $this->connection->sysTimeStamp;
 				}
 			} else if ($fdefdate) {
-				if (substr($this->connection->databaseType,0,5) == 'mysql') {
+				if (substr($this->connection->databaseType, 0, 5) == 'mysql') {
 					$ftype = 'TIMESTAMP';
 				} else {
 					$fdefault = $this->connection->sysDate;
 				}
 			} else if ($fdefault !== false && !$fnoquote)
 				if ($ty == 'C' or $ty == 'X' or
-					( substr($fdefault,0,1) != "'" && !is_numeric($fdefault)))
-					if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ')
+					(substr($fdefault, 0, 1) != "'" && !is_numeric($fdefault)))
+					if (strlen($fdefault) != 1 && substr($fdefault, 0, 1) == ' ' && substr($fdefault, strlen($fdefault) - 1) == ' ')
 						$fdefault = trim($fdefault);
 					else if (strtolower($fdefault) != 'null')
 						$fdefault = $this->connection->qstr($fdefault);
-			$suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned);
+			$suffix = $this->_CreateSuffix($fname, $ftype, $fnotnull, $fdefault, $fautoinc, $fconstraint, $funsigned);
 
-			if ($widespacing) $fname = str_pad($fname,24);
+			if ($widespacing) $fname = str_pad($fname, 24);
 			$lines[$fid] = $fname.' '.$ftype.$suffix;
 
 			if ($fautoinc) $this->autoIncrement = true;
 		} // foreach $flds
 
-		return array($lines,$pkey);
+		return array($lines, $pkey);
 	}
 	/*
 		 GENERATE THE SIZE PART OF THE DATATYPE
@@ -603,7 +603,7 @@ 
 	*/
 	function _GetSize($ftype, $ty, $fsize, $fprec)
 	{
-		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) {
+		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype, '(') === false) {
 			$ftype .= "(".$fsize;
 			if (strlen($fprec)) $ftype .= ",".$fprec;
 			$ftype .= ')';
@@ -613,7 +613,7 @@ 
 
 
 	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	function _CreateSuffix($fname, $ftype, $fnotnull, $fdefault, $fautoinc, $fconstraint, $funsigned)
 	{
 		$suffix = '';
 		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
@@ -626,26 +626,26 @@ 
 	{
 		$sql = array();
 
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname);
-			if ( isset($idxoptions['DROP']) )
+		if (isset($idxoptions['REPLACE']) || isset($idxoptions['DROP'])) {
+			$sql[] = sprintf($this->dropIndex, $idxname);
+			if (isset($idxoptions['DROP']))
 				return $sql;
 		}
 
-		if ( empty ($flds) ) {
+		if (empty ($flds)) {
 			return $sql;
 		}
 
 		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
 
-		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
+		$s = 'CREATE'.$unique.' INDEX '.$idxname.' ON '.$tabname.' ';
 
-		if ( isset($idxoptions[$this->upperName]) )
+		if (isset($idxoptions[$this->upperName]))
 			$s .= $idxoptions[$this->upperName];
 
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s .= '(' . $flds . ')';
+		if (is_array($flds))
+			$flds = implode(', ', $flds);
+		$s .= '('.$flds.')';
 		$sql[] = $s;
 
 		return $sql;
@@ -656,25 +656,25 @@ 
 		return false;
 	}
 
-	function _TableSQL($tabname,$lines,$pkey,$tableoptions)
+	function _TableSQL($tabname, $lines, $pkey, $tableoptions)
 	{
 		$sql = array();
 
 		if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) {
-			$sql[] = sprintf($this->dropTable,$tabname);
+			$sql[] = sprintf($this->dropTable, $tabname);
 			if ($this->autoIncrement) {
 				$sInc = $this->_DropAutoIncrement($tabname);
 				if ($sInc) $sql[] = $sInc;
 			}
-			if ( isset ($tableoptions['DROP']) ) {
+			if (isset ($tableoptions['DROP'])) {
 				return $sql;
 			}
 		}
 		$s = "CREATE TABLE $tabname (\n";
 		$s .= implode(",\n", $lines);
-		if (sizeof($pkey)>0) {
+		if (sizeof($pkey) > 0) {
 			$s .= ",\n                 PRIMARY KEY (";
-			$s .= implode(", ",$pkey).")";
+			$s .= implode(", ", $pkey).")";
 		}
 		if (isset($tableoptions['CONSTRAINTS']))
 			$s .= "\n".$tableoptions['CONSTRAINTS'];
@@ -693,7 +693,7 @@ 
 		GENERATE TRIGGERS IF NEEDED
 		used when table has auto-incrementing field that is emulated using triggers
 	*/
-	function _Triggers($tabname,$taboptions)
+	function _Triggers($tabname, $taboptions)
 	{
 		return array();
 	}
@@ -705,7 +705,7 @@ 
 	{
 		if (!is_array($opts)) return array();
 		$newopts = array();
-		foreach($opts as $k => $v) {
+		foreach ($opts as $k => $v) {
 			if (is_numeric($k)) $newopts[strtoupper($v)] = $v;
 			else $newopts[strtoupper($k)] = $v;
 		}
@@ -735,7 +735,7 @@ 
 		if (isset($savem)) $this->connection->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
 
-		if ( empty($cols)) {
+		if (empty($cols)) {
 			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
 		}
 
@@ -745,14 +745,14 @@ 
 		// if the Metatype and size is exactly the
 		// same, ignore - by Mark Newham
 			$holdflds = array();
-			foreach($flds as $k=>$v) {
-				if ( isset($cols[$k]) && is_object($cols[$k]) ) {
+			foreach ($flds as $k=>$v) {
+				if (isset($cols[$k]) && is_object($cols[$k])) {
 					$c = $cols[$k];
 					$ml = $c->max_length;
-					$mt = &$this->MetaType($c->type,$ml);
+					$mt = &$this->MetaType($c->type, $ml);
 					if ($ml == -1) $ml = '';
 					if ($mt == 'X') $ml = $v['SIZE'];
-					if (($mt != $v['TYPE']) ||  $ml != $v['SIZE']) {
+					if (($mt != $v['TYPE']) || $ml != $v['SIZE']) {
 						$holdflds[$k] = $v;
 					}
 				} else {
@@ -764,21 +764,21 @@ 
 
 
 		// already exists, alter table instead
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
+		list($lines, $pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE '.$this->TableName($tablename);
 		$sql = array();
 
-		foreach ( $lines as $id => $v ) {
-			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
+		foreach ($lines as $id => $v) {
+			if (isset($cols[$id]) && is_object($cols[$id])) {
 
-				$flds = Lens_ParseArgs($v,',');
+				$flds = Lens_ParseArgs($v, ',');
 
 				//  We are trying to change the size of the field, if not allowed, simply ignore the request.
-				if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) continue;
+				if ($flds && in_array(strtoupper(substr($flds[0][1], 0, 4)), $this->invalidResizeTypes4)) continue;
 
-				$sql[] = $alter . $this->alterCol . ' ' . $v;
+				$sql[] = $alter.$this->alterCol.' '.$v;
 			} else {
-				$sql[] = $alter . $this->addCol . ' ' . $v;
+				$sql[] = $alter.$this->addCol.' '.$v;
 			}
 		}
 

Braces +354 added lines, -123 removed lines

@@ -18,7 +18,10 @@ 
 */
 
 // security - hide paths
-if (!defined('ADODB_DIR')) die();
+if (!defined('ADODB_DIR'))
+{
+	die();
+}
 
 function Lens_ParseTest()
 {
@@ -31,8 +34,10 @@ 
 }
 
 
-if (!function_exists('ctype_alnum')) {
-	function ctype_alnum($text) {
+if (!function_exists('ctype_alnum'))
+{
+	function ctype_alnum($text)
+	{
 		return preg_match('/^[a-z0-9]*$/i', $text);
 	}
 }
@@ -62,15 +67,19 @@ 
 	$max = strlen($args);
 	$quoted = false;
 
-	while ($pos < $max) {
+	while ($pos < $max)
+	{
 		$ch = substr($args,$pos,1);
-		switch($ch) {
+		switch($ch)
+		{
 		case ' ':
 		case "\t":
 		case "\n":
 		case "\r":
-			if (!$quoted) {
-				if ($intoken) {
+			if (!$quoted)
+			{
+				if ($intoken)
+				{
 					$intoken = false;
 					$tokens[$stmtno][] = implode('',$tokarr);
 				}
@@ -81,49 +90,78 @@ 
 			break;
 
 		case '`':
-			if ($intoken) $tokarr[] = $ch;
+			if ($intoken)
+			{
+				$tokarr[] = $ch;
+			}
 		case '(':
 		case ')':
 		case '"':
 		case "'":
 
-			if ($intoken) {
-				if (empty($endquote)) {
+			if ($intoken)
+			{
+				if (empty($endquote))
+				{
 					$tokens[$stmtno][] = implode('',$tokarr);
-					if ($ch == '(') $endquote = ')';
-					else $endquote = $ch;
+					if ($ch == '(')
+					{
+						$endquote = ')';
+					}
+					else {
+						$endquote = $ch;
+					}
 					$quoted = true;
 					$intoken = true;
 					$tokarr = array();
-				} else if ($endquote == $ch) {
+				}
+				else if ($endquote == $ch)
+				{
 					$ch2 = substr($args,$pos+1,1);
-					if ($ch2 == $endquote) {
+					if ($ch2 == $endquote)
+					{
 						$pos += 1;
 						$tokarr[] = $ch2;
-					} else {
+					}
+					else
+					{
 						$quoted = false;
 						$intoken = false;
 						$tokens[$stmtno][] = implode('',$tokarr);
 						$endquote = '';
 					}
-				} else
-					$tokarr[] = $ch;
+				}
+				else {
+									$tokarr[] = $ch;
+				}
 
-			}else {
+			}
+			else
+			{
 
-				if ($ch == '(') $endquote = ')';
-				else $endquote = $ch;
+				if ($ch == '(')
+				{
+					$endquote = ')';
+				}
+				else {
+					$endquote = $ch;
+				}
 				$quoted = true;
 				$intoken = true;
 				$tokarr = array();
-				if ($ch == '`') $tokarr[] = '`';
+				if ($ch == '`')
+				{
+					$tokarr[] = '`';
+				}
 			}
 			break;
 
 		default:
 
-			if (!$intoken) {
-				if ($ch == $endstmtchar) {
+			if (!$intoken)
+			{
+				if ($ch == $endstmtchar)
+				{
 					$stmtno += 1;
 					$tokens[$stmtno] = array();
 					break;
@@ -136,10 +174,18 @@ 
 
 			}
 
-			if ($quoted) $tokarr[] = $ch;
-			else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch;
-			else {
-				if ($ch == $endstmtchar) {
+			if ($quoted)
+			{
+				$tokarr[] = $ch;
+			}
+			else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false)
+			{
+				$tokarr[] = $ch;
+			}
+			else
+			{
+				if ($ch == $endstmtchar)
+				{
 					$tokens[$stmtno][] = implode('',$tokarr);
 					$stmtno += 1;
 					$tokens[$stmtno] = array();
@@ -154,13 +200,17 @@ 
 		}
 		$pos += 1;
 	}
-	if ($intoken) $tokens[$stmtno][] = implode('',$tokarr);
+	if ($intoken)
+	{
+		$tokens[$stmtno][] = implode('',$tokarr);
+	}
 
 	return $tokens;
 }
 
 
-class ADODB_DataDict {
+class ADODB_DataDict
+{
 	var $connection;
 	var $debug = false;
 	var $dropTable = 'DROP TABLE %s';
@@ -192,25 +242,37 @@ 
 
 	function MetaTables()
 	{
-		if (!$this->connection->IsConnected()) return array();
+		if (!$this->connection->IsConnected())
+		{
+			return array();
+		}
 		return $this->connection->MetaTables();
 	}
 
 	function MetaColumns($tab, $upper=true, $schema=false)
 	{
-		if (!$this->connection->IsConnected()) return array();
+		if (!$this->connection->IsConnected())
+		{
+			return array();
+		}
 		return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema);
 	}
 
 	function MetaPrimaryKeys($tab,$owner=false,$intkey=false)
 	{
-		if (!$this->connection->IsConnected()) return array();
+		if (!$this->connection->IsConnected())
+		{
+			return array();
+		}
 		return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey);
 	}
 
 	function MetaIndexes($table, $primary = false, $owner = false)
 	{
-		if (!$this->connection->IsConnected()) return array();
+		if (!$this->connection->IsConnected())
+		{
+			return array();
+		}
 		return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner);
 	}
 
@@ -221,26 +283,30 @@ 
 
 	function NameQuote($name = NULL,$allowBrackets=false)
 	{
-		if (!is_string($name)) {
+		if (!is_string($name))
+		{
 			return FALSE;
 		}
 
 		$name = trim($name);
 
-		if ( !is_object($this->connection) ) {
+		if ( !is_object($this->connection) )
+		{
 			return $name;
 		}
 
 		$quote = $this->connection->nameQuote;
 
 		// if name is of the form `name`, quote it
-		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
+		if ( preg_match('/^`(.+)`$/', $name, $matches) )
+		{
 			return $quote . $matches[1] . $quote;
 		}
 
 		// if brackets are allowed, quote only the rest,
 		// to allow to limit indexes on colums, eg "column(32)"
-		if ($allowBrackets && preg_match('/^(.*) *(\(\d+\))$/',$name,$matches)) {
+		if ($allowBrackets && preg_match('/^(.*) *(\(\d+\))$/',$name,$matches))
+		{
 			return $quote . $matches[1] . $quote . ' '. $matches[2];
 		}
 		return $quote . $name . $quote;
@@ -251,7 +317,8 @@ 
 		// if name contains special characters, quote it
 		$regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex;
 
-		if ( !preg_match('/^[' . $regex . ']+$/', $name) ) {
+		if ( !preg_match('/^[' . $regex . ']+$/', $name) )
+		{
 			return $quote . $name . $quote;
 		}
 
@@ -260,7 +327,8 @@ 
 
 	function TableName($name)
 	{
-		if ( $this->schema ) {
+		if ( $this->schema )
+		{
 			return $this->NameQuote($this->schema) .'.'. $this->NameQuote($name);
 		}
 		return $this->NameQuote($name);
@@ -272,14 +340,25 @@ 
 		$rez = 2;
 		$conn = &$this->connection;
 		$saved = $conn->debug;
-		foreach($sql as $line) {
+		foreach($sql as $line)
+		{
 
-			if ($this->debug) $conn->debug = true;
+			if ($this->debug)
+			{
+				$conn->debug = true;
+			}
 			$ok = $conn->Execute($line);
 			$conn->debug = $saved;
-			if (!$ok) {
-				if ($this->debug) ADOConnection::outp($conn->ErrorMsg());
-				if (!$continueOnError) return 0;
+			if (!$ok)
+			{
+				if ($this->debug)
+				{
+					ADOConnection::outp($conn->ErrorMsg());
+				}
+				if (!$continueOnError)
+				{
+					return 0;
+				}
 				$rez = 1;
 			}
 		}
@@ -316,7 +395,9 @@ 
 
 		$s = 'CREATE DATABASE ' . $this->NameQuote($dbname);
 		if (isset($options[$this->upperName]))
-			$s .= ' '.$options[$this->upperName];
+		{
+					$s .= ' '.$options[$this->upperName];
+		}
 
 		$sql[] = $s;
 		return $sql;
@@ -327,11 +408,13 @@ 
 	*/
 	function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false)
 	{
-		if (!is_array($flds)) {
+		if (!is_array($flds))
+		{
 			$flds = explode(',',$flds);
 		}
 
-		foreach($flds as $key => $fld) {
+		foreach($flds as $key => $fld)
+		{
 			# some indexes can use partial fields, eg. index first 32 chars of "name" with NAME(32)
 			$flds[$key] = $this->NameQuote($fld,$allowBrackets=true);
 		}
@@ -355,7 +438,8 @@ 
 		$sql = array();
 		list($lines,$pkey) = $this->_GenFields($flds);
 		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
-		foreach($lines as $v) {
+		foreach($lines as $v)
+		{
 			$sql[] = $alter . $v;
 		}
 		return $sql;
@@ -378,7 +462,8 @@ 
 		$sql = array();
 		list($lines,$pkey) = $this->_GenFields($flds);
 		$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
-		foreach($lines as $v) {
+		foreach($lines as $v)
+		{
 			$sql[] = $alter . $v;
 		}
 		return $sql;
@@ -397,7 +482,8 @@ 
 	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
 	{
 		$tabname = $this->TableName ($tabname);
-		if ($flds) {
+		if ($flds)
+		{
 			list($lines,$pkey) = $this->_GenFields($flds);
 			list(,$first) = each($lines);
 			list(,$column_def) = preg_split("/[\t ]+/",$first,2);
@@ -419,10 +505,14 @@ 
 	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
 	{
 		$tabname = $this->TableName ($tabname);
-		if (!is_array($flds)) $flds = explode(',',$flds);
+		if (!is_array($flds))
+		{
+			$flds = explode(',',$flds);
+		}
 		$sql = array();
 		$alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' ';
-		foreach($flds as $v) {
+		foreach($flds as $v)
+		{
 			$sql[] = $alter . $this->NameQuote($v);
 		}
 		return $sql;
@@ -443,7 +533,10 @@ 
 	*/
 	function CreateTableSQL($tabname, $flds, $tableoptions=false)
 	{
-		if (!$tableoptions) $tableoptions = array();
+		if (!$tableoptions)
+		{
+			$tableoptions = array();
+		}
 
 		list($lines,$pkey) = $this->_GenFields($flds, true);
 
@@ -452,30 +545,42 @@ 
 		$sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
 
 		$tsql = $this->_Triggers($tabname,$taboptions);
-		foreach($tsql as $s) $sql[] = $s;
+		foreach($tsql as $s)
+		{
+			$sql[] = $s;
+		}
 
 		return $sql;
 	}
 
 	function _GenFields($flds,$widespacing=false)
 	{
-		if (is_string($flds)) {
+		if (is_string($flds))
+		{
 			$padding = '     ';
 			$txt = $flds.$padding;
 			$flds = array();
 			$flds0 = Lens_ParseArgs($txt,',');
 			$hasparam = false;
-			foreach($flds0 as $f0) {
+			foreach($flds0 as $f0)
+			{
 				$f1 = array();
-				foreach($f0 as $token) {
-					switch (strtoupper($token)) {
+				foreach($f0 as $token)
+				{
+					switch (strtoupper($token))
+					{
 					case 'CONSTRAINT':
 					case 'DEFAULT':
 						$hasparam = $token;
 						break;
 					default:
-						if ($hasparam) $f1[$hasparam] = $token;
-						else $f1[] = $token;
+						if ($hasparam)
+						{
+							$f1[$hasparam] = $token;
+						}
+						else {
+							$f1[] = $token;
+						}
 						$hasparam = false;
 						break;
 					}
@@ -487,7 +592,8 @@ 
 		$this->autoIncrement = false;
 		$lines = array();
 		$pkey = array();
-		foreach($flds as $fld) {
+		foreach($flds as $fld)
+		{
 			$fld = _array_change_key_case($fld);
 
 			$fname = false;
@@ -506,20 +612,35 @@ 
 
 			//-----------------
 			// Parse attributes
-			foreach($fld as $attr => $v) {
-				if ($attr == 2 && is_numeric($v)) $attr = 'SIZE';
-				else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v);
+			foreach($fld as $attr => $v)
+			{
+				if ($attr == 2 && is_numeric($v))
+				{
+					$attr = 'SIZE';
+				}
+				else if (is_numeric($attr) && $attr > 1 && !is_numeric($v))
+				{
+					$attr = strtoupper($v);
+				}
 
-				switch($attr) {
+				switch($attr)
+				{
 				case '0':
 				case 'NAME': 	$fname = $v; break;
 				case '1':
 				case 'TYPE': 	$ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;
 
 				case 'SIZE':
-								$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
-								if ($dotat === false) $fsize = $v;
-								else {
+								$dotat = strpos($v,'.'); if ($dotat === false)
+								{
+									$dotat = strpos($v,',');
+								}
+								if ($dotat === false)
+								{
+									$fsize = $v;
+								}
+								else
+								{
 									$fsize = substr($v,0,$dotat);
 									$fprec = substr($v,$dotat+1);
 								}
@@ -541,57 +662,97 @@ 
 
 			//--------------------
 			// VALIDATE FIELD INFO
-			if (!strlen($fname)) {
-				if ($this->debug) ADOConnection::outp("Undefined NAME");
+			if (!strlen($fname))
+			{
+				if ($this->debug)
+				{
+					ADOConnection::outp("Undefined NAME");
+				}
 				return false;
 			}
 
 			$fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname));
 			$fname = $this->NameQuote($fname);
 
-			if (!strlen($ftype)) {
-				if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'");
+			if (!strlen($ftype))
+			{
+				if ($this->debug)
+				{
+					ADOConnection::outp("Undefined TYPE for field '$fname'");
+				}
 				return false;
-			} else {
+			}
+			else
+			{
 				$ftype = strtoupper($ftype);
 			}
 
 			$ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec);
 
-			if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls
+			if ($ty == 'X' || $ty == 'X2' || $ty == 'B')
+			{
+				$fnotnull = false;
+			}
+			// some blob types do not accept nulls
 
-			if ($fprimary) $pkey[] = $fname;
+			if ($fprimary)
+			{
+				$pkey[] = $fname;
+			}
 
 			// some databases do not allow blobs to have defaults
-			if ($ty == 'X') $fdefault = false;
+			if ($ty == 'X')
+			{
+				$fdefault = false;
+			}
 
 			//--------------------
 			// CONSTRUCT FIELD SQL
-			if ($fdefts) {
-				if (substr($this->connection->databaseType,0,5) == 'mysql') {
+			if ($fdefts)
+			{
+				if (substr($this->connection->databaseType,0,5) == 'mysql')
+				{
 					$ftype = 'TIMESTAMP';
-				} else {
+				}
+				else
+				{
 					$fdefault = $this->connection->sysTimeStamp;
 				}
-			} else if ($fdefdate) {
-				if (substr($this->connection->databaseType,0,5) == 'mysql') {
+			}
+			else if ($fdefdate)
+			{
+				if (substr($this->connection->databaseType,0,5) == 'mysql')
+				{
 					$ftype = 'TIMESTAMP';
-				} else {
+				}
+				else
+				{
 					$fdefault = $this->connection->sysDate;
 				}
-			} else if ($fdefault !== false && !$fnoquote)
-				if ($ty == 'C' or $ty == 'X' or
+			}
+			else if ($fdefault !== false && !$fnoquote)
+			{
+							if ($ty == 'C' or $ty == 'X' or
 					( substr($fdefault,0,1) != "'" && !is_numeric($fdefault)))
 					if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ')
 						$fdefault = trim($fdefault);
+			}
 					else if (strtolower($fdefault) != 'null')
-						$fdefault = $this->connection->qstr($fdefault);
+					{
+											$fdefault = $this->connection->qstr($fdefault);
+					}
 			$suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned);
 
-			if ($widespacing) $fname = str_pad($fname,24);
+			if ($widespacing)
+			{
+				$fname = str_pad($fname,24);
+			}
 			$lines[$fid] = $fname.' '.$ftype.$suffix;
 
-			if ($fautoinc) $this->autoIncrement = true;
+			if ($fautoinc)
+			{
+				$this->autoIncrement = true;
+			}
 		} // foreach $flds
 
 		return array($lines,$pkey);
@@ -603,9 +764,13 @@ 
 	*/
 	function _GetSize($ftype, $ty, $fsize, $fprec)
 	{
-		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) {
+		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false)
+		{
 			$ftype .= "(".$fsize;
-			if (strlen($fprec)) $ftype .= ",".$fprec;
+			if (strlen($fprec))
+			{
+				$ftype .= ",".$fprec;
+			}
 			$ftype .= ')';
 		}
 		return $ftype;
@@ -616,9 +781,18 @@ 
 	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
 	{
 		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		if (strlen($fdefault))
+		{
+			$suffix .= " DEFAULT $fdefault";
+		}
+		if ($fnotnull)
+		{
+			$suffix .= ' NOT NULL';
+		}
+		if ($fconstraint)
+		{
+			$suffix .= ' '.$fconstraint;
+		}
 		return $suffix;
 	}
 
@@ -626,13 +800,17 @@ 
 	{
 		$sql = array();
 
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) )
+		{
 			$sql[] = sprintf ($this->dropIndex, $idxname);
 			if ( isset($idxoptions['DROP']) )
-				return $sql;
+			{
+							return $sql;
+			}
 		}
 
-		if ( empty ($flds) ) {
+		if ( empty ($flds) )
+		{
 			return $sql;
 		}
 
@@ -641,10 +819,14 @@ 
 		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
 
 		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
+		{
+					$s .= $idxoptions[$this->upperName];
+		}
 
 		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
+		{
+					$flds = implode(', ',$flds);
+		}
 		$s .= '(' . $flds . ')';
 		$sql[] = $s;
 
@@ -660,30 +842,44 @@ 
 	{
 		$sql = array();
 
-		if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) {
+		if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP']))
+		{
 			$sql[] = sprintf($this->dropTable,$tabname);
-			if ($this->autoIncrement) {
+			if ($this->autoIncrement)
+			{
 				$sInc = $this->_DropAutoIncrement($tabname);
-				if ($sInc) $sql[] = $sInc;
+				if ($sInc)
+				{
+					$sql[] = $sInc;
+				}
 			}
-			if ( isset ($tableoptions['DROP']) ) {
+			if ( isset ($tableoptions['DROP']) )
+			{
 				return $sql;
 			}
 		}
 		$s = "CREATE TABLE $tabname (\n";
 		$s .= implode(",\n", $lines);
-		if (sizeof($pkey)>0) {
+		if (sizeof($pkey)>0)
+		{
 			$s .= ",\n                 PRIMARY KEY (";
 			$s .= implode(", ",$pkey).")";
 		}
 		if (isset($tableoptions['CONSTRAINTS']))
-			$s .= "\n".$tableoptions['CONSTRAINTS'];
+		{
+					$s .= "\n".$tableoptions['CONSTRAINTS'];
+		}
 
 		if (isset($tableoptions[$this->upperName.'_CONSTRAINTS']))
-			$s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
+		{
+					$s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
+		}
 
 		$s .= "\n)";
-		if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName];
+		if (isset($tableoptions[$this->upperName]))
+		{
+			$s .= $tableoptions[$this->upperName];
+		}
 		$sql[] = $s;
 
 		return $sql;
@@ -703,11 +899,20 @@ 
 	*/
 	function _Options($opts)
 	{
-		if (!is_array($opts)) return array();
+		if (!is_array($opts))
+		{
+			return array();
+		}
 		$newopts = array();
-		foreach($opts as $k => $v) {
-			if (is_numeric($k)) $newopts[strtoupper($v)] = $v;
-			else $newopts[strtoupper($k)] = $v;
+		foreach($opts as $k => $v)
+		{
+			if (is_numeric($k))
+			{
+				$newopts[strtoupper($v)] = $v;
+			}
+			else {
+				$newopts[strtoupper($k)] = $v;
+			}
 		}
 		return $newopts;
 	}
@@ -724,7 +929,10 @@ 
 
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-		if ($this->connection->fetchMode !== false) $savem = $this->connection->SetFetchMode(false);
+		if ($this->connection->fetchMode !== false)
+		{
+			$savem = $this->connection->SetFetchMode(false);
+		}
 
 		// check table exists
 		$save_handler = $this->connection->raiseErrorFn;
@@ -732,30 +940,46 @@ 
 		$cols = $this->MetaColumns($tablename);
 		$this->connection->raiseErrorFn = $save_handler;
 
-		if (isset($savem)) $this->connection->SetFetchMode($savem);
+		if (isset($savem))
+		{
+			$this->connection->SetFetchMode($savem);
+		}
 		$ADODB_FETCH_MODE = $save;
 
-		if ( empty($cols)) {
+		if ( empty($cols))
+		{
 			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
 		}
 
-		if (is_array($flds)) {
+		if (is_array($flds))
+		{
 		// Cycle through the update fields, comparing
 		// existing fields to fields to update.
 		// if the Metatype and size is exactly the
 		// same, ignore - by Mark Newham
 			$holdflds = array();
-			foreach($flds as $k=>$v) {
-				if ( isset($cols[$k]) && is_object($cols[$k]) ) {
+			foreach($flds as $k=>$v)
+			{
+				if ( isset($cols[$k]) && is_object($cols[$k]) )
+				{
 					$c = $cols[$k];
 					$ml = $c->max_length;
 					$mt = &$this->MetaType($c->type,$ml);
-					if ($ml == -1) $ml = '';
-					if ($mt == 'X') $ml = $v['SIZE'];
-					if (($mt != $v['TYPE']) ||  $ml != $v['SIZE']) {
+					if ($ml == -1)
+					{
+						$ml = '';
+					}
+					if ($mt == 'X')
+					{
+						$ml = $v['SIZE'];
+					}
+					if (($mt != $v['TYPE']) ||  $ml != $v['SIZE'])
+					{
 						$holdflds[$k] = $v;
 					}
-				} else {
+				}
+				else
+				{
 					$holdflds[$k] = $v;
 				}
 			}
@@ -768,16 +992,23 @@ 
 		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
 		$sql = array();
 
-		foreach ( $lines as $id => $v ) {
-			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
+		foreach ( $lines as $id => $v )
+		{
+			if ( isset($cols[$id]) && is_object($cols[$id]) )
+			{
 
 				$flds = Lens_ParseArgs($v,',');
 
 				//  We are trying to change the size of the field, if not allowed, simply ignore the request.
-				if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) continue;
+				if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4))
+				{
+					continue;
+				}
 
 				$sql[] = $alter . $this->alterCol . ' ' . $v;
-			} else {
+			}
+			else
+			{
 				$sql[] = $alter . $this->addCol . ' ' . $v;
 			}
 		}

phpgwapi/inc/adodb/adodb-error.inc.php

Doc Comments +4 added lines

@@ -55,6 +55,10 @@
 	return isset($ADODB_LANG_ARRAY[$value]) ? $ADODB_LANG_ARRAY[$value] : $ADODB_LANG_ARRAY[DB_ERROR];
 }
 
+/**
+ * @param string $provider
+ * @param string $dbType
+ */
 function adodb_error($provider,$dbType,$errno)
 {
 	//var_dump($errno);

Indentation +106 added lines, -106 removed lines

@@ -51,7 +51,7 @@ 
 	if (isset($ADODB_LANG_ARRAY['LANG']) && $ADODB_LANG_ARRAY['LANG'] == $ADODB_LANG) ;
 	else {
 		include_once(ADODB_DIR."/lang/adodb-$ADODB_LANG.inc.php");
-    }
+	}
 	return isset($ADODB_LANG_ARRAY[$value]) ? $ADODB_LANG_ARRAY[$value] : $ADODB_LANG_ARRAY[DB_ERROR];
 }
 
@@ -91,84 +91,84 @@ 
 function adodb_error_pg($errormsg)
 {
 	if (is_numeric($errormsg)) return (integer) $errormsg;
-    static $error_regexps = array(
-            '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => DB_ERROR_NOSUCHTABLE,
-            '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/'      => DB_ERROR_ALREADY_EXISTS,
-            '/divide by zero$/'                     => DB_ERROR_DIVZERO,
-            '/pg_atoi: error in .*: can\'t parse /' => DB_ERROR_INVALID_NUMBER,
-            '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/' => DB_ERROR_NOSUCHFIELD,
-            '/parser: parse error at or near \"/'   => DB_ERROR_SYNTAX,
-            '/referential integrity violation/'     => DB_ERROR_CONSTRAINT,
+	static $error_regexps = array(
+			'/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => DB_ERROR_NOSUCHTABLE,
+			'/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/'      => DB_ERROR_ALREADY_EXISTS,
+			'/divide by zero$/'                     => DB_ERROR_DIVZERO,
+			'/pg_atoi: error in .*: can\'t parse /' => DB_ERROR_INVALID_NUMBER,
+			'/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/' => DB_ERROR_NOSUCHFIELD,
+			'/parser: parse error at or near \"/'   => DB_ERROR_SYNTAX,
+			'/referential integrity violation/'     => DB_ERROR_CONSTRAINT,
 			'/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key violates unique constraint/'     
 			 	 => DB_ERROR_ALREADY_EXISTS
-        );
+		);
 	reset($error_regexps);
-    while (list($regexp,$code) = each($error_regexps)) {
-        if (preg_match($regexp, $errormsg)) {
-            return $code;
-        }
-    }
-    // Fall back to DB_ERROR if there was no mapping.
-    return DB_ERROR;
+	while (list($regexp,$code) = each($error_regexps)) {
+		if (preg_match($regexp, $errormsg)) {
+			return $code;
+		}
+	}
+	// Fall back to DB_ERROR if there was no mapping.
+	return DB_ERROR;
 }
 	
 function adodb_error_odbc()
 {
 static $MAP = array(
-            '01004' => DB_ERROR_TRUNCATED,
-            '07001' => DB_ERROR_MISMATCH,
-            '21S01' => DB_ERROR_MISMATCH,
-            '21S02' => DB_ERROR_MISMATCH,
-            '22003' => DB_ERROR_INVALID_NUMBER,
-            '22008' => DB_ERROR_INVALID_DATE,
-            '22012' => DB_ERROR_DIVZERO,
-            '23000' => DB_ERROR_CONSTRAINT,
-            '24000' => DB_ERROR_INVALID,
-            '34000' => DB_ERROR_INVALID,
-            '37000' => DB_ERROR_SYNTAX,
-            '42000' => DB_ERROR_SYNTAX,
-            'IM001' => DB_ERROR_UNSUPPORTED,
-            'S0000' => DB_ERROR_NOSUCHTABLE,
-            'S0001' => DB_ERROR_NOT_FOUND,
-            'S0002' => DB_ERROR_NOSUCHTABLE,
-            'S0011' => DB_ERROR_ALREADY_EXISTS,
-            'S0012' => DB_ERROR_NOT_FOUND,
-            'S0021' => DB_ERROR_ALREADY_EXISTS,
-            'S0022' => DB_ERROR_NOT_FOUND,
+			'01004' => DB_ERROR_TRUNCATED,
+			'07001' => DB_ERROR_MISMATCH,
+			'21S01' => DB_ERROR_MISMATCH,
+			'21S02' => DB_ERROR_MISMATCH,
+			'22003' => DB_ERROR_INVALID_NUMBER,
+			'22008' => DB_ERROR_INVALID_DATE,
+			'22012' => DB_ERROR_DIVZERO,
+			'23000' => DB_ERROR_CONSTRAINT,
+			'24000' => DB_ERROR_INVALID,
+			'34000' => DB_ERROR_INVALID,
+			'37000' => DB_ERROR_SYNTAX,
+			'42000' => DB_ERROR_SYNTAX,
+			'IM001' => DB_ERROR_UNSUPPORTED,
+			'S0000' => DB_ERROR_NOSUCHTABLE,
+			'S0001' => DB_ERROR_NOT_FOUND,
+			'S0002' => DB_ERROR_NOSUCHTABLE,
+			'S0011' => DB_ERROR_ALREADY_EXISTS,
+			'S0012' => DB_ERROR_NOT_FOUND,
+			'S0021' => DB_ERROR_ALREADY_EXISTS,
+			'S0022' => DB_ERROR_NOT_FOUND,
 			'S1000' => DB_ERROR_NOSUCHTABLE,
-            'S1009' => DB_ERROR_INVALID,
-            'S1090' => DB_ERROR_INVALID,
-            'S1C00' => DB_ERROR_NOT_CAPABLE
-        );
+			'S1009' => DB_ERROR_INVALID,
+			'S1090' => DB_ERROR_INVALID,
+			'S1C00' => DB_ERROR_NOT_CAPABLE
+		);
 		return $MAP;
 }
 
 function adodb_error_ibase()
 {
 static $MAP = array(
-            -104 => DB_ERROR_SYNTAX,
-            -150 => DB_ERROR_ACCESS_VIOLATION,
-            -151 => DB_ERROR_ACCESS_VIOLATION,
-            -155 => DB_ERROR_NOSUCHTABLE,
-            -157 => DB_ERROR_NOSUCHFIELD,
-            -158 => DB_ERROR_VALUE_COUNT_ON_ROW,
-            -170 => DB_ERROR_MISMATCH,
-            -171 => DB_ERROR_MISMATCH,
-            -172 => DB_ERROR_INVALID,
-            -204 => DB_ERROR_INVALID,
-            -205 => DB_ERROR_NOSUCHFIELD,
-            -206 => DB_ERROR_NOSUCHFIELD,
-            -208 => DB_ERROR_INVALID,
-            -219 => DB_ERROR_NOSUCHTABLE,
-            -297 => DB_ERROR_CONSTRAINT,
-            -530 => DB_ERROR_CONSTRAINT,
-            -803 => DB_ERROR_CONSTRAINT,
-            -551 => DB_ERROR_ACCESS_VIOLATION,
-            -552 => DB_ERROR_ACCESS_VIOLATION,
-            -922 => DB_ERROR_NOSUCHDB,
-            -923 => DB_ERROR_CONNECT_FAILED,
-            -924 => DB_ERROR_CONNECT_FAILED
-        );
+			-104 => DB_ERROR_SYNTAX,
+			-150 => DB_ERROR_ACCESS_VIOLATION,
+			-151 => DB_ERROR_ACCESS_VIOLATION,
+			-155 => DB_ERROR_NOSUCHTABLE,
+			-157 => DB_ERROR_NOSUCHFIELD,
+			-158 => DB_ERROR_VALUE_COUNT_ON_ROW,
+			-170 => DB_ERROR_MISMATCH,
+			-171 => DB_ERROR_MISMATCH,
+			-172 => DB_ERROR_INVALID,
+			-204 => DB_ERROR_INVALID,
+			-205 => DB_ERROR_NOSUCHFIELD,
+			-206 => DB_ERROR_NOSUCHFIELD,
+			-208 => DB_ERROR_INVALID,
+			-219 => DB_ERROR_NOSUCHTABLE,
+			-297 => DB_ERROR_CONSTRAINT,
+			-530 => DB_ERROR_CONSTRAINT,
+			-803 => DB_ERROR_CONSTRAINT,
+			-551 => DB_ERROR_ACCESS_VIOLATION,
+			-552 => DB_ERROR_ACCESS_VIOLATION,
+			-922 => DB_ERROR_NOSUCHDB,
+			-923 => DB_ERROR_CONNECT_FAILED,
+			-924 => DB_ERROR_CONNECT_FAILED
+		);
 		
 		return $MAP;
 }
@@ -176,17 +176,17 @@ 
 function adodb_error_ifx()
 {
 static $MAP = array(
-            '-201'    => DB_ERROR_SYNTAX,
-            '-206'    => DB_ERROR_NOSUCHTABLE,
-            '-217'    => DB_ERROR_NOSUCHFIELD,
-            '-329'    => DB_ERROR_NODBSELECTED,
-            '-1204'   => DB_ERROR_INVALID_DATE,
-            '-1205'   => DB_ERROR_INVALID_DATE,
-            '-1206'   => DB_ERROR_INVALID_DATE,
-            '-1209'   => DB_ERROR_INVALID_DATE,
-            '-1210'   => DB_ERROR_INVALID_DATE,
-            '-1212'   => DB_ERROR_INVALID_DATE
-       );
+			'-201'    => DB_ERROR_SYNTAX,
+			'-206'    => DB_ERROR_NOSUCHTABLE,
+			'-217'    => DB_ERROR_NOSUCHFIELD,
+			'-329'    => DB_ERROR_NODBSELECTED,
+			'-1204'   => DB_ERROR_INVALID_DATE,
+			'-1205'   => DB_ERROR_INVALID_DATE,
+			'-1206'   => DB_ERROR_INVALID_DATE,
+			'-1209'   => DB_ERROR_INVALID_DATE,
+			'-1210'   => DB_ERROR_INVALID_DATE,
+			'-1212'   => DB_ERROR_INVALID_DATE
+	   );
 	   
 	   return $MAP;
 }
@@ -195,17 +195,17 @@ 
 {
 static $MAP = array(
 			 1 => DB_ERROR_ALREADY_EXISTS,
-            900 => DB_ERROR_SYNTAX,
-            904 => DB_ERROR_NOSUCHFIELD,
-            923 => DB_ERROR_SYNTAX,
-            942 => DB_ERROR_NOSUCHTABLE,
-            955 => DB_ERROR_ALREADY_EXISTS,
-            1476 => DB_ERROR_DIVZERO,
-            1722 => DB_ERROR_INVALID_NUMBER,
-            2289 => DB_ERROR_NOSUCHTABLE,
-            2291 => DB_ERROR_CONSTRAINT,
-            2449 => DB_ERROR_CONSTRAINT
-        );
+			900 => DB_ERROR_SYNTAX,
+			904 => DB_ERROR_NOSUCHFIELD,
+			923 => DB_ERROR_SYNTAX,
+			942 => DB_ERROR_NOSUCHTABLE,
+			955 => DB_ERROR_ALREADY_EXISTS,
+			1476 => DB_ERROR_DIVZERO,
+			1722 => DB_ERROR_INVALID_NUMBER,
+			2289 => DB_ERROR_NOSUCHTABLE,
+			2291 => DB_ERROR_CONSTRAINT,
+			2449 => DB_ERROR_CONSTRAINT
+		);
 	   
 	return $MAP;
 }
@@ -214,8 +214,8 @@ 
 {
 static $MAP = array(
 		  208 => DB_ERROR_NOSUCHTABLE,
-          2601 => DB_ERROR_ALREADY_EXISTS
-       );
+		  2601 => DB_ERROR_ALREADY_EXISTS
+	   );
 	   
 	return $MAP;
 }
@@ -224,7 +224,7 @@ 
 {
 static $MAP = array(
 		  1 => DB_ERROR_SYNTAX
-       );
+	   );
 	   
 	return $MAP;
 }
@@ -232,26 +232,26 @@ 
 function adodb_error_mysql()
 {
 static $MAP = array(
-           1004 => DB_ERROR_CANNOT_CREATE,
-           1005 => DB_ERROR_CANNOT_CREATE,
-           1006 => DB_ERROR_CANNOT_CREATE,
-           1007 => DB_ERROR_ALREADY_EXISTS,
-           1008 => DB_ERROR_CANNOT_DROP,
+		   1004 => DB_ERROR_CANNOT_CREATE,
+		   1005 => DB_ERROR_CANNOT_CREATE,
+		   1006 => DB_ERROR_CANNOT_CREATE,
+		   1007 => DB_ERROR_ALREADY_EXISTS,
+		   1008 => DB_ERROR_CANNOT_DROP,
 		   1045 => DB_ERROR_ACCESS_VIOLATION,
-           1046 => DB_ERROR_NODBSELECTED,
+		   1046 => DB_ERROR_NODBSELECTED,
 		   1049 => DB_ERROR_NOSUCHDB,
-           1050 => DB_ERROR_ALREADY_EXISTS,
-           1051 => DB_ERROR_NOSUCHTABLE,
-           1054 => DB_ERROR_NOSUCHFIELD,
-           1062 => DB_ERROR_ALREADY_EXISTS,
-           1064 => DB_ERROR_SYNTAX,
-           1100 => DB_ERROR_NOT_LOCKED,
-           1136 => DB_ERROR_VALUE_COUNT_ON_ROW,
-           1146 => DB_ERROR_NOSUCHTABLE,
-           1048 => DB_ERROR_CONSTRAINT,
-		    2002 => DB_ERROR_CONNECT_FAILED,
+		   1050 => DB_ERROR_ALREADY_EXISTS,
+		   1051 => DB_ERROR_NOSUCHTABLE,
+		   1054 => DB_ERROR_NOSUCHFIELD,
+		   1062 => DB_ERROR_ALREADY_EXISTS,
+		   1064 => DB_ERROR_SYNTAX,
+		   1100 => DB_ERROR_NOT_LOCKED,
+		   1136 => DB_ERROR_VALUE_COUNT_ON_ROW,
+		   1146 => DB_ERROR_NOSUCHTABLE,
+		   1048 => DB_ERROR_CONSTRAINT,
+			2002 => DB_ERROR_CONNECT_FAILED,
 			2005 => DB_ERROR_CONNECT_FAILED
-       );
+	   );
 	   
 	return $MAP;
 }

Switch Indentation +12 added lines, -12 removed lines

@@ -60,25 +60,25 @@
 	//var_dump($errno);
 	if (is_numeric($errno) && $errno == 0) return 0;
 	switch($provider) { 
-	case 'mysql': $map = adodb_error_mysql(); break;
+		case 'mysql': $map = adodb_error_mysql(); break;
 	
-	case 'oracle':
-	case 'oci8': $map = adodb_error_oci8(); break;
+		case 'oracle':
+		case 'oci8': $map = adodb_error_oci8(); break;
 	
-	case 'ibase': $map = adodb_error_ibase(); break;
+		case 'ibase': $map = adodb_error_ibase(); break;
 	
-	case 'odbc': $map = adodb_error_odbc(); break;
+		case 'odbc': $map = adodb_error_odbc(); break;
 	
-	case 'mssql':
-	case 'sybase': $map = adodb_error_mssql(); break;
+		case 'mssql':
+		case 'sybase': $map = adodb_error_mssql(); break;
 	
-	case 'informix': $map = adodb_error_ifx(); break;
+		case 'informix': $map = adodb_error_ifx(); break;
 	
-	case 'postgres': return adodb_error_pg($errno); break;
+		case 'postgres': return adodb_error_pg($errno); break;
 	
-	case 'sqlite': return $map = adodb_error_sqlite(); break;
-	default:
-		return DB_ERROR;
+		case 'sqlite': return $map = adodb_error_sqlite(); break;
+		default:
+			return DB_ERROR;
 	}	
 	//print_r($map);
 	//var_dump($errno);

Spacing +32 added lines, -32 removed lines

@@ -12,54 +12,54 @@ 
  */
 
 
-if (!defined("DB_ERROR")) define("DB_ERROR",-1);
+if (!defined("DB_ERROR")) define("DB_ERROR", -1);
 
 if (!defined("DB_ERROR_SYNTAX")) {
-	define("DB_ERROR_SYNTAX",              -2);
-	define("DB_ERROR_CONSTRAINT",          -3);
-	define("DB_ERROR_NOT_FOUND",           -4);
-	define("DB_ERROR_ALREADY_EXISTS",      -5);
-	define("DB_ERROR_UNSUPPORTED",         -6);
-	define("DB_ERROR_MISMATCH",            -7);
-	define("DB_ERROR_INVALID",             -8);
-	define("DB_ERROR_NOT_CAPABLE",         -9);
-	define("DB_ERROR_TRUNCATED",          -10);
-	define("DB_ERROR_INVALID_NUMBER",     -11);
-	define("DB_ERROR_INVALID_DATE",       -12);
-	define("DB_ERROR_DIVZERO",            -13);
-	define("DB_ERROR_NODBSELECTED",       -14);
-	define("DB_ERROR_CANNOT_CREATE",      -15);
-	define("DB_ERROR_CANNOT_DELETE",      -16);
-	define("DB_ERROR_CANNOT_DROP",        -17);
-	define("DB_ERROR_NOSUCHTABLE",        -18);
-	define("DB_ERROR_NOSUCHFIELD",        -19);
-	define("DB_ERROR_NEED_MORE_DATA",     -20);
-	define("DB_ERROR_NOT_LOCKED",         -21);
+	define("DB_ERROR_SYNTAX", -2);
+	define("DB_ERROR_CONSTRAINT", -3);
+	define("DB_ERROR_NOT_FOUND", -4);
+	define("DB_ERROR_ALREADY_EXISTS", -5);
+	define("DB_ERROR_UNSUPPORTED", -6);
+	define("DB_ERROR_MISMATCH", -7);
+	define("DB_ERROR_INVALID", -8);
+	define("DB_ERROR_NOT_CAPABLE", -9);
+	define("DB_ERROR_TRUNCATED", -10);
+	define("DB_ERROR_INVALID_NUMBER", -11);
+	define("DB_ERROR_INVALID_DATE", -12);
+	define("DB_ERROR_DIVZERO", -13);
+	define("DB_ERROR_NODBSELECTED", -14);
+	define("DB_ERROR_CANNOT_CREATE", -15);
+	define("DB_ERROR_CANNOT_DELETE", -16);
+	define("DB_ERROR_CANNOT_DROP", -17);
+	define("DB_ERROR_NOSUCHTABLE", -18);
+	define("DB_ERROR_NOSUCHFIELD", -19);
+	define("DB_ERROR_NEED_MORE_DATA", -20);
+	define("DB_ERROR_NOT_LOCKED", -21);
 	define("DB_ERROR_VALUE_COUNT_ON_ROW", -22);
-	define("DB_ERROR_INVALID_DSN",        -23);
-	define("DB_ERROR_CONNECT_FAILED",     -24);
-	define("DB_ERROR_EXTENSION_NOT_FOUND",-25);
-	define("DB_ERROR_NOSUCHDB",           -25);
-	define("DB_ERROR_ACCESS_VIOLATION",   -26);
+	define("DB_ERROR_INVALID_DSN", -23);
+	define("DB_ERROR_CONNECT_FAILED", -24);
+	define("DB_ERROR_EXTENSION_NOT_FOUND", -25);
+	define("DB_ERROR_NOSUCHDB", -25);
+	define("DB_ERROR_ACCESS_VIOLATION", -26);
 }
 
 function adodb_errormsg($value)
 {
-global $ADODB_LANG,$ADODB_LANG_ARRAY;
+global $ADODB_LANG, $ADODB_LANG_ARRAY;
 
 	if (empty($ADODB_LANG)) $ADODB_LANG = 'en';
-	if (isset($ADODB_LANG_ARRAY['LANG']) && $ADODB_LANG_ARRAY['LANG'] == $ADODB_LANG) ;
+	if (isset($ADODB_LANG_ARRAY['LANG']) && $ADODB_LANG_ARRAY['LANG'] == $ADODB_LANG);
 	else {
 		include_once(ADODB_DIR."/lang/adodb-$ADODB_LANG.inc.php");
     }
 	return isset($ADODB_LANG_ARRAY[$value]) ? $ADODB_LANG_ARRAY[$value] : $ADODB_LANG_ARRAY[DB_ERROR];
 }
 
-function adodb_error($provider,$dbType,$errno)
+function adodb_error($provider, $dbType, $errno)
 {
 	//var_dump($errno);
 	if (is_numeric($errno) && $errno == 0) return 0;
-	switch($provider) { 
+	switch ($provider) { 
 	case 'mysql': $map = adodb_error_mysql(); break;
 	
 	case 'oracle':
@@ -90,7 +90,7 @@ 
 
 function adodb_error_pg($errormsg)
 {
-	if (is_numeric($errormsg)) return (integer) $errormsg;
+	if (is_numeric($errormsg)) return (integer)$errormsg;
     static $error_regexps = array(
             '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => DB_ERROR_NOSUCHTABLE,
             '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/'      => DB_ERROR_ALREADY_EXISTS,
@@ -103,7 +103,7 @@ 
 			 	 => DB_ERROR_ALREADY_EXISTS
         );
 	reset($error_regexps);
-    while (list($regexp,$code) = each($error_regexps)) {
+    while (list($regexp, $code) = each($error_regexps)) {
         if (preg_match($regexp, $errormsg)) {
             return $code;
         }

Braces +30 added lines, -10 removed lines

@@ -12,9 +12,13 @@ 
  */
 
 
-if (!defined("DB_ERROR")) define("DB_ERROR",-1);
+if (!defined("DB_ERROR"))
+{
+	define("DB_ERROR",-1);
+}
 
-if (!defined("DB_ERROR_SYNTAX")) {
+if (!defined("DB_ERROR_SYNTAX"))
+{
 	define("DB_ERROR_SYNTAX",              -2);
 	define("DB_ERROR_CONSTRAINT",          -3);
 	define("DB_ERROR_NOT_FOUND",           -4);
@@ -47,9 +51,13 @@ 
 {
 global $ADODB_LANG,$ADODB_LANG_ARRAY;
 
-	if (empty($ADODB_LANG)) $ADODB_LANG = 'en';
+	if (empty($ADODB_LANG))
+	{
+		$ADODB_LANG = 'en';
+	}
 	if (isset($ADODB_LANG_ARRAY['LANG']) && $ADODB_LANG_ARRAY['LANG'] == $ADODB_LANG) ;
-	else {
+	else
+	{
 		include_once(ADODB_DIR."/lang/adodb-$ADODB_LANG.inc.php");
     }
 	return isset($ADODB_LANG_ARRAY[$value]) ? $ADODB_LANG_ARRAY[$value] : $ADODB_LANG_ARRAY[DB_ERROR];
@@ -58,8 +66,12 @@ 
 function adodb_error($provider,$dbType,$errno)
 {
 	//var_dump($errno);
-	if (is_numeric($errno) && $errno == 0) return 0;
-	switch($provider) { 
+	if (is_numeric($errno) && $errno == 0)
+	{
+		return 0;
+	}
+	switch($provider)
+	{
 	case 'mysql': $map = adodb_error_mysql(); break;
 	
 	case 'oracle':
@@ -82,7 +94,10 @@ 
 	}	
 	//print_r($map);
 	//var_dump($errno);
-	if (isset($map[$errno])) return $map[$errno];
+	if (isset($map[$errno]))
+	{
+		return $map[$errno];
+	}
 	return DB_ERROR;
 }
 
@@ -90,7 +105,10 @@ 
 
 function adodb_error_pg($errormsg)
 {
-	if (is_numeric($errormsg)) return (integer) $errormsg;
+	if (is_numeric($errormsg))
+	{
+		return (integer) $errormsg;
+	}
     static $error_regexps = array(
             '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => DB_ERROR_NOSUCHTABLE,
             '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/'      => DB_ERROR_ALREADY_EXISTS,
@@ -103,8 +121,10 @@ 
 			 	 => DB_ERROR_ALREADY_EXISTS
         );
 	reset($error_regexps);
-    while (list($regexp,$code) = each($error_regexps)) {
-        if (preg_match($regexp, $errormsg)) {
+    while (list($regexp,$code) = each($error_regexps))
+    {
+        if (preg_match($regexp, $errormsg))
+        {
             return $code;
         }
     }

phpgwapi/inc/adodb/adodb-iterator.inc.php

Doc Comments +3 added lines

@@ -25,6 +25,9 @@
 
     private $rs;
 
+    /**
+     * @param ADODB_BASE_RS $rs
+     */
     function __construct($rs) 
 	{
         $this->rs = $rs;

Indentation +21 added lines, -21 removed lines

@@ -23,36 +23,36 @@ 
 
  class ADODB_Iterator implements Iterator {
 
-    private $rs;
+	private $rs;
 
-    function __construct($rs) 
+	function __construct($rs) 
 	{
-        $this->rs = $rs;
-    }
-    function rewind() 
+		$this->rs = $rs;
+	}
+	function rewind() 
 	{
-        $this->rs->MoveFirst();
-    }
+		$this->rs->MoveFirst();
+	}
 
 	function valid() 
 	{
-        return !$this->rs->EOF;
-    }
+		return !$this->rs->EOF;
+	}
 	
-    function key() 
+	function key() 
 	{
-        return $this->rs->_currentRow;
-    }
+		return $this->rs->_currentRow;
+	}
 	
-    function current() 
+	function current() 
 	{
-        return $this->rs->fields;
-    }
+		return $this->rs->fields;
+	}
 	
-    function next() 
+	function next() 
 	{
-        $this->rs->MoveNext();
-    }
+		$this->rs->MoveNext();
+	}
 	
 	function __call($func, $params)
 	{
@@ -69,9 +69,9 @@ 
 
 
 class ADODB_BASE_RS implements IteratorAggregate {
-    function getIterator() {
-        return new ADODB_Iterator($this);
-    }
+	function getIterator() {
+		return new ADODB_Iterator($this);
+	}
 	
 	/* this is experimental - i don't really know what to return... */
 	function __toString()

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	function __toString()
 	{
 		include_once(ADODB_DIR.'/toexport.inc.php');
-		return _adodb_export($this,',',',',false,true);
+		return _adodb_export($this, ',', ',', false, true);
 	}
 } 
 

Braces +17 added lines, -14 removed lines

@@ -21,36 +21,37 @@ 
  */
  
 
- class ADODB_Iterator implements Iterator {
+ class ADODB_Iterator implements Iterator
+ {
 
     private $rs;
 
-    function __construct($rs) 
-	{
+    function __construct($rs)
+    {
         $this->rs = $rs;
     }
-    function rewind() 
-	{
+    function rewind()
+    {
         $this->rs->MoveFirst();
     }
 
-	function valid() 
+	function valid()
 	{
         return !$this->rs->EOF;
     }
 	
-    function key() 
-	{
+    function key()
+    {
         return $this->rs->_currentRow;
     }
 	
-    function current() 
-	{
+    function current()
+    {
         return $this->rs->fields;
     }
 	
-    function next() 
-	{
+    function next()
+    {
         $this->rs->MoveNext();
     }
 	
@@ -68,8 +69,10 @@ 
 }
 
 
-class ADODB_BASE_RS implements IteratorAggregate {
-    function getIterator() {
+class ADODB_BASE_RS implements IteratorAggregate
+{
+    function getIterator()
+    {
         return new ADODB_Iterator($this);
     }