EGroupware / egroupware

remote.php

Spacing +6 added lines, -6 removed lines

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

Doc Comments +1 added lines, -1 removed lines

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

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

@@ -24,13 +24,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;
 }
@@ -38,20 +38,20 @@ 
 /*
 	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']);
+	list($app, $class, $method) = explode('.', $_GET['menuaction']);
 
 	// check if autoloadable class belongs to given app
 	if (substr($class, 0, 11) == 'EGroupware\\')
 	{
 		list(,$app_from_class) = explode('\\', strtolower($class));
 	}
-	elseif(strpos($class, '_') !== false)
+	elseif (strpos($class, '_') !== false)
 	{
 		list($app_from_class) = explode('_', $class);
 	}
-	if(!$app || !$class || !$method || isset($app_from_class) &&
+	if (!$app || !$class || !$method || isset($app_from_class) &&
 		isset($GLOBALS['egw_info']['apps'][$app_from_class]) && $app_from_class != $app)
 	{
 		$invalid_data = True;
@@ -63,7 +63,7 @@ 
 	$invalid_data = True;
 }
 //error_log(__METHOD__."$app,$class,$method");
-if($app == 'phpgwapi')
+if ($app == 'phpgwapi')
 {
 	$app = 'api';
 	$api_requested = True;
@@ -81,9 +81,9 @@ 
 // user changed timezone
 if (isset($_GET['tz']))
 {
-	Api\DateTime::setUserPrefs($_GET['tz']);	// throws exception, if tz is invalid
+	Api\DateTime::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 = Api\Header\Referer::get()))
@@ -94,30 +94,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 == 'api' && !$class && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !Api\Header\UserAgent::mobile()) && $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] == 'idots')
+if ($app == 'api' && !$class && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !Api\Header\UserAgent::mobile()) && $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] == 'idots')
 {
 	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(Framework::index($GLOBALS['egw_info']['user']['preferences']['common']['default_app']),$GLOBALS['egw_info']['user']['preferences']['common']['default_app']);
+		Egw::redirect(Framework::index($GLOBALS['egw_info']['user']['preferences']['common']['default_app']), $GLOBALS['egw_info']['user']['preferences']['common']['default_app']);
 	}
 	else
 	{
@@ -125,7 +125,7 @@ 
 	}
 }
 
-if($windowed && $_GET['cd'] == 'yes')
+if ($windowed && $_GET['cd'] == 'yes')
 {
 	$GLOBALS['egw_info']['flags'] = array(
 		'noheader'   => False,
@@ -137,7 +137,7 @@ 
 }
 else
 {
-	if($api_requested)
+	if ($api_requested)
 	{
 		$app = 'phpgwapi';
 	}
@@ -150,7 +150,7 @@ 
 	{
 		$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);
@@ -161,9 +161,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',
@@ -174,9 +174,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',
@@ -186,7 +186,7 @@ 
 				));
 			}
 		}
-		if(@is_object($GLOBALS['egw']->log))
+		if (@is_object($GLOBALS['egw']->log))
 		{
 			$GLOBALS['egw']->log->commit();
 		}
@@ -194,7 +194,7 @@ 
 		$GLOBALS['egw']->redirect_link('/home/index.php');
 	}
 
-	if(!isset($GLOBALS['egw_info']['nofooter']))
+	if (!isset($GLOBALS['egw_info']['nofooter']))
 	{
 		echo $GLOBALS['egw']->framework->footer();
 	}

groupdav.php

Spacing +5 added lines, -5 removed lines

@@ -22,10 +22,10 @@ 
 
 // switching off output compression for Lighttpd and HTTPS, as it makes problems with TB Lightning
 if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' &&
-	strpos($_SERVER['SERVER_SOFTWARE'],'lighttpd/1.4') === 0 &&
-	strpos($_SERVER['HTTP_USER_AGENT'],'Lightning') !== false)
+	strpos($_SERVER['SERVER_SOFTWARE'], 'lighttpd/1.4') === 0 &&
+	strpos($_SERVER['HTTP_USER_AGENT'], 'Lightning') !== false)
 {
-	ini_set('zlib.output_compression',0);
+	ini_set('zlib.output_compression', 0);
 }
 //error_log("HTTPS='$_SERVER[HTTPS]', SERVER_SOFTWARE='$_SERVER[SERVER_SOFTWARE]', HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]', REQUEST_METHOD='$_SERVER[REQUEST_METHOD]' --> zlib.output_compression=".ini_get('zlib.output_compression'));
 
@@ -35,9 +35,9 @@ 
 	'flags' => array(
 		'noheader'  => True,
 		'currentapp' => 'groupdav',
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
 		'autocreate_session_callback' => 'EGroupware\\Api\\Header\\Authenticate::autocreate_session_callback',
-		'auth_realm' => 'EGroupware CalDAV/CardDAV/GroupDAV server',	// cant use groupdav::REALM as autoloading and include path not yet setup!
+		'auth_realm' => 'EGroupware CalDAV/CardDAV/GroupDAV server', // cant use groupdav::REALM as autoloading and include path not yet setup!
 	)
 );
 // if you move this file somewhere else, you need to adapt the path to the header!

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 +1 added lines, -1 removed lines

@@ -27,5 +27,5 @@
 /* Dependencies for this app to work */
 $setup_info['home']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('16.1')
