diff --git a/phpgwapi/inc/class.db.inc.php b/phpgwapi/inc/class.db.inc.php
index d95e027c12..f1f4ab2c10 100644
--- a/phpgwapi/inc/class.db.inc.php
+++ b/phpgwapi/inc/class.db.inc.php
@@ -10,16 +10,16 @@
 
 	/* $Id$ */
 
-   /**
-	* Database abstraction library
-	*
-	* This allows eGroupWare to use multiple database backends via ADOdb
-	*
-	* @package phpgwapi
-	* @subpackage db
-	* @author RalfBecker@outdoor-training.de
-	* @license LGPL
-	*/
+	/*
+	 * Database abstraction library
+	 *
+	 * This allows eGroupWare to use multiple database backends via ADOdb
+	 *
+	 * @package phpgwapi
+	 * @subpackage db
+	 * @author RalfBecker@outdoor-training.de
+	 * @license LGPL
+	 */
 
 	if(empty($GLOBALS['phpgw_info']['server']['db_type']))
 	{
@@ -210,7 +210,6 @@
 		*/
 		function disconnect()
 		{
-
 		}
 
 		/**
@@ -296,7 +295,7 @@
 			if (!$this->connect())
 			{
 				return 0; /* we already complained in connect() about that. */
-			};
+			}
 
 			# New query, discard previous result.
 			if ($this->Query_ID)
@@ -313,7 +312,7 @@
 			}
 			if ($num_rows > 0)
 			{
-				$this->Query_ID = $this->Link_ID->SelectLimit($Query_String,$num_rows,intval($offset));
+				$this->Query_ID = $this->Link_ID->SelectLimit($Query_String,$num_rows,(int)$offset);
 			}
 			else
 			{
@@ -679,7 +678,7 @@
 						'table_name'      => $table,
 						'tablespace_name' => $this->Database,
 						'database'        => $this->Database
-     				);
+					);
 				}
 			}
 			return $result;
@@ -709,7 +708,7 @@
 
 		/**
 		* Implodes an array of column-value pairs for the use in sql-querys.
-		* All data is either run through addslashes() or intval().
+		* All data is either run through addslashes() or (int).
 		*
 		* @author RalfBecker<at>outdoor-training.de
 		*
@@ -720,7 +719,7 @@
 		*	typicaly used to form a WHERE-clause from the primary keys
 		* @param array/boolean $column_definitions this can be set to the column-definitions-array
 		*	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
-		*	If its set, the column-type-data determinates if intval() or addslashes is used.
+		*	If its set, the column-type-data determinates if (int) or addslashes is used.
 		*/
 		function column_data_implode($glue,$array,$use_key=True,$only=False,$column_definitions=False)
 		{
@@ -736,7 +735,7 @@
 					$column_type = is_array($column_definitions) ? @$colum_definitions[$key]['type'] : False;
 					$values[] = ($use_key ? $key.'=' : '').
 						($column_type == 'int' || $colum_type == 'auto' ?
-						intval($data) : "'".$this->db_addslashes($data)."'");
+						(int)$data : "'" . $this->db_addslashes($data) . "'");
 				}
 			}
 			return implode($glue,$values);
@@ -749,7 +748,7 @@
 		*
 		* @param array/boolean $column_definitions this can be set to the column-definitions-array
 		*	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
-		*	If its set, the column-type-data determinates if intval() or addslashes is used.
+		*	If its set, the column-type-data determinates if (int) or addslashes is used.
 		*/
 		function set_column_definitions($column_definitions=False)
 		{
diff --git a/phpgwapi/inc/class.nextmatchs.inc.php b/phpgwapi/inc/class.nextmatchs.inc.php
index 57d4ded161..07c387cff4 100644
--- a/phpgwapi/inc/class.nextmatchs.inc.php
+++ b/phpgwapi/inc/class.nextmatchs.inc.php
@@ -56,9 +56,9 @@
 			}
 
 			if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
-				intval($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) > 0)
+				(int)$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
 			{
-				$this->maxmatches = intval($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']);
+				$this->maxmatches = (int)$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
 			}
 			else
 			{
@@ -96,21 +96,11 @@
 		*/
 		function set_icon($align,$img,$label)
 		{
-			switch(strtolower($GLOBALS['phpgw_info']['user']['account_lid']))
-			{
-				case 'ceb':
-					$border = 2;
-					break;
-				default:
-					$border = 0;
-					break;
-			}
-
 			$var = array(
 				'align'  => $align,
 				'img'    => $GLOBALS['phpgw']->common->image('phpgwapi',$img),
 				'label'  => lang($label),
-				'border' => $border
+				'border' => 0
 			);
 			$this->template->set_var($var);
 			return $this->template->fp('out','link');
@@ -159,7 +149,7 @@
 				{
 //					if(is_int($value))
 //					{
-//						$param = intval($value);
+//						$param = (int)$value;
 //					}
 //					else
 //					{
@@ -442,8 +432,8 @@
 		{
 			if(is_array($search_obj))
 			{
-				$params		= $search_obj;
-				$s_query	= stripslashes($params['query']);
+				$params     = $search_obj;
+				$s_query    = stripslashes($params['query']);
 				$search_obj = $params['search_obj'];
 			}
 			else
@@ -455,7 +445,7 @@
 			// Our only option is to remove it
 			if (ereg('"',$_query))
 			{
-				$_query = ereg_replace('"','',$_query);
+				$_query = str_replace('"','',$_query);
 			}
 			$var = array
 			(
@@ -530,9 +520,9 @@
 		{
 			if (is_array($yours))
 			{
-				$params	= $yours;
-				$filter	= $params['filter'];
-				$yours	= $params['yours'];
+				$params = $yours;
+				$filter = $params['filter'];
+				$yours  = $params['yours'];
 			}
 			else
 			{
@@ -604,14 +594,14 @@
 		{
 			if(is_array($data))
 			{
-				$filter	= (isset($data['filter'])?$data['filter']:'');
-				$format	= (isset($data['format'])?$data['format']:'all');
+				$filter = (isset($data['filter'])?$data['filter']:'');
+				$format = (isset($data['format'])?$data['format']:'all');
 			}
 			else
 			{
 				//$filter = get_var('filter',Array('GET','POST'));
 				$filter = $data;
-				$format	= 'all';
+				$format = 'all';
 			}
 
 			switch($format)