EGroupware / egroupware

index.php

Indentation +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
 // or an uncoditional redirect to this file or copy groupdav.htaccess to your docroot as .htaccess
 if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND' || $_SERVER['REQUEST_METHOD'] == 'OPTIONS')
 {
-        header('Location: groupdav.php/');
-        exit;
+		header('Location: groupdav.php/');
+		exit;
 }
 
 // forward for not existing or empty header to setup

Spacing +25 added lines, -25 removed lines

@@ -20,13 +20,13 @@ 
 }
 
 // forward for not existing or empty header to setup
-if(!file_exists('header.inc.php') || !filesize('header.inc.php'))
+if (!file_exists('header.inc.php') || !filesize('header.inc.php'))
 {
 	Header('Location: setup/index.php');
 	exit;
 }
 
-if(isset($_GET['hasupdates']) && $_GET['hasupdates'] == 'yes')
+if (isset($_GET['hasupdates']) && $_GET['hasupdates'] == 'yes')
 {
 	$hasupdates = True;
 }
@@ -34,10 +34,10 @@ 
 /*
 	This is the menuaction driver for the multi-layered design
 */
-if(isset($_GET['menuaction']) && preg_match('/^[A-Za-z0-9_]+\.[A-Za-z0-9_]+\.[A-Za-z0-9_]+$/',$_GET['menuaction']))
+if (isset($_GET['menuaction']) && preg_match('/^[A-Za-z0-9_]+\.[A-Za-z0-9_]+\.[A-Za-z0-9_]+$/', $_GET['menuaction']))
 {
-	list($app,$class,$method) = explode('.',$_GET['menuaction']);
-	if(! $app || ! $class || ! $method)
+	list($app, $class, $method) = explode('.', $_GET['menuaction']);
+	if (!$app || !$class || !$method)
 	{
 		$invalid_data = True;
 	}
@@ -48,7 +48,7 @@ 
 	$invalid_data = True;
 }
 //error_log(__METHOD__."$app,$class,$method");
-if($app == 'phpgwapi')
+if ($app == 'phpgwapi')
 {
 	$app = 'home';
 	$api_requested = True;
@@ -64,14 +64,14 @@ 
 include('./header.inc.php');
 // check if users are supposed to change their password every x sdays, then check if password is of old age or the devil-admin reset the users password
 // and forced the user to change his password on next login.
-auth::check_password_age($app,$class,$method);
+auth::check_password_age($app, $class, $method);
 
 // user changed timezone
 if (isset($_GET['tz']))
 {
-	egw_time::setUserPrefs($_GET['tz']);	// throws exception, if tz is invalid
+	egw_time::setUserPrefs($_GET['tz']); // throws exception, if tz is invalid
 
-	$GLOBALS['egw']->preferences->add('common','tz',$_GET['tz']);
+	$GLOBALS['egw']->preferences->add('common', 'tz', $_GET['tz']);
 	$GLOBALS['egw']->preferences->save_repository();
 
 	if (($referer = common::get_referer()))
@@ -82,30 +82,30 @@ 
 
 // 	Check if we are using windows or normal webpage
 $windowed = false;
-$tpl_info = EGW_SERVER_ROOT . '/phpgwapi/templates/' . basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']) . '/setup/setup.inc.php';
+$tpl_info = EGW_SERVER_ROOT.'/phpgwapi/templates/'.basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']).'/setup/setup.inc.php';
 if (!file_exists($tpl_info))
 {
-	$tpl_info = EGW_SERVER_ROOT.'/'.basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']) . '/setup/setup.inc.php';
+	$tpl_info = EGW_SERVER_ROOT.'/'.basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']).'/setup/setup.inc.php';
 }
-if(@file_exists($tpl_info))
+if (@file_exists($tpl_info))
 {
 	include_once($tpl_info);
-	if($GLOBALS['egw_info']['template'][$GLOBALS['egw_info']['user']['preferences']['common']['template_set']]['windowed'])
+	if ($GLOBALS['egw_info']['template'][$GLOBALS['egw_info']['user']['preferences']['common']['template_set']]['windowed'])
 	{
 		$windowed = true;
 	}
 }
 
 
-if($app == 'home' && !$class && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !html::$ua_mobile))
+if ($app == 'home' && !$class && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !html::$ua_mobile))
 {
 	if ($GLOBALS['egw_info']['server']['force_default_app'] && $GLOBALS['egw_info']['server']['force_default_app'] != 'user_choice')
 	{
 		$GLOBALS['egw_info']['user']['preferences']['common']['default_app'] = $GLOBALS['egw_info']['server']['force_default_app'];
 	}
-	if($GLOBALS['egw_info']['user']['preferences']['common']['default_app'] && !$hasupdates)
+	if ($GLOBALS['egw_info']['user']['preferences']['common']['default_app'] && !$hasupdates)
 	{
-		egw::redirect(egw_framework::index($GLOBALS['egw_info']['user']['preferences']['common']['default_app']),$GLOBALS['egw_info']['user']['preferences']['common']['default_app']);
+		egw::redirect(egw_framework::index($GLOBALS['egw_info']['user']['preferences']['common']['default_app']), $GLOBALS['egw_info']['user']['preferences']['common']['default_app']);
 	}
 	else
 	{
@@ -113,7 +113,7 @@ 
 	}
 }
 
-if($windowed && $_GET['cd'] == 'yes')
+if ($windowed && $_GET['cd'] == 'yes')
 {
 	$GLOBALS['egw_info']['flags'] = array(
 		'noheader'   => False,
@@ -125,13 +125,13 @@ 
 }
 else
 {
-	if($api_requested)
+	if ($api_requested)
 	{
 		$app = 'phpgwapi';
 	}
 
 	$obj = CreateObject($app.'.'.$class);
-	if((is_array($obj->public_functions) && $obj->public_functions[$method]) && !$invalid_data)
+	if ((is_array($obj->public_functions) && $obj->public_functions[$method]) && !$invalid_data)
 	{
 		$obj->$method();
 		unset($app);
@@ -142,9 +142,9 @@ 
 	}
 	else
 	{
-		if(!$app || !$class || !$method || $invalid_data)
+		if (!$app || !$class || !$method || $invalid_data)
 		{
-			if(@is_object($GLOBALS['egw']->log))
+			if (@is_object($GLOBALS['egw']->log))
 			{
 				$GLOBALS['egw']->log->message(array(
 					'text' => 'W-BadmenuactionVariable, menuaction missing or corrupt: %1',
@@ -155,9 +155,9 @@ 
 			}
 		}
 
-		if(!is_array($GLOBALS[$class]->public_functions) || !$GLOBALS[$class]->public_functions[$method] && $method)
+		if (!is_array($GLOBALS[$class]->public_functions) || !$GLOBALS[$class]->public_functions[$method] && $method)
 		{
-			if(@is_object($GLOBALS['egw']->log))
+			if (@is_object($GLOBALS['egw']->log))
 			{
 				$GLOBALS['egw']->log->message(array(
 					'text' => 'W-BadmenuactionVariable, attempted to access private method: %1',
@@ -167,7 +167,7 @@ 
 				));
 			}
 		}
-		if(@is_object($GLOBALS['egw']->log))
+		if (@is_object($GLOBALS['egw']->log))
 		{
 			$GLOBALS['egw']->log->commit();
 		}
@@ -175,7 +175,7 @@ 
 		$GLOBALS['egw']->redirect_link('/home/index.php');
 	}
 
-	if(!isset($GLOBALS['egw_info']['nofooter']))
+	if (!isset($GLOBALS['egw_info']['nofooter']))
 	{
 		common::egw_footer();
 	}

infolog/setup/setup.inc.php

Spacing +3 added lines, -3 removed lines

@@ -14,16 +14,16 @@
 $setup_info['infolog']['name']      = 'infolog';
 $setup_info['infolog']['version']   = '16.1';
 $setup_info['infolog']['app_order'] = 5;
-$setup_info['infolog']['tables']    = array('egw_infolog','egw_infolog_extra');
+$setup_info['infolog']['tables']    = array('egw_infolog', 'egw_infolog_extra');
 $setup_info['infolog']['enable']    = 1;
-$setup_info['infolog']['index']    = 'infolog.infolog_ui.index&ajax=true';
+$setup_info['infolog']['index'] = 'infolog.infolog_ui.index&ajax=true';
 
 $setup_info['infolog']['author'] =
 $setup_info['infolog']['maintainer'] = array(
 	'name'  => 'Ralf Becker',
 	'email' => 'ralfbecker@outdoor-training.de'
 );
-$setup_info['infolog']['license']  = 'GPL';
+$setup_info['infolog']['license'] = 'GPL';
 $setup_info['infolog']['description'] =
 	'<p><b>CRM</b> (customer-relation-management) type app using Addressbook providing
 	Todo List, Notes and Phonelog. <b>InfoLog</b> is orininaly based on eGroupWare\'s

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

@@ -47,11 +47,11 @@
 /* Dependencies for this app to work */
 $setup_info['admin']['depends'][] = array(
 	'appname' => 'phpgwapi',
-	'versions' => Array('14.1')
+	'versions' => array('14.1')
 );
 $setup_info['admin']['depends'][] = array(
 	'appname' => 'etemplate',
-	'versions' => Array('14.1')
+	'versions' => array('14.1')
 );
 
 

infolog/setup/tables_current.inc.php

Spacing +39 added lines, -39 removed lines

@@ -14,53 +14,53 @@
 $phpgw_baseline = array(
 	'egw_infolog' => array(
 		'fd' => array(
-			'info_id' => array('type' => 'auto','nullable' => False,'comment' => 'id of the infolog-entry'),
-			'info_type' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => 'task','comment' => 'infolog-type e.g. task, phone, email or note'),
-			'info_from' => array('type' => 'varchar','precision' => '255','comment' => 'text of the primary link'),
-			'info_addr' => array('type' => 'varchar','precision' => '255','comment' => 'textfield for phone-number or email of the primary contact'),
-			'info_subject' => array('type' => 'varchar','precision' => '255','comment' => 'title of the infolog-entry'),
-			'info_des' => array('type' => 'text','comment' => 'desciption of the infolog-entry'),
-			'info_owner' => array('type' => 'int','meta' => 'account','precision' => '4','nullable' => False,'comment' => 'owner of the entry, can be account or group'),
-			'info_responsible' => array('type' => 'ascii','meta' => 'account-commasep','precision' => '255','nullable' => False,'default' => '0','comment' => 'responsible users or groups (multiple)'),
-			'info_access' => array('type' => 'ascii','precision' => '10','default' => 'public','comment' => 'public or privat'),
-			'info_cat' => array('type' => 'int','meta' => 'category','precision' => '4','nullable' => False,'default' => '0','comment' => 'category id'),
-			'info_datemodified' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'timestamp of the last mofification'),
-			'info_startdate' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'default' => '0','comment' => 'timestamp of the startdate'),
-			'info_enddate' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'default' => '0','comment' => 'timestamp of the enddate'),
-			'info_id_parent' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'id of the parent infolog'),
-			'info_planned_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'pm-field: planned time'),
-			'info_replanned_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'pm-field: replanned time'),
-			'info_used_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'pm-field: used time'),
-			'info_status' => array('type' => 'varchar','precision' => '40','default' => 'done','comment' => 'status e.g. ongoing, done ...'),
-			'info_confirm' => array('type' => 'ascii','precision' => '10','default' => 'not'),
-			'info_modifier' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'default' => '0','comment' => 'account id of the last modifier'),
-			'info_link_id' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'id of the primary link'),
-			'info_priority' => array('type' => 'int','precision' => '2','default' => '1','comment' => '0=Low, 1=Normal, 2=High, 3=Urgent'),
-			'pl_id' => array('type' => 'int','precision' => '4','comment' => 'pm-field: id of the pricelist'),
-			'info_price' => array('type' => 'float','precision' => '8','comment' => 'pm-field: price-field'),
-			'info_percent' => array('type' => 'int','meta' => 'percent','precision' => '2','default' => '0','comment' => 'percentage of completion'),
-			'info_datecompleted' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'timestamp of completion'),
-			'info_location' => array('type' => 'varchar','precision' => '255','comment' => 'textfield location'),
-			'info_custom_from' => array('type' => 'int','precision' => '1','comment' => 'tick-box to show infolog_from'),
-			'info_uid' => array('type' => 'ascii','precision' => '128','comment' => 'unique id of the infolog-entry'),
-			'info_cc' => array('type' => 'varchar','precision' => '255','comment' => 'textfield for email-adress to be notified via email of changes'),
-			'caldav_name' => array('type' => 'ascii','precision' => '128','comment' => 'name part of CalDAV URL, if specified by client'),
-			'info_etag' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'etag, not yet used'),
-			'info_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'timestamp of the creation date'),
-			'info_creator' => array('type' => 'int','meta' => 'user','precision' => '4','comment' => 'account id of the creator')
+			'info_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'id of the infolog-entry'),
+			'info_type' => array('type' => 'varchar', 'precision' => '40', 'nullable' => False, 'default' => 'task', 'comment' => 'infolog-type e.g. task, phone, email or note'),
+			'info_from' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'text of the primary link'),
+			'info_addr' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'textfield for phone-number or email of the primary contact'),
+			'info_subject' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'title of the infolog-entry'),
+			'info_des' => array('type' => 'text', 'comment' => 'desciption of the infolog-entry'),
+			'info_owner' => array('type' => 'int', 'meta' => 'account', 'precision' => '4', 'nullable' => False, 'comment' => 'owner of the entry, can be account or group'),
+			'info_responsible' => array('type' => 'ascii', 'meta' => 'account-commasep', 'precision' => '255', 'nullable' => False, 'default' => '0', 'comment' => 'responsible users or groups (multiple)'),
+			'info_access' => array('type' => 'ascii', 'precision' => '10', 'default' => 'public', 'comment' => 'public or privat'),
+			'info_cat' => array('type' => 'int', 'meta' => 'category', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'category id'),
+			'info_datemodified' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'timestamp of the last mofification'),
+			'info_startdate' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'default' => '0', 'comment' => 'timestamp of the startdate'),
+			'info_enddate' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'default' => '0', 'comment' => 'timestamp of the enddate'),
+			'info_id_parent' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'id of the parent infolog'),
+			'info_planned_time' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'pm-field: planned time'),
+			'info_replanned_time' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'pm-field: replanned time'),
+			'info_used_time' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'pm-field: used time'),
+			'info_status' => array('type' => 'varchar', 'precision' => '40', 'default' => 'done', 'comment' => 'status e.g. ongoing, done ...'),
+			'info_confirm' => array('type' => 'ascii', 'precision' => '10', 'default' => 'not'),
+			'info_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'account id of the last modifier'),
+			'info_link_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'id of the primary link'),
+			'info_priority' => array('type' => 'int', 'precision' => '2', 'default' => '1', 'comment' => '0=Low, 1=Normal, 2=High, 3=Urgent'),
+			'pl_id' => array('type' => 'int', 'precision' => '4', 'comment' => 'pm-field: id of the pricelist'),
+			'info_price' => array('type' => 'float', 'precision' => '8', 'comment' => 'pm-field: price-field'),
+			'info_percent' => array('type' => 'int', 'meta' => 'percent', 'precision' => '2', 'default' => '0', 'comment' => 'percentage of completion'),
+			'info_datecompleted' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'timestamp of completion'),
+			'info_location' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'textfield location'),
+			'info_custom_from' => array('type' => 'int', 'precision' => '1', 'comment' => 'tick-box to show infolog_from'),
+			'info_uid' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'unique id of the infolog-entry'),
+			'info_cc' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'textfield for email-adress to be notified via email of changes'),
+			'caldav_name' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'name part of CalDAV URL, if specified by client'),
+			'info_etag' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'comment' => 'etag, not yet used'),
+			'info_created' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'timestamp of the creation date'),
+			'info_creator' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'comment' => 'account id of the creator')
 		),
 		'pk' => array('info_id'),
 		'fk' => array(),