+	'versions' => array('16.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(

Braces +20 added lines, -10 removed lines

@@ -15,7 +15,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:
@@ -79,7 +80,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 
 		$this->definition = $_definition;
 
@@ -113,7 +115,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Infolog iCal import');
 	}
 
@@ -122,7 +125,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports TODOs into Infolog from an iCal File.");
 	}
 
@@ -131,7 +135,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'ics';
 	}
 
@@ -147,7 +152,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -156,7 +162,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -168,7 +175,8 @@ 
 	 *       record_# => warning message
 	 *       )
 	 */
-	public function get_warnings() {
+	public function get_warnings()
+	{
 		return $this->warnings;
 	}
 
@@ -180,7 +188,8 @@ 
 	 *       record_# => error message
 	 *       )
 	 */
-	public function get_errors() {
+	public function get_errors()
+	{
 		return $this->errors;
 	}
 
@@ -192,7 +201,8 @@ 
 	 *       action => record count
 	 * )
 	 */
-	public function get_results() {
+	public function get_results()
+	{
 		return $this->results;
 	}
 }

infolog/inc/class.infolog_widget.inc.php

Spacing +8 added lines, -8 removed lines

@@ -79,17 +79,17 @@ 
 
 	public function get_entry($value, array $attrs)
 	{
-		unset($attrs);	// not used
+		unset($attrs); // not used
 
 		// Already done
-		if (is_array($value) && !(array_key_exists('app',$value) && array_key_exists('id', $value))) return $value;
+		if (is_array($value) && !(array_key_exists('app', $value) && array_key_exists('id', $value))) return $value;
 
 		// Link entry, already in array format
-		if(is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value)) $value = $value['id'];
+		if (is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value)) $value = $value['id'];
 
 		// Link entry, in string format
-		if (substr($value,0,8) == 'infolog:') $value = substr($value,8);
-		if($value)
+		if (substr($value, 0, 8) == 'infolog:') $value = substr($value, 8);
+		if ($value)
 		{
 			return $this->infolog->read($value);
 		}
@@ -98,7 +98,7 @@ 
 
 	function _get_fields()
 	{
-		static $fields=null;
+		static $fields = null;
 
 		if (!isset($fields))
 		{
@@ -135,7 +135,7 @@ 
 	//			'info_confirm' => lang('Confirm'),
 	//			'info_custom_from' => lang('Custom from'),
 			);
-			foreach(Api\Storage\Customfields::get('infolog') as $name => $data)
+			foreach (Api\Storage\Customfields::get('infolog') as $name => $data)
 			{
 				$fields['#'.$name] = lang($data['label']);
 			}
@@ -145,4 +145,4 @@ 
 }
 
 // register widgets for etemplate2
-Etemplate\Widget::registerWidget('infolog_widget',array('infolog-value', 'infolog-fields'));
\ No newline at end of file
+Etemplate\Widget::registerWidget('infolog_widget', array('infolog-value', 'infolog-fields'));
\ No newline at end of file

Braces +12 added lines, -3 removed lines

@@ -82,13 +82,22 @@
 		unset($attrs);	// not used
 
 		// Already done
-		if (is_array($value) && !(array_key_exists('app',$value) && array_key_exists('id', $value))) return $value;
+		if (is_array($value) && !(array_key_exists('app',$value) && array_key_exists('id', $value)))
+		{
+			return $value;
+		}
 
 		// Link entry, already in array format
-		if(is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value)) $value = $value['id'];
+		if(is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value))
+		{
+			$value = $value['id'];
+		}
 
 		// Link entry, in string format