-		'ix' => array('caldav_name',array('info_owner','info_responsible','info_status','info_startdate'),array('info_id_parent','info_owner','info_responsible','info_status','info_startdate')),
+		'ix' => array('caldav_name', array('info_owner', 'info_responsible', 'info_status', 'info_startdate'), array('info_id_parent', 'info_owner', 'info_responsible', 'info_status', 'info_startdate')),
 		'uc' => array()
 	),
 	'egw_infolog_extra' => array(
 		'fd' => array(
-			'info_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_extra_name' => array('type' => 'varchar','meta' => 'cfname','precision' => '64','nullable' => False),
-			'info_extra_value' => array('type' => 'varchar','meta' => 'cfvalue','precision' => '16384','nullable' => False)
+			'info_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_extra_name' => array('type' => 'varchar', 'meta' => 'cfname', 'precision' => '64', 'nullable' => False),
+			'info_extra_value' => array('type' => 'varchar', 'meta' => 'cfvalue', 'precision' => '16384', 'nullable' => False)
 		),
-		'pk' => array('info_id','info_extra_name'),
+		'pk' => array('info_id', 'info_extra_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()

infolog/setup/tables_update.inc.php

Spacing +209 added lines, -209 removed lines

@@ -13,8 +13,8 @@ 
 
 function infolog_upgrade0_9_11()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_infolog','info_datecreated','info_datemodified');
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog','info_event_id',array(
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_infolog', 'info_datecreated', 'info_datemodified');
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog', 'info_event_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0',
@@ -27,16 +27,16 @@ 
 
 function infolog_upgrade0_9_15_001()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_links',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_links', array(
 		'fd' => array(
-			'link_id' => array('type' => 'auto','nullable' => False),
-			'link_app1' => array('type' => 'varchar','precision' => '25','nullable' => False),
-			'link_id1' => array('type' => 'varchar','precision' => '50','nullable' => False),
-			'link_app2' => array('type' => 'varchar','precision' => '25','nullable' => False),
-			'link_id2' => array('type' => 'varchar','precision' => '50','nullable' => False),
-			'link_remark' => array('type' => 'varchar','precision' => '50','nullable' => True),
-			'link_lastmod' => array('type' => 'int','precision' => '4','nullable' => False),
-			'link_owner' => array('type' => 'int','precision' => '4','nullable' => False)
+			'link_id' => array('type' => 'auto', 'nullable' => False),
+			'link_app1' => array('type' => 'varchar', 'precision' => '25', 'nullable' => False),
+			'link_id1' => array('type' => 'varchar', 'precision' => '50', 'nullable' => False),
+			'link_app2' => array('type' => 'varchar', 'precision' => '25', 'nullable' => False),
+			'link_id2' => array('type' => 'varchar', 'precision' => '50', 'nullable' => False),
+			'link_remark' => array('type' => 'varchar', 'precision' => '50', 'nullable' => True),
+			'link_lastmod' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'link_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False)
 		),
 		'pk' => array('link_id'),
 		'fk' => array(),
@@ -62,90 +62,90 @@ 
 	//echo "<p>copying calendar-links: $insert.$select</p>\n";
 	$GLOBALS['egw_setup']->oProc->query($insert.$select3);
 
-	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog', array(
 		'fd' => array(
-			'info_id' => array('type' => 'auto','nullable' => False),
-			'info_type' => array('type' => 'varchar','precision' => '255','default' => 'task','nullable' => False),
-			'info_proj_id' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_from' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_addr' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_subject' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_des' => array('type' => 'text','nullable' => True),
-			'info_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_responsible' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_access' => array('type' => 'varchar','precision' => '10','nullable' => True,'default' => 'public'),
-			'info_cat' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_datemodified' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_startdate' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_enddate' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_id_parent' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_pri' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'normal'),
-			'info_time' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_bill_cat' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_status' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'done'),
-			'info_confirm' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'not'),
-			'info_event_id' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False)
+			'info_id' => array('type' => 'auto', 'nullable' => False),
+			'info_type' => array('type' => 'varchar', 'precision' => '255', 'default' => 'task', 'nullable' => False),
+			'info_proj_id' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_from' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_addr' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_subject' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_des' => array('type' => 'text', 'nullable' => True),
+			'info_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_responsible' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_access' => array('type' => 'varchar', 'precision' => '10', 'nullable' => True, 'default' => 'public'),
+			'info_cat' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_datemodified' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_startdate' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_enddate' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_id_parent' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_pri' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'normal'),
+			'info_time' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_bill_cat' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_status' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'done'),
+			'info_confirm' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'not'),
+			'info_event_id' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False)
 		),
 		'pk' => array('info_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'info_addr_id');
-	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog',array(
+	), 'info_addr_id');
+	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog', array(
 		'fd' => array(
-			'info_id' => array('type' => 'auto','nullable' => False),
-			'info_type' => array('type' => 'varchar','precision' => '255','default' => 'task','nullable' => False),
-			'info_from' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_addr' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_subject' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_des' => array('type' => 'text','nullable' => True),
-			'info_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_responsible' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_access' => array('type' => 'varchar','precision' => '10','nullable' => True,'default' => 'public'),
-			'info_cat' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_datemodified' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_startdate' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_enddate' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_id_parent' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_pri' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'normal'),
-			'info_time' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_bill_cat' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_status' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'done'),
-			'info_confirm' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'not'),
-			'info_event_id' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False)
+			'info_id' => array('type' => 'auto', 'nullable' => False),
+			'info_type' => array('type' => 'varchar', 'precision' => '255', 'default' => 'task', 'nullable' => False),
+			'info_from' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_addr' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_subject' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_des' => array('type' => 'text', 'nullable' => True),
+			'info_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_responsible' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_access' => array('type' => 'varchar', 'precision' => '10', 'nullable' => True, 'default' => 'public'),
+			'info_cat' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_datemodified' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_startdate' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_enddate' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_id_parent' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_pri' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'normal'),
+			'info_time' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_bill_cat' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_status' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'done'),
+			'info_confirm' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'not'),
+			'info_event_id' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False)
 		),
 		'pk' => array('info_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'info_proj_id');
-	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog',array(
+	), 'info_proj_id');
+	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog', array(
 		'fd' => array(
-			'info_id' => array('type' => 'auto','nullable' => False),
-			'info_type' => array('type' => 'varchar','precision' => '255','default' => 'task','nullable' => False),
-			'info_from' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_addr' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_subject' => array('type' => 'varchar','precision' => '64','nullable' => True),
-			'info_des' => array('type' => 'text','nullable' => True),
-			'info_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_responsible' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_access' => array('type' => 'varchar','precision' => '10','nullable' => True,'default' => 'public'),
-			'info_cat' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_datemodified' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_startdate' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_enddate' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_id_parent' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_pri' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'normal'),
-			'info_time' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_bill_cat' => array('type' => 'int','precision' => '4','default' => '0','nullable' => False),
-			'info_status' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'done'),
-			'info_confirm' => array('type' => 'varchar','precision' => '255','nullable' => True,'default' => 'not')
+			'info_id' => array('type' => 'auto', 'nullable' => False),
+			'info_type' => array('type' => 'varchar', 'precision' => '255', 'default' => 'task', 'nullable' => False),
+			'info_from' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_addr' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_subject' => array('type' => 'varchar', 'precision' => '64', 'nullable' => True),
+			'info_des' => array('type' => 'text', 'nullable' => True),
+			'info_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_responsible' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_access' => array('type' => 'varchar', 'precision' => '10', 'nullable' => True, 'default' => 'public'),
+			'info_cat' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_datemodified' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_startdate' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_enddate' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_id_parent' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_pri' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'normal'),
+			'info_time' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_bill_cat' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'nullable' => False),
+			'info_status' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'done'),
+			'info_confirm' => array('type' => 'varchar', 'precision' => '255', 'nullable' => True, 'default' => 'not')
 		),
 		'pk' => array('info_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'info_event_id');
+	), 'info_event_id');
 
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '0.9.15.003';
 }
@@ -153,37 +153,37 @@ 
 
 function infolog_upgrade0_9_15_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_type', array(
 		'type' => 'varchar',
 		'precision' => '10',
 		'nullable' => False,
 		'default' => 'task'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_pri',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_pri', array(
 		'type' => 'varchar',
 		'precision' => '10',
 		'nullable' => True,
 		'default' => 'normal'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_status',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_status', array(
 		'type' => 'varchar',
 		'precision' => '10',
 		'nullable' => True,
 		'default' => 'done'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_confirm',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_confirm', array(
 		'type' => 'varchar',
 		'precision' => '10',
 		'nullable' => True,
 		'default' => 'not'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog','info_modifier',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog', 'info_modifier', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog','info_link_id',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog', 'info_link_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
@@ -198,7 +198,7 @@ 
 		$links[$GLOBALS['egw_setup']->oProc->f(1)] = $GLOBALS['egw_setup']->oProc->f(0);
 	}
 	reset($links);
-	while (list($info_id,$link_id) = each($links))
+	while (list($info_id, $link_id) = each($links))
 	{
 		$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_infolog SET info_link_id=$link_id WHERE info_id=$info_id");
 	}
@@ -211,9 +211,9 @@ 
 {
 	// this update correctes wrong escapes of ' and " in the past
 	//
-	$db2 = $GLOBALS['egw_setup']->db;	// we need a 2. result-set
+	$db2 = $GLOBALS['egw_setup']->db; // we need a 2. result-set
 
-	$to_correct = array('info_from','info_subject','info_des');
+	$to_correct = array('info_from', 'info_subject', 'info_des');
 	foreach ($to_correct as $col)
 	{
 		$GLOBALS['egw_setup']->oProc->query("SELECT info_id,$col FROM phpgw_infolog WHERE $col LIKE '%\\'%' OR $col LIKE '%\"%'");
@@ -230,13 +230,13 @@ 
 
 function infolog_upgrade0_9_15_005()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_infolog_extra',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_infolog_extra', array(
 		'fd' => array(
-			'info_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_extra_name' => array('type' => 'varchar','precision' => '32','nullable' => False),
-			'info_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
+			'info_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_extra_name' => array('type' => 'varchar', 'precision' => '32', 'nullable' => False),
+			'info_extra_value' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('info_id','info_extra_name'),
+		'pk' => array('info_id', 'info_extra_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -249,20 +249,20 @@ 
 // the following series of updates add some indices, to speedup the selects
 function infolog_upgrade0_9_15_006()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_links',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_links', array(
 		'fd' => array(
-			'link_id' => array('type' => 'auto','nullable' => False),
-			'link_app1' => array('type' => 'varchar','precision' => '25','nullable' => False),
-			'link_id1' => array('type' => 'varchar','precision' => '50','nullable' => False),
-			'link_app2' => array('type' => 'varchar','precision' => '25','nullable' => False),
-			'link_id2' => array('type' => 'varchar','precision' => '50','nullable' => False),
-			'link_remark' => array('type' => 'varchar','precision' => '50'),
-			'link_lastmod' => array('type' => 'int','precision' => '4','nullable' => False),
-			'link_owner' => array('type' => 'int','precision' => '4','nullable' => False)
+			'link_id' => array('type' => 'auto', 'nullable' => False),
+			'link_app1' => array('type' => 'varchar', 'precision' => '25', 'nullable' => False),
+			'link_id1' => array('type' => 'varchar', 'precision' => '50', 'nullable' => False),
+			'link_app2' => array('type' => 'varchar', 'precision' => '25', 'nullable' => False),
+			'link_id2' => array('type' => 'varchar', 'precision' => '50', 'nullable' => False),
+			'link_remark' => array('type' => 'varchar', 'precision' => '50'),
+			'link_lastmod' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'link_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False)
 		),
 		'pk' => array('link_id'),
 		'fk' => array(),
-		'ix' => array(array('link_app1','link_id1','link_lastmod'),array('link_app2','link_id2','link_lastmod')),
+		'ix' => array(array('link_app1', 'link_id1', 'link_lastmod'), array('link_app2', 'link_id2', 'link_lastmod')),
 		'uc' => array()
 	));
 
@@ -272,33 +272,33 @@ 
 
 function infolog_upgrade0_9_15_007()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_infolog',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_infolog', array(
 		'fd' => array(
-			'info_id' => array('type' => 'auto','nullable' => False),
-			'info_type' => array('type' => 'varchar','precision' => '10','nullable' => False,'default' => 'task'),
-			'info_from' => array('type' => 'varchar','precision' => '64'),
-			'info_addr' => array('type' => 'varchar','precision' => '64'),
-			'info_subject' => array('type' => 'varchar','precision' => '64'),
+			'info_id' => array('type' => 'auto', 'nullable' => False),
+			'info_type' => array('type' => 'varchar', 'precision' => '10', 'nullable' => False, 'default' => 'task'),
+			'info_from' => array('type' => 'varchar', 'precision' => '64'),
+			'info_addr' => array('type' => 'varchar', 'precision' => '64'),
+			'info_subject' => array('type' => 'varchar', 'precision' => '64'),
 			'info_des' => array('type' => 'text'),
-			'info_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_responsible' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_access' => array('type' => 'varchar','precision' => '10','default' => 'public'),
-			'info_cat' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_datemodified' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_startdate' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_enddate' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_id_parent' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_pri' => array('type' => 'varchar','precision' => '10','default' => 'normal'),
-			'info_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_bill_cat' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_status' => array('type' => 'varchar','precision' => '10','default' => 'done'),
-			'info_confirm' => array('type' => 'varchar','precision' => '10','default' => 'not'),
-			'info_modifier' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_link_id' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0')
+			'info_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_responsible' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_access' => array('type' => 'varchar', 'precision' => '10', 'default' => 'public'),
+			'info_cat' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_datemodified' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_startdate' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_enddate' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_id_parent' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_pri' => array('type' => 'varchar', 'precision' => '10', 'default' => 'normal'),
+			'info_time' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_bill_cat' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_status' => array('type' => 'varchar', 'precision' => '10', 'default' => 'done'),
+			'info_confirm' => array('type' => 'varchar', 'precision' => '10', 'default' => 'not'),
+			'info_modifier' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_link_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('info_id'),
 		'fk' => array(),
-		'ix' => array(array('info_owner','info_responsible','info_status','info_startdate'),array('info_id_parent','info_owner','info_responsible','info_status','info_startdate')),
+		'ix' => array(array('info_owner', 'info_responsible', 'info_status', 'info_startdate'), array('info_id_parent', 'info_owner', 'info_responsible', 'info_status', 'info_startdate')),
 		'uc' => array()
 	));
 
@@ -310,8 +310,8 @@ 
 function infolog_upgrade0_9_15_008()
 {
 	// update the sequenzes for refreshed tables (postgres only)
-	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_infolog','info_id');
-	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_links','link_id');
+	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_infolog', 'info_id');
+	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_links', 'link_id');
 
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.0.0';
 }
@@ -320,25 +320,25 @@ 
 function infolog_upgrade1_0_0()
 {
 	// longer columns to cope with multibyte charsets
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_type', array(
 		'type' => 'varchar',
 		'precision' => '40',
 		'nullable' => False,
 		'default' => 'task'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_from',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_from', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_addr',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_addr', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_subject',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_subject', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_status',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_status', array(
 		'type' => 'varchar',
 		'precision' => '40',
 		'default' => 'done'
@@ -350,21 +350,21 @@ 
 
 function infolog_upgrade1_0_0_001()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_infolog','info_time','info_planned_time');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_infolog','info_bill_cat','info_used_time');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_infolog', 'info_time', 'info_planned_time');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_infolog', 'info_bill_cat', 'info_used_time');
 	// timestamps have to be 8byte ints
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_datemodified',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_datemodified', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_startdate',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_startdate', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog','info_enddate',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_infolog', 'info_enddate', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
@@ -372,49 +372,49 @@ 
 	));
 
 	// setting numerical priority 3=urgent, 2=high, 1=normal, 0=
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog','info_priority',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_infolog', 'info_priority', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '1'
 	));
-	$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_infolog SET info_priority=(CASE WHEN info_pri='urgent' THEN 3 WHEN info_pri='high' THEN 2 WHEN info_pri='low' THEN 0 ELSE 1 END)",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_infolog SET info_priority=(CASE WHEN info_pri='urgent' THEN 3 WHEN info_pri='high' THEN 2 WHEN info_pri='low' THEN 0 ELSE 1 END)", __LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('phpgw_infolog', array(
 		'fd' => array(
-			'info_id' => array('type' => 'auto','nullable' => False),
-			'info_type' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => 'task'),
-			'info_from' => array('type' => 'varchar','precision' => '255'),
-			'info_addr' => array('type' => 'varchar','precision' => '255'),
-			'info_subject' => array('type' => 'varchar','precision' => '255'),
+			'info_id' => array('type' => 'auto', 'nullable' => False),
+			'info_type' => array('type' => 'varchar', 'precision' => '40', 'nullable' => False, 'default' => 'task'),
+			'info_from' => array('type' => 'varchar', 'precision' => '255'),
+			'info_addr' => array('type' => 'varchar', 'precision' => '255'),
+			'info_subject' => array('type' => 'varchar', 'precision' => '255'),
 			'info_des' => array('type' => 'text'),
-			'info_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'info_responsible' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_access' => array('type' => 'varchar','precision' => '10','default' => 'public'),
-			'info_cat' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_datemodified' => array('type' => 'int','precision' => '8','nullable' => False),
-			'info_startdate' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'info_enddate' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'info_id_parent' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_planned_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_used_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_status' => array('type' => 'varchar','precision' => '40','default' => 'done'),
-			'info_confirm' => array('type' => 'varchar','precision' => '10','default' => 'not'),
-			'info_modifier' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_link_id' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'info_priority' => array('type' => 'int','precision' => '2','default' => '1')
+			'info_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'info_responsible' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_access' => array('type' => 'varchar', 'precision' => '10', 'default' => 'public'),
+			'info_cat' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_datemodified' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'info_startdate' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'info_enddate' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'info_id_parent' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_planned_time' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_used_time' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_status' => array('type' => 'varchar', 'precision' => '40', 'default' => 'done'),
+			'info_confirm' => array('type' => 'varchar', 'precision' => '10', 'default' => 'not'),
+			'info_modifier' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_link_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'info_priority' => array('type' => 'int', 'precision' => '2', 'default' => '1')
 		),
 		'pk' => array('info_id'),
 		'fk' => array(),
-		'ix' => array(array('info_owner','info_responsible','info_status','info_startdate'),array('info_id_parent','info_owner','info_responsible','info_status','info_startdate')),
+		'ix' => array(array('info_owner', 'info_responsible', 'info_status', 'info_startdate'), array('info_id_parent', 'info_owner', 'info_responsible', 'info_status', 'info_startdate')),
 		'uc' => array()
-	),'info_pri');
+	), 'info_pri');
 
-	$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_infolog','egw_infolog');
-	$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_infolog_extra','egw_infolog_extra');
+	$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_infolog', 'egw_infolog');
+	$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_infolog_extra', 'egw_infolog_extra');
 	// only rename links table, if it has not been moved into the API and therefor been already renamed by the API update
 	if ($GLOBALS['egw_setup']->oProc->GetTableDefinition('phpgw_links'))
 	{
-		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_links','egw_links');
+		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_links', 'egw_links');
 	}
 
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.0.1.001';
@@ -423,7 +423,7 @@ 
 
 function infolog_upgrade1_0_1_001()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','info_responsible',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog', 'info_responsible', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'nullable' => False,
@@ -442,12 +442,12 @@ 
 
 function infolog_upgrade1_2()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','pl_id',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'pl_id', array(
 		'type' => 'int',
 		'precision' => '4'
 	));
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_price',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_price', array(
 		'type' => 'float',
 		'precision' => '8'
 	));
@@ -458,38 +458,38 @@ 
 
 function infolog_upgrade1_2_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_percent',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_percent', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_datecompleted',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_datecompleted', array(
 		'type' => 'int',
 		'precision' => '8'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_location',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_location', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
 
 	// all not explicit named stati have the default percent 0
-	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_percent=10 WHERE info_status='ongoing'",__LINE__,__FILE__);
-	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_percent=50 WHERE info_status='will-call'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_percent=10 WHERE info_status='ongoing'", __LINE__, __FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_percent=50 WHERE info_status='will-call'", __LINE__, __FILE__);
 
-	for($p = 0; $p <= 90; $p += 10)
+	for ($p = 0; $p <= 90; $p += 10)
 	{
 		$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_percent=$p,info_status='".(!$p ? 'not-started' : 'ongoing').
-			"' WHERE info_status = '$p%'",__LINE__,__FILE__);
+			"' WHERE info_status = '$p%'", __LINE__, __FILE__);
 	}
-	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_datecompleted=info_datemodified,info_percent=100 WHERE info_status IN ('done','billed','100%')",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_datecompleted=info_datemodified,info_percent=100 WHERE info_status IN ('done','billed','100%')", __LINE__, __FILE__);
 
 	// remove the percentages from the custom stati, if they exist
-	$config =& CreateObject('phpgwapi.config','infolog');
+	$config = & CreateObject('phpgwapi.config', 'infolog');
 	$config->read_repository();
 	if (is_array($config->config_data['status']['task']))
 	{
 		$config->config_data['status']['task'] = array_diff($config->config_data['status']['task'],
-			array('0%','10%','20%','30%','40%','50%','60%','70%','80%','90%','100%'));
+			array('0%', '10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%', '100%'));
 		$config->save_repository();
 	}
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.2.002';
@@ -499,11 +499,11 @@ 
 function infolog_upgrade1_2_002()
 {
 	// change the phone-status: call --> not-started, will-call --> ongoing to be able to sync them
-	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_status='not-started' WHERE info_status='call'",__LINE__,__FILE__);
-	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_status='ongoing' WHERE info_status='will-call'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_status='not-started' WHERE info_status='call'", __LINE__, __FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_status='ongoing' WHERE info_status='will-call'", __LINE__, __FILE__);
 
 	// remove the call and will-call from the custom stati, if they exist
-	$config =& CreateObject('phpgwapi.config','infolog');
+	$config = & CreateObject('phpgwapi.config', 'infolog');
 	$config->read_repository();
 	if (is_array($config->config_data['status']['phone']))
 	{
@@ -519,7 +519,7 @@ 
 function infolog_upgrade1_2_003()
 {
 	// fix wrong info_responsible='' --> '0'
-	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_responsible='0' WHERE info_responsible=''",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE egw_infolog SET info_responsible='0' WHERE info_responsible=''", __LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.2.004';
 }
@@ -528,7 +528,7 @@ 
 function infolog_upgrade1_2_004()
 {
 	// column to save if from contains a custom text
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_custom_from',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_custom_from', array(
 		'type' => 'int',
 		'precision' => '1',
 	));
@@ -545,13 +545,13 @@ 
 
 function infolog_upgrade1_4()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_uid',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_uid', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
-	$GLOBALS['egw_setup']->db->query("SELECT config_value FROM egw_config WHERE config_app='phpgwapi' AND config_name='install_id'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->db->query("SELECT config_value FROM egw_config WHERE config_app='phpgwapi' AND config_name='install_id'", __LINE__, __FILE__);
 	$install_id = $GLOBALS['egw_setup']->db->next_record() ? $GLOBALS['egw_setup']->db->f(0) : md5(time());
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_infolog SET info_uid='.$GLOBALS['egw_setup']->db->concat("'infolog-'",'info_id',"'-$install_id'"),__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_infolog SET info_uid='.$GLOBALS['egw_setup']->db->concat("'infolog-'", 'info_id', "'-$install_id'"), __LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.5.001';
 }
@@ -564,17 +564,17 @@ 
  */
 function infolog_upgrade1_5_001()
 {
-	foreach($GLOBALS['egw_setup']->db->select('egw_infolog','info_id,info_link_id,org_name,adr_one_locality,n_family,n_given',array(
+	foreach ($GLOBALS['egw_setup']->db->select('egw_infolog', 'info_id,info_link_id,org_name,adr_one_locality,n_family,n_given', array(
 		'info_from' => '',
 		'info_link_id > 0',
-	),__LINE__,__FILE__,false,'','infolog',0,
+	), __LINE__, __FILE__, false, '', 'infolog', 0,
 	" JOIN egw_links ON info_link_id=link_id AND link_app2='addressbook'".
 	" JOIN egw_addressbook ON contact_id=link_id2") as $row)
 	{
 		$from = ($row['org_name'] ? $row['org_name'].', '.$row['adr_one_locality'].': ' : '').
 			$row['n_family'].($row['n_given'] ? ', '.$row['n_given'] : '');
-		$GLOBALS['egw_setup']->db->update('egw_infolog',array('info_from' => $from),
-			array('info_id' => $row['info_id']),__LINE__,__FILE__,'infolog');
+		$GLOBALS['egw_setup']->db->update('egw_infolog', array('info_from' => $from),
+			array('info_id' => $row['info_id']), __LINE__, __FILE__, 'infolog');
 	}
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.5.002';
 }
@@ -587,12 +587,12 @@ 
  */
 function infolog_upgrade1_5_002()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog_extra','info_extra_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog_extra', 'info_extra_name', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog_extra','info_extra_value',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog_extra', 'info_extra_value', array(
 		'type' => 'text',
 		'nullable' => False
 	));
@@ -608,7 +608,7 @@ 
  */
 function infolog_upgrade1_5_003()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_replanned_time',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_replanned_time', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
@@ -637,7 +637,7 @@ 
 
 function infolog_upgrade1_8()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_cc',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_cc', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
@@ -651,29 +651,29 @@ 
  */
 function infolog_upgrade1_9_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'caldav_name', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'comment' => 'name part of CalDAV URL, if specified by client'
 	));
 	$GLOBALS['egw_setup']->db->query('UPDATE egw_infolog SET caldav_name='.
 		$GLOBALS['egw_setup']->db->concat(
-			$GLOBALS['egw_setup']->db->to_varchar('info_id'),"'.ics'"),__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->to_varchar('info_id'), "'.ics'"), __LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_infolog','caldav_name');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_infolog', 'caldav_name');
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_etag',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_etag', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0',
 		'comment' => 'etag, not yet used'
 	));
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_created',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_created', array(
 		'type' => 'int',
 		'precision' => '8',
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog','info_creator',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_infolog', 'info_creator', array(
 		'type' => 'int',
 		'precision' => '4',
 	));
@@ -688,18 +688,18 @@ 
 function infolog_upgrade1_9_002()
 {
 	$ids = array();
-	foreach($GLOBALS['egw_setup']->db->query('SELECT sub.info_id
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT sub.info_id
 FROM egw_infolog sub
 JOIN egw_infolog parent ON sub.info_id_parent=parent.info_id
-WHERE parent.caldav_name=sub.caldav_name',__LINE__,__FILE__) as $row)
+WHERE parent.caldav_name=sub.caldav_name',__LINE__, __FILE__) as $row)
 	{
 		$ids[] = $row['info_id'];
 	}
 	if ($ids)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_infolog SET caldav_name='.
-			$GLOBALS['egw_setup']->db->concat('info_id',"'.ics'").
-			' WHERE info_id IN ('.implode(',',$ids).')',__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->concat('info_id', "'.ics'").
+			' WHERE info_id IN ('.implode(',', $ids).')', __LINE__, __FILE__);
 	}
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '1.9.003';
 }
@@ -707,7 +707,7 @@ 
 
 function infolog_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog', 'caldav_name', array(
 		'type' => 'varchar',
 		'precision' => '200',
 		'comment' => 'name part of CalDAV URL, if specified by client'