-		if (substr($value,0,8) == 'infolog:') $value = substr($value,8);
+		if (substr($value,0,8) == 'infolog:')
+		{
+			$value = substr($value,8);
+		}
 		if($value)
 		{
 			return $this->infolog->read($value);

infolog/inc/class.infolog_datasource.inc.php

Spacing +24 added lines, -24 removed lines

@@ -49,7 +49,7 @@ 
 		{
 			$GLOBALS['infolog_bo'] = new infolog_bo();
 		}
-		$this->infolog_bo =& $GLOBALS['infolog_bo'];
+		$this->infolog_bo = & $GLOBALS['infolog_bo'];
 	}
 
 	/**
@@ -62,13 +62,13 @@ 
 	{
 		if (!is_array($data_id))
 		{
-			$data =& $this->infolog_bo->read((int) $data_id);
+			$data = & $this->infolog_bo->read((int)$data_id);
 
 			if (!is_array($data)) return false;
 		}
 		else
 		{
-			$data =& $data_id;
+			$data = & $data_id;
 		}
 		return array(
 			'pe_title'        => $this->infolog_bo->link_title($data),
@@ -99,33 +99,33 @@ 
 	 * @param array $extra =null data of target-project, atm not used by the infolog datasource
 	 * @return array/boolean array(info_id,link_id) on success, false otherwise
 	 */