@@ -752,7 +752,7 @@ 
 }
 function infolog_upgrade14_2()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','info_responsible',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog', 'info_responsible', array(
 		'type' => 'ascii',
 		'meta' => 'account-commasep',
 		'precision' => '255',
@@ -760,23 +760,23 @@ 
 		'default' => '0',
 		'comment' => 'responsible users or groups (multiple)'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','info_access',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog', 'info_access', array(
 		'type' => 'ascii',
 		'precision' => '10',
 		'default' => 'public',
 		'comment' => 'public or privat'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','info_confirm',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog', 'info_confirm', array(
 		'type' => 'ascii',
 		'precision' => '10',
 		'default' => 'not'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','info_uid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog', 'info_uid', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'comment' => 'unique id of the infolog-entry'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog', 'caldav_name', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'comment' => 'name part of CalDAV URL, if specified by client'
@@ -788,7 +788,7 @@ 
 
 function infolog_upgrade14_2_001()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog_extra','info_extra_value',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_infolog_extra', 'info_extra_value', array(
 		'type' => 'varchar',
 		'meta' => 'cfvalue',
 		'precision' => '16384',

infolog/inc/class.infolog_import_ical.inc.php

Spacing +5 added lines, -5 removed lines

@@ -15,10 +15,10 @@ 
  * import ical for infolog
  * Not a lot of options for this, just uses the ical class
  */
-class infolog_import_ical implements importexport_iface_import_plugin  {
+class infolog_import_ical implements importexport_iface_import_plugin {
 
 	private static $plugin_options = array(
-		'conditions',		/* => array containing condition arrays:
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // exists
 				'string' => '#kundennummer',
 				'true' => array(
@@ -79,19 +79,19 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import($_stream, importexport_definition $_definition) {
 
 		$this->definition = $_definition;
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
 
 		$success = 0;
 
 		// Failures
 		$this->errors = array();
 
-		@set_time_limit(0);     // try switching execution time limit off
+		@set_time_limit(0); // try switching execution time limit off
 
 		$infolog_ical = new infolog_ical();
 		if (!$infolog_ical->importVTODO(stream_get_contents($_stream)))

Doc Comments +1 added lines, -2 removed lines

@@ -104,8 +104,7 @@
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function import( $_stream, importexport_definition $_definition ) {
 		$import_csv = new importexport_import_csv( $_stream, array(

Indentation +29 added lines, -29 removed lines

@@ -71,9 +71,9 @@ 
 	protected $errors = array();
 
 	/**
-         * List of actions, and how many times that action was taken
-         */
-        protected $results = array();
+	 * List of actions, and how many times that action was taken
+	 */
+		protected $results = array();
 
 	/**
 	 * imports entries according to given definition object.
@@ -163,39 +163,39 @@ 
 	}
 
 	/**
-        * Returns warnings that were encountered during importing
-        * Maximum of one warning message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => warning message
-        *       )
-        */
-        public function get_warnings() {
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
+		public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-        * Returns errors that were encountered during importing
-        * Maximum of one error message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => error message
-        *       )
-        */
-        public function get_errors() {
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
+		public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-        * Returns a list of actions taken, and the number of records for that action.
-        * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-        *
-        * @return Array (
-        *       action => record count
-        * )
-        */
-        public function get_results() {
-                return $this->results;
-        }
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
+		public function get_results() {
+				return $this->results;
+		}
 } // end of iface_export_plugin
 ?>

Braces +20 added lines, -10 removed lines

@@ -16,7 +16,8 @@ 
  * import ical for infolog
  * Not a lot of options for this, just uses the ical class
  */
-class infolog_import_ical implements importexport_iface_import_plugin  {
+class infolog_import_ical implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'conditions',		/* => array containing condition arrays:
@@ -81,7 +82,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 
 		$this->definition = $_definition;
 
@@ -115,7 +117,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Infolog iCal import');
 	}
 
@@ -124,7 +127,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports TODOs into Infolog from an iCal File.");
 	}
 
@@ -133,7 +137,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'ics';
 	}
 
@@ -149,7 +154,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -158,7 +164,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -170,7 +177,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 
@@ -182,7 +190,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -194,7 +203,8 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
                 return $this->results;
         }
 } // end of iface_export_plugin

infolog/inc/class.infolog_egw_record.inc.php

Indentation +4 added lines, -4 removed lines

@@ -25,11 +25,11 @@
 	// Used in conversions
 	static $types = array(
 		'select' => array('info_type', 'info_status', 'info_priority', 'pl_id'),
-                'select-cat' => array('info_cat'),
-                'select-account' => array('info_owner','info_responsible','info_modifier'),
-                'date-time' => array('info_startdate', 'info_enddate','info_datecompleted', 'info_datemodified','info_created'),
+				'select-cat' => array('info_cat'),
+				'select-account' => array('info_owner','info_responsible','info_modifier'),
+				'date-time' => array('info_startdate', 'info_enddate','info_datecompleted', 'info_datemodified','info_created'),
 		'links' => array('info_link_id'),
-        );
+		);
 
 	/**
 	 * constructor

Spacing +10 added lines, -10 removed lines

@@ -26,8 +26,8 @@ 
 	static $types = array(
 		'select' => array('info_type', 'info_status', 'info_priority', 'pl_id'),
                 'select-cat' => array('info_cat'),
-                'select-account' => array('info_owner','info_responsible','info_modifier'),
-                'date-time' => array('info_startdate', 'info_enddate','info_datecompleted', 'info_datemodified','info_created'),
+                'select-account' => array('info_owner', 'info_responsible', 'info_modifier'),
+                'date-time' => array('info_startdate', 'info_enddate', 'info_datecompleted', 'info_datemodified', 'info_created'),
 		'links' => array('info_link_id'),
         );
 
@@ -37,10 +37,10 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct($_identifier = '') {
 		$this->identifier = $_identifier;
-		if(self::$bo == null) self::$bo = new infolog_bo();
-		if($_identifier) {
+		if (self::$bo == null) self::$bo = new infolog_bo();
+		if ($_identifier) {
 			$rec = self::$bo->read($this->identifier);
 			if (is_array($rec)) $this->set_record($rec);
 		}
@@ -95,7 +95,7 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->record = $_record;
 	}
 
@@ -133,7 +133,7 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save($_dst_identifier) {
 
 	}
 
@@ -143,7 +143,7 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy($_dst_identifier) {
 
 	}
 
@@ -154,7 +154,7 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move($_dst_identifier) {
 
 	}
 
@@ -162,7 +162,7 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

Braces +38 added lines, -17 removed lines

@@ -37,12 +37,20 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct( $_identifier='' )
+	{
 		$this->identifier = $_identifier;
-		if(self::$bo == null) self::$bo = new infolog_bo();
-		if($_identifier) {
+		if(self::$bo == null)
+		{
+			self::$bo = new infolog_bo();
+		}
+		if($_identifier)
+		{
 			$rec = self::$bo->read($this->identifier);
-			if (is_array($rec)) $this->set_record($rec);
+			if (is_array($rec))
+			{
+				$this->set_record($rec);
+			}
 		}
 	}
 
@@ -51,7 +59,8 @@ 
 	 *
 	 * @param string $_attribute_name
 	 */
-	public function __get($_attribute_name) {
+	public function __get($_attribute_name)
+	{
 		return $this->record[$_attribute_name];
 	}
 
@@ -61,7 +70,8 @@ 
 	 * @param string $_attribute_name
 	 * @param data $data
 	 */
-	public function __set($_attribute_name, $data) {
+	public function __set($_attribute_name, $data)
+	{
 		$this->record[$_attribute_name] = $data;
 	}
 
@@ -73,7 +83,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		return $this->record;
 	}
 
@@ -82,8 +93,10 @@ 
 	 *
 	 *@return string tiltle
 	 */
-	public function get_title() {
-		if (empty($this->record)) {
+	public function get_title()
+	{
+		if (empty($this->record))
+		{
 			$this->get_record();
 		}
 		return self::$bo->link_title($this->record);
@@ -95,7 +108,8 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record)
+	{
 		$this->record = $_record;
 	}
 
@@ -104,7 +118,8 @@ 
 	 *
 	 * @return string identifier of current record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->identifier;
 	}
 
@@ -114,7 +129,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		$icon = 'infolog/navbar';
 		$ui = new infolog_ui();
 		if (!($icon = $ui->icons['type'][$this->info_type]))
@@ -133,7 +149,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save ( $_dst_identifier )
+	{
 
 	}
 
@@ -143,7 +160,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 
 	}
 
@@ -154,7 +172,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move ( $_dst_identifier )
+	{
 
 	}
 
@@ -162,7 +181,8 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete ()
+	{
 
 	}
 
@@ -170,7 +190,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 	}
 
 } // end of egw_addressbook_record

infolog/inc/class.infolog_export_csv.inc.php

Indentation +4 added lines, -4 removed lines

@@ -259,10 +259,10 @@
 	}
 
 	/**
-	* Convert some internal data to something with more meaning
-	*
-	* This is for something specific to Infolog, in addition to the normal conversions.
-	*/
+	 * Convert some internal data to something with more meaning
+	 *
+	 * This is for something specific to Infolog, in addition to the normal conversions.
+	 */
 	public static function convert(infolog_egw_record &$record) {
 		// Stub, for now
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;

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

@@ -247,7 +247,7 @@
 		$this->selects['info_status'] = $this->bo->get_status();
 	}
 
-	public function get_filter_fields(Array &$filters)
+	public function get_filter_fields(array &$filters)
 	{
 		foreach($filters as $field_name => &$settings)
 		{

Spacing +42 added lines, -42 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$selection = array();
@@ -39,45 +39,45 @@ 
 		$this->export_object->set_mapping($options['mapping']);
 
 		$ids = array();
-		switch($options['selection'])
+		switch ($options['selection'])
 		{
 			case 'search':
-				$query = array_merge((array)$GLOBALS['egw']->session->appsession('session_data','infolog'), $query);
+				$query = array_merge((array)$GLOBALS['egw']->session->appsession('session_data', 'infolog'), $query);
 				// Fall through
 			case 'filter':
 			case 'all':
 				// do we need to query the cf's
 				$query['custom_fields'] = false;
-				foreach($options['mapping'] + (array)$_definition->filter as $field => $map) {
-					if($field[0] == '#') {
+				foreach ($options['mapping'] + (array)$_definition->filter as $field => $map) {
+					if ($field[0] == '#') {
 						$query['custom_fields'] = true;
 						$query['selectcols'] .= ",$field";
 
-						if($GLOBALS['egw_info']['user']['apps'][$this->bo->customfields[substr($field,1)]['type']])
+						if ($GLOBALS['egw_info']['user']['apps'][$this->bo->customfields[substr($field, 1)]['type']])
 						{
-							$cf_links[$field] = $this->bo->customfields[substr($field,1)]['type'];
+							$cf_links[$field] = $this->bo->customfields[substr($field, 1)]['type'];
 						}
 					}
 				}
-				if($options['selection'] == 'filter')
+				if ($options['selection'] == 'filter')
 				{
 					$fields = importexport_helper_functions::get_filter_fields($_definition->application, $this);
 					$query['col_filter'] = $_definition->filter;
 
 					// Backend expects a string
-					if($query['col_filter']['info_responsible'])
+					if ($query['col_filter']['info_responsible'])
 					{
-						$query['col_filter']['info_responsible'] = implode(',',$query['col_filter']['info_responsible']);
+						$query['col_filter']['info_responsible'] = implode(',', $query['col_filter']['info_responsible']);
 					}
 
 					// Handle ranges
-					foreach($query['col_filter'] as $field => $value)
+					foreach ($query['col_filter'] as $field => $value)
 					{
-						if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+						if (!is_array($value) || (!$value['from'] && !$value['to'])) continue;
 
 						// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-						if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-						if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+						if ($value['from']) $query['col_filter'][] = "$field >= ".(int)$value['from'];
+						if ($value['to']) $query['col_filter'][] = "$field <= ".(int)$value['to'];
 						unset($query['col_filter'][$field]);
 					}
 				}
@@ -89,11 +89,11 @@ 
 
 					// Pre-load any cfs that are links
 					$cf_preload = array();
-					foreach($cf_links as $field => $app) {
-						foreach($selection as &$row) {
-							if($row[$field]) $cf_preload[$app][] = $row[$field];
+					foreach ($cf_links as $field => $app) {
+						foreach ($selection as &$row) {
+							if ($row[$field]) $cf_preload[$app][] = $row[$field];
 						}
-						if($cf_preload[$app]){
+						if ($cf_preload[$app]) {
 							 $selects[$field] = egw_link::titles($app, $cf_preload[$app]);
 							//error_log('Preload ' . $field . '['.$app . ']: ' . implode(',',$cf_preload[$app]));
 						}
@@ -101,12 +101,12 @@ 
 
 					$this->export_records($this->export_object, $options, $selection, $ids);
 					$query['start'] += $query['num_rows'];
-				} while($query['start'] < $query['total']);
+				} while ($query['start'] < $query['total']);
 
 				return $this->export_object;
 				break;
 			default:
-				$ids = $selection = explode(',',$options['selection']);
+				$ids = $selection = explode(',', $options['selection']);
 				$this->export_records($this->export_object, $options, $selection, $ids);
 				break;
 		}
@@ -116,33 +116,33 @@ 
 	protected function export_records(&$export_object, $options, &$selection, $ids = array())
 	{
 		// Pre-load links all at once
-		if($ids && $options['mapping']['info_link_id'])
+		if ($ids && $options['mapping']['info_link_id'])
 		{
 			$links = egw_link::get_links_multiple('infolog', $ids, true, '!'.egw_link::VFS_APPNAME);
-			foreach($links as $id => $link) {
-				if(!is_array($selection[$id])) break;
+			foreach ($links as $id => $link) {
+				if (!is_array($selection[$id])) break;
 				$selection[$id]['info_link_id'] = $link;
-				if($options['convert']) $selection[$id]['info_link_id'] = egw_link::title($link['app'], $link['id']);
+				if ($options['convert']) $selection[$id]['info_link_id'] = egw_link::title($link['app'], $link['id']);
 			}
 		}
 		// If exporting PM fields, pre-load them all at once
-		if($ids && ($options['mapping']['pm_id'] || $options['mapping']['project']))
+		if ($ids && ($options['mapping']['pm_id'] || $options['mapping']['project']))
 		{
 			$projects = egw_link::get_links_multiple('infolog', $ids, true, 'projectmanager');
-			foreach($projects as $id => $links)
+			foreach ($projects as $id => $links)
 			{
-				if(!is_array($selection[$id])) break;
+				if (!is_array($selection[$id])) break;
 				$selection[$id]['pm_id'] = current($links);
 				$selection[$id]['project'] = egw_link::title('projectmanager', $selection[$id]['pm_id']);
-				$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist',$selection[$id]['pm_id']);
+				$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist', $selection[$id]['pm_id']);
 			}
 		}
 
 		foreach ($selection as $_identifier) {
-			if(!is_array($_identifier)) {
+			if (!is_array($_identifier)) {
 				$record = new infolog_egw_record($_identifier);
-				if($link = $links[$record->info_id]) $record->info_link_id = $options['convert'] ? egw_link::title($link['app'], $link['id']) : $link;
-				if($project = $projects[$record->info_id])
+				if ($link = $links[$record->info_id]) $record->info_link_id = $options['convert'] ? egw_link::title($link['app'], $link['id']) : $link;
+				if ($project = $projects[$record->info_id])
 				{
 					$record->pm_id = current($project);
 					$record->project = egw_link::title('projectmanager', $record->pm_id);
@@ -152,20 +152,20 @@ 
 				$record->set_record($_identifier);
 			}
 			// Some conversion
-			if($options['convert']) {
+			if ($options['convert']) {
 				$this->selects['info_status'] = $this->bo->get_status($record->info_type);
 				importexport_export_csv::convert($record, infolog_egw_record::$types, 'infolog', $this->selects);
 				$this->convert($record);
 
 				// Force 0 times to ''
-				foreach(array('info_planned_time', 'info_used_time', 'info_replanned_time') as $field)
+				foreach (array('info_planned_time', 'info_used_time', 'info_replanned_time') as $field)
 				{
-					if($record->$field == 0) $record->$field = '';
+					if ($record->$field == 0) $record->$field = '';
 				}
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach ($record->get_record_array() as $key => $value) {
+					if (is_array($value)) $record->$key = implode(',', $value);
 				}
 			}
 			$export_object->export_record($record);
@@ -210,7 +210,7 @@ 
 	 */
 	public function get_filename()
 	{
-		if(is_object($this->export_object) && $this->export_object->get_num_of_records() == 1)
+		if (is_object($this->export_object) && $this->export_object->get_num_of_records() == 1)
 		{
 			return $this->export_object->record->get_title();
 		}
@@ -240,18 +240,18 @@ 
 	{
 		$this->selects['info_type'] = $this->bo->enums['type'];
 		$this->selects['info_priority'] = $this->bo->enums['priority'];
-		$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist',false);
+		$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist', false);
 		$this->selects['info_status'] = $this->bo->get_status();
 	}
 
 	public function get_filter_fields(Array &$filters)
 	{
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 			
 			// Infolog can't handle ranges in custom fields due to the way searching is done.
-			if(strpos($field_name, '#') === 0 && strpos($settings['type'],'date') === 0) unset($filters[$field_name]);
+			if (strpos($field_name, '#') === 0 && strpos($settings['type'], 'date') === 0) unset($filters[$field_name]);
 		}
 	}
 
@@ -260,7 +260,7 @@ 
 	*
 	* This is for something specific to Infolog, in addition to the normal conversions.
 	*/
-	public static function convert(infolog_egw_record &$record) {
+	public static function convert(infolog_egw_record&$record) {
 		// Stub, for now
 	}
 }

Braces +94 added lines, -34 removed lines

@@ -14,10 +14,12 @@ 
 /**
  * export plugin of infolog
  */
-class infolog_export_csv implements importexport_iface_export_plugin {
+class infolog_export_csv implements importexport_iface_export_plugin
+{
 
 
-	public function __construct() {
+	public function __construct()
+	{
 		translation::add_app('infolog');
 		$this->bo = new infolog_bo();
 		$this->get_selects();
@@ -28,7 +30,8 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$selection = array();
@@ -48,8 +51,10 @@ 
 			case 'all':
 				// do we need to query the cf's
 				$query['custom_fields'] = false;
-				foreach($options['mapping'] + (array)$_definition->filter as $field => $map) {
-					if($field[0] == '#') {
+				foreach($options['mapping'] + (array)$_definition->filter as $field => $map)
+				{
+					if($field[0] == '#')
+					{
 						$query['custom_fields'] = true;
 						$query['selectcols'] .= ",$field";
 
@@ -73,11 +78,20 @@ 
 					// Handle ranges
 					foreach($query['col_filter'] as $field => $value)
 					{
-						if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+						if(!is_array($value) || (!$value['from'] && !$value['to']))
+						{
+							continue;
+						}
 
 						// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-						if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-						if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+						if($value['from'])
+						{
+							$query['col_filter'][] = "$field >= " . (int)$value['from'];
+						}
+						if($value['to'])
+						{
+							$query['col_filter'][] = "$field <= " . (int)$value['to'];
+						}
 						unset($query['col_filter'][$field]);
 					}
 				}
@@ -89,11 +103,17 @@ 
 
 					// Pre-load any cfs that are links
 					$cf_preload = array();
-					foreach($cf_links as $field => $app) {
-						foreach($selection as &$row) {
-							if($row[$field]) $cf_preload[$app][] = $row[$field];
+					foreach($cf_links as $field => $app)
+					{
+						foreach($selection as &$row)
+						{
+							if($row[$field])
+							{
+								$cf_preload[$app][] = $row[$field];
+							}
 						}
-						if($cf_preload[$app]){
+						if($cf_preload[$app])
+						{
 							 $selects[$field] = egw_link::titles($app, $cf_preload[$app]);
 							//error_log('Preload ' . $field . '['.$app . ']: ' . implode(',',$cf_preload[$app]));
 						}
@@ -119,10 +139,17 @@ 
 		if($ids && $options['mapping']['info_link_id'])
 		{
 			$links = egw_link::get_links_multiple('infolog', $ids, true, '!'.egw_link::VFS_APPNAME);
-			foreach($links as $id => $link) {
-				if(!is_array($selection[$id])) break;
+			foreach($links as $id => $link)
+			{
+				if(!is_array($selection[$id]))
+				{
+					break;
+				}
 				$selection[$id]['info_link_id'] = $link;
-				if($options['convert']) $selection[$id]['info_link_id'] = egw_link::title($link['app'], $link['id']);
+				if($options['convert'])
+				{
+					$selection[$id]['info_link_id'] = egw_link::title($link['app'], $link['id']);
+				}
 			}
 		}
 		// If exporting PM fields, pre-load them all at once
@@ -131,28 +158,39 @@ 
 			$projects = egw_link::get_links_multiple('infolog', $ids, true, 'projectmanager');
 			foreach($projects as $id => $links)
 			{
-				if(!is_array($selection[$id])) break;
+				if(!is_array($selection[$id]))
+				{
+					break;
+				}
 				$selection[$id]['pm_id'] = current($links);
 				$selection[$id]['project'] = egw_link::title('projectmanager', $selection[$id]['pm_id']);
 				$this->selects['pl_id'] = ExecMethod('projectmanager.projectmanager_pricelist_bo.pricelist',$selection[$id]['pm_id']);
 			}
 		}
 
-		foreach ($selection as $_identifier) {
-			if(!is_array($_identifier)) {
+		foreach ($selection as $_identifier)
+		{
+			if(!is_array($_identifier))
+			{
 				$record = new infolog_egw_record($_identifier);
-				if($link = $links[$record->info_id]) $record->info_link_id = $options['convert'] ? egw_link::title($link['app'], $link['id']) : $link;
+				if($link = $links[$record->info_id])
+				{
+					$record->info_link_id = $options['convert'] ? egw_link::title($link['app'], $link['id']) : $link;
+				}
 				if($project = $projects[$record->info_id])
 				{
 					$record->pm_id = current($project);
 					$record->project = egw_link::title('projectmanager', $record->pm_id);
 				}
-			} else {
+			}
+			else
+			{
 				$record = new infolog_egw_record();
 				$record->set_record($_identifier);
 			}
 			// Some conversion
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				$this->selects['info_status'] = $this->bo->get_status($record->info_type);
 				importexport_export_csv::convert($record, infolog_egw_record::$types, 'infolog', $this->selects);
 				$this->convert($record);
@@ -160,12 +198,21 @@ 
 				// Force 0 times to ''
 				foreach(array('info_planned_time', 'info_used_time', 'info_replanned_time') as $field)
 				{
-					if($record->$field == 0) $record->$field = '';
+					if($record->$field == 0)
+					{
+						$record->$field = '';
+					}
 				}
-			} else {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach($record->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
 			}
 			$export_object->export_record($record);
@@ -178,7 +225,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Infolog CSV export');
 	}
 
@@ -187,7 +235,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports Infolog entries into a CSV File.");
 	}
 
@@ -196,11 +245,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
 		return 'text/csv';
 	}
 
@@ -223,14 +274,16 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 	}
 
 	/**
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'	=> 'infolog.export_csv_selectors',
 		);
@@ -248,10 +301,16 @@ 
 	{
 		foreach($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name])
+			{
+				$settings['values'] = $this->selects[$field_name];
+			}
 			
 			// Infolog can't handle ranges in custom fields due to the way searching is done.
-			if(strpos($field_name, '#') === 0 && strpos($settings['type'],'date') === 0) unset($filters[$field_name]);
+			if(strpos($field_name, '#') === 0 && strpos($settings['type'],'date') === 0)
+			{
+				unset($filters[$field_name]);
+			}
 		}
 	}
 
@@ -260,7 +319,8 @@ 
 	*
 	* This is for something specific to Infolog, in addition to the normal conversions.
 	*/
-	public static function convert(infolog_egw_record &$record) {
+	public static function convert(infolog_egw_record &$record)
+	{
 		// Stub, for now
 	}
 }

infolog/inc/class.infolog_wizard_export_csv.inc.php

Spacing +2 added lines, -2 removed lines

@@ -21,13 +21,13 @@
 		$bo = new infolog_tracking(new infolog_bo());
 		$this->export_fields = array('info_id' => 'Infolog ID', 'pm_id' => 'Project ID', 'project' => 'Project Name') + $bo->field2label;
 		// Add in created date, in the appropriate place
-		$first = array_splice($this->export_fields, 0, array_search('info_datemodified',array_keys($this->export_fields)));
+		$first = array_splice($this->export_fields, 0, array_search('info_datemodified', array_keys($this->export_fields)));
 		$this->export_fields = array_merge($first, array('info_created'=>'creation'), $this->export_fields);
 
 		// Custom fields
 		unset($this->export_fields['custom']); // Heading, not a real field
 		$custom = Api\Storage\Customfields::get('infolog', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

Braces +4 added lines, -2 removed lines

@@ -14,7 +14,8 @@ 
 
 class infolog_wizard_export_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Field mapping
@@ -27,7 +28,8 @@ 
 		// Custom fields
 		unset($this->export_fields['custom']); // Heading, not a real field
 		$custom = Api\Storage\Customfields::get('infolog', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

infolog/inc/class.infolog_so.inc.php

Indentation +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
 				$filtermethod .= " OR (".$this->responsible_filter($this->user).
 					($filter == 'own' && count($public_user_list) ?	// offer's should show up in own, eg. startpage, but need read-access
 						" OR info_status = 'offer' AND $public_access" : '').")".
-				                 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
+								 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
 			}
 			elseif ($filter != 'my' && $filter != 'responsible')	// none --> all entrys user has rights to see
 			{

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

@@ -828,7 +828,7 @@ 
 		$ids = array( );
 		if ($action == '' || $action == 'sp' || count($links))
 		{
-			$sql_query = "FROM $this->info_table main $join WHERE ($filtermethod $pid $sql_query) $link_extra";
+			$sql_query = "from $this->info_table main $join WHERE ($filtermethod $pid $sql_query) $link_extra";
 			#error_log("infolog.so.search:\n" . print_r($sql_query, true));
 
 			if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0)
@@ -838,7 +838,7 @@ 
 			}
 			else
 			{
-				$query['total'] = $this->db->query($sql="SELECT $distinct main.info_id ".$sql_query,__LINE__,__FILE__)->NumRows();
+				$query['total'] = $this->db->query($sql="select $distinct main.info_id ".$sql_query,__LINE__,__FILE__)->NumRows();
 			}
 			$info_customfield = '';
 			if ($sortbycf != '')

Doc Comments +7 added lines, -22 removed lines

@@ -64,7 +64,6 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param array $grants=array()
 	 * @return soinfolog
 	 */
 	function __construct( $grants=array() )
@@ -102,9 +101,9 @@ 
 	 *
 	 * @param array|int $info data or info_id of InfoLog entry
 	 * @param int $required_rights EGW_ACL_xyz anded together
-	 * @param boolean $implicit_edit=false responsible has only implicit read and add rigths, unless this is set to true
-	 * @param array $grants=null grants to use, default (null) $this->grants
-	 * @param int $user=null user to check, default (null) $this->user
+	 * @param boolean $implicit_edit responsible has only implicit read and add rigths, unless this is set to true
+	 * @param array $grants grants to use, default (null) $this->grants
+	 * @param integer $user
 	 * @return boolean True if access is granted else False
 	 */
 	function check_access( $info,$required_rights,$implicit_edit=false,array $grants=null,$user=null )
@@ -274,7 +273,7 @@ 
 	 * generate sql to filter based on the status of the log-entry
 	 *
 	 * @param string $filter done = done or billed, open = not (done, billed, cancelled or deleted), offer = offer
-	 * @param boolean $prefix_and=true if true prefix the fileter with ' AND '
+	 * @param boolean $prefix_and if true prefix the fileter with ' AND '
 	 * @return string the necesary sql
 	 */
 	function statusFilter($filter = '',$prefix_and=true)
@@ -370,7 +369,7 @@ 
 	 * some cacheing is done to prevent multiple reads of the same entry
 	 *
 	 * @param array $where where clause for entry to read
-	 * @return array|boolean the entry as array or False on error (eg. entry not found)
+	 * @return boolean the entry as array or False on error (eg. entry not found)
 	 */
 	function read(array $where)		// did _not_ ensure ACL
 	{
@@ -474,8 +473,6 @@ 
 	 * changes or deletes entries with a spezified owner (for hook_delete_account)
 	 *
 	 * @param array $args hook arguments
-	 * @param int $args['account_id'] account to delete
-	 * @param int $args['new_owner']=0 new owner
 	 */
 	function change_delete_owner(array $args)  // new_owner=0 means delete
 	{
@@ -508,8 +505,8 @@ 
 	 * writes the given $values to InfoLog, a new entry gets created if info_id is not set or 0
 	 *
 	 * @param array $values with the data of the log-entry
-	 * @param int $check_modified=0 old modification date to check before update (include in WHERE)
-	 * @param string $purge_cfs=null null=dont, 'ical'=only iCal X-properties (cfs name starting with "#"), 'all'=all cfs
+	 * @param int $check_modified old modification date to check before update (include in WHERE)
+	 * @param string $purge_cfs null=dont, 'ical'=only iCal X-properties (cfs name starting with "#"), 'all'=all cfs
 	 * @return int|boolean info_id, false on error or 0 if the entry has been updated in the meantime
 	 */
 	function write($values, $check_modified=0, $purge_cfs=null)  // did _not_ ensure ACL
@@ -662,19 +659,7 @@ 
 	/**
 	 * searches InfoLog for a certain pattern in $query
 	 *
-	 * @param string $query[order] column-name to sort after
-	 * @param string $query[sort] sort-order DESC or ASC
-	 * @param string $query[filter] string with combination of acl-, date- and status-filters, eg. 'own-open-today' or ''
-	 * @param int $query[cat_id] category to use or 0 or unset
-	 * @param string $query[search] pattern to search, search is done in info_from, info_subject and info_des
-	 * @param string $query[action] / $query[action_id] if only entries linked to a specified app/entry show be used
 	 * @param int &$query[start], &$query[total] nextmatch-parameters will be used and set if query returns less entries
-	 * @param array $query[col_filter] array with column-name - data pairs, data == '' means no filter (!)
-	 * @param boolean $query[subs] return subs or not, if unset the user preference is used
-	 * @param int $query[num_rows] number of rows to return if $query[start] is set, default is to use the value from the general prefs
-	 * @param string|array $query[cols]=null what to query, if set the recordset / iterator get's returned
-	 * @param string $query[append]=null get's appended to sql query, eg. for GROUP BY
-	 * @param boolean $query['custom_fields']=false query custom-fields too, default not
 	 * @return array|iterator with id's as key of the matching log-entries or recordset/iterator if cols is set
 	 */
 	function search(&$query)

Spacing +161 added lines, -162 removed lines

@@ -67,7 +67,7 @@ 
 	 * @param array $grants=array()
 	 * @return soinfolog
 	 */
-	function __construct( $grants=array() )
+	function __construct($grants = array())
 	{
 		$this->db     = clone($GLOBALS['egw']->db);
 		$this->db->set_app('infolog');
@@ -83,18 +83,18 @@ 
 	 * @param array $info infolog entry as array
 	 * @return boolean
 	 */
-	function is_responsible($info,$user=null)
+	function is_responsible($info, $user = null)
 	{
 		if (!$user) $user = $this->user;
 
 		static $um_cache = array();
-		if ($user == $this->user) $user_and_memberships =& $um_cache[$user];
+		if ($user == $this->user) $user_and_memberships = & $um_cache[$user];
 		if (!isset($user_and_memberships))
 		{
-			$user_and_memberships = $GLOBALS['egw']->accounts->memberships($user,true);
+			$user_and_memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 			$user_and_memberships[] = $user;
 		}
-		return $info['info_responsible'] && array_intersect((array)$info['info_responsible'],$user_and_memberships);
+		return $info['info_responsible'] && array_intersect((array)$info['info_responsible'], $user_and_memberships);
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 * @param int $user=null user to check, default (null) $this->user
 	 * @return boolean True if access is granted else False
 	 */
-	function check_access( $info,$required_rights,$implicit_edit=false,array $grants=null,$user=null )
+	function check_access($info, $required_rights, $implicit_edit = false, array $grants = null, $user = null)
 	{
 		if (is_null($grants)) $grants = $this->grants;
 		if (!$user) $user = $this->user;
@@ -119,7 +119,7 @@ 
 		{
 
 		}
-		elseif ((int) $info != $this->data['info_id'])      	// already loaded?
+		elseif ((int)$info != $this->data['info_id'])      	// already loaded?
 		{
 			// dont change our own internal data,
 			$backup_data = $this->data;
@@ -135,12 +135,12 @@ 
 			return False;
 		}
 		$owner = $info['info_owner'];
-		$access_ok = $owner == $user ||	// user has all rights
+		$access_ok = $owner == $user || // user has all rights
 			// ACL only on public entrys || $owner granted _PRIVATE
-			(!!($grants[$owner] & $required_rights) ||
-				$this->is_responsible($info,$user) &&	// implicite rights for responsible user(s) and his memberships
+			(!!($grants[$owner]&$required_rights) ||
+				$this->is_responsible($info, $user) && // implicite rights for responsible user(s) and his memberships
 				($required_rights == EGW_ACL_READ || $required_rights == EGW_ACL_ADD || $implicit_edit && $required_rights == EGW_ACL_EDIT)) &&
-			($info['info_access'] == 'public' || !!($this->grants[$user] & EGW_ACL_PRIVATE));
+			($info['info_access'] == 'public' || !!($this->grants[$user]&EGW_ACL_PRIVATE));
 
 		// error_log(__METHOD__."($info[info_id],$required_rights,$implicit_edit,".array2string($grants).",$user) returning ".array2string($access_ok));
 		return $access_ok;
@@ -159,23 +159,22 @@ 
 		if (!$users) return '0';
 
 		$responsible = array();
-		foreach((array)$users as $user)
+		foreach ((array)$users as $user)
 		{
-			$responsible = array_merge($responsible,(array)
-				($user > 0 ? $GLOBALS['egw']->accounts->memberships($user,true) :
-					$GLOBALS['egw']->accounts->members($user,true)));
+			$responsible = array_merge($responsible, (array)
+				($user > 0 ? $GLOBALS['egw']->accounts->memberships($user, true) : $GLOBALS['egw']->accounts->members($user, true)));
 			$responsible[] = $user;
 		}
 		if (is_array($users))
 		{
 			$responsible = array_unique($responsible);
 		}
-		foreach($responsible as $key => $uid)
+		foreach ($responsible as $key => $uid)
 		{
-			$responsible[$key] = $this->db->concat("','",'info_responsible',"','")." LIKE '%,$uid,%'";
+			$responsible[$key] = $this->db->concat("','", 'info_responsible', "','")." LIKE '%,$uid,%'";
 		}
 		//echo "<p align=right>responsible_filter($user) = ".'('.implode(' OR ',$responsible).')'."</p>\n";
-		return '('.implode(' OR ',$responsible).')';
+		return '('.implode(' OR ', $responsible).')';
 	}
 
 	/**
@@ -190,17 +189,17 @@ 
 	function aclFilter($filter = False)
 	{
 		$vars = null;
-		preg_match('/(my|responsible|delegated|own|privat|private|all|user)([0-9,-]*)/',$filter_was=$filter,$vars);
+		preg_match('/(my|responsible|delegated|own|privat|private|all|user)([0-9,-]*)/', $filter_was = $filter, $vars);
 		$filter = $vars[1];
 		$f_user = $vars[2];
 
 		if (isset($this->acl_filter[$filter.$f_user]))
 		{
-			return $this->acl_filter[$filter.$f_user];  // used cached filter if found
+			return $this->acl_filter[$filter.$f_user]; // used cached filter if found
 		}
-		if ($f_user && strpos($f_user,',') !== false)
+		if ($f_user && strpos($f_user, ',') !== false)
 		{
-			$f_user = explode(',',$f_user);
+			$f_user = explode(',', $f_user);
 		}
 
 		$filtermethod = " (info_owner=$this->user"; // user has all rights
@@ -217,24 +216,24 @@ 
 		{
 			if (is_array($this->grants))
 			{
-				foreach($this->grants as $user => $grant)
+				foreach ($this->grants as $user => $grant)
 				{
 					// echo "<p>grants: user=$user, grant=$grant</p>";
-					if ($grant & (EGW_ACL_READ|EGW_ACL_EDIT))
+					if ($grant&(EGW_ACL_READ|EGW_ACL_EDIT))
 					{
 						$public_user_list[] = $user;
 					}
-					if ($grant & EGW_ACL_PRIVATE)
+					if ($grant&EGW_ACL_PRIVATE)
 					{
 						$private_user_list[] = $user;
 					}
 				}
 				if (count($private_user_list))
 				{
-					$has_private_access = $this->db->expression($this->info_table,array('info_owner' => $private_user_list));
+					$has_private_access = $this->db->expression($this->info_table, array('info_owner' => $private_user_list));
 				}
 			}
-			$public_access = $this->db->expression($this->info_table,array('info_owner' => $public_user_list));
+			$public_access = $this->db->expression($this->info_table, array('info_owner' => $public_user_list));
 			// implicit read-rights for responsible user
 			$filtermethod .= " OR (".$this->responsible_filter($this->user).')';
 
@@ -242,9 +241,9 @@ 
 			if ($filter == 'private' || $filter == 'privat' || $filter == 'own')
 			{
 				$filtermethod .= " OR (".$this->responsible_filter($this->user).
-					($filter == 'own' && count($public_user_list) ?	// offer's should show up in own, eg. startpage, but need read-access
+					($filter == 'own' && count($public_user_list) ? // offer's should show up in own, eg. startpage, but need read-access
 						" OR info_status = 'offer' AND $public_access" : '').")".
-				                 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
+				                 " AND (info_access='public'".($has_private_access ? " OR $has_private_access" : '').')';
 			}
 			elseif ($filter != 'my' && $filter != 'responsible')	// none --> all entrys user has rights to see
 			{
@@ -261,13 +260,13 @@ 
 
 			if ($filter == 'user' && $f_user)
 			{
-				$filtermethod .= $this->db->expression($this->info_table,' AND (',array(
+				$filtermethod .= $this->db->expression($this->info_table, ' AND (', array(
 					'info_owner' => $f_user,
-				)," AND info_responsible='0' OR ",$this->responsible_filter($f_user),')');
+				), " AND info_responsible='0' OR ", $this->responsible_filter($f_user), ')');
 			}
 		}
 		//echo "<p>aclFilter(filter='$filter_was',user='$f_user') = '$filtermethod', privat_user_list=".print_r($privat_user_list,True).", public_user_list=".print_r($public_user_list,True)."</p>\n";
-		return $this->acl_filter[$filter.$f_user] = $filtermethod;  // cache the filter
+		return $this->acl_filter[$filter.$f_user] = $filtermethod; // cache the filter
 	}
 
 	/**
@@ -277,18 +276,18 @@ 
 	 * @param boolean $prefix_and=true if true prefix the fileter with ' AND '
 	 * @return string the necesary sql
 	 */
-	function statusFilter($filter = '',$prefix_and=true)
+	function statusFilter($filter = '', $prefix_and = true)
 	{
 		$vars = null;
-		preg_match('/(done|open|offer|deleted|\+deleted)/',$filter,$vars);
+		preg_match('/(done|open|offer|deleted|\+deleted)/', $filter, $vars);
 		$filter = $vars[1];
 
 		switch ($filter)
 		{
 			case 'done':	$filter = "info_status IN ('done','billed','cancelled')"; break;
 			case 'open':	$filter = "NOT (info_status IN ('done','billed','cancelled','deleted','template','nonactive','archive'))"; break;
-			case 'offer':	$filter = "info_status = 'offer'";    break;
-			case 'deleted': $filter = "info_status = 'deleted'";  break;
+			case 'offer':	$filter = "info_status = 'offer'"; break;
+			case 'deleted': $filter = "info_status = 'deleted'"; break;
 			case '+deleted':$filter = "NOT (info_status IN ('template','nonactive','archive'))"; break;
 			default:        $filter = "NOT (info_status IN ('deleted','template','nonactive','archive'))"; break;
 		}
@@ -309,18 +308,18 @@ 
 	function dateFilter($filter = '')
 	{
 		$vars = null;
-		preg_match('/(open-upcoming|upcoming|today|overdue|date|enddate)([-\\/.0-9]*)/',$filter,$vars);
+		preg_match('/(open-upcoming|upcoming|today|overdue|date|enddate)([-\\/.0-9]*)/', $filter, $vars);
 		$filter = $vars[1];
 
-		if (isset($vars[2]) && !empty($vars[2]) && ($date = preg_split('/[-\\/.]/',$vars[2])))
+		if (isset($vars[2]) && !empty($vars[2]) && ($date = preg_split('/[-\\/.]/', $vars[2])))
 		{
-			$today = mktime(-$this->tz_offset,0,0,intval($date[1]),intval($date[2]),intval($date[0]));
-			$tomorrow = mktime(-$this->tz_offset,0,0,intval($date[1]),intval($date[2])+1,intval($date[0]));
+			$today = mktime(-$this->tz_offset, 0, 0, intval($date[1]), intval($date[2]), intval($date[0]));
+			$tomorrow = mktime(-$this->tz_offset, 0, 0, intval($date[1]), intval($date[2]) + 1, intval($date[0]));
 		}
 		else
 		{
-			$now = getdate(time()-60*60*$this->tz_offset);
-			$tomorrow = mktime(-$this->tz_offset,0,0,$now['mon'],$now['mday']+1,$now['year']);
+			$now = getdate(time() - 60 * 60 * $this->tz_offset);
+			$tomorrow = mktime(-$this->tz_offset, 0, 0, $now['mon'], $now['mday'] + 1, $now['year']);
 		}
 		switch ($filter)
 		{
@@ -384,7 +383,7 @@ 
 			$minimum_uid_length = 8;
 		}
 
-		if (!$where || !($this->data = $this->db->select($this->info_table,'*',$where,__LINE__,__FILE__)->fetch()))
+		if (!$where || !($this->data = $this->db->select($this->info_table, '*', $where, __LINE__, __FILE__)->fetch()))
 		{
 			$this->init( );
 			//error_log(__METHOD__.'('.array2string($where).') returning FALSE');
@@ -396,15 +395,15 @@ 
 			$this->data['info_uid'] = common::generate_uid('infolog', $this->data['info_id']);
 			$this->db->update($this->info_table,
 				array('info_uid' => $this->data['info_uid']),
-				array('info_id' => $this->data['info_id']), __LINE__,__FILE__);
+				array('info_id' => $this->data['info_id']), __LINE__, __FILE__);
 		}
 		if (!is_array($this->data['info_responsible']))
 		{
-			$this->data['info_responsible'] = $this->data['info_responsible'] ? explode(',',$this->data['info_responsible']) : array();
+			$this->data['info_responsible'] = $this->data['info_responsible'] ? explode(',', $this->data['info_responsible']) : array();
 		}
 		// Cast back to integer
 		$this->data['info_id_parent'] = (int)$this->data['info_id_parent'];
-		foreach($this->db->select($this->extra_table,'info_extra_name,info_extra_value',array('info_id'=>$this->data['info_id']),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select($this->extra_table, 'info_extra_name,info_extra_value', array('info_id'=>$this->data['info_id']), __LINE__, __FILE__) as $row)
 		{
 			$this->data['#'.$row['info_extra_name']] = $row['info_extra_value'];
 		}
@@ -419,17 +418,17 @@ 
 	 * @param boolean $delete_children delete the children, if not set there parent-id to $new_parent
 	 * @param int $new_parent new parent-id to set for subs
 	 */
-	function delete($info_id,$delete_children=True,$new_parent=0)  // did _not_ ensure ACL
+	function delete($info_id, $delete_children = True, $new_parent = 0)  // did _not_ ensure ACL
 	{
 		//echo "<p>soinfolog::delete($info_id,'$delete_children',$new_parent)</p>\n";
-		if ((int) $info_id <= 0)
+		if ((int)$info_id <= 0)
 		{
 			return;
 		}
-		$this->db->delete($this->info_table,array('info_id'=>$info_id),__LINE__,__FILE__);
-		$this->db->delete($this->extra_table,array('info_id'=>$info_id),__LINE__,__FILE__);
-		egw_link::unlink(0,'infolog',$info_id);
-		egw_index::delete('infolog',$info_id);
+		$this->db->delete($this->info_table, array('info_id'=>$info_id), __LINE__, __FILE__);
+		$this->db->delete($this->extra_table, array('info_id'=>$info_id), __LINE__, __FILE__);
+		egw_link::unlink(0, 'infolog', $info_id);
+		egw_index::delete('infolog', $info_id);
 
 		if ($this->data['info_id'] == $info_id)
 		{
@@ -438,18 +437,18 @@ 
 		// delete children, if they are owned by the user
 		if ($delete_children)
 		{
-			$db2 = clone($this->db);	// we need an extra result-set
-			$db2->select($this->info_table,'info_id',array(
+			$db2 = clone($this->db); // we need an extra result-set
+			$db2->select($this->info_table, 'info_id', array(
 					'info_id_parent'	=> $info_id,
 					'info_owner'		=> $this->user,
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			while ($db2->next_record())
 			{
-				$this->delete($db2->f(0),$delete_children);
+				$this->delete($db2->f(0), $delete_children);
 			}
 		}
 		// set parent_id to $new_parent or 0 for all not deleted children
-		$this->db->update($this->info_table,array('info_id_parent'=>$new_parent),array('info_id_parent'=>$info_id),__LINE__,__FILE__);
+		$this->db->update($this->info_table, array('info_id_parent'=>$new_parent), array('info_id_parent'=>$info_id), __LINE__, __FILE__);
 	}
 
 	/**
@@ -461,9 +460,9 @@ 
 	function get_children($info_id)
 	{
 		$children = array();
-		foreach($this->db->select($this->info_table, 'info_id,info_owner', array(
+		foreach ($this->db->select($this->info_table, 'info_id,info_owner', array(
 			'info_id_parent'	=> $info_id,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$children[$row['info_id']] = $row['info_owner'];
 		}
@@ -479,27 +478,27 @@ 
 	 */
 	function change_delete_owner(array $args)  // new_owner=0 means delete
 	{
-		if (!(int) $args['new_owner'])
+		if (!(int)$args['new_owner'])
 		{
-			foreach($this->db->select($this->info_table,'info_id',array('info_owner'=>$args['account_id']),__LINE__,__FILE__,false,'','infolog') as $row)
+			foreach ($this->db->select($this->info_table, 'info_id', array('info_owner'=>$args['account_id']), __LINE__, __FILE__, false, '', 'infolog') as $row)
 			{
-				$this->delete($row['info_id'],False);
+				$this->delete($row['info_id'], False);
 			}
 		}
 		else
 		{
-			$this->db->update($this->info_table,array('info_owner'=>$args['new_owner']),array('info_owner'=>$args['account_id']),__LINE__,__FILE__,'infolog');
+			$this->db->update($this->info_table, array('info_owner'=>$args['new_owner']), array('info_owner'=>$args['account_id']), __LINE__, __FILE__, 'infolog');
 		}
-		foreach($this->db->select($this->info_table,'info_id,info_responsible',
-			$this->db->concat("','",'info_responsible',"','").' LIKE '.$this->db->quote('%,'.(int)$args['account_id'].',%'),
-			__LINE__,__FILE__,false,'','infolog') as $row)
+		foreach ($this->db->select($this->info_table, 'info_id,info_responsible',
+			$this->db->concat("','", 'info_responsible', "','").' LIKE '.$this->db->quote('%,'.(int)$args['account_id'].',%'),
+			__LINE__, __FILE__, false, '', 'infolog') as $row)
 		{
-			$new_responsible = explode(',',$row['info_responsible']);
-			unset($new_responsible[array_search($args['account_id'],$new_responsible)]);
+			$new_responsible = explode(',', $row['info_responsible']);
+			unset($new_responsible[array_search($args['account_id'], $new_responsible)]);
 			if ((int)$args['new_owner']) $new_responsible[] = (int)$args['new_owner'];
-			$this->db->update($this->info_table,array(
-				'info_responsible' => implode(',',$new_responsible),
-			),array('info_id' => $row['info_id']),__LINE__,__FILE__,'infolog');
+			$this->db->update($this->info_table, array(
+				'info_responsible' => implode(',', $new_responsible),
+			), array('info_id' => $row['info_id']), __LINE__, __FILE__, 'infolog');
 		}
 
 	}
@@ -512,7 +511,7 @@ 
 	 * @param string $purge_cfs=null null=dont, 'ical'=only iCal X-properties (cfs name starting with "#"), 'all'=all cfs
 	 * @return int|boolean info_id, false on error or 0 if the entry has been updated in the meantime
 	 */
-	function write($values, $check_modified=0, $purge_cfs=null)  // did _not_ ensure ACL
+	function write($values, $check_modified = 0, $purge_cfs = null)  // did _not_ ensure ACL
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
@@ -524,19 +523,19 @@ 
 		}
 
 		//echo "soinfolog::write(,$check_modified) values="; _debug_array($values);
-		$info_id = (int) $values['info_id'];
+		$info_id = (int)$values['info_id'];
 
-		if (array_key_exists('info_responsible',$values))	// isset($values['info_responsible']) returns false for NULL!
+		if (array_key_exists('info_responsible', $values))	// isset($values['info_responsible']) returns false for NULL!
 		{
-			$values['info_responsible'] = $values['info_responsible'] ? implode(',',$values['info_responsible']) : '0';
+			$values['info_responsible'] = $values['info_responsible'] ? implode(',', $values['info_responsible']) : '0';
 		}
-		$table_def = $this->db->get_table_definitions('infolog',$this->info_table);
+		$table_def = $this->db->get_table_definitions('infolog', $this->info_table);
 		$to_write = array();
-		foreach($values as $key => $val)
+		foreach ($values as $key => $val)
 		{
 			if ($key != 'info_id' && isset($table_def['fd'][$key]))
 			{
-				$to_write[$key] = $this->data[$key] = $val;   // update internal data
+				$to_write[$key] = $this->data[$key] = $val; // update internal data
 			}
 		}
 		// writing no price as SQL NULL (required by postgres)
@@ -546,23 +545,23 @@ 
 		{
 			$where = array('info_id' => $info_id);
 			if ($check_modified) $where['info_datemodified'] = $check_modified;
-			if (!$this->db->update($this->info_table,$to_write,$where,__LINE__,__FILE__))
+			if (!$this->db->update($this->info_table, $to_write, $where, __LINE__, __FILE__))
 			{
 				//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning false");
-				return false;	// Error
+				return false; // Error
 			}
 			if ($check_modified && $this->db->affected_rows() < 1)
 			{
 				//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning 0 (nothing updated, eg. condition not met)");
-				return 0;	// someone else updated the modtime or deleted the entry
+				return 0; // someone else updated the modtime or deleted the entry
 			}
 		}
 		else
 		{
-			if (!isset($to_write['info_id_parent'])) $to_write['info_id_parent'] = 0;	// must not be null
+			if (!isset($to_write['info_id_parent'])) $to_write['info_id_parent'] = 0; // must not be null
 
-			$this->db->insert($this->info_table,$to_write,false,__LINE__,__FILE__);
-			$info_id = $this->data['info_id'] = $this->db->get_last_insert_id($this->info_table,'info_id');
+			$this->db->insert($this->info_table, $to_write, false, __LINE__, __FILE__);
+			$info_id = $this->data['info_id'] = $this->db->get_last_insert_id($this->info_table, 'info_id');
 		}
 
 		$update = array();
@@ -578,8 +577,8 @@ 
 		}
 		if ($update)
 		{
-			$this->db->update($this->info_table,$update,
-				array('info_id' => $info_id), __LINE__,__FILE__);
+			$this->db->update($this->info_table, $update,
+				array('info_id' => $info_id), __LINE__, __FILE__);
 		}
 
 		//echo "<p>soinfolog.write values= "; _debug_array($values);
@@ -589,38 +588,38 @@ 
 		{
 			$where = array('info_id' => $info_id);
 			if ($purge_cfs == 'ical') $where[] = "info_extra_name LIKE '#%'";
-			$this->db->delete($this->extra_table,$where,__LINE__,__FILE__);
+			$this->db->delete($this->extra_table, $where, __LINE__, __FILE__);
 		}
 		$to_delete = array();
-		foreach($values as $key => $val)
+		foreach ($values as $key => $val)
 		{
 			if ($key[0] != '#')
 			{
-				continue;	// no customfield
+				continue; // no customfield
 			}
-			$this->data[$key] = $val;	// update internal data
+			$this->data[$key] = $val; // update internal data
 
 			if ($val)
 			{
-				$this->db->insert($this->extra_table,array(
+				$this->db->insert($this->extra_table, array(
 						// store multivalued CalDAV properties as serialized array, everything else get comma-separated
-						'info_extra_value'	=> is_array($val) ? ($key[1] == '#' ? serialize($val) : implode(',',$val)) : $val,
-					),array(
+						'info_extra_value'	=> is_array($val) ? ($key[1] == '#' ? serialize($val) : implode(',', $val)) : $val,
+					), array(
 						'info_id'			=> $info_id,
-						'info_extra_name'	=> substr($key,1),
-					),__LINE__,__FILE__);
+						'info_extra_name'	=> substr($key, 1),
+					), __LINE__, __FILE__);
 			}
 			else
 			{
-				$to_delete[] = substr($key,1);
+				$to_delete[] = substr($key, 1);
 			}
 		}
 		if ($to_delete && !$purge_cfs)
 		{
-			$this->db->delete($this->extra_table,array(
+			$this->db->delete($this->extra_table, array(
 					'info_id'			=> $info_id,
 					'info_extra_name'	=> $to_delete,
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 		}
 		// echo "<p>soinfolog.write this->data= "; _debug_array($this->data);
 		//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning id=".$this->data['info_id']);
@@ -640,18 +639,18 @@ 
 	 * @param int|array $info_id id(s) of log-entry
 	 * @return int|array the number of sub-entries or indexed by info_id, if array as param given
 	 */
-	function anzSubs( $info_id )
+	function anzSubs($info_id)
 	{
 		if (!is_array($info_id) || !$info_id)
 		{
 			if ((int)$info_id <= 0) return 0;
 		}
 		$counts = array();
-		foreach($this->db->select($this->info_table,'info_id_parent,COUNT(*) AS info_anz_subs',array(
+		foreach ($this->db->select($this->info_table, 'info_id_parent,COUNT(*) AS info_anz_subs', array(
 			'info_id_parent' => $info_id,
-			"info_status != 'deleted'",	// dont count deleted subs as subs, as they are not shown by default
-		),__LINE__,__FILE__,
-			false,'GROUP BY info_id_parent','infolog') as $row)
+			"info_status != 'deleted'", // dont count deleted subs as subs, as they are not shown by default
+		), __LINE__, __FILE__,
+			false, 'GROUP BY info_id_parent', 'infolog') as $row)
 		{
 			$counts[$row['info_id_parent']] = (int)$row['info_anz_subs'];
 		}
@@ -691,102 +690,102 @@ 
 			$action = isset($action2app[$query['action']]) ? $action2app[$query['action']] : $query['action'];
 			if ($action)
 			{
-				$links = solink::get_links($action=='sp'?'infolog':$action,
-					is_array($query['action_id']) ? $query['action_id'] : explode(',',$query['action_id']),'infolog','',$query['col_filter']['info_status'] =='deleted');
+				$links = solink::get_links($action == 'sp' ? 'infolog' : $action,
+					is_array($query['action_id']) ? $query['action_id'] : explode(',', $query['action_id']), 'infolog', '', $query['col_filter']['info_status'] == 'deleted');
 
 				if (count($links))
 				{
-					$links = call_user_func_array('array_merge',$links);	// flatten the array
-					$link_extra = ($action == 'sp' ? 'OR' : 'AND')." main.info_id IN (".implode(',',$links).')';
+					$links = call_user_func_array('array_merge', $links); // flatten the array
+					$link_extra = ($action == 'sp' ? 'OR' : 'AND')." main.info_id IN (".implode(',', $links).')';
 				}
 			}
 		}
-		$sortbycf='';
-		if (!empty($query['order']) && (preg_match('/^[a-z_0-9, ]+$/i',$query['order']) || stripos($query['order'],'#')!==FALSE ) &&
-			(empty($query['sort']) || preg_match('/^(DESC|ASC)$/i',$query['sort'])))
+		$sortbycf = '';
+		if (!empty($query['order']) && (preg_match('/^[a-z_0-9, ]+$/i', $query['order']) || stripos($query['order'], '#') !== FALSE) &&
+			(empty($query['sort']) || preg_match('/^(DESC|ASC)$/i', $query['sort'])))
 		{
 			$order = array();
-			foreach(explode(',',$query['order']) as $val)
+			foreach (explode(',', $query['order']) as $val)
 			{
 				$val = trim($val);
 				if ($val[0] == '#')
 				{
-					$sortbycf = substr($val,1);
+					$sortbycf = substr($val, 1);
 					$val = "cfsortcrit IS NULL,cfsortcrit";
 				}
 				else
 				{
 					static $table_def = null;
-					if (is_null($table_def)) $table_def = $this->db->get_table_definitions('infolog',$this->info_table);
-					if (substr($val,0,5) != 'info_' && isset($table_def['fd']['info_'.$val])) $val = 'info_'.$val;
+					if (is_null($table_def)) $table_def = $this->db->get_table_definitions('infolog', $this->info_table);
+					if (substr($val, 0, 5) != 'info_' && isset($table_def['fd']['info_'.$val])) $val = 'info_'.$val;
 					if ($val == 'info_des' && $this->db->capabilities['order_on_text'] !== true)
 					{
 						if (!$this->db->capabilities['order_on_text']) continue;
 
-						$val = sprintf($this->db->capabilities['order_on_text'],$val);
+						$val = sprintf($this->db->capabilities['order_on_text'], $val);
 					}
 				}
 				$order[] = $val;
 			}
-			$ordermethod = 'ORDER BY ' . implode(',',$order) . ' ' . $query['sort'];
+			$ordermethod = 'ORDER BY '.implode(',', $order).' '.$query['sort'];
 		}
 		else
 		{
-			$ordermethod = 'ORDER BY info_datemodified DESC';   // newest first
+			$ordermethod = 'ORDER BY info_datemodified DESC'; // newest first
 		}
 		$filtermethod = $this->aclFilter($query['filter']);
 		if (!$query['col_filter']['info_status'])  $filtermethod .= $this->statusFilter($query['filter']);
 		$filtermethod .= $this->dateFilter($query['filter']);
-		$cfcolfilter=0;
+		$cfcolfilter = 0;
 		if (is_array($query['col_filter']))
 		{
-			foreach($query['col_filter'] as $col => $data)
+			foreach ($query['col_filter'] as $col => $data)
 			{
 				if (is_int($col))
 				{
 					$filtermethod .= ' AND '.$data;
 					continue;
 				}
-				if ($col[0] != '#' && substr($col,0,5) != 'info_' && isset($table_def['fd']['info_'.$col])) $col = 'info_'.$col;
-				if ((string)$data !== '' && preg_match('/^[a-z_0-9]+$/i',$col))
+				if ($col[0] != '#' && substr($col, 0, 5) != 'info_' && isset($table_def['fd']['info_'.$col])) $col = 'info_'.$col;
+				if ((string)$data !== '' && preg_match('/^[a-z_0-9]+$/i', $col))
 				{
 					switch ($col)
 					{
 						case 'info_responsible':
-							$data = (int) $data;
+							$data = (int)$data;
 							if (!$data) continue;
 							$filtermethod .= ' AND ('.$this->responsible_filter($data)." OR info_responsible='0' AND ".
-								$this->db->expression($this->info_table,array(
-									'info_owner' => $data > 0 ? $data : $GLOBALS['egw']->accounts->members($data,true)
+								$this->db->expression($this->info_table, array(
+									'info_owner' => $data > 0 ? $data : $GLOBALS['egw']->accounts->members($data, true)
 								)).')';
 							break;
 
 						case 'info_id':	// info_id itself is ambigous
-							$filtermethod .= ' AND '.$this->db->expression($this->info_table,'main.',array('info_id' => $data));
+							$filtermethod .= ' AND '.$this->db->expression($this->info_table, 'main.', array('info_id' => $data));
 							break;
 
 						default:
-							$filtermethod .= ' AND '.$this->db->expression($this->info_table,array($col => $data));
+							$filtermethod .= ' AND '.$this->db->expression($this->info_table, array($col => $data));
 							break;
 					}
 				}
-				if ($col[0] == '#' &&  $query['custom_fields'] && $data)
+				if ($col[0] == '#' && $query['custom_fields'] && $data)
 				{
 					$filtermethod .= " AND main.info_id IN (SELECT DISTINCT info_id FROM $this->extra_table WHERE ";
 					$custom_fields = config::get_customfields('infolog');
 
-					if($custom_fields[substr($col,1)]['type'] == 'select' && $custom_fields[substr($col,1)]['rows'] > 1)
+					if ($custom_fields[substr($col, 1)]['type'] == 'select' && $custom_fields[substr($col, 1)]['rows'] > 1)
 					{
 						// Multi-select - any entry with the filter value selected matches
 						$filtermethod .= $this->db->expression($this->extra_table, array(
-							'info_extra_name' => substr($col,1),
-							$this->db->concat("','",'info_extra_value',"','").' '.$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%,'.$data.',%'),
+							'info_extra_name' => substr($col, 1),
+							$this->db->concat("','", 'info_extra_value', "','").' '.$this->db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%,'.$data.',%'),
 						)).')';
 					}
 					else
 					{
-						$filtermethod .= $this->db->expression($this->extra_table,array(
-							'info_extra_name'  => substr($col,1),
+						$filtermethod .= $this->db->expression($this->extra_table, array(
+							'info_extra_name'  => substr($col, 1),
 							'info_extra_value' => $data,
 						)).')';
 					}
@@ -798,12 +797,12 @@ 
 
 		if ((int)$query['cat_id'])
 		{
-			$categories = new categories('','infolog');
+			$categories = new categories('', 'infolog');
 			$cats = $categories->return_all_children((int)$query['cat_id']);
-			$filtermethod .= ' AND info_cat'.(count($cats)>1? ' IN ('.implode(',',$cats).') ' : '='.(int)$query['cat_id']);
+			$filtermethod .= ' AND info_cat'.(count($cats) > 1 ? ' IN ('.implode(',', $cats).') ' : '='.(int)$query['cat_id']);
 		}
 		$join = $distinct = '';
-		if ($query['query']) $query['search'] = $query['query'];	// allow both names
+		if ($query['query']) $query['search'] = $query['query']; // allow both names
 		if ($query['search'])			  // we search in _from, _subject, _des and _extra_value for $query
 		{
 			/* new code join the index
@@ -823,7 +822,7 @@ 
 				ctype_digit($query['search'] ? ' UNION (SELECT '.$this->db->quote($query['search']).')' : '').')';
 			*/
 			/* old code searching the table direct */
-			$columns = array('info_from','info_addr','info_location','info_subject','info_extra_value');
+			$columns = array('info_from', 'info_addr', 'info_location', 'info_subject', 'info_extra_value');
 			// at the moment MaxDB 7.5 cant cast nor search text columns, it's suppost to change in 7.6
 			if ($this->db->capabilities['like_on_text']) $columns[] = 'info_des';
 
@@ -831,13 +830,13 @@ 
 			$so_sql = new so_sql('infolog', $this->info_table, $this->db);
 			$search = $so_sql->search2criteria($query['search'], $wildcard, $op, null, $columns);
 			$sql_query = 'AND ('.(is_numeric($query['search']) ? 'main.info_id='.(int)$query['search'].' OR ' : '').
-				implode($op, $search) .')';
+				implode($op, $search).')';
 
-			$join = ($cfcolfilter>0 ? '':'LEFT')." JOIN $this->extra_table ON main.info_id=$this->extra_table.info_id ";
+			$join = ($cfcolfilter > 0 ? '' : 'LEFT')." JOIN $this->extra_table ON main.info_id=$this->extra_table.info_id ";
 			// mssql and others cant use DISTICT if text columns (info_des) are involved
 			$distinct = $this->db->capabilities['distinct_on_text'] ? 'DISTINCT' : '';
 		}
-		$pid = 'AND ' . $this->db->expression($this->info_table,array('info_id_parent' => ($action == 'sp' ?$query['action_id'] : 0)));
+		$pid = 'AND '.$this->db->expression($this->info_table, array('info_id_parent' => ($action == 'sp' ? $query['action_id'] : 0)));
 
 		if ($GLOBALS['egw_info']['user']['preferences']['infolog']['listNoSubs'] != '1' && $action != 'sp' ||
 			(string)$query['col_filter']['info_id_parent'] !== '' ||
@@ -858,14 +857,14 @@ 
 			}
 			else
 			{
-				$query['total'] = $this->db->query($sql="SELECT $distinct main.info_id ".$sql_query,__LINE__,__FILE__)->NumRows();
+				$query['total'] = $this->db->query($sql = "SELECT $distinct main.info_id ".$sql_query, __LINE__, __FILE__)->NumRows();
 			}
 			$info_customfield = '';
 			if ($sortbycf != '')
 			{
 				$sort_col = "(SELECT DISTINCT info_extra_value FROM $this->extra_table sub2 WHERE sub2.info_id=main.info_id AND info_extra_name=".$this->db->quote($sortbycf).")";
 				if (!isset($custom_fields)) $custom_fields = config::get_customfields('infolog');
-				switch($custom_fields[$sortbycf]['type'])
+				switch ($custom_fields[$sortbycf]['type'])
 				{
 					case 'int':
 						$sort_col = $this->db->to_int($sort_col);
@@ -884,9 +883,9 @@ 
 					$query['start'] = 0;
 				}
 				$cols = isset($query['cols']) ? $query['cols'] : 'main.*';
-				if (is_array($cols)) $cols = implode(',',$cols);
-				$rs = $this->db->query($sql='SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query.$query['append'].' '.$ordermethod,__LINE__,__FILE__,
-					(int) $query['start'],isset($query['start']) ? (int) $query['num_rows'] : -1,false,egw_db::FETCH_ASSOC);
+				if (is_array($cols)) $cols = implode(',', $cols);
+				$rs = $this->db->query($sql = 'SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query.$query['append'].' '.$ordermethod, __LINE__, __FILE__,
+					(int)$query['start'], isset($query['start']) ? (int)$query['num_rows'] : -1, false, egw_db::FETCH_ASSOC);
 				//echo "<p>db::query('$sql',,,".(int)$query['start'].','.(isset($query['start']) ? (int) $query['num_rows'] : -1).")</p>\n";
 
 				if ($mysql_calc_rows)
@@ -901,9 +900,9 @@ 
 			{
 				return $rs;
 			}
-			foreach($rs as $info)
+			foreach ($rs as $info)
 			{
-				$info['info_responsible'] = $info['info_responsible'] ? explode(',',$info['info_responsible']) : array();
+				$info['info_responsible'] = $info['info_responsible'] ? explode(',', $info['info_responsible']) : array();
 
 				$ids[$info['info_id']] = $info;
 			}
@@ -916,19 +915,19 @@ 
 			}
 			// if no specific custom field is selected, show/query all custom fields
 			if ($ids && ($query['custom_fields'] || $query['csv_export'] ||
-				$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'],$index_load_cfs)))
+				$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'], $index_load_cfs)))
 			{
 				$where = array('info_id' => array_keys($ids));
-				if (!($query['csv_export'] || strchr(is_array($query['selectcols']) ? implode(',',$query['selectcols']):$query['selectcols'],'#') === false ||
-					$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'],$index_load_cfs)))
+				if (!($query['csv_export'] || strchr(is_array($query['selectcols']) ? implode(',', $query['selectcols']) : $query['selectcols'], '#') === false ||
+					$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'], $index_load_cfs)))
 				{
 					$where['info_extra_name'] = array();
-					foreach(is_array($query['selectcols']) ? $query['selectcols'] : explode(',',$query['selectcols']) as $col)
+					foreach (is_array($query['selectcols']) ? $query['selectcols'] : explode(',', $query['selectcols']) as $col)
 					{
-						if ($col[0] == '#') $where['info_extra_name'][] = substr($col,1);
+						if ($col[0] == '#') $where['info_extra_name'][] = substr($col, 1);
 					}
 				}
-				foreach($this->db->select($this->extra_table,'*',$where,__LINE__,__FILE__) as $row)
+				foreach ($this->db->select($this->extra_table, '*', $where, __LINE__, __FILE__) as $row)
 				{
 					$ids[$row['info_id']]['#'.$row['info_extra_name']] = $row['info_extra_value'];
 				}
@@ -953,29 +952,29 @@ 
 	{
 		$users = array();
 
-		$this->db->select($this->info_table,'DISTINCT info_owner',array(
-			str_replace(' AND ','',$this->statusFilter('open')),
-			'(ABS(info_startdate-'.time().')<'.(4*24*60*60).' OR '.	// start_day within 4 days
-			'ABS(info_enddate-'.time().')<'.(4*24*60*60).')',		// end_day within 4 days
-		),__LINE__,__FILE__);
+		$this->db->select($this->info_table, 'DISTINCT info_owner', array(
+			str_replace(' AND ', '', $this->statusFilter('open')),
+			'(ABS(info_startdate-'.time().')<'.(4 * 24 * 60 * 60).' OR '.// start_day within 4 days
+			'ABS(info_enddate-'.time().')<'.(4 * 24 * 60 * 60).')', // end_day within 4 days
+		), __LINE__, __FILE__);
 		while ($this->db->next_record())
 		{
 			$users[] = $this->db->f(0);
 		}
-		$this->db->select($this->info_table,'DISTINCT info_responsible',$this->statusFilter('open',false),__LINE__,__FILE__);
+		$this->db->select($this->info_table, 'DISTINCT info_responsible', $this->statusFilter('open', false), __LINE__, __FILE__);
 		while ($this->db->next_record())
 		{
-			foreach(explode(',',$this->db->f(0)) as $responsible)
+			foreach (explode(',', $this->db->f(0)) as $responsible)
 			{
 				if ($GLOBALS['egw']->accounts->get_type($responsible) == 'g')
 				{
-					$responsible = $GLOBALS['egw']->accounts->members($responsible,true);
+					$responsible = $GLOBALS['egw']->accounts->members($responsible, true);
 				}
 				if ($responsible)
 				{
-					foreach(is_array($responsible) ? $responsible : array($responsible) as $user)
+					foreach (is_array($responsible) ? $responsible : array($responsible) as $user)
 					{
-						if ($user && !in_array($user,$users)) $users[] = $user;
+						if ($user && !in_array($user, $users)) $users[] = $user;
 					}
 				}
 			}

Braces +118 added lines, -29 removed lines

@@ -85,10 +85,16 @@ 
 	 */
 	function is_responsible($info,$user=null)
 	{
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 
 		static $um_cache = array();
-		if ($user == $this->user) $user_and_memberships =& $um_cache[$user];
+		if ($user == $this->user)
+		{
+			$user_and_memberships =& $um_cache[$user];
+		}
 		if (!isset($user_and_memberships))
 		{
 			$user_and_memberships = $GLOBALS['egw']->accounts->memberships($user,true);
@@ -109,20 +115,32 @@ 
 	 */
 	function check_access( $info,$required_rights,$implicit_edit=false,array $grants=null,$user=null )
 	{
-		if (is_null($grants)) $grants = $this->grants;
-		if (!$user) $user = $this->user;
+		if (is_null($grants))
+		{
+			$grants = $this->grants;
+		}
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 
 		// if info-array, but no owner given, force reading of info from db
-		if (is_array($info) && !$info['info_owner']) $info = $info['info_id'];
+		if (is_array($info) && !$info['info_owner'])
+		{
+			$info = $info['info_id'];
+		}
 
 		if (is_array($info))
 		{
 
 		}
-		elseif ((int) $info != $this->data['info_id'])      	// already loaded?
+		elseif ((int) $info != $this->data['info_id'])
+		{
+			// already loaded?
 		{
 			// dont change our own internal data,
 			$backup_data = $this->data;
+		}
 			$info = $this->read(array('info_id'=>$info));
 			$this->data = $backup_data;
 		}
@@ -156,7 +174,10 @@ 
 	 */
 	function responsible_filter($users)
 	{
-		if (!$users) return '0';
+		if (!$users)
+		{
+			return '0';
+		}
 
 		$responsible = array();
 		foreach((array)$users as $user)
@@ -246,11 +267,14 @@ 
 						" OR info_status = 'offer' AND $public_access" : '').")".
 				                 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
 			}
-			elseif ($filter != 'my' && $filter != 'responsible')	// none --> all entrys user has rights to see
+			elseif ($filter != 'my' && $filter != 'responsible')
+			{
+				// none --> all entrys user has rights to see
 			{
 				if ($has_private_access)
 				{
 					$filtermethod .= " OR $has_private_access";
+			}
 				}
 				if (count($public_user_list))
 				{
@@ -496,7 +520,10 @@ 
 		{
 			$new_responsible = explode(',',$row['info_responsible']);
 			unset($new_responsible[array_search($args['account_id'],$new_responsible)]);
-			if ((int)$args['new_owner']) $new_responsible[] = (int)$args['new_owner'];
+			if ((int)$args['new_owner'])
+			{
+				$new_responsible[] = (int)$args['new_owner'];
+			}
 			$this->db->update($this->info_table,array(
 				'info_responsible' => implode(',',$new_responsible),
 			),array('info_id' => $row['info_id']),__LINE__,__FILE__,'infolog');
@@ -526,10 +553,13 @@ 
 		//echo "soinfolog::write(,$check_modified) values="; _debug_array($values);
 		$info_id = (int) $values['info_id'];
 
-		if (array_key_exists('info_responsible',$values))	// isset($values['info_responsible']) returns false for NULL!
+		if (array_key_exists('info_responsible',$values))
+		{
+			// isset($values['info_responsible']) returns false for NULL!
 		{
 			$values['info_responsible'] = $values['info_responsible'] ? implode(',',$values['info_responsible']) : '0';
 		}
+		}
 		$table_def = $this->db->get_table_definitions('infolog',$this->info_table);
 		$to_write = array();
 		foreach($values as $key => $val)
@@ -540,12 +570,18 @@ 
 			}
 		}
 		// writing no price as SQL NULL (required by postgres)
-		if ($to_write['info_price'] === '') $to_write['info_price'] = NULL;
+		if ($to_write['info_price'] === '')
+		{
+			$to_write['info_price'] = NULL;
+		}
 
 		if (($this->data['info_id'] = $info_id))
 		{
 			$where = array('info_id' => $info_id);
-			if ($check_modified) $where['info_datemodified'] = $check_modified;
+			if ($check_modified)
+			{
+				$where['info_datemodified'] = $check_modified;
+			}
 			if (!$this->db->update($this->info_table,$to_write,$where,__LINE__,__FILE__))
 			{
 				//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning false");
@@ -559,7 +595,11 @@ 
 		}
 		else
 		{
-			if (!isset($to_write['info_id_parent'])) $to_write['info_id_parent'] = 0;	// must not be null
+			if (!isset($to_write['info_id_parent']))
+			{
+				$to_write['info_id_parent'] = 0;
+			}
+			// must not be null
 
 			$this->db->insert($this->info_table,$to_write,false,__LINE__,__FILE__);
 			$info_id = $this->data['info_id'] = $this->db->get_last_insert_id($this->info_table,'info_id');
@@ -588,7 +628,10 @@ 
 		if ($purge_cfs)
 		{
 			$where = array('info_id' => $info_id);
-			if ($purge_cfs == 'ical') $where[] = "info_extra_name LIKE '#%'";
+			if ($purge_cfs == 'ical')
+			{
+				$where[] = "info_extra_name LIKE '#%'";
+			}
 			$this->db->delete($this->extra_table,$where,__LINE__,__FILE__);
 		}
 		$to_delete = array();
@@ -644,7 +687,10 @@ 
 	{
 		if (!is_array($info_id) || !$info_id)
 		{
-			if ((int)$info_id <= 0) return 0;
+			if ((int)$info_id <= 0)
+			{
+				return 0;
+			}
 		}
 		$counts = array();
 		foreach($this->db->select($this->info_table,'info_id_parent,COUNT(*) AS info_anz_subs',array(
@@ -717,11 +763,20 @@ 
 				else
 				{
 					static $table_def = null;
-					if (is_null($table_def)) $table_def = $this->db->get_table_definitions('infolog',$this->info_table);
-					if (substr($val,0,5) != 'info_' && isset($table_def['fd']['info_'.$val])) $val = 'info_'.$val;
+					if (is_null($table_def))
+					{
+						$table_def = $this->db->get_table_definitions('infolog',$this->info_table);
+					}
+					if (substr($val,0,5) != 'info_' && isset($table_def['fd']['info_'.$val]))
+					{
+						$val = 'info_'.$val;
+					}
 					if ($val == 'info_des' && $this->db->capabilities['order_on_text'] !== true)
 					{
-						if (!$this->db->capabilities['order_on_text']) continue;
+						if (!$this->db->capabilities['order_on_text'])
+						{
+							continue;
+						}
 
 						$val = sprintf($this->db->capabilities['order_on_text'],$val);
 					}
@@ -735,7 +790,10 @@ 
 			$ordermethod = 'ORDER BY info_datemodified DESC';   // newest first
 		}
 		$filtermethod = $this->aclFilter($query['filter']);
-		if (!$query['col_filter']['info_status'])  $filtermethod .= $this->statusFilter($query['filter']);
+		if (!$query['col_filter']['info_status'])
+		{
+			$filtermethod .= $this->statusFilter($query['filter']);
+		}
 		$filtermethod .= $this->dateFilter($query['filter']);
 		$cfcolfilter=0;
 		if (is_array($query['col_filter']))
@@ -747,14 +805,20 @@ 
 					$filtermethod .= ' AND '.$data;
 					continue;
 				}
-				if ($col[0] != '#' && substr($col,0,5) != 'info_' && isset($table_def['fd']['info_'.$col])) $col = 'info_'.$col;
+				if ($col[0] != '#' && substr($col,0,5) != 'info_' && isset($table_def['fd']['info_'.$col]))
+				{
+					$col = 'info_'.$col;
+				}
 				if ((string)$data !== '' && preg_match('/^[a-z_0-9]+$/i',$col))
 				{
 					switch ($col)
 					{
 						case 'info_responsible':
 							$data = (int) $data;
-							if (!$data) continue;
+							if (!$data)
+							{
+								continue;
+							}
 							$filtermethod .= ' AND ('.$this->responsible_filter($data)." OR info_responsible='0' AND ".
 								$this->db->expression($this->info_table,array(
 									'info_owner' => $data > 0 ? $data : $GLOBALS['egw']->accounts->members($data,true)
@@ -803,8 +867,14 @@ 
 			$filtermethod .= ' AND info_cat'.(count($cats)>1? ' IN ('.implode(',',$cats).') ' : '='.(int)$query['cat_id']);
 		}
 		$join = $distinct = '';
-		if ($query['query']) $query['search'] = $query['query'];	// allow both names
-		if ($query['search'])			  // we search in _from, _subject, _des and _extra_value for $query
+		if ($query['query'])
+		{
+			$query['search'] = $query['query'];
+		}
+		// allow both names
+		if ($query['search'])
+		{
+			// we search in _from, _subject, _des and _extra_value for $query
 		{
 			/* new code join the index
 			if (ctype_digit($query['search']))	// search by ticket-number (numbers get never indexed!)
@@ -824,8 +894,12 @@ 
 			*/
 			/* old code searching the table direct */
 			$columns = array('info_from','info_addr','info_location','info_subject','info_extra_value');
+		}
 			// at the moment MaxDB 7.5 cant cast nor search text columns, it's suppost to change in 7.6
-			if ($this->db->capabilities['like_on_text']) $columns[] = 'info_des';
+			if ($this->db->capabilities['like_on_text'])
+			{
+				$columns[] = 'info_des';
+			}
 
 			$wildcard = $op = null;
 			$so_sql = new so_sql('infolog', $this->info_table, $this->db);
@@ -864,7 +938,10 @@ 
 			if ($sortbycf != '')
 			{
 				$sort_col = "(SELECT DISTINCT info_extra_value FROM $this->extra_table sub2 WHERE sub2.info_id=main.info_id AND info_extra_name=".$this->db->quote($sortbycf).")";
-				if (!isset($custom_fields)) $custom_fields = config::get_customfields('infolog');
+				if (!isset($custom_fields))
+				{
+					$custom_fields = config::get_customfields('infolog');
+				}
 				switch($custom_fields[$sortbycf]['type'])
 				{
 					case 'int':
@@ -884,7 +961,10 @@ 
 					$query['start'] = 0;
 				}
 				$cols = isset($query['cols']) ? $query['cols'] : 'main.*';
-				if (is_array($cols)) $cols = implode(',',$cols);
+				if (is_array($cols))
+				{
+					$cols = implode(',',$cols);
+				}
 				$rs = $this->db->query($sql='SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query.$query['append'].' '.$ordermethod,__LINE__,__FILE__,
 					(int) $query['start'],isset($query['start']) ? (int) $query['num_rows'] : -1,false,egw_db::FETCH_ASSOC);
 				//echo "<p>db::query('$sql',,,".(int)$query['start'].','.(isset($query['start']) ? (int) $query['num_rows'] : -1).")</p>\n";
@@ -912,7 +992,10 @@ 
 			{
 				$config_data = config::read('infolog');
 				$index_load_cfs = $config_data['index_load_cfs'];
-				if (!is_array($index_load_cfs)) $index_load_cfs = explode(',', $index_load_cfs);
+				if (!is_array($index_load_cfs))
+				{
+					$index_load_cfs = explode(',', $index_load_cfs);
+				}
 			}
 			// if no specific custom field is selected, show/query all custom fields
 			if ($ids && ($query['custom_fields'] || $query['csv_export'] ||
@@ -925,7 +1008,10 @@ 
 					$where['info_extra_name'] = array();
 					foreach(is_array($query['selectcols']) ? $query['selectcols'] : explode(',',$query['selectcols']) as $col)
 					{
-						if ($col[0] == '#') $where['info_extra_name'][] = substr($col,1);
+						if ($col[0] == '#')
+						{
+							$where['info_extra_name'][] = substr($col,1);
+						}
 					}
 				}
 				foreach($this->db->select($this->extra_table,'*',$where,__LINE__,__FILE__) as $row)
@@ -975,7 +1061,10 @@ 
 				{
 					foreach(is_array($responsible) ? $responsible : array($responsible) as $user)
 					{
-						if ($user && !in_array($user,$users)) $users[] = $user;
+						if ($user && !in_array($user,$users))
+						{
+							$users[] = $user;
+						}
 					}
 				}
 			}