-	function copy($element,$target,$extra=null)
+	function copy($element, $target, $extra = null)
 	{
-		unset($extra);	// not used, but required by function signature
+		unset($extra); // not used, but required by function signature
 
-		$info =& $this->infolog_bo->read((int) $element['pe_app_id']);
+		$info = & $this->infolog_bo->read((int)$element['pe_app_id']);
 
 		if (!is_array($info)) return false;
 
 		// unsetting info_link_id and evtl. info_from
 		if ($info['info_link_id'])
 		{
-			$this->infolog_bo->link_id2from($info);		// unsets info_from and sets info_link_target
+			$this->infolog_bo->link_id2from($info); // unsets info_from and sets info_link_target
 			unset($info['info_link_id']);
 		}
 		// we need to unset a view fields, to get a new entry
-		foreach(array('info_id','info_owner','info_modified','info_modifierer') as $key)
+		foreach (array('info_id', 'info_owner', 'info_modified', 'info_modifierer') as $key)
 		{
 			unset($info[$key]);
 		}
-		if(!($info['info_id'] = $this->infolog_bo->write($info))) return false;
+		if (!($info['info_id'] = $this->infolog_bo->write($info))) return false;
 
 		// link the new infolog against the project and setting info_link_id and evtl. info_from
 		$old_link = $info['info_link_id'] ? Link::get_link($info['info_link']) : $info['info_link'];
-		$info['info_link_id'] = Link::link('projectmanager',$target,'infolog',$info['info_id'],$element['pe_remark'],0,0,1);
+		$info['info_link_id'] = Link::link('projectmanager', $target, 'infolog', $info['info_id'], $element['pe_remark'], 0, 0, 1);
 		if (!$info['info_from'] || $old_link && $info['info_from'] == $old_link['title'])
 		{
-			$info['info_from'] = Link::title('projectmanager',$target);
+			$info['info_from'] = Link::title('projectmanager', $target);
 		}
 		if ($info['info_status'] == 'template')
 		{
@@ -134,22 +134,22 @@ 
 		$this->infolog_bo->write($info);
 
 		// creating again all links, beside the one to the source-project
-		foreach(Link::get_links('infolog',$element['pe_app_id']) as $link)
+		foreach (Link::get_links('infolog', $element['pe_app_id']) as $link)
 		{
-			if ($link['app'] == 'projectmanager' && $link['id'] == $element['pm_id'] ||		// ignoring the source project
+			if ($link['app'] == 'projectmanager' && $link['id'] == $element['pm_id'] || // ignoring the source project
 				$link['app'] == Link::VFS_APPNAME)					// ignoring files attachments for now
 			{
 				continue;
 			}
-			Link::link('infolog',$info['info_id'],$link['app'],$link['id'],$link['remark']);
+			Link::link('infolog', $info['info_id'], $link['app'], $link['id'], $link['remark']);
 		}
-		$ret = array($info['info_id'],$info['info_link_id']);
+		$ret = array($info['info_id'], $info['info_link_id']);
 
 		// if we have a parent set, return our callback to modify the parent id, after all entries are copied
 		if ($info['info_id_parent'])
 		{
-			$ret[] = array($this,'copy_callback');	// callback
-			$ret[] = array($info['info_id'],$info['info_id_parent']);	// $param
+			$ret[] = array($this, 'copy_callback'); // callback
+			$ret[] = array($info['info_id'], $info['info_id_parent']); // $param
 		}
 		return $ret;
 	}
@@ -164,11 +164,11 @@ 
 	public function copy_callback(array $param, array $apps_copied)
 	{
 		//error_log(__METHOD__."(".array2string($param).', '.array2string($apps_copied).')');
-		list($info_id,$parent_id) = $param;
+		list($info_id, $parent_id) = $param;
 		if (isset($apps_copied['infolog'][$parent_id]) && ($info = $this->infolog_bo->read($info_id)))
 		{
 			$info['info_id_parent'] = $apps_copied['infolog'][$parent_id];
-			$this->infolog_bo->write($info,false,true,true,true);	// no default and no notification
+			$this->infolog_bo->write($info, false, true, true, true); // no default and no notification
 		}
 	}
 
@@ -186,7 +186,7 @@ 
 			$GLOBALS['infolog_bo'] = new infolog_bo();
 		}
 		// dont delete infolog, which are linked to other elements, but their project
-		if (count(Link::get_links('infolog',$id)) > 1)
+		if (count(Link::get_links('infolog', $id)) > 1)
 		{
 			return false;
 		}
@@ -200,16 +200,16 @@ 
 	 * @param string $status
 	 * @return boolean true if status changed, false otherwise
 	 */
-	function change_status($id,$status)
+	function change_status($id, $status)
 	{
 		//error_log("datasource_infolog::change_status($id,$status)");
-		if (($info = $this->infolog_bo->read($id)) && $this->infolog_bo->check_access($info,Acl::EDIT))
+		if (($info = $this->infolog_bo->read($id)) && $this->infolog_bo->check_access($info, Acl::EDIT))
 		{
-			if ($status == 'active' && in_array($info['info_status'],array('template','nonactive','archive')))
+			if ($status == 'active' && in_array($info['info_status'], array('template', 'nonactive', 'archive')))
 			{
 				$status = $this->infolog_bo->activate($info);
 			}
-			if($info['info_status'] != $status && isset($this->infolog_bo->status[$info['info_type']][$status]))
+			if ($info['info_status'] != $status && isset($this->infolog_bo->status[$info['info_type']][$status]))
 			{
 				//error_log("datasource_infolog::change_status($id,$status) setting status from ".$info['info_status']);
 				$info['info_status'] = $status;

Braces +16 added lines, -4 removed lines

@@ -64,7 +64,10 @@ 
 		{
 			$data =& $this->infolog_bo->read((int) $data_id);
 
-			if (!is_array($data)) return false;
+			if (!is_array($data))
+			{
+				return false;
+			}
 		}
 		else
 		{
@@ -105,7 +108,10 @@ 
 
 		$info =& $this->infolog_bo->read((int) $element['pe_app_id']);
 
-		if (!is_array($info)) return false;
+		if (!is_array($info))
+		{
+			return false;
+		}
 
 		// unsetting info_link_id and evtl. info_from
 		if ($info['info_link_id'])
@@ -118,7 +124,10 @@ 
 		{
 			unset($info[$key]);
 		}
-		if(!($info['info_id'] = $this->infolog_bo->write($info))) return false;
+		if(!($info['info_id'] = $this->infolog_bo->write($info)))
+		{
+			return false;
+		}
 
 		// link the new infolog against the project and setting info_link_id and evtl. info_from
 		$old_link = $info['info_link_id'] ? Link::get_link($info['info_link']) : $info['info_link'];
@@ -137,10 +146,13 @@ 
 		foreach(Link::get_links('infolog',$element['pe_app_id']) as $link)
 		{
 			if ($link['app'] == 'projectmanager' && $link['id'] == $element['pm_id'] ||		// ignoring the source project
-				$link['app'] == Link::VFS_APPNAME)					// ignoring files attachments for now
+				$link['app'] == Link::VFS_APPNAME)
+			{
+				// ignoring files attachments for now
 			{
 				continue;
 			}
+			}
 			Link::link('infolog',$info['info_id'],$link['app'],$link['id'],$link['remark']);
 		}
 		$ret = array($info['info_id'],$info['info_link_id']);