diff --git a/about.php b/about.php
index fefaa531b8..6353e9f64c 100644
--- a/about.php
+++ b/about.php
@@ -1,78 +1,128 @@
 <?php
-	/**************************************************************************\
-	* phpGroupWare                                                             *
-	* http://www.phpgroupware.org                                              *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-	/* $Id$ */
+  /**************************************************************************\
+  * phpGroupWare                                                             *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
 
 	$GLOBALS['phpgw_info'] = array();
 	$GLOBALS['phpgw_info']['flags']['currentapp'] = 'about';
+	$GLOBALS['phpgw_info']['flags']['disable_Template_class'] = True;
+	$GLOBALS['phpgw_info']['flags']['noheader'] = True;
 	include('header.inc.php');
 
 	$app = $HTTP_GET_VARS['app'];
-
-	$GLOBALS['phpgw']->xslttpl->add_file(array('about'));
-
-	if ($app == 'phpGroupWare' || $app == 'about')
+	if ($app)
 	{
-		$app = 'phpgwapi';
-	}
-
-	$setup_file = PHPGW_INCLUDE_ROOT . '/' . $app . '/setup/setup.inc.php';
-
-	if (@file_exists($setup_file))
-	{
-		include($setup_file);
-		
-		$fields = array
-		(
-			'version',
-			'description',
-			'note',
-			'author',
-			'license',
-			'based_on',
-			'maintainer'
-		);
-		while (list(,$field) = each($fields))
+		if (!($included = $GLOBALS['phpgw']->hooks->single('about',$app)))
 		{
-			$app_data[$field] = $setup_info[$app][$field];
-
-			if ($field == 'description')
-			{
-				$app_data[$field] = lang($setup_info[$app][$field]);
-			}
-		}
-
-		if (isset($app_data['note']) && !empty($app_data['note']))
-		{
-			$app_data['note'] = lang($app_data['note']);
-		}
-	}
-
-	$data = array
-	(
-		'phpgw_logo'			=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
-		'lang_url_statustext'	=> lang('phpGroupWare --> homepage'),
-		'lang_version'			=> lang('version'),
-		'phpgw_version'			=> 'phpGroupWare API ' . $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'],
-		'phpgw_descr'			=> lang('is a multi-user, web-based groupware suite written in PHP'), 
-		'about_app'				=> $app_data + array
-		(
-			'title'				=> lang($app),
-			'icon'				=> $GLOBALS['phpgw']->common->image($app,'navbar','',True),
-			'lang_version'		=> lang('version'),
-			'lang_author'		=> lang('author'),
-			'lang_based_on'		=> lang('based on'),
-			'lang_maintainer'	=> lang('maintainer'),
-			'lang_license'		=> lang('license')
-		)
+function about_app()
+{
+	global $app;
+	$icon = $GLOBALS['phpgw']->common->image($app,'navbar.gif');
+	include (PHPGW_INCLUDE_ROOT . "/$app/setup/setup.inc.php");
+	$info = $setup_info[$app];
+	$info['title'] = $GLOBALS['phpgw_info']['apps'][$app]['title'];
+	$other_infos = array(
+		'author'     => lang('Author'),
+		'maintainer' => lang('Maintainer'),
+		'version'    => lang('Version'),
+		'license'    => lang('License')
 	);
 
-	$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('about_data' => $data));
+	$s = "<table width='70%' cellpadding='4'>\n<tr><td align='right'><img src='$icon'></td><td align='left'><b>$info[title]</b></td></tr>";
+	
+	if ($info['description'])
+	{
+		$info['description'] = lang($info['description']);
+		$s .= "<tr><td colspan='2' align='center'>$info[description]</td></tr>\n";
+		if ($info['note'])
+		{
+			$info['note'] = lang($info['note']);
+			$s .= "<tr><td colspan='2' align='center'><i>$info[note]</i></td></tr>\n";
+		}
+	}
+	foreach ($other_infos as $key => $val)
+	{
+		if (isset($info[$key]))
+		{
+			$s .= "<tr><td width='50%' align='right'>$val</td><td>";
+			$infos = $info[$key];
+			for ($n = 0; is_array($info[$key][$n]) && ($infos = $info[$key][$n]) || !$n; ++$n)
+			{
+				if (!is_array($infos) && isset($info[$key.'_email']))
+				{
+					$infos = array('email' => $info[$key.'_email'],'name' => $infos);
+				}
+				if (is_array($infos))
+				{
+					$names = explode('<br>',$infos['name']);
+					$emails = split('@|<br>',$infos['email']);
+					if (count($names) < count($emails)/2)
+					{
+						$names = '';
+					}
+					$infos = '';
+					while (list($user,$domain) = $emails)
+					{
+						if ($infos) $infos .= '<br>';
+						$name = $names ? array_shift($names) : $user;
+						$infos .= "<a href='mailto:$user at $domain' onClick=\"document.location='mailto:$user'+'@'+'$domain'; return false;\">$name</a>";
+						array_shift($emails); array_shift($emails);
+					}
+				}
+				$s .= ($n ? '<br>' : '') . $infos;
+			}
+			$s .= "</td></tr>\n";
+		}
+	}
+	$s .= "</table>\n";
+
+	return $s;
+}
+			$api_only = !($included = file_exists(PHPGW_INCLUDE_ROOT . "/$app/setup/setup.inc.php"));
+		}
+	}
+	else
+	{
+		$api_only = True;
+	}
+
+	$tpl = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi'));
+	$tpl->set_file(array(
+		'phpgw_about'         => 'about.tpl',
+		'phpgw_about_unknown' => 'about_unknown.tpl'
+	));
+
+	$tpl->set_var('webserver_url',$GLOBALS['phpgw']->common->get_image_path('phpgwapi'));
+	$tpl->set_var('phpgw_version','phpGroupWare API version ' . $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+	if ($included)
+	{
+		$tpl->set_var('phpgw_app_about',about_app('',''));
+		//about_app($tpl,"phpgw_app_about");
+	}
+	else
+	{
+		if ($api_only)
+		{
+			$tpl->set_var('phpgw_app_about','');
+		}
+		else
+		{
+			$tpl->set_var('app_header',$app);
+			$tpl->parse('phpgw_app_about','phpgw_about_unknown');
+		}
+	}
+
+	$title = isset($GLOBALS['phpgw_info']['apps'][$app]) ? $GLOBALS['phpgw_info']['apps'][$app]['title'] : 'phpGroupWare';
+	$GLOBALS['phpgw_info']['flags']['app_header'] = lang('About %1',$title);
+	$GLOBALS['phpgw']->common->phpgw_header();
+	$tpl->pparse('out','phpgw_about');
+	$GLOBALS['phpgw']->common->phpgw_footer();
 ?>
diff --git a/addressbook/admin.php b/addressbook/admin.php
new file mode 100644
index 0000000000..78ac03a64e
--- /dev/null
+++ b/addressbook/admin.php
@@ -0,0 +1,69 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - Address Book                                              *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
+
+	$phpgw_info['flags'] = array(
+		'currentapp'  => 'addressbook', 
+		'noheader'    => True, 
+		'nonavbar'    => True, 
+		'noappheader' => True,
+		'noappfooter' => True,
+		'enable_config_class'     => True,
+		'enable_nextmatchs_class' => True
+	);
+
+	include('../header.inc.php');
+
+	$phpgw->config->read_repository();
+
+	if ($submit)
+	{
+		if ($usecountrylist)
+		{
+			$phpgw->config->config_data['countrylist'] = True;
+		}
+		else
+		{
+			unset($phpgw->config->config_data['countrylist']);
+		}
+
+		$phpgw->config->save_repository(True);
+		Header('Location: ' . $phpgw->link('/admin/index.php'));
+	}
+
+	$phpgw->common->phpgw_header();
+	echo parse_navbar();
+
+	$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+	$t->set_file(array('admin' => 'admin.tpl'));
+
+	$t->set_var('action_url',$phpgw->link('/addressbook/admin.php'));
+
+	$tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
+	$t->set_var('tr_color',$tr_color);
+
+	$t->set_var('lang_countrylist',lang('Use Country List'));
+	if ($phpgw->config->config_data['countrylist'])
+	{
+		$t->set_var('countrylist',' checked');
+	}
+	else
+	{
+		$t->set_var('countrylist','');
+	}
+
+	$t->set_var('lang_admin',lang('Addressbook').' '.lang('Admin'));
+	$t->set_var('lang_submit',lang('submit'));
+
+	$t->pparse('out','admin');
+	$phpgw->common->phpgw_footer();
+?>
diff --git a/addressbook/csv_import.php b/addressbook/csv_import.php
index 7718b015c9..01cacefa28 100644
--- a/addressbook/csv_import.php
+++ b/addressbook/csv_import.php
@@ -12,27 +12,32 @@
 
   /* $Id$ */
 
-	$GLOBALS['phpgw_info'] = array();
-	$GLOBALS['phpgw_info']['flags']['currentapp'] = 'addressbook';
-	$GLOBALS['phpgw_info']['flags']['enable_contacts_class'] = True;
+	$GLOBALS['phpgw_info']['flags'] = array(
+		'currentapp' => 'addressbook',
+		'noheader'   => True,
+		'enable_contacts_class' => True,
+	);
 	include('../header.inc.php');
 
+	$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Import CSV-File into Addressbook');
+	$GLOBALS['phpgw']->common->phpgw_header();
+
 	$GLOBALS['phpgw']->contacts = createobject('phpgwapi.contacts');
 
-	$GLOBALS['phpgw']->template->set_file(array('import_t' => 'csv_import.tpl'));
-	$GLOBALS['phpgw']->template->set_block('import_t','filename');
-	$GLOBALS['phpgw']->template->set_block('import_t','fheader');
-	$GLOBALS['phpgw']->template->set_block('import_t','fields');
-	$GLOBALS['phpgw']->template->set_block('import_t','ffooter');
-	$GLOBALS['phpgw']->template->set_block('import_t','imported');
-	$GLOBALS['phpgw']->template->set_block('import_t','import');
+	$GLOBALS['phpgw']->template->set_file(array('import' => 'csv_import.tpl'));
+	$GLOBALS['phpgw']->template->set_block('import','filename','filenamehandle');
+	$GLOBALS['phpgw']->template->set_block('import','fheader','fheaderhandle');
+	$GLOBALS['phpgw']->template->set_block('import','fields','fieldshandle');
+	$GLOBALS['phpgw']->template->set_block('import','ffooter','ffooterhandle');
+	$GLOBALS['phpgw']->template->set_block('import','imported','importedhandle');
 
-	if($action == 'download' && (!$fieldsep || !$csvfile || !($fp=fopen($csvfile,'rb'))))
+	$csvfile  = isset($_POST['csvfile']) ? $_POST['csvfile'] : $_FILES['csvfile']['tmp_name'];
+
+	if($_POST['action'] == 'download' && (!$_POST['fieldsep'] || !$csvfile || !($fp=fopen($csvfile,'rb'))))
 	{
-		$action = '';
+		$_POST['action'] = '';
 	}
 	$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/addressbook/csv_import.php'));
-	$GLOBALS['phpgw']->template->set_var('lang_addr_action',lang('Import CSV-File into Addressbook'));
 
 	$PSep = '||'; // Pattern-Separator, separats the pattern-replacement-pairs in trans
 	$ASep = '|>'; // Assignment-Separator, separats pattern and replacesment
@@ -125,18 +130,18 @@
 		return  $id_str;
 	}
 
-	switch($action)
+	switch($_POST['action'])
 	{
 		case '':	// Start, ask Filename
 			$GLOBALS['phpgw']->template->set_var('lang_csvfile',lang('CSV-Filename'));
 			$GLOBALS['phpgw']->template->set_var('lang_fieldsep',lang('Fieldseparator'));
-			$GLOBALS['phpgw']->template->set_var('fieldsep',$fieldsep ? $fieldsep : ',');
+			$GLOBALS['phpgw']->template->set_var('fieldsep',$_POST['fieldsep'] ? $_POST['fieldsep'] : ',');
 			$GLOBALS['phpgw']->template->set_var('submit',lang('Download'));
 			$GLOBALS['phpgw']->template->set_var('csvfile',$csvfile);
 			$GLOBALS['phpgw']->template->set_var('enctype','ENCTYPE="multipart/form-data"');
 			$hiddenvars .= '<input type="hidden" name="action" value="download">'."\n";
 
-			$GLOBALS['phpgw']->template->parse('rows','filename');
+			$GLOBALS['phpgw']->template->parse('filenamehandle','filename');
 			break;
 
 		case 'download':
@@ -151,9 +156,9 @@
 			$GLOBALS['phpgw']->template->set_var('lang_translation',lang("Translation").' <a href="#help">'.lang('help').'</a>');
 			$GLOBALS['phpgw']->template->set_var('submit',lang('Import'));
 			$GLOBALS['phpgw']->template->set_var('lang_debug',lang('Test Import (show importable records <u>only</u> in browser)'));
-			$GLOBALS['phpgw']->template->parse('rows','fheader');
+			$GLOBALS['phpgw']->template->parse('fheaderhandle','fheader');
 			$hiddenvars .= '<input type="hidden" name="action" value="import">'."\n"
-				. '<input type="hidden" name="fieldsep" value="'.$fieldsep."\">\n";
+				. '<input type="hidden" name="fieldsep" value="'.$_POST['fieldsep']."\">\n";
 
 			$addr_names = $GLOBALS['phpgw']->contacts->stock_contact_fields + array(
 				'cat_id' => 'Categories: @cat_id(Cat1,Cat2)',
@@ -161,8 +166,7 @@
 				'owner'  => 'Owner: defaults to user',
 				'address2' => 'address line 2',
 				'address3' => 'address line 3',
-			 	'ophone'   => 'Other Phone',
-				'ab_id'    => 'Address Id: @addr_id(n_family,n_given,org_name)'
+			 	'ophone'   => 'Other Phone'
 			);
 			$config = CreateObject('phpgwapi.config','addressbook');
 			$config->read_repository();
@@ -172,7 +176,7 @@
 			}
 			unset($config);
 
-			while(list($field,$name) = each($addr_names))
+			foreach($addr_names as $field => $name)
 			{
 				if($dn = display_name($field))
 				{
@@ -180,23 +184,22 @@
 				}
 			}
 			$addr_name_options = "<option value=\"\">none\n";
-			reset($addr_names);
-			while(list($field,$name) = each($addr_names))
+			foreach($addr_names as $field => $name)
 			{
 				$addr_name_options .= "<option value=\"$field\">".$GLOBALS['phpgw']->strip_html($name)."\n";
 			}
-			$csv_fields = fgetcsv($fp,8000,$fieldsep);
+			$csv_fields = fgetcsv($fp,8000,$_POST['fieldsep']);
 			$csv_fields[] = 'no CSV 1'; // eg. for static assignments
 			$csv_fields[] = 'no CSV 2';
 			$csv_fields[] = 'no CSV 3';
-			while(list($csv_idx,$csv_field) = each($csv_fields))
+			foreach($csv_fields as $csv_idx => $csv_field)
 			{
 				$GLOBALS['phpgw']->template->set_var('csv_field',$csv_field);
 				$GLOBALS['phpgw']->template->set_var('csv_idx',$csv_idx);
 				if($def = $defaults[$csv_field])
 				{
-					list($addr,$trans) = explode($PSep,$def,2);
-					$GLOBALS['phpgw']->template->set_var('trans',$trans);
+					list($addr,$_POST['trans']) = explode($PSep,$def,2);
+					$GLOBALS['phpgw']->template->set_var('trans',$_POST['trans']);
 					$GLOBALS['phpgw']->template->set_var('addr_fields',str_replace('="'.$addr.'">','="'.$addr.'" selected>',$addr_name_options));
 				}
 				else
@@ -204,19 +207,19 @@
 					$GLOBALS['phpgw']->template->set_var('trans','');
 					$GLOBALS['phpgw']->template->set_var('addr_fields',$addr_name_options);
 				}
-				$GLOBALS['phpgw']->template->parse('rows','fields',True); 
+				$GLOBALS['phpgw']->template->parse('fieldshandle','fields',True); 
 			}
 			$GLOBALS['phpgw']->template->set_var('lang_start',lang('Startrecord'));
-			$GLOBALS['phpgw']->template->set_var('start',$start);
+			$GLOBALS['phpgw']->template->set_var('start',$_POST['start']);
 			$GLOBALS['phpgw']->template->set_var('lang_max',lang('Number of records to read (<=200)'));
 			$GLOBALS['phpgw']->template->set_var('max',200);
-			$GLOBALS['phpgw']->template->parse('rows','ffooter',True); 
+			$GLOBALS['phpgw']->template->parse('ffooterhandle','ffooter'); 
 			fclose($fp);
 			$old = $csvfile; $csvfile = $GLOBALS['phpgw_info']['server']['temp_dir'].'/addrbook_import_'.basename($csvfile);
 			rename($old,$csvfile); 
 			$hiddenvars .= '<input type="hidden" name="csvfile" value="'.$csvfile.'">';
 			$mktime_lotus = "${PSep}0?([0-9]+)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*).*$ASep@mktime(${VPre}4,${VPre}5,${VPre}6,${VPre}2,${VPre}3,${VPre}1)";
-			$help_on_trans = "<a name='help'><b>How to use Translation's</b><p>".
+			$help_on_trans = "<a name=\"help\"></a><b>How to use Translation's</b><p>".
 				"Translations enable you to change / adapt the content of each CSV field for your needs. <br>".
 				"General syntax is: <b>pattern1 ${ASep} replacement1 ${PSep} ... ${PSep} patternN ${ASep} replacementN</b><br>".
 				"If the pattern-part of a pair is ommited it will match everything ('^.*$'), which is only ".
@@ -251,21 +254,22 @@
 			$GLOBALS['phpgw']->template->set_var('help_on_trans',lang($help_on_trans));	// I don't think anyone will translate this
 			break;
 		case 'import':
+			@set_time_limit(0);
 			$fp=fopen($csvfile,'rb');
-			$csv_fields = fgetcsv($fp,8000,$fieldsep);
+			$csv_fields = fgetcsv($fp,8000,$_POST['fieldsep']);
 			$csv_fields[] = 'no CSV 1'; // eg. for static assignments
 			$csv_fields[] = 'no CSV 2';
 			$csv_fields[] = 'no CSV 3';
 
-			$addr_fields = array_diff($addr_fields,array(''));	// throw away empty / not assigned entrys
+			$addr_fields = array_diff($_POST['addr_fields'],array(''));	// throw away empty / not assigned entrys
 
 			$defaults = array();
-			while(list($csv_idx,$addr) = each($addr_fields))
-			{	// convert $trans[$csv_idx] into array of pattern => value
+			foreach($addr_fields as $csv_idx => $addr)
+			{	// convert $_POST['trans'][$csv_idx] into array of pattern => value
 				$defaults[$csv_fields[$csv_idx]] = $addr;
-				if($trans[$csv_idx])
+				if($_POST['trans'][$csv_idx])
 				{
-					$defaults[$csv_fields[$csv_idx]] .= $PSep.$trans[$csv_idx];
+					$defaults[$csv_fields[$csv_idx]] .= $PSep.$_POST['trans'][$csv_idx];
 				}
 			}
 
@@ -275,15 +279,14 @@
 
 			$log = "<table border=1>\n\t<tr><td>#</td>\n";
 
-			reset($addr_fields);
-			while(list($csv_idx,$addr) = each($addr_fields))
-			{	// convert $trans[$csv_idx] into array of pattern => value
-				// if (!$debug) echo "<p>$csv_idx: ".$csv_fields[$csv_idx].": $addr".($trans[$csv_idx] ? ': '.$trans[$csv_idx] : '')."</p>";
-				$pat_reps = explode($PSep,stripslashes($trans[$csv_idx]));
+			foreach($addr_fields as $csv_idx => $addr)
+			{	// convert $_POST['trans'][$csv_idx] into array of pattern => value
+				// if (!$_POST['debug']) echo "<p>$csv_idx: ".$csv_fields[$csv_idx].": $addr".($_POST['trans'][$csv_idx] ? ': '.$_POST['trans'][$csv_idx] : '')."</p>";
+				$pat_reps = explode($PSep,stripslashes($_POST['trans'][$csv_idx]));
 				$replaces = ''; $values = '';
 				if($pat_reps[0] != '')
 				{
-					while(list($k,$pat_rep) = each($pat_reps))
+					foreach($pat_reps as $k => $pat_rep)
 					{
 						list($pattern,$replace) = explode($ASep,$pat_rep,2);
 						if($replace == '')
@@ -293,11 +296,11 @@
 						$values[$pattern] = $replace;	// replace two with only one, added by the form
 						$replaces .= ($replaces != '' ? $PSep : '') . $pattern . $ASep . $replace;
 					}
-					$trans[$csv_idx] = $values;
+					$_POST['trans'][$csv_idx] = $values;
 				}
 				else
 				{
-					unset( $trans[$csv_idx] );
+					unset( $_POST['trans'][$csv_idx] );
 				}
 				$log .= "\t\t<td><b>$addr</b></td>\n";
 			}
@@ -307,24 +310,22 @@
 
 				$auto_fn = array('n_prefix','n_given','n_middle','n_family','n_suffix');
 			}
-			if($start < 1)
-			{
-				$start = 1;
-			}
-			for($i = 1; $i < $start && fgetcsv($fp,8000,$fieldsep); ++$i); 	// overread lines before our start-record
+			$start = $_POST['start'] < 1 ? 1 : $_POST['start'];
 
-			for($anz = 0; $anz < $max && ($fields = fgetcsv($fp,8000,$fieldsep)); ++$anz)
+			for($i = 1; $i < $start && fgetcsv($fp,8000,$_POST['fieldsep']); ++$i); 	// overread lines before our start-record
+
+			for($anz = 0; $anz < $_POST['max'] && ($fields = fgetcsv($fp,8000,$_POST['fieldsep'])); ++$anz)
 			{
 				$log .= "\t</tr><tr><td>".($start+$anz)."</td>\n";
 
 				reset($addr_fields); $values = array();
 				while(list($csv_idx,$addr) = each($addr_fields))
 				{
-					//echo "<p>$csv: $addr".($trans[$csv] ? ': '.$trans[$csv] : '')."</p>";
+					//echo "<p>$csv: $addr".($_POST['trans'][$csv] ? ': '.$_POST['trans'][$csv] : '')."</p>";
 					$val = $fields[$csv_idx];
-					if(isset($trans[$csv_idx]))
+					if(isset($_POST['trans'][$csv_idx]))
 					{
-						$trans_csv = $trans[$csv_idx];
+						$trans_csv = $_POST['trans'][$csv_idx];
 						while(list($pattern,$replace) = each($trans_csv))
 						{
 							if(ereg((string) $pattern,$val))
@@ -342,15 +343,22 @@
 								}
 								if($val[0] == '@')
 								{
-									// removing the $ to close security hole of showing vars, which contain eg. passwords
-									$val = 'return '.substr(str_replace('$','',$val),1).';';
-									// echo "<p>eval('$val')=";
-									$val = eval($val);
-									// echo "'$val'</p>";
+									if (!$GLOBALS['phpgw_info']['user']['apps']['admin'])
+									{
+										echo lang('@-eval() is only availible to admins!!!');
+									}
+									else
+									{
+										// removing the $ to close security hole of showing vars, which contain eg. passwords
+										$val = 'return '.substr(str_replace('$','',$val),1).';';
+										// echo "<p>eval('$val')=";
+										$val = eval($val);
+										// echo "'$val'</p>";
+									}
 								}
 								if($pattern[0] != '@' || $val)
 								{
-									break;
+									break; 
 								}
 							}
 						}
@@ -370,32 +378,24 @@
 					}
 					$log .= "\t\t<td>".$values['fn']."</td>\n";
 				}
-				if(!$debug)
+				if(!$_POST['debug'])
 				{
-					if (!$values['ab_id'])
-					{
-						$GLOBALS['phpgw']->contacts->add( $values['owner'] ? $values['owner'] : $GLOBALS['phpgw_info']['user']['account_id'],
-							$values,$values['access'],$values['cat_id']);
-					}
-					else
-					{
-						$GLOBALS['phpgw']->contacts->update( $values['ab_id'],
-							$values['owner'] ? $values['owner'] : $GLOBALS['phpgw_info']['user']['account_id'],
-							$values,$values['access'],$values['cat_id']);
-					}
+					$GLOBALS['phpgw']->contacts->add( $values['owner'] ? $values['owner'] : $GLOBALS['phpgw_info']['user']['account_id'],
+						$values,$values['access'],$values['cat_id']);
 					// echo "<p>adding: ".dump_array($values)."</p>\n";
 				}
 			}
 			$log .= "\t</tr>\n</table>\n";
 
-			$GLOBALS['phpgw']->template->set_var('anz_imported',$debug ? lang('%1 records read (not yet imported, you may go %2back%3 and uncheck Test Import)',
+			$GLOBALS['phpgw']->template->set_var('anz_imported',$_POST['debug'] ? lang('%1 records read (not yet imported, you may go %2back%3 and uncheck Test Import)',
 				$anz,'<a href="javascript:history.back()">','</a>') :
 				lang('%1 records imported',$anz));
 			$GLOBALS['phpgw']->template->set_var('log',$log);
-			$GLOBALS['phpgw']->template->parse('rows','imported');
+			$GLOBALS['phpgw']->template->parse('importedhandle','imported');
 			break;
 	}
 
 	$GLOBALS['phpgw']->template->set_var('hiddenvars',$hiddenvars);
-	$GLOBALS['phpgw']->template->fp('phpgw_body','import');
+	$GLOBALS['phpgw']->template->pfp('out','import',True);
+	$GLOBALS['phpgw']->common->phpgw_footer();
 ?>
diff --git a/addressbook/debian/changelog b/addressbook/debian/changelog
deleted file mode 100644
index 2213961fa8..0000000000
--- a/addressbook/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-phpgroupware-addressbook (0.9.14-0.RC3.3) unstable; urgency=low
-
-  * New release.
-  	- Source is now splitted into modules.
-
- -- Luca - De Whiskey's - De Vitis <luca@debian.org>  Mon, 21 May 2001 15:00:56 +0200
diff --git a/addressbook/debian/control b/addressbook/debian/control
deleted file mode 100644
index edfb9f7aa7..0000000000
--- a/addressbook/debian/control
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: phpgroupware-addressbook
-Section: web
-Priority: optional
-Maintainer: Luca - De Whiskey's - De Vitis <luca@debian.org>
-Build-Depends: debhelper (>> 3.0.0)
-Standards-Version: 3.5.2
-
-Package: phpgroupware-addressbook
-Section: web
-Architecture: all
-Depends: phpgroupware (>= ${Source-Version}), php3-pgsql | php3-cgi-pgsql | php4-pgsql | php3-mysql | php3-cgi-mysql | php4-mysql
-Description: The phpGrouhpWare addressbook management module
- This phpGroupWare module provides a searchable addressbook with vCard
- support.
-
diff --git a/addressbook/debian/copyright b/addressbook/debian/copyright
deleted file mode 100644
index 900148502e..0000000000
--- a/addressbook/debian/copyright
+++ /dev/null
@@ -1,15 +0,0 @@
-This package was debianized by Luca - De Whiskey's - De Vitis <luca@debian.org> on
-Sat, 29 Jun 2002 17:13:40 +0200
-
-It was downloaded from the CVS repository at subversion.gnu.org. Try:
-prompt$ CVSROOT=:pserver:anoncvs@subversions.gnu.org:/cvsroot/phpgroupware
-prompt$ CVS_RSH=ssh
-prompt$ cvs login
-prompt$ cvs get all packages
-
-Upstream Author(s):
-Please, see credits.txt, the README file or visit http://apps.phpgroupware.org/
-
-Copyright:
-A copy of the GNU General Public License, version 2, can be found in
-/usr/share/common-licenses/GPL .
diff --git a/addressbook/debian/rules b/addressbook/debian/rules
deleted file mode 100755
index 73d7df75be..0000000000
--- a/addressbook/debian/rules
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. 
-# GNU copyright 1997 by Joey Hess.
-#
-# This version is for a hypothetical package that builds an
-# architecture-dependant package, as well as an architecture-independent
-# package.
-
-# Uncomment this to turn on verbose mode. 
-#export DH_VERBOSE=1
-
-
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
-APP = addressbook
-PACKAGE = debian/phpgroupware-$(APP)/usr/share/phpgroupware/$(APP)
-PACKAGEDOC = debian/phpgroupware-$(APP)/usr/share/doc/phpgroupware-$(APP)
-
-COPYRIGHT = -iname copyright\* -or -iname license
-CHANGELOG = -iname change\*
-INSTALL = -iname install
-FINDOPT = -type f -not \( -path \*CVS\* -or -path \*debian\* -or -name .cvsignore \)
-SPECIAL = -size 0 -or $(INSTALL) -or $(CHANGELOG) -or $(COPYRIGHT) -or -name \*.sgml
-STAMPS = -name configure-stamp -or -name build-stamp
-APPFILES = -not \( -path \*doc\* -or -path \. -or -name '*.pl' -or -name '*.py' -or $(STAMPS) \)
-DOCFILES = -not \( $(SPECIAL) \)
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# No configuration needed.
-	touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-	# Here should go the commands necessary to build the sgml documentation...
-	touch build-stamp
-
-clean:
-	dh_testdir
-	rm -f build-stamp configure-stamp
-	rm -f debian/.builded
-	rm -f debian/files
-	# Here should go the commands to clean the builded sgml documents.
-	dh_clean
-
-install: build
-	dh_testdir
-
-	# Install $(APP) files in $(PACKAGE)
-	find $(FINDOPT) $(APPFILES) \
-		-exec install -D --mode=644 {} $(PACKAGE)/{} \;
-	
-	# Install $(APP) doc files in $(PACKAGEDOC)
-	cd doc ;\
-		find $(FINDOPT) $(DOCFILES) \
-			-exec install -D --mode=644 {} ../$(PACKAGEDOC)/{} \;
-	
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb | tee debian/.builded
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/addressbook/doc/copyright.gpl b/addressbook/doc/copyright.gpl
deleted file mode 100644
index d60c31a97a..0000000000
--- a/addressbook/doc/copyright.gpl
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/addressbook/help/DE/addressbook.php b/addressbook/help/DE/addressbook.php
new file mode 100644
index 0000000000..eb88cbfb1c
--- /dev/null
+++ b/addressbook/help/DE/addressbook.php
@@ -0,0 +1,59 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - User manual                                               *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+	/* $Id$ */
+
+	$phpgw_flags = Array(
+		'currentapp'	=> 'manual'
+	);
+	$phpgw_info['flags'] = $phpgw_flags;
+	include('../../../header.inc.php');
+	$font = $phpgw_info['theme']['font'];
+?>
+<img src="<?php echo $phpgw->common->image('addressbook','navbar.gif'); ?>" border="0">
+<font face="<?php echo $font ?>" size="2"><p/>&nbsp;&nbsp;&nbsp;&nbsp; Ein durchsuchbares 
+Adressbuch um Kontakt-Informationen von Gesch&auml;ftspartnern, Freunden und der 
+Familie aufzubewahren. 
+<ul>
+  <li><b>Hinzuf&uuml;gen:</b><br/>
+    Klicken Sie auf den Hinzuf&uuml;gen Knopf, es wird eine Formularseite mit 
+    den folgenden Feldern angezeigt: 
+    <table width="80%">
+<td bgcolor="#ccddeb" width="50%" valign="top">
+<font face="<?php echo $font; ?>" size="2">
+Nachnahme:<br/>
+E-mail:<br/>
+Telefon Privat:<br/>
+Telefon Gesch&auml;ftlich:<br/>
+Mobiltelefon:<br/>
+Strasse:<br/>
+Stadt:<br/>
+Land:<br/>
+Postleitzahl:<br/>
+Zugriff:<br/>
+Gruppen-Einstellungen:<br/>
+Notizen:</td>
+        <td bgcolor="#ccddeb" width="50%" valign="top"> <font face="<?php echo $font; ?>" size="2"> 
+          Vorname:<br/>
+          Firmenname:<br/>
+Fax:<br/>
+Pager:<br/>
+Andere Nummer:<br/>
+Geburtstag:</td></table>
+...und viele andere mehr.  
+Einfach die Felder ausfüllen und OK klicken.</li><p/>&nbsp;&nbsp;&nbsp;&nbsp;</ul>
+Der Zugriff kann auf Privat beschr&auml;nkt werden, was die Prefrences (Optionen) 
+Einstellungen überschreibt. In den Prefrences kann eingestellt werden, welche 
+Benutzer welchen Zugriff auf ihr Adressbuch haben - anschauen, bearbeiten oder 
+sogar l&ouml;schen. 
+<p/>&nbsp;&nbsp;&nbsp;&nbsp;
+<?php $phpgw->common->phpgw_footer(); ?>
+
diff --git a/addressbook/help/EN/add.php b/addressbook/help/EN/add.php
deleted file mode 100644
index 2d80174eab..0000000000
--- a/addressbook/help/EN/add.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-	/**************************************************************************\
-	* phpGroupWare - User manual                                               *
-	* http://www.phpgroupware.org                                              *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-	/* $Id$ */
-
-	$GLOBALS['phpgw_info']['flags'] = Array
-	(
-		'headonly'		=> True,
-		'currentapp'	=> 'addressbook'
-	);
-
-	include('../../../header.inc.php');
-	$GLOBALS['phpgw']->help = CreateObject('phpgwapi.help_helper');
-	$GLOBALS['phpgw']->help->set_params(array('app_name'	=> 'addressbook',
-												'title'		=> lang('addressbook') . ' - ' . lang('add'),
-												'controls'	=> array('up' => 'list.php')));
-
-	$values['add'] = array
-	(
-		'add_img'				=> $GLOBALS['phpgw']->common->image('addressbook','help_add'),
-		'item_1'				=> 'Add any and all information that you see fit. You can use the tab key to tab from one field to the next.',
-		'item_2'				=> 'Once you have entered all the information, press OK to accept, Clear to erase all information in all the fields or Cancel to exit this screen.',
-		'lang_lastname'			=> 'Last name',
-		'lang_firstname'		=> 'First name',
-		'lang_email'			=> 'E-mail',
-		'lang_homephone'		=> 'Home phone',
-		'lang_workphone'		=> 'Work phone',
-		'lang_mobile'			=> 'Mobile',
-		'lang_street'			=> 'Street',
-		'lang_city'				=> 'City',
-		'lang_state'			=> 'State',
-		'lang_zip'				=> 'ZIP code',
-		'lang_access'			=> 'Access',
-		'lang_groupsettings'	=> 'Group settings',
-		'lang_notes'			=> 'Notes',
-		'lang_company'			=> 'Company name',
-		'lang_fax'				=> 'Fax',
-		'lang_pager'			=> 'Pager',
-		'lang_othernumber'		=> 'Other number',
-		'lang_birthday'			=> 'Birthday',
-		'access_descr'			=> 'Access can be restricted to private, overriding acl preferences settings.
-									From preferences, you can grant access to users to the be able to view, 
-									edit, and even delete your entries.'
-	);
-
-	$GLOBALS['phpgw']->help->xdraw($values);
-	$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->help->output);
-?>
diff --git a/addressbook/help/EN/addressbook.php b/addressbook/help/EN/addressbook.php
new file mode 100755
index 0000000000..46ae7bb9c5
--- /dev/null
+++ b/addressbook/help/EN/addressbook.php
@@ -0,0 +1,56 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - User manual                                               *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+	/* $Id$ */
+
+	$phpgw_flags = Array(
+		'currentapp'	=> 'manual'
+	);
+	$phpgw_info['flags'] = $phpgw_flags;
+	include('../../../header.inc.php');
+	$font = $phpgw_info['theme']['font'];
+?>
+<img src="<?php echo $phpgw->common->image('addressbook','navbar.gif'); ?>" border="0">
+<font face="<?php echo $font ?>" size="2"><p/>
+A searchable address book for keeping contact information of business 
+associates or friends and family.
+<ul><li><b>Add:</b><br/>
+Click on the add button, a form page will be presented with the following fields:
+<table width="80%">
+<td bgcolor="#ccddeb" width="50%" valign="top">
+<font face="<?php echo $font; ?>" size="2">
+Last name:<br/>
+E-mail:<br/>
+Home phone:<br/>
+Work phone:<br/>
+Mobile:<br/>
+Street:<br/>
+City:<br/>
+State:<br/>
+ZIP code:<br/>
+Access:<br/>
+Group settings:<br/>
+Notes:</td>
+<td bgcolor="#ccddeb" width="50%" valign="top">
+<font face="<?php echo $font; ?>" size="2">
+First name:<br/>
+Company name:<br/>
+Fax:<br/>
+Pager:<br/>
+Other number:<br/>
+Birthday:</td></table>
+...and many others.  
+Simply fill in the fields, and click OK.</li><p/></ul>
+Access can be restricted to private, overriding acl preferences settings.
+From preferences, you can grant access to users to the be able to view, 
+edit, and even delete your entries.<p/>
+<?php $phpgw->common->phpgw_footer(); ?>
+
diff --git a/addressbook/help/EN/list.php b/addressbook/help/EN/list.php
deleted file mode 100644
index 3edf7f7972..0000000000
--- a/addressbook/help/EN/list.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-	/**************************************************************************\
-	* phpGroupWare - User manual                                               *
-	* http://www.phpgroupware.org                                              *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-	/* $Id$ */
-
-	$GLOBALS['phpgw_info']['flags'] = Array
-	(
-		'headonly'		=> True,
-		'currentapp'	=> 'addressbook'
-	);
-
-	include('../../../header.inc.php');
-
-	$GLOBALS['phpgw']->help = CreateObject('phpgwapi.help_helper');
-	$GLOBALS['phpgw']->help->set_params(array('app_name'	=> 'addressbook',
-												'title'		=> lang('addressbook') . ' - ' . lang('list'),
-												'controls'	=> array('up'	=> 'overview.php',
-																	'down'	=> 'add.php')));
-	$values['list']	= array
-	(
-		'list_img'	=> $GLOBALS['phpgw']->common->image('addressbook','help_list'),
-		'item_1'	=> 'Category select box. The category filter shows the items sorted by category.',
-		'item_2'	=> 'The double arrow moves you to the first page, the single arrow moves you to the previous page.',
-		'item_3'	=> 'Type in a word and hit the search for a specific name. For example you cant remember Bobs e-mail address, you type *Bob* into the search box and it will display all entries with the name Bob. You can search entries of your adressbook. The search function is not case sensetive, it searches for upper and lower cases at once.',
-		'item_4'	=> 'This pull down menu allows you to choose which entries you would like to view: private, only yours or all records. Hit the filter button to display your selection.',
-		'item_5'	=> 'Use the filter button to activate your selection of filters (see #4).',
-		'item_6'	=> 'The double arrow moves you to the last page, the single arrow moves you to the next page.',
-		'h_data'	=> 'Data records. The visible fields you have choosen in the preferences section. Examples:',
-		'item_7'	=> 'Persons full name. By clicking on *Full Name* it will sort the list by the entries first name.',
-		'item_8'	=> 'Persons birthday. By clicking on *Birthday* it will sort the list by the entries birthday.',
-		'item_9'	=> 'Persons work e-mail address. By clicking on "Business Email" it will sort the list by the entries Business e-mail. In the example above, if you click on the e-mail address, joe@work.com, it will open a compose window to joe an e-mail.',
-		'item_10'	=> 'Persons home e-mail address. By clicking on "Home Email" it will sort the list by the entries home e-mail. In the example above, if you click on the e-mail address, joe@home.com, it will open a compose window to joe an e-mail.',
-		'item_11'	=> 'View: Allows you to view all of the information that was entered. ie: phone #, address, work #, etc...',
-		'item_12'	=> 'VCard: Creates a VCard.',
-		'item_13'	=> 'Edit: Allows you to edit all the information contained in that persons entry. It is only possible to edit an entry if you are the owner or have the rights to do so.',
-		'item_14'	=> 'Owner: The person who owns this record.',
-		'item_15'	=> 'Add: Creates a new entry to add a new person.',
-		'item_16'	=> 'Add VCard: Imports a new VCard into your address book.',
-		'item_17'	=> 'Import Contacts: A way to import a previous address book, ie. Netscape ldif format, IE csv files...',
-		'item_18'	=> 'Export Contacts: Lets you export your address book to a text file.'
-	);
-
-	$GLOBALS['phpgw']->help->xdraw($values);
-	$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->help->output);
-?>
diff --git a/addressbook/help/EN/overview.php b/addressbook/help/EN/overview.php
deleted file mode 100644
index 0d18c48567..0000000000
--- a/addressbook/help/EN/overview.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-	/**************************************************************************\
-	* phpGroupWare - User manual                                               *
-	* http://www.phpgroupware.org                                              *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-	/* $Id$ */
-
-	$GLOBALS['phpgw_info']['flags'] = Array
-	(
-		'headonly'		=> True,
-		'currentapp'	=> 'addressbook'
-	);
-
-	include('../../../header.inc.php');
-
-	$GLOBALS['phpgw']->help = CreateObject('phpgwapi.help_helper');
-	$GLOBALS['phpgw']->help->set_params(array('app_name'	=> 'addressbook',
-												'title'		=> lang('addressbook') . ' - ' . lang('overview'),
-												'controls'	=> array('down' => 'list.php')));
-
-	$values['overview']	= array
-	(
-		'intro'				=> 'A searchable address book for keeping contact information of business associates or friends and family, to keep various levels of contact information and a search function to find people you need quickly. Integration with other applications in the phpGroupWare suite.',
-		'prefs_settings'	=> 'Preferences settings:<br>When you enter the adressbock the first time it shows on the top the message *Please set your preferences for this application!*. This means you still have to adapt the application for your special needs. Each applications preferences section can be found within the preferences application. For further informations please see the section preferences.'
-	);
-
-	$GLOBALS['phpgw']->help->xdraw($values);
-	$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->help->output);
-?>
diff --git a/addressbook/help/FI/addressbook.php b/addressbook/help/FI/addressbook.php
index aa2eacc966..6d0ab187a8 100644
--- a/addressbook/help/FI/addressbook.php
+++ b/addressbook/help/FI/addressbook.php
@@ -51,3 +51,4 @@ T
 Tiedon käyttöoikeus voidaan rajoittaa yksityiseksi, mikä ohittaa ACL:n
 asetuksen. Osoitekirjan asetuksista voit antaa muille käyttäjille
 oikeuden selata, muokata tai jopa poistaa tallentamiasi tietoja.<p/>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/addressbook/help/JA/addressbook.php b/addressbook/help/JA/addressbook.php
index a2a911d173..2a25a2208d 100644
--- a/addressbook/help/JA/addressbook.php
+++ b/addressbook/help/JA/addressbook.php
@@ -51,3 +51,5 @@ FAX:<br/>
 ¥×¥é¥¤¥Ù¡¼¥È¥Ç¡¼¥¿¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Ë¤Ï¡¢ÍøÍѵö²Ä¡Ê¥æ¡¼¥¶ÀßÄê¡Ë¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 ¥æ¡¼¥¶ÀßÄê¤Ç¤Ï¤¢¤Ê¤¿¤¬ºîÀ®¤·¤¿¥¢¥É¥ì¥¹Ä¢¤ò¾¤Î¥æ¡¼¥¶¤¬¡¢É½¼¨¡¦ÄûÀµ¡¦ºï½ü¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¥¢¥¯¥»¥¹¸¢¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 <p/>
+<?php $phpgw->common->phpgw_footer(); ?>
+
diff --git a/addressbook/setup/tables_current.inc.php b/addressbook/help/index.php
old mode 100644
new mode 100755
similarity index 50%
rename from addressbook/setup/tables_current.inc.php
rename to addressbook/help/index.php
index 5f5b70270a..9d060b29b9
--- a/addressbook/setup/tables_current.inc.php
+++ b/addressbook/help/index.php
@@ -1,6 +1,6 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare                                                             *
+  * phpGroupWare - User manual                                               *
   * http://www.phpgroupware.org                                              *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
@@ -9,20 +9,18 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id$ */
+	/* $Id$ */
 
-	$phpgw_baseline = array(
-		'phpgw_addressbook_servers' => array(
-			'fd' => array(
-				'name'    => array('type' => 'varchar', 'precision' => 64,  'nullable' => False),
-				'basedn'  => array('type' => 'varchar', 'precision' => 255, 'nullable' => True),
-				'search'  => array('type' => 'varchar', 'precision' => 32,  'nullable' => True),
-				'attrs'   => array('type' => 'varchar', 'precision' => 255, 'nullable' => True),
-				'enabled' => array('type' => 'int', 'precision' => 4)
-			),
-			'pk' => array('name'),
-			'fk' => array(),
-			'ix' => array(),
-			'uc' => array()
-		)
+	$phpgw_flags = Array(
+		'currentapp'	=> 'manual'
 	);
+	$phpgw_info['flags'] = $phpgw_flags;
+	include('../../header.inc.php');
+	$appname = 'addressbook';
+	include(PHPGW_SERVER_ROOT.'/'.$appname.'/setup/setup.inc.php');
+?>
+<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>" border="0"><p/>
+<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2">
+Version: <b><?php echo $setup_info[$appname]['version']; ?></b>
+</font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/addressbook/inc/class.boXport.inc.php b/addressbook/inc/class.boXport.inc.php
index 0149ea885c..59176f0a77 100644
--- a/addressbook/inc/class.boXport.inc.php
+++ b/addressbook/inc/class.boXport.inc.php
@@ -41,25 +41,15 @@
 				$this->read_sessiondata();
 				$this->use_session = True;
 			}
+			global $start,$limit,$query,$sort,$order,$filter,$cat_id;
 
-			$start  = intval(get_var('start',   array('POST','GET')));
-			$query  = get_var('query',   array('POST','GET'));
-			$limit  = get_var('limit',   array('POST','GET'));
-			$sort   = get_var('sort',    array('POST','GET'));
-			$order  = get_var('order',   array('POST','GET'));
-			$filter = get_var('filter',  array('POST','GET'));
-			$cat_id = get_var('fcat_id', array('POST'));
-
-			$this->start  = (!empty($start) || ($start == '0')) ? $start : $this->start;
-			$this->limit  = (!empty($limit) || ($limit == '0')) ? $limit : $this->limit;
-			$this->query  = (empty($query) && !empty($this->query)) || !empty($query) ? $query : $this->query;
-			$this->cquery = (empty($cquery) && !empty($this->cquery)) || !empty($cquery) ? $cquery : $this->cquery;
-			$this->sort   = (!empty($sort)) ? $sort : $this->sort;
-			$this->order  = (!empty($order)) ? $order : $this->order;
-			$this->filter = (!empty($filter) || ($filter == '0')) ? $filter : $this->filter;
-
-			$this->cat_id = (isset($cat_id) && !empty($cat_id)) ? $cat_id : $this->cat_id;
-			$this->cat_id = ($cat_id == '0' || $cat_id == 0 || $cat_id == '') ? $cat_id : $this->cat_id;
+			if($start || $start == 0)  { $this->start = $start; }
+			if($limit)  { $this->limit  = $limit;  }
+			if($query)  { $this->query  = $query;  }
+			if($sort)   { $this->sort   = $sort;   }
+			if($order)  { $this->order  = $order;  }
+			if($filter) { $this->filter = $filter; }
+			$this->cat_id = $cat_id;
 		}
 
 		function save_sessiondata()
@@ -85,10 +75,7 @@
 		function read_sessiondata()
 		{
 			$data = $GLOBALS['phpgw']->session->appsession('session_data','addressbook');
-			if($this->debug)
-			{
-				echo '<br>Read:'; _debug_array($data);
-			}
+			if($this->debug) { echo '<br>Read:'; _debug_array($data); }
 
 			$this->start  = $data['start'];
 			$this->limit  = $data['limit'];
@@ -103,23 +90,20 @@
 		{
 			include (PHPGW_APP_INC . '/import/' . $conv_type);
 
-			if($private == '')
-			{
-				$private = 'public';
-			}
+			if ($private == '') { $private = 'public'; }
 			$row = 0;
 			$buffer = array();
 			$contacts = new import_conv;
 
 			$buffer = $contacts->import_start_file($buffer);
 			$fp = fopen($tsvfile,'r');
-			if($contacts->type == 'csv')
+			if ($contacts->type == 'csv')
 			{
-				while($data = fgetcsv($fp,8000,','))
+				while ($data = fgetcsv($fp,8000,','))
 				{
 					$num = count($data);
 					$row++;
-					if($row == 1)
+					if ($row == 1)
 					{
 						$header = $data;
 						/* Changed here to ignore the header, set to our array
@@ -132,10 +116,10 @@
 					else
 					{
 						$buffer = $contacts->import_start_record($buffer);
-						for($c=0; $c<$num; $c++)
+						for ($c=0; $c<$num; $c++ )
 						{
 							//Send name/value pairs along with the buffer
-							if($contacts->import[$header[$c]] != '' && $data[$c] != '')
+							if ($contacts->import[$header[$c]] != '' && $data[$c] != '')
 							{
 								$buffer = $contacts->import_new_attrib($buffer, $contacts->import[$header[$c]],$data[$c]);
 							}
@@ -144,25 +128,25 @@
 					}
 				}
 			}
-			elseif($contacts->type == 'ldif')
+			elseif ($contacts->type == 'ldif')
 			{
-				while($data = fgets($fp,8000))
+				while ($data = fgets($fp,8000))
 				{
 					$url = "";
 					list($name,$value,$extra) = split(':', $data);
-					if(substr($name,0,2) == 'dn')
+					if (substr($name,0,2) == 'dn')
 					{
 						$buffer = $contacts->import_start_record($buffer);
 					}
 					
 					$test = trim($value);
-					if($name && !empty($test) && $extra)
+					if ($name && !empty($test) && $extra)
 					{
 						// Probable url string
 						$url = $test;
 						$value = $extra;
 					}
-					elseif($name && empty($test) && $extra)
+					elseif ($name && empty($test) && $extra)
 					{
 						// Probable multiline encoding
 						$newval = base64_decode(trim($extra));
@@ -170,15 +154,15 @@
 						//echo $name.':'.$value;
 					}
 
-					if($name && $value)
+					if ($name && $value)
 					{
 						$test = split(',mail=',$value);
-						if($test[1])
+						if ($test[1])
 						{
 							$name = "mail";
 							$value = $test[1];
 						}
-						if($url)
+						if ($url)
 						{
 							$name = "homeurl";
 							$value = $url. ':' . $value;
@@ -197,32 +181,32 @@
 			}
 			else
 			{
-				while($data = fgets($fp,8000))
+				while ($data = fgets($fp,8000))
 				{
 					$data = trim($data);
 					// RB 2001/05/07 added for Lotus Organizer
-					while(substr($data,-1) == '=')
+					while (substr($data,-1) == '=')
 					{
 						// '=' at end-of-line --> line to be continued with next line
 						$data = substr($data,0,-1) . trim(fgets($fp,8000));
 					}
-					if(strstr($data,';ENCODING=QUOTED-PRINTABLE'))
+					if (strstr($data,';ENCODING=QUOTED-PRINTABLE'))
 					{
 						// RB 2001/05/07 added for Lotus Organizer
 						$data = quoted_printable_decode(str_replace(';ENCODING=QUOTED-PRINTABLE','',$data));
 					}
 					list($name,$value) = explode(':', $data,2); // RB 2001/05/09 to allow ':' in Values (not only in URL's)
 
-					if(strtolower(substr($name,0,5)) == 'begin')
+					if (strtolower(substr($name,0,5)) == 'begin')
 					{
 						$buffer = $contacts->import_start_record($buffer);
 					}
-					if($name && $value)
+					if ($name && $value)
 					{
 						reset($contacts->import);
-						while(list($fname,$fvalue) = each($contacts->import))
+						while ( list($fname,$fvalue) = each($contacts->import) )
 						{
-							if(strstr(strtolower($name), $contacts->import[$fname]))
+							if ( strstr(strtolower($name), $contacts->import[$fname]) )
 							{
 								$buffer = $contacts->import_new_attrib($buffer,$name,$value);
 							}
@@ -243,14 +227,14 @@
 		function export($conv_type,$cat_id='')
 		{
 			include (PHPGW_APP_INC . '/export/' . $conv_type);
-			$buffer   = array();
+			$buffer=array();
 			$contacts = new export_conv;
 
 			// Read in user custom fields, if any
 			$customfields = array();
-			while(list($col,$descr) = @each($GLOBALS['phpgw_info']['user']['preferences']['addressbook']))
+			while (list($col,$descr) = @each($GLOBALS['phpgw_info']['user']['preferences']['addressbook']))
 			{
-			if(substr($col,0,6) == 'extra_')
+			if ( substr($col,0,6) == 'extra_' )
 				{
 					$field = ereg_replace('extra_','',$col);
 						$field = ereg_replace(' ','_',$field);
@@ -262,12 +246,12 @@
 				'address2' => 'address2',
 				'address3' => 'address3'
 			);
-			if($contacts->type != 'vcard')
+			if ($contacts->type != 'vcard')
 			{
 				$contacts->qfields = $contacts->stock_contact_fields;# + $extrafields;# + $customfields;
 			}
 
-			if(!empty($cat_id))
+			if (!empty($cat_id))
 			{
 				$buffer = $contacts->export_start_file($buffer,$cat_id);
 			}
@@ -276,10 +260,10 @@
 				$buffer = $contacts->export_start_file($buffer);
 			}
 
-			for($i=0;$i<count($contacts->ids);$i++)
+			for ($i=0;$i<count($contacts->ids);$i++)
 			{
 				$buffer = $contacts->export_start_record($buffer);
-				while(list($name,$value) = each($contacts->currentrecord))
+				while( list($name,$value) = each($contacts->currentrecord) )
 				{
 					$buffer = $contacts->export_new_attrib($buffer,$name,$value);
 				}
diff --git a/addressbook/inc/class.boaddressbook.inc.php b/addressbook/inc/class.boaddressbook.inc.php
index 7820181fc5..6616262ff3 100644
--- a/addressbook/inc/class.boaddressbook.inc.php
+++ b/addressbook/inc/class.boaddressbook.inc.php
@@ -24,8 +24,8 @@
 			'update_entry'    => True
 		);
 
-		var $xml_functions = array();
-
+		var $xml_functions  = array();
+		var $xmlrpc_methods = array();
 		var $soap_functions = array(
 			'read_entries' => array(
 				'in'  => array('int','int','struct','string','int'),
@@ -53,6 +53,7 @@
 
 		var $so;
 		var $start;
+		var $limit;
 		var $query;
 		var $sort;
 		var $order;
@@ -73,41 +74,75 @@
 				$this->read_sessiondata();
 				$this->use_session = True;
 			}
+			/* _debug_array($GLOBALS['HTTP_POST_VARS']); */
+			/* Might change this to '' at the end---> */
+			$_start   = $GLOBALS['HTTP_POST_VARS']['start']   ? $GLOBALS['HTTP_POST_VARS']['start']   : $GLOBALS['HTTP_GET_VARS']['start'];
+			$_query   = $GLOBALS['HTTP_POST_VARS']['query']   ? $GLOBALS['HTTP_POST_VARS']['query']   : $GLOBALS['HTTP_GET_VARS']['query'];
+			$_sort    = $GLOBALS['HTTP_POST_VARS']['sort']    ? $GLOBALS['HTTP_POST_VARS']['sort']    : $GLOBALS['HTTP_GET_VARS']['sort'];
+			$_order   = $GLOBALS['HTTP_POST_VARS']['order']   ? $GLOBALS['HTTP_POST_VARS']['order']   : $GLOBALS['HTTP_GET_VARS']['order'];
+			$_filter  = $GLOBALS['HTTP_POST_VARS']['filter']  ? $GLOBALS['HTTP_POST_VARS']['filter']  : $GLOBALS['HTTP_GET_VARS']['filter'];
+			$_cat_id  = $GLOBALS['HTTP_POST_VARS']['cat_id']  ? $GLOBALS['HTTP_POST_VARS']['cat_id']  : $GLOBALS['HTTP_GET_VARS']['cat_id'];
+			$_fcat_id = $GLOBALS['HTTP_POST_VARS']['fcat_id'] ? $GLOBALS['HTTP_POST_VARS']['fcat_id'] : $GLOBALS['HTTP_GET_VARS']['fcat_id'];
 
-			$start  = intval(get_var('start',   array('POST','GET')));
-			$query  = get_var('query',   array('POST','GET'));
-			$cquery = get_var('cquery',  array('GET'));
-			$sort   = get_var('sort',    array('POST','GET'));
-			$order  = get_var('order',   array('POST','GET'));
-			$filter = get_var('filter',  array('POST','GET'));
-			$cat_id = get_var('fcat_id', array('POST'));
-
-			$this->start  = (!empty($start) || ($start == '0')) ? $start : $this->start;
-			$this->query  = (empty($query) && !empty($this->query)) || !empty($query) ? $query : $this->query;
-			$this->cquery = (empty($cquery) && !empty($this->cquery)) || !empty($cquery) ? $cquery : $this->cquery;
-			$this->sort   = (!empty($sort)) ? $sort : $this->sort;
-			$this->order  = (!empty($order)) ? $order : $this->order;
-			$this->filter = (!empty($filter) || ($filter == '0')) ? $filter : $this->filter;
-
-			$this->cat_id = (isset($cat_id) && !empty($cat_id)) ? $cat_id : $this->cat_id;
-			$this->cat_id = ($cat_id == '0' || $cat_id == 0 || $cat_id == '') ? $cat_id : $this->cat_id;
-
-			if($this->debug)
+			if(!empty($_start) || ($_start == '0') || ($_start == 0))
 			{
-				$this->_debug_sqsof();
+				if($this->debug) { echo '<br>overriding $start: "' . $this->start . '" now "' . $_start . '"'; }
+				$this->start = $_start;
 			}
+			if($_limit)
+			{
+				$this->limit  = $_limit;
+			}
+			if((empty($_query) && !empty($this->query)) || !empty($_query))
+			{
+				$this->query  = $_query;
+			}
+
+			if(isset($GLOBALS['HTTP_POST_VARS']['fcat_id']) || isset($GLOBALS['HTTP_POST_VARS']['fcat_id']))
+			{
+				$this->cat_id = $_fcat_id;
+			}
+			else
+			{
+				$this->cat_id = -1;
+			}
+			
+			if(isset($_sort)   && !empty($_sort))
+			{
+				if($this->debug) { echo '<br>overriding $sort: "' . $this->sort . '" now "' . $_sort . '"'; }
+				$this->sort   = $_sort;
+			}
+
+			if(isset($_order)  && !empty($_order))
+			{
+				if($this->debug) { echo '<br>overriding $order: "' . $this->order . '" now "' . $_order . '"'; }
+				$this->order  = $_order;
+			}
+
+			if(isset($_filter) && !empty($_filter))
+			{
+				if($this->debug) { echo '<br>overriding $filter: "' . $this->filter . '" now "' . $_filter . '"'; }
+				$this->filter = $_filter;
+			}
+
+			if($this->debug) { $this->_debug_sqsof(); }
+
+			$this->xmlrpc_methods[] = array(
+				'name'        => 'read_entries',
+				'description' => 'Get list of addressbook items'
+			);
 		}
 
 		function _debug_sqsof()
 		{
 			$data = array(
 				'start'  => $this->start,
+				'limit'  => $this->limit,
 				'query'  => $this->query,
 				'sort'   => $this->sort,
 				'order'  => $this->order,
 				'filter' => $this->filter,
-				'cat_id' => $this->cat_id,
-				'cquery' => $this->cquery
+				'cat_id' => $this->cat_id
 			);
 			echo '<br>BO:';
 			_debug_array($data);
@@ -120,7 +155,7 @@
 			  in which case the input might be an array.  The server always calls
 			  this function to fill the server dispatch map using a string.
 			*/
-			if(is_array($_type))
+			if (is_array($_type))
 			{
 				$_type = $_type['type'] ? $_type['type'] : $_type[0];
 			}
@@ -172,12 +207,9 @@
 
 		function save_sessiondata($data)
 		{
-			if($this->use_session)
+			if ($this->use_session)
 			{
-				if($this->debug)
-				{
-					echo '<br>Save:'; _debug_array($data);
-				}
+				if($this->debug) { echo '<br>Save:'; _debug_array($data); }
 				$GLOBALS['phpgw']->session->appsession('session_data','addressbook',$data);
 			}
 		}
@@ -185,14 +217,11 @@
 		function read_sessiondata()
 		{
 			$data = $GLOBALS['phpgw']->session->appsession('session_data','addressbook');
-			if($this->debug)
-			{
-				echo '<br>Read:'; _debug_array($data);
-			}
+			if($this->debug) { echo '<br>Read:'; _debug_array($data); }
 
 			$this->start  = $data['start'];
+			$this->limit  = $data['limit'];
 			$this->query  = $data['query'];
-			$this->cquery = $data['cquery'];
 			$this->sort   = $data['sort'];
 			$this->order  = $data['order'];
 			$this->filter = $data['filter'];
@@ -202,15 +231,15 @@
 
 		function strip_html($dirty = '')
 		{
-			if($dirty == '')
+			if ($dirty == '')
 			{
 				$dirty = array();
 			}
 			for($i=0;$i<count($dirty);$i++)
 			{
-				if(is_array($dirty[$i]))
+				if(gettype($dirty[$i]) == 'array')
 				{
-					while(list($name,$value) = @each($dirty[$i]))
+					while (list($name,$value) = @each($dirty[$i]))
 					{
 						$cleaned[$i][$name] = $GLOBALS['phpgw']->strip_html($dirty[$i][$name]);
 					}
@@ -227,11 +256,8 @@
 		{
 			$entries = $this->so->read_entries($data);
 			$this->total = $this->so->contacts->total_records;
-			if($this->debug)
-			{
-				echo '<br>Total records="' . $this->total . '"';
-			}
-			return $this->strip_html($entries);
+			if($this->debug) { echo '<br>Total records="' . $this->total . '"'; }
+			return (is_array($entries) ? $this->strip_html($entries) : array());
 		}
 
 		function read_entry($data)
@@ -248,7 +274,7 @@
 
 		function add_vcard()
 		{
-			$uploadedfile = $GLOBALS['HTTP_POST_VARS']['uploadedfile'];
+			global $uploadedfile;
 
 			if($uploadedfile == 'none' || $uploadedfile == '')
 			{
@@ -289,15 +315,11 @@
 
 		function add_email()
 		{
-			$name    = $GLOBALS['HTTP_GET_VARS']['name'];
-			$referer = $GLOBALS['HTTP_GET_VARS']['referer'];
+			global $name,$referer;
 
 			$named = explode(' ', $name);
-			for($i=count($named);$i>=0;$i--)
-			{
-				$names[$i] = $named[$i];
-			}
-			if($names[2])
+			for ($i=count($named);$i>=0;$i--) { $names[$i] = $named[$i]; }
+			if ($names[2])
 			{
 				$fields['n_given']  = $names[0];
 				$fields['n_middle'] = $names[1];
@@ -341,13 +363,13 @@
 		function save_preferences($prefs,$other,$qfields,$fcat_id)
 		{
 			$GLOBALS['phpgw']->preferences->read_repository();
-			if(is_array($prefs))
+			if (is_array($prefs))
 			{
 				/* _debug_array($prefs);exit; */
-				while(list($pref,$x) = each($qfields))
+				while (list($pref,$x) = each($qfields))
 				{
 					/* echo '<br>checking: ' . $pref . '=' . $prefs[$pref]; */
-					if($prefs[$pref] == 'on')
+					if ($prefs[$pref] == 'on')
 					{
 						$GLOBALS['phpgw']->preferences->add('addressbook',$pref,'addressbook_on');
 					}
@@ -361,29 +383,26 @@
 			if(is_array($other))
 			{
 				$GLOBALS['phpgw']->preferences->delete('addressbook','mainscreen_showbirthdays');
-				if($other['mainscreen_showbirthdays'])
+	 			if ($other['mainscreen_showbirthdays'])
 				{
 					$GLOBALS['phpgw']->preferences->add('addressbook','mainscreen_showbirthdays',True);
 				}
 
 				$GLOBALS['phpgw']->preferences->delete('addressbook','default_filter');
-				if($other['default_filter'])
+	 			if ($other['default_filter'])
 				{
 					$GLOBALS['phpgw']->preferences->add('addressbook','default_filter',$other['default_filter']);
 				}
 
 				$GLOBALS['phpgw']->preferences->delete('addressbook','autosave_category');
-				if($other['autosave_category'])
+	 			if ($other['autosave_category'])
 				{
 					$GLOBALS['phpgw']->preferences->add('addressbook','autosave_category',True);
 				}
 			}
 
-			if($fcat_id)
-			{
-				$GLOBALS['phpgw']->preferences->delete('addressbook','default_category');
-				$GLOBALS['phpgw']->preferences->add('addressbook','default_category',$fcat_id);
-			}
+			$GLOBALS['phpgw']->preferences->delete('addressbook','default_category');
+			$GLOBALS['phpgw']->preferences->add('addressbook','default_category',$fcat_id);
 
 			$GLOBALS['phpgw']->preferences->save_repository(True);
 			/* _debug_array($prefs);exit; */
diff --git a/addressbook/inc/class.remote.inc.php b/addressbook/inc/class.remote.inc.php
deleted file mode 100644
index b5427e94ad..0000000000
--- a/addressbook/inc/class.remote.inc.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-  /**************************************************************************\
-  * phpGroupWare - addressbook                                               *
-  * http://www.phpgroupware.org                                              *
-  * Written by Joseph Engo <jengo@mail.com>                                  *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
-
-	class remote
-	{
-		var $servers = array(
-			'BigFoot' => array(
-				'host'    => 'ldap.bigfoot.com',
-				'basedn'  => '',
-				'search'  => 'cn',
-				'attrs'   => 'mail,cn,o,surname,givenname',
-				'enabled' => True
-			),
-		);
-		var $serverid = '';
-
-		var $ldap = 0;
-
-		function remote($serverid='BigFoot')
-		{
-			$GLOBALS['phpgw']->db->query("SELECT * FROM phpgw_addressbook_servers",__LINE__,__FILE__);
-			while ($GLOBALS['phpgw']->db->next_record())
-			{
-				if ($GLOBALS['phpgw']->db->f('name'))
-				{
-					$this->servers[$GLOBALS['phpgw']->db->f('name')] = array(
-						'host'    => $GLOBALS['phpgw']->db->f('host'),
-						'basedn'  => $GLOBALS['phpgw']->db->f('basedn'),
-						'search'  => $GLOBALS['phpgw']->db->f('search'),
-						'attrs'   => $GLOBALS['phpgw']->db->f('attrs'),
-						'enabled' => $GLOBALS['phpgw']->db->f('enabled')
-					);
-				}
-			}
-			$this->serverid = $serverid;
-			$this->ldap = $this->_connect($this->serverid);
-			//$this->search();
-		}
-
-		function _connect($serverid='BigFoot')
-		{
-			if (!$ds = ldap_connect($this->servers[$serverid]['host']))
-			{
-				printf("<b>Error: Can't connect to LDAP server %s!</b><br>",$this->servers[$serverid]['host']);
-				return False;
-			}
-			@ldap_bind($ds);
-
-			return $ds;
-		}
-
-		function search($query='')
-		{
-			if(!$query)
-			{
-				return;
-			}
-
-			if(isset($this->servers[$this->serverid]['attrs']))
-			{
-				$attrs = explode(',',$this->servers[$this->serverid]['attrs']);
-				$found = ldap_search($this->ldap,$this->servers[$this->serverid]['basedn'],$this->servers[$this->serverid]['search'] . '=*' . $query . '*',$attrs);
-			}
-			else
-			{
-				$found = ldap_search($this->ldap,$this->servers[$this->serverid]['basedn'],$this->servers[$this->serverid]['search'] . '=*' . $query . '*');
-			}
-
-			$ldap_fields = @ldap_get_entries($this->ldap, $found);
-
-			$out = $this->clean($ldap_fields);
-			$out = $this->convert($out);
-
-			return $out;
-		}
-
-		function clean($value)
-		{
-			if(!is_int($value) && ($value != 'count'))
-			{
-				if(is_array($value))
-				{
-					while(list($x,$y) = @each($value))
-					{
-						/* Fill a new output array, but do not include things like array( 0 => mail) */
-						if(isset($this->servers[$this->serverid]['attrs']) &&
-							!@in_array($y,explode(',',$this->servers[$this->serverid]['attrs'])))
-						{
-							$out[$x] = $this->clean($y);
-						}
-					}
-					unset($out['count']);
-					return $out;
-				}
-				else
-				{
-					return $value;
-				}
-			}
-		}
-
-		function convert($in='')
-		{
-			if(is_array($in))
-			{
-				while(list($key,$value) = each($in))
-				{
-					$out[] = array(
-						'fn'       => $value['cn'][0],
-						'n_family' => $value['sn'][0] ? $value['sn'][0] : $value['surname'][0],
-						'email'    => $value['mail'][0],
-						'owner'    => $GLOBALS['phpgw_info']['user']['account_id']
-					);
-				}
-				return $out;
-			}
-			else
-			{
-				return $in;
-			}
-		}
-	}
-?>
diff --git a/addressbook/inc/class.soaddressbook.inc.php b/addressbook/inc/class.soaddressbook.inc.php
index c354a66405..73d25e7dc3 100644
--- a/addressbook/inc/class.soaddressbook.inc.php
+++ b/addressbook/inc/class.soaddressbook.inc.php
@@ -65,14 +65,13 @@
 				$data['query'],
 				$data['filter'],
 				$data['sort'],
-				$data['order'],
-				$data['cquery']
+				$data['order']
 			);
 		}
 
 		function read_entry($id,$fields)
 		{
-			if($this->rights & PHPGW_ACL_READ)
+			if ($this->rights & PHPGW_ACL_READ)
 			{
 				return $this->contacts->read_single_entry($id,$fields);
 			}
@@ -85,7 +84,7 @@
 
 		function read_last_entry($fields)
 		{
-			if($this->rights & PHPGW_ACL_READ)
+			if ($this->rights & PHPGW_ACL_READ)
 			{
 				return $this->contacts->read_last_entry($fields);
 			}
@@ -103,7 +102,7 @@
 			{
 				$fields['tid'] = 'n';
 			}
-			if($this->rights & PHPGW_ACL_ADD)
+			if ($this->rights & PHPGW_ACL_ADD)
 			{
 				$ab_id  = $fields['ab_id'];
 				$owner  = $fields['owner'];
@@ -130,26 +129,27 @@
 
 		function update_entry($fields)
 		{
-			if($this->rights & PHPGW_ACL_EDIT)
+			if ($this->rights & PHPGW_ACL_EDIT)
 			{
 				$ab_id  = $fields['ab_id'];
 				$owner  = $fields['owner'];
 				$access = $fields['access'];
 				$cat_id = $fields['cat_id'];
+				$tid = $fields['tid'];
 				unset($fields['owner']);
 				unset($fields['access']);
 				unset($fields['cat_id']);
 				unset($fields['ab_id']);
 				unset($fields['tid']);
 
-				$this->contacts->update($ab_id,$owner,$fields,$access,$cat_id);
+				$this->contacts->update($ab_id,$owner,$fields,$access,$cat_id,$tid);
 			}
 			return;
 		}
 
 		function delete_entry($data)
 		{
-			if($this->rights & PHPGW_ACL_DELETE)
+			if ($this->rights & PHPGW_ACL_DELETE)
 			{
 				$this->contacts->delete($data['id']);
 			}
diff --git a/addressbook/inc/class.uiXport.inc.php b/addressbook/inc/class.uiXport.inc.php
index 4f70be137a..d85898fa7e 100644
--- a/addressbook/inc/class.uiXport.inc.php
+++ b/addressbook/inc/class.uiXport.inc.php
@@ -14,7 +14,7 @@
 
 	class uiXport
 	{
-		var $output = '';
+		var $template;
 		var $public_functions = array(
 			'import' => True,
 			'export' => True
@@ -32,6 +32,7 @@
 
 		function uiXport()
 		{
+			$this->template = $GLOBALS['phpgw']->template;
 			$this->cat      = CreateObject('phpgwapi.categories');
 			$this->bo       = CreateObject('addressbook.boXport',True);
 			$this->browser  = CreateObject('phpgwapi.browser');
@@ -45,28 +46,19 @@
 			$this->cat_id   = $this->bo->cat_id;
 		}
 
-		function totpl()
-		{
-			if(@isset($this->output) && !empty($this->output))
-			{
-				$GLOBALS['phpgw']->template->set_var('phpgw_body', $this->output,True);
-				unset($this->output);
-			}
-		}
-
 		/* Return a select form element with the categories option dialog in it */
 		function cat_option($cat_id='',$notall=False,$java=True,$multiple=False)
 		{
-			if($java)
+			if ($java)
 			{
 				$jselect = ' onChange="this.form.submit();"';
 			}
 			/* Setup all and none first */
 			$cats_link  = "\n" .'<select name="fcat_id'.($multiple?'[]':'').'"' .$jselect . ($multiple ? 'multiple size="3"' : '') . ">\n";
-			if(!$notall)
+			if (!$notall)
 			{
 				$cats_link .= '<option value=""';
-				if($cat_id=='all')
+				if ($cat_id=='all')
 				{
 					$cats_link .= ' selected';
 				}
@@ -74,7 +66,7 @@
 			}
 
 			/* Get global and app-specific category listings */
-			$cats_link .= $this->cat->formatted_list('select','all',$cat_id,True);
+			$cats_link .= $this->cat->formated_list('select','all',$cat_id,True);
 			$cats_link .= '</select>'."\n";
 			return $cats_link;
 		}
@@ -83,11 +75,11 @@
 		{
 			global $convert,$download,$tsvfile,$private,$conv_type,$fcat_id;
 
-			if($convert)
+			if ($convert)
 			{
 				$buffer = $this->bo->import($tsvfile,$conv_type,$private,$fcat_id);
 
-				if($download == '')
+				if ($download == '')
 				{
 					if($conv_type == 'Debug LDAP' || $conv_type == 'Debug SQL' )
 					{
@@ -98,30 +90,36 @@
 					else
 					{
 						$GLOBALS['phpgw']->common->phpgw_header();
+						echo parse_navbar();
 						echo "<pre>$buffer</pre>";
 						echo '<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index') . '">'.lang('OK').'</a>';
+						$GLOBALS['phpgw']->common->phpgw_footer();
 					}
 				}
 				else
 				{
 					$GLOBALS['phpgw']->common->phpgw_header();
+					echo parse_navbar();
 					echo "<pre>$buffer</pre>";
 					echo '<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'). '">'.lang('OK').'</a>';
+					$GLOBALS['phpgw']->common->phpgw_footer();
 				}
+
 			}
 			else
 			{
 				$GLOBALS['phpgw']->common->phpgw_header();
+				echo parse_navbar();
 
 				set_time_limit(0);
 
-				$GLOBALS['phpgw']->template->set_file(array('import' => 'import.tpl'));
+				$this->template->set_file(array('import' => 'import.tpl'));
 
 				$dir_handle = opendir(PHPGW_APP_INC . SEP . 'import');
 				$i=0; $myfilearray = '';
-				while($file = readdir($dir_handle))
+				while ($file = readdir($dir_handle))
 				{
-					if((substr($file, 0, 1) != '.') && is_file(PHPGW_APP_INC . SEP . 'import' . SEP . $file) )
+					if ((substr($file, 0, 1) != '.') && is_file(PHPGW_APP_INC . SEP . 'import' . SEP . $file) )
 					{
 						$myfilearray[$i] = $file;
 						$i++;
@@ -129,92 +127,87 @@
 				}
 				closedir($dir_handle);
 				sort($myfilearray);
-				for($i=0;$i<count($myfilearray);$i++)
+				for ($i=0;$i<count($myfilearray);$i++)
 				{
 					$fname = ereg_replace('_',' ',$myfilearray[$i]);
 					$conv .= '<OPTION VALUE="' . $myfilearray[$i].'">' . $fname . '</OPTION>';
 				}
 
-				$GLOBALS['phpgw']->template->set_var('lang_cancel',lang('Cancel'));
-				$GLOBALS['phpgw']->template->set_var('lang_cat',lang('Select Category'));
-				$GLOBALS['phpgw']->template->set_var('cancel_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
-				$GLOBALS['phpgw']->template->set_var('conversion',lang('Select the type of conversion'));
-				$GLOBALS['phpgw']->template->set_var('export_path',lang('Enter the path to the export file here'));
-				$GLOBALS['phpgw']->template->set_var('navbar_bg',$GLOBALS['phpgw_info']['theme']['navbar_bg']);
-				$GLOBALS['phpgw']->template->set_var('navbar_text',$GLOBALS['phpgw_info']['theme']['navbar_text']);
-				$GLOBALS['phpgw']->template->set_var('mark_private',lang('Mark records as private'));
-				$GLOBALS['phpgw']->template->set_var('help_import',lang('In Netscape, open the Addressbook and select <b>Export</b> from the <b>File</b> menu.<br>The file exported will be in LDIF format.<P>Or, in Outlook, select your Contacts folder, select <b>Import and Export...</b> from'));
-				$GLOBALS['phpgw']->template->set_var('help_import2',lang('the <b>File</b> menu and export your contacts into a comma separated text (CSV) file. <P>Or, in Palm Desktop 4.0 or greater, visit your addressbook and select <b>Export</b> from the <b>File</b> menu. The file exported will be in VCard format.<P>'));
-				$GLOBALS['phpgw']->template->set_var('none',lang('none'));
-				$GLOBALS['phpgw']->template->set_var('debug_browser',lang('Debug output in browser'));
-				$GLOBALS['phpgw']->template->set_var('import_text',lang('Import from LDIF, CSV, or VCard'));
-				$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.import'));
-				$GLOBALS['phpgw']->template->set_var('cat_link',$this->cat_option($this->cat_id,True,False));
-				$GLOBALS['phpgw']->template->set_var('tsvfilename','');
-				$GLOBALS['phpgw']->template->set_var('conv',$conv);
-				$GLOBALS['phpgw']->template->set_var('debug',lang('Debug output in browser'));
-				$GLOBALS['phpgw']->template->set_var('filetype',lang('LDIF'));
-				$GLOBALS['phpgw']->template->set_var('download',lang('Submit'));
-				$GLOBALS['phpgw']->template->set_var('start',$this->start);
-				$GLOBALS['phpgw']->template->set_var('sort',$this->sort);
-				$GLOBALS['phpgw']->template->set_var('order',$this->order);
-				$GLOBALS['phpgw']->template->set_var('filter',$this->filter);
-				$GLOBALS['phpgw']->template->set_var('query',$this->query);
-				$GLOBALS['phpgw']->template->set_var('cat_id',$this->cat_id);
-
-				$this->output = $GLOBALS['phpgw']->template->fp('out','import');
-				$this->totpl();
+				$this->template->set_var('lang_cancel',lang('Cancel'));
+				$this->template->set_var('lang_cat',lang('Select Category'));
+				$this->template->set_var('cancel_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
+				$this->template->set_var('navbar_bg',$GLOBALS['phpgw_info']['theme']['navbar_bg']);
+				$this->template->set_var('navbar_text',$GLOBALS['phpgw_info']['theme']['navbar_text']);
+				$this->template->set_var('import_text',lang('Import from LDIF, CSV, or VCard'));
+				$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.import'));
+				$this->template->set_var('cat_link',$this->cat_option($this->cat_id,True,False));
+				$this->template->set_var('tsvfilename','');
+				$this->template->set_var('conv',$conv);
+				$this->template->set_var('debug',lang('Debug output in browser'));
+				$this->template->set_var('filetype',lang('LDIF'));
+				$this->template->set_var('download',lang('Submit'));
+				$this->template->set_var('start',$this->start);
+				$this->template->set_var('sort',$this->sort);
+				$this->template->set_var('order',$this->order);
+				$this->template->set_var('filter',$this->filter);
+				$this->template->set_var('query',$this->query);
+				$this->template->set_var('cat_id',$this->cat_id);
+				$this->template->pparse('out','import');
 			}
+//			$GLOBALS['phpgw']->common->phpgw_footer();
 		}
 
 		function export()
 		{
 			global $convert,$tsvfilename,$cat_id,$download,$conv_type;
 
-			if($convert)
+			if ($convert)
 			{
-				if($conv_type == 'none')
+				if ($conv_type == 'none')
 				{
 					$GLOBALS['phpgw_info']['flags']['noheader'] = False;
 					$GLOBALS['phpgw_info']['flags']['noheader'] = True;
 					$GLOBALS['phpgw']->common->phpgw_header();
+					echo parse_navbar();
 					echo lang('<b>No conversion type &lt;none&gt; could be located.</b>  Please choose a conversion type from the list');
 					echo '&nbsp<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export') . '">' . lang('OK') . '</a>';
-					$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-					exit;
+					$GLOBALS['phpgw']->common->phpgw_footer();
+					$GLOBALS['phpgw']->common->phpgw_exit();
 				}
 
 				$buffer = $this->bo->export($conv_type,$cat_id);
 
-				if(($download == 'on') || ($conv_type == 'Palm_PDB'))
+				if(($download == 'on') || ($conv_type == 'Palm_PDB') )
 				{
 					// filename, default application/octet-stream, length of file, default nocache True
 					$this->browser->content_header($tsvfilename,'application/x-octet-stream',strlen($buffer));
 					echo $buffer;
-					exit;
 				}
 				else
 				{
 					$GLOBALS['phpgw']->common->phpgw_header();
+					echo parse_navbar();
 					echo "<pre>\n";
 					echo $buffer;
 					echo "\n</pre>\n";
 					echo '<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export') . '">' . lang('OK') . '</a>';
+					$GLOBALS['phpgw']->common->phpgw_footer();
 				}
 			}
 			else
 			{
 				$GLOBALS['phpgw']->common->phpgw_header();
+				echo parse_navbar();
 
 				set_time_limit(0);
-
-				$GLOBALS['phpgw']->template->set_file(array('export' => 'export.tpl'));
+				
+				$this->template->set_file(array('export' => 'export.tpl'));
 
 				$dir_handle = opendir(PHPGW_APP_INC. SEP . 'export');
 				$i=0; $myfilearray = '';
-				while($file = readdir($dir_handle))
+				while ($file = readdir($dir_handle))
 				{
-					if((substr($file, 0, 1) != '.') && is_file(PHPGW_APP_INC . SEP . 'export' . SEP . $file) )
+					if ((substr($file, 0, 1) != '.') && is_file(PHPGW_APP_INC . SEP . 'export' . SEP . $file) )
 					{
 						$myfilearray[$i] = $file;
 						$i++;
@@ -222,36 +215,33 @@
 				}
 				closedir($dir_handle);
 				sort($myfilearray);
-				for($i=0;$i<count($myfilearray);$i++)
+				for ($i=0;$i<count($myfilearray);$i++)
 				{
 					$fname = ereg_replace('_',' ',$myfilearray[$i]);
 					$conv .= '        <option value="'.$myfilearray[$i].'">'.$fname.'</option>'."\n";
 				}
 
-				$GLOBALS['phpgw']->template->set_var('lang_cancel',lang('Cancel'));
-				$GLOBALS['phpgw']->template->set_var('lang_cat',lang('Select Category'));
-				$GLOBALS['phpgw']->template->set_var('cat_link',$this->cat_option($this->cat_id,False,False));
-				$GLOBALS['phpgw']->template->set_var('cancel_url',$GLOBALS['phpgw']->link('/addressbook/index.php'));
-				$GLOBALS['phpgw']->template->set_var('navbar_bg',$GLOBALS['phpgw_info']['theme']['navbar_bg']);
-				$GLOBALS['phpgw']->template->set_var('navbar_text',$GLOBALS['phpgw_info']['theme']['navbar_text']);
-				$GLOBALS['phpgw']->template->set_var('export_text',lang('Export from Addressbook'));
-				$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export'));
-				$GLOBALS['phpgw']->template->set_var('filename',lang('Export file name'));
-				$GLOBALS['phpgw']->template->set_var('conversion',lang('Select the type of conversion'));
-				$GLOBALS['phpgw']->template->set_var('conv',$conv);
-				$GLOBALS['phpgw']->template->set_var('debug',lang(''));
-				$GLOBALS['phpgw']->template->set_var('download',lang('Submit'));
-				$GLOBALS['phpgw']->template->set_var('download_export',lang('Download export file (Uncheck to debug output in browser)'));
-				$GLOBALS['phpgw']->template->set_var('none',lang('none'));
-				$GLOBALS['phpgw']->template->set_var('start',$this->start);
-				$GLOBALS['phpgw']->template->set_var('sort',$this->sort);
-				$GLOBALS['phpgw']->template->set_var('order',$this->order);
-				$GLOBALS['phpgw']->template->set_var('filter',$this->filter);
-				$GLOBALS['phpgw']->template->set_var('query',$this->query);
-				$GLOBALS['phpgw']->template->set_var('cat_id',$this->cat_id);
+				$this->template->set_var('lang_cancel',lang('Cancel'));
+				$this->template->set_var('lang_cat',lang('Select Category'));
+				$this->template->set_var('cat_link',$this->cat_option($this->cat_id,False,False));
+				$this->template->set_var('cancel_url',$GLOBALS['phpgw']->link('/addressbook/index.php'));
+				$this->template->set_var('navbar_bg',$GLOBALS['phpgw_info']['theme']['navbar_bg']);
+				$this->template->set_var('navbar_text',$GLOBALS['phpgw_info']['theme']['navbar_text']);
+				$this->template->set_var('export_text',lang('Export from Addressbook'));
+				$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export'));
+				$this->template->set_var('filename',lang('Export file name'));
+				$this->template->set_var('conv',$conv);
+				$this->template->set_var('debug',lang(''));
+				$this->template->set_var('download',lang('Submit'));
+				$this->template->set_var('start',$this->start);
+				$this->template->set_var('sort',$this->sort);
+				$this->template->set_var('order',$this->order);
+				$this->template->set_var('filter',$this->filter);
+				$this->template->set_var('query',$this->query);
+				$this->template->set_var('cat_id',$this->cat_id);
+				$this->template->pparse('out','export');
 
-				$this->output = $GLOBALS['phpgw']->template->fp('out','export');
-				$this->totpl();
+				$GLOBALS['phpgw']->common->phpgw_footer();
 			}
 		}
 	}
diff --git a/addressbook/inc/class.uiaddressbook.inc.php b/addressbook/inc/class.uiaddressbook.inc.php
index 68f2aa3fc3..2b283a9c61 100644
--- a/addressbook/inc/class.uiaddressbook.inc.php
+++ b/addressbook/inc/class.uiaddressbook.inc.php
@@ -15,7 +15,7 @@
 
 	class uiaddressbook
 	{
-		var $output = '';
+		var $template;
 		var $contacts;
 		var $bo;
 		var $cat;
@@ -25,23 +25,23 @@
 		var $debug = False;
 
 		var $start;
+		var $limit;
 		var $query;
 		var $sort;
 		var $order;
 		var $filter;
 		var $cat_id;
 
+		var $template;
 		var $public_functions = array(
-			'index'  => True,
-			'view'   => True,
-			'add'    => True,
-			'addfromremote' => True,
+			'index' => True,
+			'view' => True,
+			'add'  => True,
 			'add_email' => True,
-			'copy'   => True,
-			'edit'   => True,
+			'copy' => True,
+			'edit' => True,
 			'delete' => True,
-			'preferences'   => True,
-			'remote_search' => True
+			'preferences' => True
 		);
 
 		var $extrafields = array(
@@ -58,6 +58,7 @@
 			$this->fields = CreateObject('addressbook.uifields');
 
 			$this->bo       = CreateObject('addressbook.boaddressbook',True);
+			$this->template = &$GLOBALS['phpgw']->template;
 			$this->contacts = CreateObject('phpgwapi.contacts');
 			$this->cat      = CreateObject('phpgwapi.categories');
 			$this->company  = CreateObject('phpgwapi.categories','addressbook_company');
@@ -66,36 +67,24 @@
 			$this->_set_sessiondata();
 		}
 
-		function totpl()
-		{
-			if(@isset($this->output) && !empty($this->output))
-			{
-				$GLOBALS['phpgw']->template->set_var('phpgw_body', $this->output,True);
-				unset($this->output);
-			}
-		}
-
 		function _set_sessiondata()
 		{
 			$this->start    = $this->bo->start;
+			$this->limit    = $this->bo->limit;
 			$this->query    = $this->bo->query;
-			$this->cquery   = $this->bo->cquery;
 			$this->sort     = $this->bo->sort;
 			$this->order    = $this->bo->order;
 			$this->filter   = $this->bo->filter;
 			$this->cat_id   = $this->bo->cat_id;
-			if($this->debug)
-			{
-				$this->_debug_sqsof();
-			}
+			if($this->debug) { $this->_debug_sqsof(); }
 		}
 
 		function _debug_sqsof()
 		{
 			$data = array(
 				'start'  => $this->start,
+				'limit'  => $this->limit,
 				'query'  => $this->query,
-				'cquery' => $this->cquery,
 				'sort'   => $this->sort,
 				'order'  => $this->order,
 				'filter' => $this->filter,
@@ -110,8 +99,8 @@
 		{
 			$data = array(
 				'start'  => $this->start,
+				'limit'  => $this->limit,
 				'query'  => $this->query,
-				'cquery' => $this->cquery,
 				'sort'   => $this->sort,
 				'order'  => $this->order,
 				'filter' => $this->filter,
@@ -122,7 +111,7 @@
 
 		function formatted_list($name,$list,$id='',$default=False,$java=False)
 		{
-			if($java)
+			if ($java)
 			{
 				$jselect = ' onChange="this.form.submit();"';
 			}
@@ -132,10 +121,10 @@
 			{
 				$select .= '<option value="">' . lang('Please Select') . '</option>'."\n";
 			}
-			while(list($key,$val) = each($list))
+			while (list($key,$val) = each($list))
 			{
 				$select .= '<option value="' . $key . '"';
-				if($key == $id && $id != '')
+				if ($key == $id && $id != '')
 				{
 					$select .= ' selected';
 				}
@@ -151,56 +140,28 @@
 		/* Return a select form element with the categories option dialog in it */
 		function cat_option($cat_id='',$notall=False,$java=True,$multiple=False)
 		{
-			if($java)
+			if ($java)
 			{
 				$jselect = ' onChange="this.form.submit();"';
 			}
 			/* Setup all and none first */
-			$cats_link  = "\n" . '<select name="fcat_id' . ($multiple?'[]':'') . '"' . $jselect . ($multiple ? 'multiple size="3"' : '') . ">\n";
-			if(!$notall)
+			$cats_link  = "\n" .'<select name="fcat_id'.($multiple?'[]':'').'"' .$jselect . ($multiple ? 'multiple size="3"' : '') . ">\n";
+			if (!$notall)
 			{
 				$cats_link .= '<option value=""';
-				if($cat_id == 'all')
+				if ($cat_id=="all")
 				{
 					$cats_link .= ' selected';
 				}
-				$cats_link .= '>' . lang("all") . '</option>'."\n";
+				$cats_link .= '>'.lang("all").'</option>'."\n";
 			}
 
 			/* Get global and app-specific category listings */
-			$cats_link .= $this->cat->formatted_list('select','all',$cat_id,True);
-			$cats_link .= '</select>' . "\n";
+			$cats_link .= $this->cat->formated_list('select','all',$cat_id,True);
+			$cats_link .= '</select>'."\n";
 			return $cats_link;
 		}
 
-		function remote_search_option()
-		{
-			$remote  = CreateObject('addressbook.remote');
-			$servers = $remote->servers;
-			$search_remote = '';
-
-			/* show search box and server dropdown */
-			while(list($server,$data) = @each($servers))
-			{
-				$search_remote .= '      <option value="' . $server . '"';
-				if($server == $this->server)
-				{
-					$search_remote .= ' selected';
-				}
-				$search_remote .= '>' . $server . '</option>' . "\n";
-			}
-
-			return $search_remote;
-		}
-
-		function remote_search()
-		{
-//			_debug_array($GLOBALS['HTTP_POST_VARS']);
-			$remote = CreateObject('addressbook.remote',$GLOBALS['HTTP_POST_VARS']['serverid']);
-			$entries = $remote->search($GLOBALS['HTTP_POST_VARS']['remote_query']);
-			$this->index($entries);
-		}
-
 		/* this cleans up the fieldnames for display */
 		function display_name($column)
 		{
@@ -256,56 +217,23 @@
 				'note'                => 'notes'
 			);
 
-			if($abc[$column])
+			if ($abc[$column])
 			{
 				return lang($abc[$column]);
 			}
 			return;
 		}
 
-		/*
-			Former index.php
-		*/
-		function index($entries='')
+		function index()
 		{
-			$GLOBALS['phpgw']->template->set_file(array('addressbook_list_t' => 'index.tpl'));
-			$GLOBALS['phpgw']->template->set_block('addressbook_list_t','addressbook_header','addressbook_header');
-			$GLOBALS['phpgw']->template->set_block('addressbook_list_t','column','column');
-			$GLOBALS['phpgw']->template->set_block('addressbook_list_t','row','row');
-			$GLOBALS['phpgw']->template->set_block('addressbook_list_t','remsearch','remsearch');
-			$GLOBALS['phpgw']->template->set_block('addressbook_list_t','addressbook_footer','addressbook_footer');
-			$GLOBALS['phpgw']->template->set_block('addressbook_list_t','addressbook_alpha','addressbook_alpha');
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
-			$aar = explode(',',lang('alphabet'));
-			$aar[] = 'all';
-			while(list(,$char) = @each($aar))
-			{
-				if($this->cquery == $char ||
-					($char == 'all' && !$this->cquery))
-				{
-					$GLOBALS['phpgw']->template->set_var('charbgcolor','#000000');
-					$GLOBALS['phpgw']->template->set_var('charcolor','#FFFFFF');
-				}
-				else
-				{
-					$GLOBALS['phpgw']->template->set_var('charbgcolor',$GLOBALS['phpgw_info']['theme']['th_bg']);
-					$GLOBALS['phpgw']->template->set_var('charcolor',$GLOBALS['phpgw_info']['theme']['th_text']);
-				}
-				if($char == 'all')
-				{
-					$GLOBALS['phpgw']->template->set_var('charlink',
-						$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index&cquery=')
-					);
-				}
-				else
-				{
-					$GLOBALS['phpgw']->template->set_var('charlink',
-						$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index&cquery=' . $char)
-					);
-				}
-				$GLOBALS['phpgw']->template->set_var('char',$char != 'all' ? strtoupper($char) : lang('all'));
-				$GLOBALS['phpgw']->template->fp('alphalinks','addressbook_alpha',True);
-			}
+			$this->template->set_file(array('addressbook_list_t' => 'index.tpl'));
+			$this->template->set_block('addressbook_list_t','addressbook_header','addressbook_header');
+			$this->template->set_block('addressbook_list_t','column','column');
+			$this->template->set_block('addressbook_list_t','row','row');
+			$this->template->set_block('addressbook_list_t','addressbook_footer','addressbook_footer');
 
 			$custom = $this->fields->read_custom_fields();
 			$customfields = array();
@@ -315,11 +243,12 @@
 				$namedfields[$y['name']] = $y['title'];
 			}
 
-			if(!$this->cat_id)
+			if ($this->cat_id == -1)
 			{
 				$this->cat_id = $this->prefs['default_category'];
-			} 
-			if($this->prefs['autosave_category'])
+			}
+ 
+			if ($this->prefs['autosave_category'])
 			{
 				$GLOBALS['phpgw']->preferences->read_repository();
 				$GLOBALS['phpgw']->preferences->delete('addressbook','default_category');
@@ -348,15 +277,16 @@
 			}
 			/* Setup the columns for non-standard fields, since we don't allow sorting */
 			$nonstd = $this->extrafields + $customfields;
-			while($column = each($nonstd))
+			while($column = @each($nonstd))
 			{
 				$test = strtolower($column[1]);
-				if(isset($this->prefs[$test]) && $this->prefs[$test])
+				if (isset($this->prefs[$test]) && $this->prefs[$test])
 				{
 					$showcol = $this->display_name($column[0]);
 					/* This must be a custom field */
 					if(!$showcol)
 					{
+//						$showcol = $column[1];
 						$showcol = $namedfields[$column[1]];
 					}
 					$cols .= '  <td height="21">' . "\n";
@@ -369,8 +299,9 @@
 					$columns_to_display[$column[0]] = True;
 				}
 			}
+
 			/* Check if prefs were set, if not, create some defaults */
-			if(!$columns_to_display )
+			if(!$columns_to_display)
 			{
 				$columns_to_display = array(
 					'n_given'  => 'n_given',
@@ -380,13 +311,10 @@
 //				$columns_to_display = $columns_to_display + $customfields;
 				/* No prefs,. so cols above may have been set to '' or a bunch of <td></td> */
 				$cols='';
-				while($column = each($columns_to_display))
+				while ($column = each($columns_to_display))
 				{
 					$showcol = $this->display_name($column[0]);
-					if(!$showcol)
-					{
-						$showcol = $column[1];
-					}
+					if (!$showcol) { $showcol = $column[1]; }
 					$cols .= '  <td height="21">' . "\n";
 					$cols .= '    <font size="-1" face="Arial, Helvetica, sans-serif">';
 					$cols .= $GLOBALS['phpgw']->nextmatchs->show_sort_order($this->sort,
@@ -405,11 +333,11 @@
 			if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] &&
 				$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
 			{
-				$limit = $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+				$this->limit = $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
 			}
 			else
 			{
-				$limit = 30;
+				$this->limit = 15;
 			}
 
 			/*global $filter; */
@@ -431,7 +359,7 @@
 			else they may be accounts, etc.
 			*/
 			$qfilter = 'tid=n';
-			switch($this->filter)
+			switch ($this->filter)
 			{
 				case 'blank':
 					$nosearch = True;
@@ -446,204 +374,181 @@
 				default:
 					$qfilter .= ',owner=' . $this->filter;
 			}
-			if($this->cat_id)
+			if ($this->cat_id)
 			{
 				$qfilter .= ',cat_id='.$this->cat_id;
 			}
  
-			if(!$userid)
+			if (!$userid)
 			{
 				$userid = $GLOBALS['phpgw_info']['user']['account_id'];
 			}
 
-			if($nosearch && !$this->query && !$entries)
+			if ($nosearch && !$this->query)
 			{
 				$entries = array();
 				$total_records = 0;
 			}
-			elseif(!$entries)
+			else
 			{
 				/* read the entry list */
 				$entries = $this->bo->read_entries(array(
 					'start'  => $this->start,
-					'limit'  => $limit,
+					'limit'  => $this->limit,
 					'fields' => $columns_to_display,
 					'filter' => $qfilter,
 					'query'  => $this->query,
-					'cquery' => $this->cquery,
 					'sort'   => $this->sort,
 					'order'  => $this->order
 				));
 				$total_records = $this->bo->total;
-				$GLOBALS['phpgw']->template->set_var('lang_view',lang('View'));
-			}
-			else
-			{
-				$total_records = count($entries);
-				$GLOBALS['phpgw']->template->set_var('lang_view',lang('Add'));
-				$showadd = True;
 			}
 
+			/* global here so nextmatchs accepts our setting of $query and $filter */
+			$GLOBALS['query']  = $this->query;
+			$GLOBALS['filter'] = $this->filter;
+
 			$search_filter = $GLOBALS['phpgw']->nextmatchs->show_tpl('/index.php',
 				$this->start, $total_records,'&menuaction=addressbook.uiaddressbook.index&fcat_id='.$this->cat_id,'75%',
-				$GLOBALS['phpgw_info']['theme']['th_bg'],1,1,1,1,$this->cat_id);
+				$GLOBALS['phpgw_info']['theme']['th_bg'],1,1,1,array('filter'=>$this->filter,'yours'=>1),
+				$this->cat_id);
+			$query = $filter = '';
 
 			$lang_showing = $GLOBALS['phpgw']->nextmatchs->show_hits($total_records,$this->start);
 
 			/* set basic vars and parse the header */
-			$GLOBALS['phpgw']->template->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
-			$GLOBALS['phpgw']->template->set_var('row_on',$GLOBALS['phpgw_info']['theme']['row_on']);
-//			$GLOBALS['phpgw']->template->set_var('lang_view',lang('View'));
-			$GLOBALS['phpgw']->template->set_var('lang_vcard',lang('VCard'));
-			$GLOBALS['phpgw']->template->set_var('lang_edit',lang('Edit'));
-			$GLOBALS['phpgw']->template->set_var('lang_owner',lang('Owner'));
-			$GLOBALS['phpgw']->template->set_var('lang_go',lang('Go'));
+			$this->template->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
+			$this->template->set_var('lang_view',lang('View'));
+			$this->template->set_var('lang_vcard',lang('VCard'));
+			$this->template->set_var('lang_edit',lang('Edit'));
+			$this->template->set_var('lang_owner',lang('Owner'));
 
-			$GLOBALS['phpgw']->template->set_var('searchreturn',$noprefs . ' ' . $searchreturn);
-			$GLOBALS['phpgw']->template->set_var('lang_showing',$lang_showing);
-			$GLOBALS['phpgw']->template->set_var('search_filter',$search_filter);
-			$GLOBALS['phpgw']->template->set_var('cats',lang('Category'));
-			$GLOBALS['phpgw']->template->set_var('cats_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
-			/* $GLOBALS['phpgw']->template->set_var('cats_link',$this->cat_option($this->cat_id)); */
-			$GLOBALS['phpgw']->template->set_var('lang_cats',lang('Select'));
-			$GLOBALS['phpgw']->template->set_var('lang_addressbook',lang('Address book'));
-			$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
-			$GLOBALS['phpgw']->template->set_var('th_font',$GLOBALS['phpgw_info']['theme']['font']);
-			$GLOBALS['phpgw']->template->set_var('th_text',$GLOBALS['phpgw_info']['theme']['th_text']);
-			$GLOBALS['phpgw']->template->set_var('lang_add',lang('Add'));
-			$GLOBALS['phpgw']->template->set_var('add_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add'));
-			$GLOBALS['phpgw']->template->set_var('lang_addvcard',lang('AddVCard'));
-			$GLOBALS['phpgw']->template->set_var('vcard_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uivcard.in'));
-			$GLOBALS['phpgw']->template->set_var('lang_import',lang('Import Contacts'));
-			$GLOBALS['phpgw']->template->set_var('import_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.import'));
-			$GLOBALS['phpgw']->template->set_var('lang_import_alt',lang('Alt. CSV Import'));
-			$GLOBALS['phpgw']->template->set_var('import_alt_url',$GLOBALS['phpgw']->link('/addressbook/csv_import.php'));
-			$GLOBALS['phpgw']->template->set_var('lang_export',lang('Export Contacts'));
-			$GLOBALS['phpgw']->template->set_var('export_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export'));
+			$this->template->set_var('searchreturn',$noprefs . ' ' . $searchreturn);
+			$this->template->set_var('lang_showing',$lang_showing);
+			$this->template->set_var('search_filter',$search_filter);
+			$this->template->set_var('cats',lang('Category'));
+			$this->template->set_var('cats_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
+			/* $this->template->set_var('cats_link',$this->cat_option($this->cat_id)); */
+			$this->template->set_var('lang_cats',lang('Select'));
+//			$this->template->set_var('lang_addressbook',lang('Address book'));
+			$this->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
+			$this->template->set_var('th_font',$GLOBALS['phpgw_info']['theme']['font']);
+			$this->template->set_var('th_text',$GLOBALS['phpgw_info']['theme']['th_text']);
+			$this->template->set_var('lang_add',lang('Add'));
+			$this->template->set_var('add_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add'));
+			$this->template->set_var('lang_addvcard',lang('AddVCard'));
+			$this->template->set_var('vcard_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uivcard.in'));
+			$this->template->set_var('lang_import',lang('Import Contacts'));
+			$this->template->set_var('import_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.import'));
+			$this->template->set_var('lang_import_alt',lang('Alt. CSV Import'));
+			$this->template->set_var('import_alt_url',$GLOBALS['phpgw']->link('/addressbook/csv_import.php'));
+			$this->template->set_var('lang_export',lang('Export Contacts'));
+			$this->template->set_var('export_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export'));
 
-			$GLOBALS['phpgw']->template->set_var('start',$this->start);
-			$GLOBALS['phpgw']->template->set_var('sort',$this->sort);
-			$GLOBALS['phpgw']->template->set_var('order',$this->order);
-			$GLOBALS['phpgw']->template->set_var('filter',$this->filter);
-			$GLOBALS['phpgw']->template->set_var('query',$this->query);
-			$GLOBALS['phpgw']->template->set_var('cat_id',$this->cat_id);
+			$this->template->set_var('start',$this->start);
+			$this->template->set_var('sort',$this->sort);
+			$this->template->set_var('order',$this->order);
+			$this->template->set_var('filter',$this->filter);
+			$this->template->set_var('query',$this->query);
+			$this->template->set_var('cat_id',$this->cat_id);
 
-			$GLOBALS['phpgw']->template->set_var('qfield',$qfield);
-			$GLOBALS['phpgw']->template->set_var('cols',$cols);
+			$this->template->set_var('qfield',$qfield);
+			$this->template->set_var('cols',$cols);
 
-			if(@isset($GLOBALS['phpgw_info']['server']['enable_remote_addressbook']))
-			{
-				$GLOBALS['phpgw']->template->set_var('remote_search',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.remote_search'));
-				$GLOBALS['phpgw']->template->set_var('remote_query',$GLOBALS['HTTP_POST_VARS']['remote_query']);
-				$GLOBALS['phpgw']->template->set_var('lang_remote_search',lang('Remote Search'));
-				$GLOBALS['phpgw']->template->set_var('search_remote',$this->remote_search_option());
-				$GLOBALS['phpgw']->template->fp('remotesearch','remsearch');
-			}
-			else
-			{
-				$GLOBALS['phpgw']->template->set_var('remotesearch','');
-			}
-			$this->output .= $GLOBALS['phpgw']->template->parse('out','addressbook_header');
+			$this->template->pparse('out','addressbook_header');
 
 			/* Show the entries */
 			/* each entry */
-			for($i=0;$i<count($entries);$i++)
+			for ($i=0;$i<count($entries);$i++)
 			{
-				$GLOBALS['phpgw']->template->set_var('columns','');
+				$this->template->set_var('columns','');
 				$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
-				$GLOBALS['phpgw']->template->set_var('row_tr_color',$tr_color);
+				$this->template->set_var('row_tr_color',$tr_color);
 				$myid    = $entries[$i]['id'];
 				$myowner = $entries[$i]['owner'];
 
 				/* each entry column */
 				@reset($columns_to_display);
-				while($column = @each($columns_to_display))
+				while ($column = @each($columns_to_display))
 				{
-					$ref = $data = '';
+					$ref = $data='';
 					$coldata = $entries[$i][$column[0]];
 					/* echo '<br>coldata="' . $coldata . '"'; */
 					/* Some fields require special formatting. */
-					if($column[0] == 'url')
+					if ($column[0] == 'url')
 					{
-						if(!empty($coldata) && (substr($coldata,0,7) != 'http://'))
-						{
-							$coldata = 'http://' . $coldata;
-						}
-						$ref  = '<a href="' . $coldata . '" target="_new">';
-						$data = $coldata . '</a>';
+						if ( !empty($coldata) && (substr($coldata,0,7) != 'http://') ) { $coldata = 'http://' . $coldata; }
+						$ref='<a href="'.$coldata.'" target="_new">';
+						$data=$coldata.'</a>';
 					}
-					elseif(($column[0] == 'email') || ($column[0] == 'email_home'))
+					elseif ( ($column[0] == 'email') || ($column[0] == 'email_home') )
 					{
-						if($GLOBALS['phpgw_info']['user']['apps']['email'])
+						if ($GLOBALS['phpgw_info']['user']['apps']['email'])
 						{
-							$ref = '<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=email.uicompose.compose&to=' . urlencode($coldata)) . '" target="_new">';
+							$ref='<a href="'.$GLOBALS['phpgw']->link("/email/compose.php","to=" . urlencode($coldata)).'" target="_new">';
 						}
 						else
 						{
-							$ref = '<a href="mailto:'.$coldata.'">';
+							$ref='<a href="mailto:'.$coldata.'">';
 						}
-						$data = $coldata . '</a>';
+						$data=$coldata . '</a>';
 					}
 					else /* But these do not */
 					{
-						$ref  = '';
-						$data = $coldata;
+						$ref = ''; $data = $coldata;
 					}
-					$GLOBALS['phpgw']->template->set_var('col_data',$ref . $data);
-					$GLOBALS['phpgw']->template->parse('columns','column',True);
+					$this->template->set_var('col_data',$ref.$data);
+					$this->template->parse('columns','column',True);
 				}
 
-				if(!$showadd)
+				if (1)
 				{
-					$GLOBALS['phpgw']->template->set_var('row_view_link',$GLOBALS['phpgw']->link('/index.php',
-						'menuaction=addressbook.uiaddressbook.view&ab_id=' . $entries[$i]['id']));
+					$this->template->set_var('row_view_link',$GLOBALS['phpgw']->link('/index.php',
+						'menuaction=addressbook.uiaddressbook.view&ab_id='.$entries[$i]['id']));
 				}
 				else
 				{
-					$GLOBALS['phpgw']->template->set_var('row_view_link',$GLOBALS['phpgw']->link('/index.php',
-						'menuaction=addressbook.uiaddressbook.addfromremote&fields=' . urlencode(serialize($entries[$i]))));
-//					$GLOBALS['phpgw']->template->set_var('lang_view',lang('Add'));
+					$this->template->set_var('row_view_link','');
+					$this->template->set_var('lang_view',lang('Private'));
 				}
 
-				$GLOBALS['phpgw']->template->set_var('row_vcard_link',$GLOBALS['phpgw']->link('/index.php',
+				$this->template->set_var('row_vcard_link',$GLOBALS['phpgw']->link('/index.php',
 					'menuaction=addressbook.uivcard.out&ab_id='.$entries[$i]['id']));
-
 				/* echo '<br>: ' . $contacts->grants[$myowner] . ' - ' . $myowner; */
-				if($this->contacts->check_perms($this->contacts->grants[$myowner],PHPGW_ACL_EDIT) ||
-					$myowner == $GLOBALS['phpgw_info']['user']['account_id'])
+				if ($this->contacts->check_perms($this->contacts->grants[$myowner],PHPGW_ACL_EDIT) || $myowner == $GLOBALS['phpgw_info']['user']['account_id'])
 				{
-					$GLOBALS['phpgw']->template->set_var('row_edit','<a href="' . $GLOBALS['phpgw']->link('/index.php',
+					$this->template->set_var('row_edit','<a href="' . $GLOBALS['phpgw']->link('/index.php',
 						'menuaction=addressbook.uiaddressbook.edit&ab_id='.$entries[$i]['id']) . '">' . lang('Edit') . '</a>');
 				}
 				else
 				{
-					$GLOBALS['phpgw']->template->set_var('row_edit','&nbsp;');
+					$this->template->set_var('row_edit','&nbsp;');
 				}
 
-				$GLOBALS['phpgw']->template->set_var('row_owner',$GLOBALS['phpgw']->accounts->id2name($myowner));
+				$this->template->set_var('row_owner',$GLOBALS['phpgw']->accounts->id2name($myowner));
 
-				$GLOBALS['phpgw']->template->parse('rows','row',True);
-				$this->output .= $GLOBALS['phpgw']->template->fp('out','row');
+				$this->template->parse('rows','row',True);
+				$this->template->pparse('out','row');
 				reset($columns_to_display);
 			}
 
-			$this->output .= $GLOBALS['phpgw']->template->fp('out','addressbook_footer');
+			$this->template->pparse('out','addressbook_footer');
 			$this->save_sessiondata();
-			$this->totpl();
+			/* $GLOBALS['phpgw']->common->phpgw_footer(); */
 		}
 
 		function add_email()
 		{
-			$name      = $GLOBALS['HTTP_POST_VARS']['name'] ? $GLOBALS['HTTP_POST_VARS']['name'] : $GLOBALS['HTTP_GET_VARS']['name'];
-			$referer   = $GLOBALS['HTTP_POST_VARS']['referer'] ? $GLOBALS['HTTP_POST_VARS']['referer'] : $GLOBALS['HTTP_GET_VARS']['referer'];
-			$add_email = $GLOBALS['HTTP_POST_VARS']['add_email'] ? $GLOBALS['HTTP_POST_VARS']['add_email'] : $GLOBALS['HTTP_GET_VARS']['add_email'];
+			$name      = $_POST['name'] ? $_POST['name'] : $_GET['name'];
+			$referer   = $_POST['referer'] ? $_POST['referer'] : $_GET['referer'];
+			$add_email = $_POST['add_email'] ? $_POST['add_email'] : $_GET['add_email'];
 
 			$named = explode(' ', $name);
-			for($i=count($named);$i>=0;$i--)
+			for ($i=count($named);$i>=0;$i--)
 			{
 				$names[$i] = $named[$i];
 			}
-			if($names[2])
+			if ($names[2])
 			{
 				$fields['n_given']  = $names[0];
 				$fields['n_middle'] = $names[1];
@@ -673,31 +578,23 @@
 
 		function copy()
 		{
-			$addnew = $this->bo->read_entry(array('id' => $GLOBALS['ab_id'], 'fields' => $this->contacts->stock_contact_fields));
+			list($addnew) = $this->bo->read_entry(array(
+				'id' => $_GET['ab_id'],
+				'fields' => $this->contacts->stock_contact_fields
+			));
 
-			$addnew[0]['note'] .= "\nCopied from " . $GLOBALS['phpgw']->accounts->id2name($addnew[0]['owner']).", record #".$addnew[0]['id'].'.';
-			$addnew[0]['owner'] = $GLOBALS['phpgw_info']['user']['account_id'];
-			unset($addnew[0]['id']);
-			$fields = $addnew[0];
+			$addnew['note'] .= "\n".lang("Copied by %1, from record #%2.",$GLOBALS['phpgw']->accounts->id2name($addnew['owner']),$addnew['id']);
+			$addnew['owner'] = $GLOBALS['phpgw_info']['user']['account_id'];
+			unset($addnew['id']);
 
-			$ab_id = $this->bo->add_entry($fields);
+			$ab_id = $this->bo->add_entry($addnew);
 
-			Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.edit&ab_id=' . $ab_id));
-		}
-
-		function addfromremote()
-		{
-			$fields = get_var('fields',array('GET'));
-			$fields = stripslashes(urldecode($fields));
-			$fields = unserialize($fields);
-			$fields['note'] = "\nCopied from remote search.";
-			$ab_id = $this->bo->add_entry($fields);
-			Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.edit&ab_id=' . $ab_id));
+			$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=addressbook.uiaddressbook.edit&ab_id=' . $ab_id);
 		}
 
 		function add()
 		{
-			if($GLOBALS['HTTP_POST_VARS']['submit'])
+			if ($_POST['submit'])
 			{
 				$fields = $this->get_form();
 
@@ -708,19 +605,18 @@
 				$this->bo->add_entry($fields);
 
 				$ab_id = $this->bo->get_lastid();
-				$GLOBALS['ab_id'] = $ab_id;
-				$GLOBALS['phpgw']->hooks->process('addressbook_save');
 
 				Header('Location: '
 					. $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id=' . $ab_id . '&referer=' . $referer));
-				$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-				exit;
+				$GLOBALS['phpgw']->common->phpgw_exit();
 			}
 
-			$GLOBALS['phpgw']->template->set_file(array('add' => 'add.tpl'));
+			$this->template->set_file(array('add' => 'add.tpl'));
+
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
 			$custom = $this->fields->read_custom_fields();
-			$customfields = array();
 			while(list($x,$y) = @each($custom))
 			{
 				$customfields[$y['name']] = $y['title'];
@@ -728,26 +624,22 @@
 
 			$this->addressbook_form('','menuaction=addressbook.uiaddressbook.add','Add','',$customfields,$this->cat_id);
 
-			$GLOBALS['phpgw']->template->set_var('lang_ok',lang('ok'));
-			$GLOBALS['phpgw']->template->set_var('lang_clear',lang('clear'));
-			$GLOBALS['phpgw']->template->set_var('lang_cancel',lang('cancel'));
-			$GLOBALS['phpgw']->template->set_var('cancel_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
-			$this->output .= $GLOBALS['phpgw']->template->parse('out','add');
-			$this->output .= $GLOBALS['phpgw']->template->parse('out','add');
-			$this->totpl();
-			$GLOBALS['phpgw']->hooks->process('addressbook_add');
+			$this->template->set_var('lang_save',lang('Save'));
+			$this->template->set_var('lang_cancel',lang('Cancel'));
+			$this->template->set_var('cancel_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
+			$this->template->parse('out','add');
+			$this->template->pparse('out','add');
 		}
 
 		function edit()
 		{
-			if($GLOBALS['HTTP_POST_VARS']['submit'])
+			if ($_POST['submit'])
 			{
 				$_fields = $this->get_form();
 				/* _debug_array($_fields);exit; */
 				$check = $this->bo->read_entry(array('id' => $_fields['ab_id'], 'fields' => array('owner' => 'owner','tid' => 'tid')));
 
-				if(($this->contacts->grants[$check[0]['owner']] & PHPGW_ACL_EDIT) &&
-					$check[0]['owner'] != $GLOBALS['phpgw_info']['user']['account_id'])
+				if (($this->contacts->grants[$check[0]['owner']] & PHPGW_ACL_EDIT) && $check[0]['owner'] != $GLOBALS['phpgw_info']['user']['account_id'])
 				{
 					$userid = $check[0]['owner'];
 				}
@@ -760,28 +652,27 @@
 				unset($_fields['referer']);
 
 				$this->bo->update_entry($_fields);
-				$GLOBALS['ab_id'] = $_fields['ab_id'];
-				$GLOBALS['phpgw']->hooks->process('addressbook_save');
 
 				Header('Location: '
 					. $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id=' . $_fields['ab_id'] . '&referer=' . $referer)
 				);
 
-				$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-				exit;
+				$GLOBALS['phpgw']->common->phpgw_exit();
 			}
 
 			/* First, make sure they have permission to this entry */
-			$check = $this->bo->read_entry(array('id' => $GLOBALS['HTTP_GET_VARS']['ab_id'], 'fields' => array('owner' => 'owner','tid' => 'tid')));
+			$check = $this->bo->read_entry(array('id' => $_GET['ab_id'], 'fields' => array('owner' => 'owner','tid' => 'tid')));
 
-			if(!$this->contacts->check_perms($this->contacts->grants[$check[0]['owner']],PHPGW_ACL_EDIT) &&
-				($check[0]['owner'] != $GLOBALS['phpgw_info']['user']['account_id']))
+			if ( !$this->contacts->check_perms($this->contacts->grants[$check[0]['owner']],PHPGW_ACL_EDIT) &&
+				($check[0]['owner'] != $GLOBALS['phpgw_info']['user']['account_id']) )
 			{
 				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
-				$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-				exit;
+				$GLOBALS['phpgw']->common->phpgw_exit();
 			}
 
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+
 			/* Read in user custom fields, if any */
 			$custom = $this->fields->read_custom_fields();
 			$customfields = array();
@@ -792,68 +683,65 @@
 
 			/* merge in extra fields */
 			$qfields = $this->contacts->stock_contact_fields + $this->extrafields + $customfields;
-			$fields = $this->bo->read_entry(array('id' => $GLOBALS['HTTP_GET_VARS']['ab_id'], 'fields' => $qfields));
+			$fields = $this->bo->read_entry(array('id' => $_GET['ab_id'], 'fields' => $qfields));
 
 			$this->addressbook_form('edit','menuaction=addressbook.uiaddressbook.edit',lang('Edit'),$fields[0],$customfields);
 
-			$GLOBALS['phpgw']->template->set_file(array('edit' => 'edit.tpl'));
+			$this->template->set_file(array('edit' => 'edit.tpl'));
 
-			$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
-			$GLOBALS['phpgw']->template->set_var('ab_id',$GLOBALS['HTTP_GET_VARS']['ab_id']);
-			$GLOBALS['phpgw']->template->set_var('tid',$check[0]['tid']);
-			$GLOBALS['phpgw']->template->set_var('referer',$referer);
-			$GLOBALS['phpgw']->template->set_var('lang_ok',lang('ok'));
-			$GLOBALS['phpgw']->template->set_var('lang_clear',lang('clear'));
-			$GLOBALS['phpgw']->template->set_var('lang_cancel',lang('cancel'));
-			$GLOBALS['phpgw']->template->set_var('lang_submit',lang('submit'));
-			$GLOBALS['phpgw']->template->set_var('cancel_link','<form method="POST" action="'
+			$this->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
+			$this->template->set_var('ab_id',$_GET['ab_id']);
+			$this->template->set_var('tid',$check[0]['tid']);
+			$this->template->set_var('referer',$referer);
+			$this->template->set_var('lang_save',lang('Save'));
+			$this->template->set_var('lang_cancel',lang('Cancel'));
+			$this->template->set_var('cancel_link','<form method="POST" action="'
 				. $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index') . '">');
 
-			if(($this->contacts->grants[$check[0]['owner']] & PHPGW_ACL_DELETE) ||
-				$check[0]['owner'] == $GLOBALS['phpgw_info']['user']['account_id'])
+			if (($this->contacts->grants[$check[0]['owner']] & PHPGW_ACL_DELETE) || $check[0]['owner'] == $GLOBALS['phpgw_info']['user']['account_id'])
 			{
-				$GLOBALS['phpgw']->template->set_var('delete_link','<form method="POST" action="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.delete') . '">');
-				$GLOBALS['phpgw']->template->set_var('delete_button','<input type="submit" name="delete" value="' . lang('Delete') . '">');
+				$this->template->set_var('delete_link','<form method="POST" action="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.delete') . '">');
+				$this->template->set_var('delete_button','<input type="submit" name="delete" value="' . lang('Delete') . '">');
 			}
 
-			$this->output .= $GLOBALS['phpgw']->template->fp('out','edit');
-			$this->totpl();
-			$GLOBALS['phpgw']->hooks->process('addressbook_edit');
+			$this->template->pfp('out','edit');
 		}
 
 		function delete()
 		{
-			$ab_id = $GLOBALS['HTTP_POST_VARS']['entry']['ab_id'] ? $GLOBALS['HTTP_POST_VARS']['entry']['ab_id'] : $GLOBALS['HTTP_POST_VARS']['ab_id'];
-			$confirm = $GLOBALS['HTTP_GET_VARS']['confirm'] ? $GLOBALS['HTTP_GET_VARS']['confirm'] :$GLOBALS['HTTP_POST_VARS']['confirm'];
-			if(!$ab_id)
+			$ab_id = $_POST['entry']['ab_id'] ? $_POST['entry']['ab_id'] : $_POST['ab_id'];
+			$confirm = $_GET['confirm'] ? $_GET['confirm'] :$_POST['confirm'];
+			if (!$ab_id)
 			{
-				$ab_id = $GLOBALS['HTTP_GET_VARS']['ab_id'];		// else plain Link in delete does not work
+				$ab_id = $_GET['ab_id'];		// else plain Link in delete does not work
 			}
-			if(!$ab_id)
+			if (!$ab_id || $_POST['no'])
 			{
 				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
 			}
 
 			$check = $this->bo->read_entry(array('id' => $ab_id, 'fields' => array('owner' => 'owner','tid' => 'tid')));
 
-			if(!(($this->contacts->grants[$check[0]['owner']] & PHPGW_ACL_DELETE) ||
-				$check[0]['owner'] == $GLOBALS['phpgw_info']['user']['account_id']))
+			if (!(($this->contacts->grants[$check[0]['owner']] & PHPGW_ACL_DELETE) || $check[0]['owner'] == $GLOBALS['phpgw_info']['user']['account_id']))
 			{
 				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
-				$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-				exit;
+				$GLOBALS['phpgw']->common->phpgw_exit();
 			}
 
-			$GLOBALS['phpgw']->template->set_file(array('delete' => 'delete.tpl'));
+			$this->template->set_file(array('delete' => 'delete.tpl'));
 
-			if($confirm != 'true')
+			if (!$_POST['yes'])
 			{
-				$GLOBALS['phpgw']->template->set_var('lang_sure',lang('Are you sure you want to delete this entry ?'));
-				$GLOBALS['phpgw']->template->set_var('no_link',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
-				$GLOBALS['phpgw']->template->set_var('lang_no',lang('NO'));
-				$GLOBALS['phpgw']->template->set_var('yes_link',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.delete&ab_id=' . $ab_id . '&confirm=true'));
-				$GLOBALS['phpgw']->template->set_var('lang_yes',lang('YES'));
-				$this->output .= $GLOBALS['phpgw']->template->parse('out','delete');
+				$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Addressbook').' - '.lang('Delete');
+				$GLOBALS['phpgw']->common->phpgw_header();
+				echo parse_navbar();
+
+				$this->template->set_var('lang_sure',lang('Are you sure you want to delete this entry ?'));
+				$this->template->set_var('no_link',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
+				$this->template->set_var('lang_no',lang('NO'));
+				$this->template->set_var('yes_link',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.delete&ab_id=' . $ab_id . '&confirm=true'));
+				$this->template->set_var('lang_yes',lang('YES'));
+				$this->template->pparse('out','delete');
 
 			}
 			else
@@ -861,14 +749,13 @@
 				$this->bo->delete_entry(array('id' => $ab_id));
 				@Header('Location: ' . $GLOBALS['phpgw']->link('/addressbook/index.php','menuaction=addressbook.uiaddressbook.index'));
 			}
-			$this->totpl();
 		}
 
 		function view()
 		{
-			$ab_id   = $GLOBALS['HTTP_GET_VARS']['ab_id'];
-			$submit  = $GLOBALS['HTTP_POST_VARS']['submit'];
-			$referer = $GLOBALS['HTTP_GET_VARS']['referer'];
+			$ab_id   = $_GET['ab_id'];
+			$submit  = $_POST['submit'];
+			$referer = $_GET['referer'];
 
 			/* First, make sure they have permission to this entry */
 			$check = $this->bo->read_entry(array('id' => $ab_id, 'fields' => array('owner' => 'owner','tid' => 'tid')));
@@ -876,25 +763,29 @@
 			$tmp = $check[0]['owner'];
 			$perms = $this->contacts->check_perms($this->contacts->grants[$tmp],PHPGW_ACL_READ);
 
-			if((!$perms) && ($check[0]['owner'] != $GLOBALS['phpgw_info']['user']['account_id']))
+			if ( (!$perms) && ($check[0]['owner'] != $GLOBALS['phpgw_info']['user']['account_id']) )
 			{
 				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
-				$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-				exit;
+				$GLOBALS['phpgw']->common->phpgw_exit();
 			}
 
-			if(!$ab_id)
+			if (!$ab_id)
 			{
 				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
-				$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-				exit;
+				$GLOBALS['phpgw']->common->phpgw_exit();
+			}
+			elseif (!$submit && $ab_id)
+			{
+				$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Address book - view');
+				$GLOBALS['phpgw']->common->phpgw_header();
+				echo parse_navbar();
 			}
 
-			$GLOBALS['phpgw']->template->set_file(array('view_t' => 'view.tpl'));
-			$GLOBALS['phpgw']->template->set_block('view_t','view_header','view_header');
-			$GLOBALS['phpgw']->template->set_block('view_t','view_row','view_row');
-			$GLOBALS['phpgw']->template->set_block('view_t','view_footer','view_footer');
-			$GLOBALS['phpgw']->template->set_block('view_t','view_buttons','view_buttons');
+			$this->template->set_file(array('view_t' => 'view.tpl'));
+			$this->template->set_block('view_t','view_header','view_header');
+			$this->template->set_block('view_t','view_row','view_row');
+			$this->template->set_block('view_t','view_footer','view_footer');
+			$this->template->set_block('view_t','view_buttons','view_buttons');
 
 			$custom = $this->fields->read_custom_fields();
 			$customfields = array();
@@ -904,34 +795,15 @@
 			}
 
 			/* _debug_array($this->prefs); */
-			while(list($column,$x) = each($this->contacts->stock_contact_fields))
+			while (list($column,$x) = each($this->contacts->stock_contact_fields))
 			{
-				if(isset($this->prefs[$column]) && $this->prefs[$column])
+				if (isset($this->prefs[$column]) && $this->prefs[$column])
 				{
 					$columns_to_display[$column] = True;
 					$colname[$column] = $column;
 				}
 			}
 
-			/* No prefs? */
-			if(!$columns_to_display )
-			{
-				$columns_to_display = array(
-					'n_given'    => 'n_given',
-					'n_family'   => 'n_family',
-					'org_name'   => 'org_name',
-					'tel_work'   => 'tel_work',
-					'tel_home'   => 'tel_home',
-					'email'      => 'email',
-					'email_home' => 'email_home'
-				);
-				while($column = each($columns_to_display))
-				{
-					$colname[$column[0]] = $column[1];
-				}
-				$noprefs = ' - ' . lang('Please set your preferences for this application');
-			}
-
 			/* merge in extra fields */
 			$qfields = $this->contacts->stock_contact_fields + $this->extrafields + $customfields;
 
@@ -939,7 +811,7 @@
 
 			$record_owner = $fields[0]['owner'];
 
-			if($fields[0]['access'] == 'private')
+			if ($fields[0]['access'] == 'private')
 			{
 				$access_check = lang('private');
 			}
@@ -948,41 +820,39 @@
 				$access_check = lang('public');
 			}
 
-			$GLOBALS['phpgw']->template->set_var('lang_viewpref',lang('Address book - view') . $noprefs);
-
 			unset($qfields['email_type']);		// noone is useing that any more
-			unset($qfields['privat_email_type']);
+			unset($qfields['email_home_type']);
 
 			@reset($qfields);
-			while(list($column,$null) = @each($qfields))
+			while (list($column,$null) = @each($qfields))
 			{
 				if($this->display_name($colname[$column]))
 				{
-					$GLOBALS['phpgw']->template->set_var('display_col',$this->display_name($colname[$column]));
+					$this->template->set_var('display_col',$this->display_name($colname[$column]));
 				}
 				elseif($this->display_name($column))
 				{
-					$GLOBALS['phpgw']->template->set_var('display_col',$this->display_name($column));
+					$this->template->set_var('display_col',$this->display_name($column));
 				}
 				else
 				{
-					$GLOBALS['phpgw']->template->set_var('display_col',ucfirst($column));
+					$this->template->set_var('display_col',ucfirst($column));
 				}
 				$ref = $data = '';
-				if($fields[0][$column])
+				if ($fields[0][$column])
 				{
 					$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
-					$GLOBALS['phpgw']->template->set_var('th_bg',$tr_color);
+					$this->template->set_var('th_bg',$tr_color);
 					$coldata = $fields[0][$column];
 					/* Some fields require special formatting. */
-					if(($column == 'note' || $column == 'pubkey') && $coldata)
+					if ( ($column == 'note' || $column == 'pubkey') && $coldata )
 					{
 						$datarray = explode ("\n",$coldata);
-						if($datarray[1])
+						if ($datarray[1])
 						{
-							while(list($key,$info) = each ($datarray))
+							while (list($key,$info) = each ($datarray))
 							{
-								if($key)
+								if ($key)
 								{
 									$data .= '</td></tr><tr bgcolor="'.$tr_color.'"><td width="30%">&nbsp;</td><td width="70%">' .$info;
 								}
@@ -1004,11 +874,12 @@
 						$ref = '<a href="' . $coldata . '" target="_new">';
 						$data = $coldata . '</a>';
 					}
-					elseif((($column == 'email') || ($column == 'email_home')) && $coldata)
+					elseif ( (($column == 'email') || ($column == 'email_home')) && $coldata)
 					{
-						if($GLOBALS['phpgw_info']['user']['apps']['email'])
+						if ($GLOBALS['phpgw_info']['user']['apps']['email'])
 						{
-							$ref = '<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=email.uicompose.compose&to=' . urlencode($coldata)) . '" target="_new">';
+							$ref='<a href="' . $GLOBALS['phpgw']->link('/email/compose.php','to='
+								. urlencode($coldata)) . '" target="_new">';
 						}
 						else
 						{
@@ -1027,34 +898,34 @@
 						$ref = ''; $data = $coldata;
 					}
 
-					if(!$data)
+					if (!$data)
 					{
-						$GLOBALS['phpgw']->template->set_var('ref_data','&nbsp;');
+						$this->template->set_var('ref_data','&nbsp;');
 					}
 					else
 					{
-						$GLOBALS['phpgw']->template->set_var('ref_data',$ref . $data);
+						$this->template->set_var('ref_data',$ref . $data);
 					}
-					$GLOBALS['phpgw']->template->parse('cols','view_row',True);
+					$this->template->parse('cols','view_row',True);
 				}
 			}
 			/* Following cleans up view_row, since we were only using it to fill {cols} */
-			$GLOBALS['phpgw']->template->set_var('view_row','');
+			$this->template->set_var('view_row','');
 
 			$fields['cat_id'] = is_array($this->cat_id) ? implode(',',$this->cat_id) : $this->cat_id;
 
 			$cats = explode(',',$fields[0]['cat_id']);
-			if($cats[1])
+			if ($cats[1])
 			{
-				while(list($key,$contactscat) = each($cats))
+				while (list($key,$contactscat) = each($cats))
 				{
-					if($contactscat)
+					if ($contactscat)
 					{
 						$catinfo = $this->cat->return_single(intval($contactscat));
 						$catname .= $catinfo[0]['name'] . '; ';
 					}
 				}
-				if(!$this->cat_id)
+				if (!$this->cat_id)
 				{
 					$this->cat_id = $cats[0];
 				}
@@ -1064,57 +935,52 @@
 				$fields[0]['cat_id'] = ereg_replace(',','',$fields[0]['cat_id']);
 				$catinfo = $this->cat->return_single(intval($fields[0]['cat_id']));
 				$catname = $catinfo[0]['name'];
-				if(!$this->cat_id)
+				if (!$this->cat_id)
 				{
 					$this->cat_id = $fields[0]['cat_id'];
 				}
 			}
 
-			if(!$catname)
-			{
-				$catname = lang('none');
-			}
+			if (!$catname) { $catname = lang('none'); }
 
 			/* These are in the footer */
-			$GLOBALS['phpgw']->template->set_var('lang_owner',lang('Record owner'));
-			$GLOBALS['phpgw']->template->set_var('owner',$GLOBALS['phpgw']->common->grab_owner_name($record_owner));
-			$GLOBALS['phpgw']->template->set_var('lang_access',lang('Record access'));
-			$GLOBALS['phpgw']->template->set_var('access',$access_check);
-			$GLOBALS['phpgw']->template->set_var('lang_category',lang('Category'));
-			$GLOBALS['phpgw']->template->set_var('catname',$catname);
+			$this->template->set_var('lang_owner',lang('Record owner'));
+			$this->template->set_var('owner',$GLOBALS['phpgw']->common->grab_owner_name($record_owner));
+			$this->template->set_var('lang_access',lang('Record access'));
+			$this->template->set_var('access',$access_check);
+			$this->template->set_var('lang_category',lang('Category'));
+			$this->template->set_var('catname',$catname);
 
-			if(($this->contacts->grants[$record_owner] & PHPGW_ACL_EDIT) ||
-				($record_owner == $GLOBALS['phpgw_info']['user']['account_id']))
+			if (($this->contacts->grants[$record_owner] & PHPGW_ACL_EDIT) || ($record_owner == $GLOBALS['phpgw_info']['user']['account_id']))
 			{
 				$extra_vars = array('cd' => 16,'query' => $this->query,'cat_id' => $this->cat_id);
 
-				if($referer)
+				if ($referer)
 				{
 					$extra_vars += array('referer' => urlencode($referer));
 				}
 
-				$GLOBALS['phpgw']->template->set_var('edit_button',$this->html_1button_form('edit','Edit',
+				$this->template->set_var('edit_button',$this->html_1button_form('edit','Edit',
 					$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.edit&ab_id=' .$ab_id)));
 			}
-			$GLOBALS['phpgw']->template->set_var('copy_button',$this->html_1button_form('submit','copy',
+			$this->template->set_var('copy_button',$this->html_1button_form('submit','copy',
 				$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.copy&ab_id=' . $fields[0]['id'])));
 
-			if($fields[0]['n_family'] && $fields[0]['n_given'])
+			if ($fields[0]['n_family'] && $fields[0]['n_given'])
 			{
-				$GLOBALS['phpgw']->template->set_var('vcard_button',$this->html_1button_form('VCardForm','VCard',
+				$this->template->set_var('vcard_button',$this->html_1button_form('VCardForm','VCard',
 					$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uivcard.out&ab_id=' .$ab_id)));
 			}
 			else
 			{
-				$GLOBALS['phpgw']->template->set_var('vcard_button',lang('no vcard'));
+				$this->template->set_var('vcard_button',lang('no vcard'));
 			}
 
-			$GLOBALS['phpgw']->template->set_var('done_button',$this->html_1button_form('DoneForm','Done',
+			$this->template->set_var('done_button',$this->html_1button_form('DoneForm','Done',
 				$referer ? $referer : $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index')));
-			$GLOBALS['phpgw']->template->set_var('access_link',$access_link);
+			$this->template->set_var('access_link',$access_link);
 
-			$this->output .= $GLOBALS['phpgw']->template->fp('out','view_t');
-			$this->totpl();
+			$this->template->pfp('phpgw_body','view_t');
 
 			$GLOBALS['phpgw']->hooks->process(array(
 				'location' => 'addressbook_view',
@@ -1132,12 +998,11 @@
 
 		function preferences()
 		{
-			$submit  = $GLOBALS['HTTP_POST_VARS']['submit'];
-			$prefs   = $GLOBALS['HTTP_POST_VARS']['prefs'];
-			$other   = $GLOBALS['HTTP_POST_VARS']['other'];
-			$fcat_id = $GLOBALS['HTTP_POST_VARS']['fcat_id'];
+			$submit  = $_POST['submit'];
+			$prefs   = $_POST['prefs'];
+			$other   = $_POST['other'];
+			$fcat_id = (int) $_POST['fcat_id'];
 
-			/* _debug_array($this->prefs); */
 			$custom = $this->fields->read_custom_fields();
 			$customfields = array();
 			while(list($x,$y) = @each($custom))
@@ -1147,139 +1012,149 @@
 
 			$qfields = $this->contacts->stock_contact_fields + $this->extrafields + $customfields;
 
-			if($submit)
+			if ($submit)
 			{
 				$totalerrors = 0;
-				if(!count($prefs))
+				if (!count($prefs))
 				{
 					$errors[$totalerrors++] = lang('You must select at least 1 column to display');
 				}
-				if(!$totalerrors)
+				if (!$totalerrors)
 				{
 					@reset($qfields);
 					$this->bo->save_preferences($prefs,$other,$qfields,$fcat_id);
 				}
 			}
 
-			if($totalerrors)
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+
+			if ($totalerrors)
 			{
 				echo '<p><center>' . $GLOBALS['phpgw']->common->error_list($errors) . '</center>';
 			}
 
-			$GLOBALS['phpgw']->template->set_file(array('preferences' => 'preferences.tpl'));
+			$this->template->set_file(array('preferences' => 'preferences.tpl'));
 
-			$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.preferences'));
+			$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.preferences'));
 
 			$i = 0; $j = 0;
 			$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
 
-			while(list($col, $descr) = each($qfields))
+			while (list($col, $descr) = each($qfields))
 			{
 				/* echo '<br>test: $col - $i $j - ' . count($abc); */
 				$i++; $j++;
 				$showcol = $this->display_name($col);
-				if(!$showcol)
-				{
-					$showcol = $col;
-				}
+				if (!$showcol) { $showcol = $col; }
 				/* yank the *'s prior to testing for a valid column description */
 				$coltest = ereg_replace('\*','',$showcol);
-				if($coltest)
+				if ($coltest)
 				{
-					$GLOBALS['phpgw']->template->set_var($col,$showcol);
-					if($GLOBALS['phpgw_info']['user']['preferences']['addressbook'][$col])
+					$this->template->set_var($col,$showcol);
+					if ($GLOBALS['phpgw_info']['user']['preferences']['addressbook'][$col])
 					{
-						$GLOBALS['phpgw']->template->set_var($col.'_checked',' checked');
+						$this->template->set_var($col.'_checked',' checked');
 					}
 					else
 					{
-						$GLOBALS['phpgw']->template->set_var($col.'_checked','');
+						$this->template->set_var($col.'_checked','');
 					}
 				}
 			}
 
-			if($customfields)
+			if ($customfields)
 			{
 				$custom_var = '
   <tr>
-    <td><font color="#000000" face="">'.lang('Custom').' '.lang('Fields').':</font></td>
-    <td></td>
-    <td></td>
+    <td bgcolor="'.$tr_color.'" colspan="6"><font color="#000000" face="">'.lang('Custom Fields').':</font></td>
   </tr>
 ';
-				while(list($cf) = each($customfields))
+				$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
+				$i = 0;
+				while( list($cf) = each($customfields) )
 				{
-					$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
-					$custom_var .= "\n" . '<tr bgcolor="' . $tr_color . '">' . "\n";
+					if (!($i % 6))
+					{
+						$custom_var .= "\n  <tr bgcolor='$tr_color'>\n";
+					}
 					$custom_var .= '    <td><input type="checkbox" name="prefs['
 						. strtolower($cf) . ']"'
 						. ($this->prefs[$cf] ? ' checked' : '')
-						. '>' . $cf . '</option></td>' . "\n"
-						. '</tr>' . "\n";
+						. '>' . str_replace('_',' ',$cf) . '</option></td>' . "\n";
+					
+					if (!(++$i % 6))
+					{
+						echo "</tr>\n";
+					}
 				}
-				$GLOBALS['phpgw']->template->set_var('custom_fields',$custom_var);
+				if ($i = 6 - ($i % 6))
+				{
+					$custom_var .= "    <td colspan=$i>&nbsp;</td>\n  </tr>\n";
+				}
+				$this->template->set_var('custom_fields',$custom_var);
 			}
 			else
 			{
-				$GLOBALS['phpgw']->template->set_var('custom_fields','');
+				$this->template->set_var('custom_fields','');
 			}
 
 			$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
-			$GLOBALS['phpgw']->template->set_var(tr_color,$tr_color);
-			$GLOBALS['phpgw']->template->set_var('lang_showbirthday',lang('show birthday reminders on main screen'));
+			$this->template->set_var(tr_color,$tr_color);
+			$this->template->set_var('lang_showbirthday',lang('show birthday reminders on main screen'));
 
-			if($this->prefs['mainscreen_showbirthdays'])
+			if ($this->prefs['mainscreen_showbirthdays'])
 			{
-				$GLOBALS['phpgw']->template->set_var('show_birthday',' checked');
+				$this->template->set_var('show_birthday',' checked');
 			}
 			else
 			{
-				$GLOBALS['phpgw']->template->set_var('show_birthday','');
+				$this->template->set_var('show_birthday','');
 			}
 
 			$list = array(
-				''        => lang('All'),
-				'private' => lang('Private'),
-				'blank'   => lang('Blank')
+				'none'    => lang('Show all'),
+				'yours'   => lang('Only yours'),
+				'private' => lang('Private') /*,
+				'blank'   => lang('Blank') */
 			);
-			$GLOBALS['phpgw']->template->set_var('lang_default_filter',lang('Default Filter'));
-			$GLOBALS['phpgw']->template->set_var('filter_select',$this->formatted_list('other[default_filter]',$list,$this->prefs['default_filter']));
+			$this->template->set_var('lang_default_filter',lang('Default Filter'));
+			$this->template->set_var('filter_select',$this->formatted_list('other[default_filter]',$list,$this->prefs['default_filter']));
 
-			$GLOBALS['phpgw']->template->set_var('lang_autosave',lang('Autosave default category'));
-			if($this->prefs['autosave_category'])
+			$this->template->set_var('lang_autosave',lang('Autosave default category'));
+			if ($this->prefs['autosave_category'])
 			{
-				$GLOBALS['phpgw']->template->set_var('autosave',' checked');
+				$this->template->set_var('autosave',' checked');
 			}
 			else
 			{
-				$GLOBALS['phpgw']->template->set_var('autosave','');
+				$this->template->set_var('autosave','');
 			}
-			$GLOBALS['phpgw']->template->set_var('lang_defaultcat',lang('Default Category'));
-			$GLOBALS['phpgw']->template->set_var('cat_select',$this->cat_option($this->prefs['default_category']));
-			$GLOBALS['phpgw']->template->set_var('lang_abprefs',lang('Addressbook').' '.lang('Preferences'));
-			$GLOBALS['phpgw']->template->set_var('lang_fields',lang('Fields to show in address list'));
-			$GLOBALS['phpgw']->template->set_var('lang_personal',lang('Personal'));
-			$GLOBALS['phpgw']->template->set_var('lang_business',lang('Business'));
-			$GLOBALS['phpgw']->template->set_var('lang_home',lang('Home'));
-			$GLOBALS['phpgw']->template->set_var('lang_phones',lang('Extra').' '.lang('Phone Numbers'));
-			$GLOBALS['phpgw']->template->set_var('lang_other',lang('Other').' '.lang('Fields'));
-			$GLOBALS['phpgw']->template->set_var('lang_otherprefs',lang('Other').' '.lang('Preferences'));
-			$GLOBALS['phpgw']->template->set_var('lang_submit',lang('submit'));
-			$GLOBALS['phpgw']->template->set_var('th_bg',  $GLOBALS['phpgw_info']['theme']['th_bg']);
-			$GLOBALS['phpgw']->template->set_var('th_text',$GLOBALS['phpgw_info']['theme']['th_text']);
-			$GLOBALS['phpgw']->template->set_var('row_on', $GLOBALS['phpgw_info']['theme']['row_on']);
-			$GLOBALS['phpgw']->template->set_var('row_off',$GLOBALS['phpgw_info']['theme']['row_off']);
+			$this->template->set_var('lang_defaultcat',lang('Default Category'));
+			$this->template->set_var('cat_select',$this->cat_option($this->prefs['default_category'], false, false));
+			$this->template->set_var('lang_abprefs',lang('Addressbook').' '.lang('Preferences'));
+			$this->template->set_var('lang_fields',lang('Fields to show in address list'));
+			$this->template->set_var('lang_personal',lang('Personal'));
+			$this->template->set_var('lang_business',lang('Business'));
+			$this->template->set_var('lang_home',lang('Home'));
+			$this->template->set_var('lang_phones',lang('Extra').' '.lang('Phone Numbers'));
+			$this->template->set_var('lang_other',lang('Other').' '.lang('Fields'));
+			$this->template->set_var('lang_otherprefs',lang('Other').' '.lang('Preferences'));
+			$this->template->set_var('lang_submit',lang('submit'));
+			$this->template->set_var('th_bg',  $GLOBALS['phpgw_info']['theme']['th_bg']);
+			$this->template->set_var('th_text',$GLOBALS['phpgw_info']['theme']['th_text']);
+			$this->template->set_var('row_on', $GLOBALS['phpgw_info']['theme']['row_on']);
+			$this->template->set_var('row_off',$GLOBALS['phpgw_info']['theme']['row_off']);
 
-			$this->output .= $GLOBALS['phpgw']->template->parse('out','preferences');
-			$this->totpl();
+			$this->template->pparse('out','preferences');
 		}
 
 		function get_form()
 		{
-			$entry   = $GLOBALS['HTTP_POST_VARS']['entry'];
-			$fcat_id = $GLOBALS['HTTP_POST_VARS']['fcat_id'];
-			$referer = $entry['referer'] ? $entry['referer'] : $GLOBALS['HTTP_GET_VARS']['referer'];
-			$referer = $referer ? $referer : $GLOBALS['HTTP_POST_VARS']['referer'];
+			$entry   = $_POST['entry'];
+			$fcat_id = $_POST['fcat_id'];
+			$referer = $entry['referer'] ? $entry['referer'] : $_GET['referer'];
+			$referer = $referer ? $referer : $_POST['referer'];
 
 			$test = @unserialize(rawurldecode($entry));
 			if($test && ($test != $entry))
@@ -1288,14 +1163,14 @@
 			}
 			/* _debug_array($entry); exit; */
 
-			if(!$entry['bday_month'] && !$entry['bday_day'] && !$entry['bday_year'])
+			if (!$entry['bday_month'] && !$entry['bday_day'] && !$entry['bday_year'])
 			{
 				$fields['bday'] = '';
 			}
 			else
 			{
 				$bday_day = $entry['bday_day'];
-				if(strlen($bday_day) == 1)
+				if (strlen($bday_day) == 1)
 				{
 					$bday_day = '0' . $entry['bday_day'];
 				}
@@ -1305,6 +1180,7 @@
 			$fields['url'] = $entry['url'] == 'http://' ? '' : $entry['url'];
 
 
+			$fields['lid']				= $entry['lid'];
 			$fields['org_name']				= $entry['company'];
 			$fields['org_unit']				= $entry['department'];
 			$fields['n_given']				= $entry['firstname'];
@@ -1312,9 +1188,9 @@
 			$fields['n_middle']				= $entry['middle'];
 			$fields['n_prefix']				= $entry['prefix'];
 			$fields['n_suffix']				= $entry['suffix'];
-			if($entry['prefix']) { $pspc = ' '; }
-			if($entry['middle']) { $mspc = ' '; } else { $nspc = ' '; }
-			if($entry['suffix']) { $sspc = ' '; }
+			if ($entry['prefix']) { $pspc = ' '; }
+			if ($entry['middle']) { $mspc = ' '; } else { $nspc = ' '; }
+			if ($entry['suffix']) { $sspc = ' '; }
 			$fields['fn']					= $entry['prefix'].$pspc.$entry['firstname'].$nspc.$mspc.$entry['middle'].$mspc.$entry['lastname'].$sspc.$entry['suffix'];
 			$fields['email']				= $entry['email'];
 			$fields['email_type']			= $entry['email_type'];
@@ -1384,7 +1260,7 @@
 			$custom = $this->fields->read_custom_fields();
 			while(list($name,$val) = @each($custom))
 			{
-				@$fields[$name] = $entry[$val];
+				$fields[$val['name']] = $entry[$val['name']];
 			}
 
 			$fields['ophone']	= $entry['ophone'];
@@ -1393,7 +1269,7 @@
 			$fields['note']		= $entry['notes'];
 			$fields['label']	= $entry['label'];
 
-			if($entry['access'] == True)
+			if ($entry['access'] == True)
 			{
 				$fields['access'] = 'private';
 			}
@@ -1402,7 +1278,7 @@
 				$fields['access'] = 'public';
 			}
 
-			if(is_array($fcat_id))
+			if (is_array($fcat_id))
 			{
 				$fields['cat_id'] = count($fcat_id) > 1 ? ','.implode(',',$fcat_id).',' : $fcat_id[0];
 			}
@@ -1413,7 +1289,7 @@
 
 			$fields['ab_id']   = $entry['ab_id'];
 			$fields['tid']     = $entry['tid'];
-			if(!$fields['tid'])
+			if (!$fields['tid'])
 			{
 				$fields['tid'] = 'n';
 			}
@@ -1426,11 +1302,11 @@
 		/* Following used for add/edit */
 		function addressbook_form($format,$action,$title='',$fields='',$customfields='',$cat_id='')
 		{
-			$referer = $GLOBALS['HTTP_GET_VARS']['referer'] ? $GLOBALS['HTTP_GET_VARS']['referer'] : $GLOBALS['HTTP_POST_VARS']['referer'];
+			$referer = $_GET['referer'] ? $_GET['referer'] : $_POST['referer'];
 
-			$GLOBALS['phpgw']->template->set_file(array('form' => 'form.tpl'));
+			$this->template->set_file(array('form' => 'form.tpl'));
 
-			if(($GLOBALS['phpgw_info']['server']['countrylist'] == 'user_choice' &&
+			if ( ($GLOBALS['phpgw_info']['server']['countrylist'] == 'user_choice' &&
 				$GLOBALS['phpgw_info']['user']['preferences']['common']['countrylist'] == 'use_select') ||
 				($GLOBALS['phpgw_info']['server']['countrylist'] == 'force_select'))
 			{
@@ -1497,7 +1373,7 @@
 			}
 			$cats_link = $this->cat_option($cat_id,True,False,True);
 
-			if($access == 'private')
+			if ($access == 'private')
 			{
 				$access_check = ' checked';
 			}
@@ -1506,7 +1382,7 @@
 				$access_check = '';
 			}
 
-			if($customfields)
+			if ($customfields)
 			{
 				while(list($name,$value) = each($customfields))
 				{
@@ -1521,24 +1397,24 @@
 				}
 			}
 
-			if($format != "view")
+			if ($format != "view")
 			{
 				/* Preferred phone number radio buttons */
 				$pref[0] = '<font size="-2">';
 				$pref[1] = '(' . lang('pref') . ')</font>';
-				while(list($name,$val) = each($this->contacts->tel_types))
+				while (list($name,$val) = each($this->contacts->tel_types))
 				{
 					$str[$name] = "\n".'      <input type="radio" name="entry[tel_prefer]" value="'.$name.'"';
-					if($name == $preferred)
+					if ($name == $preferred)
 					{
 						$str[$name] .= ' checked';
 					}
 					$str[$name] .= '>';
 					$str[$name] = $pref[0].$str[$name].$pref[1];
-					$GLOBALS['phpgw']->template->set_var("pref_".$name,$str[$name]);
+					$this->template->set_var("pref_".$name,$str[$name]);
 				}
 
-				if(strlen($bday) > 2)
+				if (strlen($bday) > 2)
 				{
 					list( $month, $day, $year ) = split( '/', $bday );
 					$temp_month[$month] = ' selected';
@@ -1582,14 +1458,14 @@
 				}
 
 				$time_zone = '<select name="entry[timezone]">' . "\n";
-				for($i = -23; $i<24; $i++)
+				for ($i = -23; $i<24; $i++)
 				{
 					$time_zone .= '<option value="' . $i . '"';
-					if($i == $timezone)
+					if ($i == $timezone)
 					{
 						$time_zone .= ' selected';
 					}
-					if($i < 1)
+					if ($i < 1)
 					{
 						$time_zone .= '>' . $i . '</option>' . "\n";
 					}
@@ -1601,32 +1477,26 @@
 				$time_zone .= '</select>' . "\n";
 
 				$email_type = '<select name=entry[email_type]>';
-				while($type = each($this->contacts->email_types))
+				while ($type = each($this->contacts->email_types))
 				{
 					$email_type .= '<option value="' . $type[0] . '"';
-					if($type[0] == $emailtype)
-					{
-						$email_type .= ' selected';
-					}
+					if ($type[0] == $emailtype) { $email_type .= ' selected'; }
 					$email_type .= '>' . $type[1] . '</option>';
 				}
 				$email_type .= '</select>';
 
 				reset($this->contacts->email_types);
 				$hemail_type = '<select name=entry[hemail_type]>';
-				while($type = each($this->contacts->email_types))
+				while ($type = each($this->contacts->email_types))
 				{
 					$hemail_type .= '<option value="' . $type[0] . '"';
-					if($type[0] == $hemailtype)
-					{
-						$hemail_type .= ' selected';
-					}
+					if ($type[0] == $hemailtype) { $hemail_type .= ' selected'; }
 					$hemail_type .= '>' . $type[1] . '</option>';
 				}
 				$hemail_type .= '</select>';
 
 				reset($this->contacts->adr_types);
-				while(list($type,$val) = each($this->contacts->adr_types))
+				while (list($type,$val) = each($this->contacts->adr_types))
 				{
 					$badrtype .= "\n".'<INPUT type="checkbox" name="entry[one_'.$type.']"';
 					$ot = 'one_'.$type;
@@ -1639,7 +1509,7 @@
 				}
 
 				reset($this->contacts->adr_types);
-				while(list($type,$val) = each($this->contacts->adr_types))
+				while (list($type,$val) = each($this->contacts->adr_types))
 				{
 					$hadrtype .= "\n".'<INPUT type="checkbox" name="entry[two_'.$type.']"';
 					$tt = 'two_'.$type;
@@ -1659,25 +1529,25 @@
 			{
 				$notes = '<form><TEXTAREA cols="60" name="entry[notes]" rows="4">'
 					. $notes . '</TEXTAREA></form>';
-				if($bday == '//')
+				if ($bday == '//')
 				{
 					$bday = '';
 				}
 			}
 
-			if($action)
+			if ($action)
 			{
 				echo '<FORM action="' . $GLOBALS['phpgw']->link('/index.php', $action . '&referer='.urlencode($referer)).'" method="post">';
 			}
 
-			if(!ereg('^http://',$url))
+			if (!ereg('^http://',$url))
 			{
 				$url = 'http://' . $url;
 			} 
 
 			$birthday = $GLOBALS['phpgw']->common->dateformatorder($bday_year,$bday_month,$bday_day)
 				. '<font face="'.$theme["font"].'" size="-2">(e.g. 1969)</font>';
-			if($format == 'edit')
+			if ($format == 'edit')
 			{
 				$create .= '<tr bgcolor="' . $GLOBALS['phpgw_info']['theme']['th_bg'] . '"><td colspan="2"><font size="-1">' . lang("Created by") . ':</font></td>'
 					. '<td colspan="3"><font size="-1">'
@@ -1688,137 +1558,137 @@
 				$create .= '';
 			}
  
-			$GLOBALS['phpgw']->template->set_var('lang_home',lang('Home'));
-			$GLOBALS['phpgw']->template->set_var('lang_business',lang('Business'));
-			$GLOBALS['phpgw']->template->set_var('lang_personal',lang('Personal'));
+			$this->template->set_var('lang_home',lang('Home'));
+			$this->template->set_var('lang_business',lang('Business'));
+			$this->template->set_var('lang_personal',lang('Personal'));
 
-			$GLOBALS['phpgw']->template->set_var('lang_lastname',lang('Last Name'));
-			$GLOBALS['phpgw']->template->set_var('lastname',$lastname);
-			$GLOBALS['phpgw']->template->set_var('lang_firstname',lang('First Name'));
-			$GLOBALS['phpgw']->template->set_var('firstname',$firstname);
-			$GLOBALS['phpgw']->template->set_var('lang_middle',lang('Middle Name'));
-			$GLOBALS['phpgw']->template->set_var('middle',$middle);
-			$GLOBALS['phpgw']->template->set_var('lang_prefix',lang('Prefix'));
-			$GLOBALS['phpgw']->template->set_var('prefix',$prefix);
-			$GLOBALS['phpgw']->template->set_var('lang_suffix',lang('Suffix'));
-			$GLOBALS['phpgw']->template->set_var('suffix',$suffix);
-			$GLOBALS['phpgw']->template->set_var('lang_birthday',lang('Birthday'));
-			$GLOBALS['phpgw']->template->set_var('birthday',$birthday);
+			$this->template->set_var('lang_lastname',lang('Last Name'));
+			$this->template->set_var('lastname',$lastname);
+			$this->template->set_var('lang_firstname',lang('First Name'));
+			$this->template->set_var('firstname',$firstname);
+			$this->template->set_var('lang_middle',lang('Middle Name'));
+			$this->template->set_var('middle',$middle);
+			$this->template->set_var('lang_prefix',lang('Prefix'));
+			$this->template->set_var('prefix',$prefix);
+			$this->template->set_var('lang_suffix',lang('Suffix'));
+			$this->template->set_var('suffix',$suffix);
+			$this->template->set_var('lang_birthday',lang('Birthday'));
+			$this->template->set_var('birthday',$birthday);
 
-			$GLOBALS['phpgw']->template->set_var('lang_company',lang('Company Name'));
-			$GLOBALS['phpgw']->template->set_var('company',$company);
-			$GLOBALS['phpgw']->template->set_var('lang_department',lang('Department'));
-			$GLOBALS['phpgw']->template->set_var('department',$department);
-			$GLOBALS['phpgw']->template->set_var('lang_title',lang('Title'));
-			$GLOBALS['phpgw']->template->set_var('title',$title);
-			$GLOBALS['phpgw']->template->set_var('lang_email',lang('Business Email'));
-			$GLOBALS['phpgw']->template->set_var('email',$email);
-			$GLOBALS['phpgw']->template->set_var('lang_email_type',lang('Business EMail Type'));
-			$GLOBALS['phpgw']->template->set_var('email_type',$email_type);
-			$GLOBALS['phpgw']->template->set_var('lang_url',lang('URL'));
-			$GLOBALS['phpgw']->template->set_var('url',$url);
-			$GLOBALS['phpgw']->template->set_var('lang_timezone',lang('time zone offset'));
-			$GLOBALS['phpgw']->template->set_var('timezone',$time_zone);
-			$GLOBALS['phpgw']->template->set_var('lang_fax',lang('Business Fax'));
-			$GLOBALS['phpgw']->template->set_var('fax',$fax);
-			$GLOBALS['phpgw']->template->set_var('lang_wphone',lang('Business Phone'));
-			$GLOBALS['phpgw']->template->set_var('wphone',$wphone);
-			$GLOBALS['phpgw']->template->set_var('lang_pager',lang('Pager'));
-			$GLOBALS['phpgw']->template->set_var('pager',$pager);
-			$GLOBALS['phpgw']->template->set_var('lang_mphone',lang('Cell Phone'));
-			$GLOBALS['phpgw']->template->set_var('mphone',$mphone);
-			$GLOBALS['phpgw']->template->set_var('lang_msgphone',lang('Message Phone'));
-			$GLOBALS['phpgw']->template->set_var('msgphone',$msgphone);
-			$GLOBALS['phpgw']->template->set_var('lang_isdnphone',lang('ISDN Phone'));
-			$GLOBALS['phpgw']->template->set_var('isdnphone',$isdnphone);
-			$GLOBALS['phpgw']->template->set_var('lang_carphone',lang('Car Phone'));
-			$GLOBALS['phpgw']->template->set_var('carphone',$carphone);
-			$GLOBALS['phpgw']->template->set_var('lang_vidphone',lang('Video Phone'));
-			$GLOBALS['phpgw']->template->set_var('vidphone',$vidphone);
+			$this->template->set_var('lang_company',lang('Company Name'));
+			$this->template->set_var('company',$company);
+			$this->template->set_var('lang_department',lang('Department'));
+			$this->template->set_var('department',$department);
+			$this->template->set_var('lang_title',lang('Title'));
+			$this->template->set_var('title',$title);
+			$this->template->set_var('lang_email',lang('Business Email'));
+			$this->template->set_var('email',$email);
+			$this->template->set_var('lang_email_type',lang('Business EMail Type'));
+			$this->template->set_var('email_type',$email_type);
+			$this->template->set_var('lang_url',lang('URL'));
+			$this->template->set_var('url',$url);
+			$this->template->set_var('lang_timezone',lang('time zone offset'));
+			$this->template->set_var('timezone',$time_zone);
+			$this->template->set_var('lang_fax',lang('Business Fax'));
+			$this->template->set_var('fax',$fax);
+			$this->template->set_var('lang_wphone',lang('Business Phone'));
+			$this->template->set_var('wphone',$wphone);
+			$this->template->set_var('lang_pager',lang('Pager'));
+			$this->template->set_var('pager',$pager);
+			$this->template->set_var('lang_mphone',lang('Cell Phone'));
+			$this->template->set_var('mphone',$mphone);
+			$this->template->set_var('lang_msgphone',lang('Message Phone'));
+			$this->template->set_var('msgphone',$msgphone);
+			$this->template->set_var('lang_isdnphone',lang('ISDN Phone'));
+			$this->template->set_var('isdnphone',$isdnphone);
+			$this->template->set_var('lang_carphone',lang('Car Phone'));
+			$this->template->set_var('carphone',$carphone);
+			$this->template->set_var('lang_vidphone',lang('Video Phone'));
+			$this->template->set_var('vidphone',$vidphone);
 
-			$GLOBALS['phpgw']->template->set_var('lang_ophone',lang('Other Number'));
-			$GLOBALS['phpgw']->template->set_var('ophone',$ophone);
-			$GLOBALS['phpgw']->template->set_var('lang_bstreet',lang('Business Street'));
-			$GLOBALS['phpgw']->template->set_var('bstreet',$bstreet);
-			$GLOBALS['phpgw']->template->set_var('lang_address2',lang('Address Line 2'));
-			$GLOBALS['phpgw']->template->set_var('address2',$address2);
-			$GLOBALS['phpgw']->template->set_var('lang_address3',lang('Address Line 3'));
-			$GLOBALS['phpgw']->template->set_var('address3',$address3);
-			$GLOBALS['phpgw']->template->set_var('lang_bcity',lang('Business City'));
-			$GLOBALS['phpgw']->template->set_var('bcity',$bcity);
-			$GLOBALS['phpgw']->template->set_var('lang_bstate',lang('Business State'));
-			$GLOBALS['phpgw']->template->set_var('bstate',$bstate);
-			$GLOBALS['phpgw']->template->set_var('lang_bzip',lang('Business Zip Code'));
-			$GLOBALS['phpgw']->template->set_var('bzip',$bzip);
-			$GLOBALS['phpgw']->template->set_var('lang_bcountry',lang('Business Country'));
-			$GLOBALS['phpgw']->template->set_var('bcountry',$bcountry);
-			if($countrylist)
+			$this->template->set_var('lang_ophone',lang('Other Number'));
+			$this->template->set_var('ophone',$ophone);
+			$this->template->set_var('lang_bstreet',lang('Business Street'));
+			$this->template->set_var('bstreet',$bstreet);
+			$this->template->set_var('lang_address2',lang('Address Line 2'));
+			$this->template->set_var('address2',$address2);
+			$this->template->set_var('lang_address3',lang('Address Line 3'));
+			$this->template->set_var('address3',$address3);
+			$this->template->set_var('lang_bcity',lang('Business City'));
+			$this->template->set_var('bcity',$bcity);
+			$this->template->set_var('lang_bstate',lang('Business State'));
+			$this->template->set_var('bstate',$bstate);
+			$this->template->set_var('lang_bzip',lang('Business Zip Code'));
+			$this->template->set_var('bzip',$bzip);
+			$this->template->set_var('lang_bcountry',lang('Business Country'));
+			$this->template->set_var('bcountry',$bcountry);
+			if ($countrylist)
 			{
-				$GLOBALS['phpgw']->template->set_var('bcountry',$GLOBALS['phpgw']->country->form_select($bcountry,'entry[bcountry]'));
+				$this->template->set_var('bcountry',$GLOBALS['phpgw']->country->form_select($bcountry,'entry[bcountry]'));
 			}
 			else
 			{
-				 $GLOBALS['phpgw']->template->set_var('bcountry','<input name="entry[bcountry]" value="' . $bcountry . '">');
+				 $this->template->set_var('bcountry','<input name="entry[bcountry]" value="' . $bcountry . '">');
 			}
-			$GLOBALS['phpgw']->template->set_var('lang_badrtype',lang('Address Type'));
-			$GLOBALS['phpgw']->template->set_var('badrtype',$badrtype);
+			$this->template->set_var('lang_badrtype',lang('Address Type'));
+			$this->template->set_var('badrtype',$badrtype);
 
-			$GLOBALS['phpgw']->template->set_var('lang_hphone',lang('Home Phone'));
-			$GLOBALS['phpgw']->template->set_var('hphone',$hphone);
-			$GLOBALS['phpgw']->template->set_var('lang_hemail',lang('Home Email'));
-			$GLOBALS['phpgw']->template->set_var('hemail',$hemail);
-			$GLOBALS['phpgw']->template->set_var('lang_hemail_type',lang('Home EMail Type'));
-			$GLOBALS['phpgw']->template->set_var('hemail_type',$hemail_type);
-			$GLOBALS['phpgw']->template->set_var('lang_hstreet',lang('Home Street'));
-			$GLOBALS['phpgw']->template->set_var('hstreet',$hstreet);
-			$GLOBALS['phpgw']->template->set_var('lang_hcity',lang('Home City'));
-			$GLOBALS['phpgw']->template->set_var('hcity',$hcity);
-			$GLOBALS['phpgw']->template->set_var('lang_hstate',lang('Home State'));
-			$GLOBALS['phpgw']->template->set_var('hstate',$hstate);
-			$GLOBALS['phpgw']->template->set_var('lang_hzip',lang('Home Zip Code'));
-			$GLOBALS['phpgw']->template->set_var('hzip',$hzip);
-			$GLOBALS['phpgw']->template->set_var('lang_hcountry',lang('Home Country'));
-			if($countrylist)
+			$this->template->set_var('lang_hphone',lang('Home Phone'));
+			$this->template->set_var('hphone',$hphone);
+			$this->template->set_var('lang_hemail',lang('Home Email'));
+			$this->template->set_var('hemail',$hemail);
+			$this->template->set_var('lang_hemail_type',lang('Home EMail Type'));
+			$this->template->set_var('hemail_type',$hemail_type);
+			$this->template->set_var('lang_hstreet',lang('Home Street'));
+			$this->template->set_var('hstreet',$hstreet);
+			$this->template->set_var('lang_hcity',lang('Home City'));
+			$this->template->set_var('hcity',$hcity);
+			$this->template->set_var('lang_hstate',lang('Home State'));
+			$this->template->set_var('hstate',$hstate);
+			$this->template->set_var('lang_hzip',lang('Home Zip Code'));
+			$this->template->set_var('hzip',$hzip);
+			$this->template->set_var('lang_hcountry',lang('Home Country'));
+			if ($countrylist)
 			{
-				$GLOBALS['phpgw']->template->set_var('hcountry',$GLOBALS['phpgw']->country->form_select($hcountry,'entry[hcountry]'));
+				$this->template->set_var('hcountry',$GLOBALS['phpgw']->country->form_select($hcountry,'entry[hcountry]'));
 			}
 			else
 			{
-				$GLOBALS['phpgw']->template->set_var('hcountry','<input name="entry[hcountry]" value="' . $hcountry . '">');
+				$this->template->set_var('hcountry','<input name="entry[hcountry]" value="' . $hcountry . '">');
 			}
-			$GLOBALS['phpgw']->template->set_var('lang_hadrtype',lang('Address Type'));
-			$GLOBALS['phpgw']->template->set_var('hadrtype',$hadrtype);
+			$this->template->set_var('lang_hadrtype',lang('Address Type'));
+			$this->template->set_var('hadrtype',$hadrtype);
 
-			$GLOBALS['phpgw']->template->set_var('create',$create);
-			$GLOBALS['phpgw']->template->set_var('lang_notes',lang('notes'));
-			$GLOBALS['phpgw']->template->set_var('notes',$notes);
-			$GLOBALS['phpgw']->template->set_var('lang_label',lang('label'));
-			$GLOBALS['phpgw']->template->set_var('label',$label);
-			$GLOBALS['phpgw']->template->set_var('lang_pubkey',lang('Public Key'));
-			$GLOBALS['phpgw']->template->set_var('pubkey',$pubkey);
-			$GLOBALS['phpgw']->template->set_var('access_check',$access_check);
+			$this->template->set_var('create',$create);
+			$this->template->set_var('lang_notes',lang('notes'));
+			$this->template->set_var('notes',$notes);
+			$this->template->set_var('lang_label',lang('label'));
+			$this->template->set_var('label',$label);
+			$this->template->set_var('lang_pubkey',lang('Public Key'));
+			$this->template->set_var('pubkey',$pubkey);
+			$this->template->set_var('access_check',$access_check);
 
-			$GLOBALS['phpgw']->template->set_var('lang_private',lang('Private'));
+			$this->template->set_var('lang_private',lang('Private'));
 
-			$GLOBALS['phpgw']->template->set_var('lang_cats',lang('Category'));
-			$GLOBALS['phpgw']->template->set_var('cats_link',$cats_link);
-			if($customfields)
+			$this->template->set_var('lang_cats',lang('Category'));
+			$this->template->set_var('cats_link',$cats_link);
+			if ($customfields)
 			{
-				$GLOBALS['phpgw']->template->set_var('lang_custom',lang('Custom Fields').':');
-				$GLOBALS['phpgw']->template->set_var('custom',$custom);
+				$this->template->set_var('lang_custom',lang('Custom Fields').':');
+				$this->template->set_var('custom',$custom);
 			}
 			else
 			{
-				$GLOBALS['phpgw']->template->set_var('lang_custom','');
-				$GLOBALS['phpgw']->template->set_var('custom','');
+				$this->template->set_var('lang_custom','');
+				$this->template->set_var('custom','');
 			}
-			$GLOBALS['phpgw']->template->set_var('th_bg',   $GLOBALS['phpgw_info']['theme']['th_bg']);
-			$GLOBALS['phpgw']->template->set_var('th_text', $GLOBALS['phpgw_info']['theme']['th_text']);
-			$GLOBALS['phpgw']->template->set_var('row_on',  $GLOBALS['phpgw_info']['theme']['row_on']);
-			$GLOBALS['phpgw']->template->set_var('row_off', $GLOBALS['phpgw_info']['theme']['row_off']);
-			$GLOBALS['phpgw']->template->set_var('row_text',$GLOBALS['phpgw_info']['theme']['row_text']);
+			$this->template->set_var('th_bg',   $GLOBALS['phpgw_info']['theme']['th_bg']);
+			$this->template->set_var('th_text', $GLOBALS['phpgw_info']['theme']['th_text']);
+			$this->template->set_var('row_on',  $GLOBALS['phpgw_info']['theme']['row_on']);
+			$this->template->set_var('row_off', $GLOBALS['phpgw_info']['theme']['row_off']);
+			$this->template->set_var('row_text',$GLOBALS['phpgw_info']['theme']['row_text']);
 
-			$this->output .= $GLOBALS['phpgw']->template->fp('out','form');
+			$this->template->pfp('out','form');
 		} /* end form function */
 	}
 ?>
diff --git a/addressbook/inc/class.uifields.inc.php b/addressbook/inc/class.uifields.inc.php
index 2da9f8ad32..562ead7612 100644
--- a/addressbook/inc/class.uifields.inc.php
+++ b/addressbook/inc/class.uifields.inc.php
@@ -24,8 +24,8 @@
 
 		function uifields()
 		{
-//			$GLOBALS['phpgw']->template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
-//			$GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs');
+			$GLOBALS['phpgw']->template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+			$GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs');
 			$this->config = CreateObject('phpgwapi.config','addressbook');
 		}
 
@@ -34,9 +34,9 @@
 			if(!$GLOBALS['phpgw']->acl->check('run',1,'admin'))
 			{
 				$GLOBALS['phpgw']->common->phpgw_header();
+				echo parse_navbar();
 				echo lang('access not permitted');
-				$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-				exit;
+				$GLOBALS['phpgw']->common->phpgw_exit();
 			}
 
 			$GLOBALS['phpgw']->template->set_file(array(
@@ -80,6 +80,7 @@
 			$total_records = count($fields);
 
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
 			$GLOBALS['phpgw']->template->set_var('left',$GLOBALS['phpgw']->nextmatchs->left('/index.php',$start,$total_records,'menuaction=addressbook.uifields.index'));
 			$GLOBALS['phpgw']->template->set_var('right',$GLOBALS['phpgw']->nextmatchs->right('/index.php',$start,$total_records,'menuaction=addressbook.uifields.index'));
@@ -128,9 +129,9 @@
 			if(!$GLOBALS['phpgw']->acl->check('run',1,'admin'))
 			{
 				$GLOBALS['phpgw']->common->phpgw_header();
+				echo parse_navbar();
 				echo lang('access not permitted');
-				$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-				exit;
+				$GLOBALS['phpgw']->common->phpgw_exit();
 			}
 
 			$field      = stripslashes($GLOBALS['HTTP_POST_VARS']['field']);
@@ -166,6 +167,7 @@
 			}
 
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
 			if($errorcount)
 			{
@@ -204,9 +206,9 @@
 			if(!$GLOBALS['phpgw']->acl->check('run',1,'admin'))
 			{
 				$GLOBALS['phpgw']->common->phpgw_header();
+				echo parse_navbar();
 				echo lang('access not permitted');
-				$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-				exit;
+				$GLOBALS['phpgw']->common->phpgw_exit();
 			}
 
 			$field      = stripslashes($GLOBALS['HTTP_POST_VARS']['field'] ? $GLOBALS['HTTP_POST_VARS']['field'] : $GLOBALS['HTTP_GET_VARS']['field']);
@@ -245,6 +247,7 @@
 			}
 
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
 			if($errorcount)
 			{
@@ -296,9 +299,9 @@
 			if(!$GLOBALS['phpgw']->acl->check('run',1,'admin'))
 			{
 				$GLOBALS['phpgw']->common->phpgw_header();
+				echo parse_navbar();
 				echo lang('access not permitted');
-				$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-				exit;
+				$GLOBALS['phpgw']->common->phpgw_exit();
 			}
 
 			$field    = $GLOBALS['HTTP_POST_VARS']['field'] ? $GLOBALS['HTTP_POST_VARS']['field'] : $GLOBALS['HTTP_GET_VARS']['field'];
@@ -320,6 +323,7 @@
 			else
 			{
 				$GLOBALS['phpgw']->common->phpgw_header();
+				echo parse_navbar();
 
 				$hidden_vars = '<input type="hidden" name="sort" value="' . $sort . '">' . "\n"
 					. '<input type="hidden" name="order" value="' . $order .'">' . "\n"
diff --git a/addressbook/inc/class.uivcard.inc.php b/addressbook/inc/class.uivcard.inc.php
index 6d95c6c334..9b35f3dd69 100644
--- a/addressbook/inc/class.uivcard.inc.php
+++ b/addressbook/inc/class.uivcard.inc.php
@@ -26,7 +26,7 @@
 			'out' => True
 		);
 
-		var $extrafields = array(
+	 	var $extrafields = array(
 			'ophone'   => 'ophone',
 			'address2' => 'address2',
 			'address3' => 'address3'
@@ -43,13 +43,14 @@
 
 		function in()
 		{
-			$action = $GLOBALS['HTTP_POST_VARS']['action'];
+			$action = $GLOBALS['HTTP_POST_VARS']['action'] ? $GLOBALS['HTTP_POST_VARS']['action'] : $GLOBALS['HTTP_GET_VARS']['action'];
 
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
 			echo '<body bgcolor="' . $GLOBALS['phpgw_info']['theme']['bg_color'] . '">';
   
-			if($action == 'GetFile')
+			if ($action == 'GetFile')
 			{
 				echo '<b><center>' . lang('You must select a vcard. (*.vcf)') . '</b></center><br><br>';
 			}
@@ -64,43 +65,39 @@
 			$this->template->set_var('group_option',$group_option);
 
 			$this->template->pparse('out','vcardin');
+
+			$GLOBALS['phpgw']->common->phpgw_footer();
 		}
 
 		function out()
 		{
-			$ab_id   = get_var('ab_id',array('GET','POST'));
-			$nolname = get_var('nolname',array('GET','POST'));
-			$nofname = get_var('nofname',array('GET','POST'));
+			$ab_id   = $GLOBALS['HTTP_GET_VARS']['ab_id'] ? $GLOBALS['HTTP_GET_VARS']['ab_id'] : $GLOBALS['HTTP_POST_VARS']['ab_id'];
+			$nolname = $GLOBALS['HTTP_GET_VARS']['nolname'];
+			$nofname = $GLOBALS['HTTP_GET_VARS']['nofname'];
 
 			if($nolname || $nofname)
 			{
 				$GLOBALS['phpgw']->common->phpgw_header();
+				echo parse_navbar();
 			}
 
 			if(!$ab_id)
 			{
 				Header('Location: ' . $GLOBALS['phpgw']->link('/addressbook/index.php'));
-				$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-				exit;
+				$GLOBALS['phpgw']->common->phpgw_exit();
 			}
 
 			// First, make sure they have permission to this entry
-			$check = $this->bo->read_entry(array(
-				'id' => $ab_id,
-				'fields' => array(
-					'owner' => 'owner'
-				)
-			));
+			$check = $this->bo->read_entry(array('id' => $ab_id, 'fields' => array('owner' => 'owner')));
 			$perms = $this->contacts->check_perms($this->contacts->grants[$check[0]['owner']],PHPGW_ACL_READ);
 
-			if((!$perms) && ($check[0]['owner'] != $GLOBALS['phpgw_info']['user']['account_id']))
+			if ( (!$perms) && ($check[0]['owner'] != $GLOBALS['phpgw_info']['user']['account_id']) )
 			{
-				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.get_list'));
-				$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-				exit;
+				Header("Location: " . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.get_list'));
+				$GLOBALS['phpgw']->common->phpgw_exit();
 			}
 
-			$extrafields = array('address2' => 'address2');
+		 	$extrafields = array('address2' => 'address2');
 			$qfields = $this->contacts->stock_contact_fields + $extrafields;
 
 			$fieldlist = $this->bo->read_entry(array('id' => $ab_id, 'fields' => $qfields));
@@ -127,49 +124,50 @@
 				if($lastname == '')
 				{
 					/* Run away here. */
-					Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uivcard.out&nolname=1&ab_id=' . $ab_id));
+					Header('Location: ' . $GLOBALS['phpgw']->link('/index.php',"menuaction=addressbook.uivcard.out&nolname=1&ab_id=$ab_id"));
 				}
 				if($firstname == '')
 				{
-					Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uivcard.out&nofname=1&ab_id=' . $ab_id));
+					Header('Location: ' . $GLOBALS['phpgw']->link('/index.php',"menuaction=addressbook.uivcard.out&nofname=1&ab_id=$ab_id"));
 				}
 
 				if ($email)
 				{
 					$fn =  explode('@',$email);
-					$filename = sprintf('%s.vcf', $fn[0]);
+					$filename = sprintf("%s.vcf", $fn[0]);
 				}
 				elseif ($hemail)
 				{
 					$fn =  explode('@',$hemail);
-					$filename = sprintf('%s.vcf', $fn[0]);
+					$filename = sprintf("%s.vcf", $fn[0]);
 				}
 				else
 				{
 					$fn = strtolower($firstname);
-					$filename = sprintf('%s.vcf', $fn);
+					$filename = sprintf("%s.vcf", $fn);
 				}
 
 				// set translation variable
 				$myexport = $this->vcard->export;
 				// check that each $fields exists in the export array and
 				// set a new array to equal the translation and original value
-				while(list($name,$value) = each($fields))
+				while( list($name,$value) = each($fields) )
 				{
-					if($myexport[$name] && ($value != ''))
+					if ($myexport[$name] && ($value != "") )
 					{
-						//echo '<br>'.$name.'='.$fields[$name]."\n";
+						//echo '<br>'.$name."=".$fields[$name]."\n";
 						$buffer[$myexport[$name]] = $value;
 					}
 				}
 
 				// create a vcard from this translated array
-				$entry = $this->vcard->out($buffer);
+			    $entry = $this->vcard->out($buffer);
 				// print it using browser class for headers
 				// filename, mimetype, no length, default nocache True
 				$this->browser->content_header($filename,'text/x-vcard');
 				echo $entry;
-				$GLOBALS['phpgw']->common->exit;
+				exit;
+				//$GLOBALS['phpgw']->common->exit;
 			} /* !nolname && !nofname */
 
 			if($nofname)
@@ -177,7 +175,8 @@
 				echo '<br><br><center>';
 				echo lang("This person's first name was not in the address book.") .'<br>';
 				echo lang('Vcards require a first name entry.') . '<br><br>';
-				echo '<a href="' . $GLOBALS['phpgw']->link('/addressbook/index.php') . '">' . lang('OK') . '</a>';
+				echo '<a href="' . $GLOBALS['phpgw']->link('/addressbook/index.php',
+					"order=$order&start=$start&filter=$filter&query=$query&sort=$sort&cat_id=$cat_id") . '">' . lang('OK') . '</a>';
 				echo '</center>';
 			}
 
@@ -186,9 +185,15 @@
 				echo '<br><br><center>';
 				echo lang("This person's last name was not in the address book.") . '<br>';
 				echo lang('Vcards require a last name entry.') . '<br><br>';
-				echo '<a href="' . $GLOBALS['phpgw']->link('/addressbook/index.php') . '">' . lang('OK') . '</a>';
+				echo '<a href="' . $GLOBALS['phpgw']->link('/addressbook/index.php',
+					"order=$order&start=$start&filter=$filter&query=$query&sort=$sort&cat_id=$cat_id") . '">' . lang('OK') . '</a>';
 				echo '</center>';
 			}
+
+			if($nolname || $nofname)
+			{
+				//$GLOBALS['phpgw']->common->phpgw_footer();
+			}
 		}
 	}
 ?>
diff --git a/addressbook/inc/functions.inc.php b/addressbook/inc/functions.inc.php
index cba49654ef..4dcc53672f 100755
--- a/addressbook/inc/functions.inc.php
+++ b/addressbook/inc/functions.inc.php
@@ -43,8 +43,6 @@
 	/* Return a select form element with the categories option dialog in it */
 	function cat_option($cat_id='',$notall=False,$java=True,$multiple=False)
 	{
-		global $phpgw;
-
 		if ($java)
 		{
 			$jselect = ' onChange="this.form.submit();"';
@@ -62,7 +60,7 @@
 		}
 
 		/* Get global and app-specific category listings */
-		$cats_link .= $phpgw->categories->formatted_list('select','all',$cat_id,True);
+		$cats_link .= $GLOBALS['phpgw']->categories->formated_list('select','all',$cat_id,True);
 		$cats_link .= '</select>'."\n";
 		return $cats_link;
 	}
@@ -134,12 +132,10 @@
 
 	function read_custom_fields()
 	{
-		global $phpgw_info;
-
 		$i = 0; $j = 0;
 		$fields = array();
-		@reset($phpgw_info['user']['preferences']['addressbook']);
-		while (list($col,$descr) = @each($phpgw_info['user']['preferences']['addressbook']))
+		@reset($GLOBALS['phpgw_info']['user']['preferences']['addressbook']);
+		while (list($col,$descr) = @each($GLOBALS['phpgw_info']['user']['preferences']['addressbook']))
 		{
 			if ( substr($col,0,6) == 'extra_' )
 			{
@@ -166,17 +162,15 @@
 
 	function save_custom_field($old='',$new='')
 	{
-		global $phpgw,$phpgw_info;
-	
-		$phpgw->preferences->read_repository($phpgw_info['user']['account_id']);
+		$GLOBALS['phpgw']->preferences->read_repository($GLOBALS['phpgw_info']['user']['account_id']);
 		if ($old)
 		{
-			$phpgw->preferences->delete("addressbook","extra_".$old);
+			$GLOBALS['phpgw']->preferences->delete("addressbook","extra_".$old);
 		}
 		if($new)
 		{
-			$phpgw->preferences->add("addressbook","extra_".$new);
+			$GLOBALS['phpgw']->preferences->add("addressbook","extra_".$new);
 		}
-		$phpgw->preferences->save_repository(1);
+		$GLOBALS['phpgw']->preferences->save_repository(1);
 	}
 ?>
diff --git a/addressbook/inc/hook_admin.inc.php b/addressbook/inc/hook_admin.inc.php
index d13b4665a9..290e519306 100644
--- a/addressbook/inc/hook_admin.inc.php
+++ b/addressbook/inc/hook_admin.inc.php
@@ -2,24 +2,24 @@
 	/**************************************************************************\
 	* phpGroupWare                                                             *
 	* http://www.phpgroupware.org                                              *
-	* Written by coreteam <phpgroupware-developers@gnu.org>                    *
-	* -----------------------------------------------------                    *
+	* Written by Joseph Engo <jengo@phpgroupware.org>                          *
+	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
 	*  Free Software Foundation; either version 2 of the License, or (at your  *
 	*  option) any later version.                                              *
 	\**************************************************************************/
-	/* $Id$ */
 
-	{
-// Only Modify the $file variable.....
-		$file = Array
-		(
-			'Site Configuration' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
-			'Edit custom fields' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uifields.index'),
-			'Global Categories'  => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=' . $appname . '&global_cats=True')
-		);
-//Do not modify below this line
-		$GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
-	}
-?>
+	// $Id$
+	// $Source$
+
+	// Only Modify the $file and $title variables.....
+	$title = $appname;
+	$file = Array(
+		'Site Configuration' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
+		'Edit custom fields' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uifields.index'),
+		'Global Categories' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=addressbook')
+	);
+	//Do not modify below this line
+	display_section($appname,$title,$file);
+?>
\ No newline at end of file
diff --git a/addressbook/inc/hook_help.inc.php b/addressbook/inc/hook_help.inc.php
deleted file mode 100644
index 8191bc9918..0000000000
--- a/addressbook/inc/hook_help.inc.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-	/**************************************************************************\
-	* phpGroupWare - Addressbook hook_help                                     *
-	* http://www.phpgroupware.org                                              *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-	/* $Id$ */
-
-	include(PHPGW_SERVER_ROOT.'/'.'addressbook'.'/setup/setup.inc.php');
-
-	$GLOBALS['phpgw']->help->set_params(array('app_name'		=> 'addressbook',
-												'title'			=> lang('addressbook'),
-												'app_version'	=> $setup_info['addressbook']['version']));
-
-	$GLOBALS['phpgw']->help->data[] = array
-	(
-		'text'					=> lang('owerview'),
-		'link'					=> $GLOBALS['phpgw']->help->check_help_file('overview.php'),
-		'lang_link_statustext'	=> lang('owerview')
-	);
-
-	$GLOBALS['phpgw']->help->data[] = array
-	(
-		'text'					=> lang('list'),
-		'link'					=> $GLOBALS['phpgw']->help->check_help_file('list.php'),
-		'lang_link_statustext'	=> lang('list')
-	);
-
-	$GLOBALS['phpgw']->help->data[] = array
-	(
-		'text'					=> lang('add'),
-		'link'					=> $GLOBALS['phpgw']->help->check_help_file('add.php'),
-		'lang_link_statustext'	=> lang('add')
-	);
-
-	$GLOBALS['phpgw']->help->draw();
-?>
diff --git a/addressbook/inc/hook_home.inc.php b/addressbook/inc/hook_home.inc.php
index 4e8471b86a..da604e7ddf 100644
--- a/addressbook/inc/hook_home.inc.php
+++ b/addressbook/inc/hook_home.inc.php
@@ -1,55 +1,83 @@
 <?php
-	/**************************************************************************\
-	* phpGroupWare - Addressbook hook_home                                     *
-	* http://www.phpgroupware.org                                              *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-	/* $Id$ */
+  /**************************************************************************\
+  * phpGroupWare - E-Mail                                                    *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
 
+	/* $Id$ */
+	
 	$d1 = strtolower(substr(PHPGW_APP_INC,0,3));
 	if($d1 == 'htt' || $d1 == 'ftp' )
 	{
 		echo "Failed attempt to break in via an old Security Hole!<br>\n";
-		$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-		exit;
+		$GLOBALS['phpgw']->common->phpgw_exit();
 	}
 	unset($d1);
 
 	if ($GLOBALS['phpgw_info']['user']['apps']['addressbook']
 		&& $GLOBALS['phpgw_info']['user']['preferences']['addressbook']['mainscreen_showbirthdays'])
 	{
+		echo "\n<!-- Birthday info -->\n";
+
 		$c = CreateObject('phpgwapi.contacts');
-		$qfields = array
-		(
+		$qfields = array(
 			'n_given'  => 'n_given',
 			'n_family' => 'n_family',
 			'bday'     => 'bday'
 		);
 		$now = time() - ((60 * 60) * intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']));
 		$today = $GLOBALS['phpgw']->common->show_date($now,'n/d/');
-
+		
 		$bdays = $c->read(0,15,$qfields,$today,'tid=n','','',$GLOBALS['phpgw_info']['user']['account_id']);
+		
+		$title = '<center><font color="#FFFFFF">'.lang('Birthdays').'</font></center>';
 
+		$portalbox = CreateObject('phpgwapi.listbox',
+			Array(
+				'title'     => $title,
+				'primary'   => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
+				'secondary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
+				'tertiary'  => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
+				'width'     => '100%',
+				'outerborderwidth' => '0',
+				'header_background_image' => $GLOBALS['phpgw']->common->image('phpgwapi/templates/default','bg_filler')
+			)
+		);
 		$app_id = $GLOBALS['phpgw']->applications->name2id('addressbook');
 		$GLOBALS['portal_order'][] = $app_id;
+		$var = Array(
+			'up'       => Array('url' => '/set_box.php', 'app' => $app_id),
+			'down'     => Array('url' => '/set_box.php', 'app' => $app_id),
+			'close'    => Array('url' => '/set_box.php', 'app' => $app_id),
+			'question' => Array('url' => '/set_box.php', 'app' => $app_id),
+			'edit'     => Array('url' => '/set_box.php', 'app' => $app_id)
+		);
+
+		while(list($key,$value) = each($var))
+		{
+			$portalbox->set_controls($key,$value);
+		}
+
+		$portalbox->data = Array();
 
-		$GLOBALS['phpgw']->portalbox->set_params(array('app_id'	=> $app_id,
-														'title'	=> lang('addressbook')));
 		while(list($key,$val) = @each($bdays))
 		{
 			if (substr($val['bday'],0,strlen($today)) == $today)
 			{
-				$GLOBALS['phpgw']->portalbox->data[] = array
-				(
-					'text'					=> lang("Today is %1's birthday!", $val['n_given'] . ' ' . $val['n_family']),
-					'link'					=> $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id=' .  $val['id']),
-					'lang_link_statustext'	=> lang('show contact')
+				$portalbox->data[] = array(
+					'text' => lang("Today is %1's birthday!", $val['n_given'] . ' ' . $val['n_family']),
+					'link' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id=' .  $val['id'])
 				);
 			}
+//			$tmp = '<a href="'
+//				. $GLOBALS['phpgw']->link('/addressbook/view.php','ab_id=' .  $val['id']) . '">'
+//				. $val['n_given'] . ' ' . $val['n_family'] . '</a>';
+//			echo '<tr><td align="left">' . lang("Today is %1's birthday!", $tmp) . '</td></tr>' . "\n";
 		}
 
 		$tomorrow = $GLOBALS['phpgw']->common->show_date($now + 86400,'n/d/');
@@ -60,14 +88,21 @@
 		{
 			if (substr($val['bday'],0,strlen($tomorrow)) == $tomorrow)
 			{
-				$GLOBALS['phpgw']->portalbox->data[] = array
-				(
-					'text'					=> lang("Tomorrow is %1's birthday.", $val['n_given'] . ' ' . $val['n_family']),
-					'link'					=> $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='.$val['id']),
-					'lang_link_statustext'	=> lang('show contact')
+				$portalbox->data[] = array(
+					'text' => lang("Tomorrow is %1's birthday.",$val['n_given'] . ' ' . $val['n_family']),
+					'link' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='.$val['id'])
 				);
 			}
+//			$tmp = '<a href="'
+//				. $GLOBALS['phpgw']->link('/addressbook/view.php','ab_id=' .  $val['id']) . '">'
+//				. $val['n_given'] . ' ' . $val["n_family"] . '</a>';
+//			echo '<tr><td align="left">' . lang("Tomorrow is %1's birthday.", $tmp) . '</td></tr>' . "\n";
 		}
-		$GLOBALS['phpgw']->portalbox->draw();
+		if(count($portalbox->data))
+		{
+			echo $portalbox->draw();
+		}
+		unset($portalbox);
+		echo "\n<!-- Birthday info -->\n";
 	}
 ?>
diff --git a/addressbook/inc/hook_manual.inc.php b/addressbook/inc/hook_manual.inc.php
new file mode 100755
index 0000000000..365e315b61
--- /dev/null
+++ b/addressbook/inc/hook_manual.inc.php
@@ -0,0 +1,19 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - Calendar Holidays                                         *
+  * http://www.phpgroupware.org                                              *
+  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+	/* $Id$ */
+
+// Only Modify the $file variable.....
+	$file = Array();
+//Do not modify below this line
+	display_manual_section($appname,$file);
+?>
diff --git a/addressbook/inc/hook_notifywindow.inc.php b/addressbook/inc/hook_notifywindow.inc.php
index eb4f0a4bc2..7e49f68309 100644
--- a/addressbook/inc/hook_notifywindow.inc.php
+++ b/addressbook/inc/hook_notifywindow.inc.php
@@ -15,8 +15,7 @@
 	if($d1 == 'htt' || $d1 == 'ftp' )
 	{
 		echo "Failed attempt to break in via an old Security Hole!<br>\n";
-		$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-		exit;
+		$GLOBALS['phpgw']->common->phpgw_exit();
 	}
 	unset($d1);
 
diff --git a/addressbook/index.php b/addressbook/index.php
index 47c69e63e6..62e54f74d3 100755
--- a/addressbook/index.php
+++ b/addressbook/index.php
@@ -1,10 +1,10 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - Addressbook                                               *
+	* phpGroupWare - Messenger                                                 *
 	* http://www.phpgroupware.org                                              *
-	* --------------------------------------------                             *
 	* This application written by Joseph Engo <jengo@phpgroupware.org>         *
-	*  and Miles Lott<milosch@phpgroupware.org>                                *
+	* --------------------------------------------                             *
+	* Funding for this program was provided by http://www.checkwithmom.com     *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
@@ -17,10 +17,14 @@
 	$GLOBALS['phpgw_info'] = array();
 
 	$GLOBALS['phpgw_info']['flags'] = array(
-		'currentapp' => 'addressbook'
+		'currentapp' => 'addressbook',
+		'noheader'   => True,
+		'nonavbar'   => True
 	);
 	include('../header.inc.php');
 
 	$obj = CreateObject('addressbook.uiaddressbook');
 	$obj->index();
+
+	$GLOBALS['phpgw']->common->phpgw_footer();
 ?>
diff --git a/addressbook/setup/phpgw_de.lang b/addressbook/setup/phpgw_de.lang
index 641c9a515a..5c465c8b80 100644
--- a/addressbook/setup/phpgw_de.lang
+++ b/addressbook/setup/phpgw_de.lang
@@ -1,15 +1,19 @@
+%1 records imported	addressbook	de	%1 Datensätze importiert
+%1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	de	%1 Datensätze gelesen (noch nicht importiert, sie können %2zurück%3 gehen und Test-Import auschalten)
 <b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	de	<b>Kein Übersetzungstyp &lt;none&gt; konnte gefunden werden.</b> Bitte wählen Sie einen Übersetzungstype aus der Liste
-<b>no conversion type <none> could be located.</b>  please choose a conversion type from the list	addressbook	de	<b>Kein Übersetzungstyp &lt;none&gt; konnte gefunden werden.</b> Bitte wählen Sie einen Übersetzungstype aus der Liste
+@-eval() is only availible to admins!!!	addressbook	de	@-eval() ist nur verfügbar für Administratoren!!!
+add a single entry by passing the fields.	addressbook	de	Hinzufügen eines einzelnen Eintrags durch Übergeben der Felder.
 add custom field	addressbook	de	Benutzerdefiniertes Feld hinzufügen
 address book	common	de	Adressbuch
+address book - vcard in	addressbook	de	Adressbuch - VCard in
 address book - view	addressbook	de	Adressbuch - Anzeigen
 address line 2	addressbook	de	Adreßzeile 2
 address line 3	addressbook	de	Adreßzeile 3
 address type	addressbook	de	Adreßtyp
 addressbook	common	de	Adressbuch
 addressbook preferences	addressbook	de	Adressbuch Einstellungen
+addressbook-fieldname	addressbook	de	Adressbuch Feldname
 addvcard	addressbook	de	VCard hinzufügen
-alphabet	addressbook	de	a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z
 alt. csv import	addressbook	de	Alt. CSV Import
 are you sure you want to delete this field?	addressbook	de	Sind Sie sicher, dass sie dieses Feld löschen wollen?
 bbs phone	addressbook	de	BBS
@@ -35,27 +39,32 @@ company name	common	de	Firmenname
 contact	common	de	Kontakt
 contact application	admin	de	Kontakt Anwendung
 contact settings	admin	de	Kontakt Einstellungen
+copied by %1, from record #%2.	addressbook	de	Kopiert von %1, vom Datensatz Nr. %2.
 country	common	de	Land
+csv-fieldname	addressbook	de	CSV-Feldname
+csv-filename	addressbook	de	CSV-Dateiname
 custom	addressbook	de	Benutzerdefiniert
 custom fields	addressbook	de	Benutzerdefinierte Felder
-debug output in browser	addressbook	de	Ausgaben zur Fehlersuche im Webbrowser
+debug output in browser	addressbook	de	Debugausgaben in Browser
 default filter	addressbook	de	Standardfilter
+delete a single entry by passing the id.	addressbook	de	Löscht einen einzelnen Eintrag durch Übergabe seiner Id.
 department	common	de	Abteilung
 domestic	addressbook	de	Wohnung
-download export file (uncheck to debug output in browser)	addressbook	de	Exportdatei herunterladen (nicht auswählen um eine Test-Ausgabe im Browser zu bekommen)
+download	addressbook	de	Herunterladen
 edit custom field	addressbook	de	Benutzerdefiniertes Feld bearbeiten
 edit custom fields	admin	de	Benutzerdefinierte Felder bearbeiten
-enable remote search	admin	de	Fern-Suche zulassen
-enter the path to the export file here	addressbook	de	Geben Sie hier den Pfad zur exportierent Datei an
 export contacts	addressbook	de	Kontakte exportieren
 export file name	addressbook	de	Dateiname zum Exportieren
+export from addressbook	addressbook	de	Export vom Addressbuch
 extra	addressbook	de	Extra
 fax	addressbook	de	Telefax
 fax number	common	de	Telefaxnummer
-field name	addressbook	de	Feldname
 field %1 has been added !	addressbook	de	Feld %1 wurde hinzugefügt !
+field %1 has been updated !	addressbook	de	Feld %1 wurde aktualisiert !
+field name	addressbook	de	Feldname
 fields	addressbook	de	Felder
 fields to show in address list	addressbook	de	Felder, die in der Adressliste angezeigt werden sollen
+fieldseparator	addressbook	de	Feldtrenner
 full name	addressbook	de	vollständiger Name
 geo	addressbook	de	GEO
 grant addressbook access	common	de	Berechtigungen
@@ -68,10 +77,12 @@ home phone	addressbook	de	Tel privat
 home state	addressbook	de	Land (priv)
 home street	addressbook	de	Straße (priv)
 home zip code	addressbook	de	PLZ (priv)
+import	addressbook	de	Import
 import contacts	addressbook	de	Kontakte importieren
+import csv-file into addressbook	addressbook	de	Import CSV-Datei ins Addressbuch
 import file	addressbook	de	Datei importieren
+import from ldif, csv, or vcard	addressbook	de	Import von LDIF, CSV oder VCard
 import from outlook	addressbook	de	Aus Outlook importieren
-in netscape, open the addressbook and select <b>export</b> from the <b>file</b> menu.<br>the file exported will be in ldif format.<p>or, in outlook, select your contacts folder, select <b>import and export...</b> from	addressbook	de	
 international	addressbook	de	International
 isdn phone	addressbook	de	ISDN Tel.
 label	addressbook	de	Adreßetikett
@@ -79,15 +90,16 @@ ldap context for contacts	admin	de	LDAP Kontext f
 ldap host for contacts	admin	de	LDAP Host für Kontakte
 ldap root dn for contacts	admin	de	LDAP rootdn für Kontakte
 ldap root pw for contacts	admin	de	LDAP Paswort für Kontakte
+ldif	addressbook	de	LDIF
 line 2	addressbook	de	Zeile 2
-mark records as private	addressbook	de	Einträge als privat markieren
 message phone	addressbook	de	Anrufbeantworter
 middle name	addressbook	de	Zweiter Vorname
 mobile	addressbook	de	Mobil
 mobile phone	addressbook	de	Mobil-Telefon
 modem phone	addressbook	de	Modem
 no vcard	addressbook	de	Keine VCard
-none	addressbook	de	keine
+number of records to read (<=200)	addressbook	de	Nummer der einzulesenden Datensätze (<= 200)
+on	addressbook	de	an
 other	addressbook	de	Andere
 other number	addressbook	de	andere Nr.
 other phone	addressbook	de	Anderes Telefon
@@ -96,182 +108,43 @@ parcel	addressbook	de	Lieferadresse
 personal	addressbook	de	Persönlich
 phone number	common	de	Telefon
 phone numbers	common	de	Telefonnummern
+please enter a name for that field !	addressbook	de	Bitte geben sie einen Namen für das Feld an !
+please select	addressbook	de	Bitte auswählen
 postal	common	de	Postanschrift
 pref	addressbook	de	pref
 prefix	addressbook	de	Prefix
 public key	addressbook	de	öffentlicher Schlüssel
+read a list of entries.	addressbook	de	Liest eine Liste von Einträgen.
+read a single entry by passing the id and fieldlist.	addressbook	de	Liest einen einzelnen Eintrag über seine Id und Feldliste.
+read this list of methods.	addressbook	de	Liest diese Liste der Methoden.
 record access	addressbook	de	Zugriffsrechte
 record owner	addressbook	de	Datensatz Eigentümer
 retrieve contacts	admin	de	Kontakte laden
-select the type of conversion	addressbook	de	Art der Umsetzung auswählen
+select	addressbook	de	Auswählen
 select where you want to store	admin	de	Auswählen wo Sie speichern wollen
 show birthday reminders on main screen	addressbook	de	Geburtstags-Mahner auf der Startseite anzeigen
+startrecord	addressbook	de	Startdatensatz
 state	common	de	Land
 street	common	de	Straße
 successfully imported %1 records into your addressbook.	addressbook	de	%1 Kontakte wurden erfolgreich in ihr Adressbuch importiert
 suffix	addressbook	de	Zusatz
-the <b>file</b> menu and export your contacts into a comma separated text (csv) file. <p>or, in palm desktop 4.0 or greater, visit your addressbook and select <b>export</b> from the <b>file</b> menu. the file exported will be in vcard format.<p>	addressbook	de	
+test import (show importable records <u>only</u> in browser)	addressbook	de	Test-Import (zeigt importierbare Datensätze <u>nur</u> im Browser an)
+that field name has been used already !	addressbook	de	Dieser Feldname wird bereits benutzt !
 this person's first name was not in the address book.	addressbook	de	Der Vorname dieser Person ist nicht im Adressbuch.
+this person's last name was not in the address book.	addressbook	de	Der Nachname dieser Person ist nicht im Adressbuch.
 today is %1's birthday!	common	de	Heute ist der Geburtstag von %1!
 tomorrow is %1's birthday.	common	de	Morgen ist der Geburtstag von %1.
+translation	addressbook	de	Übersetzung
+update a single entry by passing the fields.	addressbook	de	Aktualisiert einen einzelnen Eintrag durch Übergabe seiner Felder.
+use country list	addressbook	de	Länderliste benutzen
 vcard	common	de	VCard
 vcards require a first name entry.	addressbook	de	VCards benötigen einen Vornamen.
+vcards require a last name entry.	addressbook	de	VCards benötigen einen Nachnamen.
 video phone	addressbook	de	Bildtelefon
 voice phone	addressbook	de	Telefon
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	de	WARNUNG!! LDAP darf nur verwendet werden, wenn sie die Benutzerkonten nicht im Adressbuch speichern!
 work phone	addressbook	de	Tel dienstl.
+you appear to be running	addressbook	de	Sie benutzen gerade einen
+you must select a vcard. (*.vcf)	addressbook	de	Sie müssen eine VCard auswählen (*.vcf)
+you must select at least 1 column to display	addressbook	de	Sie müssen mindestens eine Spalte zum Anzeigen auswählen
 zip code	common	de	PLZ
-<br>
-<b>Fatal error</b>:  Call to undefined function:  phpgw_exit() in <b>/www/drock/html/cvs_phpgroupware/developer_tools/inc/class.uilangfile.inc.php</b> on line <b>566</b><br>
-
-<!DOCTYPE html PUBLIC "-//W3C/DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta name="author" content="phpGroupWare http://www.phpgroupware.org">
-    <meta name="description" content="phpGroupWare">
-    <meta name="keywords" content="phpGroupWare">
-    <meta name="robots" content="noindex">
-    <link rel="icon" href="favicon.ico" type="image/x-ico">
-    <link rel="shortcut icon" href="favicon.ico">
-    <title>phpGroupWare@CVS@granit</title>
-    <link rel="stylesheet" type="text/css" href="/cvs_phpgroupware/phpgwapi/templates/verdilak/css/phpgw.css">
-    <link rel="stylesheet" type="text/css" href="/cvs_phpgroupware/phpgwapi/templates/verdilak/css/submarine.css">
-  </head>
-  <body>
-    <table width="100%" height="100%" cellspacing="0" cellpadding="0">
-      <tr height="30">
-        <td colspan="2" valign="top">
-          <table class="navbar" height="30" width="100%" cellspacing="0" cellpadding="0" border="0">
-            <tr valign="bottom">
-              <td>
-                <a href="http://www.phpgroupware.org" target="_blank" title="phpGroupWare --> homepage*"><img src="/cvs_phpgroupware/phpgwapi/templates/verdilak/images/logo.png" border="0"></a>
-              </td>
-              <td class="info" width="99%" align="center">Ralf Becker &lt;ralf&gt; - Saturday 01.03.2003</td>
-              <td rowspan="2" nowrap>
-                <table cellspacing="0" cellpadding="0" border="0">
-                  <tr>
-                    <td>
-                      <a href="/cvs_phpgroupware/home.php"><img src="/cvs_phpgroupware/phpgwapi/templates/verdilak/images/welcome-grey.png" border="0" alt="Home" title="Home"></a>
-                    </td>
-                    <td>
-                      <a href="/cvs_phpgroupware/preferences/index.php"><img src="/cvs_phpgroupware/preferences/templates/verdilak/images/preferences-grey.png" border="0" alt="Preferences" title="Preferences"></a>
-                    </td>
-                    <td>
-                      <a href="/cvs_phpgroupware/logout.php"><img src="/cvs_phpgroupware/phpgwapi/templates/verdilak/images/logout.png" border="0" alt="Logout" title="Logout"></a>
-                    </td>
-                    <td>
-                      <a href="/cvs_phpgroupware/about.php?app=developer_tools"><img src="/cvs_phpgroupware/phpgwapi/templates/verdilak/images/about-grey.png" border="0" alt="about Developer Tools" title="about Developer Tools"></a>
-                    </td>
-                    <td>
-                      <a href="/cvs_phpgroupware/help.php" target="_blank"><img src="/cvs_phpgroupware/phpgwapi/templates/verdilak/images/help.png" border="0" alt="Manual" title="Manual"></a>
-                    </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-            <tr valign="bottom">
-              <td colspan="2" valign="bottom"><img src="/cvs_phpgroupware/phpgwapi/templates/verdilak/images/greybar.jpg" height="6" width="100%"></td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr height="20" valign="top">
-        <td class="left"></td>
-        <td align="right"></td>
-      </tr>
-      <tr valign="top">
-        <td class="left" width="32">
-          <table cellspacing="0" cellpadding="0" valign="top" class="left">
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/admin/index.php"><img src="/cvs_phpgroupware/admin/templates/default/images/navbar.png" border="0" alt="Admin" title="Admin"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/email/index.php"><img src="/cvs_phpgroupware/email/templates/default/images/navbar.png" border="0" alt="E-Mail" title="E-Mail"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/calendar/index.php"><img src="/cvs_phpgroupware/calendar/templates/default/images/navbar.png" border="0" alt="Calendar" title="Calendar"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/addressbook/index.php"><img src="/cvs_phpgroupware/addressbook/templates/default/images/navbar.png" border="0" alt="Addressbook" title="Addressbook"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/news_admin/index.php"><img src="/cvs_phpgroupware/news_admin/templates/default/images/navbar.png" border="0" alt="News Admin" title="News Admin"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/notes/index.php"><img src="/cvs_phpgroupware/notes/templates/default/images/navbar.png" border="0" alt="Notes" title="Notes"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/developer_tools/index.php"><img src="/cvs_phpgroupware/developer_tools/templates/default/images/navbar.png" border="0" alt="Developer Tools" title="Developer Tools"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/etemplate/index.php"><img src="/cvs_phpgroupware/etemplate/templates/default/images/navbar.png" border="0" alt="eTemplate" title="eTemplate"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/sitemgr/index.php"><img src="/cvs_phpgroupware/sitemgr/templates/default/images/navbar.png" border="0" alt="sitemgr*" title="sitemgr*"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/filemanager/index.php"><img src="/cvs_phpgroupware/filemanager/templates/default/images/navbar.png" border="0" alt="Filemanager" title="Filemanager"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/projects/index.php"><img src="/cvs_phpgroupware/projects/templates/default/images/navbar.png" border="0" alt="Projects" title="Projects"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/infolog/index.php"><img src="/cvs_phpgroupware/infolog/templates/default/images/navbar.png" border="0" alt="InfoLog" title="InfoLog"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/stocks/index.php"><img src="/cvs_phpgroupware/stocks/templates/default/images/navbar.png" border="0" alt="Stock Quotes" title="Stock Quotes"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/chora/index.php"><img src="/cvs_phpgroupware/chora/templates/default/images/navbar.png" border="0" alt="Chora" title="Chora"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/registration/index.php"><img src="/cvs_phpgroupware/phpgwapi/templates/verdilak/images/nonav.png" border="0" alt="Registration" title="Registration"></a>
-              </td>
-            </tr>
-            <tr>
-              <td class="left">
-                <a href="/cvs_phpgroupware/et_media/index.php"><img src="/cvs_phpgroupware/phpgwapi/templates/verdilak/images/nonav.png" border="0" alt="et_media*" title="et_media*"></a>
-              </td>
-            </tr>
-          </table>
-        </td>
-        <td width="100%" height="100%" valign="top" align="center" style="padding-left: 5px"></td>
-      </tr>
-      <tr class="navbar">
-        <td colspan="2" align="center" class="info">Powered by<a href="http://www.phpgroupware.org" target="blank" onMouseout="window.status='';return true;" onMouseover="window.status='phpGroupWare --> homepage*'; return true;"> phpGroupWare </a> Version 0.9.15.008</td>
-      </tr>
-    </table>
-  </body>
-</html>
-
diff --git a/addressbook/setup/phpgw_en.lang b/addressbook/setup/phpgw_en.lang
index 87f3f9d1b7..efe0872b3b 100644
--- a/addressbook/setup/phpgw_en.lang
+++ b/addressbook/setup/phpgw_en.lang
@@ -1,6 +1,7 @@
 %1 records imported	addressbook	en	%1 records imported
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	en	%1 records read (not yet imported, you may go %2back%3 and uncheck Test Import)
 <b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	en	<b>No conversion type &lt;none&gt; could be located.</b>  Please choose a conversion type from the list
+@-eval() is only availible to admins!!!	addressbook	en	@-eval() is only availible to admins!!!
 add a single entry by passing the fields.	addressbook	en	Add a single entry by passing the fields.
 add custom field	addressbook	en	Add Custom Field
 address book	common	en	Address Book
@@ -13,7 +14,6 @@ addressbook	common	en	Addressbook
 addressbook preferences	addressbook	en	Addressbook preferences
 addressbook-fieldname	addressbook	en	Addressbook-Fieldname
 addvcard	addressbook	en	Add VCard
-alphabet	addressbook	en	a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z
 alt. csv import	addressbook	en	Alt. CSV Import
 are you sure you want to delete this field?	addressbook	en	Are you sure you want to delete this field?
 bbs phone	addressbook	en	BBS Phone
@@ -39,6 +39,7 @@ company name	common	en	Company Name
 contact	common	en	Contact
 contact application	admin	en	Contact application
 contact settings	admin	en	Contact Settings
+copied by %1, from record #%2.	addressbook	en	Copied by %1, from record #%2.
 country	common	en	Country
 csv-fieldname	addressbook	en	CSV-Fieldname
 csv-filename	addressbook	en	CSV-Filename
@@ -50,10 +51,8 @@ delete a single entry by passing the id.	addressbook	en	Delete a single entry by
 department	common	en	Department
 domestic	addressbook	en	Domestic
 download	addressbook	en	Download
-download export file (uncheck to debug output in browser)	addressbook	en	Download export file (Uncheck to debug output in browser)
 edit custom field	addressbook	en	Edit Custom Field
 edit custom fields	admin	en	Edit Custom Fields
-enter the path to the export file here	addressbook	en	Enter the path to the export file here
 export contacts	addressbook	en	Export Contacts
 export file name	addressbook	en	Export file name
 export from addressbook	addressbook	en	Export from Addressbook
@@ -67,7 +66,6 @@ fields to show in address list	addressbook	en	Fields to show in address list
 fieldseparator	addressbook	en	Fieldseparator
 full name	addressbook	en	Full Name
 geo	addressbook	en	GEO
-go	addressbook	en	Go
 grant addressbook access	common	en	Grant Addressbook Access
 home address type	addressbook	en	Home Address Type
 home city	addressbook	en	Home City
@@ -84,7 +82,6 @@ import csv-file into addressbook	addressbook	en	Import CSV-File into Addressbook
 import file	addressbook	en	Import File
 import from ldif, csv, or vcard	addressbook	en	Import from LDIF, CSV, or VCard
 import from outlook	addressbook	en	Import from Outlook
-In Netscape, open the Addressbook and select <b>Export</b> from the <b>File</b> menu.<br>The file exported will be in LDIF format.<P>Or, in Outlook, select your Contacts folder, select <b>Import and Export...</b> from	addressbook	en	In Netscape, open the Addressbook and select <b>Export</b> from the <b>File</b> menu.<br>The file exported will be in LDIF format.<P>Or, in Outlook, select your Contacts folder, select <b>Import and Export...</b> from 
 international	addressbook	en	International
 isdn phone	addressbook	en	ISDN Phone
 label	addressbook	en	Label
@@ -94,7 +91,6 @@ ldap root dn for contacts	admin	en	LDAP root dn for contacts
 ldap root pw for contacts	admin	en	LDAP root pw for contacts
 ldif	addressbook	en	LDIF
 line 2	addressbook	en	Line 2
-mark records as private	addressbook	en	Mark records as private
 message phone	addressbook	en	Message Phone
 middle name	addressbook	en	Middle Name
 mobile	addressbook	en	Mobile
@@ -104,7 +100,6 @@ no vcard	addressbook	en	No VCard
 number of records to read (<=200)	addressbook	en	Number of records to read (<=200)
 other number	addressbook	en	Other Number
 other phone	addressbook	en	Other Phone
-owerview	addressbook	en	owerview
 pager	common	en	Pager
 parcel	addressbook	en	Parcel
 phone number	common	en	Phone Number
@@ -118,24 +113,21 @@ read a list of entries.	addressbook	en	Read a list of entries.
 read a single entry by passing the id and fieldlist.	addressbook	en	Read a single entry by passing the id and fieldlist.
 record access	addressbook	en	Record Access
 record owner	addressbook	en	Record owner
-remote search	addressbook	en	Remote Search
 retrieve contacts	admin	en	retrieve contacts
-select the type of conversion	addressbook	en	Select the type of conversion
 select where you want to store	admin	en	Select where you want to store
 show birthday reminders on main screen	addressbook	en	Show birthday reminders on main screen
-show contact	addressbook	en	show contact
 startrecord	addressbook	en	Startrecord
 state	common	en	State
 street	common	en	Street
 suffix	addressbook	en	Suffix
 test import (show importable records <u>only</u> in browser)	addressbook	en	Test Import (show importable records <u>only</u> in browser)
 that field name has been used already !	addressbook	en	That field name has been used already !
-the <b>File</b> menu and export your contacts into a comma separated text (CSV) file. <P>Or, in Palm Desktop 4.0 or greater, visit your addressbook and select <b>Export</b> from the <b>File</b> menu. The file exported will be in VCard format.<P>	addressbook	en	the <b>File</b> menu and export your contacts into a comma separated text (CSV) file.       <P>Or, in Palm Desktop 4.0 or greater, visit your addressbook and select <b>Export</b> from the <b>File</b> menu. The file exported will be in VCard format.<P>
 this person's first name was not in the address book.	addressbook	en	This person's first name was not in the address book.
 this person's last name was not in the address book.	addressbook	en	This person's last name was not in the address book.
 today is %1's birthday!	common	en	Today is %1's birthday!
 tomorrow is %1's birthday.	common	en	Tomorrow is %1's birthday.
 update a single entry by passing the fields.	addressbook	en	Update a single entry by passing the fields.
+use country list	addressbook	en	Use Country List
 vcard	common	en	VCard
 vcards require a first name entry.	addressbook	en	VCards require a first name entry.
 vcards require a last name entry.	addressbook	en	Vcards require a last name entry.
diff --git a/addressbook/setup/phpgw_es.lang b/addressbook/setup/phpgw_es.lang
index 0eda483ee5..e29a881fd7 100644
--- a/addressbook/setup/phpgw_es.lang
+++ b/addressbook/setup/phpgw_es.lang
@@ -37,16 +37,13 @@ country	common	es	Pais
 csv-fieldname	addressbook	es	Campo CSV
 csv-filename	addressbook	es	Archivo CSV
 custom fields	addressbook	es	Campos Personalizados
-debug output in browser	addressbook	es	Visualizar depuracion
 default filter	preferences	es	Filtro por Defecto
 department	common	es	Departmento
 domestic	common	es	Nacional
 download	addressbook	es	Descargar Archivo
-download export file (uncheck to debug output in browser)	addressbook	es	Descargar archivo exportado
 edit custom field	admin	es	Editar Campo Personalizado
 edit custom fields	admin	es	Editar Campos Personalizados
 e-mail	addressbook	es	E-Mail
-enter the path to the export file here	addressbook	es	Ingrese la ruta al archivo exportado aqui
 export contacts	addressbook	es	Exportar Contactos
 export file name	addressbook	es	Nombre del Archivo a Exportar
 export from addressbook	addressbook	es	Exportar de la Libreta de Direcciones
@@ -76,8 +73,6 @@ import file	addressbook	es	Importar Archivo
 import from ldif, csv, or vcard	addressbook	es	Importar desde LDIF, CSV o VCard
 import from netscape	addressbook	es	Importar desde Netscape
 import from outlook	addressbook	es	Importar desde Outlook
-In Netscape, open the Addressbook and select <b>Export</b> from the <b>File</b> menu.<br>The file exported will be in LDIF format.<P>Or, in Outlook, select your Contacts folder, select <b>Import and Export...</b> from	addressbook	es	<P>
-the <b>File</b> menu and export your contacts into a comma separated text (CSV) file. <P>Or, in Palm Desktop 4.0 or greater, visit your addressbook and select <b>Export</b> from the <b>File</b> menu. The file exported will be in VCard format.<P>	addressbook	es	Desde Outlook, seleccione su carpeta de contactos, seleccione <b>Importar y Exportar</b> del menu <b>Archivo</b> y exporte sus contactos en un archivo de Texto separado por comas (CSV).</P>
 international	common	es	Internacional
 isdn phone	addressbook	es	Telefono ISDN
 label	addressbook	es	Etiqueta
@@ -87,14 +82,12 @@ ldap host for contacts	admin	es	Host LDAP para contacts
 ldap root dn for contacts	admin	es	Raiz LDAP dn para contactos
 ldap root pw for contacts	admin	es	Raiz LDAP pw para contactos
 line 2	addressbook	es	Linea 2
-mark records as private	addressbook	es	Marcar registros como Privados
 message phone	addressbook	es	Telefono de Mensajes
 middle name	addressbook	es	Segundo Nombre
 mobile	addressbook	es	Tel.Celular
 mobile phone	addressbook	es	Telefono Movil
 modem phone	addressbook	es	Telefono Modem
 no vcard	common	es	Sin VCard
-none	addressbook	es	Ninguno
 number of records to read (<=200)	addressbook	es	Registros a leer (menos de 200)
 other number	addressbook	es	Otro Numero
 other phone	addressbook	es	Otro Telefono
@@ -112,7 +105,6 @@ record access	addressbook	es	Acceso al registro
 record owner	addressbook	es	Dueño del registro
 records read (not yet imported, you may go back and uncheck test import)	addressbook	es	registros leidos (aun no importados, usted puede volver y desmarcar Testear)
 retrieve contacts	admin	es	Recuperar Contactos
-select the type of conversion	addressbook	es	Seleccione el tipo de conversion
 select where you want to store	admin	es	Seleccione donde desea almacenar
 show birthday reminders on main screen	addressbook	es	Mostrar recordatorios de Cumplea&ntilde;os en la Pantalla Principal
 startrecord	addressbook	es	Registro Inicial
diff --git a/addressbook/setup/phpgw_fr.lang b/addressbook/setup/phpgw_fr.lang
index 71ad3e2691..f5e03e30db 100644
--- a/addressbook/setup/phpgw_fr.lang
+++ b/addressbook/setup/phpgw_fr.lang
@@ -1,6 +1,7 @@
 %1 records imported	addressbook	fr	%1 enregistrements importés
-%1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	fr	%1 enregistrements lus (pas encore importés, vous pouvez revenir %2en arrière%3 et décocher Tester l'import)
+%1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	fr	%1 enregistrements lus (pas
 <b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	fr	<b>Aucun type de conversion &lt;aucun&gt; n'a pu être trouvé.</b>  SVP choisissez un type de conversion depuis la liste
+@-eval() is only availible to admins!!!	addressbook	fr	@-eval() est disponible uniquement pour les administrateurs!!!
 add a single entry by passing the fields.	addressbook	fr	Ajouter une seule entrée en passant les champs.
 add custom field	addressbook	fr	Ajouter champ personnalisé
 address book	common	fr	Carnet d'adresses
@@ -13,7 +14,6 @@ addressbook	common	fr	Carnet d'adresses
 addressbook preferences	addressbook	fr	Préférences du carnet d'adresses
 addressbook-fieldname	addressbook	fr	Carnet d'adresses-nomdechamp
 addvcard	addressbook	fr	Ajouter VCard
-alphabet	addressbook	fr	a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z
 alt. csv import	addressbook	fr	Import Alt. CSV
 are you sure you want to delete this field?	addressbook	fr	Etes-vous sûr de vouloir effacer ce champ?
 bbs phone	addressbook	fr	Téléphone BBS
@@ -39,6 +39,7 @@ company name	common	fr	Nom de la soci
 contact	common	fr	Contact
 contact application	admin	fr	Application contact
 contact settings	admin	fr	Paramètres du contact
+copied by %1, from record #%2.	addressbook	fr	Copié par %1, depuis l'enregistrement #%2.
 country	common	fr	Pays
 csv-fieldname	addressbook	fr	CSV-Nomdechamp
 csv-filename	addressbook	fr	CSV-Nomdefichier
@@ -50,10 +51,8 @@ delete a single entry by passing the id.	addressbook	fr	Effacer une seule entr
 department	common	fr	Département
 domestic	addressbook	fr	Domestique
 download	addressbook	fr	Downloader
-download export file (uncheck to debug output in browser)	addressbook	fr	Downloader le fichier d'export (Décocher pour débogger la sortie dans le navigateur)
 edit custom field	addressbook	fr	Editer le champ personnalisé
 edit custom fields	admin	fr	Editer les champs personnalisés
-enter the path to the export file here	addressbook	fr	Entrez le chemin vers le fichier d'export ici
 export contacts	addressbook	fr	Exporter les contacts
 export file name	addressbook	fr	Nom du fichier d'export
 export from addressbook	addressbook	fr	Exporter depuis le carnet d'adresses
@@ -67,7 +66,6 @@ fields to show in address list	addressbook	fr	Champs 
 fieldseparator	addressbook	fr	Séparateur de champ
 full name	addressbook	fr	Nom complet
 geo	addressbook	fr	GEO
-go	addressbook	fr	Allez
 grant addressbook access	common	fr	Régler les droits d'accès au carnet d'adresses
 home address type	addressbook	fr	Type d'adresse (domicile)
 home city	addressbook	fr	Ville (domicile)
@@ -84,7 +82,6 @@ import csv-file into addressbook	addressbook	fr	Importer le fichier CSV dans le
 import file	addressbook	fr	Importer le fichier
 import from ldif, csv, or vcard	addressbook	fr	Importer depuis LDIF, CSV ou VCard
 import from outlook	addressbook	fr	Importer depuis Outlook
-In Netscape, open the Addressbook and select <b>Export</b> from the <b>File</b> menu.<br>The file exported will be in LDIF format.<P>Or, in Outlook, select your Contacts folder, select <b>Import and Export...</b> from	addressbook	fr	Dans Netscape, ouvrez le carnet d'adresses et choisissez <b>Exporter</b> dans le menu <b>Fichier</b>.<br>Le fichier exporté sera dans le format LDIF.<P>Ou, dans Outlook, choisissez votre dossier Contacts, choisissez <b>Importer et Exporter...</b> depuis
 international	addressbook	fr	International
 isdn phone	addressbook	fr	Téléphone RNIS
 label	addressbook	fr	Label
@@ -94,7 +91,6 @@ ldap root dn for contacts	admin	fr	Racine LDAP dn pour les contacts
 ldap root pw for contacts	admin	fr	Racine LDAP pw pour les contacts
 ldif	addressbook	fr	LDIF
 line 2	addressbook	fr	Ligne 2
-mark records as private	addressbook	fr	Marquer les enregistrements comme privés
 message phone	addressbook	fr	Téléphone de message
 middle name	addressbook	fr	Deuxième prénom
 mobile	addressbook	fr	Portable
@@ -104,7 +100,6 @@ no vcard	addressbook	fr	Pas de VCard
 number of records to read (<=200)	addressbook	fr	Nombre d'enregistrements à lire (<=200)
 other number	addressbook	fr	Autre numéro
 other phone	addressbook	fr	Autre téléphone
-owerview	addressbook	fr	Vue globale
 pager	common	fr	Pager
 parcel	addressbook	fr	Paquet
 phone number	common	fr	Numéro de téléphone
@@ -118,24 +113,21 @@ read a list of entries.	addressbook	fr	Lire une liste d'entr
 read a single entry by passing the id and fieldlist.	addressbook	fr	Lire une seule entrée en passant l'ID et la liste des champs.
 record access	addressbook	fr	Enregistrer l'accès
 record owner	addressbook	fr	Enregistrer le propriétaire
-remote search	addressbook	fr	Recherche à distance
 retrieve contacts	admin	fr	Récupérer les contacts
-select the type of conversion	addressbook	fr	Choisissez le type de conversion
 select where you want to store	admin	fr	Choisissez où vous voulez stocker
 show birthday reminders on main screen	addressbook	fr	Montrer les rappels d'anniversaires sur la page principale
-show contact	addressbook	fr	Montrer le contact
 startrecord	addressbook	fr	Enregistrement de départ
 state	common	fr	Région
 street	common	fr	Rue
 suffix	addressbook	fr	Suffixe
 test import (show importable records <u>only</u> in browser)	addressbook	fr	Tester l'import (montrer <u>seulement</u> les enregistrements importables dans le navigateur)
 that field name has been used already !	addressbook	fr	Ce nom de champ a déjà été utilisé !
-the <b>File</b> menu and export your contacts into a comma separated text (CSV) file. <P>Or, in Palm Desktop 4.0 or greater, visit your addressbook and select <b>Export</b> from the <b>File</b> menu. The file exported will be in VCard format.<P>	addressbook	fr	le menu <b>Fichier</b> et exportez vos contacts dans un fichier aux champs séparés par des virgules (CSV).       <P>Ou, dans Palm Desktop 4.0 ou plus, allez dans votre carnet d'adresses et choisissez <b>Exporter</b> depuis le menu <b>Fichier</b>. Le fichier exporté sera dans le format VCard.<P>
 this person's first name was not in the address book.	addressbook	fr	Le prénom de cette personne n'était pas dans le carnet d'adresses.
 this person's last name was not in the address book.	addressbook	fr	Le nom de cette personne n'était pas dans le carnet d'adresses.
 today is %1's birthday!	common	fr	Aujourd'hui c'est l'anniversaire de %1 !
 tomorrow is %1's birthday.	common	fr	Demain c'est l'anniversaire de %1.
 update a single entry by passing the fields.	addressbook	fr	Mettre à jour une seule entrée en passant les champs.
+use country list	addressbook	fr	Utiliser la liste des pays
 vcard	common	fr	VCard
 vcards require a first name entry.	addressbook	fr	Les VCards nécessitent une entrée Prénom.
 vcards require a last name entry.	addressbook	fr	Les Vcards nécessitent une entrée nom de famille.
diff --git a/addressbook/setup/phpgw_ja.lang b/addressbook/setup/phpgw_ja.lang
index 95af2fa994..97c01dfffe 100644
--- a/addressbook/setup/phpgw_ja.lang
+++ b/addressbook/setup/phpgw_ja.lang
@@ -88,7 +88,7 @@ suffix	addressbook	ja	
 that field name has been used already !	addressbook	ja	¹àÌÜ̾¤Ï´û¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹¡£
 this person's first name was not in the address book.	addressbook	ja	¥¢¥É¥ì¥¹Ä¢¤Ë̾Á°¤¬¤¢¤ê¤Þ¤»¤ó¡£
 today is %1's birthday!	common	ja	º£Æü¤Ï %1 ¤µ¤ó¤ÎÃÂÀ¸Æü¤Ç¤¹¡£
-tomorrow is %1's birthday.	common	ja	ÌÀÆü¤Ï %1 ¤µ¤ó¤ÎÃÂÀ¸Æü¤Ç¤¹¡£
+tommorow is %1's birthday.	common	ja	ÌÀÆü¤Ï %1 ¤µ¤ó¤ÎÃÂÀ¸Æü¤Ç¤¹¡£
 url	addressbook	ja	URL
 vcard	common	ja	VCard
 vcards require a first name entry.	addressbook	ja	VCard ¤Ë¤Ï¡¢Ì¾Á°¤¬É¬ÍפǤ¹¡£
diff --git a/addressbook/setup/setup.inc.php b/addressbook/setup/setup.inc.php
index 9f9e15eb2f..77a3288772 100755
--- a/addressbook/setup/setup.inc.php
+++ b/addressbook/setup/setup.inc.php
@@ -13,23 +13,13 @@
 
 	/* Basic information about this app */
 	$setup_info['addressbook']['name']      = 'addressbook';
-	$setup_info['addressbook']['version']   = '0.9.13.003';
+	$setup_info['addressbook']['title']     = 'Addressbook';
+	$setup_info['addressbook']['version']   = '0.9.13.002';
 	$setup_info['addressbook']['app_order'] = 4;
 	$setup_info['addressbook']['enable']    = 1;
 
-	$setup_info['addressbook']['author'][] = array
-	(
-		'name'	=> 'Joseph Engo',
-		'email'	=> 'jengo@phpgroupware.org'
-	);
-
-	$setup_info['addressbook']['author'][] = array
-	(
-		'name'	=> 'Miles Lott',
-		'email'	=> 'milos@speakeasy.net'
-	);
-
-	$setup_info['addressbook']['note']   = 'The phpgwapi manages contact data.  Addressbook manages servers for its remote capability';
+	$setup_info['addressbook']['author'] = 'Joseph Engo, Miles Lott';
+	$setup_info['addressbook']['note']   = 'The phpgwapi manages contact data.  Addressbook manages servers for its remote capability.';
 	$setup_info['addressbook']['license']  = 'GPL';
 	$setup_info['addressbook']['description'] =
 		'Contact manager with Vcard support.<br>
@@ -37,28 +27,24 @@
 		It makes use of the phpgroupware contacts class to store and retrieve 
 		contact information via SQL or LDAP.';
 
-	$setup_info['addressbook']['maintainer'] = '';
-
-	/* Tables */
-	$setup_info['addressbook']['tables'][] = 'phpgw_addressbook_servers';
+	$setup_info['addressbook']['maintainer'] = 'phpGroupWare coreteam';
+	$setup_info['addressbook']['maintainer_email'] = 'phpgroupware-developers@gnu.org';
 
 	/* The hooks this app includes, needed for hooks registration */
-	$setup_info['addressbook']['hooks'] = array
-	(
-		'admin',
-		'add_def_pref',
-		'config_validate',
-		'home',
-		'deleteaccount',
-		'notifywindow',
-		'preferences',
-		'help'
-	);
+	$setup_info['addressbook']['hooks'][] = 'admin';
+	$setup_info['addressbook']['hooks'][] = 'add_def_pref';
+	$setup_info['addressbook']['hooks'][] = 'config_validate';
+	$setup_info['addressbook']['hooks'][] = 'home';
+	$setup_info['addressbook']['hooks'][] = 'manual';
+	$setup_info['addressbook']['hooks'][] = 'addaccount';
+	$setup_info['addressbook']['hooks'][] = 'editaccount';
+	$setup_info['addressbook']['hooks'][] = 'deleteaccount';
+	$setup_info['addressbook']['hooks'][] = 'notifywindow';
+	$setup_info['addressbook']['hooks'][] = 'preferences';
 
 	/* Dependencies for this app to work */
-	$setup_info['addressbook']['depends'][] = array
-	(
-		'appname'  => 'phpgwapi',
-		'versions' => Array('0.9.15', '0.9.16')
+	$setup_info['addressbook']['depends'][] = array(
+		 'appname' => 'phpgwapi',
+		 'versions' => Array('0.9.13', '0.9.14')
 	);
 ?>
diff --git a/addressbook/setup/tables_baseline.inc.php b/addressbook/setup/tables_baseline.inc.php
deleted file mode 100644
index 51f6ebdce4..0000000000
--- a/addressbook/setup/tables_baseline.inc.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-	/**************************************************************************\
-	* phpGroupWare - Setup                                                     *
-	* http://www.phpgroupware.org                                              *
-	* --------------------------------------------                             *
-	* This program is free software; you can redistribute it and/or modify it  *
-	* under the terms of the GNU General Public License as published by the    *
-	* Free Software Foundation; either version 2 of the License, or (at your   *
-	* option) any later version.                                               *
-	\**************************************************************************/
-	/* $Id$ */
-
-	$phpgw_baseline = array();
-?>
diff --git a/addressbook/setup/tables_update.inc.php b/addressbook/setup/tables_update.inc.php
deleted file mode 100644
index 392e965e26..0000000000
--- a/addressbook/setup/tables_update.inc.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-	/**************************************************************************\
-	* phpGroupWare - Setup                                                     *
-	* http://www.phpgroupware.org                                              *
-	* --------------------------------------------                             *
-	* This program is free software; you can redistribute it and/or modify it  *
-	* under the terms of the GNU General Public License as published by the    *
-	* Free Software Foundation; either version 2 of the License, or (at your   *
-	* option) any later version.                                               *
-	\**************************************************************************/
-
-	/* $Id$ */
-
-	$test[] = '0.9.13.002';
-	function addressbook_upgrade0_9_13_002()
-	{
-		$GLOBALS['phpgw_setup']->oProc->CreateTable(
-			'phpgw_addressbook_servers', array(
-				'fd' => array(
-					'name'    => array('type' => 'varchar', 'precision' => 64,  'nullable' => False),
-					'basedn'  => array('type' => 'varchar', 'precision' => 255, 'nullable' => True),
-					'search'  => array('type' => 'varchar', 'precision' => 32,  'nullable' => True),
-					'attrs'   => array('type' => 'varchar', 'precision' => 255, 'nullable' => True),
-					'enabled' => array('type' => 'int', 'precision' => 4)
-				),
-				'pk' => array('name'),
-				'fk' => array(),
-				'ix' => array(),
-				'uc' => array()
-			)
-		);
-
-		$GLOBALS['setup_info']['addressbook']['currentver'] = '0.9.13.003';
-		return $GLOBALS['setup_info']['addressbook']['currentver'];
-	}
-?>
diff --git a/addressbook/templates/default/about.tpl b/addressbook/templates/default/about.tpl
new file mode 100644
index 0000000000..0b819b76e9
--- /dev/null
+++ b/addressbook/templates/default/about.tpl
@@ -0,0 +1,16 @@
+<table border="0" width="100%">
+ <tr>
+  <td align="left">
+   <a href="{url}"><img src="{image}" border="0" alt="{alt}"></a>
+  </td>
+ </tr>
+ <tr>
+  <td align="center">{about_addressbook}</td>
+ </tr>
+ <tr>
+  <td align="center">{appear}&nbsp;{agent}&nbsp;{version}&nbsp;{on}&nbsp;{platform}.</td>
+ </tr>
+ <tr>
+  <td><hr></td>
+ </tr>
+</table>
diff --git a/addressbook/templates/default/add.tpl b/addressbook/templates/default/add.tpl
index a2c7f29ab8..1389086489 100644
--- a/addressbook/templates/default/add.tpl
+++ b/addressbook/templates/default/add.tpl
@@ -1,17 +1,14 @@
 
 <!-- BEGIN add -->
-   <table border="0" cellPadding="0" cellSpacing="0" width="75%">
+   <table border="0" cellPadding="0" cellSpacing="0" width="77%">
     <tr> 
-     <td width="7%">&nbsp;</td>
-     <td width="7%">&nbsp;</td>
-     <td> 
-      <input type="submit" name="submit" value="{lang_ok}">
-      <input type="reset" name="reset" value="{lang_clear}">
+     <td width="10%"> 
+      <input type="submit" name="submit" value="{lang_save}">&nbsp;
      </td>
      </form>
      <form action="{cancel_url}" method="post">
-     <td>
-      <input type="submit" name="Cancel" value="{lang_cancel}">
+     <td width="10%">
+      <input type="submit" name="cancel" value="{lang_cancel}">
      </td>
      </form>
      <td>&nbsp;</td>
diff --git a/addressbook/templates/default/config.tpl b/addressbook/templates/default/config.tpl
index 1810de2825..36f5d7f27d 100644
--- a/addressbook/templates/default/config.tpl
+++ b/addressbook/templates/default/config.tpl
@@ -1,25 +1,28 @@
 <!-- BEGIN header -->
 <form method="POST" action="{action_url}">
 <table border="0" align="center">
-   <tr class="th">
-    <td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
+   <tr bgcolor="{th_bg}">
+	   <td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
    </tr>
-   <tr class="th_err">
+   <tr bgcolor="{th_err}">
     <td colspan="2">&nbsp;<b>{error}</b></font></td>
    </tr>
 <!-- END header -->
 <!-- BEGIN body -->
-   <tr class="row_off">
+   <tr bgcolor="{row_on}">
+    <td colspan="2">&nbsp;</td>
+   </tr>
+   <tr bgcolor="{row_off}">
     <td colspan="2">&nbsp;<b>{lang_Addressbook}/{lang_Contact_Settings}</b></font></td>
    </tr>
-   <tr class="row_on">
+   <tr bgcolor="{row_on}">
     <td>{lang_Contact_application}:</td>
     <td><input name="newsettings[contact_application]" value="{value_contact_application}"></td>
    </tr>
-   <tr class="row_off">
+   <tr bgcolor="{row_off}">
     <td align="center" colspan="2">{lang_WARNING!!_LDAP_is_valid_only_if_you_are_NOT_using_contacts_for_accounts_storage!}</td>
    </tr>
-   <tr class="row_off">
+   <tr bgcolor="{row_off}">
     <td>{lang_Select_where_you_want_to_store}/{lang_retrieve_contacts}.</td>
     <td>
      <select name="newsettings[contact_repository]">
@@ -28,32 +31,25 @@
      </select>
     </td>
    </tr>
-   <tr class="row_on">
+   <tr bgcolor="{row_on}">
     <td>{lang_LDAP_host_for_contacts}:</td>
     <td><input name="newsettings[ldap_contact_host]" value="{value_ldap_contact_host}"></td>
    </tr>
-   <tr class="row_off">
+   <tr bgcolor="{row_off}">
     <td>{lang_LDAP_context_for_contacts}:</td>
     <td><input name="newsettings[ldap_contact_context]" value="{value_ldap_contact_context}" size="40"></td>
    </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
    <td>{lang_LDAP_root_dn_for_contacts}:</td>
    <td><input name="newsettings[ldap_contact_dn]" value="{value_ldap_contact_dn}" size="40"></td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
    <td>{lang_LDAP_root_pw_for_contacts}:</td>
    <td><input name="newsettings[ldap_contact_pw]" type="password" value=""></td>
   </tr>
-  <tr class="row_on">
-    <td>{lang_Enable_remote_search}:</td>
-    <td>
-     <input name="newsettings[enable_remote_addressbook]" type="radio" value=""{checked_enable_remote_addressbook+}>{lang_no}
-     <input name="newsettings[enable_remote_addressbook]" type="radio" value="True"{checked_enable_remote_addressbook+True}>{lang_yes}
-    </td>
-  </tr>
 <!-- END body -->
 <!-- BEGIN footer -->
-  <tr class="th">
+  <tr bgcolor="{th_bg}">
     <td colspan="2">
 &nbsp;
     </td>
diff --git a/addressbook/templates/default/csv_import.tpl b/addressbook/templates/default/csv_import.tpl
index 3e6838960c..837d0da6c0 100644
--- a/addressbook/templates/default/csv_import.tpl
+++ b/addressbook/templates/default/csv_import.tpl
@@ -1,3 +1,9 @@
+
+<br><center>
+
+  <FORM {enctype} action="{action_url}" method="post">
+      <TABLE>
+
 <!-- BEGIN filename -->
      <TR>
        <TD>{lang_csvfile}</td>
@@ -36,7 +42,7 @@
      {lang_max} <INPUT name="max" type="text" size="3" value="{max}"><td>
    </tr>
    <tr>
-    <td><INPUT name="debug" type="checkbox" value="1" checked> {lang_debug}</td>
+    <td colspan="3"><INPUT name="debug" type="checkbox" value="1" checked> {lang_debug}</td>
    </TR>
    <tr><td colspan=3>&nbsp;<p>
     {help_on_trans}
@@ -52,17 +58,7 @@
    </TR>
 <!-- END imported -->
 
-<!-- BEGIN import -->
-<p class=action>{lang_addr_action}<br>
-<hr noshade width="98%" align="center" size="1">
-<center>
-
-	<FORM {enctype} action="{action_url}" method="post">
-      <TABLE>
-			{rows}
-		</TABLE>
-		{hiddenvars}
-	</form>
+</TABLE>
+{hiddenvars}</form>
 
 </CENTER>
-<!-- END import -->
diff --git a/addressbook/templates/default/delete.tpl b/addressbook/templates/default/delete.tpl
index 9072d06e05..c3ded90e41 100644
--- a/addressbook/templates/default/delete.tpl
+++ b/addressbook/templates/default/delete.tpl
@@ -1,6 +1,9 @@
+<br>
 <center>{lang_sure}</center>
 <br>
 <center>
-  <a href="{no_link}">{lang_no}</a> &nbsp; &nbsp; &nbsp; &nbsp;
-  <a href="{yes_link}">{lang_yes}</a>
+ <form action="{yes_link}" method="POST">
+  <input type="submit" name="yes" value="{lang_yes}"> &nbsp; &nbsp; &nbsp; &nbsp;
+  <input type="submit" name="no" value="{lang_no}">
+ </form>
 </center>
diff --git a/addressbook/templates/default/edit.tpl b/addressbook/templates/default/edit.tpl
index 45a304281b..80715c0c10 100644
--- a/addressbook/templates/default/edit.tpl
+++ b/addressbook/templates/default/edit.tpl
@@ -3,14 +3,12 @@
    <input type="hidden" name="entry[ab_id]" value="{ab_id}">
    <input type="hidden" name="entry[tid]" value="{tid}">
    <input type="hidden" name="entry[referer]" value="{referer}">
-   <table border="0" cellPadding="1" cellSpacing="1" width="95%">
+   <table border="0" cellPadding="1" cellSpacing="1" width="77%">
      <tr>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
-      <td align="left" width="7%">
-       <input type="submit" name="submit" value="{lang_submit}"></form>
+      <td align="left" width="10%">
+       <input type="submit" name="submit" value="{lang_save}">&nbsp;</form>
       </TD>
-      <td align="left" width="7%">
+      <td align="left" width="10%">
        {cancel_link}
        <input type="submit" name="cancel" value="{lang_cancel}"></form>
       </td>
@@ -20,7 +18,6 @@
        {delete_button}
        </form>
       </td>
-      <td>&nbsp;</td>
      </tr>
    </table>
 <!-- END edit -->
diff --git a/addressbook/templates/default/export.tpl b/addressbook/templates/default/export.tpl
index 366845cef7..cd8ac8fbdf 100644
--- a/addressbook/templates/default/export.tpl
+++ b/addressbook/templates/default/export.tpl
@@ -1,5 +1,5 @@
 
-<!-- BEGIN export -->
+<!-- BEGIN import -->
 <CENTER>
   <TABLE WIDTH=90%>
     <TR BGCOLOR="{navbar_bg}">
@@ -10,13 +10,13 @@
       <TD>
         <FORM ENCTYPE="multipart/form-data" action="{action_url}" method="POST">
         <OL>
-        <LI>{conversion}:
+        <LI>Select the type of conversion:
         <SELECT NAME="conv_type">
-        <OPTION VALUE="none">&lt;{none}&gt;</OPTION>
+        <OPTION VALUE="none">&lt;none&gt;</OPTION>
 {conv}        </SELECT><P></LI>
         <LI>{filename}:<INPUT NAME="tsvfilename" VALUE="export.txt"></LI>
         <LI>{lang_cat}:{cat_link}</LI>
-        <LI><INPUT NAME="download" TYPE="checkbox" checked>{download_export}</LI>
+        <LI><INPUT NAME="download" TYPE="checkbox" checked>Download export file (Uncheck to debug output in browser)</LI>
         <LI><INPUT NAME="convert" TYPE="submit" VALUE="{download}"></LI>
         </OL>
         <input type="hidden" name="sort" value="{sort}">
diff --git a/addressbook/templates/default/form.tpl b/addressbook/templates/default/form.tpl
index 4fba2fc627..2b41af2287 100755
--- a/addressbook/templates/default/form.tpl
+++ b/addressbook/templates/default/form.tpl
@@ -1,18 +1,17 @@
 
 <!-- BEGIN addressbook entry form -->
 <table width="75%" border="0" align="center">
-{search}
-  <tr class="th">
+  <tr bgcolor="{th_bg}">
     <td colspan="5"><font color="{th_text}" face="">{lang_personal}:</font></td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
     <td><font color="{row_text}" face="" size="-1">{lang_prefix}:</font></td>
     <td colspan="3">
       <font size="-1"><input size="10" name="entry[prefix]" value="{prefix}"></font>
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td>&nbsp;</td>
     <td><font color="{row_text}" face="" size="-1">{lang_firstname}:</font></td>
     <td>
@@ -23,29 +22,29 @@
       <font size="-1"><input name="entry[middle]" value="{middle}"></font>
     </td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
     <td><font color="{row_text}" face="" size="-1">{lang_lastname}:</font></td>
     <td colspan="3">
       <font size="-1"><input name="entry[lastname]" value="{lastname}"></font>
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td>&nbsp;</td>
     <td><font color="{row_text}" face="" size="-1">{lang_suffix}:</font></td>
     <td colspan="3">
       <font size="-1"><input size="10" name="entry[suffix]" value="{suffix}"></font>
     </td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_birthday}:</font></td>
     <td colspan="3"><font size="-1">{birthday}</font></td>
   </tr>
-  <tr class="th">
+  <tr bgcolor="{th_bg}">
     <td colspan="5"><font color="{th_text}" face="">{lang_business}:</font></td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
     <td>
      <font color="{row_text}" face="" size="-1">{lang_title}:</font>
@@ -54,7 +53,7 @@
       <font size="-1"><input name="entry[title]" value="{title}"></font>
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td>&nbsp;</td>
     <td>
      <font color="{row_text}" face="" size="-1">{lang_company}:</font>
@@ -67,7 +66,7 @@
      <input size="30" name="entry[url]" value="{url}">
     </td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
 	<td>
      <font color="{row_text}" face="" size="-1">{lang_email}:
@@ -80,7 +79,7 @@
      <font size="-1">{email_type}</font>
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td>&nbsp;</td>
      <td>
      <font color="{row_text}" face="" size="-1">{lang_department}:</font>
@@ -89,28 +88,28 @@
      <font size="-1"><input name="entry[department]" value="{department}"></font>
     </td>
   </tr> 
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_bstreet}:</font></td>
     <td colspan="3">
       <font size="-1"><input size="30" name="entry[bstreet]" value="{bstreet}"></font>
      </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_address2}:</font></td>
     <td colspan="3">
       <font size="-1"><input size="30" name="entry[address2]" value="{address2}"></font>
     </td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_address3}:</font></td>
     <td colspan="3">
       <font size="-1"><input size="30" name="entry[address3]" value="{address3}"></font>
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_bcity}:</font></td>
     <td>
@@ -120,14 +119,14 @@
       <font size="-1"><input name="entry[bstate]" value="{bstate}"></font>
     </td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_bzip}:</font></td>
     <td colspan="3">
       <font size="-1"><input size="10" name="entry[bzip]" value="{bzip}"></font>
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td>&nbsp;</td>
     <td><font color="{row_text}" face="" size="-1">{lang_bcountry}:</font></td>
     <td>
@@ -137,14 +136,14 @@
       <font size="-1">{timezone}</font>
     </td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
 	<td><font color="{row_text}" face="" size="-1">{lang_badrtype}:</font></td>
     <td colspan="3">
 	  <font size="-1">{badrtype}</font>
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td>&nbsp;</td>
     <td><font color="{row_text}" face="" size="-1">{lang_wphone}:</font></td>
      <td>
@@ -155,7 +154,7 @@
       <font size="-1"><input name="entry[fax]" value="{fax}"></font>{pref_fax}
     </td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
     <td><font color="{row_text}" face="" size="-1">{lang_pager}:</font></td>
     <td>
@@ -166,7 +165,7 @@
       <font size="-1"><input name="entry[mphone]" value="{mphone}"></font>{pref_cell}
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td>&nbsp;</td>
     <td><font color="{row_text}" face="" size="-1">{lang_msgphone}:</font></td>
     <td>
@@ -177,7 +176,7 @@
       <font size="-1"><input name="entry[isdnphone]" value="{isdnphone}"></font>{pref_isdn}
     </td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
     <td><font color="{row_text}" face="" size="-1">{lang_carphone}:</font></td>
     <td>
@@ -188,20 +187,20 @@
       <font size="-1"><input name="entry[vidphone]" value="{vidphone}"></font>{pref_video}
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td>&nbsp;</td>
     <td><font size="-1">{lang_label}:</font></td>
     <td colspan="3"><font size="-1">{label}</font></td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
     <td><font size="-1">{lang_pubkey}:</font></td>
     <td colspan="3"><font size="-1">{pubkey}</font></td>
   </tr>
-  <tr class="th">
+  <tr bgcolor="{th_bg}">
     <td colspan="5"><font color="{row_text}" face="">{lang_home}:</font></td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
     <td>
       <font color="{row_text}" face="" size="-1">{lang_hemail}:</font>
@@ -211,12 +210,12 @@
         <font size="-1">{hemail_type}</font>
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_hstreet}:</font></td>
     <td colspan="3"><font size="-1"><input size="30" name="entry[hstreet]" value="{hstreet}"></font></td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_hcity}:</font></td>
     <td>
@@ -227,28 +226,28 @@
       <font size="-1"><input name="entry[hstate]" value="{hstate}"></font>
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td>&nbsp;</td>
     <td><font face="" size="-1">{lang_hzip}:</font></td>
     <td colspan="3">
       <font size="-1"><input size="10" name="entry[hzip]" value="{hzip}"></font>
     </td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
     <td><font color="{row_text}" face="" size="-1">{lang_hcountry}:</font></td>
     <td colspan="3">
       <font size="-1">{hcountry}</font>
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td>&nbsp;</td>
 	<td><font color="{row_text}" face="" size="-1">{lang_hadrtype}:</font></td>
     <td colspan="3">
 	  <font size="-1">{hadrtype}</font>
     </td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td>&nbsp;</td>
     <td><font color="{row_text}" face="" size="-1">{lang_hphone}:</font></td>
     <td>
@@ -258,22 +257,22 @@
       <font size="-1"><input name="entry[ophone]" value="{ophone}"></font>
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td><font size="-1">{lang_notes}:</font></td>
     <td colspan="4"><font size="-1">{notes}</font></td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td><font size="-1">{lang_private}:</font></td>
     <td colspan="4">
      <input type="checkbox" name="entry[access]" value="True"{access_check}>
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td><font size="-1">{lang_cats}:</font></td>
     <td>{cats_link}</td>
     <td colspan="3">&nbsp;</td>
   </tr>
-  <tr class="th">
+  <tr bgcolor="{th_bg}">
 	<td colspan="5"><font color="{row_text}" face="" size="-1">{lang_custom}</font></td>
   </tr>
 {custom}
diff --git a/addressbook/templates/default/help_data.xsl b/addressbook/templates/default/help_data.xsl
deleted file mode 100644
index 3ce386bc01..0000000000
--- a/addressbook/templates/default/help_data.xsl
+++ /dev/null
@@ -1,185 +0,0 @@
-<!-- $Id$ -->
-
-	<xsl:template name="help_data">
-		<xsl:apply-templates select="xhelp"/>
-	</xsl:template>
-
-	<xsl:template match="xhelp">
-		<xsl:choose>
-			<xsl:when test="overview">
-				<xsl:apply-templates select="overview"/>
-			</xsl:when>
-			<xsl:when test="list">
-				<xsl:apply-templates select="list"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:apply-templates select="add"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-
-	<xsl:template match="overview">
-		<table>
-			<tr>
-				<td>
-					<xsl:value-of disable-output-escaping="yes" select="intro"/>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<xsl:value-of disable-output-escaping="yes" select="prefs_settings"/>
-				</td>
-			</tr>
-		</table>
-	</xsl:template>
-
-	<xsl:template match="list">
-	<xsl:variable name="list_img" select="list_img"/>
-		<table>
-			<tr>
-				<td colspan="2">
-					<img src="{$list_img}"/>
-				</td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">1</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_1"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">2</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_2"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">3</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_3"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">4</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_4"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">5</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_5"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">6</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_6"/></td>
-			</tr>
-			<tr>
-				<td colspan="2"><u><xsl:value-of disable-output-escaping="yes" select="h_data"/></u></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">7</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_7"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">8</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_8"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">9</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_9"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">10</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_10"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">11</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_11"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">12</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_12"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">13</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_13"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">14</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_14"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">15</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_15"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">16</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_16"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">17</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_17"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">18</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_18"/></td>
-			</tr>
-		</table>
-	</xsl:template>
-
-	<xsl:template match="add">
-	<xsl:variable name="add_img" select="add_img"/>
-		<table>
-			<tr>
-				<td colspan="2">
-					<img src="{$add_img}"/>
-				</td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">1</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_1"/></td>
-			</tr>
-			<tr>
-				<td colspan="2">
-					<table width="80%" bgcolor="#ccddeb">
-						<tr>
-							<td><xsl:value-of select="lang_lastname"/>:</td>
-							<td><xsl:value-of select="lang_firstname"/>:</td>
-						</tr>
-						<tr>
-							<td><xsl:value-of select="lang_email"/>:</td>
-							<td><xsl:value-of select="lang_company"/>:</td>
-						</tr>
-						<tr>
-							<td><xsl:value-of select="lang_homephone"/>:</td>
-							<td><xsl:value-of select="lang_fax"/>:</td>
-						</tr>
-						<tr>
-							<td><xsl:value-of select="lang_workphone"/>:</td>
-							<td><xsl:value-of select="lang_pager"/>:</td>
-						</tr>
-						<tr>
-							<td><xsl:value-of select="lang_mobile"/>:</td>
-							<td><xsl:value-of select="lang_othernumber"/>:</td>
-						</tr>
-						<tr>
-							<td><xsl:value-of select="lang_street"/>:</td>
-							<td><xsl:value-of select="lang_city"/>:</td>
-						</tr>
-						<tr>
-							<td><xsl:value-of select="lang_state"/>:</td>
-							<td><xsl:value-of select="lang_zip"/>:</td>
-						</tr>
-						<tr>
-							<td><xsl:value-of select="lang_access"/>:</td>
-							<td><xsl:value-of select="lang_groupsettings"/>:</td>
-						</tr>
-						<tr>
-							<td><xsl:value-of select="lang_notes"/>:</td>
-							<td><xsl:value-of select="lang_birthday"/>:</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2"><xsl:value-of disable-output-escaping="yes" select="access_descr"/></td>
-			</tr>
-			<tr>
-				<td valign="top" align="right">2</td>
-				<td><xsl:value-of disable-output-escaping="yes" select="item_2"/></td>
-			</tr>
-		</table>
-	</xsl:template>
diff --git a/addressbook/templates/default/images/help_add.jpg b/addressbook/templates/default/images/help_add.jpg
deleted file mode 100644
index f80671ec2d..0000000000
Binary files a/addressbook/templates/default/images/help_add.jpg and /dev/null differ
diff --git a/addressbook/templates/default/images/help_list.jpg b/addressbook/templates/default/images/help_list.jpg
deleted file mode 100644
index 9fe55307e2..0000000000
Binary files a/addressbook/templates/default/images/help_list.jpg and /dev/null differ
diff --git a/addressbook/templates/default/images/navbar.png b/addressbook/templates/default/images/navbar.png
index f7f3e3ecca..bcc658c9ba 100644
Binary files a/addressbook/templates/default/images/navbar.png and b/addressbook/templates/default/images/navbar.png differ
diff --git a/addressbook/templates/default/import.tpl b/addressbook/templates/default/import.tpl
index f2230b7221..b94948de5f 100644
--- a/addressbook/templates/default/import.tpl
+++ b/addressbook/templates/default/import.tpl
@@ -12,18 +12,24 @@
     <TR>
      <TD><FORM ENCTYPE="multipart/form-data" action="{action_url}" method="post">
             <OL>
-            <LI>{help_import} {help_import2}
+            <LI>In Netscape, open the Addressbook and select <b>Export</b> from the <b>File</b> menu.
+                The file exported will be in LDIF format.
+              <P>Or, in Outlook, select your Contacts folder, select <b>Import 
+                and Export...</b> from the <b>File</b> 
+                menu and export your contacts into a comma separated text (CSV) file.
+              <P>Or, in Palm Desktop 4.0 or greater, visit your addressbook and select <b>Export</b> from the <b>File</b> menu.
+                The file exported will be in VCard format.<P>
             </LI>
-            <LI>{export_path}:
+            <LI>Enter the path to the exported file here:
               <INPUT NAME="tsvfile" SIZE="48" TYPE="file" VALUE="{tsvfilename}"><P></LI>
-            <LI>{conversion}:
+            <LI>Select the type of conversion:
             <SELECT NAME="conv_type">
-            <OPTION VALUE="none">&lt;{none}&gt;</OPTION>
+            <OPTION VALUE="none">&lt;none&gt;</OPTION>
      {conv}
             </SELECT><P></LI>
    <LI>{lang_cat}:{cat_link}</LI>
-   <LI><INPUT NAME="private" TYPE="checkbox" VALUE="private" CHECKED>{mark_private}</LI>
-            <LI><INPUT NAME="download" TYPE="checkbox" VALUE="{debug}" CHECKED>{debug_browser}</LI>
+   <LI><INPUT NAME="private" TYPE="checkbox" VALUE="private" CHECKED>Mark records as private</LI>
+            <LI><INPUT NAME="download" TYPE="checkbox" VALUE="{debug}" CHECKED>Debug output in browser</LI>
             <LI><INPUT NAME="convert" TYPE="submit" VALUE="{download}"></LI>
             </OL>
               <input type="hidden" name="sort" value="{sort}">
diff --git a/addressbook/templates/default/index.tpl b/addressbook/templates/default/index.tpl
index b0f904f200..301ad5dd66 100644
--- a/addressbook/templates/default/index.tpl
+++ b/addressbook/templates/default/index.tpl
@@ -1,19 +1,15 @@
 <!-- BEGIN addressbook_header -->
-<center>{lang_addressbook}
-<br>{lang_showing}
-<br>{searchreturn}{search_filter}{remotesearch}
-<table width="75%" border="1" cellspacing="1" cellpadding="1">
- <tr>
-  {alphalinks}
- </tr>
-</table>
-<table width="75%" border="0" cellspacing="1" cellpadding="3">
- <tr class="th">{cols}
+<center>
+{lang_showing}
+<br>{searchreturn}
+{search_filter}
+<table width="95%" border="0" cellspacing="1" cellpadding="3">
+<tr bgcolor="{th_bg}">{cols}
   <td width="3%" height="21"><font face="Arial, Helvetica, sans-serif" size="-1">{lang_view}</font></td>
   <td width="3%" height="21"><font face="Arial, Helvetica, sans-serif" size="-1">{lang_vcard}</font></td>
   <td width="5%" height="21"><font face="Arial, Helvetica, sans-serif" size="-1">{lang_edit}</font></td>
   <td width="5%" height="21"><font face="Arial, Helvetica, sans-serif" size="-1">{lang_owner}</font></td>
- </tr>
+</tr>
 <!-- END addressbook_header -->
 
 <!-- BEGIN column -->
@@ -21,34 +17,18 @@
 <!-- END column -->
 
 <!-- BEGIN row -->
- <tr class="{row_tr_color}">{columns}
+<tr bgcolor="{row_tr_color}">{columns}
   <td valign="top" width="3%"><font face="{font}" size="2"><a href="{row_view_link}">{lang_view}</a></font></td>
   <td valign="top" width="3%"><font face="{font}" size="2"><a href="{row_vcard_link}">{lang_vcard}</a></font></td>
   <td valign="top" width="5%"><font face="{font}" size="2">{row_edit}</font></td>
   <td valign="top" width="5%"><font face="{font}" size="2">{row_owner}</font></td>
- </tr>
+</tr>
 <!-- END row -->
 
-<!-- BEGIN remsearch -->
-<table width="75%" border="0" cellspacing="1" cellpadding="3">
- <form method="POST" action="{remote_search}">
-  <tr class="row_on">
-    <td colspan="3">{lang_remote_search}:
-     <select name="serverid">
-{search_remote}
-     </select>
-    </td>
-    <td><input size="30" name="remote_query" value="{remote_query}"></td>
-    <td><input type="submit" name="submit" value="{lang_go}"></td>
-  </tr>
-</form>
-</table>
-<!-- END remsearch -->
-
 <!-- BEGIN addressbook_footer -->
  </table>
- <table width="75%" border="0" cellspacing="0" cellpadding="4">
-   <tr class="th"> 
+ <table width="95%" border="0" cellspacing="0" cellpadding="4">
+   <tr bgcolor="{th_bg}"> 
      <form action="{add_url}"    method="post"><td width="16%"><input type="submit" name="Add"      value="{lang_add}"></td></form>
      <form action="{vcard_url}"  method="post"><td width="16%"><input type="submit" name="AddVcard" value="{lang_addvcard}"></td></form>
      <form action="{import_url}" method="post"><td width="16%"><input type="submit" name="Import"   value="{lang_import}"></td></form>
@@ -56,8 +36,5 @@
      <form action="{export_url}" method="post"><td width="16%"><input type="submit" name="Export"   value="{lang_export}"></td></form>
    </tr>
  </table>
- </center>
+</center>
 <!-- END addressbook_footer -->
-
-<!-- BEGIN addressbook_alpha --><td class="charbgcolor" align="center"><a href="{charlink}"><font color="{charcolor}">{char}</a></font></td>
-<!-- END addressbook_alpha -->
diff --git a/addressbook/templates/default/listfields.tpl b/addressbook/templates/default/listfields.tpl
index d51682fb14..9338fead4f 100644
--- a/addressbook/templates/default/listfields.tpl
+++ b/addressbook/templates/default/listfields.tpl
@@ -19,14 +19,14 @@
   <form method="post" action="{actionurl}">
  <input type="text" name="query">&nbsp;<input type="submit" name="search" value="{lang_search}"></form></td>
  </tr>
-  <tr class="th">
-   <td width="16%" class="th">{sort_field}</td>
-   <td width="8%"  class="th" align="center">{lang_edit}</td>
-   <td width="8%"  class="th" align="center">{lang_delete}</td>
+  <tr bgcolor="{th_bg}">
+   <td width="16%" bgcolor="{th_bg}">{sort_field}</td>
+   <td width="8%"  bgcolor="{th_bg}" align="center">{lang_edit}</td>
+   <td width="8%"  bgcolor="{th_bg}" align="center">{lang_delete}</td>
   </tr>
 
 <!-- BEGIN field_list -->
-  <tr class="{tr_color}">
+  <tr bgcolor="{tr_color}">
    <td>{cfield}</td>
    <td align="center"><a href="{edit}">{lang_edit_entry}</a></td>
    <td align="center"><a href="{delete}">{lang_delete_entry}</a></td>  
diff --git a/addressbook/templates/default/preference_acl_row.tpl b/addressbook/templates/default/preference_acl_row.tpl
index 378507ec6d..5fbfcc6b0a 100755
--- a/addressbook/templates/default/preference_acl_row.tpl
+++ b/addressbook/templates/default/preference_acl_row.tpl
@@ -1,5 +1,5 @@
 <!-- $Id$ -->
-   <tr class="{row_color}">
+   <tr bgcolor="{row_color}">
     <td>{user}</td>
     <td align="center"><input type="checkbox" name="{read}" value="Y"{read_selected}></td>
     <td align="center"><input type="checkbox" name="{edit}" value="Y"{edit_selected}></td>
diff --git a/addressbook/templates/default/preference_colspan.tpl b/addressbook/templates/default/preference_colspan.tpl
index 03dded0da5..aea9424902 100755
--- a/addressbook/templates/default/preference_colspan.tpl
+++ b/addressbook/templates/default/preference_colspan.tpl
@@ -1,6 +1,6 @@
-  <tr class="th">
+  <tr bgcolor="{bg_color}">
     <td>{string}</td>
-    <td align="center">{read_lang}</td>
-    <td align="center">{edit_lang}</td>
-    <td align="center">{delete_lang}</td>
+    <td align="center">{lang_read}</td>
+    <td align="center">{lang_edit}</td>
+    <td align="center">{lang_delete}</td>
   </tr>
diff --git a/addressbook/templates/default/preferences.tpl b/addressbook/templates/default/preferences.tpl
index 57ba74482c..1e8facdca0 100644
--- a/addressbook/templates/default/preferences.tpl
+++ b/addressbook/templates/default/preferences.tpl
@@ -2,13 +2,13 @@
 <p><b>{lang_abprefs}:</b><hr><p>
    <form method="POST" action="{action_url}">
    <table border="0" align="center" cellspacing="1" cellpadding="1">
-  <tr class="th">
+  <tr bgcolor="{th_bg}">
     <td colspan="6" align="center"><font color="#000000" face="">{lang_fields}:</font></td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td colspan="6"><font color="#000000" face="">{lang_personal}:</font></td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td><input type="checkbox" name="prefs[fn]"{fn_checked}>{fn}</option></td>
     <td><input type="checkbox" name="prefs[n_given]"{n_given_checked}>{n_given}</option></td>
     <td><input type="checkbox" name="prefs[n_family]"{n_family_checked}>{n_family}</option></td>
@@ -16,7 +16,7 @@
     <td>&nbsp;</td>
     <td>&nbsp;</td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td><input type="checkbox" name="prefs[n_prefix]"{n_prefix_checked}>{n_prefix}</option></td>
     <td><input type="checkbox" name="prefs[n_suffix]"{n_suffix_checked}>{n_suffix}</option></td>
     <td><input type="checkbox" name="prefs[bday]"{bday_checked}>{bday}</option></td>
@@ -27,10 +27,10 @@
   <tr>
     <td>&nbsp;</td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td colspan="6"><font color="#000000" face="">{lang_business}:</font></td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td><input type="checkbox" name="prefs[org_name]"{org_name_checked}>{org_name}</option></td>
     <td><input type="checkbox" name="prefs[org_unit]"{org_unit_checked}>{org_unit}</option></td>
     <td><input type="checkbox" name="prefs[title]"{title_checked}>{title}</option></td>
@@ -38,7 +38,7 @@
     <td>&nbsp;</td>
     <td>&nbsp;</td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td><input type="checkbox" name="prefs[adr_one_street]"{adr_one_street_checked}>{adr_one_street}</option></td>
     <td><input type="checkbox" name="prefs[address2]"{address2_checked}>{address2}</option></td>
     <td><input type="checkbox" name="prefs[address3]"{address3_checked}>{address3}</option></td>
@@ -46,7 +46,7 @@
     <td><input type="checkbox" name="prefs[adr_one_region]"{adr_one_region_checked}>{adr_one_region}</option></td>
     <td><input type="checkbox" name="prefs[adr_one_postalcode]"{adr_one_postalcode_checked}>{adr_one_postalcode}</option></td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td><input type="checkbox" name="prefs[adr_one_countryname]"{adr_one_countryname_checked}>{adr_one_countryname}</option></td>
     <td><input type="checkbox" name="prefs[adr_two_type]"{adr_one_type_checked}>{adr_one_type}</option></td>
     <td><input type="checkbox" name="prefs[tel_work]"{tel_work_checked}>{tel_work}</option></td>
@@ -56,10 +56,10 @@
   <tr>
     <td>&nbsp;</td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td colspan="6"><font color="#000000" face="">{lang_home}:</font></td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td><input type="checkbox" name="prefs[adr_two_street]"{adr_two_street_checked}>{adr_two_street}</option></td>
     <td><input type="checkbox" name="prefs[adr_two_locality]"{adr_two_locality_checked}>{adr_two_locality}</option></td>
     <td><input type="checkbox" name="prefs[adr_two_region]"{adr_two_region_checked}>{adr_two_region}</option></td>
@@ -67,7 +67,7 @@
     <td>&nbsp;</td>
     <td>&nbsp;</td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td><input type="checkbox" name="prefs[adr_two_countryname]"{adr_two_countryname_checked}>{adr_two_countryname}</option></td>
     <td><input type="checkbox" name="prefs[adr_two_type]"{adr_two_type_checked}>{adr_two_type}</option></td>
     <td><input type="checkbox" name="prefs[tel_home]"{tel_home_checked}>{tel_home}</option></td>
@@ -77,10 +77,10 @@
   <tr>
     <td>&nbsp;</td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td colspan="6"><font color="#000000" face="">{lang_phones}:</font></td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td><input type="checkbox" name="prefs[tel_voice]"{tel_voice_checked}>{tel_voice}</option></td>
     <td><input type="checkbox" name="prefs[tel_fax]"{tel_fax_checked}>{tel_fax}</option></td>
     <td><input type="checkbox" name="prefs[tel_msg]"{tel_msg_checked}>{tel_msg}</option></td>
@@ -88,7 +88,7 @@
     <td><input type="checkbox" name="prefs[tel_pager]"{tel_pager_checked}>{tel_pager}</option></td>
     <td><input type="checkbox" name="prefs[tel_bbs]"{tel_bbs_checked}>{tel_bbs}</option></td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td><input type="checkbox" name="prefs[tel_modem]"{tel_modem_checked}>{tel_modem}</option></td>
     <td><input type="checkbox" name="prefs[tel_car]"{tel_car_checked}>{tel_car}</option></td>
     <td><input type="checkbox" name="prefs[tel_isdn]"{tel_isdn_checked}>{tel_isdn}</option></td>
@@ -99,10 +99,10 @@
   <tr>
     <td>&nbsp;</td>
   </tr>
-  <tr class="row_on">
+  <tr bgcolor="{row_on}">
     <td colspan="6"><font color="#000000" face="">{lang_other}:</font></td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td><input type="checkbox" name="prefs[geo]"{geo_checked}>{geo}</option></td>
     <td><input type="checkbox" name="prefs[url]"{url_checked}>{url}</option></td>
     <td><input type="checkbox" name="prefs[tz]"{tz_checked}>{tz}</option></td>
@@ -117,10 +117,10 @@
   <tr>
     <td>&nbsp;</td>
   </tr>
-  <tr class="th">
+  <tr bgcolor="{th_bg}">
     <td colspan="6" align="center"><font color="#000000" face="">{lang_otherprefs}:</font></td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td colspan="3" align="center">
      {lang_default_filter}
      {filter_select}
@@ -129,7 +129,7 @@
      <input type="checkbox" name="other[mainscreen_showbirthdays]"{show_birthday}>
     </td>
   </tr>
-  <tr class="row_off">
+  <tr bgcolor="{row_off}">
     <td colspan="3" align="center">
      {lang_defaultcat}
      {cat_select}
diff --git a/addressbook/templates/default/view.tpl b/addressbook/templates/default/view.tpl
index 662b18be4e..28c8b317aa 100644
--- a/addressbook/templates/default/view.tpl
+++ b/addressbook/templates/default/view.tpl
@@ -1,9 +1,9 @@
 <!-- BEGIN view_header -->
-<p>&nbsp;<b>{lang_viewpref}</b><hr><p>
+<br>
 <table border="0" cellspacing="2" cellpadding="2" width="70%" align="center">
 <!-- END view_header -->
 <!-- BEGIN view_row -->
-  <tr class="th">
+  <tr bgcolor="{th_bg}">
     <td align="right" width="30%"><b>{display_col}</b>:</td><td width="70%">{ref_data}</td>
   </tr>
 <!-- END view_row -->
diff --git a/addressbook/templates/idots/images/navbar.png b/addressbook/templates/idots/images/navbar.png
new file mode 100755
index 0000000000..745489ae93
Binary files /dev/null and b/addressbook/templates/idots/images/navbar.png differ
diff --git a/admin/acl2_tester.php b/admin/acl2_tester.php
deleted file mode 100644
index c49f5f4091..0000000000
--- a/admin/acl2_tester.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-	$GLOBALS['phpgw_info']['flags']['currentapp'] = 'admin';
-	include('../header.inc.php');
-	include(PHPGW_API_INC . '/class.acl2.inc.php');
-	//$sec = New acl(array('account_id'=>1));
-	$sec = New acl2(1,'##DEFAULT##');
-//echo 'phpgw:<pre>'; print_r($GLOBALS['phpgw']); echo '</pre>';
-	$sec->get_memberships();
-//echo 'memberships_sql: '.$sec->memberships_sql.'<br>';
-//echo 'memberships:<pre>'; print_r($sec->memberships); echo '</pre>';
-	function ttt($location, $rights)
-	{
-		GLOBAL $sec;
-		if ($sec->check($location, $rights))
-		{
-			echo $rights.' is valid<br>';
-		}
-		else
-		{
-			echo $rights.' is invalid<br>';
-		}
-	}
-
-	echo 'This test is going to delete all your phpgw_acl2 records to ensure that the tests run as expected.<br>';
-	$GLOBALS['phpgw']->db->query('DELETE FROM phpgw_acl2',__LINE__,__FILE__);
-	echo 'Action: DELETE FROM phpgw_acl2<br><br>';
-	echo 'Running checks on .one.two.three after changing directly granted rights as well as ones it will inherit from<br>';
-	
-	echo '<br>1: check rights for .one.two which will get inherited by .one.two.three<br>';
-	ttt('.one.two', 1);
-	ttt('.one.two', 2);
-	ttt('.one.two', 4);
-	ttt('.one.two', 8);
-	echo 'You can see that no rights are set, so none will be inherited<br>';
-
-	echo '<br>2: checking .one.two.three<br>';
-	ttt('.one.two.three', 1);
-	ttt('.one.two.three', 2);
-	ttt('.one.two.three', 4);
-	ttt('.one.two.three', 8);
-	echo 'You can see that no rights are set directly as well<br>';
-
-	echo '<br>3: add rights 4 to .one.two.three<br>';
-	echo 'Action: $acl2->add(\'.one.two.three\',4,0);<br>';
-	$sec->add('.one.two.three',4,0);
-	ttt('.one.two.three', 1);
-	ttt('.one.two.three', 2);
-	ttt('.one.two.three', 4);
-	ttt('.one.two.three', 8);
-	
-	echo '<br>4: add rights 8 to .one.two.three<br>';
-	echo 'Action: $acl2->add(\'.one.two.three\',8,0);<br>';
-	$sec->add('.one.two.three',8,0);
-	ttt('.one.two.three', 1);
-	ttt('.one.two.three', 2);
-	ttt('.one.two.three', 4);
-	ttt('.one.two.three', 8);
-
-	echo '<br>5: remove rights 4 from .one.two.three<br>';
-	echo 'Action: $acl2->remove(\'.one.two.three\',4,0);<br>';
-	$sec->remove('.one.two.three',4,0);
-	ttt('.one.two.three', 1);
-	ttt('.one.two.three', 2);
-	ttt('.one.two.three', 4);
-	ttt('.one.two.three', 8);
-
-	echo '<br>5: set rights to 2 on .one.two.three<br>';
-	echo 'Action: $acl2->set(\'.one.two.three\', 2,0);<br>';
-	$sec->set('.one.two.three', 2,0);
-	ttt('.one.two.three', 1);
-	ttt('.one.two.three', 2);
-	ttt('.one.two.three', 4);
-	ttt('.one.two.three', 8);
-
-	echo '<br>Now to see inheritance in action...<br>';
-	echo '6: add rights 8 to .one.two<br>';
-	echo 'Action: $acl2->add(\'.one.two\',8,0);<br>';
-	$sec->add('.one.two',8,0);
-	ttt('.one.two.three', 1);
-	ttt('.one.two.three', 2);
-	ttt('.one.two.three', 4);
-	ttt('.one.two.three', 8);
-	echo 'You can see here that it has inherited rights 8 from .one.two<br>';
-
-	echo '<br>7: add rights 4 to .one.two<br>';
-	echo 'Action: $acl2->add(\'.one.two\',4,0);<br>';
-	$sec->add('.one.two',4,0);
-	ttt('.one.two.three', 1);
-	ttt('.one.two.three', 2);
-	ttt('.one.two.three', 4);
-	ttt('.one.two.three', 8);
-	echo 'You can see here that it has also inherited rights 4 from .one.two<br>';
-
-	echo '<br>Now to see inherited rights masks in action...<br>';
-	echo '8: add rights mask for 8 to .one.two<br>';
-	echo 'Action: $acl2->add(\'.one.two\',8,1);<br>';
-	$sec->add('.one.two',8,1);
-	ttt('.one.two.three', 1);
-	ttt('.one.two.three', 2);
-	ttt('.one.two.three', 4);
-	ttt('.one.two.three', 8);
-	echo 'You can see here that it no longer inherited rights 8 from .one.two<br>';
-	
-	echo '<br>It will help to see the rights for .one.two at this point to clearly see the rights mask doing its work<br>';
-	echo '9: display rights for .one.two<br>';
-	ttt('.one.two', 1);
-	ttt('.one.two', 2);
-	ttt('.one.two', 4);
-	ttt('.one.two', 8);
-	echo 'You can see here that it has rights for 4 and 8, and yet above you saw that .one.two.three did not inherited rights 4 from it<br>';
-
-	//echo 'rights_cache:<pre>'; print_r($sec->rights_cache); echo '</pre>';
-?>
diff --git a/admin/debian/changelog b/admin/debian/changelog
deleted file mode 100644
index bc99bb2465..0000000000
--- a/admin/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-phpgroupware-admin (0.9.14-0.RC3.3) unstable; urgency=low
-
-  * New release.
-  	- Source is now splitted into modules.
-
- -- Luca - De Whiskey's - De Vitis <luca@debian.org>  Mon, 21 May 2001 15:00:56 +0200
diff --git a/admin/debian/control b/admin/debian/control
deleted file mode 100644
index 84926e89cb..0000000000
--- a/admin/debian/control
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: phpgroupware-admin
-Section: web
-Priority: optional
-Maintainer: Luca - De Whiskey's - De Vitis <luca@debian.org>
-Build-Depends: debhelper (>> 3.0.0)
-Standards-Version: 3.5.2
-
-Package: phpgroupware-admin
-Section: web
-Architecture: all
-Depends: phpgroupware (>= ${Source-Version}), php3-pgsql | php3-cgi-pgsql | php4-pgsql | php3-mysql | php3-cgi-mysql | php4-mysql
-Description: The phpGroupWare administration module
- This phpGroupWare module provide the administration facilities for
- phpGroupWare (add and remove groups, users, modules, session handling
- etc.).
-
diff --git a/admin/debian/copyright b/admin/debian/copyright
deleted file mode 100644
index 900148502e..0000000000
--- a/admin/debian/copyright
+++ /dev/null
@@ -1,15 +0,0 @@
-This package was debianized by Luca - De Whiskey's - De Vitis <luca@debian.org> on
-Sat, 29 Jun 2002 17:13:40 +0200
-
-It was downloaded from the CVS repository at subversion.gnu.org. Try:
-prompt$ CVSROOT=:pserver:anoncvs@subversions.gnu.org:/cvsroot/phpgroupware
-prompt$ CVS_RSH=ssh
-prompt$ cvs login
-prompt$ cvs get all packages
-
-Upstream Author(s):
-Please, see credits.txt, the README file or visit http://apps.phpgroupware.org/
-
-Copyright:
-A copy of the GNU General Public License, version 2, can be found in
-/usr/share/common-licenses/GPL .
diff --git a/admin/debian/rules b/admin/debian/rules
deleted file mode 100755
index 96af18a79d..0000000000
--- a/admin/debian/rules
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. 
-# GNU copyright 1997 by Joey Hess.
-#
-# This version is for a hypothetical package that builds an
-# architecture-dependant package, as well as an architecture-independent
-# package.
-
-# Uncomment this to turn on verbose mode. 
-#export DH_VERBOSE=1
-
-
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
-APP = admin
-PACKAGE = debian/phpgroupware-$(APP)/usr/share/phpgroupware/$(APP)
-PACKAGEDOC = debian/phpgroupware-$(APP)/usr/share/doc/phpgroupware-$(APP)
-
-COPYRIGHT = -iname copyright\* -or -iname license
-CHANGELOG = -iname change\*
-INSTALL = -iname install
-FINDOPT = -type f -not \( -path \*CVS\* -or -path \*debian\* -or -name .cvsignore \)
-SPECIAL = -size 0 -or $(INSTALL) -or $(CHANGELOG) -or $(COPYRIGHT) -or -name \*.sgml
-STAMPS = -name configure-stamp -or -name build-stamp
-APPFILES = -not \( -path \*doc\* -or -path \. -or -name '*.pl' -or -name '*.py' -or $(STAMPS) \)
-DOCFILES = -not \( $(SPECIAL) \)
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# No configuration needed.
-	touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-	# Here should go the commands necessary to build the sgml documentation...
-	touch build-stamp
-
-clean:
-	dh_testdir
-	rm -f build-stamp configure-stamp
-	rm -f debian/.builded
-	rm -f debian/files
-	# Here should go the commands to clean the builded sgml documents.
-	dh_clean
-
-install: build
-	dh_testdir
-
-	# Install $(APP) files in $(PACKAGE)
-	find $(FINDOPT) $(APPFILES) \
-		-exec install -D --mode=644 {} $(PACKAGE)/{} \;
-	
-	# Install $(APP) doc files in $(PACKAGEDOC)
-	cd doc ;\
-		find $(FINDOPT) $(DOCFILES) \
-			-exec install -D --mode=644 {} ../$(PACKAGEDOC)/{} \;
-	
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb | tee debian/.builded
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/admin/doc/adminconfig.dvi b/admin/doc/adminconfig.dvi
index 35dbcc1a7d..53c4225c7e 100644
Binary files a/admin/doc/adminconfig.dvi and b/admin/doc/adminconfig.dvi differ
diff --git a/admin/doc/adminconfig.lyx b/admin/doc/adminconfig.lyx
index 889ad7c6ae..b442d4f0ca 100644
--- a/admin/doc/adminconfig.lyx
+++ b/admin/doc/adminconfig.lyx
@@ -69,10 +69,6 @@ and the following special types:
 \layout Enumerate
 
 {hook_XXX} - Calls a function named XXX (will be discussed later).
-\layout Enumerate
-
-{checked_XXX+YYY} - Handles checkbox/radio values set to YYY or '' (will
- be discussed later).
 \layout Standard
 
 Following is an example from the addressbook application:
@@ -179,35 +175,7 @@ Let's take a look at part of the preferences/default/config.tpl:
 \layout Standard
 
 Here, we are adding a new element, {hook_country_set}.
- This brings up the next file we will need to parse this value, hook_config.inc.ph
-p.
- But first, let's look at the last template type, 'checked':
-\layout Code
-
-<input name="newsettings[enable_remote_addressbook]" type="radio" value=""{check
-ed_enable_remote_addressbook+}>{lang_no}
-\layout Code
-
-<input name="newsettings[enable_remote_addressbook]" type="radio" value="True"{c
-hecked_enable_remote_addressbook+True}>{lang_yes}
-\layout Standard
-
-We want to check the value of the setting 'enable_remote_addressbook'.
- The value could be '' or 'True'.
- We use the '+' character to isolate the config name from the check value.
- If the value is empty or unset in the phpgw_config table, {checked_enable_remot
-e_addressbook+} is replaced with ' checked'.
- If the value is 'True',{checked_enable_remote_addressbook+True} is replaced
- with ' checked'.
- Note that the part after the '+' character matches what is in the value=
-\begin_inset Quotes erd
-\end_inset 
-
-XXX
-\begin_inset Quotes erd
-\end_inset 
-
- part in the html for this form element.
+ This brings up the next file we will need to parse this value...
 \layout Subsection
 
 hook_config.inc.php (optional)
diff --git a/admin/doc/adminconfig.pdf b/admin/doc/adminconfig.pdf
index 7658da426e..34dd19a17f 100644
Binary files a/admin/doc/adminconfig.pdf and b/admin/doc/adminconfig.pdf differ
diff --git a/admin/doc/adminconfig.ps b/admin/doc/adminconfig.ps
index 531a8497fd..3ff9c89b06 100644
--- a/admin/doc/adminconfig.ps
+++ b/admin/doc/adminconfig.ps
@@ -1,15 +1,15 @@
 %!PS-Adobe-2.0
 %%Creator: dvips(k) 5.86 Copyright 1999 Radical Eye Software
 %%Title: adminconfig.dvi
-%%Pages: 1
+%%Pages: 6
 %%PageOrder: Ascend
 %%BoundingBox: 0 0 612 792
-%%DocumentFonts: Times-Roman
+%%DocumentFonts: Helvetica-Bold Times-Roman Courier Times-Italic
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
 %DVIPSCommandLine: dvips -t letter -o adminconfig.ps adminconfig.dvi
 %DVIPSParameters: dpi=600, compressed
-%DVIPSSource:  TeX output 2002.03.19:1838
+%DVIPSSource:  TeX output 2001.12.22:1805
 %%BeginProcSet: texc.pro
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -314,13 +314,28 @@ setcmykcolor}DC/White{0 0 0 0 setcmykcolor}DC end
 
 %%EndProcSet
 TeXDict begin 40258431 52099146 1000 600 600 (adminconfig.dvi)
-@start /Fa 107[37 22[40 1[40 1[42 42 60 42 42 23 32 28
-42 42 42 42 65 23 42 1[23 42 42 28 37 42 37 42 37 1[42
-1[28 23 28 1[60 60 78 1[60 51 46 55 1[46 60 60 74 51
-2[28 60 60 46 51 60 55 55 60 76 1[47 47 47 23 23 7[42
-42 42 23 21 28 21 47 42 28 28 28 65 1[42 1[34 28 29[46
-46 2[{TeXBase1Encoding ReEncodeFont}76 83.022 /Times-Roman
-rf end
+@start /Fa 138[42 2[32 1[42 42 42 60 3[23 42 42 1[37
+42 37 1[42 9[69 15[60 16[42 42 42 42 42 42 1[23 21 43[42
+2[{TeXBase1Encoding ReEncodeFont}24 83.022 /Times-Italic
+rf /Fb 107[45 22[45 1[45 1[45 45 45 45 45 45 45 45 1[45
+45 45 45 45 45 1[45 45 45 45 45 45 45 45 45 1[45 1[45
+45 45 5[45 45 45 2[45 45 45 1[45 2[45 1[45 45 45 45 45
+45 45 2[45 45 45 45 45 7[45 1[45 45 45 45 45 1[45 45
+45 45 45 1[45 1[45 45 33[{TeXBase1Encoding ReEncodeFont}64
+74.7198 /Courier rf /Fc 137[66 73 40 1[47 73 73 73 73
+1[33 66 1[33 73 73 1[66 73 66 1[66 1[66 43[66 66 66 2[33
+4[40 40 37[73 2[{TeXBase1Encoding ReEncodeFont}25 119.552
+/Helvetica-Bold rf /Fd 140[80 6[40 2[40 3[80 30[88 20[80
+2[40 46[{TeXBase1Encoding ReEncodeFont}7 143.462 /Helvetica-Bold
+rf /Fe 107[37 22[40 1[40 1[42 42 60 42 42 23 32 28 1[42
+42 42 65 23 42 1[23 42 42 28 37 42 37 42 37 1[42 1[28
+1[28 2[60 78 2[51 46 55 1[46 60 60 74 51 2[28 60 60 46
+1[60 55 55 60 76 1[47 1[47 1[23 5[42 42 42 42 42 23 21
+28 21 2[28 28 28 2[42 32[46 46 2[{TeXBase1Encoding ReEncodeFont}66
+83.022 /Times-Roman rf /Ff 138[126 2[80 1[126 126 126
+184 3[57 126 126 1[115 126 115 1[115 9[195 15[161 23[57
+57 43[126 2[{TeXBase1Encoding ReEncodeFont}18 206.584
+/Helvetica-Bold rf end
 %%EndProlog
 %%BeginSetup
 %%Feature: *Resolution 600dpi
@@ -331,180 +346,188 @@ letter
 
 %%EndSetup
 %%Page: 1 1
-1 0 bop Black Black -434 -417 a Fa(phpGroupW)-7 b(are)39
-b(admin/con\002g.php)81 b(A)42 b(brief)f(introduction)f(to)i(writing)f
-(hooks)g(and)g(templates)h(for)f(an)o(y)g(application)f(to)i(use)h
-(this)f(admin)f(interf)o(ace,)-600 -318 y(by)93 b(Miles)47
-b(Lott)g(<milosch@phpgroupw)o(are.or)n(g)o(>)41 b(Dec)47
-b(22,)f(2001.)91 b(Files)k(con\002g.tpl)45 b(\(required\))91
-b(In)46 b(your)f(application/templates/def)o(ault)e(directory)-5
-b(,)-600 -218 y(create)38 b(a)g(ne)n(w)g(template)g(\002le)h(named)e
-('con\002g.tpl'.)e(This)k(will)g(be)f(included)e(by)i(con\002g.php)d
-(and)j(used)g(to)g(dra)o(w)g(the)g(page.)f(This)h(template)g(should)f
-(include)-600 -118 y(a)45 b(POST)g(method)f(form.)f(The)i(follo)n(wing)
-e(template)h(tags)h(may)f(be)h(used:)89 b({action_url})43
-b(-)i(A)g(phpgw->link)d(to)j(con\002g.php)d(will)k(be)e(inserted.)89
-b({title})-600 -19 y(-)50 b(This)g(will)g(be)f(parsed)g(to)h(display)f
-('Site)h(Con\002guration'.)97 b({th_bg},{th_te)o(xt},{ro)n(w_)o(on})o
-(,{ro)m(w_)o(of)n(f)o(})44 b(-)50 b(Replaced)f(with)h(the)f(current)g
-(theme)g(colors.)-600 81 y(and)c(the)g(follo)n(wing)e(special)i(types:)
-91 b({lang_XXX})44 b(-)h(Filled)h(with)f(lang\('XXX'\).)89
-b({v)n(alue_XXX})43 b(-)i(Filled)h(with)f(the)g(current)f(v)n(alue)h
-(of)f(con\002g)h(item)-600 180 y('XXX'.)95 b({selected_XXX})47
-b(-)h(set)h(to)e(\224,)h(or)g(')g(selected')f(if)h(an)g(option)e(v)n
-(alue)h(is)i(current.)94 b({hook_XXX})46 b(-)i(Calls)h(a)f(function)e
-(named)g(XXX)i(\(will)-600 280 y(be)54 b(discussed)g(later\).)109
-b({check)o(ed_XXX+YYY})51 b(-)k(Handles)f(checkbox/radio)c(v)n(alues)k
-(set)h(to)g(YYY)f(or)g(\224)h(\(will)f(be)h(discussed)f(later\).)108
-b(F)o(ollo)n(wing)-600 380 y(is)70 b(an)f(e)o(xample)e(from)h(the)h
-(addressbook)e(application:)g(<form)h(method="POST")f
-(action="{action_url}">)e(<table)k(border="0")d(align="center">)-600
-479 y(<tr)96 b(bgcolor="{th_bg}">)c(<td)k(colspan="2"><font)d
-(color="{th_te)o(xt}">&nbsp;<b>)o({title}</b>)o(</fon)o(t></td)o(>)e
-(</tr>)96 b(<tr)g(bgcolor="{th_err}">)-600 579 y(<td)62
-b(colspan="2">&nbsp;<b>{erro)o(r}</b)o(></fo)o(nt>)o(</td>)56
-b(</tr>)61 b(<!--)g(END)h(header)e(-->)i(<!--)f(BEGIN)g(body)f(-->)i
-(<tr)f(bgcolor="{ro)n(w_on}">)c(<td)-600 679 y(colspan="2">&nbsp;</td>)
-28 b(</tr>)33 b(<tr)g(bgcolor="{ro)n(w_of)n(f}">)27 b(<td)32
-b(colspan="2">&nbsp;<b>{lang_Ad)o(dre)o(ssbook)o(}/{lan)o(g_)o
-(Contact_)o(Setting)o(s}</b></f)o(on)o(t>)-600 778 y(</td>)121
-b(</tr>)g(<tr)h(bgcolor="{ro)n(w_on}">)116 b
-(<td>{lang_Contact_application}:</td)o(>)g(<td><input)j(name="ne)n
-(wsettings[contact_application])o(")-600 878 y(v)n(alue="{v)n
-(alue_contact_applicatio)o(n}")o(></td>)25 b(</tr>)31
-b(...)62 b(Note)30 b(the)h(\002eldname,)e(ne)n
-(wsettings[contact_application].)d(This)31 b(array)f(name)g(must)h(be)f
-(used)h(for)f(the)-600 977 y(form)e(v)n(alues.)h(Ne)o(xt,)g(note)f(the)
-i(v)n(alue)e(setting)h(for)g(this)h(form)e(element,)h({v)n
-(alue_contact_application}.)23 b(This)30 b(indicates)f(that)g(we)h(w)o
-(ant)f(the)g(current)f(v)n(alue)h(of)g(the)-600 1077
-y(con\002g)21 b(setting,)h('contact_application',)c(to)k(be)g(set)h
-(and)e(displayed)g(on)h(the)g(form.)f(Lastly)-5 b(,)21
-b(look)g(at)i(the)f(template)g(element,)f({lang_Contact_application}.)c
-(Here,)22 b(the)-600 1177 y(v)n(alue)k(from)g(the)h(lang)f(db)g(table)h
-(will)h(be)e(inserted)h(if)g(a)n(v)n(ailable.)53 b(Let')-5
-b(s)28 b(tak)o(e)e(a)i(look)e(at)h(part)f(of)h(the)g(preferences/def)o
-(ault/con\002g.tpl:)49 b(<tr)27 b(bgcolor="{ro)n(w_on}">)-600
-1276 y(<td>{lang_Country_Selection})35 b(\({lang_T)-6
-b(e)o(xt_Entry}/{lang_)o(SelectBox}\))o(:</td>)35 b(<td>)40
-b(<select)h(name="ne)n(wsettings[countrylist]">)36 b
-({hook_country_set})-600 1376 y(</select>)f(</td>)f(</tr>)70
-b(Here,)34 b(we)h(are)g(adding)e(a)i(ne)n(w)f(element,)g
-({hook_country_set}.)29 b(This)35 b(brings)f(up)g(the)g(ne)o(xt)g
-(\002le)i(we)e(will)i(need)e(to)g(parse)h(this)g(v)n(alue,)-600
-1476 y(hook_con\002g.inc.php.)56 b(But)62 b(\002rst,)g(let')-5
-b(s)63 b(look)d(at)j(the)e(last)i(template)e(type,)g('check)o(ed':)f
-(<input)g(name="ne)n(wsettings[enable_remote_ad)o(dr)o(essboo)o(k])o(")
--600 1575 y(type="radio")36 b(v)n(alue=""{check)o(ed_enable_r)o(emo)o
-(te_ad)o(dr)o(essboo)o(k+}>)o({lang)o(_n)o(o})c(<input)38
-b(name="ne)n(wsettings[enable_remo)o(te_ad)o(dr)o(essboo)o(k]")32
-b(type="radio")-600 1675 y(v)n(alue="T)m(rue"{check)o(ed_enab)o(le_re)o
-(mo)o(te_ad)o(dr)o(essboo)o(k+T)l(rue})o(>{lang)o(_y)o(es})g(W)-7
-b(e)20 b(w)o(ant)f(to)f(check)g(the)h(v)n(alue)e(of)i(the)f(setting)h
-('enable_remote_addressboo)o(k')o(.)13 b(The)-600 1774
-y(v)n(alue)18 b(could)h(be)g(\224)g(or)g('T)m(rue'.)f(W)-7
-b(e)20 b(use)g(the)f('+')g(character)f(to)h(isolate)h(the)f(con\002g)f
-(name)h(from)f(the)h(check)f(v)n(alue.)h(If)g(the)g(v)n(alue)f(is)i
-(empty)f(or)g(unset)g(in)g(the)g(phpgw_con\002g)-600
-1874 y(table,)38 b({check)o(ed_enable_remote_ad)o(dr)o(essboo)o(k+})32
-b(is)40 b(replaced)d(with)h(')h(check)o(ed'.)d(If)j(the)f(v)n(alue)g
-(is)h('T)m(rue',{check)o(ed_enable_r)o(emo)o(te_ad)o(dr)o(essboo)o(k+T)
-l(rue)o(})-600 1974 y(is)29 b(replaced)d(with)i(')g(check)o(ed'.)e
-(Note)h(that)h(the)g(part)f(after)g(the)h('+')f(character)g(matches)g
-(what)h(is)g(in)g(the)g(v)n(alue=\224XXX\224)e(part)i(in)g(the)f(html)h
-(for)f(this)h(form)f(element.)-600 2073 y(hook_con\002g.inc.php)19
-b(\(optional\))49 b(At)26 b(each)f(in)m(v)n(ocation)e(of)i
-(con\002g.php,)e(a)i(call)h(to)f(the)g(common)f(class)i(function)d
-(hook_single\(\))f(is)27 b(made.)d(It)h(attempts)g(to)h(include)-600
-2173 y(a)31 b(\002le,)g(hook_con\002g.inc.php)24 b(as)31
-b(a)g(set)g(of)f(code)g(for)g(con\002g.php)d(to)k(use.)f(In)g(the)h
-(case)f(of)g(the)h(preferences)d(e)o(xample)h(abo)o(v)o(e,)g(using)g
-(hook_country_set,)d(here)k(is)-600 2273 y(the)39 b(corresponding)d
-(function)i(in)i(preferences/inc/hook_con)o(\002g.in)o(c.ph)o(p:)34
-b(function)j(country_set\($con\002g\))e({)40 b($country)d(=)j(array\()e
-('user_choice')f(=>)j('Users)-600 2372 y(Choice',)30
-b('force_select')e(=>)j('F)o(orce)e(Selectbox')h(\);)g(while)h(\(list)g
-(\($k)o(e)o(y)-5 b(,)29 b($v)n(alue\))g(=)h(each)h(\($country\)\))c({)k
-(if)f(\($con\002g['countrylist'])c(==)31 b($k)o(e)o(y\))e({)i
-($selected)f(=)h(')-600 2472 y(selected';)23 b(})g(else)h({)g
-($selected)e(=)i(\224;)f(})h($descr)e(=)i(lang\($v)n(alue\);)c($out)i
-(.=)i('<option)d(v)n(alue="')h(.)h($k)o(e)o(y)f(.)i('"')e(.)i
-($selected)f(.)g('>')g(.)g($descr)g(.)g('</option>')e(.)i("\\n";)g(})h
-(return)-600 2571 y($out;)31 b(})63 b(Note)31 b(again)g(the)g(template)
-g(v)n(alue)g(we)g(used)g(earlier)m(,)g({hook_country_set}.)26
-b(This)31 b(causes)h(con\002g.php)d(to)i(look)g(for)f(a)i(function)e
-(named)g(country_set\(\).)-600 2671 y(Since)j(we)g(included)e(the)i
-(\002le)h(with)f(this)g(function)e(via)i(the)g(hook_single\(\))c(call,)
-34 b(this)f(function)e(is)j(e)o(x)o(ecuted.)c(It')-5
-b(s)34 b(return)e(is)h(a)h(string,)e(and)g(the)h(function)e(prints)-600
-2771 y(nothing)25 b(itself.)54 b(hook_con\002g_v)n(alidate.in)o(c.p)o
-(hp)20 b(\(optional\))52 b(Once)26 b(the)h(admin)e(clicks)i(the)f
-(submit)g(b)n(utton)g(to)g(post)h(the)f(form,)g(we)g(can)h(optionally)d
-(v)n(alidate)i(their)-600 2870 y(input)j(using)h(one)g(or)g(man)o(y)f
-(dif)n(ferent)f(functions.)h(This)h(is)h(done)e(by)h(\002rst)h(making)e
-(another)f(call)j(to)f(hook_single\(\))d(in)k(the)f(API)g(common)e
-(class.)j(This)g(time,)f(the)-600 2970 y(name)k(con\002g_v)n(alidate)e
-(is)j(used,)f(so)h(common)d(tries)j(to)g(include)e
-('application/inc/hook_con\002g_)o(v)n(alid)o(ate.in)o(c.ph)o(p')o(.)64
-b(If)34 b(this)h(\002le)g(e)o(xists,)g(it)g(sets)h(a)f(v)n(ar)f(to)g
-(tell)-600 3070 y(con\002g.php)c(it)j(w)o(as)g(found.)e(F)o(ollo)n
-(wing)g(then)h(are)h(functions)e(named)g(after)h(each)g(con\002g)g(we)h
-(w)o(ant)f(to)h(v)n(alidate.)f(The)g(follo)n(wing)f(e)o(xample)g(is)i
-(for)f(addressbook:)-600 3169 y($GLOB)m(ALS['phpgw_info'][')-5
-b(serv)n(er')o(][)o('fo)o(un)o(d_)o(v)n(alid)o(ation)o(_h)o(oo)o(k'])35
-b(=)41 b(T)m(rue;)f(/*)h(Check)g(a)g(speci\002c)g(setting.)f(Name)h
-(must)g(match)f(the)h(setting.)g(*/)g(function)-600 3269
-y(ldap_contact_conte)o(xt\($v)n(a)o(lue=\224\))e({)45
-b(if\($v)n(alue)f(==)h($GLOB)m(ALS['phpgw_info'][')-6
-b(serv)o(er)o('][)o(')o(ldap)o(_c)o(on)o(te)o(xt')o(]\))39
-b({)46 b($GLOB)m(ALS['con\002g_error'])40 b(=)45 b('Contact)-600
-3368 y(conte)o(xt)17 b(for)g(ldap)h(must)g(be)g(dif)n(ferent)f(from)g
-(the)h(conte)o(xt)f(used)h(for)f(accounts';)g(})h(elseif\($v)n(alue)f
-(==)h($GLOB)m(ALS['phpgw_info'][')-5 b(serv)n(er')o(][')n(ldap)o(_g)o
-(rou)o(p_)o(con)o(te)o(x)o(t']\))-600 3468 y({)22 b($GLOB)m
-(ALS['con\002g_error'])16 b(=)21 b('Contact)g(conte)o(xt)e(for)i(ldap)f
-(must)i(be)f(dif)n(ferent)e(from)h(the)h(conte)o(xt)f(used)h(for)f
-(groups';)g(})h(else)h({)f($GLOB)m(ALS['con\002g_error'])16
-b(=)-600 3568 y(\224;)24 b(})h(})48 b(Here)24 b(we)g(created)f(a)h
-(function)f(to)h(check)f(the)g(entered)g(v)n(alue)g(for)h(the)f
-(con\002g)g(item,)h(ldap_contact_conte)o(xt.)19 b(W)-7
-b(e)25 b(w)o(ant)f(to)g(mak)o(e)g(sure)f(the)h(admin)f(did)h(not)f(set)
--600 3667 y(this)d(v)n(alue)f(to)g(one)g(which)g(w)o(ould)g(con\003ict)
-g(with)h(another)e(con\002g)g(item,)i(used)f(for)g(accounts)f(or)h
-(groups)f(in)i(phpGroupW)-7 b(are.)36 b(con\002g.php)17
-b(calls)k(this)e(function,)f(sending)-600 3767 y(it)j(the)g(POST)-6
-b(ed)21 b(v)n(alue.)f(con\002g.php)e(continues,)h(adding)g(all)j(other)
-e(con\002g)f(items)j(from)d(the)i(POST)-6 b(ed)21 b(v)n(alues.)41
-b(The)21 b(v)n(ariable)e($GLOB)m(ALS['con\002g_error'])d(is)22
-b(parsed)-600 3867 y(through)e(lang\(\),)h(then)h(appended)e(to)j(the)f
-(local)h(v)n(ariable,)e($error)-5 b(.)21 b(If)h(this)h(has)g(an)o(y)f
-(v)n(alue)f(after)h(the)h(POST)-6 b(ed)22 b(v)n(ariables)g(are)g(check)
-o(ed,)f(the)i(form)e(then)h(has)h(its)g({error})-600
-3966 y(tag)f(\002lled)g(with)f(this)i(result.)e(The)g(form)g(is)h
-(displayed)f(again,)f(with)i(the)g(error)-5 b(.)20 b(If)i($error)e(has)
-i(no)f(v)n(alue,)g(con\002g.php)e(redirects)i(to)g(admin/inde)o(x.php.)
-40 b(Ho)n(we)n(v)o(er)m(,)19 b(there)-600 4066 y(is)i(one)e(more)g
-(function)f(that)i(may)g(be)g(included)e(in)i(hook_con\002g_v)n
-(alidate.inc.)o(ph)o(p:)35 b(/*)20 b(Check)g(all)g(settings)g(to)g(v)n
-(alidate)f(input.)g(Name)h(must)g(be)g('\002nal_v)n(alidation')d(*/)
--600 4165 y(function)36 b(\002nal_v)n(alidation\($v)n(alue=\224\))c({)
-38 b(if\($v)n(alue['contact_repository)o('])32 b(==)38
-b(')o(ldap')e(&&)i(!$v)n(alue[')o(ldap_contact_d)o(n')o(]\))32
-b({)38 b($GLOB)m(ALS['con\002g_error'])32 b(=)-600 4265
-y('Contact)37 b(dn)g(must)h(be)f(set';)h(})g(elseif\($v)n
-(alue['contact_repositor)o(y'])31 b(==)38 b(')o(ldap')f(&&)g(!$v)n
-(alue[')o(ldap_contact_co)o(nte)n(xt'])o(\))32 b({)38
-b($GLOB)m(ALS['con\002g_error'])32 b(=)-600 4365 y('Contact)24
-b(conte)o(xt)f(must)i(be)f(set';)h(})g(else)h({)f($GLOB)m
-(ALS['con\002g_error'])19 b(=)25 b(\224;)g(})g(})50 b(con\002g.php)22
-b(checks)i(for)g(the)g(e)o(xistence)g(of)g(the)h(function)e('\002nal_v)
-n(alidation\(\)'.)-600 4464 y(This)31 b(function)e(can)i(be)g(used)g
-(to)g(check)f(all)i(form)e(v)n(alues)g(at)i(once.)e(It)h(gets)h(sent)f
-(the)g(entire)g($ne)n(wsettings)f(array)g(POST)-6 b(ed)31
-b(from)f(the)h(form.)f(As)h(with)h(the)f(other)-600 4564
-y(functions)19 b(in)h(this)h(\002le,)f(\002nal_v)n(alidation\(\))e
-(should)h(set)i($GLOB)m(ALS['con\002g_error'])15 b(if)20
-b(there)g(is)h(a)g(problem.)p Black Black eop
+1 0 bop Black 0 TeXcolorgray Black Black 505 647 a Ff(phpGr)l(oupW)-8
+b(are)58 b(admin/con\002g.php)695 879 y Fe(A)21 b(brief)e(introduction)
+f(to)i(writing)g(hooks)f(and)h(templates)g(for)f(an)o(y)h(application)e
+(to)j(use)f(this)695 987 y(admin)f(interf)o(ace,)h(by)695
+1136 y(Miles)h(Lott)f(<milosch@phpgroupw)o(are.or)o(g)o(>)15
+b(Dec)20 b(22,)g(2001.)-2 1854 y Fd(1.)39 b(Files)-2
+2182 y Fc(1.1.)34 b(con\002g.tpl)h(\(required\))396 2350
+y Fe(In)20 b(your)f(application/templates/def)o(ault)e(directory)-5
+b(,)18 b(create)i(a)g(ne)n(w)g(template)g(\002le)h(named)e
+('con\002g.tpl'.)f(This)i(will)396 2458 y(be)g(included)f(by)h
+(con\002g.php)d(and)j(used)g(to)g(dra)o(w)g(the)g(page.)f(This)i
+(template)e(should)h(include)f(a)h(POST)h(method)396
+2566 y(form.)e(The)h(follo)n(wing)f(template)g(tags)i(may)e(be)i(used:)
+p Black 463 2798 a(1.)p Black 40 w({action_url})e(-)h(A)h(phpgw->link)c
+(to)j(con\002g.php)e(will)j(be)f(inserted.)p Black 463
+2947 a(2.)p Black 40 w({title})h(-)f(This)h(will)g(be)f(parsed)f(to)i
+(display)e('Site)i(Con\002guration'.)p Black 463 3097
+a(3.)p Black 40 w({th_bg},{th_te)o(xt},{ro)n(w_on)o(},{r)o(o)n(w_)o(of)
+m(f})15 b(-)20 b(Replaced)g(with)g(the)g(current)f(theme)h(colors.)396
+3246 y(and)g(the)g(follo)n(wing)f(special)h(types:)p
+Black 463 3479 a(1.)p Black 40 w({lang_XXX})f(-)i(Filled)f(with)h
+(lang\('XXX'\).)p Black 463 3628 a(2.)p Black 40 w({v)n(alue_XXX})e(-)h
+(Filled)h(with)f(the)g(current)f(v)n(alue)h(of)g(con\002g)f(item)h
+('XXX'.)p Black 463 3778 a(3.)p Black 40 w({selected_XXX})g(-)g(set)h
+(to)f(\224,)h(or)f(')g(selected')g(if)g(an)h(option)d(v)n(alue)i(is)h
+(current.)p Black 463 3927 a(4.)p Black 40 w({hook_XXX})d(-)j(Calls)g
+(a)g(function)d(named)h(XXX)i(\(will)f(be)h(discussed)f(later\).)396
+4077 y(F)o(ollo)n(wing)f(is)i(an)f(e)o(xample)f(from)g(the)h
+(addressbook)e(application:)396 4257 y Fb(<form)44 b(method="POST")f
+(action="{action_url}">)396 4354 y(<table)h(border="0")f
+(align="center">)441 4451 y(<tr)h(bgcolor="{th_bg}">)486
+4548 y(<td)g(colspan="2"><font)e
+(color="{th_text}">&nbsp;<b>{title}</b></f)o(ont><)o(/td>)441
+4645 y(</tr>)i(<tr)g(bgcolor="{th_err}">)486 4742 y(<td)g
+(colspan="2">&nbsp;<b>{error}</b></font></)o(td>)441
+4840 y(</tr>)p Black 3842 5278 a Fa(1)p Black eop
+%%Page: 2 2
+2 1 bop Black 0 TeXcolorgray Black 2778 67 a Fa(phpGr)l(oupW)-8
+b(ar)m(e)19 b(admin/con\002g)o(.php)p Black 396 579 a
+Fb(<!--)44 b(END)h(header)f(-->)396 676 y(<!--)g(BEGIN)g(body)h(-->)441
+773 y(<tr)f(bgcolor="{row_on}">)486 870 y(<td)g
+(colspan="2">&nbsp;</td>)441 967 y(</tr>)441 1065 y(<tr)g
+(bgcolor="{row_off}">)486 1162 y(<td)g
+(colspan="2">&nbsp;<b>{lang_Addressbook}/{)o(lang_C)o(ontact)o(_Setti)o
+(ngs}<)o(/b></f)o(ont>)396 1259 y(</td>)441 1356 y(</tr>)441
+1453 y(<tr)g(bgcolor="{row_on}">)486 1550 y
+(<td>{lang_Contact_application}:</td>)486 1647 y(<td><input)f
+(name="newsettings[contact_application]")38 b
+(value="{value_contact_application}"></td>)441 1745 y(</tr>)396
+1842 y(...)396 2130 y Fe(Note)20 b(the)h(\002eldname,)e(ne)n
+(wsettings[contact_application].)c(This)20 b(array)f(name)h(must)g(be)g
+(used)g(for)g(the)g(form)f(v)n(alues.)396 2238 y(Ne)o(xt,)h(note)g(the)
+g(v)n(alue)f(setting)i(for)e(this)i(form)e(element,)g({v)n
+(alue_contact_application}.)c(This)20 b(indicates)g(that)h(we)396
+2346 y(w)o(ant)g(the)f(current)f(v)n(alue)g(of)h(the)g(con\002g)g
+(setting,)g('contact_application',)c(to)k(be)g(set)h(and)f(displayed)f
+(on)g(the)i(form.)396 2454 y(Lastly)-5 b(,)20 b(look)f(at)i(the)f
+(template)g(element,)f({lang_Contact_application}.)d(Here,)j(the)i(v)n
+(alue)e(from)g(the)i(lang)e(db)h(table)396 2561 y(will)h(be)f(inserted)
+g(if)g(a)n(v)n(ailable.)396 2711 y(Let')-5 b(s)21 b(tak)o(e)f(a)h(look)
+e(at)i(part)f(of)g(the)g(preferences/def)o(ault/con\002g.tpl:)441
+2891 y Fb(<tr)44 b(bgcolor="{row_on}">)486 2988 y
+(<td>{lang_Country_Selection})c
+(\({lang_Text_Entry}/{lang_SelectBox}\):</)o(td>)486
+3085 y(<td>)531 3182 y(<select)j(name="newsettings[countrylist]">)396
+3280 y({hook_country_set})531 3377 y(</select>)486 3474
+y(</td>)441 3571 y(</tr>)396 3859 y Fe(Here,)20 b(we)h(are)f(adding)f
+(a)h(ne)n(w)g(element,)f({hook_country_set}.)d(This)k(brings)f(up)h
+(the)g(ne)o(xt)g(\002le)h(we)f(will)h(need)f(to)396 3967
+y(parse)g(this)h(v)n(alue...)-2 4337 y Fc(1.2.)34 b
+(hook_con\002g.inc.php)j(\(optional\))396 4504 y Fe(At)21
+b(each)f(in)m(v)n(ocation)e(of)i(con\002g.php,)d(a)k(call)g(to)f(the)g
+(common)f(class)i(function)d(hook_single\(\))f(is)k(made.)f(It)g
+(attempts)396 4612 y(to)h(include)e(a)h(\002le,)h
+(hook_con\002g.inc.php)14 b(as)21 b(a)g(set)g(of)f(code)f(for)h
+(con\002g.php)d(to)k(use.)f(In)g(the)g(case)h(of)f(the)g(preferences)
+396 4720 y(e)o(xample)f(abo)o(v)o(e,)f(using)i(hook_country_set,)15
+b(here)20 b(is)h(the)f(corresponding)d(function)i(in)396
+4828 y(preferences/inc/hook_con\002g.)o(inc.p)o(hp)o(:)p
+Black 3842 5278 a Fa(2)p Black eop
+%%Page: 3 3
+3 2 bop Black 0 TeXcolorgray Black 2778 67 a Fa(phpGr)l(oupW)-8
+b(ar)m(e)19 b(admin/con\002g)o(.php)p Black 396 579 a
+Fb(function)44 b(country_set\($config\))396 676 y({)576
+773 y($country)f(=)i(array\()f('user_choice')e(=>)j('Users)f(Choice',)f
+('force_select')f(=>)j('Force)f(Se-)396 870 y(lectbox')g(\);)576
+967 y(while)g(\(list)g(\($key,)f($value\))h(=)h(each)f(\($country\)\))
+576 1065 y({)755 1162 y(if)g(\($config['countrylist'])d(==)k($key\))755
+1259 y({)934 1356 y($selected)f(=)g(')h(selected';)755
+1453 y(})755 1550 y(else)755 1647 y({)934 1745 y($selected)f(=)g(\224;)
+755 1842 y(})755 1939 y($descr)g(=)g(lang\($value\);)755
+2036 y($out)g(.=)h('<option)e(value="')h(.)g($key)g(.)h('"')f(.)h
+($selected)e(.)i('>')f(.)h($descr)f(.)g('</option>')f(.)i("\\n";)576
+2133 y(})576 2230 y(return)e($out;)396 2327 y(})396 2615
+y Fe(Note)20 b(again)g(the)g(template)f(v)n(alue)h(we)h(used)e(earlier)
+m(,)h({hook_country_set}.)15 b(This)20 b(causes)h(con\002g.php)c(to)k
+(look)e(for)h(a)396 2723 y(function)f(named)g(country_set\(\).)e(Since)
+j(we)h(included)d(the)j(\002le)g(with)f(this)h(function)d(via)i(the)g
+(hook_single\(\))d(call,)396 2831 y(this)k(function)d(is)k(e)o(x)o
+(ecuted.)c(It')-5 b(s)21 b(return)e(is)i(a)f(string,)g(and)g(the)g
+(function)e(prints)i(nothing)f(itself.)-2 3201 y Fc(1.3.)34
+b(hook_con\002g_v)n(alidate)r(.inc.php)39 b(\(optional\))396
+3369 y Fe(Once)20 b(the)g(admin)g(clicks)g(the)g(submit)g(b)n(utton)f
+(to)i(post)f(the)g(form,)f(we)i(can)f(optionally)e(v)n(alidate)i(their)
+g(input)f(using)396 3477 y(one)h(or)g(man)o(y)f(dif)n(ferent)f
+(functions.)h(This)h(is)h(done)e(by)h(\002rst)h(making)e(another)g
+(call)h(to)h(hook_single\(\))c(in)j(the)g(API)396 3584
+y(common)f(class.)h(This)h(time,)f(the)g(name)g(con\002g_v)n(alidate)d
+(is)k(used,)f(so)h(common)d(tries)j(to)f(include)396
+3692 y('application/inc/hook_con\002g_)o(v)n(a)o(lidate.in)o(c.p)o(hp)o
+('.)396 3842 y(If)g(this)h(\002le)g(e)o(xists,)f(it)h(sets)g(a)g(v)n
+(ar)f(to)g(tell)h(con\002g.php)d(it)i(w)o(as)i(found.)c(F)o(ollo)n
+(wing)h(then)g(are)h(functions)f(named)g(after)396 3950
+y(each)h(con\002g)f(we)i(w)o(ant)f(to)h(v)n(alidate.)e(The)h(follo)n
+(wing)e(e)o(xample)h(is)i(for)f(addressbook:)576 4130
+y Fb($GLOBALS['phpgw_info']['server']['fou)o(nd_val)o(idatio)o(n_hook)o
+('])39 b(=)45 b(True;)576 4227 y(/*)f(Check)g(a)h(specific)e(setting.)h
+(Name)g(must)g(match)g(the)g(setting.)g(*/)576 4324 y(function)f
+(ldap_contact_context\($value=\224\))576 4421 y({)755
+4518 y(if\($value)g(==)i($GLOBALS['phpgw_info']['server']['ldap)o
+(_conte)o(xt']\))755 4616 y({)934 4713 y($GLOBALS['config_error'])c(=)k
+('Contact)e(context)h(for)g(ldap)g(must)g(be)h(differ-)396
+4810 y(ent)g(from)f(the)g(context)g(used)g(for)g(accounts';)p
+Black 3842 5278 a Fa(3)p Black eop
+%%Page: 4 4
+4 3 bop Black 0 TeXcolorgray Black 2778 67 a Fa(phpGr)l(oupW)-8
+b(ar)m(e)19 b(admin/con\002g)o(.php)p Black 755 579 a
+Fb(})755 676 y(elseif\($value)43 b(==)h
+($GLOBALS['phpgw_info']['server']['ldap_g)o(roup_)o(contex)o(t']\))755
+773 y({)934 870 y($GLOBALS['config_error'])d(=)k('Contact)e(context)h
+(for)g(ldap)g(must)g(be)h(differ-)396 967 y(ent)g(from)f(the)g(context)
+g(used)g(for)g(groups';)755 1065 y(})755 1162 y(else)755
+1259 y({)934 1356 y($GLOBALS['config_error'])d(=)k(\224;)755
+1453 y(})576 1550 y(})396 1838 y Fe(Here)20 b(we)f(created)g(a)h
+(function)e(to)i(check)e(the)i(entered)e(v)n(alue)h(for)g(the)g
+(con\002g)g(item,)g(ldap_contact_conte)o(xt.)c(W)-7 b(e)21
+b(w)o(ant)396 1946 y(to)g(mak)o(e)e(sure)h(the)h(admin)e(did)h(not)g
+(set)h(this)f(v)n(alue)g(to)g(one)g(which)g(w)o(ould)f(con\003ict)h
+(with)g(another)f(con\002g)g(item,)h(used)396 2054 y(for)g(accounts)f
+(or)h(groups)f(in)h(phpGroupW)-7 b(are.)396 2204 y(con\002g.php)18
+b(calls)j(this)g(function,)d(sending)h(it)i(the)f(POST)-6
+b(ed)20 b(v)n(alue.)f(con\002g.php)f(continues,)h(adding)g(all)h(other)
+g(con\002g)396 2312 y(items)h(from)e(the)h(POST)-6 b(ed)21
+b(v)n(alues.)396 2461 y(The)f(v)n(ariable)f($GLOB)m
+(ALS['con\002g_error'])c(is)21 b(parsed)f(through)e(lang\(\),)h(then)g
+(appended)f(to)j(the)f(local)g(v)n(ariable,)396 2569
+y($error)-5 b(.)19 b(If)h(this)h(has)f(an)o(y)g(v)n(alue)f(after)h(the)
+g(POST)-6 b(ed)20 b(v)n(ariables)g(are)g(check)o(ed,)f(the)h(form)f
+(then)h(has)g(its)h({error})e(tag)396 2677 y(\002lled)i(with)f(this)h
+(result.)f(The)g(form)f(is)i(displayed)e(again,)g(with)h(the)g(error)-5
+b(.)20 b(If)g($error)e(has)j(no)e(v)n(alue,)h(con\002g.php)396
+2785 y(redirects)g(to)g(admin/inde)o(x.php.)396 2934
+y(Ho)n(we)n(v)o(er)m(,)e(there)i(is)h(one)f(more)f(function)g(that)h
+(may)g(be)g(included)e(in)j(hook_con\002g_v)n(alidate.inc)o(.ph)o(p:)
+576 3114 y Fb(/*)44 b(Check)g(all)g(settings)g(to)g(validate)g(input.)g
+(Name)g(must)g(be)h('final_validation')c(*/)576 3212
+y(function)i(final_validation\($value=\224\))576 3309
+y({)755 3406 y(if\($value['contact_repository'])d(==)k('ldap')g(&&)g
+(!$value['ldap_contact_dn']\))755 3503 y({)934 3600 y
+($GLOBALS['config_error'])d(=)k('Contact)e(dn)i(must)f(be)g(set';)755
+3697 y(})755 3794 y(elseif\($value['contact_repository'])39
+b(==)44 b('ldap')g(&&)h(!$value['ldap_contact_context']\))755
+3891 y({)934 3989 y($GLOBALS['config_error'])c(=)k('Contact)e(context)h
+(must)g(be)h(set';)755 4086 y(})755 4183 y(else)755 4280
+y({)934 4377 y($GLOBALS['config_error'])c(=)k(\224;)755
+4474 y(})576 4571 y(})p Black 3842 5278 a Fa(4)p Black
+eop
+%%Page: 5 5
+5 4 bop Black 0 TeXcolorgray Black 2778 67 a Fa(phpGr)l(oupW)-8
+b(ar)m(e)19 b(admin/con\002g)o(.php)p Black 396 579 a
+Fe(con\002g.php)f(checks)i(for)f(the)h(e)o(xistence)g(of)g(the)g
+(function)e('\002nal_v)n(alidation\(\)'.)f(This)j(function)e(can)i(be)g
+(used)g(to)396 687 y(check)g(all)g(form)g(v)n(alues)f(at)i(once.)e(It)i
+(gets)f(sent)h(the)f(entire)g($ne)n(wsettings)f(array)g(POST)-6
+b(ed)21 b(from)e(the)h(form.)f(As)i(with)396 795 y(the)f(other)g
+(functions)f(in)h(this)h(\002le,)f(\002nal_v)n(alidation\(\))d(should)j
+(set)h($GLOB)m(ALS['con\002g_error'])15 b(if)20 b(there)g(is)h(a)396
+903 y(problem.)p Black 3842 5278 a Fa(5)p Black eop
+%%Page: 6 6
+6 5 bop Black 0 TeXcolorgray Black 2778 67 a Fa(phpGr)l(oupW)-8
+b(ar)m(e)19 b(admin/con\002g)o(.php)p Black Black 3840
+5278 a(6)p Black eop
 %%Trailer
 end
 userdict /end-hook known{end-hook}if
diff --git a/admin/doc/adminconfig.sgml b/admin/doc/adminconfig.sgml
index cf4123e770..e1251c01b5 100644
--- a/admin/doc/adminconfig.sgml
+++ b/admin/doc/adminconfig.sgml
@@ -67,11 +67,6 @@
     <para>
     &lcub;hook_XXX&rcub; - Calls a function named XXX (will be discussed later).
     </para>
-   </listitem>
-    <listitem>
-    <para>
-    &lcub;checked_XXX+YYY&rcub; - Handles checkbox/radio values set to YYY or '' (will be discussed later).
-    </para>
    </listitem>
    </orderedlist>
    <para>
@@ -117,14 +112,7 @@
 ]]><![ CDATA [ </tr>
 ]]>   </programlisting>
    <para>
-    Here, we are adding a new element, &lcub;hook_country_set&rcub;. This brings up the next file we will need to parse this value, hook_config.inc.php. But first, let's look at the last template type, 'checked':
-   </para>
-   <programlisting>
-<![ CDATA [<input name="newsettings[enable_remote_addressbook]" type="radio" value=""{checked_enable_remote_addressbook+}>{lang_no}
-]]><![ CDATA [<input name="newsettings[enable_remote_addressbook]" type="radio" value="True"{checked_enable_remote_addressbook+True}>{lang_yes}
-]]>   </programlisting>
-   <para>
-    We want to check the value of the setting 'enable_remote_addressbook'. The value could be '' or 'True'. We use the '+' character to isolate the config name from the check value. If the value is empty or unset in the phpgw_config table, &lcub;checked_enable_remote_addressbook+&rcub; is replaced with ' checked'. If the value is 'True',&lcub;checked_enable_remote_addressbook+True&rcub; is replaced with ' checked'. Note that the part after the '+' character matches what is in the value=&rdquo;XXX&rdquo; part in the html for this form element.
+    Here, we are adding a new element, &lcub;hook_country_set&rcub;. This brings up the next file we will need to parse this value...
    </para>
    </sect2>
    <sect2>
diff --git a/admin/doc/adminconfig.txt b/admin/doc/adminconfig.txt
index 55cc0c8354..1f1fdaa659 100644
--- a/admin/doc/adminconfig.txt
+++ b/admin/doc/adminconfig.txt
@@ -1,15 +1,10 @@
 
-
 phpGroupWare admin/config.php
 
 Abstract
 
-A brief introduction to writing hooks and templates for any
-application to use this admin interface, by
-
-Abstract
-
-Miles Lott <milosch@phpgroupware.org> Dec 22, 2001.
+A brief introduction to writing hooks and templates for any application to use
+this admin interface, by Miles Lott <milosch@phpgroupware.org> Dec 22, 2001.
 
 1 Files
 
@@ -22,70 +17,39 @@ include a POST method form. The following template tags
 may be used:
 
 1. {action_url} - A phpgw->link to config.php will be inserted.
-
 2. {title} - This will be parsed to display 'Site Configuration'.
-
-3. {th_bg},{th_text},{row_on},{row_off} - Replaced with the
-  current theme colors.
+3. {th_bg},{th_text},{row_on},{row_off} - Replaced with the current theme colors.
 
 and the following special types:
 
 1. {lang_XXX} - Filled with lang('XXX').
-
-2. {value_XXX} - Filled with the current value of config item
-  'XXX'.
-
-3. {selected_XXX} - set to '', or ' selected' if an option
-  value is current.
-
-4. {hook_XXX} - Calls a function named XXX (will be discussed
-  later).
-
-5. {checked_XXX+YYY} - Handles checkbox/radio values set to
-  YYY or '' (will be discussed later).
+2. {value_XXX} - Filled with the current value of config item 'XXX'.
+3. {selected_XXX} - set to '', or ' selected' if an option value is current.
+4. {hook_XXX} - Calls a function named XXX (will be discussed later).
 
 Following is an example from the addressbook application:
 
 <form method="POST" action="{action_url}">
-
 <table border="0" align="center">
-
  <tr bgcolor="{th_bg}">
-
   <td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
-
  </tr> <tr bgcolor="{th_err}">
-
   <td colspan="2">&nbsp;<b>{error}</b></font></td>
-
  </tr>
-
 <!-- END header -->
 
 <!-- BEGIN body -->
-
  <tr bgcolor="{row_on}">
-
   <td colspan="2">&nbsp;</td>
-
  </tr>
-
  <tr bgcolor="{row_off}">
-
   <td colspan="2">&nbsp;<b>{lang_Addressbook}/{lang_Contact_Settings}</b></font>
-
 </td>
-
  </tr>
-
  <tr bgcolor="{row_on}">
-
   <td>{lang_Contact_application}:</td>
-
   <td><input name="newsettings[contact_application]" value="{value_contact_application}"></td>
-
  </tr>
-
 ...
 
 Note the fieldname, newsettings[contact_application]. This
@@ -100,40 +64,16 @@ if available.
 Let's take a look at part of the preferences/default/config.tpl:
 
  <tr bgcolor="{row_on}">
-
   <td>{lang_Country_Selection} ({lang_Text_Entry}/{lang_SelectBox}):</td>
-
   <td>
-
    <select name="newsettings[countrylist]">
-
 {hook_country_set}
-
    </select>
-
   </td>
-
  </tr>
 
 Here, we are adding a new element, {hook_country_set}. This
-brings up the next file we will need to parse this value,
-hook_config.inc.php. But first, let's look at the last template
-type, 'checked':
-
-<input name="newsettings[enable_remote_addressbook]" type="radio"
-value=""{checked_enable_remote_addressbook+}>{lang_no}
-
-<input name="newsettings[enable_remote_addressbook]" type="radio"
-value="True"{checked_enable_remote_addressbook+True}>{lang_yes}
-
-We want to check the value of the setting 'enable_remote_addressbook'.
-The value could be '' or 'True'. We use the '+' character
-to isolate the config name from the check value. If the
-value is empty or unset in the phpgw_config table, {checked_enable_remote_addressbook+}
-is replaced with ' checked'. If the value is 'True',{checked_enable_remote_addressbook+True}
-is replaced with ' checked'. Note that the part after the
-'+' character matches what is in the value="XXX"
-part in the html for this form element.
+brings up the next file we will need to parse this value...
 
 1.2 hook_config.inc.php (optional)
 
@@ -145,41 +85,22 @@ hook_country_set, here is the corresponding function in
 preferences/inc/hook_config.inc.php:
 
 function country_set($config)
-
 {
-
-    $country = array( 'user_choice' => 'Users Choice', 'force_select'
-=> 'Force Selectbox' );
-
+    $country = array( 'user_choice' => 'Users Choice', 'force_select' => 'Force Selectbox' );
     while (list ($key, $value) = each ($country))
-
     {
-
         if ($config['countrylist'] == $key)
-
         {
-
             $selected = ' selected';
-
         } 
-
         else
-
         {
-
             $selected = '';
-
         }
-
         $descr = lang($value);
-
-        $out .= '<option value="' . $key . '"' . $selected
-. '>' . $descr . '</option>' . "\n";
-
+        $out .= '<option value="' . $key . '"' . $selected . '>' . $descr . '</option>' . "\n";
     }
-
     return $out;
-
 }
 
 Note again the template value we used earlier, {hook_country_set}.
@@ -202,42 +123,24 @@ was found. Following then are functions named after each
 config we want to validate. The following example is for
 addressbook:
 
-    $GLOBALS['phpgw_info']['server']['found_validation_hook']
-= True;
+    $GLOBALS['phpgw_info']['server']['found_validation_hook'] = True;
 
-    /* Check a specific setting. Name must match the setting.
-*/
+    /* Check a specific setting. Name must match the setting. */
 
     function ldap_contact_context($value='')
-
     {
-
         if($value == $GLOBALS['phpgw_info']['server']['ldap_context'])
-
         {
-
-            $GLOBALS['config_error'] = 'Contact context for
-ldap must be different from the context used for accounts';
-
+            $GLOBALS['config_error'] = 'Contact context for ldap must be different from the context used for accounts';
         }
-
         elseif($value == $GLOBALS['phpgw_info']['server']['ldap_group_context'])
-
         {
-
-            $GLOBALS['config_error'] = 'Contact context for
-ldap must be different from the context used for groups';
-
+            $GLOBALS['config_error'] = 'Contact context for ldap must be different from the context used for groups';
         }
-
         else
-
         {
-
             $GLOBALS['config_error'] = '';
-
         }
-
     }
 
 Here we created a function to check the entered value for
@@ -260,40 +163,21 @@ config.php redirects to admin/index.php.
 However, there is one more function that may be included
 in hook_config_validate.inc.php:
 
-    /* Check all settings to validate input. Name must be
-'final_validation' */
-
+    /* Check all settings to validate input. Name must be 'final_validation' */
     function final_validation($value='') 
-
     {
-
         if($value['contact_repository'] == 'ldap' && !$value['ldap_contact_dn'])
-
         {
-
-            $GLOBALS['config_error'] = 'Contact dn must be
-set';
-
+            $GLOBALS['config_error'] = 'Contact dn must be set';
         }
-
-        elseif($value['contact_repository'] == 'ldap' &&
-!$value['ldap_contact_context'])
-
+        elseif($value['contact_repository'] == 'ldap' && !$value['ldap_contact_context'])
         {
-
-            $GLOBALS['config_error'] = 'Contact context must
-be set';
-
+            $GLOBALS['config_error'] = 'Contact context must be set';
         }
-
         else
-
         {
-
             $GLOBALS['config_error'] = '';
-
         }
-
     }
 
 config.php checks for the existence of the function 'final_validation()'.
diff --git a/admin/help/DE/account.php b/admin/help/DE/account.php
new file mode 100644
index 0000000000..fe2abe1f2a
--- /dev/null
+++ b/admin/help/DE/account.php
@@ -0,0 +1,32 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - User manual                                               *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+	/* $Id$ */
+	
+	$phpgw_flags = Array(
+		'currentapp'	=> 'manual',
+		'admin_header'	=> True,
+	);
+	$phpgw_info['flags'] = $phpgw_flags;
+	include('../../../header.inc.php');
+	$appname = 'admin';
+?>
+<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>" border=0> 
+<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2"><p/>&nbsp;&nbsp;
+Diese Funktion ist normalerweise nur f&uuml;r den Administrator zugänglich. Administration aller Programme, Benutzer und Benutzergruppen und Sitzungs/Logging Kontrolle.
+<ul>
+<li><b>Benutzerkonten-Verwaltung:</b><p/>&nbsp;&nbsp;
+<i>Benutzerkonten:</i><br/>
+Erstellen, Edittieren und l&ouml;schen von Benutzerkonten. Setzen von Gruppenmidgliedschaft und der Zugriff auf Programme.<p/>&nbsp;&nbsp;
+<i>Benutzergruppen:</i><br/>
+Erstellen, Edittieren und l&ouml;schen von Benutzergruppen.<p/>&nbsp;&nbsp;
+</ul></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/DE/admin.php b/admin/help/DE/admin.php
new file mode 100644
index 0000000000..6e6806309d
--- /dev/null
+++ b/admin/help/DE/admin.php
@@ -0,0 +1,54 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - User manual                                               *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+	/* $Id$ */
+	$phpgw_flags = Array(
+		'currentapp'	=> 'manual',
+		'admin_header'	=> True,
+	);
+	$phpgw_info['flags'] = $phpgw_flags;
+	include('../../../header.inc.php');
+	$appname = 'admin';
+?>
+<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>" border=0> 
+<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2"><p/>&nbsp;&nbsp;&nbsp;&nbsp;
+Diese Funktion ist normalerweise nur f&uuml;r den Administrator zugänglich. Administration aller Programme, Benutzer und Benutzergruppen und Sitzungs/Logging Kontrolle.
+<ul>
+<li><b>Benutzerkonten-Verwaltung:</b><br/>
+<i>Benutzerkonten:</i><br/>
+Erstellen, Edittieren und l&ouml;schen von Benutzerkonten. Setzen von Gruppenmidgliedschaft und der Zugriff auf Programme.<br/
+><i>Benutzergruppen:</i><br/>
+    Erstellen, Editieren und l&ouml;schen von Benutzergruppen.
+    <p/>&nbsp;&nbsp;&nbsp;&nbsp;
+<li><b>Sitzungs-Verwaltung:</b><br/>
+    <i>Session's anzeigen::</i><br/>
+Aktuelle Sitzungen, IP's, Login-Zeit, Inaktivit&auml;tszeit und die M&ouml;glichkeit sessions zu beenden (kill).<br/>
+<i>Zugriffsaufzeichnungen (Access Log) anzeigen:</i><br/>
+    LoginId, IP, Login Time (Zeit), Logout Time (Zeit), Total time spent (gesamte 
+    Verbrachte Zeit).</li>
+  <p/>&nbsp;&nbsp;&nbsp;&nbsp;
+<li><b>Headline-Seiten (Schlagzeilen):</b><br/>
+    Administrieren von Headline-Seiten die von den Benutzern im Headline Programm 
+    gesehen werden.<br/>
+<i>Edit:</i> Optionen f&uuml;r die Headline-Seiten:<br/>
+    Anzeige, BasisURL, NewsDatei, Minuten zwischen Neuladungen (reloads), Angezeigte 
+    Auflistung und die Art der Neuigkeiten.<br/>
+    <i>L&ouml;schen:</i>Entfernen von einer existierenden Headline-Seite, klicken 
+    auf Löschen bringt Sie auf eine &Uuml;berprüffungsseite, um das l&ouml;schen 
+    zu verifizieren.<br/>
+<i>Anzeigen:</i>Zeigt die Optionen wie in Edit.<br/>
+<i>Hinzuf&uuml;gen:</i>Formular um eine neue Headline-Seite hinzuzuf&uuml;gen, wie in Edit.</li><p/>&nbsp;&nbsp;&nbsp;&nbsp;
+<li><b>Netzwerk News:</b><br/>
+Manuelle Aktualisierung f&uuml;r Newsgruppen.</li><p/>&nbsp;&nbsp;&nbsp;&nbsp;
+<li><b>Server Information:</b><br/>
+Zeigt die phpinfo(); des Servers an.</li><p/>&nbsp;&nbsp;&nbsp;&nbsp;
+</ul></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/DE/other.php b/admin/help/DE/other.php
new file mode 100644
index 0000000000..36539853d9
--- /dev/null
+++ b/admin/help/DE/other.php
@@ -0,0 +1,33 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - User manual                                               *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+	/* $Id$ */
+
+	$phpgw_flags = Array(
+		'currentapp'	=> 'manual',
+		'admin_header'	=> True,
+		'enable_utilities_class'	=> True
+	);
+	$phpgw_info['flags'] = $phpgw_flags;
+	include('../../../header.inc.php');
+	$appname = 'admin';
+?>
+<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>" border=0> 
+<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2"><p/>&nbsp;&nbsp;&nbsp; 
+Diese Funktion ist normalerweise nur f&uuml;r den Administrator zugänglich. Administration 
+aller Programme, Benutzer und Benutzergruppen und Sitzung's/Logging Kontrolle. 
+<ul><li><b>Netzwerk News:</b><br/>
+Manuelle Aktualisierung f&uuml;r Newsgruppen.</li><p/>&nbsp;&nbsp;&nbsp;
+<li><b>Server Information:</b><br/>
+    Zeigt die phpinfo(); des Server's an.</li>
+  <p/>&nbsp;&nbsp;&nbsp;
+</ul></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/DE/session.php b/admin/help/DE/session.php
new file mode 100644
index 0000000000..07ea40e73f
--- /dev/null
+++ b/admin/help/DE/session.php
@@ -0,0 +1,35 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - User manual                                               *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+	/* $Id$ */
+	
+	$phpgw_flags = Array(
+		'currentapp'	=> 'manual',
+		'admin_header'	=> True,
+		'enable_utilities_class'	=> True
+	);
+	$phpgw_info['flags'] = $phpgw_flags;
+	include('../../../header.inc.php');
+	$appname = 'admin';
+?>
+<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>" border=0> 
+<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2">
+<p>
+Diese Funktion ist normalerweise nur f&uuml;r den Administrator zugänglich. Administration aller Programme, Benutzer und Benutzergruppen und Sitzungs/Logging Kontrolle.
+<ul>
+<li><b>Session :</b>
+<p><i>Sessions anzeigen:</i>
+<br>Aktuelle Sitzungen, IP's, Login-Zeit, Inaktivit&auml;tszeit und die M&ouml;glichkeit sessions zu beenden (kill).
+<p><i>Zugriffsaufzeichnungen (Access Log) anzeigen:</i>
+<br>
+      LoginId, IP, Login Time (Zeit), Logout Time (Zeit), Total time spent (gesamte 
+      verbrachte Zeit). </ul>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/EN/account.php b/admin/help/EN/account.php
index bcb28134b7..c259892d75 100755
--- a/admin/help/EN/account.php
+++ b/admin/help/EN/account.php
@@ -30,3 +30,4 @@ Create, edit and delete users accounts. Set membership of groups, and access to
 <i>User groups:</i><br/>
 Create, edit and delete groups.<p/>
 </ul></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/EN/admin.php b/admin/help/EN/admin.php
index cb474dbaf8..cafc5aff26 100755
--- a/admin/help/EN/admin.php
+++ b/admin/help/EN/admin.php
@@ -46,3 +46,4 @@ Manual update for news groups.</li><p/>
 <li><b>Server information:</b><br/>
 At present phpinfo of the server that is running.</li><p/>
 </ul></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/EN/other.php b/admin/help/EN/other.php
index a0524dbe63..236d78f639 100755
--- a/admin/help/EN/other.php
+++ b/admin/help/EN/other.php
@@ -29,3 +29,4 @@ Manual update for news groups.</li><p/>
 <li><b>Server information:</b><br/>
 At present phpinfo of the server that is running.</li><p/>
 </ul></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/EN/session.php b/admin/help/EN/session.php
index 86e7853d00..31a68f2501 100755
--- a/admin/help/EN/session.php
+++ b/admin/help/EN/session.php
@@ -32,3 +32,4 @@ Administration of all applications, user and group accounts, session logging and
 <p><i>View Access Log:</i>
 <br>LoginId, IP, Login Time, Logout Time, Total time spent.
 </ul>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/FI/account.php b/admin/help/FI/account.php
index 52628033ea..5c52f1d97d 100644
--- a/admin/help/FI/account.php
+++ b/admin/help/FI/account.php
@@ -32,3 +32,4 @@ ryhm
 <i>Käyttäjäryhmät:</i><br/>
 Toiminnolla voit lisätä, muuttaa ja poistaa käyttäjäryhmiä.<p/>
 </ul></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/FI/admin.php b/admin/help/FI/admin.php
index bd893b8238..50998b5cd4 100644
--- a/admin/help/FI/admin.php
+++ b/admin/help/FI/admin.php
@@ -50,3 +50,4 @@ Uutisryhmien p
 <li><b>Palvelimen tiedot:</b><br/>
 Tällä hetkellä palvelimen phpinfo.</li><p/>
 </ul></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/FI/other.php b/admin/help/FI/other.php
index 0936a17b69..f2cc7269cd 100644
--- a/admin/help/FI/other.php
+++ b/admin/help/FI/other.php
@@ -30,3 +30,4 @@ Uutisryhmien p
 <li><b>Palvelimen tiedot:</b><br/>
 Tällä hetkellä palvelimen phpinfo.</li><p/>
 </ul></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/FI/session.php b/admin/help/FI/session.php
index 5d6ead5d42..10f78bac5b 100644
--- a/admin/help/FI/session.php
+++ b/admin/help/FI/session.php
@@ -34,3 +34,4 @@ on ollut tekem
 <p><i>Näytä käyttöloki:</i>
 <br>Tunnus, IP-osoite, Sisäänkirjautumisaika, Uloskirjautumisaika, Istunnon kesto.
 </ul>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/JA/account.php b/admin/help/JA/account.php
index d37e04e78a..e97c8894ed 100644
--- a/admin/help/JA/account.php
+++ b/admin/help/JA/account.php
@@ -30,3 +30,4 @@
 <i>¥æ¡¼¥¶¥°¥ë¡¼¥×:</i><br/>
 ¥æ¡¼¥¶¤¬½ê°¤¹¤ë¥°¥ë¡¼¥×¤òÄɲá¢ÄûÀµºï½ü¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£<p/>
 </ul></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/JA/admin.php b/admin/help/JA/admin.php
index edff4e6b98..4218bac9cc 100644
--- a/admin/help/JA/admin.php
+++ b/admin/help/JA/admin.php
@@ -51,3 +51,4 @@ you a checking page to be sure you do want to delete.<br/>
 <li><b>¥µ¡¼¥Ð¾ðÊó:</b><br/>
 ¥µ¡¼¥Ð¤ÇÆ°ºî¤·¤Æ¤¤¤ë PHP ¤Î¾ðÊó¤ò¡¢phpinfo() ¤Çɽ¼¨¤·¤Þ¤¹¡£</li><p/>
 </ul></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/JA/other.php b/admin/help/JA/other.php
index 606df88473..af359ce4ba 100644
--- a/admin/help/JA/other.php
+++ b/admin/help/JA/other.php
@@ -29,3 +29,4 @@
 <li><b>¥µ¡¼¥Ð¾ðÊó:</b><br/>
 ¥µ¡¼¥Ð¤ÇÆ°ºî¤·¤Æ¤¤¤ë PHP ¤Î¾ðÊó¤ò¡¢phpinfo() ¤Çɽ¼¨¤·¤Þ¤¹¡£</li><p/>
 </ul></font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/JA/session.php b/admin/help/JA/session.php
index f3bcedef4e..807bdc1260 100644
--- a/admin/help/JA/session.php
+++ b/admin/help/JA/session.php
@@ -32,3 +32,4 @@
 <p><i>¥¢¥¯¥»¥¹¥í¥°»²¾È:</i>
 <br>phpGroupWare¤Ø¤Î¥¢¥¯¥»¥¹¥í¥°¤òɽ¼¨¤·¤Þ¤¹¡£¥í¥°¥¤¥óID,IP¥¢¥É¥ì¥¹,¥í¥°¥¤¥ó»þ´Ö,¥í¥°¥¢¥¦¥È»þ´Ö,ÍøÍÑ»þ´Ö¤òɽ¼¨¤·¤Þ¤¹¡£
 </ul>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/help/index.php b/admin/help/index.php
index 30d99b641b..cb180ca5dd 100755
--- a/admin/help/index.php
+++ b/admin/help/index.php
@@ -24,3 +24,4 @@
 <font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2">
 Version: <b><?php echo $setup_info[$appname]['version']; ?></b>
 </font>
+<?php $phpgw->common->phpgw_footer(); ?>
diff --git a/admin/inc/class.boaccounts.inc.php b/admin/inc/class.boaccounts.inc.php
index 1318246769..ba33115697 100755
--- a/admin/inc/class.boaccounts.inc.php
+++ b/admin/inc/class.boaccounts.inc.php
@@ -1,37 +1,35 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - Account Administration                                    *
+	* phpGroupWare - account administration                                    *
 	* http://www.phpgroupware.org                                              *
-	* Written by coreteam <phpgroupware-developers@gnu.org>                    *
-	* -----------------------------------------------------                    *
+	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
 	*  Free Software Foundation; either version 2 of the License, or (at your  *
 	*  option) any later version.                                              *
 	\**************************************************************************/
+
 	/* $Id$ */
 
 	class boaccounts
 	{
 		var $so;
-		var $public_functions = array
-		(
-			'add_group'				=> True,
-			'delete_group'			=> True,
-			'delete_user'			=> True,
-			'edit_group'			=> True,
-			'save_user'				=> True,
+		var $public_functions = array(
+			'add_group'    => True,
+			'add_user'     => True,
+			'delete_group' => True,
+			'delete_user'  => True,
+			'edit_group'   => True,
+			'edit_user'    => True,
 			'set_group_managers'	=> True
 		);
 
 		var $xml_functions = array();
 
-		var $soap_functions = array
-		(
-			'add_user'	=> array
-			(
-				'in'	=> array('int','struct'),
-				'out'	=> array()
+		var $soap_functions = array(
+			'add_user' => array(
+				'in'  => array('int', 'struct'),
+				'out' => array()
 			)
 		);
 
@@ -77,28 +75,113 @@
 			}
 		}
 
-		function check_rights($action, $access = 'group_access')
+		function delete_group()
 		{
-			switch($action)
+			if (!@isset($_POST['account_id']) || !@$_POST['account_id'] || $GLOBALS['phpgw']->acl->check('group_access',32,'admin'))
 			{
-				case 'view':	$right = '8'; break;
-				case 'add':		$right = '4'; break;
-				case 'edit':	$right = '16'; break;
-				case 'delete':	$right = '32'; break;
-				case 'search':	$right = '2'; break;
+				ExecMethod('admin.uiaccounts.list_groups');
+				return False;
+			}
+			
+			$account_id = intval($_POST['account_id']);
+
+			$GLOBALS['phpgw']->db->lock(
+				Array(
+					'phpgw_accounts',
+					'phpgw_acl'
+				)
+			);
+				
+			$old_group_list = $GLOBALS['phpgw']->acl->get_ids_for_location($account_id,1,'phpgw_group');
+
+			@reset($old_group_list);
+			while($old_group_list && $id = each($old_group_list))
+			{
+				$GLOBALS['phpgw']->acl->delete_repository('phpgw_group',$account_id,intval($id[1]));
+				$GLOBALS['phpgw']->session->delete_cache(intval($id[1]));
 			}
 
-			if (!$GLOBALS['phpgw']->acl->check($access,$right,'admin'))
+			$GLOBALS['phpgw']->acl->delete_repository('%%','run',$account_id);
+
+			if (! @rmdir($GLOBALS['phpgw_info']['server']['files_dir'].SEP.'groups'.SEP.$GLOBALS['phpgw']->accounts->id2name($account_id)))
 			{
-				return True;
+				$cd = 38;
 			}
-			return False;
+			else
+			{
+				$cd = 32;
+			}
+
+			$GLOBALS['phpgw']->accounts->delete($account_id);
+
+			$GLOBALS['phpgw']->db->unlock();
+
+			Header('Location: '.$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'));
+			$GLOBALS['phpgw']->common->phpgw_exit();
 		}
 
-
-		function add_group($values)
+		function delete_user()
 		{
-			$temp_users = ($values['account_user']?$values['account_user']:Array());
+			if (isset($_POST['cancel']) || $GLOBALS['phpgw']->acl->check('account_access',32,'admin'))
+			{
+				ExecMethod('admin.uiaccounts.list_users');
+				return False;
+			}
+			elseif($_POST['delete_account'])
+			{
+				$accountid = $_POST['account_id'];
+				settype($account_id,'integer');
+				$account_id = get_account_id($accountid);
+				// make this information also in hook available
+				$lid = $GLOBALS['phpgw']->accounts->id2name($account_id);
+				$db = $GLOBALS['phpgw']->db;
+				$db->query('SELECT app_name,app_order FROM phpgw_applications WHERE app_enabled!=0 ORDER BY app_order',__LINE__,__FILE__);
+				if($db->num_rows())
+				{
+					while($db->next_record())
+					{
+						$appname = $db->f('app_name');
+
+						if($appname <> 'admin')
+						{
+							$GLOBALS['phpgw']->hooks->single('deleteaccount', $appname);
+						}
+					}
+				}
+
+				$GLOBALS['hook_values']['account_id'] = $account_id;
+				$GLOBALS['hook_values']['account_lid'] = $lid;
+
+				$GLOBALS['phpgw']->hooks->single('deleteaccount','preferences');
+				$GLOBALS['phpgw']->hooks->single('deleteaccount','admin');
+
+				$GLOBALS['phpgw']->hooks->process('deleteaccount');
+
+				$basedir = $GLOBALS['phpgw_info']['server']['files_dir'] . SEP . 'users' . SEP;
+
+				if (! @rmdir($basedir . $lid))
+				{
+					$cd = 34;
+				}
+				else
+				{
+					$cd = 29;
+				}
+
+				ExecMethod('admin.uiaccounts.list_users');
+				return False;
+			}
+		}
+
+		function add_group()
+		{
+			if ($GLOBALS['phpgw']->acl->check('group_access',4,'admin'))
+			{
+				ExecMethod('admin.uiaccounts.list_groups');
+				return False;
+			}
+
+			$temp_users = ($_POST['account_user']?$_POST['account_user']:Array());
 			$account_user = Array();
 			@reset($temp_users);
 			while(list($key,$user_id) = each($temp_users))
@@ -107,7 +190,7 @@
 			}
 			@reset($account_user);
 
-			$group_permissions = ($values['account_apps']?$values['account_apps']:Array());
+			$group_permissions = ($_POST['account_apps']?$_POST['account_apps']:Array());
 			$account_apps = Array();
 			@reset($group_permissions);
 			while(list($key,$value) = each($group_permissions))
@@ -119,30 +202,31 @@
 			}
 			@reset($account_apps);
 
-			$group_info = Array
-			(
-				'account_id'   => ($values['account_id']?intval($values['account_id']):0),
-				'account_name' => ($values['account_name']?$values['account_name']:''),
+			$group_info = Array(
+				'account_id'   => ($_POST['account_id']?intval($_POST['account_id']):0),
+				'account_name' => ($_POST['account_name']?$_POST['account_name']:''),
 				'account_user' => $account_user,
 				'account_apps' => $account_apps
 			);
 
-			$GLOBALS['phpgw']->db->lock(array
-			(
-				'phpgw_accounts',
-				'phpgw_nextid',
-				'phpgw_preferences',
-				'phpgw_sessions',
-				'phpgw_acl',
-				'phpgw_applications',
-				'phpgw_app_sessions',
-				'phpgw_hooks'
-			));
+			$this->validate_group($group_info);
+
+			$GLOBALS['phpgw']->db->lock(
+				Array(
+					'phpgw_accounts',
+					'phpgw_nextid',
+					'phpgw_preferences',
+					'phpgw_sessions',
+					'phpgw_acl',
+					'phpgw_applications',
+					'phpgw_app_sessions',
+					'phpgw_hooks'
+				)
+			);
 
 			$group = CreateObject('phpgwapi.accounts',$group_info['account_id'],'g');
 			$group->acct_type = 'g';
-			$account_info = array
-			(
+			$account_info = array(
 				'account_type'      => 'g',
 				'account_lid'       => $group_info['account_name'],
 				'account_passwd'    => '',
@@ -181,7 +265,7 @@
 				$GLOBALS['pref'] = CreateObject('phpgwapi.preferences',$user_id);
 				$t = $GLOBALS['pref']->read_repository();
 				@reset($new_apps);
-				while(list($app_key,$app_name) = each($new_apps))
+				while(is_array($new_apps) && list($app_key,$app_name) = each($new_apps))
 				{
 					if (!$t[($app_name=='admin'?'common':$app_name)])
 					{
@@ -204,17 +288,92 @@
 			{
 				$cd = 37;
 			}
+
 			$GLOBALS['phpgw']->db->unlock();
+
+			ExecMethod('admin.uiaccounts.list_groups');
+			return False;
 		}
 
-		function edit_group($values)
+		function add_user()
+		{
+			if ($GLOBALS['phpgw']->acl->check('account_access',4,'admin'))
+			{
+				ExecMethod('admin.uiaccounts.list_users');
+				return False;
+			}
+
+			if ($_POST['submit'])
+			{
+				$userData = array(
+					'account_type'          => 'u',
+					'account_lid'           => $_POST['account_lid'],
+					'account_firstname'     => $_POST['account_firstname'],
+					'account_lastname'      => $_POST['account_lastname'],
+					'account_passwd'        => $_POST['account_passwd'],
+					'status'                => ($_POST['account_status'] ? 'A' : ''),
+					'account_status'        => ($_POST['account_status'] ? 'A' : ''),
+					'old_loginid'           => ($_GET['old_loginid']?rawurldecode($_GET['old_loginid']):''),
+					'account_id'            => ($_GET['account_id']?$_GET['account_id']:0),
+					'account_passwd_2'      => $_POST['account_passwd_2'],
+					'account_groups'        => $_POST['account_groups'],
+					'anonymous'             => $_POST['anonymous'],
+					'changepassword'        => $_POST['changepassword'],
+					'account_permissions'   => $_POST['account_permissions'],
+					'homedirectory'         => $_POST['homedirectory'],
+					'loginshell'            => $_POST['loginshell'],
+					'account_expires_never' => $_POST['never_expires']
+					/* 'file_space' => $_POST['account_file_space_number'] . "-" . $_POST['account_file_space_type'] */
+				);
+				if ($_POST['expires'] !== '' && !$_POST['never_expires'])
+				{
+					$jscal = CreateObject('phpgwapi.jscalendar',False);
+					$userData += $jscal->input2date($_POST['expires'],False,'account_expires_day','account_expires_month','account_expires_year');
+				}
+				if (!$errors = $this->validate_user($userData))
+				{
+					$account_id = $this->so->add_user($userData);
+
+					if ($userData['anonymous']) 
+					{
+						$GLOBALS['phpgw']->acl->add_repository('phpgwapi','anonymous',$account_id,1);
+					}
+					else
+					{
+						$GLOBALS['phpgw']->acl->delete_repository('phpgwapi','anonymous',$account_id);
+					}
+					// make this information for the hooks available
+					$GLOBALS['hook_values']['account_lid'] = $userData['account_lid'];
+					$GLOBALS['hook_values']['account_id'] = $account_id;
+					$GLOBALS['hook_values']['new_passwd'] = $userData['account_passwd'];
+					$GLOBALS['hook_values']['account_firstname'] = $userData['account_firstname'];
+					$GLOBALS['hook_values']['account_lastname'] = $userData['account_lastname'];
+					$GLOBALS['phpgw']->hooks->process('addaccount');
+					ExecMethod('admin.uiaccounts.list_users');
+					return False;
+				}
+				else
+				{
+					$ui = createobject('admin.uiaccounts');
+					$ui->create_edit_user($userData['account_id'],$userData,$errors);
+				}
+			}
+			else
+			{
+				ExecMethod('admin.uiaccounts.list_users');
+				return False;
+			}
+		}
+
+		function edit_group()
 		{
 			if ($GLOBALS['phpgw']->acl->check('group_access',16,'admin'))
 			{
-				$error[] = lang('no permission to create groups');
+				ExecMethod('admin.uiaccounts.list_groups');
+				return False;
 			}
 
-			$temp_users = ($values['account_user']?$values['account_user']:Array());
+			$temp_users = ($_POST['account_user']?$_POST['account_user']:Array());
 			$account_user = Array();
 			@reset($temp_users);
 			while($temp_users && list($key,$user_id) = each($temp_users))
@@ -223,7 +382,7 @@
 			}
 			@reset($account_user);
 
-			$group_permissions = ($values['account_apps']?$values['account_apps']:Array());
+			$group_permissions = ($_POST['account_apps']?$_POST['account_apps']:Array());
 			$account_apps = Array();
 			@reset($group_permissions);
 			while(list($key,$value) = each($group_permissions))
@@ -236,12 +395,14 @@
 			@reset($account_apps);
 
 			$group_info = Array(
-				'account_id'   => ($values['account_id']?intval($values['account_id']):0),
-				'account_name' => ($values['account_name']?$values['account_name']:''),
+				'account_id'   => ($_POST['account_id']?intval($_POST['account_id']):0),
+				'account_name' => ($_POST['account_name']?$_POST['account_name']:''),
 				'account_user' => $account_user,
 				'account_apps' => $account_apps
 			);
 
+			$this->validate_group($group_info);
+
 			// Lock tables
 			$GLOBALS['phpgw']->db->lock(
 				Array(
@@ -365,198 +526,140 @@
 		/*
 			// Update any other options here, since the above save_repository () depends
 			// on a group having users
-			$group->data['file_space'] = $GLOBALS['HTTP_POST_VARS']['account_file_space_number'] . "-" . $GLOBALS['HTTP_POST_VARS']['account_file_space_type'];
+			$group->data['file_space'] = $_POST['account_file_space_number'] . "-" . $_POST['account_file_space_type'];
 			$group->save_repository();
 		*/
 
 			$GLOBALS['phpgw']->db->unlock();
+
+			ExecMethod('admin.uiaccounts.list_groups');
+			return False;
 		}
 
-		function save_user($values)
+		function edit_user()
 		{
-			if (is_array($values))
+			if ($GLOBALS['phpgw']->acl->check('account_access',16,'admin'))
 			{
-				if($values['expires_never'])
-				{
-					$values['expires'] = $values['account_expires'] = -1;
-				}
-				else
-				{
-					$values['expires'] = $values['account_expires'] = mktime(2,0,0,$values['account_expires_month'],$values['account_expires_day'],$values['account_expires_year']);
-				}
+				ExecMethod('admin.uiaccounts.list_users');
+				return False;
+			}
 
-				$userData = array
-				(
-					'account_type'          => 'u',
-					'account_lid'           => $values['account_lid'],
-					'account_firstname'     => $values['account_firstname'],
-					'account_lastname'      => $values['account_lastname'],
-					'account_passwd'        => $values['account_passwd'],
-					'status'                => ($values['account_status'] ? 'A' : ''),
-					'account_status'        => ($values['account_status'] ? 'A' : ''),
-					'old_loginid'           => ($values['old_loginid']?rawurldecode($GLOBALS['HTTP_GET_VARS']['old_loginid']):''),
-					'account_id'            => ($values['account_id']?$GLOBALS['HTTP_GET_VARS']['account_id']:0),
-					'account_passwd_2'      => $values['account_passwd_2'],
-					'account_groups'        => $values['account_groups'],
-					'account_permissions'   => $values['account_permissions'],
-					'homedirectory'         => $values['homedirectory'],
-					'loginshell'            => $values['loginshell'],
-					'account_expires_month' => $values['account_expires_month'],
-					'account_expires_day'   => $values['account_expires_day'],
-					'account_expires_year'  => $values['account_expires_year'],
-					'account_expires_never'	=> $values['expires'],
-								'expires'	=> $values['expires'],
-						'account_expires'	=> $values['expires']
-					/* 'file_space' => $GLOBALS['HTTP_POST_VARS']['account_file_space_number'] . "-" . $GLOBALS['HTTP_POST_VARS']['account_file_space_type'] */
+			if ($_POST['submit'])
+			{
+				$userData = array(
+					'account_lid'           => $_POST['account_lid'],
+					'firstname'             => $_POST['account_firstname'],
+					'lastname'              => $_POST['account_lastname'],
+					'account_passwd'        => $_POST['account_passwd'],
+					'status'                => ($_POST['account_status'] ? 'A' : ''),
+					'account_status'        => ($_POST['account_status'] ? 'A' : ''),
+					'old_loginid'           => ($_GET['old_loginid']?rawurldecode($_GET['old_loginid']):''),
+					'account_id'            => ($_GET['account_id']?$_GET['account_id']:0),
+					'account_passwd_2'      => $_POST['account_passwd_2'],
+					'account_groups'        => $_POST['account_groups'],
+					'anonymous'             => $_POST['anonymous'],
+					'changepassword'        => $_POST['changepassword'],
+					'account_permissions'   => $_POST['account_permissions'],
+					'homedirectory'         => $_POST['homedirectory'],
+					'loginshell'            => $_POST['loginshell'],
+					'account_expires_never' => $_POST['never_expires']
+					/* 'file_space' => $_POST['account_file_space_number'] . "-" . $_POST['account_file_space_type'] */
 				);
-
-				if ($values['account_id'])
+				if ($_POST['expires'] !== '' && !$_POST['never_expires'])
 				{
-					$userData['account_id'] = $values['account_id'];
-					$this->update_user($userData);
-					/* check if would create a menu
+					$jscal = CreateObject('phpgwapi.jscalendar',False);
+					$userData += $jscal->input2date($_POST['expires'],False,'account_expires_day','account_expires_month','account_expires_year');
+				}
+				if (!$errors = $this->validate_user($userData))
+				{
+					$this->save_user($userData);
+					$GLOBALS['hook_values']['account_id'] = $userData['account_id'];
+					$GLOBALS['hook_values']['account_lid'] = $userData['account_lid'];
+					$GLOBALS['hook_values']['account_firstname'] = $userData['account_firstname'];
+					$GLOBALS['hook_values']['account_lastname'] = $userData['account_lastname'];
+					$GLOBALS['phpgw']->hooks->process('editaccount');
+
+					// check if would create a menu
 					// if we do, we can't return to the users list, because
 					// there are also some other plugins
 					if (!ExecMethod('admin.uimenuclass.createHTMLCode','edit_user'))
 					{
-					}*/
-				}
-				else
-				{
-					$account_id = $this->so->add_user($userData);
-					$GLOBALS['hook_values']['account_lid']	= $userData['account_lid'];
-					$GLOBALS['hook_values']['account_id']	= $account_id; //$userData['account_id'];
-					$GLOBALS['hook_values']['new_passwd']	= $userData['account_passwd'];
-					$GLOBALS['phpgw']->hooks->process('addaccount');
-				}
-			}
-		}
-
-		/* stores the userdata */
-		function update_user($userData)
-		{
-			$account = CreateObject('phpgwapi.accounts',$userData['account_id'],'u');
-			$account->update_data($userData);
-			$account->save_repository();
-			if ($userData['account_passwd'])
-			{
-				$auth = CreateObject('phpgwapi.auth');
-				$auth->change_password($old_passwd,$userData['account_passwd'],$userData['account_id']);
-				$GLOBALS['hook_values']['account_id'] = $userData['account_id'];
-				$GLOBALS['hook_values']['old_passwd'] = $old_passwd;
-				$GLOBALS['hook_values']['new_passwd'] = $userData['account_passwd'];
-				$GLOBALS['phpgw']->hooks->process('changepassword');
-			}
-
-			$apps = CreateObject('phpgwapi.applications',array(intval($userData['account_id']),'u'));
-
-			$apps->account_id = $userData['account_id'];
-			if ($_userData['account_permissions'])
-			{
-				while($app = each($userData['account_permissions'])) 
-				{
-					if($app[1]) 
+						ExecMethod('admin.uiaccounts.list_users');
+						return False;
+					}
+					else
 					{
-						$apps->add($app[0]);
+						ExecMethod('admin.uiaccounts.edit_user',$_GET['account_id']);
+						return False;
 					}
 				}
-			}
-			$apps->save_repository();
-
-			$account = CreateObject('phpgwapi.accounts',$userData['account_id'],'u');
-			$allGroups = $account->get_list('groups');
-
-			if ($userData['account_groups'])
-			{
-				reset($userData['account_groups']);
-				while (list($key,$value) = each($userData['account_groups']))
-				{
-					$newGroups[$value] = $value;
-				}
-			}
-
-			$acl = CreateObject('phpgwapi.acl',$userData['account_id']);
-
-			reset($allGroups);
-			while (list($key,$groupData) = each($allGroups)) 
-			{
-				/* print "$key,". $groupData['account_id'] ."<br>";*/
-				/* print "$key,". $userData['account_groups'][1] ."<br>"; */
-
-				if ($newGroups[$groupData['account_id']]) 
-				{
-					$acl->add_repository('phpgw_group',$groupData['account_id'],$userData['account_id'],1);
-				}
 				else
 				{
-					$acl->delete_repository('phpgw_group',$groupData['account_id'],$userData['account_id']);
+					$ui = createobject('admin.uiaccounts');
+					$ui->create_edit_user($userData['account_id'],$userData,$errors);
 				}
 			}
-			$GLOBALS['phpgw']->session->delete_cache(intval($userData['account_id']));
 		}
 
 		function set_group_managers()
 		{
-			if($GLOBALS['phpgw']->acl->check('group_access',16,'admin') || $GLOBALS['HTTP_POST_VARS']['cancel'])
+			if($GLOBALS['phpgw']->acl->check('group_access',16,'admin') || $_POST['cancel'])
 			{
 				$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'));
-				$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-				exit;
+				$GLOBALS['phpgw']->common->phpgw_exit();
 			}
-			elseif($GLOBALS['HTTP_POST_VARS']['submit'])
+			elseif($_POST['submit'])
 			{
-				$acl = CreateObject('phpgwapi.acl',intval($GLOBALS['HTTP_POST_VARS']['account_id']));
+				$acl = CreateObject('phpgwapi.acl',intval($_POST['account_id']));
 				
-				$users = $GLOBALS['phpgw']->accounts->member($GLOBALS['HTTP_POST_VARS']['account_id']);
+				$users = $GLOBALS['phpgw']->accounts->member($_POST['account_id']);
 				@reset($users);
 				while($managers && list($key,$user) = each($users))
 				{
-					$acl->add_repository('phpgw_group',intval($GLOBALS['HTTP_POST_VARS']['account_id']),$user['account_id'],1);
+					$acl->add_repository('phpgw_group',intval($_POST['account_id']),$user['account_id'],1);
 				}
-				$managers = $GLOBALS['HTTP_POST_VARS']['managers'];
+				$managers = $_POST['managers'];
 				@reset($managers);
 				while($managers && list($key,$manager) = each($managers))
 				{
-					$acl->add_repository('phpgw_group',intval($GLOBALS['HTTP_POST_VARS']['account_id']),$manager,(1 + PHPGW_ACL_GROUP_MANAGERS));
+					$acl->add_repository('phpgw_group',intval($_POST['account_id']),$manager,(1 + PHPGW_ACL_GROUP_MANAGERS));
 				}
 			}
 			$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'));
-			$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-			exit;
+			$GLOBALS['phpgw']->common->phpgw_exit();
 		}
 
-		function validate_group($values)
+		function validate_group($group_info)
 		{
-			$group = CreateObject('phpgwapi.accounts',$values['account_id'],'g');
+			$errors = Array();
+			
+			$group = CreateObject('phpgwapi.accounts',$group_info['account_id'],'g');
 			$group->read_repository();
 
-			if (!$values['account_id'] && $GLOBALS['phpgw']->acl->check('group_access',4,'admin'))
+			if(!$group_info['account_name'])
 			{
-				$error[] = lang('no permission to add groups');
+				$errors[] = lang('You must enter a group name.');
 			}
 
-			if(!$values['account_name'])
+			if($group_info['account_name'] != $group->id2name($group_info['account_id']))
 			{
-				$error[] = lang('You must enter a group name.');
-			}
-
-			if($values['account_name'] != $group->id2name($values['account_id']))
-			{
-				if ($group->exists($values['account_name']))
+				if ($group->exists($group_info['account_name']))
 				{
-					$error[] = lang('Sorry, that group name has already been taken.');
+					$errors[] = lang('Sorry, that group name has already been taken.');
 				}
 			}
 
 		/*
 			if (preg_match ("/\D/", $account_file_space_number))
 			{
-				$error[] = lang ('File space must be an integer');
+				$errors[] = lang ('File space must be an integer');
 			}
 		*/
-			if(is_array($error))
+			if(count($errors))
 			{
-				return $error;
+				$ui = createobject('admin.uiaccounts');
+				$ui->create_edit_group($group_info,$errors);
+				$GLOBALS['phpgw']->common->phpgw_exit();
 			}
 		}
 
@@ -564,69 +667,76 @@
 		 returns FALSE if the data are correct
 		 otherwise the error array
 		*/
-		function validate_user($values)
+		function validate_user(&$_userData)
 		{
-			if (!$values['account_id'] && $GLOBALS['phpgw']->acl->check('account_access',4,'admin'))
-			{
-				$error[] = lang('no permission to add users');
-			}
+			$totalerrors = 0;
 
 			/*
-			if ($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap' && ! $values['allow_long_loginids'])
+			if ($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap' && ! $allow_long_loginids)
 			{
-				if (strlen($values['account_lid']) > 8) 
+				if (strlen($_userData['account_lid']) > 8) 
 				{
-					$error[] = lang('The loginid can not be more then 8 characters');
+					$error[$totalerrors] = lang('The loginid can not be more then 8 characters');
+					$totalerrors++;
 				}
 			}
 			*/
 
-			if (!$values['account_lid'])
+			if (!$_userData['account_lid'])
 			{
-				$error[] = lang('You must enter a loginid');
+				$error[$totalerrors] = lang('You must enter a loginid');
+				$totalerrors++;
 			}
 
-			if ($values['old_loginid'] != $values['account_lid']) 
+			if ($_userData['old_loginid'] != $_userData['account_lid']) 
 			{
-				if ($GLOBALS['phpgw']->accounts->exists($values['account_lid']))
+				if ($GLOBALS['phpgw']->accounts->exists($_userData['account_lid']))
 				{
-					$error[] = lang('That loginid has already been taken');
+					$error[$totalerrors] = lang('That loginid has already been taken');
+					$totalerrors++;
 				}
 			}
 
-			if ($values['account_passwd'] || $values['account_passwd_2']) 
+			if ($_userData['account_passwd'] || $_userData['account_passwd_2']) 
 			{
-				if ($values['account_passwd'] != $values['account_passwd_2']) 
+				if ($_userData['account_passwd'] != $_userData['account_passwd_2']) 
 				{
-					$error[] = lang('The two passwords are not the same');
+					$error[$totalerrors] = lang('The two passwords are not the same');
+					$totalerrors++;
 				}
+			}
 
-			/*	$temp_msgbox_data = $GLOBALS['phpgw_info']['flags']['msgbox_data'];
-				unset($GLOBALS['phpgw_info']['flags']['msgbox_data']);
-				if(!sanitize($_userData['account_passwd'],'password'))
+			if (!count($_userData['account_permissions']) && !count($_userData['account_groups'])) 
+			{
+				$error[$totalerrors] = lang('You must add at least 1 permission or group to this account');
+				$totalerrors++;
+			}
+
+			if ($_userData['account_expires_month'] || $_userData['account_expires_day'] || $_userData['account_expires_year'] || $_userData['account_expires_never'])
+			{
+				if($_userData['account_expires_never'])
 				{
-					reset($GLOBALS['phpgw_info']['flags']['msgbox_data']);
-					while(list($key) = each($GLOBALS['phpgw_info']['flags']['msgbox_data']))
+					$_userData['expires'] = -1;
+					$_userData['account_expires'] = $_userData['expires'];
+				}
+				else
+				{
+					if (! checkdate($_userData['account_expires_month'],$_userData['account_expires_day'],$_userData['account_expires_year']))
 					{
-						$error[$totalerrors] = lang($key);
+						$error[$totalerrors] = lang('You have entered an invalid expiration date');
 						$totalerrors++;
 					}
+					else
+					{
+						$_userData['expires'] = mktime(2,0,0,$_userData['account_expires_month'],$_userData['account_expires_day'],$_userData['account_expires_year']);
+						$_userData['account_expires'] = $_userData['expires'];
+					}
 				}
-				$GLOBALS['phpgw_info']['flags']['msgbox_data'] = $temp_msgbox_data;
-				unset($temp_msgbox_data); */
 			}
-
-			if (!count($values['account_permissions']) && !count($values['account_groups'])) 
+			else
 			{
-				$error[] = lang('You must add at least 1 permission or group to this account');
-			}
-
-			if ($values['account_expires_month'] || $values['account_expires_day'] || $values['account_expires_year'] || $values['account_expires_never'])
-			{
-				if (! checkdate($values['account_expires_month'],$values['account_expires_day'],$values['account_expires_year']))
-				{
-					$error[] = lang('You have entered an invalid expiration date');
-				}
+				$_userData['expires'] = -1;
+				$_userData['account_expires'] = $_userData['expires'];
 			}
 
 		/*
@@ -638,99 +748,93 @@
 			}
 		*/
 
-			if (is_array($error))
+			if ($totalerrors == 0)
+			{
+				return FALSE;
+			}
+			else
 			{
 				return $error;
 			}
 		}
 
-
-		function delete_group($account_id)
+		/* stores the userdata */
+		function save_user($_userData)
 		{
-			if ($GLOBALS['phpgw']->acl->check('group_access',32,'admin'))
+			$account = CreateObject('phpgwapi.accounts',$_userData['account_id'],'u');
+			$account->update_data($_userData);
+			$account->save_repository();
+			if ($_userData['account_passwd'])
 			{
-				return False;
+				$auth = CreateObject('phpgwapi.auth');
+				$auth->change_password($old_passwd, $_userData['account_passwd'], $_userData['account_id']);
+				$GLOBALS['hook_values']['account_id'] = $_userData['account_id'];
+				$GLOBALS['hook_values']['old_passwd'] = $old_passwd;
+				$GLOBALS['hook_values']['new_passwd'] = $_userData['account_passwd'];
+				$GLOBALS['phpgw']->hooks->process('changepassword');
 			}
 
-			$GLOBALS['phpgw']->db->lock(array
-				(
-					'phpgw_accounts',
-					'phpgw_acl'
-				)
-			);
+			$apps = CreateObject('phpgwapi.applications',array(intval($_userData['account_id']),'u'));
 
-			$old_group_list = $GLOBALS['phpgw']->acl->get_ids_for_location($account_id,1,'phpgw_group');
-
-			@reset($old_group_list);
-			while($old_group_list && $id = each($old_group_list))
+			$apps->account_id = $_userData['account_id'];
+			if ($_userData['account_permissions'])
 			{
-				$GLOBALS['phpgw']->acl->delete_repository('phpgw_group',$account_id,intval($id[1]));
-				$GLOBALS['phpgw']->session->delete_cache(intval($id[1]));
-			}
-
-			$GLOBALS['phpgw']->acl->delete_repository('%%','run',$account_id);
-
-			if (! @rmdir($GLOBALS['phpgw_info']['server']['files_dir'].SEP.'groups'.SEP.$GLOBALS['phpgw']->accounts->id2name($account_id)))
-			{
-				$cd = 38;
-			}
-			else
-			{
-				$cd = 32;
-			}
-
-			$GLOBALS['phpgw']->accounts->delete($account_id);
-			$GLOBALS['phpgw']->db->unlock();
-		}
-
-		function delete_user()
-		{
-			if (isset($GLOBALS['HTTP_POST_VARS']['cancel']) || $GLOBALS['phpgw']->acl->check('account_access',32,'admin'))
-			{
-				ExecMethod('admin.uiaccounts.list_users');
-				return False;
-			}
-			elseif($GLOBALS['HTTP_POST_VARS']['delete_account'])
-			{
-				$accountid = $GLOBALS['HTTP_POST_VARS']['account_id'];
-				settype($account_id,'integer');
-				$account_id = get_account_id($accountid);
-				$lid = $GLOBALS['phpgw']->accounts->id2name($account_id);
-				$db = $GLOBALS['phpgw']->db;
-				$db->query('SELECT app_name,app_order FROM phpgw_applications WHERE app_enabled!=0 ORDER BY app_order',__LINE__,__FILE__);
-				if($db->num_rows())
+				while($app = each($_userData['account_permissions'])) 
 				{
-					while($db->next_record())
+					if($app[1]) 
 					{
-						$appname = $db->f('app_name');
-
-						if($appname <> 'admin')
-						{
-							$GLOBALS['phpgw']->hooks->single('deleteaccount', $appname);
-						}
+						$apps->add($app[0]);
 					}
 				}
+			}
+			$apps->save_repository();
 
-				$GLOBALS['phpgw']->hooks->single('deleteaccount','preferences');
-				$GLOBALS['phpgw']->hooks->single('deleteaccount','admin');
+			$account = CreateObject('phpgwapi.accounts',$_userData['account_id'],'u');
+			$allGroups = $account->get_list('groups');
 
-				$GLOBALS['hook_values']['account_id'] = $account_id;
-				$GLOBALS['phpgw']->hooks->process('deleteaccount');
-
-				$basedir = $GLOBALS['phpgw_info']['server']['files_dir'] . SEP . 'users' . SEP;
-
-				if (! @rmdir($basedir . $lid))
+			if ($_userData['account_groups'])
+			{
+				reset($_userData['account_groups']);
+				while (list($key,$value) = each($_userData['account_groups']))
 				{
-					$cd = 34;
+					$newGroups[$value] = $value;
+				}
+			}
+
+			$acl = CreateObject('phpgwapi.acl',$_userData['account_id']);
+
+			reset($allGroups);
+			while (list($key,$groupData) = each($allGroups)) 
+			{
+				/* print "$key,". $groupData['account_id'] ."<br>";*/
+				/* print "$key,". $_userData['account_groups'][1] ."<br>"; */
+
+				if ($newGroups[$groupData['account_id']]) 
+				{
+					$acl->add_repository('phpgw_group',$groupData['account_id'],$_userData['account_id'],1);
 				}
 				else
 				{
-					$cd = 29;
+					$acl->delete_repository('phpgw_group',$groupData['account_id'],$_userData['account_id']);
 				}
-
-				ExecMethod('admin.uiaccounts.list_users');
-				return False;
 			}
+			if ($_userData['anonymous']) 
+			{
+				$acl->add_repository('phpgwapi','anonymous',$_userData['account_id'],1);
+			}
+			else
+			{
+				$acl->delete_repository('phpgwapi','anonymous',$_userData['account_id']);
+			}
+			if ($_userData['changepassword']) 
+			{
+				$GLOBALS['phpgw']->acl->add_repository('preferences','changepassword',$_userData['account_id'],1);
+			}
+			else
+			{
+				$GLOBALS['phpgw']->acl->delete_repository('preferences','changepassword',$_userData['account_id']);
+			}
+			$GLOBALS['phpgw']->session->delete_cache(intval($_userData['account_id']));
 		}
 
 		function load_group_users($account_id)
diff --git a/admin/inc/class.bocategories.inc.php b/admin/inc/class.bocategories.inc.php
index 0f8b2a6ba7..b5fc2f4a7c 100644
--- a/admin/inc/class.bocategories.inc.php
+++ b/admin/inc/class.bocategories.inc.php
@@ -28,9 +28,9 @@
 
 		function bocategories()
 		{
-			if ($GLOBALS['appname'])
+			if ($_GET['appname'])
 			{
-				$this->cats = CreateObject('phpgwapi.categories',-1,$GLOBALS['appname']);
+				$this->cats = CreateObject('phpgwapi.categories',-1,$_GET['appname']);
 			}
 			else
 			{
@@ -39,24 +39,19 @@
 
 			$this->read_sessiondata();
 
-			/* _debug_array($GLOBALS['HTTP_POST_VARS']); */
-
-			$start  = intval(get_var('start',array('POST','GET')));
+			/* _debug_array($_POST); */
+			/* Might change this to '' at the end---> */
+			$start  = get_var('start',array('POST','GET'));
 			$query  = get_var('query',array('POST','GET'));
-			$sort   = get_var('sort',array('POST','GET'));
+			$sort   = get_var('sort', array('POST','GET'));
 			$order  = get_var('order',array('POST','GET'));
-			$cat_id = intval(get_var('cat_id', array('POST','GET')));
+			$cat_id = get_var('cat_id',array('POST','GET'));
 
-			if(!empty($start) || $start == 0)
+			if(!empty($start) || $start == '0' || $start == 0)
 			{
 				if($this->debug) { echo '<br>overriding start: "' . $this->start . '" now "' . $start . '"'; }
 				$this->start = $start;
 			}
-			else
-			{
-				$this->start = 0;
-			}
-
 			if((empty($query) && !empty($this->query)) || !empty($query))
 			{
 				if($this->debug) { echo '<br>setting query to: "' . $query . '"'; }
@@ -67,17 +62,14 @@
 			{
 				$this->cat_id = $cat_id;
 			}
-
-			if($cat_id == 0)
+			if($cat_id == '0' || $cat_id == 0 || $cat_id == '')
 			{
 				unset($this->cat_id);
 			}
-
 			if(isset($sort) && !empty($sort))
 			{
 				$this->sort = $sort;
 			}
-
 			if(isset($order) && !empty($order))
 			{
 				$this->order = $order;
@@ -105,23 +97,15 @@
 			}
 		}
 
-		function get_list($global_cats=False)
+		function get_list()
 		{
 			if($this->debug) { echo '<br>querying: "' . $this->query . '"'; }
-
-			if ($global_cats)
-			{
-				return $this->cats->return_sorted_array($this->start,True,$this->query,$this->sort,$this->order,True);
-			}
-			else
-			{
-				return $this->cats->return_sorted_array($this->start,True,$this->query,$this->sort,$this->order);
-			}
+			return $this->cats->return_sorted_array($this->start,True,$this->query,$this->sort,$this->order,True);
 		}
 
 		function save_cat($values)
 		{
-			if ($values['cat_id'] && $values['cat_id'] != 0)
+			if ($values['id'] && $values['id'] != 0)
 			{
 				return $this->cats->edit($values);
 			}
@@ -133,20 +117,19 @@
 
 		function exists($data)
 		{
-			return $this->cats->exists($data);
+			$data['type']   = $data['type'] ? $data['type'] : '';
+			$data['cat_id'] = $data['cat_id'] ? $data['cat_id'] : '';
+			return $this->cats->exists($data['type'],$data['cat_name'],$data['cat_id']);
 		}
 
 		function formatted_list($data)
 		{
-			return $this->cats->formatted_list($data);
+			return $this->cats->formated_list($data['select'],$data['all'],$data['cat_parent'],True);
 		}
 
-		function delete($data)
+		function delete($cat_id,$subs=False)
 		{
-			if (is_array($data))
-			{
-				$this->cats->delete($data);
-			}
+			return $this->cats->delete($cat_id,$subs);
 		}
 
 		function check_values($values)
@@ -168,7 +151,7 @@
 					(
 						'type'     => 'appandmains',
 						'cat_name' => $values['name'],
-						'cat_id'   => $values['cat_id']
+						'cat_id'   => $values['id']
 					));
 				}
 				else
@@ -177,7 +160,7 @@
 					(
 						'type'     => 'appandsubs',
 						'cat_name' => $values['name'],
-						'cat_id'   => $values['cat_id']
+						'cat_id'   => $values['id']
 					));
 				}
 
diff --git a/admin/inc/class.soaccounts.inc.php b/admin/inc/class.soaccounts.inc.php
index f40e38c097..1aa86f73b6 100755
--- a/admin/inc/class.soaccounts.inc.php
+++ b/admin/inc/class.soaccounts.inc.php
@@ -19,10 +19,9 @@
 
 		function add_user($userData)
 		{
-			$GLOBALS['phpgw']->db->lock
-			(
-				array
-				(
+			$userData['account_expires'] = $userData['expires'];
+			$GLOBALS['phpgw']->db->lock(
+				Array(
 					'phpgw_accounts',
 					'phpgw_nextid',
 					'phpgw_preferences',
@@ -37,10 +36,9 @@
 			$GLOBALS['phpgw']->accounts->create($userData);
 
 			$userData['account_id'] = $GLOBALS['phpgw']->accounts->name2id($userData['account_lid']);
-
-			$apps = CreateObject('phpgwapi.applications',array($userData['account_id'],'u'));
+			
+			$apps = CreateObject('phpgwapi.applications',$userData['account_id']);
 			$apps->read_installed_apps();
-
 			// Read Group Apps
 			if ($userData['account_groups'])
 			{
@@ -63,7 +61,7 @@
 
 			$apps->account_type = 'u';
 			$apps->account_id = $userData['account_id'];
-			$apps->account_apps = Array(Array());
+			$apps->data = Array(Array());
 
 			if ($userData['account_permissions'])
 			{
@@ -82,8 +80,10 @@
 			}
 			$apps->save_repository();
 
-			$GLOBALS['phpgw']->acl->add_repository('preferences','changepassword',$userData['account_id'],1);
-
+			if ($userData['changepassword'])
+			{
+				$GLOBALS['phpgw']->acl->add_repository('preferences','changepassword',$userData['account_id'],1);
+			}
 			// Assign user to groups
 			if ($userData['account_groups'])
 			{
@@ -94,32 +94,11 @@
 				}
 			}
 
-/*			if ($apps_after)
-			{
-				$GLOBALS['pref'] = CreateObject('phpgwapi.preferences',$userData['account_id']);
-				$GLOBALS['phpgw']->hooks->single('add_def_pref','admin');
-				while ($apps = each($apps_after))
-				{
-					if (strcasecmp ($apps[0], 'admin') != 0)
-					{
-						$GLOBALS['phpgw']->hooks->single('add_def_pref', $apps[1]);
-					}
-				}
-				$GLOBALS['pref']->save_repository(False);
-			} */
-
 			$apps->account_apps = array(array());
 			$apps_after = array(array());
 
 			$GLOBALS['phpgw']->db->unlock();
 
-/*
-			// start inlcuding other admin tools
-			while($app = each($apps_after))
-			{
-				$GLOBALS['phpgw']->hooks->single('add_user_data', $value);
-			}
-*/
 			return $userData['account_id'];
 		}
 	}
diff --git a/admin/inc/class.soapplications.inc.php b/admin/inc/class.soapplications.inc.php
index da6ea945be..92ddd72d23 100644
--- a/admin/inc/class.soapplications.inc.php
+++ b/admin/inc/class.soapplications.inc.php
@@ -28,7 +28,7 @@
 			$this->db->next_record();
 			$app_info = array(
 				$this->db->f('app_name'),
-				$this->db->f('app_name'),
+				$GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')]['title'],
 				$this->db->f('app_enabled'),
 				$this->db->f('app_name'),
 				$this->db->f('app_order')
@@ -44,7 +44,7 @@
 				while ($this->db->next_record())
 				{
 					$apps[$this->db->f('app_name')] = array(
-						'title'		=> str_replace('- ','-',ucwords(str_replace('_','- ',$this->db->f('app_name')))),
+						'title'  => $GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')],
 						'name'   => $this->db->f('app_name'),
 						'status' => $this->db->f('app_enabled')
 					);
@@ -74,7 +74,7 @@
 		function save($data)
 		{
 			$sql = "UPDATE phpgw_applications SET app_name='" . addslashes($data['n_app_name']) . "',"
-				. "app_enabled='" . $data['n_app_status'] . "',app_order='" . $data['app_order']
+				. "app_enabled='" . $data['n_app_status'] . "',app_order='" . $data['app_order'] 
 				. "' WHERE app_name='" . $data['old_app_name'] . "'";
 
 			$this->db->query($sql,__LINE__,__FILE__);
diff --git a/admin/inc/class.uiaccess_history.inc.php b/admin/inc/class.uiaccess_history.inc.php
index 43915293a6..e9ed137b01 100644
--- a/admin/inc/class.uiaccess_history.inc.php
+++ b/admin/inc/class.uiaccess_history.inc.php
@@ -20,6 +20,11 @@
 
 		function uiaccess_history()
 		{
+			if ($GLOBALS['phpgw']->acl->check('access_log_access',1,'admin'))
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
+			
 			$this->bo         = createobject('admin.boaccess_history');
 			$this->nextmatchs = createobject('phpgwapi.nextmatchs');
 			$this->template   = $GLOBALS['phpgw']->template;
@@ -35,13 +40,14 @@
 
 		function list_history()
 		{
-			$account_id = ($GLOBALS['HTTP_GET_VARS']['account_id']?$GLOBALS['HTTP_GET_VARS']['account_id']:$GLOBALS['HTTP_POST_VARS']['account_id']);
-			$start = ($GLOBALS['HTTP_POST_VARS']['start']?$GLOBALS['HTTP_POST_VARS']['start']:0);
-			$sort = ($GLOBALS['HTTP_POST_VARS']['sort']?$GLOBALS['HTTP_POST_VARS']['sort']:0);
-			$order = ($GLOBALS['HTTP_POST_VARS']['order']?$GLOBALS['HTTP_POST_VARS']['order']:0);
+			$account_id = get_var('account_id',array('GET','POST'));
+			$start = get_var('start',array('POST'),0);
+			$sort = get_var('sort',array('POST'),0);
+			$order = get_var('order',array('POST'),0);
 			
 			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('View access log');
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
 			$total_records = $this->bo->total($account_id);
 
diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php
index da20139433..93279f74b0 100755
--- a/admin/inc/class.uiaccounts.inc.php
+++ b/admin/inc/class.uiaccounts.inc.php
@@ -2,8 +2,7 @@
 	/**************************************************************************\
 	* phpGroupWare - account administration                                    *
 	* http://www.phpgroupware.org                                              *
-	* Written by coreteam <phpgroupware-developers@gnu.org>                    *
-	* -----------------------------------------------------                    *
+	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
 	*  Free Software Foundation; either version 2 of the License, or (at your  *
@@ -15,14 +14,19 @@
 	{
 		var $public_functions = array
 		(
-			'list_groups'	=> True,
-			'list_users'	=> True,
-			'delete_group'	=> True,
-			'delete_user'	=> True,
-			'edit_user'		=> True,
-			'edit_group'	=> True,
-			'view_user'		=> True,
-			'group_manager'	=> True
+			'list_groups'		=> True,
+			'list_users'		=> True,
+			'add_group'			=> True,
+			'add_user'			=> True,
+			'delete_group'		=> True,
+			'delete_user'		=> True,
+			'edit_user'			=> True,
+			'edit_user_hook'	=> True,
+			'edit_group'		=> True,
+			'view_user'			=> True,
+			'view_user_hook'	=> True,
+			'group_manager'		=> True,
+			'accounts_popup'	=> True
 		);
 
 		var $bo;
@@ -30,11 +34,8 @@
 
 		function uiaccounts()
 		{
-			$GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
-
-			$this->bo			= createobject('admin.boaccounts');
-			$this->nextmatchs	= createobject('phpgwapi.nextmatchs');
-
+			$this->bo = createobject('admin.boaccounts');
+			$this->nextmatchs = createobject('phpgwapi.nextmatchs');
 			@set_time_limit(300);
 		}
 
@@ -48,27 +49,28 @@
 
 		function list_groups()
 		{
-			if ($_POST['done'] || $GLOBALS['phpgw']->acl->check('group_access',1,'admin'))
+			if ($GLOBALS['phpgw']->acl->check('group_access',1,'admin'))
 			{
-				$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uimainscreen.mainscreen');
-			}
-
-			if($_POST['add'])
-			{
-				$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.edit_group');
+				$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/admin/index.php'));
 			}
 
 			$query = (isset($_POST['query'])?$_POST['query']:'');
 
 			$GLOBALS['cd'] = ($_GET['cd']?$_GET['cd']:0);
+			
+			unset($GLOBALS['phpgw_info']['flags']['noheader']);
+			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
+			$GLOBALS['phpgw']->common->phpgw_header();
 
-			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('administration') . ': ' . lang('list groups');
-
-			$GLOBALS['phpgw']->xslttpl->add_file(array('app_data','groups',
-										$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 'search_field',
-										$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 'nextmatchs'));
-
-/* what should this be for??? this is the same call for both cases! can this be removed? [ceb] */
+			$p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+			$p->set_file(
+				array(
+					'groups'   => 'groups.tpl'
+				)
+			);
+			$p->set_block('groups','list','list');
+			$p->set_block('groups','row','row');
+			$p->set_block('groups','row_empty','row_empty');
 
 			if ($GLOBALS['phpgw']->acl->check('group_access',2,'admin'))
 			{
@@ -81,85 +83,117 @@
 				$total = $GLOBALS['phpgw']->accounts->total;
 			}
 
-			$group_header = array
-			(
-				'sort_name'				=> $this->nextmatchs->show_sort_order(array
-											(
-												'sort'	=> $sort,
-												'var'	=> 'account_lid',
-												'order'	=> $order,
-												'extra'	=> 'menuaction=admin.uiaccounts.list_groups'
-											)),
-				'lang_name'				=> lang('name'),
-				'lang_edit'				=> lang('edit'),
-				'lang_delete'			=> lang('delete'),
-				'lang_sort_statustext'	=> lang('sort the entries')
-			);
+			$url = $GLOBALS['phpgw']->link('/index.php');
 
-			while (list($null,$account) = each($account_info))
+			$var = Array(
+				'th_bg'             => $GLOBALS['phpgw_info']['theme']['th_bg'],
+				'left_next_matchs'  => $this->nextmatchs->left('/index.php',$start,$total,'menuaction=admin.uiaccounts.list_groups'),
+				'right_next_matchs' => $this->nextmatchs->right('/admin/groups.php',$start,$total,'menuaction=admin.uiaccounts.list_groups'),
+				'lang_groups'   => lang('user groups'),
+				'sort_name'     => $this->nextmatchs->show_sort_order($sort,'account_lid',$order,'/index.php',lang('name'),'menuaction=admin.uiaccounts.list_groups'),
+				'header_edit'   => lang('Edit'),
+				'header_delete' => lang('Delete')
+			);
+			$p->set_var($var);
+
+			if (!count($account_info) || !$total)
 			{
-				$group_data[] = Array
-				(
-					'edit_url'					=> ($this->bo->check_rights('edit')?$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.edit_group&account_id=' . $account['account_id']):''),
-					'lang_edit'					=> ($this->bo->check_rights('edit')?lang('edit'):''),
-					'lang_edit_statustext'		=> ($this->bo->check_rights('edit')?lang('edit this group'):''),
-					'group_name'				=> (!$account['account_lid']?'':$account['account_lid']),
-					'delete_url'				=> ($this->bo->check_rights('delete')?$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.delete_group&account_id=' . $account['account_id']):''),
-					'lang_delete_statustext'	=> ($this->bo->check_rights('delete')?lang('delete this group'):''),
-					'lang_delete'				=> ($this->bo->check_rights('delete')?lang('delete'):'')
-				);
+				$p->set_var('message',lang('No matches found'));
+				$p->parse('rows','row_empty',True);
+			}
+			else
+			{
+				if (! $GLOBALS['phpgw']->acl->check('group_access',8,'admin'))
+				{
+					$can_view = True;
+				}
+
+				if (! $GLOBALS['phpgw']->acl->check('group_access',16,'admin'))
+				{
+					$can_edit = True;
+				}
+
+				if (! $GLOBALS['phpgw']->acl->check('group_access',32,'admin'))
+				{
+					$can_delete = True;
+				}
+
+				while (list($null,$account) = each($account_info))
+				{
+					$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+					$var = Array(
+						'tr_color'    => $tr_color,
+						'group_name'  => (!$account['account_lid']?'&nbsp;':$account['account_lid']),
+						'delete_link' => $this->row_action('delete','group',$account['account_id'])
+					);
+					$p->set_var($var);
+
+					if ($can_edit)
+					{
+						$p->set_var('edit_link',$this->row_action('edit','group',$account['account_id']));
+					}
+					else
+					{
+						$p->set_var('edit_link','&nbsp;');
+					}
+
+					if ($can_delete)
+					{
+						$p->set_var('delete_link',$this->row_action('delete','group',$account['account_id']));
+					}
+					else
+					{
+						$p->set_var('delete_link','&nbsp;');
+					}
+
+					$p->fp('rows','row',True);
+
+				}
+			}
+			$var = Array(
+				'new_action'    => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.add_group'),
+				'search_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups')
+			);
+			$p->set_var($var);
+
+			if (! $GLOBALS['phpgw']->acl->check('group_access',4,'admin'))
+			{
+				$p->set_var('input_add','<input type="submit" value="' . lang('Add') . '">');
 			}
 
-			$group_add = array
-			(
-				'lang_add'				=> lang('add'),
-				'lang_add_statustext'	=> lang('add a group'),
-				'action_url'			=> $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'),
-				'lang_done'				=> lang('done'),
-				'lang_done_statustext'	=> lang('return to admin mainscreen'),
-				'add_access'			=> ($this->bo->check_rights('add')?'yes':''),
-			);
+			if (! $GLOBALS['phpgw']->acl->check('group_access',2,'admin'))
+			{
+				$p->set_var('input_search',lang('Search') . '&nbsp;<input name="query">');
+			}
 
-			$data = array
-			(
-				'start_record'					=> $start,
- 				'record_limit'					=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
- 				'num_records'					=> count($account_info),
- 				'all_records'					=> $total,
-				'nextmatchs_url'				=> $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'),
-				'nextmatchs_img_path'			=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
-				'select_url'					=> $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'),
-				'lang_searchfield_statustext'	=> lang('Enter the search string. To show all entries, empty this field and press the SUBMIT button again'),
-				'lang_searchbutton_statustext'	=> lang('Submit the search string'),
-				'query'							=> $query,
-				'lang_search'					=> lang('search'),
-				'group_header'					=> $group_header,
-				'group_data'					=> $group_data,
-				'group_add'						=> $group_add,
-				'search_access'					=> ($this->bo->check_rights('search')?'yes':'')
-			);
-			$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('group_list' => $data));
+			$p->pfp('out','list');
 		}
 
 		function list_users($param_cd='')
 		{
-			if ($_POST['done'] || $GLOBALS['phpgw']->acl->check('account_access',1,'admin'))
+			if ($GLOBALS['phpgw']->acl->check('account_access',1,'admin'))
 			{
-				$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uimainscreen.mainscreen');
-			}
-
-			if ($_POST['add'])
-			{
-				$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.edit_user');
+				$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/admin/index.php'));
 			}
 
 			if($param_cd)
 			{
 				$cd = $param_cd;
 			}
-
-			$GLOBALS['query'] = (isset($GLOBALS['HTTP_POST_VARS']['query'])?$GLOBALS['HTTP_POST_VARS']['query']:'');
-			$start = (isset($GLOBALS['HTTP_POST_VARS']['start'])?intval($GLOBALS['HTTP_POST_VARS']['start']):'');
+			
+			if(isset($_POST['query']))
+			{
+				$GLOBALS['query'] = $_POST['query'];
+			}
+			
+			if(isset($_POST['start']))
+			{
+				$start = intval($_POST['start']);
+			}
+			else
+			{
+				$start = 0;
+			}
 
 			if(isset($_GET['order']))
 			{
@@ -178,537 +212,362 @@
 			{
 				$sort = 'ASC';
 			}
+			
+			unset($GLOBALS['phpgw_info']['flags']['noheader']);
+			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
+			$GLOBALS['phpgw']->common->phpgw_header();
 
-			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('administration') . ': ' . lang('list users');
+			$p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
 
-			$GLOBALS['phpgw']->xslttpl->add_file(array('app_data','users',
-										$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 'search_field',
-										$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 'nextmatchs'));
-
-/* the same like in groups... we really should remove this... :) [ceb] */
+			$p->set_file(
+				Array(
+					'accounts' => 'accounts.tpl'
+				)
+			);
+			$p->set_block('accounts','list','list');
+			$p->set_block('accounts','row','row');
+			$p->set_block('accounts','row_empty','row_empty');
 
 			if ($GLOBALS['phpgw']->acl->check('account_access',2,'admin'))
 			{
-				$account_info = $GLOBALS['phpgw']->accounts->get_list('accounts',$start,$sort,$order,$GLOBALS['query'],$total);
+				$account_info = $GLOBALS['phpgw']->accounts->get_list('accounts',$start,$sort,$order,$GLOBALS['query']);
 				$total = $GLOBALS['phpgw']->accounts->total;
 			}
 			else
 			{
-				$account_info = $GLOBALS['phpgw']->accounts->get_list('accounts',$start,$sort,$order,$GLOBALS['query'],$total);
+				$account_info = $GLOBALS['phpgw']->accounts->get_list('accounts',$start,$sort,$order,$GLOBALS['query']);
 				$total = $GLOBALS['phpgw']->accounts->total;
 			}
+			
+			$url = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users');
 
-			$user_header = array
-			(
-				'sort_lid'				=> $this->nextmatchs->show_sort_order(array
-											(
-												'sort'	=> $sort,
-												'var'	=> 'account_lid',
-												'order'	=> $order,
-												'extra'	=> 'menuaction=admin.uiaccounts.list_users'
-											)),
-				'lang_lid'				=> lang('loginid'),
-				'sort_lastname'			=> $this->nextmatchs->show_sort_order(array
-											(
-												'sort'	=> $sort,
-												'var'	=> 'account_lastname',
-												'order'	=> $order,
-												'extra'	=> 'menuaction=admin.uiaccounts.list_users'
-											)),
-				'lang_lastname'				=> lang('Lastname'),
-				'sort_firstname'			=> $this->nextmatchs->show_sort_order(array
-											(
-												'sort'	=> $sort,
-												'var'	=> 'account_firstname',
-												'order'	=> $order,
-												'extra'	=> 'menuaction=admin.uiaccounts.list_users'
-											)),
-				'lang_firstname'			=> lang('firstname'),
-				'lang_view'				=> lang('view'),
-				'lang_edit'				=> lang('edit'),
-				'lang_delete'			=> lang('delete'),
-				'lang_sort_statustext'	=> lang('sort the entries')
+			$var = Array(
+				'bg_color' => $GLOBALS['phpgw_info']['theme']['bg_color'],
+				'th_bg'    => $GLOBALS['phpgw_info']['theme']['th_bg'],
+				'left_next_matchs'   => $this->nextmatchs->left($url,$start,$total,'menuaction=admin.uiaccounts.list_users'),
+				'lang_user_accounts' => lang('%1 - %2 of %3 user accounts',$start+1,$start+count($account_info),$total),
+				'right_next_matchs'  => $this->nextmatchs->right($url,$start,$total,'menuaction=admin.uiaccounts.list_users'),
+				'lang_loginid'       => $this->nextmatchs->show_sort_order($sort,'account_lid',$order,$url,lang('LoginID')),
+				'lang_lastname'      => $this->nextmatchs->show_sort_order($sort,'account_lastname',$order,$url,lang('last name')),
+				'lang_firstname'     => $this->nextmatchs->show_sort_order($sort,'account_firstname',$order,$url,lang('first name')),
+				'lang_edit'    => lang('edit'),
+				'lang_delete'  => lang('delete'),
+				'lang_view'    => lang('view'),
+				'actionurl'    => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.add_user'),
+				'accounts_url' => $url,
+				'lang_search'  => lang('search')
 			);
-
-			while (list($null,$account) = each($account_info))
+			$p->set_var($var);
+			
+			if (! $GLOBALS['phpgw']->acl->check('account_access',4,'admin'))
 			{
-				$user_data[] = Array
-				(
-					'view_url'					=> ($this->bo->check_rights('view','account_access')?$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.view_user&account_id=' . $account['account_id']):''),
-					'lang_view'					=> ($this->bo->check_rights('view','account_access')?lang('view'):''),
-					'lang_view_statustext'		=> ($this->bo->check_rights('view','account_access')?lang('view this user'):''),
-					'edit_url'					=> ($this->bo->check_rights('edit','account_access')?$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.edit_user&account_id=' . $account['account_id']):''),
-					'lang_edit'					=> ($this->bo->check_rights('edit','account_access')?lang('edit'):''),
-					'lang_edit_statustext'		=> ($this->bo->check_rights('edit','account_access')?lang('edit this user'):''),
-					'lid'						=> (!$account['account_lid']?'':$account['account_lid']),
-					'firstname'					=> (!$account['account_firstname']?'':$account['account_firstname']),
-					'lastname'					=> (!$account['account_lastname']?'':$account['account_lastname']),
-					'delete_url'				=> ($this->bo->check_rights('delete','account_access')?$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.delete_user&account_id=' . $account['account_id']):''),
-					'lang_delete_statustext'	=> ($this->bo->check_rights('delete','account_access')?lang('delete this user'):''),
-					'lang_delete'				=> ($this->bo->check_rights('delete','account_access')?lang('delete'):'')
-				);
+				$p->set_var('input_add','<input type="submit" value="' . lang('Add') . '">');
 			}
 
-			$user_add = array
-			(
-				'lang_add'				=> lang('add'),
-				'lang_add_statustext'	=> lang('add a user'),
-				'action_url'			=> $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users'),
-				'lang_done'				=> lang('done'),
-				'lang_done_statustext'	=> lang('return to admin mainscreen'),
-				'add_access'			=> ($this->bo->check_rights('add','account_access')?'yes':''),
-			);
-
-			$data = array
-			(
-				'start_record'					=> $start,
- 				'record_limit'					=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
- 				'num_records'					=> count($account_info),
- 				'all_records'					=> $total,
-				'nextmatchs_url'				=> $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users'),
-				'nextmatchs_img_path'			=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
-				'select_url'					=> $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users'),
-				'lang_searchfield_statustext'	=> lang('Enter the search string. To show all entries, empty this field and press the SUBMIT button again'),
-				'lang_searchbutton_statustext'	=> lang('Submit the search string'),
-				'query'							=> $query,
-				'lang_search'					=> lang('search'),
-				'user_header'					=> $user_header,
-				'user_data'						=> $user_data,
-				'user_add'						=> $user_add,
-				'search_access'					=> ($this->bo->check_rights('search','account_access')?'yes':'')
-			);
-			$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('account_list' => $data));
-		}
-
-		function edit_group()
-		{
-			$account_id 	= get_var('account_id',array('POST','GET'));
-			$values			= get_var('values',array('POST'));
-			$account_user	= get_var('account_user',array('POST'));
-			$account_apps	= get_var('account_apps',array('POST'));
-
-			if ($values['save'])
+			if (! $GLOBALS['phpgw']->acl->check('account_access',2,'admin'))
 			{
-				$error = $this->bo->validate_group($values);
+				$p->set_var('input_search',lang('Search') . '&nbsp;<input type="text" name="query" value='.$GLOBALS['query'].'>');
+			}
 
-				if (is_array($error))
+			if (!count($account_info) || !$total)
+			{
+				$p->set_var('message',lang('No matches found'));
+				$p->parse('rows','row_empty',True);
+			}
+			else
+			{
+				if (! $GLOBALS['phpgw']->acl->check('account_access',8,'admin'))
 				{
-					$error_list = $GLOBALS['phpgw']->common->error_list($error);
+					$can_view = True;
 				}
-				else
+
+				if (! $GLOBALS['phpgw']->acl->check('account_access',16,'admin'))
 				{
-					if (is_array($account_user))
-					{
-						$values['account_user'] = $account_user;
-					}
+					$can_edit = True;
+				}
 
-					if (is_array($account_apps))
-					{
-						$values['account_apps'] = $account_apps;
-					}
+				if (! $GLOBALS['phpgw']->acl->check('account_access',32,'admin'))
+				{
+					$can_delete = True;
+				}
 
-					if ($values['account_id'])
+				while (list($null,$account) = each($account_info))
+				{
+					$this->nextmatchs->template_alternate_row_color($p);
+
+					$var = array(
+						'row_loginid'   => $account['account_lid'],
+						'row_firstname' => (!$account['account_firstname']?'&nbsp':$account['account_firstname']),
+						'row_lastname'  => (!$account['account_lastname']?'&nbsp':$account['account_lastname'])
+					);
+					$p->set_var($var);
+
+					if ($can_edit)
 					{
-						$this->bo->edit_group($values);
-						$account_id = $values['account_id'];
+						$p->set_var('row_edit',$this->row_action('edit','user',$account['account_id']));
 					}
 					else
 					{
-						$this->bo->add_group($values);
-						$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_groups');
+						$p->set_var('row_edit','&nbsp;');
 					}
+
+					if ($can_delete)
+					{
+						$p->set_var('row_delete',($GLOBALS['phpgw_info']['user']['userid'] != $account['account_lid']?$this->row_action('delete','user',$account['account_id']):'&nbsp'));
+					}
+					else
+					{
+						$p->set_var('row_delete','&nbsp;');
+					}
+
+					if ($can_view)
+					{
+						$p->set_var('row_view',$this->row_action('view','user',$account['account_id']));
+					}
+					else
+					{
+						$p->set_var('row_view','&nbsp;');
+					}
+					$p->parse('rows','row',True);
 				}
+			}		// End else
+			$p->pfp('out','list');
+		}
+
+		function add_group()
+		{
+			if ($GLOBALS['phpgw']->acl->check('group_access',4,'admin'))
+			{
+				$this->list_groups();
+				return False;
 			}
 
-			if ($values['cancel'] || (!$account_id && $GLOBALS['phpgw']->acl->check('group_access',4,'admin')) || ($account_id && $GLOBALS['phpgw']->acl->check('group_access',16,'admin')))
+			$group_info = Array(
+				'account_id'   => $_GET['account_id'],
+				'account_name' => '',
+				'account_user' => Array(),
+				'account_apps' => Array()
+				);
+			$this->create_edit_group($group_info);
+		}
+
+		function add_user()
+		{
+			if ($GLOBALS['phpgw']->acl->check('account_access',4,'admin'))
 			{
-				$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_groups');
+				$this->list_users();
+			}
+			else
+			{
+				$this->create_edit_user(0);
+			}
+		}
+
+		function delete_group()
+		{
+			if ($_POST['no'] || $_POST['yes'] || !@isset($_GET['account_id']) || !@$_GET['account_id'] || $GLOBALS['phpgw']->acl->check('group_access',32,'admin'))
+			{
+				if ($_POST['yes'])
+				{
+					$this->bo->delete_group();
+				}
+				$this->list_groups();
+				return False;
+			}
+
+			unset($GLOBALS['phpgw_info']['flags']['noheader']);
+			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
+			$GLOBALS['phpgw']->common->phpgw_header();
+
+			$p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+			$p->set_file(
+				Array(
+					'body' => 'delete_common.tpl',
+					'message_row' => 'message_row.tpl',
+					'form_button' => 'form_button_script.tpl'
+				)
+			);
+
+			$p->set_var('message_display',lang('Are you sure you want to delete this group ?'));
+			$p->parse('messages','message_row');
+
+			$old_group_list = $GLOBALS['phpgw']->acl->get_ids_for_location(intval($_GET['account_id']),1,'phpgw_group');
+
+			if($old_group_list)
+			{
+				$group_name = $GLOBALS['phpgw']->accounts->id2name($_GET['account_id']);
+
+				$p->set_var('message_display','<br>');
+				$p->parse('messages','message_row',True);
+
+				$user_list = '';
+				while (list(,$id) = each($old_group_list))
+				{
+					$user_list .= '<a href="' . $GLOBALS['phpgw']->link('/index.php',
+						Array(
+							'menuaction' => 'admin.uiaccounts.edit_user',
+							'account_id' => $id
+						)
+					) . '">' . $GLOBALS['phpgw']->common->grab_owner_name($id) . '</a><br>';
+				}
+				$p->set_var('message_display',$user_list);
+				$p->parse('messages','message_row',True);
+
+				$p->set_var('message_display',lang("Sorry, the above users are still a member of the group %1",$group_name)
+					. '.<br>' . lang('They must be removed before you can continue'). '.<br>' . lang('Remove all users from this group').'?');
+				$p->parse('messages','message_row',True);
+			}
+
+			$var = Array(
+				'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.delete_group'),
+				'hidden_vars' => '<input type="hidden" name="account_id" value="'.$_GET['account_id'].'">',
+				'yes'         => lang('Yes'),
+				'no'          => lang('No')
+			);
+			$p->set_var($var);
+/*
+			$p->parse('yes','form_button');
+
+
+			$var = Array(
+				'submit_button' => lang('Submit'),
+				'action_url_button'     => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'),
+				'action_text_button'    => ' '.lang('No'),
+				'action_confirm_button' => '',
+				'action_extra_field'    => ''
+			);
+			$p->set_var($var);
+			$p->parse('no','form_button');
+*/
+			$p->pparse('phpgw_body','body');
+		}
+
+		function delete_user()
+		{
+			if ($GLOBALS['phpgw']->acl->check('account_access',32,'admin') || $GLOBALS['phpgw_info']['user']['account_id'] == $_GET['account_id'])
+			{
+				$this->list_users();
+				return False;
+			}
+			
+			unset($GLOBALS['phpgw_info']['flags']['noheader']);
+			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
+			$GLOBALS['phpgw']->common->phpgw_header();
+
+			$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+			$t->set_file(
+				Array(
+					'form' => 'delete_account.tpl'
+				)
+			);
+			$var = Array(
+				'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.boaccounts.delete_user'),
+				'account_id'  => $_GET['account_id']
+			);
+
+			// the account can have special chars/white spaces, if it is a ldap dn
+			$account_id = rawurlencode($_GET['account_id']);
+
+			// Find out who the new owner is of the deleted users records...
+			$users = $GLOBALS['phpgw']->accounts->get_list('accounts');
+			$c_users = count($users);
+			$str = '';
+			for($i=0;$i<$c_users;$i++)
+			{
+				$str .= '<option value='.$users[$i]['account_id'].'>'.$GLOBALS['phpgw']->common->display_fullname($users[$i]['account_lid'],$users[$i]['account_firstname'],$users[$i]['account_lastname']).'</option>'."\n";
+			}
+			$var['lang_new_owner'] = lang('Who would you like to transfer ALL records owned by the deleted user to?');
+			$var['new_owner_select'] = '<select name="new_owner" size="5">'."\n".'<option value=0 selected>'.lang('Delete All Records').'</option>'."\n".$str.'</select>'."\n";
+			$var['cancel'] = lang('cancel');
+			$var['delete'] = lang('delete');
+			$t->set_var($var);
+			$t->pparse('out','form');
+		}
+
+		function edit_group($cd='',$account_id='')
+		{
+			if ($GLOBALS['phpgw']->acl->check('group_access',16,'admin'))
+			{
+				$this->list_groups();
+				return False;
 			}
 
 			$cdid = $cd;
 			settype($cd,'integer');
 			$cd = ($_GET['cd']?$_GET['cd']:intval($cdid));
 
-			if ($account_id)
+			$accountid = $account_id;
+			settype($account_id,'integer');
+			$account_id = ($_GET['account_id']?$_GET['account_id']:intval($accountid));
+			
+			// todo
+			// not needed if i use the same file for new groups too
+			if (! $account_id)
 			{
-				$group_info = Array
-				(
-					'account_name' => $GLOBALS['phpgw']->accounts->id2name($account_id),
-					'account_user' => $this->bo->load_group_users($account_id),
-					'account_apps' => $this->bo->load_group_apps($account_id)
+				$this->list_groups();
+			}
+			else
+			{
+				$group_info = Array(
+					'account_id'   => intval($_GET['account_id']),
+					'account_name' => $GLOBALS['phpgw']->accounts->id2name($_GET['account_id']),
+					'account_user' => $this->bo->load_group_users($_GET['account_id']),
+					'account_apps' => $this->bo->load_group_apps($_GET['account_id'])
 				);
+
+				$this->create_edit_group($group_info);
 			}
-
-			$apps_with_acl = Array
-			(
-				'addressbook'	=> True,
-				'bookmarks'		=> True,
-				'calendar'		=> True,
-				'filemanager'	=> True,
-				'img'			=> True,
-				'infolog'		=> True,
-				'inv'			=> True,
-				'netsaint'		=> True,
-				'notes'			=> True,
-				'phonelog'		=> True,
-				'phpwebhosting'	=> True,
-				'projects'		=> True,
-				'todo'			=> True,
-				'tts'			=> True
-			);
-
-			$GLOBALS['phpgw']->xslttpl->add_file(array('app_data','groups'));
-			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('administration') . ': ' . ((intval($account_id) > 0)?lang('edit group'):lang('add group'));
-
-			$accounts = CreateObject('phpgwapi.accounts',$account_id,'u');
-			$account_list = $accounts->get_list('accounts');
-			$account_num = count($account_list);
-
-			while (list($key,$entry) = each($account_list))
-			{
-				$user_list[] = array
-				(
-					'account_id'		=> $entry['account_id'],
-					'account_name'		=> $GLOBALS['phpgw']->common->display_fullname($entry['account_lid'],$entry['account_firstname'],
-																						$entry['account_lastname']),
- 					'selected'			=> $group_info['account_user'][intval($entry['account_id'])]
-				);
-			}
-
-			$group_repository = $accounts->read_repository();
-			if (!$group_repository['file_space'])
-			{
-				$group_repository['file_space'] = $GLOBALS['phpgw_info']['server']['vfs_default_account_size_number'] . "-" . $GLOBALS['phpgw_info']['server']['vfs_default_account_size_type'];
-			}
-	/*
-			$file_space_array = explode ('-', $group_repository['file_space']);
-			$account_file_space_types = array ('gb', 'mb', 'kb', 'b');
-			while (list ($num, $type) = each ($account_file_space_types))
-			{
-				$account_file_space_select .= '<option value="'.$type.'"'.($type==$file_space_array[1]?' selected':'').'>'.strtoupper ($type).'</option>'."\n";
-			}
-			$p->set_var ('lang_file_space', lang('File space'));
-			$p->set_var ('account_file_space', '<input type=text name="account_file_space_number" value="'.trim($file_space_array[0]).'" size="7">');
-			$p->set_var ('account_file_space_select','<select name="account_file_space_type">'."\n".$account_file_space_select.'</select>'."\n");
-	*/
-
-			reset($GLOBALS['phpgw_info']['apps']);
-			$sorted_apps = $GLOBALS['phpgw_info']['apps'];
-			@asort($sorted_apps);
-			@reset($sorted_apps);
-			while ($permission = each($sorted_apps))
-			{
-				if ($permission[1]['enabled'] && $permission[1]['status'] != 3)
-				{
-					$perm_display[] = array
-					(
-						$permission[0],
-						$permission[1]['title']
-					);
-				}
-			}
-
-			/*$perm_html = '<td>'.lang('Application').'</td><td>&nbsp;</td><td>'.lang('ACL').'</td>';
-			$perm_html = '<tr class="th">'.$perm_html.$perm_html."</tr>\n";*/
-
-			for ($i=0;$i < count($perm_display);$i++)
-			{
-				$app = $perm_display[$i][0];
-				/*$perm_html .= '<td width="40%">' . $perm_display[$i][1] . '</td>'
-					. '<td width="5%"><input type="checkbox" name="account_apps['
-					. $perm_display[$i][0] . ']" value="True"'.($group_info['account_apps'][$app]?' checked':'').'></td><td width="5%" align="center">'
-					. ($apps_with_acl[$app] && $group_info['account_id']?'<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$app.'&owner='.$group_info['account_id'])
-					. '" target="_blank"><img src="'.$GLOBALS['phpgw']->common->image('admin','dot').'" border="0" hspace="3" align="absmiddle" alt="'
-					. lang('Grant Access').'"></a>':'&nbsp;').'</td>'.($i & 1?'</tr>':'')."\n";*/
-
-				$app_list[] = array
-				(
-					'app_name'		=> $perm_display[$i][1],
-					'checkbox_name'	=> 'account_apps[' . $perm_display[$i][0] . ']',
-					'checked'		=> ($group_info['account_apps'][$app]?'checked':''),
-					'acl_url'		=> ($apps_with_acl[$app] && $account_id?$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$app.'&owner='.$account_id):''),
-					'acl_img'		=> $GLOBALS['phpgw']->common->image('admin','dot'),
-					'img_name'		=> lang('Grant Access')
-				);
-			}
-
-			/*if($i & 1)
-			{
-				$perm_html .= '<td colspan="4">&nbsp;</td></tr>';
-			}*/
-
-			$link_data = array
-			(
-				'menuaction'	=> 'admin.uiaccounts.edit_group',
-				'account_id'	=> $account_id
-			);
-
-			$data = array
-			(
-				'msgbox_data'			=> $error_list,
-				'edit_url'				=> $GLOBALS['phpgw']->link('/index.php',$link_data),
-				'account_id'			=> $group_info['account_id'],
-				'lang_account_name'		=> lang('group name'),
-				'value_account_name'	=> $group_info['account_name'],
-				'lang_include_user'		=> lang('select users for inclusion'),
-				'select_size'			=> ($account_num < 5?$account_num:5),
-				'user_list'				=> $user_list,
-				'lang_permissions'		=> lang('permissions this group has'),
-				'lang_application'		=> lang('application'),
-				'lang_acl'				=> lang('acl'),
-				'lang_cancel'			=> lang('cancel'),
-				'lang_save'				=> lang('save'),
-				'app_list'				=> $app_list,
-				'account_id'			=> $account_id
-			);
-
-			/* create the menu on the left, if needed
-			$p->set_var('rows',ExecMethod('admin.uimenuclass.createHTMLCode','group_manager')); */
-
-			$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('group_edit' => $data));
 		}
 
-		function edit_user()
+		function edit_view_user_hook()
 		{
-			$cd						= get_var('cd',array('GET'));
-			$account_id				= get_var('account_id',array('GET','POST'));
-			$values					= get_var('values',array('POST'));
-			$account_groups			= get_var('account_groups',array('POST'));
-			$account_permissions	= get_var('account_permissions',array('POST'));
-
-			if ($values['cancel'] || (!$account_id && $GLOBALS['phpgw']->acl->check('account_access',4,'admin')) || ($account_id && $GLOBALS['phpgw']->acl->check('account_access',16,'admin')))
+			if (!$GLOBALS['phpgw']->acl->check('current_sessions_access',1,'admin'))	// no rights to view
 			{
-				$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_users');
+				$GLOBALS['menuData'][] = array(
+					'description' => 'Login History',
+					'url'         => '/index.php',
+					'extradata'   => 'menuaction=admin.uiaccess_history.list_history'
+				);
+			}
+			// not sure if this realy belongs here, or only in edit_user
+			if ($_GET['account_id'] && 	// can't set it on add
+			    !$GLOBALS['phpgw']->acl->check('account_access',64,'admin'))	// no rights to set ACL-rights
+			{
+				$GLOBALS['menuData'][] = array(
+					'description' => 'ACL Rights',
+					'url'         => '/index.php',
+					'extradata'   => 'menuaction=admin.uiaclmanager.list_apps'
+				);
+			}
+		}
+
+		function edit_user($cd='',$account_id='')
+		{
+			if ($GLOBALS['phpgw']->acl->check('account_access',16,'admin'))
+			{
+				$this->list_users();
+				return False;
 			}
 
-			/*$cdid = $cd;
+			$cdid = $cd;
 			settype($cd,'integer');
 			$cd = ($_GET['cd']?$_GET['cd']:intval($cdid));
 
 			$accountid = $account_id;
 			settype($account_id,'integer');
-			$account_id = ($_GET['account_id']?$_GET['account_id']:intval($accountid));*/
+			$account_id = intval($_GET['account_id'] ? $_GET['account_id'] : $accountid);
 			
-			if ($values['save'])
+			// todo
+			// not needed if i use the same file for new users too
+			if (! $account_id)
 			{
-				if (is_array($account_groups))
-				{
-					$values['account_groups'] = $account_groups;
-				}
-
-				if (is_array($account_permissions))
-				{
-					$values['account_permissions'] = $account_permissions;
-				}
-
-				$error = $this->bo->validate_user($values);
-
-				if (is_array($error))
-				{
-					$error_list = $GLOBALS['phpgw']->common->error_list($error);
-				}
-				else
-				{
-					if ($account_id)
-					{
-						$values['account_id'] = $account_id;
-					}
-					$this->bo->save_user($values);
-					$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_users');
-				}
-			}
-
-			$sbox = createobject('phpgwapi.sbox');
-
-			if ($GLOBALS['phpgw_info']['server']['ldap_extra_attributes'] && ($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap'))
-			{
-			}
-
-			print_debug('Type : '.gettype($_userData).'<br>_userData(size) = "'.$_userData.'"('.strlen($_userData).')');
-
-			$GLOBALS['phpgw']->xslttpl->add_file(array('app_data','users'));
-			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('administration') . ': ' . ($account_id?lang('edit user account'):lang('add user account'));
-
-			if ($account_id)
-			{
-				$user_info = Array
-				(
-					'account_name' => $GLOBALS['phpgw']->accounts->id2name($account_id),
-					'account_user' => $this->bo->load_group_users($account_id),
-					'account_apps' => $this->bo->load_group_apps($account_id)
-				);
-			}
-
-			if($account_id)
-			{
-				$account = CreateObject('phpgwapi.accounts',intval($account_id),'u');
-				$userData = $account->read_repository();
-				$userGroups = $account->membership($account_id);
+				$this->list_users();
+				return False;
 			}
 			else
 			{
-				$account = CreateObject('phpgwapi.accounts');
-				$userData = Array();
-				$userData['status'] = 'A';
-				$userGroups = Array();
+				$this->create_edit_user($account_id);
 			}
-			$allGroups = $account->get_list('groups');
-
-			if ($userData['expires'] == -1)
-			{
-				$userData['account_expires_month'] = 0;
-				$userData['account_expires_day']   = 0;
-				$userData['account_expires_year']  = 0;
-			}
-			else
-			{
-				/* Change this to be an admin/setup setting.  For now, default to expire one week from today. */
-				$time_var = time() + (60*60*24*7);
-				$userData['account_expires_month'] = date('m',$userData['expires'] > 0 ? $userData['expires'] : $time_var);
-				$userData['account_expires_day']   = date('d',$userData['expires'] > 0 ? $userData['expires'] : $time_var);
-				$userData['account_expires_year']  = date('Y',$userData['expires'] > 0 ? $userData['expires'] : $time_var);
-			}
-
-			if ($GLOBALS['phpgw_info']['server']['ldap_extra_attributes'])
-			{
-				$lang_homedir	= lang('home directory');
-				$lang_shell		= lang('login shell');
-				$homedirectory = '<input name="homedirectory" value="'
-					. ($account_id?$userData['homedirectory']:$GLOBALS['phpgw_info']['server']['ldap_account_home'].SEP.$account_lid)
-					. '">';
-				$loginshell = '<input name="loginshell" value="'
-					. ($account_id?$userData['loginshell']:$GLOBALS['phpgw_info']['server']['ldap_account_shell'])
-					. '">';
-			}
-
-			$_y = $sbox->getyears('account_expires_year',$userData['account_expires_year'],date('Y'),date('Y')+10);
-			$_m = $sbox->getmonthtext('account_expires_month',$userData['account_expires_month']);
-			$_d = $sbox->getdays('account_expires_day',$userData['account_expires_day']);
-
-		/*	$account_file_space = '';
-			if (!$userData['file_space'])
-			{
-				$userData['file_space'] = $GLOBALS['phpgw_info']['server']['vfs_default_account_size_number'] . "-" . $GLOBALS['phpgw_info']['server']['vfs_default_account_size_type'];
-			}
-			$file_space_array = explode ('-', $userData['file_space']);
-			$account_file_space_number = $file_space_array[0];
-			$account_file_space_type = $file_space_array[1];
-			$account_file_space_type_selected[$account_file_space_type] = ' selected';
-
-			$account_file_space = '<input type=text name="account_file_space_number" value="' . trim($account_file_space_number) . '" size="7">';
-			$account_file_space_select ='<select name="account_file_space_type">';
-			$account_file_space_types = array ('gb', 'mb', 'kb', 'b');
-			while (list ($num, $type) = each ($account_file_space_types))
-			{
-				$account_file_space_select .= '<option value="'.$type.'"' . $account_file_space_type_selected[$type] . '>' . strtoupper ($type) . '</option>';
-			}
-			$account_file_space_select .= '</select>';
-
-			$var = Array(
-				'lang_file_space'    => 'File space',
-				'account_file_space' => $account_file_space,
-				'account_file_space_select' => $account_file_space_select
-			);
-			$t->set_var($var);
-		*/
-
-			reset($allGroups);
-			while (list($key,$value) = each($allGroups)) 
-			{
-				$group_list[] = array
-				(
-					'account_id'		=> $value['account_id'],
-					'account_lid'		=> $value['account_lid']
-				);
-			}
-
-			for ($i=0;$i<count($userGroups);$i++)
-			{
-				for($j=0;$j<count($group_list);$j++)
-				{
-					if ($userGroups[$i]['account_id'] == $group_list[$j]['account_id'])
-					{
-						$group_list[$j]['selected'] = 'yes';
-					}
-				}
-			}
-
-			/* create list of available apps */
-			$i = 0;
-			$apps = CreateObject('phpgwapi.applications',$account_id);
-			$db_perms = $apps->read_account_specific();
-
-			@reset($GLOBALS['phpgw_info']['apps']);
-			$availableApps = $GLOBALS['phpgw_info']['apps'];
-			@asort($availableApps);
-			@reset($availableApps);
-			while (list($key,$application) = each($availableApps)) 
-			{
-				if ($application['enabled'] && $application['status'] != 3) 
-				{
-					$perm_display[$i]['appName']        = $key;
-					$perm_display[$i]['translatedName'] = $application['title'];
-					$i++;
-				}
-			}
-
-			/* create apps output */
-			$appRightsOutput = '';
-//			@reset($perm_display);
-			for ($i=0;$i<count($perm_display);$i++) 
-			{
-				$app_list[] = array
-				(
-					'app_title'		=> $perm_display[$i]['translatedName'],
-					'checkbox_name'	=> 'account_permissions[' . $perm_display[$i]['appName'] . ']',
-					'checked'		=> ($userData['account_permissions'][$perm_display[$i]['appName']] || $db_perms[$perm_display[$i]['appName']]?'yes':'')
-				);
-			}
-
-			$page_params['menuaction'] = 'admin.uiaccounts.edit_user';
-			if($account_id)
-			{
-				$page_params['account_id']  = $account_id;
-				$page_params['old_loginid'] = rawurlencode($userData['account_lid']);
-			}
-
-			$data = array
-			(
-				'msgbox_data'			=> $error_list,
-				'edit_url'				=> $GLOBALS['phpgw']->link('/index.php',$page_params),
-				'lang_lid'				=> lang('loginid'),
-				'lang_account_active'	=> lang('account active'),
-				'lang_password'			=> lang('password'),
-				'lang_reenter_password'	=> lang('Re-Enter Password'),
-				'lang_lastname'			=> lang('lastname'),
-				'lang_groups'			=> lang('groups'),
-				'lang_expires'			=> lang('expires'),
-				'lang_firstname'		=> lang('firstname'),
-				'lang_applications'		=> lang('applications'),
-				'lang_save'				=> lang('save'),
-				'lang_cancel'			=> lang('cancel'),
-				'select_expires'		=> $GLOBALS['phpgw']->common->dateformatorder($_y,$_m,$_d,True),
-				'lang_never'			=> lang('Never'),
-				'account_lid'			=> $userData['account_lid'],
-				'lang_homedir'			=> $lang_homedir,
-				'lang_shell'			=> $lang_shell,
-				'homedirectory'			=> $homedirectory,
-				'loginshell'			=> $loginshell,
-				'account_status'		=> ($userData['status']?'yes':''),
-				'account_firstname'		=> $userData['firstname'],
-				'account_lastname'		=> $userData['lastname'],
-				'account_passwd'		=> $account_passwd,
-				'account_passwd_2'		=> $account_passwd_2,
-				'expires_never'			=> (($userData['expires'] == -1)?'yes':''),
-				'group_list'			=> $group_list,
-				'app_list'				=> $app_list
-			);
-
-			/* create the menu on the left, if needed
-			$menuClass = CreateObject('admin.uimenuclass');
-			This is now using ExecMethod()
-			$t->set_var('rows',ExecMethod('admin.uimenuclass.createHTMLCode','edit_user')); */
-			$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('account_edit' => $data));
 		}
 
 		function view_user()
@@ -734,13 +593,16 @@
 			$t->set_block('account','link_row');
 
 			$var = Array(
+				'th_bg'        => $GLOBALS['phpgw_info']['theme']['th_bg'],
+				'tr_color1'    => $GLOBALS['phpgw_info']['theme']['row_on'],
+				'tr_color2'    => $GLOBALS['phpgw_info']['theme']['row_off'],
 				'lang_action'  => lang('View user account'),
 				'lang_loginid' => lang('LoginID'),
 				'lang_account_active'   => lang('Account active'),
-				'lang_password'         => lang('Password'),
-				'lang_reenter_password' => lang('Re-Enter Password'),
 				'lang_lastname'      => lang('Last Name'),
 				'lang_groups'        => lang('Groups'),
+				'lang_anonymous'     => lang('Anonymous user (not shown in list sessions)'),
+				'lang_changepassword'=> lang('Can change password'),
 				'lang_firstname'     => lang('First Name'),
 				'lang_lastlogin'     => lang('Last login'),
 				'lang_lastloginfrom' => lang('Last login from'),
@@ -756,6 +618,11 @@
 			$var['account_firstname'] = $userData['firstname'];
 			$var['account_lastname']  = $userData['lastname'];
 
+			$acl = CreateObject('phpgwapi.acl',intval($_GET['account_id']));
+			$var['anonymous']         = $acl->check('anonymous',1,'phpgwapi') ? '&nbsp;&nbsp;X' : '&nbsp;';
+			$var['changepassword']    = $acl->check('changepassword',0xFFFF,'preferences') ? '&nbsp;&nbsp;X' : '&nbsp;';
+			unset($acl);
+
 			if ($userData['status'])
 			{
 				$var['account_status'] = lang('Enabled');
@@ -807,7 +674,7 @@
 				{
 					$group_names[] = $group['account_name'];
 				}
-				$var['groups_select'] = implode(',',$group_names);
+				$var['groups_select'] = implode(', ',$group_names);
 			}
 
 			$account_lastlogin      = $userData['account_lastlogin'];
@@ -820,12 +687,12 @@
 			$availableApps = $GLOBALS['phpgw_info']['apps'];
 			@asort($availableApps);
 			@reset($availableApps);
-			while ($application = each($availableApps)) 
+			foreach($availableApps as $app => $data) 
 			{
-				if ($application[1]['enabled'] && $application[1]['status'] != 2) 
+				if ($data['enabled'] && $data['status'] != 2) 
 				{
-					$perm_display[$i]['appName']        = $application[0];
-					$perm_display[$i]['translatedName'] = $application[1]['title'];
+					$perm_display[$i]['appName'] = $app;
+					$perm_display[$i]['title']   = $data['title'];
 					$i++;
 				}
 			}
@@ -836,25 +703,25 @@
 
 			@reset($db_perms);
 
-			for ($i=0;$i<=count($perm_display);$i++)
+			for ($i=0;$i<count($perm_display);$i++)
 			{
-				if ($perm_display[$i]['translatedName'])
+				if ($perm_display[$i]['title'])
 				{
-					$part1 = sprintf("<td>%s</td><td>%s</td>",lang($perm_display[$i]['translatedName']),($_userData['account_permissions'][$perm_display[$i]['appName']] || $db_perms[$perm_display[$i]['appName']]?'&nbsp;&nbsp;X':'&nbsp'));
+					$part1 = sprintf("<td>%s</td><td>%s</td>",$perm_display[$i]['title'],($_userData['account_permissions'][$perm_display[$i]['appName']] || $db_perms[$perm_display[$i]['appName']]?'&nbsp;&nbsp;X':'&nbsp'));
 				}
 
 				$i++;
 
-				if ($perm_display[$i]['translatedName'])
+				if ($perm_display[$i]['title'])
 				{
-					$part2 = sprintf("<td>%s</td><td>%s</td>",lang($perm_display[$i]['translatedName']),($_userData['account_permissions'][$perm_display[$i]['appName']] || $db_perms[$perm_display[$i]['appName']]?'&nbsp;&nbsp;X':'&nbsp'));
+					$part2 = sprintf("<td>%s</td><td>%s</td>",$perm_display[$i]['title'],($_userData['account_permissions'][$perm_display[$i]['appName']] || $db_perms[$perm_display[$i]['appName']]?'&nbsp;&nbsp;X':'&nbsp'));
 				}
 				else
 				{
 					$part2 = '<td colspan="2">&nbsp;</td>';
 				}
 
-				$appRightsOutput .= "<tr class=\"row_on\">$part1$part2</tr>\n";
+				$appRightsOutput .= sprintf("<tr bgcolor=\"%s\">$part1$part2</tr>\n",$GLOBALS['phpgw_info']['theme']['row_on']);
 			}
 
 			$var['permissions_list'] = $appRightsOutput;
@@ -867,101 +734,6 @@
 			$t->pfp('out','form');
 		}
 
-		function delete_group()
-		{
-			$account_id = get_var('account_id',array('POST','GET'));
-
-			if ($_POST['cancel'] || $GLOBALS['phpgw']->acl->check('group_access',32,'admin'))
-			{
-				$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_groups');
-			}
-
-			if ($account_id && $_POST['delete'])
-			{
-				$this->bo->delete_group($account_id);
-				$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_groups');
-			}
-
-			$GLOBALS['phpgw']->xslttpl->add_file(array('app_data',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 'app_delete'));
-			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('administration') . ': ' . lang('delete group');
-
-			$data = array
-			(
-				'delete_url'				=> $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.delete_group&account_id=' . $account_id),
-				'lang_delete'				=> lang('delete'),
-				'lang_cancel'				=> lang('cancel'),
-				'lang_delete_statustext'	=> lang('delete the group'),
-				'lang_cancel_statustext'	=> lang('Leave the group untouched and return back to the list'),
-				'lang_delete_msg'			=> lang('are you sure you want to delete this group ?')
-			);
-
-			$old_group_list = $GLOBALS['phpgw']->acl->get_ids_for_location(intval($account_id),1,'phpgw_group');
-
-			if($old_group_list)
-			{
-				$group_name = $GLOBALS['phpgw']->accounts->id2name($account_id);
-
-				$user_list = '';
-				while (list(,$id) = each($old_group_list))
-				{
-					$data['user_list'][] = array
-					(
-						'user_url'					=> $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.edit_user&account_id=' . $id),
-						'user_name'					=> $GLOBALS['phpgw']->common->grab_owner_name($id),
-						'lang_user_url_statustext'	=> lang('edit user')
-					);
-				}
-
-				$data['lang_confirm_msg']			= lang('the users bellow are still members of group %1',$group_name) . '. '
-													. lang('they must be removed before you can continue');
-				$data['lang_remove_user']			= lang('Remove all users from this group ?');
-			}
-
-			$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
-		}
-
-		function delete_user()
-		{
-			if ($GLOBALS['phpgw']->acl->check('account_access',32,'admin') || $GLOBALS['phpgw_info']['user']['account_id'] == $_GET['account_id'])
-			{
-				$this->list_users();
-				return False;
-			}
-			
-			unset($GLOBALS['phpgw_info']['flags']['noheader']);
-			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-			$GLOBALS['phpgw']->common->phpgw_header();
-
-			$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
-			$t->set_file(
-				Array(
-					'form' => 'delete_account.tpl'
-				)
-			);
-			$var = Array(
-				'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.boaccounts.delete_user'),
-				'account_id'  => $_GET['account_id']
-			);
-
-			// the account can have special chars/white spaces, if it is a ldap dn
-			$account_id = rawurlencode($_GET['account_id']);
-
-			// Find out who the new owner is of the deleted users records...
-			$users = $GLOBALS['phpgw']->accounts->get_list('accounts');
-			$c_users = count($users);
-			$str = '';
-			for($i=0;$i<$c_users;$i++)
-			{
-				$str .= '<option value='.$users[$i]['account_id'].'>'.$GLOBALS['phpgw']->common->display_fullname($users[$i]['account_lid'],$users[$i]['account_firstname'],$users[$i]['account_lastname']).'</option>'."\n";
-			}
-			$var['lang_new_owner'] = lang('Who would you like to transfer ALL records owned by the deleted user to?');
-			$var['new_owner_select'] = '<select name="new_owner" size="5">'."\n".'<option value=0 selected>'.lang('Delete All Records').'</option>'."\n".$str.'</select>'."\n";
-			$var['cancel'] = lang('cancel');
-			$var['delete'] = lang('delete');
-			$t->set_var($var);
-			$t->pparse('out','form');
-		}
-
 		function group_manager($cd='',$account_id='')
 		{
 			if ($GLOBALS['phpgw']->acl->check('group_access',16,'admin'))
@@ -997,6 +769,412 @@
 			}
 		}
 
+		function accounts_popup()
+		{
+			$GLOBALS['phpgw']->accounts->accounts_popup('admin');
+		}
+
+		function create_edit_group($group_info,$_errors='')
+		{
+			// Maybe we should list this in setup/setup.inc.php and put it into the
+			// phpgw_applications table ? (jengo)
+			$apps_with_acl = array(
+				'addressbook' => True,
+				'todo'        => True,
+				'calendar'    => True,
+				'notes'       => True,
+				'projects'    => True,
+				'phonelog'    => True,
+				'infolog'     => True,
+				'filemanager' => True,
+				'tts'         => True,
+				'bookmarks'   => True,
+				'img'         => True,
+				'netsaint'    => True,
+				'inv'         => True
+			);
+
+			$sbox = createobject('phpgwapi.sbox');
+
+			unset($GLOBALS['phpgw_info']['flags']['noheader']);
+			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
+			$GLOBALS['phpgw']->common->phpgw_header();
+
+			$p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+			$p->set_file(Array('edit' => 'group_form.tpl'));
+			$p->set_block('edit','select');
+			$p->set_block('edit','popwin');
+
+			$accounts = CreateObject('phpgwapi.accounts',$group_info['account_id'],'u');
+
+			if ($GLOBALS['phpgw_info']['user']['preferences']['common']['account_selection'] == 'popup')
+			{
+				$p->set_var('accounts_link',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.accounts_popup'));
+				$p->set_var('lang_open_popup',lang('open popup window'));
+
+				while(is_array($group_info['account_user']) && list($ac_id,) = each($group_info['account_user']))
+				{
+					$ac_name = $GLOBALS['phpgw']->accounts->get_account_data($ac_id);
+
+					$user_list .= '<option value="' . $ac_id . '" selected>'
+								. $GLOBALS['phpgw']->common->display_fullname($ac_name[$ac_id]['lid'],$ac_name[$ac_id]['firstname'],$ac_name[$ac_id]['lastname'])
+								. '</option>'."\n";
+				}
+				$account_num = count($group_info['account_user']);
+				$p->set_var('select_size',($account_num < 25?$account_num:25));
+				$p->set_var('user_list',$user_list);
+				$p->fp('accounts','popwin',True);
+			}
+			else
+			{
+				$account_list = $accounts->get_list('accounts');
+				$account_num = count($account_list);
+
+				$user_list = '';
+				while (list($key,$entry) = each($account_list))
+				{
+					$user_list .= '<option value="' . $entry['account_id'] . '"'
+					. $group_info['account_user'][intval($entry['account_id'])] . '>'
+					. $GLOBALS['phpgw']->common->display_fullname(
+						$entry['account_lid'],
+						$entry['account_firstname'],
+						$entry['account_lastname'])
+					. '</option>'."\n";
+				}
+				$p->set_var('select_size',($account_num < 7?$account_num:7));
+				$p->set_var('user_list',$user_list);
+				$p->fp('accounts','select',True);
+			}
+
+			$var = Array(
+				'form_action'       => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.boaccounts.'.($group_info['account_id']?'edit':'add').'_group'),
+				'hidden_vars'       => '<input type="hidden" name="account_id" value="' . $group_info['account_id'] . '">',
+				'lang_group_name'   => lang('group name'),
+				'group_name_value'  => $group_info['account_name'],
+				'lang_include_user' => lang('Select users for inclusion'),
+				'error'             => (!$_errors?'':'<center>'.$GLOBALS['phpgw']->common->error_list($_errors).'</center>'),
+				'lang_permissions'  => lang('Permissions this group has')
+			);
+			$p->set_var($var);
+
+			$group_repository = $accounts->read_repository();
+			if (!$group_repository['file_space'])
+			{
+				$group_repository['file_space'] = $GLOBALS['phpgw_info']['server']['vfs_default_account_size_number'] . "-" . $GLOBALS['phpgw_info']['server']['vfs_default_account_size_type'];
+			}
+	/*
+			$file_space_array = explode ('-', $group_repository['file_space']);
+			$account_file_space_types = array ('gb', 'mb', 'kb', 'b');
+			while (list ($num, $type) = each ($account_file_space_types))
+			{
+				$account_file_space_select .= '<option value="'.$type.'"'.($type==$file_space_array[1]?' selected':'').'>'.strtoupper ($type).'</option>'."\n";
+			}
+			$p->set_var ('lang_file_space', lang('File space'));
+			$p->set_var ('account_file_space', '<input type=text name="account_file_space_number" value="'.trim($file_space_array[0]).'" size="7">');
+			$p->set_var ('account_file_space_select','<select name="account_file_space_type">'."\n".$account_file_space_select.'</select>'."\n");
+	*/
+
+			reset($GLOBALS['phpgw_info']['apps']);
+			$sorted_apps = $GLOBALS['phpgw_info']['apps'];
+			@asort($sorted_apps);
+			@reset($sorted_apps);
+			while ($permission = each($sorted_apps))
+			{
+				if ($permission[1]['enabled'] && $permission[1]['status'] != 3)
+				{
+					$perm_display[] = Array(
+						$permission[0],
+						$permission[1]['title']
+					);
+				}
+			}
+
+			$perm_html = '<td>'.lang('Application').'</td><td>&nbsp;</td><td>'.lang('ACL').'</td>';
+			$perm_html = '<tr bgcolor="'.$GLOBALS['phpgw_info']['theme']['th_bg'].'">'.
+				$perm_html.$perm_html."</tr>\n";
+			
+			$tr_color = $GLOBALS['phpgw_info']['theme']['row_off'];
+			for ($i=0;$i < count($perm_display);$i++)
+			{
+				$app = $perm_display[$i][0];
+				if(!($i & 1))
+				{
+					$tr_color = $this->nextmatchs->alternate_row_color();
+					$perm_html .= '<tr bgcolor="'.$tr_color.'">';
+				}
+				$perm_html .= '<td width="40%">' . $perm_display[$i][1] . '</td>'
+					. '<td width="5%"><input type="checkbox" name="account_apps['
+					. $perm_display[$i][0] . ']" value="True"'.($group_info['account_apps'][$app]?' checked':'').'></td><td width="5%" align="center">'
+					. ($apps_with_acl[$app] && $group_info['account_id']?'<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$app.'&owner='.$group_info['account_id'])
+					. '" target="_blank"><img src="'.$GLOBALS['phpgw']->common->image('admin','dot').'" border="0" hspace="3" align="absmiddle" alt="'
+					. lang('Grant Access').'"></a>':'&nbsp;').'</td>'.($i & 1?'</tr>':'')."\n";
+			}
+			if($i & 1)
+			{
+				$perm_html .= '<td colspan="4">&nbsp;</td></tr>';
+			}
+
+			$var = Array(
+				'permissions_list'   => $perm_html,
+				'lang_submit_button' => lang('submit changes')
+			);
+			$p->set_var($var);
+
+			// create the menu on the left, if needed
+			$p->set_var('rows',ExecMethod('admin.uimenuclass.createHTMLCode','group_manager'));
+
+			$p->set_var('select','');
+			$p->set_var('popwin','');
+			$p->pfp('out','edit');
+
+		}
+
+		function create_edit_user($_account_id,$_userData='',$_errors='')
+		{
+			$sbox = createobject('phpgwapi.sbox');
+			$jscal = CreateObject('phpgwapi.jscalendar');
+
+			unset($GLOBALS['phpgw_info']['flags']['noheader']);
+			unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
+			$GLOBALS['phpgw']->common->phpgw_header();
+
+			$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+			$t->set_unknowns('remove');
+
+			if ($GLOBALS['phpgw_info']['server']['ldap_extra_attributes'] && ($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap'))
+			{
+				$t->set_file(array('account' => 'account_form_ldap.tpl'));
+			}
+			else
+			{
+				$t->set_file(array('account' => 'account_form.tpl'));
+			}
+			$t->set_block('account','form','form');
+			$t->set_block('account','form_passwordinfo','form_passwordinfo');
+			$t->set_block('account','form_buttons_','form_buttons_');
+			$t->set_block('account','link_row','link_row');
+
+			print_debug('Type : '.gettype($_userData).'<br>_userData(size) = "'.$_userData.'"('.strlen($_userData).')');
+			if (is_array($_userData))
+			{
+				$userData = Array();
+				$userData=$_userData;
+				@reset($userData['account_groups']);
+				while (list($key, $value) = @each($userData['account_groups']))
+				{
+					$userGroups[$key]['account_id'] = $value;
+				}
+
+				$account = CreateObject('phpgwapi.accounts');
+				$allGroups = $account->get_list('groups');
+			}
+			elseif(is_string($_userData) && $_userData=='')
+			{
+				if($_account_id)
+				{
+					$account = CreateObject('phpgwapi.accounts',intval($_account_id),'u');
+					$userData = $account->read_repository();
+					$userGroups = $account->membership($_account_id);
+					$acl = CreateObject('phpgwapi.acl',$_account_id);
+					$acl->read_repository();
+					$userData['anonymous'] = $acl->check('anonymous',1,'phpgwapi');
+					$userData['changepassword'] = $acl->check('changepassword',0xFFFF,'preferences');
+					unset($acl);
+				}
+				else
+				{
+					$account = CreateObject('phpgwapi.accounts');
+					$userData = Array();
+					$userData['status'] = 'A';
+					$userGroups = Array();
+					$userData['anonymous'] = False;
+					$userData['changepassword'] = True;
+				}
+				$allGroups = $account->get_list('groups');
+			}
+			$page_params['menuaction'] = 'admin.boaccounts.'.($_account_id?'edit':'add').'_user';
+			if($_account_id)
+			{
+				$page_params['account_id']  = $_account_id;
+				$page_params['old_loginid'] = rawurlencode($userData['account_lid']);
+			}
+
+			$var = Array(
+				'form_action'    => $GLOBALS['phpgw']->link('/index.php',$page_params),
+				'error_messages' => (!$_errors?'':'<center>'.$GLOBALS['phpgw']->common->error_list($_errors).'</center>'),
+				'th_bg'          => $GLOBALS['phpgw_info']['theme']['th_bg'],
+				'tr_color1'      => $GLOBALS['phpgw_info']['theme']['row_on'],
+				'tr_color2'      => $GLOBALS['phpgw_info']['theme']['row_off'],
+				'lang_action'    => ($_account_id?lang('Edit user account'):lang('Add new account')),
+				'lang_loginid'   => lang('LoginID'),
+				'lang_account_active' => lang('Account active'),
+				'lang_password'  => lang('Password'),
+				'lang_reenter_password' => lang('Re-Enter Password'),
+				'lang_lastname'  => lang('Last Name'),
+				'lang_groups'    => lang('Groups'),
+				'lang_expires'   => lang('Expires'),
+				'lang_firstname' => lang('First Name'),
+				'lang_anonymous' => lang('Anonymous User (not shown in list sessions)'),
+				'lang_changepassword' => lang('Can change password'),
+				'lang_button'    => ($_account_id?lang('Save'):lang('Add'))
+			/* 'lang_file_space' => lang('File Space') */
+			);
+			$t->set_var($var);
+			$t->parse('form_buttons','form_buttons_',True);
+
+			if ($GLOBALS['phpgw_info']['server']['ldap_extra_attributes']) {
+				$lang_homedir = lang('home directory');
+				$lang_shell = lang('login shell');
+				$homedirectory = '<input name="homedirectory" value="'
+					. ($_account_id?$userData['homedirectory']:$GLOBALS['phpgw_info']['server']['ldap_account_home'].SEP.$account_lid)
+					. '">';
+				$loginshell = '<input name="loginshell" value="'
+					. ($_account_id?$userData['loginshell']:$GLOBALS['phpgw_info']['server']['ldap_account_shell'])
+					. '">';
+			}
+			else
+			{
+				$lang_homedir = '';
+				$lang_shell = '';
+				$homedirectory = '';
+				$loginshell = '';
+			}
+			$account_file_space = '';
+		/*
+			if (!$userData['file_space'])
+			{
+				$userData['file_space'] = $GLOBALS['phpgw_info']['server']['vfs_default_account_size_number'] . "-" . $GLOBALS['phpgw_info']['server']['vfs_default_account_size_type'];
+			}
+			$file_space_array = explode ('-', $userData['file_space']);
+			$account_file_space_number = $file_space_array[0];
+			$account_file_space_type = $file_space_array[1];
+			$account_file_space_type_selected[$account_file_space_type] = ' selected';
+
+			$account_file_space = '<input type=text name="account_file_space_number" value="' . trim($account_file_space_number) . '" size="7">';
+			$account_file_space_select ='<select name="account_file_space_type">';
+			$account_file_space_types = array ('gb', 'mb', 'kb', 'b');
+			while (list ($num, $type) = each ($account_file_space_types))
+			{
+				$account_file_space_select .= '<option value="'.$type.'"' . $account_file_space_type_selected[$type] . '>' . strtoupper ($type) . '</option>';
+			}
+			$account_file_space_select .= '</select>';
+
+			$var = Array(
+				'lang_file_space'    => 'File space',
+				'account_file_space' => $account_file_space,
+				'account_file_space_select' => $account_file_space_select
+			);
+			$t->set_var($var);
+		*/
+			$var = Array(
+				'input_expires' => $jscal->input('expires',$userData['expires']<0?'':($userData['expires']?$userData['expires']:time()+(60*60*24*7))),
+				'lang_never'    => lang('Never'),
+				'account_lid'   => '<input name="account_lid" value="' . $userData['account_lid'] . '">',
+				'lang_homedir'  => $lang_homedir,
+				'lang_shell'    => $lang_shell,
+				'homedirectory' => $homedirectory,
+				'loginshell'    => $loginshell,
+				'anonymous'     => '<input type="checkbox" name="anonymous" value="1"'.($userData['anonymous'] ? ' checked' : '').'>',
+				'changepassword'=> '<input type="checkbox" name="changepassword" value="1"'.($userData['changepassword'] ? ' checked' : '').'>',
+				'account_status'    => '<input type="checkbox" name="account_status" value="A"'.($userData['status']?' checked':'').'>',
+				'account_firstname' => '<input name="account_firstname" value="' . $userData['firstname'] . '">',
+				'account_lastname'  => '<input name="account_lastname" value="' . $userData['lastname'] . '">',
+				'account_passwd'    => $account_passwd,
+				'account_passwd_2'  => $account_passwd_2,
+				'account_file_space' => $account_file_space
+			);
+
+			if($userData['expires'] == -1)
+			{
+				$var['never_expires'] = '<input type="checkbox" name="never_expires" value="True" checked>';
+			}
+			else
+			{
+				$var['never_expires'] = '<input type="checkbox" name="never_expires" value="True">';
+			}
+
+			$t->set_var($var);
+			$t->parse('password_fields','form_passwordinfo',True);
+
+//			$allAccounts;
+//			$userGroups;
+
+			$groups_select = '';
+			reset($allGroups);
+			while (list($key,$value) = each($allGroups)) 
+			{
+				$groups_select .= '<option value="' . $value['account_id'] . '"';
+				for ($i=0; $i<count($userGroups); $i++) 
+				{
+					/* print "Los1:".$userData["account_id"].$userGroups[$i]['account_id']." : ".$value['account_id']."<br>"; */
+					if (@$userGroups[$i]['account_id'] == $value['account_id']) 
+					{
+						$groups_select .= ' selected';
+					}
+				}
+				$groups_select .= '>' . $value['account_lid'] . '</option>'."\n";
+			}
+
+			/* create list of available apps */
+			$i = 0;
+
+			$apps = CreateObject('phpgwapi.applications',$_account_id);
+			$db_perms = $apps->read_account_specific();
+
+			@reset($GLOBALS['phpgw_info']['apps']);
+			$availableApps = $GLOBALS['phpgw_info']['apps'];
+			@asort($availableApps);
+			@reset($availableApps);
+			while (list($key,$application) = each($availableApps)) 
+			{
+				if ($application['enabled'] && $application['status'] != 3) 
+				{
+					$perm_display[$i]['appName']        = $key;
+					$perm_display[$i]['title'] = $application['title'];
+					$i++;
+				}
+			}
+
+			/* create apps output */
+			$appRightsOutput = '';
+//			@reset($perm_display);
+			for ($i=0;$i<=count($perm_display);$i++) 
+			{
+				$checked = ((($userData['account_permissions'][$perm_display[$i]['appName']] || $db_perms[$perm_display[$i]['appName']]) && $_account_id)?' checked':'');
+
+				if ($perm_display[$i]['title'])
+				{
+					$part[$i&1] = sprintf('<td>%s</td><td><input type="checkbox" name="account_permissions[%s]" value="True"%s></td>',
+						$perm_display[$i]['title'],
+						$perm_display[$i]['appName'],
+						$checked);
+				}
+				else
+				{
+					$part[1] = '<td colspan="2">&nbsp;</td>';
+				}
+
+				if ($i & 1)
+				{
+					$appRightsOutput .= sprintf('<tr bgcolor="%s">%s%s</tr>',$this->nextmatchs->alternate_row_color()/*$GLOBALS['phpgw_info']['theme']['row_on']*/, $part[0], $part[1]);
+				}
+			}
+
+			$var = Array(
+				'groups_select'    => '<select name="account_groups[]" multiple>'."\n".$groups_select.'</select>'."\n",
+				'permissions_list' => $appRightsOutput
+			);
+			$t->set_var($var);
+
+			// create the menu on the left, if needed
+//			$menuClass = CreateObject('admin.uimenuclass');
+			// This is now using ExecMethod()
+			$GLOBALS['account_id'] = $_account_id;
+			$t->set_var('rows',ExecMethod('admin.uimenuclass.createHTMLCode','edit_user'));
+
+			echo $t->fp('out','form');
+		}
+
 		function edit_group_managers($group_info,$_errors='')
 		{
 			if ($GLOBALS['phpgw']->acl->check('group_access',16,'admin'))
diff --git a/admin/inc/class.uiaclmanager.inc.php b/admin/inc/class.uiaclmanager.inc.php
index 4e6dfd2c2c..956dcd3628 100644
--- a/admin/inc/class.uiaclmanager.inc.php
+++ b/admin/inc/class.uiaclmanager.inc.php
@@ -23,12 +23,20 @@
 
 		function uiaclmanager()
 		{
+			$this->account_id = intval($_GET['account_id']);
+			if (!$this->account_id || $GLOBALS['phpgw']->acl->check('account_access',64,'admin'))
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
 			$this->template = createobject('phpgwapi.Template',PHPGW_APP_TPL);
 		}
 
 		function common_header()
 		{
+			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin') . ' - ' . lang('ACL Manager') .
+				': ' . $GLOBALS['phpgw']->common->grab_owner_name($this->account_id);
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 		}
 
 		function list_apps()
@@ -46,14 +54,12 @@
 			$this->template->set_block('app_list','link_row');
 			$this->template->set_block('app_list','spacer_row');
 
-			$this->template->set_var('lang_header',lang('ACL Manager'));
-
 			while (is_array($GLOBALS['acl_manager']) && list($app,$locations) = each($GLOBALS['acl_manager']))
 			{
 				$icon = $GLOBALS['phpgw']->common->image($app,array('navbar.gif',$app.'.gif'));
 				$this->template->set_var('icon_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']);
 				$this->template->set_var('link_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']);
-				$this->template->set_var('app_name',lang($GLOBALS['phpgw_info']['navbar'][$app]['title']));
+				$this->template->set_var('app_name',$GLOBALS['phpgw_info']['apps'][$app]['title']);
 				$this->template->set_var('a_name',$appname);
 				$this->template->set_var('app_icon',$icon);
 
@@ -68,83 +74,83 @@
 
 				while (is_array($locations) && list($loc,$value) = each($locations))
 				{
-					$total_rights = 0;
-					while (list($k,$v) = each($value['rights']))
-					{
-						$total_rights += $v;
-					}
-					reset($value['rights']);
+					$link_values = array(
+						'menuaction' => 'admin.uiaclmanager.access_form',
+						'location'   => urlencode($loc),
+						'acl_app'    => $app,
+						'account_id' => $this->account_id
+					);
 
-					// If all of there rights are denied, then they shouldn't even see the option
-					if ($total_rights != $GLOBALS['phpgw']->acl->get_rights($loc,$app))
-					{
-						$link_values = array(
-							'menuaction' => 'admin.uiaclmanager.access_form',
-							'location'   => urlencode(base64_encode($loc)),
-							'acl_app'    => $app,
-							'account_id' => $GLOBALS['account_id']
-						);
-
-						$this->template->set_var('link_location',$GLOBALS['phpgw']->link('/index.php',$link_values));
-						$this->template->set_var('lang_location',lang($value['name']));
-						$this->template->fp('rows','link_row',True);
-					}
+					$this->template->set_var('link_location',$GLOBALS['phpgw']->link('/index.php',$link_values));
+					$this->template->set_var('lang_location',lang($value['name']));
+					$this->template->fp('rows','link_row',True);
 				}
 
 				$this->template->parse('rows','spacer_row',True);
 			}
+			$this->template->set_var(array(
+				'cancel_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users'),
+				'lang_cancel'   => lang('Cancel')
+			));
 			$this->template->pfp('out','list');
 		}
 
 		function access_form()
 		{
-			$GLOBALS['phpgw']->hooks->single('acl_manager',$GLOBALS['acl_app']);
-			$location = base64_decode($GLOBALS['location']);
+			$location = $_GET['location'];
 
-			$acl_manager = $GLOBALS['acl_manager'][$GLOBALS['acl_app']][$location];
+			if ($_POST['submit'] || $_POST['cancel'])
+			{
+				if ($_POST['submit'])
+				{
+					$total_rights = 0;
+					while (is_array($_POST['acl_rights']) && list(,$rights) = each($_POST['acl_rights']))
+					{
+						$total_rights += $rights;
+					}
+					if ($total_rights)
+					{
+						$GLOBALS['phpgw']->acl->add_repository($_GET['acl_app'], $location, $this->account_id, $total_rights);
+					}
+					else	// we dont need to save 0 rights (= no restrictions)
+					{
+						$GLOBALS['phpgw']->acl->delete_repository($_GET['acl_app'], $location, $this->account_id);
+					}
+				}
+				$this->list_apps();
+				return;
+			}
+			$GLOBALS['phpgw']->hooks->single('acl_manager',$_GET['acl_app']);
+			$acl_manager = $GLOBALS['acl_manager'][$_GET['acl_app']][$location];
 
 			$this->common_header();
 			$this->template->set_file('form','acl_manager_form.tpl');
 
-			$acc = createobject('phpgwapi.accounts',$GLOBALS['account_id']);
+			$acc = createobject('phpgwapi.accounts',$this->account_id);
 			$acc->read_repository();
 			$afn = $GLOBALS['phpgw']->common->display_fullname($acc->data['account_lid'],$acc->data['firstname'],$acc->data['lastname']);
 
-			$this->template->set_var('lang_message',lang('Check items to <b>%1</b> to %2 for %3',$acl_manager['name'],$GLOBALS['acl_app'],$afn));
+			$this->template->set_var('lang_message',lang('Check items to <b>%1</b> to %2 for %3',lang($acl_manager['name']),$GLOBALS['phpgw_info']['apps'][$_GET['acl_app']]['title'],$afn));
 			$link_values = array(
-				'menuaction' => 'admin.boaclmanager.submit',
-				'acl_app'    => $GLOBALS['acl_app'],
-				'location'   => urlencode($GLOBALS['location']),
-				'account_id' => $GLOBALS['account_id']
+				'menuaction' => 'admin.uiaclmanager.access_form',
+				'acl_app'    => $_GET['acl_app'],
+				'location'   => urlencode($_GET['location']),
+				'account_id' => $this->account_id
 			);
 
-			$acl    = createobject('phpgwapi.acl',$GLOBALS['account_id']);
+			$acl    = createobject('phpgwapi.acl',$this->account_id);
 			$acl->read_repository();
+			$grants = $acl->get_rights($location,$_GET['acl_app']);
 
 			$this->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php',$link_values));
-			$this->template->set_var('lang_title',lang('ACL Manager'));
 
 			$total = 0;
 			while (list($name,$value) = each($acl_manager['rights']))
 			{
-				$grants = $acl->get_rights($location,$GLOBALS['acl_app']);
-
-				if (! $GLOBALS['phpgw']->acl->check($location,$value,$GLOBALS['acl_app']))
-				{
-					$s .= '<option value="' . $value . '"';
-					$s .= (($grants & $value)?' selected':'');
-					$s .= '>' . lang($name) . '</option>';
-					$total++;
-				}
+				$cb .= '<input type="checkbox" name="acl_rights[]" value="'.$value.'"'.($grants & $value ? ' checked' : '').'>&nbsp;'.lang($name)."<br>\n";
 			}
-
-			$size = 7;
-			if ($total < 7)
-			{
-				$size = $total;
-			}
-			$this->template->set_var('select_values','<select name="acl_rights[]" multiple size="' . $size . '">' . $s . '</select>');
-			$this->template->set_var('lang_submit',lang('Submit'));
+			$this->template->set_var('select_values',$cb);
+			$this->template->set_var('lang_submit',lang('Save'));
 			$this->template->set_var('lang_cancel',lang('Cancel'));
 
 			$this->template->pfp('out','form');
diff --git a/admin/inc/class.uiapplications.inc.php b/admin/inc/class.uiapplications.inc.php
index b7eecaec35..240b4541c4 100644
--- a/admin/inc/class.uiapplications.inc.php
+++ b/admin/inc/class.uiapplications.inc.php
@@ -32,15 +32,26 @@
 
 		function get_list()
 		{
+			if ($GLOBALS['phpgw']->acl->check('applications_access',1,'admin'))
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
+			$can_add    = !$GLOBALS['phpgw']->acl->check('applications_access',2,'admin');
+			$can_edit   = !$GLOBALS['phpgw']->acl->check('applications_access',4,'admin');
+			$can_delete = !$GLOBALS['phpgw']->acl->check('applications_access',8,'admin');
+			
+			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Installed applications');
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
 			$GLOBALS['phpgw']->template->set_file(array('applications' => 'applications.tpl'));
 			$GLOBALS['phpgw']->template->set_block('applications','list','list');
 			$GLOBALS['phpgw']->template->set_block('applications','row','row');
-
-			$start = $GLOBALS['HTTP_POST_VARS']['start'];
-			$sort  = $GLOBALS['HTTP_GET_VARS']['sort'];
-			$order = $GLOBALS['HTTP_GET_VARS']['order'];
+			$GLOBALS['phpgw']->template->set_block('applications','add','add');
+			
+			$start = get_var('start',array('POST','GET'));
+			$sort  = $_GET['sort'];
+			$order = $_GET['order'];
 			$offset = $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
 
 			$apps = $this->bo->get_list();
@@ -91,7 +102,8 @@
 				$i++;
 			}
 
-			$GLOBALS['phpgw']->template->set_var('lang_installed',lang('Installed applications'));
+			$GLOBALS['phpgw']->template->set_var('bg_color',$GLOBALS['phpgw_info']['theme']['bg_color']);
+			$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
 
 			$GLOBALS['phpgw']->template->set_var('sort_title',$this->nextmatchs->show_sort_order($sort,'title','title','/index.php',lang('Title'),'&menuaction=admin.uiapplications.get_list'));
 			$GLOBALS['phpgw']->template->set_var('lang_showing',$this->nextmatchs->show_hits($total,$start));
@@ -106,29 +118,15 @@
 			$GLOBALS['phpgw']->template->set_var('lang_note',lang('(To install new applications use<br><a href="setup/" target="setup">Setup</a> [Manage Applications] !!!)'));
 			$GLOBALS['phpgw']->template->set_var('lang_add',lang('add'));
 
-			@reset($applications);
-			while (list($key,$app) = @each($applications))
+			foreach($applications as $app)
 			{
 				$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
 
-				if($app['title'])
-				{
-					$name = $app['title'];
-				}
-				elseif($app['name'])
-				{
-					$name = $app['name'];
-				}
-				else
-				{
-					$name = '&nbsp;';
-				}
-
 				$GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
-				$GLOBALS['phpgw']->template->set_var('name',$name);
+				$GLOBALS['phpgw']->template->set_var('name',$GLOBALS['phpgw_info']['apps'][$app['name']]['title']);
 
-				$GLOBALS['phpgw']->template->set_var('edit','<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.edit&app_name=' . urlencode($app['name'])) . '"> ' . lang('Edit') . ' </a>');
-				$GLOBALS['phpgw']->template->set_var('delete','<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.delete&app_name=' . urlencode($app['name'])) . '"> ' . lang('Delete') . ' </a>');
+				$GLOBALS['phpgw']->template->set_var('edit',$can_edit ? '<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.edit&app_name=' . urlencode($app['name'])) . '&start='.$start.'"> ' . lang('Edit') . ' </a>' : '&nbsp;');
+				$GLOBALS['phpgw']->template->set_var('delete',$can_delete ? '<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.delete&app_name=' . urlencode($app['name'])) . '&start='.$start.'"> ' . lang('Delete') . ' </a>' : '&nbsp;');
 
 				if ($app['status'])
 				{
@@ -142,6 +140,14 @@
 
 				$GLOBALS['phpgw']->template->parse('rows','row',True);
 			}
+			if ($can_add)
+			{
+				$GLOBALS['phpgw']->template->parse('addbutton','add');
+			}
+			else
+			{
+				$GLOBALS['phpgw']->template->set_var('addbutton','');
+			}
 
 			$GLOBALS['phpgw']->template->pparse('out','list');
 		}
@@ -156,18 +162,30 @@
 
 		function add()
 		{
+			if ($GLOBALS['phpgw']->acl->check('applications_access',2,'admin'))
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
+			$start = get_var('start',array('POST','GET'));
+	
 			$GLOBALS['phpgw']->template->set_file(array('application' => 'application_form.tpl'));
 			$GLOBALS['phpgw']->template->set_block('application','form','form');
 			$GLOBALS['phpgw']->template->set_block('application','row','row');
+			$GLOBALS['phpgw']->template->set_block('form','delete_button');
+			$GLOBALS['phpgw']->template->set_var('delete_button','');
 
-			if ($GLOBALS['HTTP_POST_VARS']['submit'])
+			if ($_POST['cancel'])
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiapplications.get_list&start='.$start);
+			}
+
+			if ($_POST['save'])
 			{
 				$totalerrors = 0;
 
-				$app_order    = $GLOBALS['HTTP_POST_VARS']['app_order'] ? $GLOBALS['HTTP_POST_VARS']['app_order'] : 0;
-				$n_app_name   = chop($GLOBALS['HTTP_POST_VARS']['n_app_name']);
-				$n_app_title  = chop($GLOBALS['HTTP_POST_VARS']['n_app_title']);
-				$n_app_status = $GLOBALS['HTTP_POST_VARS']['n_app_status'];
+				$app_order    = $_POST['app_order'] ? $_POST['app_order'] : 0;
+				$n_app_name   = chop($_POST['n_app_name']);
+				$n_app_status = $_POST['n_app_status'];
 
 				if ($this->bo->exists($n_app_name))
 				{
@@ -190,9 +208,8 @@
 						'app_order'    => $app_order
 					));
 
-					Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list'));
-					$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-					exit;
+					$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiapplications.get_list&start='.$start);
+					$GLOBALS['phpgw']->common->phpgw_exit();
 				}
 				else
 				{
@@ -204,11 +221,13 @@
 				$GLOBALS['phpgw']->template->set_var('error','');
 			}
 
+			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Add new application');
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
-			$GLOBALS['phpgw']->template->set_var('lang_header',lang('Add new application'));
+			$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
 
-			$GLOBALS['phpgw']->template->set_var('hidden_vars','');
+			$GLOBALS['phpgw']->template->set_var('hidden_vars','<input type="hidden" name="start" value="'.$start.'">');
 			$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.add'));
 
 			$this->display_row(lang('application name'),'<input name="n_app_name" value="' . $n_app_name . '">');
@@ -231,33 +250,48 @@
 
 			$this->display_row(lang('Select which location this app should appear on the navbar, lowest (left) to highest (right)'),'<input name="app_order" value="' . $app_order . '">');
 
-			$GLOBALS['phpgw']->template->set_var('lang_submit_button',lang('add'));
-			$GLOBALS['phpgw']->template->pparse('out','form');
+			$GLOBALS['phpgw']->template->set_var('lang_save_button',lang('Add'));
+			$GLOBALS['phpgw']->template->set_var('lang_cancel_button',lang('Cancel'));
+			$GLOBALS['phpgw']->template->pparse('phpgw_body','form');
 		}
 
 		function edit()
 		{
-			$app_name = $GLOBALS['HTTP_GET_VARS']['app_name'];
+			if ($GLOBALS['phpgw']->acl->check('applications_access',4,'admin'))
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
+			$app_name = get_var('app_name',array('POST','GET'));
+			$start = get_var('start',array('POST','GET'));
 
 			$GLOBALS['phpgw']->template->set_file(array('application' => 'application_form.tpl'));
 			$GLOBALS['phpgw']->template->set_block('application','form','form');
 			$GLOBALS['phpgw']->template->set_block('application','row','row');
 
-			if ($GLOBALS['HTTP_POST_VARS']['submit'])
+			if ($_POST['cancel'])
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiapplications.get_list&start='.$start);
+			}
+			
+			if ($_POST['delete'])
+			{
+				return $this->delete();
+			}
+
+			if ($_POST['save'])
 			{
 				$totalerrors = 0;
 
-				$old_app_name = $GLOBALS['HTTP_POST_VARS']['old_app_name'];
-				$app_order    = $GLOBALS['HTTP_POST_VARS']['app_order'] ? $GLOBALS['HTTP_POST_VARS']['app_order'] : 0;
-				$n_app_name   = chop($GLOBALS['HTTP_POST_VARS']['n_app_name']);
-				$n_app_status = $GLOBALS['HTTP_POST_VARS']['n_app_status'];
+				$app_order    = $_POST['app_order'] ? $_POST['app_order'] : 0;
+				$n_app_name   = chop($_POST['n_app_name']);
+				$n_app_status = $_POST['n_app_status'];
 
 				if (! $n_app_name)
 				{
 					$error[$totalerrors++] = lang('You must enter an application name.');
 				}
 
-				if ($old_app_name != $n_app_name)
+				if ($app_name != $n_app_name)
 				{
 					if ($this->bo->exists($n_app_name))
 					{
@@ -271,16 +305,16 @@
 						'n_app_name'   => $n_app_name,
 						'n_app_status' => $n_app_status,
 						'app_order'    => $app_order,
-						'old_app_name' => $old_app_name
+						'old_app_name' => $app_name
 					));
 
-					Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list'));
-					$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-					exit;
+					$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiapplications.get_list&start='.$start);
 				}
 			}
 
+			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Edit application');
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
 			if ($totalerrors)
 			{
@@ -291,15 +325,17 @@
 				$GLOBALS['phpgw']->template->set_var('error','');
 				list($n_app_name,$n_app_title,$n_app_status,$old_app_name,$app_order) = $this->bo->read($app_name);
 			}
-
-			$GLOBALS['phpgw']->template->set_var('lang_header',lang('Edit application'));
-			$GLOBALS['phpgw']->template->set_var('hidden_vars','<input type="hidden" name="old_app_name" value="' . $old_app_name . '">');
+			$GLOBALS['phpgw']->template->set_var('hidden_vars','<input type="hidden" name="start" value="'.$start.'">'.
+				'<input type="hidden" name="app_name" value="' . $app_name . '">');
+			$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
 			$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.edit'));
 
 			$this->display_row(lang('application name'),'<input name="n_app_name" value="' . $n_app_name . '">');
 
 			$GLOBALS['phpgw']->template->set_var('lang_status',lang('Status'));
-			$GLOBALS['phpgw']->template->set_var('lang_submit_button',lang('edit'));
+			$GLOBALS['phpgw']->template->set_var('lang_save_button',lang('Save'));
+			$GLOBALS['phpgw']->template->set_var('lang_cancel_button',lang('Cancel'));
+			$GLOBALS['phpgw']->template->set_var('lang_delete_button',lang('Delete'));
 
 			$selected[$n_app_status] = ' selected';
 			$status_html = '<option value="0"' . $selected[0] . '>' . lang('Disabled') . '</option>'
@@ -310,38 +346,47 @@
 			$this->display_row(lang("Select which location this app should appear on the navbar, lowest (left) to highest (right)"),'<input name="app_order" value="' . $app_order . '">');
 
 			$GLOBALS['phpgw']->template->set_var('select_status',$status_html);
-			$GLOBALS['phpgw']->template->pparse('out','form');
+			$GLOBALS['phpgw']->template->pparse('phpgw_body','form');
 		}
 
 		function delete()
 		{
-			$app_name = $GLOBALS['HTTP_GET_VARS']['app_name'];
-
-			if (!$app_name)
+			if ($GLOBALS['phpgw']->acl->check('applications_access',8,'admin'))
 			{
-				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list'));
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
+			$app_name = get_var('app_name',array('POST','GET'));
+			$start = get_var('start',array('POST','GET'));
+			
+			if (!$app_name || $_POST['no'] || $_POST['yes'])
+			{
+				if ($_POST['yes'])
+				{
+					$this->bo->delete($app_name);
+				}
+				$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiapplications.get_list&start='.$start);
 			}
 
 			$GLOBALS['phpgw']->template->set_file(array('body' => 'delete_common.tpl'));
 
-			if ($GLOBALS['HTTP_GET_VARS']['confirm'])
-			{
-				$this->bo->delete($app_name);
-				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list'));
-				$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-				exit;
-			}
-
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
-			$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to delete this application ?'));
-			$GLOBALS['phpgw']->template->set_var('no','<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list') . '">' . lang('No') . '</a>');
-			$GLOBALS['phpgw']->template->set_var('yes','<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.delete&app_name=' . urlencode($app_name) . "&confirm=True") . '">' . lang('Yes') . '</a>');
-			$GLOBALS['phpgw']->template->pparse('out','body');
+			$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to delete the application %1 ?',$GLOBALS['phpgw_info']['apps'][$app_name]['title']));
+			$GLOBALS['phpgw']->template->set_var('no',lang('No'));
+			$GLOBALS['phpgw']->template->set_var('yes',lang('Yes'));
+			$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.delete'));
+			$GLOBALS['phpgw']->template->set_var('hidden_vars','<input type="hidden" name="start" value="'.$start.'">'.
+				'<input type="hidden" name="app_name" value="'. urlencode($app_name) . '">');
+			$GLOBALS['phpgw']->template->pparse('phpgw_body','body');
 		}
 		
 		function register_all_hooks()
 		{
+			if ($GLOBALS['phpgw']->acl->check('applications_access',16,'admin'))
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
 			if (!is_object($GLOBALS['phpgw']->hooks))
 			{
 				$GLOBALS['phpgw']->hooks = CreateObject('phpgwapi.hooks');
diff --git a/admin/inc/class.uicategories.inc.php b/admin/inc/class.uicategories.inc.php
index 9223bb2f9d..14e35c725a 100644
--- a/admin/inc/class.uicategories.inc.php
+++ b/admin/inc/class.uicategories.inc.php
@@ -4,10 +4,12 @@
 	* http://www.phpgroupware.org                                              *
 	* Written by Bettina Gille [ceb@phpgroupware.org]                          *
 	* -----------------------------------------------                          *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
+	* Copyright 2000 - 2003 Free Software Foundation, Inc                      *
+	*                                                                          *
+	* This program is free software; you can redistribute it and/or modify it  *
+	* under the terms of the GNU General Public License as published by the    *
+	* Free Software Foundation; either version 2 of the License, or (at your   *
+	* option) any later version.                                               *
 	\**************************************************************************/
 	/* $Id$ */
 	/* $Source$ */
@@ -15,8 +17,7 @@
 	class uicategories
 	{
 		var $bo;
-		var $nextmatchs;
-		var $xslttpl;
+		var $template;
 
 		var $start;
 		var $query;
@@ -28,20 +29,35 @@
 		var $public_functions = array
 		(
 			'index'  => True,
+			'add'    => True,
 			'edit'   => True,
 			'delete' => True
 		);
 
 		function uicategories()
 		{
-			$GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
+			if ($GLOBALS['phpgw']->acl->check('global_categories_access',1,'admin'))
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
 
 			$this->bo			= CreateObject('admin.bocategories');
+			$this->template		= $GLOBALS['phpgw']->template;
 			$this->nextmatchs	= CreateObject('phpgwapi.nextmatchs');
 
+			$this->acl_search = !$GLOBALS['phpgw']->acl->check('global_categories_access',2,'admin');
+			$this->acl_add    = !$GLOBALS['phpgw']->acl->check('global_categories_access',4,'admin');
+			$this->acl_view   = !$GLOBALS['phpgw']->acl->check('global_categories_access',8,'admin');
+			$this->acl_edit   = !$GLOBALS['phpgw']->acl->check('global_categories_access',16,'admin');
+			$this->acl_delete = !$GLOBALS['phpgw']->acl->check('global_categories_access',32,'admin');
+			$this->acl_add_sub= !$GLOBALS['phpgw']->acl->check('global_categories_access',64,'admin');
+
+			$this->appname = get_var('appname',array('GET','POST'));
+			$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps'][$this->appname ? $this->appname : 'admin']['title'];
+
 			$this->start		= $this->bo->start;
 			$this->query		= $this->bo->query;
-			$this->sort			= $this->bo->sort;
+			$this->sort 		= $this->bo->sort;
 			$this->order		= $this->bo->order;
 			$this->cat_id		= $this->bo->cat_id;
 			if($this->debug) { $this->_debug_sqsof(); }
@@ -50,11 +66,11 @@
 		function _debug_sqsof()
 		{
 			$data = array(
-				'start'		=> $this->start,
-				'query'		=> $this->query,
-				'sort'		=> $this->sort,
-				'order'		=> $this->order,
-				'cat_id'	=> $this->cat_id
+				'start'  => $this->start,
+				'query'  => $this->query,
+				'sort'   => $this->sort,
+				'order'  => $this->order,
+				'cat_id' => $this->cat_id
 			);
 			echo '<br>UI:<br>';
 			_debug_array($data);
@@ -64,10 +80,10 @@
 		{
 			$data = array
 			(
-				'start'	=> $this->start,
-				'query'	=> $this->query,
-				'sort'	=> $this->sort,
-				'order'	=> $this->order
+				'start' => $this->start,
+				'query' => $this->query,
+				'sort'  => $this->sort,
+				'order' => $this->order
 			);
 
 			if(isset($this->cat_id))
@@ -77,106 +93,133 @@
 			$this->bo->save_sessiondata($data);
 		}
 
+		function set_langs()
+		{
+			$this->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
+			$this->template->set_var('row_on',$GLOBALS['phpgw_info']['theme']['row_on']);
+			$this->template->set_var('row_off',$GLOBALS['phpgw_info']['theme']['row_off']);
+			$this->template->set_var('lang_save',lang('Save'));
+			$this->template->set_var('lang_search',lang('Search'));
+			$this->template->set_var('lang_sub',lang('Add sub'));
+			$this->template->set_var('lang_edit',lang('Edit'));
+			$this->template->set_var('lang_delete',lang('Delete'));
+			$this->template->set_var('lang_parent',lang('Parent category'));
+			$this->template->set_var('lang_none',lang('None'));
+			$this->template->set_var('lang_name',lang('Name'));
+			$this->template->set_var('lang_descr',lang('Description'));
+			$this->template->set_var('lang_add',lang('Add'));
+			$this->template->set_var('lang_reset',lang('Clear Form'));
+			$this->template->set_var('lang_cancel',lang('Cancel'));
+			$this->template->set_var('lang_done',lang('Done'));
+		}
+
 		function index()
 		{
-			$global_cats  = get_var('global_cats',array('POST','GET'));
-
-			$GLOBALS['phpgw']->xslttpl->add_file(array('app_data','cats',
-										$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 'search_field',
-										$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 'nextmatchs'));
-
 			$link_data = array
 			(
-				'menuaction'  => 'admin.uicategories.index',
-				'appname'     => $GLOBALS['appname'],
-				'global_cats' => $global_cats
+				'menuaction'	=> 'admin.uicategories.add',
+				'appname'		=> $this->appname
 			);
 
 			if ($_POST['add'])
 			{
-				$link_data['menuaction'] = 'admin.uicategories.edit';
 				$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
 			}
 
 			if ($_POST['done'])
 			{
-				$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uimainscreen.mainscreen');
+				$GLOBALS['phpgw']->redirect_link('/admin/index.php');
 			}
 
-			if ($GLOBALS['appname'])
+			$this->template->set_file(array('cat_list_t' => 'listcats.tpl'));
+			$this->template->set_block('cat_list_t','cat_list','list');
+			if (!$this->acl_add)
 			{
-				$GLOBALS['phpgw_info']['flags']['app_header'] = lang($GLOBALS['appname']) . '&nbsp;' . lang('global categories') . ': ' . lang('category list');
+				$this->template->set_block('cat_list_t','add','addhandle');
 			}
-			else
+			if (!$this->acl_search)
 			{
-				$GLOBALS['phpgw_info']['flags']['app_header'] = lang('global categories') . ': ' . lang('category list');
+				$this->template->set_block('cat_list_t','search','searchhandle');
 			}
 
-			if (!$global_cats)
+			$GLOBALS['phpgw_info']['flags']['app_header'] .= ' - '.lang('Global categories');
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+			$this->set_langs();
+			$this->template->set_var('query',$this->query);
+
+			$link_data['menuaction'] = 'admin.uicategories.index';
+			$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
+
+			if(!$start)
 			{
-				$global_cats = False;
+				$start = 0;
 			}
 
-			$categories = $this->bo->get_list($global_cats);
+			$categories = $this->bo->get_list();
 
-			$cat_header[] = array
-			(
-				'sort_name'				=> $this->nextmatchs->show_sort_order(array
-										(
-											'sort'	=> $this->sort,
-											'var'	=> 'cat_name',
-											'order'	=> $this->order,
-											'extra'	=> $link_data
-										)),
-				'lang_add_sub'			=> lang('add sub'),
-				'lang_name'				=> lang('name'),
-				'lang_descr'			=> lang('description'),
-				'lang_edit'				=> lang('edit'),
-				'lang_delete'			=> lang('delete'),
-				'lang_sort_statustext'	=> lang('sort the entries'),
-				'sort_descr'			=> $this->nextmatchs->show_sort_order(array
-											(
-												'sort'	=> $this->sort,
-												'var'	=> 'cat_description',
-												'order'	=> $this->order,
-												'extra'	=> $link_data
-											))
-			);
+			$left  = $this->nextmatchs->left('/index.php',$this->start,$this->bo->cats->total_records,$link_data);
+			$right = $this->nextmatchs->right('/index.php',$this->start,$this->bo->cats->total_records,$link_data);
+			$this->template->set_var('left',$left);
+			$this->template->set_var('right',$right);
 
-			while (is_array($categories) && list(,$cat) = each($categories))
+			$this->template->set_var('lang_showing',$this->nextmatchs->show_hits($this->bo->cats->total_records,$this->start));
+
+			$this->template->set_var('sort_name',$this->nextmatchs->show_sort_order($this->sort,'cat_name',$this->order,'/index.php',lang('Name'),$link_data));
+			$this->template->set_var('sort_description',$this->nextmatchs->show_sort_order($this->sort,'cat_description',$this->order,'/index.php',lang('Description'),$link_data));
+
+			for ($i=0;$i<count($categories);$i++)
 			{
-				$level		= $cat['level'];
-				$cat_name	= $GLOBALS['phpgw']->strip_html($cat['name']);
+				$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+				$this->template->set_var(tr_color,$tr_color);
+
+				$id = $categories[$i]['id'];
+				$level = $categories[$i]['level'];
+				$cat_name = $GLOBALS['phpgw']->strip_html($categories[$i]['name']);
 
-				$main = 'yes';
 				if ($level > 0)
 				{
-					$space = '&nbsp;.&nbsp;';
+					$space = '&nbsp;&nbsp;';
 					$spaceset = str_repeat($space,$level);
 					$cat_name = $spaceset . $cat_name;
-					$main = 'no';
 				}
 
-				$descr = $GLOBALS['phpgw']->strip_html($cat['descr']);
+				$descr = $GLOBALS['phpgw']->strip_html($categories[$i]['description']);
+				if (!$descr) { $descr = '&nbsp;'; }
 
-				if ($GLOBALS['appname'] && $cat['app_name'] == 'phpgw')
+				if ($level == 0)
 				{
-					$appendix = '&nbsp;&lt;' . lang('Global') . '&gt;';
+					$cat_name = '<font color="FF0000"><b>' . $cat_name . '</b></font>';
+					$descr = '<font color="FF0000"><b>' . $descr . '</b></font>';
+				}
+
+				if ($this->appname && $categories[$i]['app_name'] == 'phpgw')
+				{
+					$appendix = '&lt;' . lang('Global') . '&gt;';
 				}
 				else
 				{
 					$appendix = '';
 				}
 
-				$link_data['menuaction'] = 'admin.uicategories.edit';
-				$link_data['parent'] = $cat['cat_id'];
-				$add_sub_url = $GLOBALS['phpgw']->link('/index.php',$link_data);
+				$this->template->set_var(array
+				(
+					'name' => $cat_name . $appendix,
+					'descr' => $descr
+				));
 
-				if ($GLOBALS['appname'] && $cat['app_name'] == $GLOBALS['appname'])
+				if ($this->acl_add_sub)
+				{
+					$link_data['menuaction'] = 'admin.uicategories.add';
+					$link_data['cat_parent'] = $id;
+					$this->template->set_var('add_sub','<a href="'.$GLOBALS['phpgw']->link('/index.php',$link_data).'">'.
+														lang('Add sub').'</a>');
+				}
+				if ($this->appname && $categories[$i]['app_name'] == $this->appname)
 				{
 					$show_edit_del = True;
 				}
-				elseif(!$GLOBALS['appname'] && $cat['app_name'] == 'phpgw')
+				elseif(!$this->appname && $categories[$i]['app_name'] == 'phpgw')
 				{
 					$show_edit_del = True;
 				}
@@ -185,242 +228,251 @@
 					$show_edit_del = False;
 				}
 
-				if ($show_edit_del)
+				$link_data['cat_id'] = $id;
+				if ($show_edit_del && $this->acl_edit)
 				{
-					$link_data['cat_id']		= $cat['cat_id'];
-					$link_data['menuaction']	= 'admin.uicategories.edit';
-					$edit_url					= $GLOBALS['phpgw']->link('/index.php',$link_data);
-					$lang_edit					= lang('edit');
-
-					$link_data['menuaction']	= 'admin.uicategories.delete';
-					$delete_url					= $GLOBALS['phpgw']->link('/index.php',$link_data);
-					$lang_delete				= lang('delete');
+					$link_data['menuaction'] = 'admin.uicategories.edit';
+					$this->template->set_var('edit','<a href="'.$GLOBALS['phpgw']->link('/index.php',$link_data).'">'.
+						lang('Edit').'</a>');
 				}
 				else
 				{
-					$edit_url					= '';
-					$lang_edit					= '';
-					$delete_url					= '';
-					$lang_delete				= '';
+					$this->template->set_var('edit','');
 				}
-
-				$content[] = array
-				(
-					'name'						=> $cat_name . $appendix,
-					'descr'						=> $descr,
-					'date'						=> $note['date'],
-					'main'						=> $main,
-					'add_sub_url'				=> $add_sub_url,
-					'edit_url'					=> $edit_url,
-					'delete_url'				=> $delete_url,
-					'lang_add_sub_statustext'	=> lang('add a subcategory'),
-					'lang_edit_statustext'		=> lang('edit this category'),
-					'lang_delete_statustext'	=> lang('delete this category'),
-					'lang_add_sub'				=> lang('add sub'),
-					'lang_edit'					=> $lang_edit,
-					'lang_delete'				=> $lang_delete
-				);
+				if ($show_edit_del && $this->acl_delete)
+				{
+					$link_data['menuaction'] = 'admin.uicategories.delete';
+					$this->template->set_var('delete','<a href="'.$GLOBALS['phpgw']->link('/index.php',$link_data).'">'.
+						lang('Delete').'</a>');
+				}
+				else
+				{
+					$this->template->set_var('delete','');
+				}
+				$this->template->fp('list','cat_list',True);
 			}
-
-			$link_data['menuaction'] = 'admin.uicategories.index';
-			$link_data['parent'] = '';
-
-			$cat_add[] = array
-			(
-				'lang_add'				=> lang('add'),
-				'lang_add_statustext'	=> lang('add a category'),
-				'action_url'			=> $GLOBALS['phpgw']->link('/index.php',$link_data),
-				'lang_done'				=> lang('done'),
-				'lang_done_statustext'	=> lang('return to admin mainscreen')
-			);
-
-			$link_data['menuaction'] = 'admin.uicategories.index';
-
-			$data = array
-			(
-				'start_record'					=> $this->start,
- 				'record_limit'					=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
- 				'num_records'					=> count($categoris),
- 				'all_records'					=> $this->bo->cats->total_records,
-				'nextmatchs_url'				=> $GLOBALS['phpgw']->link('/index.php',$link_data),
-				'nextmatchs_img_path'			=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
-				'select_url'					=> $GLOBALS['phpgw']->link('/index.php',$link_data),
-				'lang_searchfield_statustext'	=> lang('Enter the search string. To show all entries, empty this field and press the SUBMIT button again'),
-				'lang_searchbutton_statustext'	=> lang('Submit the search string'),
-				'query'							=> $this->query,
-				'lang_search'					=> lang('search'),
-				'cat_header'					=> $cat_header,
-				'cat_data'						=> $content,
-				'cat_add'						=> $cat_add 
-			);
+			$link_data['menuaction'] = 'admin.uicategories.add';
+			$link_data['cat_parent'] = '';
+			$this->template->set_var('add_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
 
 			$this->save_sessiondata();
-			$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('cat_list' => $data));
+			$this->template->pfp('out','cat_list_t',True);
 		}
 
-		function edit()
+		function add()
 		{
-			$global_cats	= get_var('global_cats',array('POST','GET'));
-			$parent			= get_var('parent',array('GET'));
-			$values			= get_var('values',array('POST'));
+			$new_parent			= $_POST['new_parent'];
+			$cat_parent			= intval(get_var('cat_parent',array('POST','GET')));
+			$cat_name			= $_POST['cat_name'];
+			$cat_description	= $_POST['cat_description'];
+			if ($new_parent)
+			{
+				$cat_parent = intval($new_parent);
+			}
 
+			if (!$this->acl_add && $cat_parent == 0 || !$this->acl_add_sub && $cat_parent != 0)
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
 			$link_data = array
 			(
-				'menuaction'  => 'admin.uicategories.index',
-				'appname'     => $GLOBALS['appname'],
-				'global_cats' => $global_cats
+				'menuaction'	=> 'admin.uicategories.index',
+				'appname'		=> $this->appname
 			);
 
-			if ($values['cancel'])
+			if ($_POST['cancel'])
 			{
 				$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
 			}
 
-			if ($values['save'] || $values['apply'])
+			$GLOBALS['phpgw_info']['flags']['app_header'] .= ' - '.lang('Add global category');
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+
+			$this->set_langs();
+
+			$this->template->set_file(array('form' => 'category_form.tpl'));
+			$this->template->set_block('form','delete','deletehandle');
+
+			if ($_POST['save'])
 			{
-				$values['cat_id'] = $this->cat_id;
-				$values['access'] = 'public';
+				$values = array
+				(
+					'parent'		=> $cat_parent,
+					'descr'			=> $cat_description,
+					'name'			=> $cat_name,
+					'access'		=> 'public'
+				);
 
 				$error = $this->bo->check_values($values);
 				if (is_array($error))
 				{
-					$message = $GLOBALS['phpgw']->common->error_list($error);
+					$this->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
 				}
 				else
 				{
-					$this->cat_id = $this->bo->save_cat($values);
-					if ($values['apply'])
-					{
-						$message = lang('Category %1 has been saved !',$values['name']);
-					}
-					else
-					{
-						$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
-					}
+					$this->bo->save_cat($values);
+					$this->template->set_var('message',lang('Category %1 has been added !', $cat_name));
 				}
 			}
 
-			if ($this->cat_id)
-			{
-				$cats = $this->bo->cats->return_single($this->cat_id);
-				$parent = $cats['parent'];
-			}
+			$link_data['menuaction'] = 'admin.uicategories.add'; 			
+			$this->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
 
-			if ($GLOBALS['appname'])
-			{
-				$GLOBALS['phpgw_info']['flags']['app_header'] = lang($GLOBALS['appname']) . '&nbsp;' . lang('global categories') . ': ' . ($this->cat_id?lang('edit category'):lang('add category'));
-			}
-			else
-			{
-				$GLOBALS['phpgw_info']['flags']['app_header'] = lang('global categories') . ': ' . $function;
-			}
+			$this->template->set_var('category_list',$this->bo->cats->formatted_list(array('selected' => $cat_parent)));
+			$this->template->set_var('cat_name',$cat_name);
+			$this->template->set_var('cat_description',$cat_description);
 
-			$GLOBALS['phpgw']->xslttpl->add_file(array('app_data','cats'));
-
-			if ($GLOBALS['appname'])
-			{
-				$GLOBALS['phpgw']->template->set_var('title_categories',lang('Edit global category for %1',lang($GLOBALS['appname'])));
-			}
-			else
-			{
-				$GLOBALS['phpgw']->template->set_var('title_categories',lang('Edit global category'));
-			}
-
-			$data = array
-			(
-				'lang_name'					=> lang('name'),
-				'lang_descr'				=> lang('description'),
-				'lang_parent'				=> lang('parent category'),
-				'old_parent'				=> $cats['parent'],
-				'lang_save'					=> lang('save'),
-				'lang_apply'				=> lang('apply'),
-				'lang_cancel'				=> lang('cancel'),
-				'value_name'				=> $GLOBALS['phpgw']->strip_html($cats['name']),
-				'value_descr'				=> $GLOBALS['phpgw']->strip_html($cats['descr']),
-				'message'					=> $message,
-				'lang_content_statustext'	=> lang('enter a description for the category'),
-				'lang_cancel_statustext'	=> lang('leave the category untouched and return back to the list'),
-				'lang_save_statustext'		=> lang('save the category and return back to the list'),
-				'lang_apply_statustext'		=> lang('save the category'),
-				'lang_no_cat'				=> lang('no category'),
-				'lang_cat_statustext'		=> lang('Select the parent category. If this is a main category select NO CATEGORY'),
-				'select_name'				=> 'values[parent]',
-				'cat_list'					=> $this->bo->cats->formatted_xslt_list(array('format' => 'select', 'selected' => $parent,'self' => $this->cat_id,'globals' => $global_cats))
-			);
-
-			$link_data['menuaction'] = 'admin.uicategories.edit';
-			if ($this->cat_id)
-			{
-				$link_data['cat_id']	= $this->cat_id;
-			}
-			$data['edit_url'] = $GLOBALS['phpgw']->link('/index.php',$link_data);
-
-			$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('cat_edit' => $data));
+			$this->template->pfp('out','form');
 		}
 
-		function delete()
+		function edit()
 		{
-			$global_cats  = get_var('global_cats',array('POST','GET'));
+			$new_parent			= intval($_POST['new_parent']);
+			$cat_parent			= intval($_POST['cat_parent']);
+			$cat_name			= $_POST['cat_name'];
+			$cat_description	= $_POST['cat_description'];
+			$old_parent			= intval($_POST['old_parent']);
+			
+			if ($new_parent)
+			{
+				$cat_parent = $new_parent;
+			}
 
 			$link_data = array
 			(
-				'menuaction'  => 'admin.uicategories.index',
-				'appname'     => $GLOBALS['appname'],
-				'global_cats' => $global_cats
+				'menuaction'	=> 'admin.uicategories.index',
+				'appname'		=> $this->appname
 			);
 
-			if ($_POST['done'] || $_POST['cancel'] || !$this->cat_id)
+			if ($_POST['cancel'] || !$this->cat_id || !$this->acl_edit)
 			{
 				$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
 			}
 
-			if ($_POST['delete'])
+			$GLOBALS['phpgw_info']['flags']['app_header'] .= ' - '.lang('Edit global category');
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+
+			$this->set_langs();
+
+			$this->template->set_file(array('form' => 'category_form.tpl'));
+
+			if ($_POST['save'])
 			{
-				if ($_POST['subs'])
+				$values = array
+				(
+					'id'			=> $this->cat_id,
+					'old_parent'	=> $old_parent,
+					'parent'		=> $cat_parent,
+					'descr'			=> $cat_description,
+					'name'			=> $cat_name,
+					'access'		=> 'public'
+				);
+
+				$error = $this->bo->check_values($values);
+				if (is_array($error))
 				{
-					switch ($_POST['subs'])
-					{
-						case 'move':
-							$this->bo->delete(array('cat_id' => $this->cat_id, 'modify_subs' => True));
-							$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
-							break;
-						case 'drop':
-							$this->bo->delete(array('cat_id' => $this->cat_id, 'drop_subs' => True));
-							$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
-							break;
-						default:
-							$error			= array('Please choose one of the methods to handle the subcategories');
-							$msgbox_error	= $GLOBALS['phpgw']->common->error_list($error);
-							break;
-					}
+					$this->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
 				}
 				else
 				{
-					$this->bo->delete(array('cat_id' => $this->cat_id));
-					$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+					$this->cat_id = $this->bo->save_cat($values);
+					$this->template->set_var('message',lang('Category %1 has been updated !',$cat_name));
 				}
 			}
 
-			$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 'app_delete'));
+			$cats = $this->bo->cats->return_single($this->cat_id);
 
-			$GLOBALS['phpgw_info']['flags']['app_header'] = ($GLOBALS['appname']?lang($GLOBALS['appname']) . '&nbsp;':'') . lang('global categories') . ': ' . lang('delete category');
+			$hidden_vars = '<input type="hidden" name="cat_id" value="' . $this->cat_id . '">' . "\n"
+							. '<input type="hidden" name="old_parent" value="' . $cats[0]['parent'] . '">' . "\n";
+			$this->template->set_var('hidden_vars',$hidden_vars);
 
-			$type = ($GLOBALS['appname']?'noglobalapp':'noglobal');
+			$link_data['menuaction']	= 'admin.uicategories.edit'; 
+			$link_data['cat_id']		= $this->cat_id; 
+			$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
 
-			$apps_cats = $this->bo->exists(array('type'		=> $type,
-												'cat_name'	=> '',
-												'cat_id'	=> $this->cat_id));
-			if ($apps_cats)
+			$this->template->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats[0]['name']));
+			$this->template->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats[0]['description']));
+			$this->template->set_var('category_list',$this->bo->cats->formatted_list(array('selected' => $cats[0]['parent'],'self' => $this->cat_id)));
+			$this->template->pfp('out','form');
+		}
+
+		function delete()
+		{
+			if (!$this->acl_delete)
 			{
-				$error = array('This category is currently being used by applications as a parent category',
-								'You will need to reassign these subcategories before you can delete this category');
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
+			$link_data = array
+			(
+				'menuaction'	=> 'admin.uicategories.index',
+				'appname'		=> $this->appname
+			);
 
-				$msgbox_error	= $GLOBALS['phpgw']->common->error_list($error);
-				$show_done		= 'yes';
+			if (!$this->cat_id || $_POST['cancel'])
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+			}
+
+			if ($_POST['confirm'])
+			{
+				if ($_POST['subs'])
+				{
+					$this->bo->delete($this->cat_id,True);
+				}
+				else
+				{
+					$this->bo->delete($this->cat_id);
+				}
+				$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+			}
+			$this->template->set_file(array('category_delete' => 'delete_cat.tpl'));
+
+			if ($this->appname)
+			{
+				$type = 'noglobalapp';
 			}
 			else
 			{
-				$confirm_msg = lang('Are you sure you want to delete this global category ?');
+				$type = 'noglobal';
+			}
+
+			$apps_cats = $this->bo->exists(array
+			(
+				'type'     => $type,
+				'cat_name' => '',
+				'cat_id'   => $this->cat_id
+			));
+
+			$GLOBALS['phpgw_info']['flags']['app_header'] .= ' - '.lang('Delete category');
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+
+			$hidden_vars = '<input type="hidden" name="cat_id" value="' . $this->cat_id . '">' . "\n";
+			$this->template->set_var('hidden_vars',$hidden_vars);
+
+			$cats = $this->bo->cats->return_single($this->cat_id);
+			$this->template->set_var('cat_name',$cats[0]['name']);
+			
+			if ($apps_cats)
+			{
+				$this->template->set_block('category_delete','delete','deletehandle');
+				$this->template->set_var('messages',lang('This category is currently being used by applications as a parent category') . '<br>'
+					. lang('You will need to remove the subcategories before you can delete this category'));
+
+				$this->template->set_var('lang_subs','');
+				$this->template->set_var('subs','');
+				$this->template->set_var('nolink',$nolink);
+				$this->template->set_var('deletehandle','');
+				$this->template->set_var('donehandle','');
+				$this->template->set_var('lang_ok',lang('Ok'));
+				$this->template->pfp('out','category_delete');
+			}
+			else
+			{
+				$this->template->set_block('category_delete','done','donehandle');
+				$this->template->set_var('messages',lang('Are you sure you want to delete this category ?'));
 
 				$exists = $this->bo->exists(array
 				(
@@ -431,33 +483,22 @@
 
 				if ($exists)
 				{
-					$subs					= 'yes';
-					$lang_sub_select_move	= lang('Do you want to move all global subcategories one level down ?');
-					$lang_sub_select_drop	= lang('Do you want to delete all global subcategories ?');
+					$this->template->set_var('lang_subs',lang('Do you also want to delete all global subcategories ?'));
+					$this->template->set_var('subs','<input type="checkbox" name="subs" value="True">');
 				}
+				else
+				{
+					$this->template->set_var('lang_subs','');
+					$this->template->set_var('subs', '');
+				}
+
+				$link_data['menuaction'] = 'admin.uicategories.delete';
+				$link_data['cat_id'] = $this->cat_id;
+				$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
+				$this->template->set_var('lang_yes',lang('Yes'));
+				$this->template->set_var('lang_no',lang('No'));
+				$this->template->pfp('out','category_delete');
 			}
-
-			$data = array
-			(
-				'show_done'					=> $show_done,
-				'msgbox_data'				=> $msgbox_error,
-				'lang_delete'				=> lang('delete'),
-				'subs'						=> $subs,
-				'lang_sub_select_move'		=> $lang_sub_select_move,
-				'lang_sub_select_drop'		=> $lang_sub_select_drop,
-				'lang_delete_statustext'	=> lang('delete the category'),
-				'lang_cancel_statustext'	=> lang('do NOT delete the category and return back to the list'),
-				'lang_done_statustext'		=> lang('back to the list'),
-				'lang_cancel'				=> lang('cancel'),
-				'lang_done'					=> lang('done'),
-				'lang_confirm_msg'			=> $confirm_msg
-			);
-
-			$link_data['menuaction']	= 'admin.uicategories.delete';
-			$link_data['cat_id']		= $this->cat_id;
-			$data['delete_url']			= $GLOBALS['phpgw']->link('/index.php',$link_data);
-
-			$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
 		}
 	}
 ?>
diff --git a/admin/inc/class.uiconfig.inc.php b/admin/inc/class.uiconfig.inc.php
index 2fa6ba6ceb..a422f605ea 100644
--- a/admin/inc/class.uiconfig.inc.php
+++ b/admin/inc/class.uiconfig.inc.php
@@ -18,29 +18,14 @@
 
 		function index()
 		{
-			$referer = urldecode($GLOBALS['HTTP_GET_VARS']['referer']);
-
-			if($referer)
+			if ($GLOBALS['phpgw']->acl->check('site_config_access',1,'admin'))
 			{
-				$_redir = $referer;
-				$GLOBALS['phpgw']->session->appsession('session_data','admin_config',$referer);
+				$GLOBALS['phpgw']->redirect_link('/index.php');
 			}
-			else
-			{
-				$referer = $GLOBALS['phpgw']->session->appsession('session_data','admin_config');
-				if($referer == '-1')
-				{
-					$referer = '';
-				}
-				$_redir  = $referer ? $referer : $GLOBALS['phpgw']->link('/admin/index.php');
-			}
-
-			$appname = $GLOBALS['HTTP_GET_VARS']['appname'];
-			switch($appname)
+			
+			switch($_GET['appname'])
 			{
 				case 'admin':
-				//case 'preferences':
-				//$appname = 'preferences';
 				case 'addressbook':
 				case 'calendar':
 				case 'email':
@@ -49,14 +34,16 @@
 					Other special apps can go here for now, e.g.:
 					case 'bogusappname':
 					*/
+					$appname = $_GET['appname'];
 					$config_appname = 'phpgwapi';
 					break;
 				case 'phpgwapi':
 				case '':
 					/* This keeps the admin from getting into what is a setup-only config */
-					Header('Location: ' . $_redir);
+					$GLOBALS['phpgw']->redirect_link('/admin/index.php');
 					break;
 				default:
+					$appname = $_GET['appname'];
 					$config_appname = $appname;
 					break;
 			}
@@ -76,17 +63,17 @@
 				$current_config = $c->config_data;
 			}
 
-			if ($GLOBALS['HTTP_POST_VARS']['cancel'])
+			if ($_POST['cancel'] || $_POST['submit'] && $GLOBALS['phpgw']->acl->check('site_config_access',2,'admin'))
 			{
-				Header('Location: ' . $_redir);
+				$GLOBALS['phpgw']->redirect_link('/admin/index.php');
 			}
 
-			if ($GLOBALS['HTTP_POST_VARS']['submit'])
+			if ($_POST['submit'])
 			{
 				/* Load hook file with functions to validate each config (one/none/all) */
 				$GLOBALS['phpgw']->hooks->single('config_validate',$appname);
 
-				while (list($key,$config) = each($GLOBALS['HTTP_POST_VARS']['newsettings']))
+				while (list($key,$config) = each($_POST['newsettings']))
 				{
 					if ($config)
 					{
@@ -128,14 +115,11 @@
 					unset($GLOBALS['phpgw_info']['server']['found_validation_hook']);
 				}
 
-				$c->save_repository(True);
+				$c->save_repository();
 
 				if(!$errors)
 				{
-					$GLOBALS['phpgw']->session->appsession('session_data','admin_config',-1);
-					Header('Location: ' . $_redir);
-					$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-					exit;
+					$GLOBALS['phpgw']->redirect_link('/admin/index.php');
 				}
 			}
 
@@ -149,12 +133,18 @@
 			else
 			{
 				$t->set_var('error','');
+				$t->set_var('th_err',$GLOBALS['phpgw_info']['theme']['th_bg']);
 			}
 
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
 			$t->set_var('title',lang('Site Configuration'));
 			$t->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname));
+			$t->set_var('th_bg',     $GLOBALS['phpgw_info']['theme']['th_bg']);
+			$t->set_var('th_text',   $GLOBALS['phpgw_info']['theme']['th_text']);
+			$t->set_var('row_on',    $GLOBALS['phpgw_info']['theme']['row_on']);
+			$t->set_var('row_off',   $GLOBALS['phpgw_info']['theme']['row_off']);
 			$t->pparse('out','header');
 
 			$vars = $t->get_undefined('body');
@@ -173,7 +163,7 @@
 				}
 				$newval = implode(' ',$new);
 
-				switch($type)
+				switch ($type)
 				{
 					case 'lang':
 						$t->set_var($value,lang($newval));
@@ -190,19 +180,19 @@
 							$t->set_var($value,$current_config[$newval]);
 						}
 						break;
+					/*
 					case 'checked':
-						/* '+' is used as a delimiter for the check value */
-						list($newvalue,$check) = split('\+',$newval);
-						$newval = ereg_replace(' ','_',$newvalue);
-						if($current_config[$newval] == $check)
+						$newval = ereg_replace(' ','_',$newval);
+						if ($current_config[$newval])
 						{
-							$t->set_var($value, ' checked');
+							$t->set_var($value,' checked');
 						}
 						else
 						{
-							$t->set_var($value, '');
+							$t->set_var($value,'');
 						}
 						break;
+					*/
 					case 'selected':
 						$configs = array();
 						$config  = '';
@@ -235,15 +225,15 @@
 						}
 						break;
 					default:
-						$t->set_var($value,'');
-						break;
+					$t->set_var($value,'');
+					break;
 				}
 			}
 
 			$t->pfp('out','body');
 
-			$t->set_var('lang_submit', lang('submit'));
-			$t->set_var('lang_cancel', lang('cancel'));
+			$t->set_var('lang_submit', $GLOBALS['phpgw']->acl->check('site_config_access',2,'admin') ? lang('Cancel') : lang('Save'));
+			$t->set_var('lang_cancel', lang('Cancel'));
 			$t->pfp('out','footer');
 		}
 	}
diff --git a/admin/inc/class.uicurrentsessions.inc.php b/admin/inc/class.uicurrentsessions.inc.php
index 0d03db25b9..6d680c20e7 100644
--- a/admin/inc/class.uicurrentsessions.inc.php
+++ b/admin/inc/class.uicurrentsessions.inc.php
@@ -23,6 +23,10 @@
 
 		function uicurrentsessions()
 		{
+			if ($GLOBALS['phpgw']->acl->check('current_sessions_access',1,'admin'))
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
 			$this->template   = createobject('phpgwapi.Template',PHPGW_APP_TPL);
 			$this->bo         = createobject('admin.bocurrentsessions');
 			$this->nextmatchs = createobject('phpgwapi.nextmatchs');
@@ -31,6 +35,7 @@
 		function header()
 		{
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 		}
 
 		function store_location($info)
@@ -78,15 +83,9 @@
 			$this->template->set_block('current','list','list');
 			$this->template->set_block('current','row','row');
 
-			if (! $GLOBALS['phpgw']->acl->check('current_sessions_access',4,'admin'))
-			{
-				$can_view_ip = True;
-			}
-
-			if (! $GLOBALS['phpgw']->acl->check('current_sessions_access',2,'admin'))
-			{
-				$can_view_action = True;
-			}
+			$can_view_action = !$GLOBALS['phpgw']->acl->check('current_sessions_access',2,'admin');
+			$can_view_ip     = !$GLOBALS['phpgw']->acl->check('current_sessions_access',4,'admin');
+			$can_kill        = !$GLOBALS['phpgw']->acl->check('current_sessions_access',8,'admin');
 
 			$total = $this->bo->total();
 
@@ -115,14 +114,7 @@
 
 				$this->template->set_var('row_loginid',$value['session_lid']);
 
-				if ($can_view_ip)
-				{
-					$this->template->set_var('row_ip',$value['session_ip']);
-				}
-				else
-				{
-					$this->template->set_var('row_ip','&nbsp; -- &nbsp;');
-				}
+				$this->template->set_var('row_ip',$can_view_ip?$value['session_ip']:'&nbsp;');
 
 				$this->template->set_var('row_logintime',$value['session_logintime']);
 				$this->template->set_var('row_idle',$value['session_idle']);
@@ -131,16 +123,12 @@
 				{
 					$this->template->set_var('row_action',$GLOBALS['phpgw']->strip_html($value['session_action']));
 				}
-				elseif(! $can_view_action)
-				{
-					$this->template->set_var('row_action','&nbsp; -- &nbsp;');
-				}
 				else
 				{
 					$this->template->set_var('row_action','&nbsp;');
 				}
 
-				if ($value['session_id'] != $GLOBALS['phpgw_info']['user']['sessionid'] && ! $GLOBALS['phpgw']->acl->check('current_sessions_access',8,'admin'))
+				if ($value['session_id'] != $GLOBALS['phpgw_info']['user']['sessionid'] && $can_kill)
 				{
 					$this->template->set_var('row_kill','<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.kill&ksession='
 						. $value['session_id'] . '&kill=true') . '">' . lang('Kill').'</a>');
@@ -160,10 +148,8 @@
 		{
 			if ($GLOBALS['phpgw']->acl->check('current_sessions_access',8,'admin'))
 			{
-				$this->list_sessions();
-				return False;
+				$GLOBALS['phpgw']->redirect_link('/index.php');
 			}
-
 			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Kill session');
 			$this->header();
 			$this->template->set_file('form','kill_session.tpl');
diff --git a/admin/inc/class.uilog.inc.php b/admin/inc/class.uilog.inc.php
index aa6d7f36f0..ab718ffba3 100644
--- a/admin/inc/class.uilog.inc.php
+++ b/admin/inc/class.uilog.inc.php
@@ -26,6 +26,11 @@
 
 		function uilog()
 		{
+			if ($GLOBALS['phpgw']->acl->check('error_log_access',1,'admin'))
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
+			
 			$_cols    = $GLOBALS['HTTP_POST_VARS']['_cols'];
 			$nocols   = $GLOBALS['HTTP_POST_VARS']['nocols'];
 			$_delcol  = $GLOBALS['HTTP_POST_VARS']['_delcol'];
@@ -257,6 +262,7 @@
 
 			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.($this->editmode?lang('Edit Table format') : lang('View error log'));
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 			$this->t->pfp('out','log_list_t');
 //			$this->set_app_langs();
 		}
diff --git a/admin/inc/class.uimainscreen.inc.php b/admin/inc/class.uimainscreen.inc.php
index 3a5335861f..52b2570a71 100644
--- a/admin/inc/class.uimainscreen.inc.php
+++ b/admin/inc/class.uimainscreen.inc.php
@@ -1,49 +1,44 @@
 <?php
-	/**************************************************************************\
-	* phpGroupWare - Administration                                            *
-	* http://www.phpgroupware.org                                              *
-	* Written by coreteam <phpgroupware-developers@gnu.org>                    *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-	/* $Id$ */
+  /**************************************************************************\
+  * phpGroupWare - administration                                            *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
 
 	class uimainscreen
 	{
-		var $public_functions = array
-		(
-			'index'			=> True,
-			'mainscreen'	=> True
-		);
+		var $public_functions = array('index' => True);
 
 		function uimainscreen()
 		{
-			$GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
 			$GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs');
 		}
 
-		function mainscreen()
-		{
-			$GLOBALS['phpgw']->xslttpl->add_file('app_data');
-			
-			function display_section($appname,$file,$file2='')
-			{
-				$GLOBALS['phpgw']->common->display_mainscreen($appname,$file2 ? $file2 : $file);
-			}
-
-			$GLOBALS['phpgw']->hooks->process('admin');
-
-			$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $GLOBALS['phpgw']->common->output));
-		}
-
 		function index()
 		{
-			if ($GLOBALS['HTTP_POST_VARS']['cancel'])
+			$section     = addslashes($_POST['section']);
+			$select_lang = addslashes($_POST['select_lang']);
+			$message     = addslashes($_POST['message']);
+
+			$acl_ok = array();
+			if (!$GLOBALS['phpgw']->acl->check('mainscreen_message_access',1,'admin'))
 			{
-				header('Location: ' . $GLOBALS['phpgw']->link('/admin/index.php'));
+				$acl_ok['mainscreen'] = True;
+			}
+			if (!$GLOBALS['phpgw']->acl->check('mainscreen_message_access',2,'admin'))
+			{
+				$acl_ok['loginscreen'] = True;
+			}
+			if ($_POST['cancel'] && !isset($_POST['message']) || 
+			    !count($acl_ok) || $_POST['submit'] && !isset($acl_ok[$section]))
+			{
+				$GLOBALS['phpgw']->redirect_link('/admin/index.php');
 			}
 
 			$GLOBALS['phpgw']->template->set_file(array('message' => 'mainscreen_message.tpl'));
@@ -51,24 +46,37 @@
 			$GLOBALS['phpgw']->template->set_block('message','row','row');
 			$GLOBALS['phpgw']->template->set_block('message','row_2','row_2');
 
-			$section     = $GLOBALS['HTTP_POST_VARS']['section'];
-			$select_lang = $GLOBALS['HTTP_POST_VARS']['select_lang'];
-			$message     = $GLOBALS['HTTP_POST_VARS']['message'];
-
-			$GLOBALS['phpgw']->common->phpgw_header();
-
-			if ($GLOBALS['HTTP_POST_VARS']['submit'])
+			if ($_POST['submit'])
 			{
 				$GLOBALS['phpgw']->db->query("DELETE FROM phpgw_lang WHERE message_id='$section" . "_message' AND app_name='"
 					. "$section' AND lang='$select_lang'",__LINE__,__FILE__);
 				$GLOBALS['phpgw']->db->query("INSERT INTO phpgw_lang VALUES ('$section" . "_message','$section','$select_lang','"
-					. addslashes($message) . "')",__LINE__,__FILE__);
+					. $message . "')",__LINE__,__FILE__);
 				$message = '<center>'.lang('message has been updated').'</center>';
+				
+				$section = '';
 			}
-
-			if (empty($select_lang))
+			if ($_POST['cancel'])	// back to section/lang-selection
+			{
+				$message = $section = '';
+			}
+			switch ($section)
+			{
+				case 'mainscreen':
+					$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Edit main screen message') . ': '.strtoupper($select_lang);
+					break;
+				case 'loginscreen':
+					$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Edit login screen message') . ': '.strtoupper($select_lang);
+					break;
+				default:
+					$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Main screen message');
+					break;
+			}
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+
+			if (empty($section))
 			{
-				$GLOBALS['phpgw']->template->set_var('header_lang',lang('Main screen message'));
 				$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index'));
 				$GLOBALS['phpgw']->template->set_var('tr_color',$GLOBALS['phpgw_info']['theme']['th_bg']);
 				$GLOBALS['phpgw']->template->set_var('value','&nbsp;');
@@ -77,51 +85,48 @@
 				$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
 				$GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
 
-				$select_lang = '<select name="select_lang">';
+				$lang_select = '<select name="select_lang">';
 				$GLOBALS['phpgw']->db->query("SELECT lang,phpgw_languages.lang_name,phpgw_languages.lang_id FROM phpgw_lang,phpgw_languages WHERE "
 					. "phpgw_lang.lang=phpgw_languages.lang_id GROUP BY lang,phpgw_languages.lang_name,"
-					. "phpgw_languages.lang_id ORDER BY lang");
+					. "phpgw_languages.lang_id ORDER BY lang",__LINE__,__FILE__);
 				while ($GLOBALS['phpgw']->db->next_record())
 				{
-					$select_lang .= '<option value="' . $GLOBALS['phpgw']->db->f('lang') . '">' . $GLOBALS['phpgw']->db->f('lang_id')
-						. ' - ' . $GLOBALS['phpgw']->db->f('lang_name') . '</option>';
+					$lang = $GLOBALS['phpgw']->db->f('lang');
+					$lang_select .= '<option value="' . $lang . '"'.($lang == $select_lang ? ' selected' : '').'>' . 
+						$lang . ' - ' . $GLOBALS['phpgw']->db->f('lang_name') . "</option>\n";
 				}
-				$select_lang .= '</select>';
+				$lang_select .= '</select>';
 				$GLOBALS['phpgw']->template->set_var('label',lang('Language'));
-				$GLOBALS['phpgw']->template->set_var('value',$select_lang);
+				$GLOBALS['phpgw']->template->set_var('value',$lang_select);
 				$GLOBALS['phpgw']->template->fp('rows','row',True);
 
 				$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
 				$GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
-				$select_section = '<select name="section"><option value="mainscreen">' . lang('Main screen')
-					. '</option><option value="loginscreen">' . lang("Login screen") . '</option>'
-					. '</select>';
+				$select_section = '<select name="section">'."\n";
+				foreach($acl_ok as $key => $val)
+				{
+					$select_section .= ' <option value="'.$key.'"'.
+						($key == $_POST['section'] ? ' selected' : '') . '>' . 
+						($key == 'mainscreen' ? lang('Main screen') : lang("Login screen")) . "</option>\n";
+				}
+				$select_section .= '</select>';
 				$GLOBALS['phpgw']->template->set_var('label',lang('Section'));
 				$GLOBALS['phpgw']->template->set_var('value',$select_section);
 				$GLOBALS['phpgw']->template->fp('rows','row',True);
 
 				$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
 				$GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
-				$GLOBALS['phpgw']->template->set_var('value','<input type="submit" value="' . lang('Submit')
+				$GLOBALS['phpgw']->template->set_var('value','<input type="submit" value="' . lang('Edit')
 					. '"><input type="submit" name="cancel" value="'. lang('cancel') .'">');
 				$GLOBALS['phpgw']->template->fp('rows','row_2',True);
 			}
 			else
 			{
 				$GLOBALS['phpgw']->db->query("SELECT content FROM phpgw_lang WHERE lang='$select_lang' AND message_id='$section"
-				. "_message'");
+				. "_message'",__LINE__,__FILE__);
 				$GLOBALS['phpgw']->db->next_record();
 				$current_message = $GLOBALS['phpgw']->db->f('content');
 
-				if ($section == 'mainscreen')
-				{
-					$GLOBALS['phpgw']->template->set_var('header_lang',lang('Edit main screen message'));
-				}
-				else
-				{
-					$GLOBALS['phpgw']->template->set_var('header_lang',lang('Edit login screen message'));
-				}
-
 				$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index'));
 				$GLOBALS['phpgw']->template->set_var('select_lang',$select_lang);
 				$GLOBALS['phpgw']->template->set_var('section',$section);
@@ -136,7 +141,7 @@
 
 				$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
 				$GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
-				$GLOBALS['phpgw']->template->set_var('value','<input type="submit" name="submit" value="' . lang('Update')
+				$GLOBALS['phpgw']->template->set_var('value','<input type="submit" name="submit" value="' . lang('Save')
 					. '"><input type="submit" name="cancel" value="'. lang('cancel') .'">'
 				);
 				$GLOBALS['phpgw']->template->fp('rows','row_2',True);
diff --git a/admin/inc/class.uimenuclass.inc.php b/admin/inc/class.uimenuclass.inc.php
index e52167716d..87bf0be114 100644
--- a/admin/inc/class.uimenuclass.inc.php
+++ b/admin/inc/class.uimenuclass.inc.php
@@ -45,15 +45,18 @@
 		{
 			$i=0;
 
+			// reset the value of all_rows
+			$this->t->set_var('all_rows','');
+
 			while(list($key,$value) = each($_menuData))
 			{
 				if (!empty($value['extradata']))
 				{
-					$link = $GLOBALS['phpgw']->link($value['url'],'account_id=' . $GLOBALS['account_id'] . '&' . $value['extradata']);
+					$link = $GLOBALS['phpgw']->link($value['url'],'account_id=' . get_var('account_id',array('GET','POST')) . '&' . $value['extradata']);
 				}
 				else
 				{
-					$link = $GLOBALS['phpgw']->link($value['url'],'account_id=' . $GLOBALS['account_id']);
+					$link = $GLOBALS['phpgw']->link($value['url'],'account_id=' . get_var('account_id',array('GET','POST')));
 				}
 				$this->section_item($link,lang($value['description']),$this->rowColor[($i % 2)]);
 				$i++;
@@ -115,7 +118,6 @@
 			}
 
 			$GLOBALS['phpgw']->hooks->process($_hookname);
-
 			if (count($GLOBALS['menuData']) >= 1) 
 			{
 				$result = $this->display_section($GLOBALS['menuData']);
diff --git a/admin/inc/class.uiserver.inc.php b/admin/inc/class.uiserver.inc.php
index d38d9851fe..0750abc9d7 100644
--- a/admin/inc/class.uiserver.inc.php
+++ b/admin/inc/class.uiserver.inc.php
@@ -33,6 +33,16 @@
 
 		function uiserver()
 		{
+			if ($GLOBALS['phpgw']->acl->check('peer_server_access',1,'admin'))
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
+			$this->acl_search = !$GLOBALS['phpgw']->acl->check('peer_server_access',2,'admin');
+			$this->acl_add    = !$GLOBALS['phpgw']->acl->check('peer_server_access',4,'admin');
+			$this->acl_view   = !$GLOBALS['phpgw']->acl->check('peer_server_access',8,'admin');
+			$this->acl_edit   = !$GLOBALS['phpgw']->acl->check('peer_server_access',16,'admin');
+			$this->acl_delete = !$GLOBALS['phpgw']->acl->check('peer_server_access',32,'admin');
+
 			$this->bo = createobject('admin.boserver',True);
 			$this->nextmatchs = createobject('phpgwapi.nextmatchs');
 
@@ -70,7 +80,7 @@
 			$this->bo->save_sessiondata($data);
 		}
 
-		function formatted_list($name,$list,$id='',$default=False,$java=False)
+		function formatted_list($name,$list,$id='',$default=False)
 		{
 			$select  = "\n" .'<select name="' . $name . '"' . ">\n";
 			if($default)
@@ -94,18 +104,27 @@
 
 		function list_servers()
 		{
+			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Peer Servers');
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
 			$GLOBALS['phpgw']->template->set_file(array('server_list_t' => 'listservers.tpl'));
 			$GLOBALS['phpgw']->template->set_block('server_list_t','server_list','list');
+			if (!$this->acl_search)
+			{
+				$GLOBALS['phpgw']->template->set_block('server_list_t','search','searchhandle');
+			}
+			if (!$this->acl_add)
+			{
+				$GLOBALS['phpgw']->template->set_block('server_list_t','add','addhandle');
+			}
 
 			$GLOBALS['phpgw']->template->set_var('lang_action',lang('Server List'));
 			$GLOBALS['phpgw']->template->set_var('add_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.edit'));
 			$GLOBALS['phpgw']->template->set_var('lang_add',lang('Add'));
-			$GLOBALS['phpgw']->template->set_var('title_servers',lang('Peer Servers'));
 			$GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
 			$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.list_servers'));
-			$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
+			$GLOBALS['phpgw']->template->set_var('lang_done',lang('Cancel'));
 			$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/admin/index.php'));
 
 			if(!$this->start)
@@ -159,11 +178,18 @@
 					'server_mode' => strtoupper($server['server_mode'])
 				));
 
-				$GLOBALS['phpgw']->template->set_var('edit',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.edit&server_id=' . $server_id));
-				$GLOBALS['phpgw']->template->set_var('lang_edit_entry',lang('Edit'));
-
-				$GLOBALS['phpgw']->template->set_var('delete',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.delete&server_id=' . $server_id));
-				$GLOBALS['phpgw']->template->set_var('lang_delete_entry',lang('Delete'));
+				$GLOBALS['phpgw']->template->set_var('edit','');
+				$GLOBALS['phpgw']->template->set_var('delete','');
+				if ($this->acl_edit)
+				{
+					$GLOBALS['phpgw']->template->set_var('edit','<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.edit&server_id=' . $server_id).
+						'">'.lang('Edit').'</a>');
+				}
+				if ($this->acl_delete)
+				{
+					$GLOBALS['phpgw']->template->set_var('delete','<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.delete&server_id=' . $server_id).
+						'">'.lang('Delete').'</a>');
+				}
 				$GLOBALS['phpgw']->template->parse('list','server_list',True);
 			}
 
@@ -174,26 +200,44 @@
 		/* This function handles add or edit */
 		function edit()
 		{
+			if ($_POST['done'])
+			{
+				return $this->list_servers();
+			}
+			if ($_POST['delete'])
+			{
+				return $this->delete();
+				
+			}
+			$server_id = get_var('server_id',array('POST','GET'));
+
+			if (!$server_id && !$this->acl_add || $server_id && !$this->acl_edit)
+			{
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
 			$is = CreateObject('phpgwapi.interserver');
 
 			$GLOBALS['phpgw']->template->set_file(array('form' => 'server_form.tpl'));
-			$GLOBALS['phpgw']->template->set_block('form','add','addhandle');
-			$GLOBALS['phpgw']->template->set_block('form','edit','edithandle');
 
-			$server = $this->bo->read($GLOBALS['HTTP_GET_VARS']['server_id']);
+			if (!$this->acl_delete || !$server_id)
+			{
+				$GLOBALS['phpgw']->template->set_block('form','delete','deletehandle');
+				$GLOBALS['phpgw']->template->set_var('deletehandle','');
+			}
+			$server = $this->bo->read($server_id);
 
-			if ($GLOBALS['HTTP_POST_VARS']['submit'])
+			if ($_POST['save'])
 			{
 				$errorcount = 0;
 
-				$tmp = $is->name2id($GLOBALS['HTTP_POST_VARS']['server_name']);
+				$tmp = $is->name2id($_POST['server_name']);
 				
-				if($tmp && $GLOBALS['HTTP_POST_VARS']['server_id'])
+				if($tmp && $server_id != $tmp)
 				{
 					$error[$errorcount++] = lang('That server name has been used already !');
 				}
 
-				if (!$GLOBALS['HTTP_POST_VARS']['server_name'])
+				if (!$_POST['server_name'])
 				{
 					$error[$errorcount++] = lang('Please enter a name for that server !');
 				}
@@ -201,20 +245,20 @@
 				if (!$error)
 				{
 					$server_info = array(
-						'server_name' => addslashes($GLOBALS['HTTP_POST_VARS']['server_name']),
-						'server_url'  => addslashes($GLOBALS['HTTP_POST_VARS']['server_url']),
-						'trust_level' => intval($GLOBALS['HTTP_POST_VARS']['trust_level']),
-						'trust_rel'   => intval($GLOBALS['HTTP_POST_VARS']['trust_rel']),
-						'username'    => addslashes($GLOBALS['HTTP_POST_VARS']['server_username']),
-						'password'    => $GLOBALS['HTTP_POST_VARS']['server_password'] ? $GLOBALS['HTTP_POST_VARS']['server_password'] : $server['password'],
-						'server_mode' => addslashes($GLOBALS['HTTP_POST_VARS']['server_mode']),
-						'server_security' => addslashes($GLOBALS['HTTP_POST_VARS']['server_security']),
-						'admin_name'  => addslashes($GLOBALS['HTTP_POST_VARS']['admin_name']),
-						'admin_email' => addslashes($GLOBALS['HTTP_POST_VARS']['admin_email'])
+						'server_name' => addslashes($_POST['server_name']),
+						'server_url'  => addslashes($_POST['server_url']),
+						'trust_level' => intval($_POST['trust_level']),
+						'trust_rel'   => intval($_POST['trust_rel']),
+						'username'    => addslashes($_POST['server_username']),
+						'password'    => $_POST['server_password'] ? $_POST['server_password'] : $server['password'],
+						'server_mode' => addslashes($_POST['server_mode']),
+						'server_security' => addslashes($_POST['server_security']),
+						'admin_name'  => addslashes($_POST['admin_name']),
+						'admin_email' => addslashes($_POST['admin_email'])
 					);
-					if($GLOBALS['HTTP_GET_VARS']['server_id'])
+					if($server_id)
 					{
-						$server_info['server_id'] = $GLOBALS['HTTP_GET_VARS']['server_id'];
+						$server_info['server_id'] = $server_id;
 					}
 					$newid = $this->bo->edit($server_info);
 					$server = $this->bo->read($newid ? $newid : $server_info['server_id']);
@@ -225,28 +269,27 @@
 			{
 				$GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
 			}
-			if (($GLOBALS['HTTP_POST_VARS']['submit']) && (!$error) && (!$errorcount))
+			if (($_POST['save']) && (!$error) && (!$errorcount))
 			{
-				if($GLOBALS['HTTP_GET_VARS']['server_id'])
+				if($server_id)
 				{
-					$GLOBALS['phpgw']->template->set_var('message',lang('Server %1 has been updated',$GLOBALS['HTTP_POST_VARS']['server_name']));
+					$GLOBALS['phpgw']->template->set_var('message',lang('Server %1 has been updated',$_POST['server_name']));
 				}
 				else
 				{
-					$GLOBALS['phpgw']->template->set_var('message',lang('Server %1 has been added',$GLOBALS['HTTP_POST_VARS']['server_name']));
+					$GLOBALS['phpgw']->template->set_var('message',lang('Server %1 has been added',$_POST['server_name']));
 				}
 			}
-			if ((!$GLOBALS['HTTP_POST_VARS']['submit']) && (!$error) && (!$errorcount))
+			if ((!$_POST['save']) && (!$error) && (!$errorcount))
 			{
 				$GLOBALS['phpgw']->template->set_var('message','');
 			}
 
+			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.($server_id ? lang('Edit Peer Server') : lang('Add Peer Server'));
 			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
-			$GLOBALS['phpgw']->template->set_var('title_servers',$GLOBALS['HTTP_GET_VARS']['server_id'] ? lang('Edit Peer Server') : lang('Add Peer Server'));
-			$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.edit&server_id=' . $GLOBALS['HTTP_GET_VARS']['server_id']));
-			$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.delete&server_id=' . $GLOBALS['HTTP_GET_VARS']['server_id']));
-			$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.list_servers'));
+			$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.edit'));
 
 			$GLOBALS['phpgw']->template->set_var('lang_name',lang('Server name'));
 			$GLOBALS['phpgw']->template->set_var('lang_url',lang('Server URL'));
@@ -258,10 +301,11 @@
 			$GLOBALS['phpgw']->template->set_var('lang_security',lang('Security'));
 			$GLOBALS['phpgw']->template->set_var('lang_admin_name',lang('Admin Name'));
 			$GLOBALS['phpgw']->template->set_var('lang_admin_email',lang('Admin Email'));
-			$GLOBALS['phpgw']->template->set_var('lang_edit',lang('Edit'));
+			$GLOBALS['phpgw']->template->set_var('lang_save',lang('Save'));
+			$GLOBALS['phpgw']->template->set_var('lang_add',lang('Add'));
 			$GLOBALS['phpgw']->template->set_var('lang_default',lang('Default'));
 			$GLOBALS['phpgw']->template->set_var('lang_reset',lang('Clear Form'));
-			$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
+			$GLOBALS['phpgw']->template->set_var('lang_done',lang('Cancel'));
 			$GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete'));
 
 			$GLOBALS['phpgw']->template->set_var('server_name',$server['server_name']);
@@ -270,46 +314,51 @@
 			$GLOBALS['phpgw']->template->set_var('server_mode',$this->formatted_list('server_mode',$is->server_modes,$server['server_mode']));
 			$GLOBALS['phpgw']->template->set_var('server_security',$this->formatted_list('server_security',$is->security_types,$server['server_security']));
 			$GLOBALS['phpgw']->template->set_var('ssl_note', function_exists('curl_init') ? '&nbsp;' : lang('Note: SSL available only if PHP is compiled with curl support'));
-			$GLOBALS['phpgw']->template->set_var('pass_note',lang('(Stored password will not be shown here)'));
+			$GLOBALS['phpgw']->template->set_var('pass_note',$server_id ? '<br>'.lang('(Stored password will not be shown here)') : '');
 			$GLOBALS['phpgw']->template->set_var('trust_level',$this->formatted_list('trust_level',$is->trust_levels,$server['trust_level']));
 			$GLOBALS['phpgw']->template->set_var('trust_relationship',$this->formatted_list('trust_rel',$is->trust_relationships,$server['trust_rel'],True));
 			$GLOBALS['phpgw']->template->set_var('admin_name',$GLOBALS['phpgw']->strip_html($server['admin_name']));
 			$GLOBALS['phpgw']->template->set_var('admin_email',$GLOBALS['phpgw']->strip_html($server['admin_email']));
-			$GLOBALS['phpgw']->template->set_var('server_id',$GLOBALS['HTTP_GET_VARS']['server_id']);
+			$GLOBALS['phpgw']->template->set_var('server_id',$server_id);
 
-			$GLOBALS['phpgw']->template->set_var('edithandle','');
-			$GLOBALS['phpgw']->template->set_var('addhandle','');
-
-			$GLOBALS['phpgw']->template->pparse('out','form');
-			$GLOBALS['phpgw']->template->pparse('edithandle','edit');
+			$GLOBALS['phpgw']->template->set_var(array(
+				'th'      => $GLOBALS['phpgw_info']['theme']['th_bg'],
+				'row_on'  => $GLOBALS['phpgw_info']['theme']['row_on'],
+				'row_off' => $GLOBALS['phpgw_info']['theme']['row_off']
+			));
+			$GLOBALS['phpgw']->template->pparse('phpgw_body','form');
 		}
 
 		function delete()
 		{
-			$server_id = $GLOBALS['HTTP_POST_VARS']['server_id'] ? $GLOBALS['HTTP_POST_VARS']['server_id'] : $GLOBALS['HTTP_GET_VARS']['server_id'];
-			if ($GLOBALS['HTTP_POST_VARS']['confirm'])
+			if (!$this->acl_delete)
 			{
-				$this->bo->delete($server_id);
-				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.list_servers'));
+				$GLOBALS['phpgw']->redirect_link('/index.php');
+			}
+			$server_id = get_var('server_id',array('POST','GET'));
+			if ($_POST['yes'] || $_POST['no'])
+			{
+				if ($_POST['yes'])
+				{
+					$this->bo->delete($server_id);
+				}
+				$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiserver.list_servers');
 			}
 			else
 			{
 				$GLOBALS['phpgw']->common->phpgw_header();
+				echo parse_navbar();
 
 				$GLOBALS['phpgw']->template->set_file(array('server_delete' => 'delete_common.tpl'));
 
-				$nolink = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.list_servers');
-
-				$yeslink = '<form method="POST" name="yesbutton" action="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.delete') . '">'
-					. '<input type="hidden" name="server_id" value="' . $server_id . '">'
-					. '<input type="hidden" name="confirm" value="True">'
-					. '<input type="submit" name="yesbutton" value=Yes>'
-					. '</form><script>document.yesbutton.yesbutton.focus()</script>';
-
-				$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to delete this server?'));
-				$GLOBALS['phpgw']->template->set_var('no','<a href="' . $nolink . '">' . lang('No') . '</a>');
-				$GLOBALS['phpgw']->template->set_var('yes',$yeslink);
-				$GLOBALS['phpgw']->template->pparse('out','server_delete');
+				$GLOBALS['phpgw']->template->set_var(array(
+					'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.delete'),
+					'hidden_vars' => '<input type="hidden" name="server_id" value="' . $server_id . '"><script>document.yesbutton.yesbutton.focus()</script>',
+					'messages' => lang('Are you sure you want to delete this server?'),
+					'no' => lang('No'),
+					'yes' => lang('Yes'),
+				));
+				$GLOBALS['phpgw']->template->pparse('phpgw_body','server_delete');
 			}
 		}
 	}
diff --git a/admin/inc/hook_acl_manager.inc.php b/admin/inc/hook_acl_manager.inc.php
index 171fa2ef67..e8a015250f 100644
--- a/admin/inc/hook_acl_manager.inc.php
+++ b/admin/inc/hook_acl_manager.inc.php
@@ -17,7 +17,7 @@
 			'List config settings'   => 1,
 			'Change config settings' => 2
 		)
-	);
+	);	// added and working ralfbecker
 
 	$GLOBALS['acl_manager']['admin']['account_access'] = array(
 		'name' => 'Deny access to user accounts',
@@ -27,9 +27,10 @@
 			'Add account'     => 4,
 			'View account'    => 8,
 			'Edit account'    => 16,
-			'Delete account'  => 32
+			'Delete account'  => 32,
+			'change ACL Rights' => 64
 		)
-	);
+	);	// was already there and seems to work ralfbecker
 
 	$GLOBALS['acl_manager']['admin']['group_access'] = array(
 		'name' => 'Deny access to groups',
@@ -41,7 +42,7 @@
 			'Edit group'    => 16,
 			'Delete group'  => 32
 		)
-	);
+	);	// was already there and seems to work ralfbecker
 
 	$GLOBALS['acl_manager']['admin']['peer_server_access'] = array(
 		'name' => 'Deny access to peer servers',
@@ -49,7 +50,7 @@
 			'Peer server list'    => 1,
 			'Search peer servers' => 2,
 			'Add peer server'     => 4,
-			'View peer server'    => 8,
+//			'View peer server'    => 8,		// there's no view-routine atm.
 			'Edit peer server'    => 16,
 			'Delete peer server'  => 32
 		)
@@ -61,9 +62,10 @@
 			'Applications list' => 1,
 			'Add application'   => 2,
 			'Edit application'  => 4,
-			'Delete application'  => 8
+			'Delete application'  => 8,
+			'Register application hooks' => 16
 		)
-	);
+	);	// added and working ralfbecker
 
 	$GLOBALS['acl_manager']['admin']['global_categories_access'] = array(
 		'name' => 'Deny access to global categories',
@@ -73,9 +75,10 @@
 			'Add category'      => 4,
 			'View category'     => 8,
 			'Edit category'     => 16,
-			'Delete category'   => 32
+			'Delete category'   => 32,
+			'Add sub-category'  => 64
 		)
-	);
+	);	// added and working ralfbecker
 
 	$GLOBALS['acl_manager']['admin']['mainscreen_message_access'] = array(
 		'name' => 'Deny access to mainscreen message',
@@ -83,7 +86,7 @@
 			'Main screen message' => 1,
 			'Login message'       => 2
 		)
-	);
+	);	// added and working ralfbecker
 
 	$GLOBALS['acl_manager']['admin']['current_sessions_access'] = array(
 		'name' => 'Deny access to current sessions',
@@ -93,33 +96,33 @@
 			'Show session IP address' => 4,
 			'Kill session'            => 8
 		)
-	);
+	);	// checked and working ralfbecker
 
 	$GLOBALS['acl_manager']['admin']['access_log_access'] = array(
-		'name' => 'Deny access to session log',
+		'name' => 'Deny access to access log',
 		'rights' => array(
-			'Show session log' => 1
+			'Show access log' => 1
 		)
-	);
+	);	// added and working ralfbecker
 
 	$GLOBALS['acl_manager']['admin']['error_log_access'] = array(
 		'name' => 'Deny access to error log',
 		'rights' => array(
 			'Show error log' => 1
 		)
-	);
+	);	// added and working ralfbecker
 
-	$GLOBALS['acl_manager']['admin']['appreg_access'] = array(
-		'name' => 'Deny access to application registery',
+	$GLOBALS['acl_manager']['admin']['asyncservice_access'] = array(
+		'name' => 'Deny access to asynchronous timed services',
 		'rights' => array(
-			'Register applications' => 1
+			'Asynchronous timed services' => 1
 		)
-	);
+	);	// added and working ralfbecker
 
 	$GLOBALS['acl_manager']['admin']['info_access'] = array(
 		'name' => 'Deny access to phpinfo',
 		'rights' => array(
 			'Show phpinfo()' => 1
  		)
- 	);
+ 	);	// added and working ralfbecker
 
diff --git a/admin/inc/hook_admin.inc.php b/admin/inc/hook_admin.inc.php
index 0c693d5685..4f433a371e 100644
--- a/admin/inc/hook_admin.inc.php
+++ b/admin/inc/hook_admin.inc.php
@@ -8,36 +8,37 @@
 	*  Free Software Foundation; either version 2 of the License, or (at your  *
 	*  option) any later version.                                              *
 	\**************************************************************************/
+
 	/* $Id$ */
 
 	if (! $GLOBALS['phpgw']->acl->check('site_config_access',1,'admin'))
 	{
-		$file['Site Configuration'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=admin');
+		$file['Site Configuration']         = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=admin');
 	}
 
 	if (! $GLOBALS['phpgw']->acl->check('peer_server_access',1,'admin'))
 	{
-		$file['Peer Servers'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.list_servers');
+		$file['Peer Servers']               = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.list_servers');
 	}
 
 	if (! $GLOBALS['phpgw']->acl->check('account_access',1,'admin'))
 	{
-		$file['User Accounts'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users');
+		$file['User Accounts']              = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users');
 	}
 
 	if (! $GLOBALS['phpgw']->acl->check('group_access',1,'admin'))
 	{
-		$file['User Groups'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups');
+		$file['User Groups']                = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups');
 	}
 
 	if (! $GLOBALS['phpgw']->acl->check('applications_access',1,'admin'))
 	{
-		$file['Applications'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list');
+		$file['Applications']               = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list');
 	}
 
 	if (! $GLOBALS['phpgw']->acl->check('global_categories_access',1,'admin'))
 	{
-		$file['Global Categories'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index');
+		$file['Global Categories']          = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index');
 	}
 
 	if (!$GLOBALS['phpgw']->acl->check('mainscreen_message_access',1,'admin') || !$GLOBALS['phpgw']->acl->check('mainscreen_message_access',2,'admin'))
@@ -49,7 +50,7 @@
 	{
 		$file['View Sessions'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions');
 	}
-
+	
 	if (! $GLOBALS['phpgw']->acl->check('access_log_access',1,'admin'))
 	{
 		$file['View Access Log'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccess_history.list_history');
@@ -57,7 +58,7 @@
 
 	if (! $GLOBALS['phpgw']->acl->check('error_log_access',1,'admin'))
 	{
-		$file['View Error Log'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uilog.list_log');
+		$file['View Error Log']  = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uilog.list_log');
 	}
 
 	if (! $GLOBALS['phpgw']->acl->check('applications_access',16,'admin'))
@@ -72,10 +73,9 @@
 
 	if (! $GLOBALS['phpgw']->acl->check('info_access',1,'admin'))
 	{
-		$file['phpInfo'] = "javascript:openwindow('" . $GLOBALS['phpgw']->link('/admin/phpinfo.php') . "','700','600')";
+		$file['phpInfo']         = "javascript:openwindow('" . $GLOBALS['phpgw']->link('/admin/phpinfo.php') . "')"; //$GLOBALS['phpgw']->link('/admin/phpinfo.php');
 	}
  
 	/* Do not modify below this line */
-
-	$GLOBALS['phpgw']->common->display_mainscreen('admin',$file);
+	display_section('admin',$file);
 ?>
diff --git a/admin/inc/hook_after_navbar.inc.php b/admin/inc/hook_after_navbar.inc.php
index 4dced0cae9..dbd907a18b 100644
--- a/admin/inc/hook_after_navbar.inc.php
+++ b/admin/inc/hook_after_navbar.inc.php
@@ -23,7 +23,7 @@
 			$GLOBALS['phpgw_info']['user']['apps']['admin']) ||
 			$GLOBALS['phpgw_info']['server']['checkappversions'] == 'All')
 		{
-			$_current = array();
+			$_current = False;
 			$app_name = $GLOBALS['phpgw_info']['flags']['currentapp'];
 			$GLOBALS['phpgw']->db->query("SELECT app_name,app_version FROM phpgw_applications WHERE app_name='$app_name' OR app_name='phpgwapi'",__LINE__,__FILE__);
 			while($GLOBALS['phpgw']->db->next_record())
@@ -36,34 +36,29 @@
 					include($_versionfile);
 					/* echo '<br>' . $_versionfile . ','; */
 					$_file_version = $setup_info[$app_name]['version'];
-					$_app_title    = str_replace('- ','-',ucwords(str_replace('_','- ',$setup_info[$app_name]['name']))),
+					$_app_title    = $setup_info[$app_name]['title'];
 					unset($setup_info);
 
-					/* echo '<br>' . $app_name . ',' . $_db_version . ',' . $_file_version; */
-					$test = $GLOBALS['phpgw']->common->cmp_version_long($_db_version,$_file_version);
-					if($test == '')
+					if($app_name == 'phpgwapi')
 					{
-						$_current[$app_name] = True;
+						$api_str = '<br>' . lang('The API requires an upgrade');
+					}
+					/* echo $app_name . ',' . $_db_version . ',' . $_file_version; */
+					if(!$GLOBALS['phpgw']->common->cmp_version_long($_db_version,$_file_version))
+					{
+						$_current = True;
 						if($app_name == 'phpgwapi')
 						{
 							$api_str = '<br>' . lang('The API is current');
 						}
 					}
-					else
-					{
-						if($app_name == 'phpgwapi')
-						{
-							$api_str = '<br>' . lang('The API requires an upgrade');
-						}
-					}
-					unset($test);
 					unset($_file_version);
 					unset($_app_title);
 				}
 				unset($_db_version);
 				unset($_versionfile);
 			}
-			if(!@isset($_current[$GLOBALS['phpgw_info']['flags']['currentapp']]))
+			if(!$_current)
 			{
 				echo '<center>';
 				echo $api_str;
diff --git a/admin/inc/hook_config.inc.php b/admin/inc/hook_config.inc.php
new file mode 100644
index 0000000000..2a412a9dfd
--- /dev/null
+++ b/admin/inc/hook_config.inc.php
@@ -0,0 +1,104 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare                                                             *
+  * http://www.phpgroupware.org                                              *
+  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
+
+	function encryptalgo($config)
+	{
+		if(@function_exists('mcrypt_list_algorithms'))
+		{
+			$listed = array();
+			if(!isset($config['mcrypt_algo']))
+			{
+				$config['mcrypt_algo'] = 'tripledes';  /* MCRYPT_TRIPLEDES */
+			}
+			$algos = @mcrypt_list_algorithms();
+			$found = False;
+
+			while (list ($key, $value) = each ($algos))
+			{
+				$found = True;
+				/* Only show each once - seems this is a problem in some installs */
+				if(!in_array($value,$listed))
+				{
+					if ($config['mcrypt_algo'] == $value)
+					{
+						$selected = ' selected';
+					}
+					else
+					{
+						$selected = '';
+					}
+					$descr = strtoupper($value);
+	
+					$out .= '<option value="' . $value . '"' . $selected . '>' . $descr . '</option>' . "\n";
+					$listed[] = $value;
+				}
+			}
+			if(!$found)
+			{
+				/* Something is wrong with their mcrypt install or php.ini */
+				$out = '<option value="">' . lang('no algorithms available') . '</option>' . "\n";;
+			}
+		}
+		else
+		{
+			$out = '<option value="tripledes">TRIPLEDES</option>' . "\n";;
+		}
+		return $out;
+	}
+
+	function encryptmode($config)
+	{
+		if(@function_exists('mcrypt_list_modes'))
+		{
+			$listed = array();
+			if(!isset($config['mcrypt_mode']))
+			{
+				$config['mcrypt_mode'] = 'cbc'; /* MCRYPT_MODE_CBC */
+			}
+			$modes = @mcrypt_list_modes();
+			$found = False;
+
+			while (list ($key, $value) = each ($modes))
+			{
+				$found = True;
+				/* Only show each once - seems this is a problem in some installs */
+				if(!in_array($value,$listed))
+				{
+					if ($config['mcrypt_mode'] == $value)
+					{
+						$selected = ' selected';
+					}
+					else
+					{
+						$selected = '';
+					}
+					$descr = strtoupper($value);
+	
+					$out .= '<option value="' . $value . '"' . $selected . '>' . $descr . '</option>' . "\n";
+					$listed[] = $value;
+				}
+			}
+			if(!$found)
+			{
+				/* Something is wrong with their mcrypt install or php.ini */
+				$out = '<option value="" selected>' . lang('no modes available') . '</option>' . "\n";
+			}
+		}
+		else
+		{
+			$out = '<option value="cbc" selected>CBC</option>' . "\n";
+		}
+		return $out;
+	}
+?>
diff --git a/admin/inc/hook_sidebox_menu.inc.php b/admin/inc/hook_sidebox_menu.inc.php
new file mode 100644
index 0000000000..dfac14c6fa
--- /dev/null
+++ b/admin/inc/hook_sidebox_menu.inc.php
@@ -0,0 +1,95 @@
+<?php
+	/**************************************************************************\
+	* phpGroupWare                                                             *
+	* http://www.phpgroupware.org                                              *
+	* Written by Pim Snel <pim@lingewoud.nl>                                   *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
+
+	/* $Id$ */
+	{
+
+	/*
+		This hookfile is for generating an app-specific side menu used in the idots 
+		template set.
+
+		$menu_title speaks for itself
+		$file is the array with link to app functions
+
+		display_sidebox can be called as much as you like
+	*/
+
+		$menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
+		$file = array();
+
+		if (! $GLOBALS['phpgw']->acl->check('site_config_access',1,'admin'))
+		{
+			$file['Site Configuration']         = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=admin');
+		}
+/*
+		if (! $GLOBALS['phpgw']->acl->check('peer_server_access',1,'admin'))
+		{
+			$file['Peer Servers']               = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiserver.list_servers');
+		}
+*/
+		if (! $GLOBALS['phpgw']->acl->check('account_access',1,'admin'))
+		{
+			$file['User Accounts']              = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users');
+		}
+
+		if (! $GLOBALS['phpgw']->acl->check('group_access',1,'admin'))
+		{
+			$file['User Groups']                = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups');
+		}
+
+		if (! $GLOBALS['phpgw']->acl->check('applications_access',1,'admin'))
+		{
+			$file['Applications']               = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list');
+		}
+
+		if (! $GLOBALS['phpgw']->acl->check('global_categories_access',1,'admin'))
+		{
+			$file['Global Categories']          = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index');
+		}
+
+		if (!$GLOBALS['phpgw']->acl->check('mainscreen_message_access',1,'admin') || !$GLOBALS['phpgw']->acl->check('mainscreen_message_access',2,'admin'))
+		{
+			$file['Change Main Screen Message'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index');
+		}
+
+		if (! $GLOBALS['phpgw']->acl->check('current_sessions_access',1,'admin'))
+		{
+			$file['View Sessions'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions');
+		}
+
+		if (! $GLOBALS['phpgw']->acl->check('access_log_access',1,'admin'))
+		{
+			$file['View Access Log'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccess_history.list_history');
+		}
+
+		if (! $GLOBALS['phpgw']->acl->check('error_log_access',1,'admin'))
+		{
+			$file['View Error Log']  = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uilog.list_log');
+		}
+
+		if (! $GLOBALS['phpgw']->acl->check('applications_access',16,'admin'))
+		{
+			$file['Find and Register all Application Hooks'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.register_all_hooks');
+		}
+
+		if (! $GLOBALS['phpgw']->acl->check('asyncservice_access',1,'admin'))
+		{
+			$file['Asynchronous timed services'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiasyncservice.index');
+		}
+
+		if (! $GLOBALS['phpgw']->acl->check('info_access',1,'admin'))
+		{
+			$file['phpInfo']         = "javascript:openwindow('" . $GLOBALS['phpgw']->link('/admin/phpinfo.php') . "')";
+		}
+
+		display_sidebox($appname,$menu_title,$file);
+	}
diff --git a/admin/inc/hook_view_account.inc.php b/admin/inc/hook_view_account.inc.php
deleted file mode 100644
index 40e7004ebc..0000000000
--- a/admin/inc/hook_view_account.inc.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-	/**************************************************************************\
-	* phpGroupWare - Administration                                            *
-	* http://www.phpgroupware.org                                              *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-
-	/* $Id$ */
-
-	$GLOBALS['menuData'][] = array(
-		'description' => 'Login History',
-		'url'         => '/index.php',
-		'extradata'   => 'menuaction=admin.uiaccess_history.list_history'
-	);
-
-	$GLOBALS['menuData'][] = array(
-		'description' => 'ACL Rights',
-		'url'         => '/index.php',
-		'extradata'   => 'menuaction=admin.uiaclmanager.list_apps'
-	);
-
-	//Do not modify below this line
-//	global $menuData;
-
-//	$GLOBALS['menuData'][] = $data;
-?>
\ No newline at end of file
diff --git a/admin/inc/hook_view_user.inc.php b/admin/inc/hook_view_user.inc.php
deleted file mode 100755
index a451d73603..0000000000
--- a/admin/inc/hook_view_user.inc.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-	/**************************************************************************\
-	* phpGroupWare - Administration                                            *
-	* http://www.phpgroupware.org                                              *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-
-	/* $Id$ */
-
-	$GLOBALS['menuData'][] = array(
-		'description' => 'Login History',
-		'url'         => '/index.php',
-		'extradata'   => 'menuaction=admin.uiaccess_history.list_history'
-	);
-
-	$GLOBALS['menuData'][] = array(
-		'description' => 'ACL Rights',
-		'url'         => '/index.php',
-		'extradata'   => 'menuaction=admin.uiaclmanager.list_apps'
-	);
-?>
\ No newline at end of file
diff --git a/admin/index.php b/admin/index.php
index 4718dab574..d94e572457 100755
--- a/admin/index.php
+++ b/admin/index.php
@@ -2,23 +2,96 @@
 	/**************************************************************************\
 	* phpGroupWare - administration                                            *
 	* http://www.phpgroupware.org                                              *
-	* Written by coreteam <phpgroupware-developers@gnu.org>                    *
-	*               & Stephen Brown <steve@dataclarity.net>                    *
-	* to distribute admin across the application directories                   *
-	* ------------------------------------------------------                   *
-	* This program is free software; you can redistribute it and/or modify it  *
-	* under the terms of the GNU General Public License as published by the    *
-	* Free Software Foundation; either version 2 of the License, or (at your   *
-	* option) any later version.                                               *
+	* Written by Joseph Engo <jengo@phpgroupware.org>                          *
+	* Modified by Stephen Brown <steve@dataclarity.net>                        *
+	*  to distribute admin across the application directories                  *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
 	\**************************************************************************/
+
 	/* $Id$ */
 
-	$GLOBALS['phpgw_info']['flags'] = array
-	(
-		'currentapp' => 'admin'
-	);
+	$GLOBALS['phpgw_info'] = array();
+	$GLOBALS['phpgw_info']['flags']['currentapp'] = 'admin';
 	include('../header.inc.php');
 
-	header('Location: '. $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.mainscreen'));
-	exit;
+	$GLOBALS['admin_tpl'] = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+	$GLOBALS['admin_tpl']->set_file(
+		Array(
+			'admin' => 'index.tpl'
+		)
+	);
+
+	$GLOBALS['admin_tpl']->set_block('admin','list');
+	$GLOBALS['admin_tpl']->set_block('admin','app_row');
+	$GLOBALS['admin_tpl']->set_block('admin','app_row_noicon');
+	$GLOBALS['admin_tpl']->set_block('admin','link_row');
+	$GLOBALS['admin_tpl']->set_block('admin','spacer_row');
+
+	$GLOBALS['admin_tpl']->set_var('title',lang('Administration'));
+
+	// This func called by the includes to dump a row header
+	function section_start($appname='',$icon='')
+	{
+		$GLOBALS['admin_tpl']->set_var('icon_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']);
+		$GLOBALS['admin_tpl']->set_var('link_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']);
+		$GLOBALS['admin_tpl']->set_var('app_name',$GLOBALS['phpgw_info']['apps'][$appname]['title']);
+		$GLOBALS['admin_tpl']->set_var('a_name',$appname);
+		$GLOBALS['admin_tpl']->set_var('app_icon',$icon);
+		if ($icon)
+		{
+			$GLOBALS['admin_tpl']->parse('rows','app_row',True);
+		}
+		else
+		{
+			$GLOBALS['admin_tpl']->parse('rows','app_row_noicon',True);
+		}
+	}
+
+	function section_item($pref_link='',$pref_text='')
+	{
+		$GLOBALS['admin_tpl']->set_var('pref_link',$pref_link);
+		$GLOBALS['admin_tpl']->set_var('pref_text',$pref_text);
+		$GLOBALS['admin_tpl']->parse('rows','link_row',True);
+	}
+
+	function section_end()
+	{
+		$GLOBALS['admin_tpl']->parse('rows','spacer_row',True);
+	}
+
+	function display_section($appname,$file,$file2=False)
+	{
+		if ($file2)
+		{
+			$file = $file2;
+		}
+		if(is_array($file))
+		{
+			section_start($appname,
+				$GLOBALS['phpgw']->common->image(
+					$appname,
+					Array(
+						'navbar',
+						$appname,
+						'nonav'
+					)
+				)
+			);
+
+			while(list($text,$url) = each($file))
+			{
+				section_item($url,lang($text));
+			}
+			section_end();
+		}
+	}
+
+	$GLOBALS['phpgw']->hooks->process('admin');
+	$GLOBALS['admin_tpl']->pparse('out','list');
+
+	$GLOBALS['phpgw']->common->phpgw_footer();
 ?>
diff --git a/admin/navbar-create.php b/admin/navbar-create.php
index 5d3e116475..13fc39cefb 100644
--- a/admin/navbar-create.php
+++ b/admin/navbar-create.php
@@ -27,4 +27,6 @@ The instructions are as follows:
     echo "\n<A HREF=\"".$phpgw->link("/admin/navbar-sel.php","filename=".$phpgw_info["server"]["server_root"]."/".$key."/images/navbar.gif")."\">";
     echo $phpgw_info["apps"][$key]["title"]."</A><BR>";
   }
+
+  $phpgw->common->phpgw_footer();
 ?>
diff --git a/admin/phpinfo.php b/admin/phpinfo.php
index fca0a7fd00..3c5b718137 100755
--- a/admin/phpinfo.php
+++ b/admin/phpinfo.php
@@ -8,14 +8,20 @@
 	*  Free Software Foundation; either version 2 of the License, or (at your  *
 	*  option) any later version.                                              *
 	\**************************************************************************/
+
 	/* $Id$ */
 
-	$GLOBALS['phpgw_info']['flags'] = array
-	(
-		'noframework'	=> True,
-		'currentapp'	=> 'admin'
+	$phpgw_info['flags'] = array(
+		'noheader'   => True,
+		'nonavbar'   => True,
+		'currentapp' => 'admin'
 	);
 	include('../header.inc.php');
+	
+	if ($GLOBALS['phpgw']->acl->check('info_access',1,'admin'))
+	{
+		$GLOBALS['phpgw']->redirect_link('/index.php');
+	}
 
 // Throw a little notice out if PHPaccelerator is enabled.
 	if($GLOBALS['_PHPA']['ENABLED'])
@@ -23,6 +29,8 @@
 		echo 'PHPaccelerator enabled:</br>'."\n";
 		echo 'PHPaccelerator Version: '.$GLOBALS['_PHPA']['VERSION'].'</br></p>'."\n";
 	}
-
+	
 	phpinfo();
+
+//	$phpgw->common->phpgw_footer();
 ?>
diff --git a/admin/templates/default/accesslog.tpl b/admin/templates/default/accesslog.tpl
index 95febfc2c9..16fa29cb3f 100644
--- a/admin/templates/default/accesslog.tpl
+++ b/admin/templates/default/accesslog.tpl
@@ -23,7 +23,7 @@
 								</table>
 							</td>
 						</tr>
-						<tr class="th">
+						<tr bgcolor="{th_bg}">
 							<td width="10%">{lang_loginid}</td>
 							<td width="15%">{lang_ip}</td>
 							<td width="20%">{lang_login}</td>
@@ -31,10 +31,10 @@
 							<td>{lang_total}</td>
 						</tr>
 						{rows_access}
-						<tr class="bg_color">
+						<tr bgcolor="{bg_color}">
 							<td colspan="5" align="left">{footer_total}</td>
 						</tr>
-						<tr class="bg_color">
+						<tr bgcolor="{bg_color}">
 							<td colspan="5" align="left">{lang_percent}</td>
 						</tr>
 					</table>
@@ -46,7 +46,7 @@
 <!-- END list -->
 
 <!-- BEGIN row -->
-	<tr class="{tr_color}">
+	<tr bgcolor="{tr_color}">
 		<td>{row_loginid}</td>
 		<td>{row_ip}</td>
 		<td>{row_li}</td>
@@ -56,7 +56,7 @@
 <!-- END row -->
 
 <!-- BEGIN row_empty -->
-	<tr class="{tr_color}">
+	<tr bgcolor="{tr_color}">
 		<td align="center" colspan="5">{row_message}</td>
 	</tr>
 <!-- END row_empty -->
diff --git a/admin/templates/default/account_form.tpl b/admin/templates/default/account_form.tpl
new file mode 100644
index 0000000000..4a688c7e78
--- /dev/null
+++ b/admin/templates/default/account_form.tpl
@@ -0,0 +1,93 @@
+<!-- BEGIN form -->
+{error_messages}
+
+ <form method="POST" action="{form_action}">
+ 	<div align="center">
+	<table border="0" width="95%">
+		<tr>
+			<td valign="top">
+				{rows}
+			</td>
+			<td valign="top">
+
+			   <table border=0 width=100%>
+			    <tr bgcolor="{th_bg}">
+			      <td colspan="4"><b>{lang_action}</b></td>
+			    </tr>
+				
+			    <tr bgcolor="{tr_color1}">
+			     <td width="25%">{lang_loginid}</td>
+			     <td width="25%">{account_lid}&nbsp;</td>
+				
+			     <td width="25%">{lang_account_active}:</td>
+			     <td width="25%">{account_status}</td>
+			    </tr>
+				
+			    <tr bgcolor="{tr_color2}">
+			     <td>{lang_firstname}</td>
+			     <td>{account_firstname}&nbsp;</td>
+			     <td>{lang_lastname}</td>
+			     <td>{account_lastname}&nbsp;</td>
+			    </tr>
+			
+			    {password_fields}
+			 
+			    <tr bgcolor="{tr_color2}">
+			     <td>{lang_changepassword}</td>
+			     <td>{changepassword}</td>
+			     <td>{lang_anonymous}</td>
+			     <td>{anonymous}</td>
+			    </tr>
+
+			    <tr bgcolor="{tr_color1}">
+			     <td>{lang_expires}</td>
+			     <td colspan="3">{input_expires}&nbsp;&nbsp;{lang_never}&nbsp;{never_expires}</td>
+			    </tr>
+	
+			    <tr bgcolor="{tr_color2}">
+			     <td>{lang_groups}</td>
+			     <td colspan="3">{groups_select}&nbsp;</td>
+			    </tr>
+
+			    {permissions_list}
+			
+				 {form_buttons}
+			
+			   </table>
+   			</td>
+   		</tr>
+   	</table>
+ 	</div>
+ </form>
+<!-- END form -->
+
+<!-- BEGIN form_passwordinfo -->
+    <tr bgcolor="{tr_color1}">
+     <td>{lang_password}</td>
+     <td><input type="password" name="account_passwd" value="{account_passwd}"></td>
+     <td>{lang_reenter_password}</td>
+     <td><input type="password" name="account_passwd_2" value="{account_passwd_2}"></td>
+    </tr>
+<!-- END form_passwordinfo -->
+
+<!-- BEGIN form_buttons_ -->
+    <tr bgcolor="{tr_color2}">
+     <td colspan="4" align="right"><input type="submit" name="submit" value="{lang_button}"></td>
+    </tr>
+<!-- END form_buttons_ -->
+
+<!-- BEGIN form_logininfo -->
+    <tr bgcolor="{tr_color1}">
+     <td>{lang_lastlogin}</td>
+     <td>{account_lastlogin}</td>
+
+     <td>{lang_lastloginfrom}</td>
+     <td>{account_lastloginfrom}</td>
+    </tr>
+<!-- END form_logininfo -->
+
+<!-- BEGIN link_row -->
+	<tr bgcolor="{tr_color}">
+		<td>&nbsp;<a href="{row_link}">{row_text}</a></td>
+	</tr>
+<!-- END link_row -->
diff --git a/admin/templates/default/account_form_ldap.tpl b/admin/templates/default/account_form_ldap.tpl
index 309811d983..9c163607dd 100644
--- a/admin/templates/default/account_form_ldap.tpl
+++ b/admin/templates/default/account_form_ldap.tpl
@@ -2,56 +2,74 @@
 {error_messages}
 
  <form method="POST" action="{form_action}">
-  <div align="center"> 
-  <table border="0" width="95%">
-    <tr>
-      <td valign="top">
-        {rows}
-      </td>
-      <td valign="top">
-         <table border=0 width=100%>
-          <tr class="th">
-            <td colspan="4"><b>{lang_action}</b></td>
-          </tr>
-          <tr class="tr_color1">
-           <td width="25%">{lang_loginid}</td>
-           <td width="25%">{account_lid}&nbsp;</td>
-           <td width="25%">{lang_account_active}:</td>
-           <td width="25%">{account_status}</td>
-          </tr>
-          <tr class="tr_color2">
-           <td>{lang_firstname}</td>
-           <td>{account_firstname}&nbsp;</td>
-           <td>{lang_lastname}</td>
-           <td>{account_lastname}&nbsp;</td>
-          </tr>
-          {password_fields}
-          <tr class="tr_color2">
-           <td>{lang_homedir}</td>
-           <td>{homedirectory}&nbsp;</td>
-           <td>{lang_shell}</td>
-           <td>{loginshell}&nbsp;</td>
-          </tr>
-          <tr class="tr_color2">
-           <td>{lang_groups}</td>
-           <td colspan="3">{groups_select}&nbsp;</td>
-          </tr>
-          <tr class="tr_color1">
-           <td>{lang_expires}</td>
-           <td colspan="3">{input_expires}&nbsp;&nbsp;{lang_never}&nbsp;{never_expires}</td>
-          </tr>
-          {permissions_list}
-          {form_buttons}
-        </table>
-      </td>
-    </tr>
-  </table>
-  </div>
+	<div align="center"> 
+	<table border="0" width="95%">
+		<tr>
+			<td valign="top">
+				{rows}
+			</td>
+			<td valign="top">
+
+			   <table border=0 width=100%>
+			    <tr bgcolor="{th_bg}">
+			      <td colspan="4"><b>{lang_action}</b></td>
+			    </tr>
+				
+			    <tr bgcolor="{tr_color1}">
+			     <td width="25%">{lang_loginid}</td>
+			     <td width="25%">{account_lid}&nbsp;</td>
+				
+			     <td width="25%">{lang_account_active}:</td>
+			     <td width="25%">{account_status}</td>
+			    </tr>
+				
+			    <tr bgcolor="{tr_color2}">
+			     <td>{lang_firstname}</td>
+			     <td>{account_firstname}&nbsp;</td>
+			     <td>{lang_lastname}</td>
+			     <td>{account_lastname}&nbsp;</td>
+			    </tr>
+			
+				{password_fields}
+
+			    <tr bgcolor="{tr_color2}">
+				 <td>{lang_homedir}</td>
+				 <td>{homedirectory}&nbsp;</td>
+				 <td>{lang_shell}</td>
+				 <td>{loginshell}&nbsp;</td>
+				</tr>
+
+			    <tr bgcolor="{tr_color2}">
+			     <td>{lang_expires}</td>
+			     <td colspan="3">{input_expires}&nbsp;&nbsp;{lang_never}&nbsp;{never_expires}</td>
+			    </tr>
+ 
+			    <tr bgcolor="{tr_color1}">
+			     <td>{lang_changepassword}</td>
+			     <td>{changepassword}</td>
+			     <td>{lang_anonymous}</td>
+			     <td>{anonymous}</td>
+			    </tr>
+
+			    <tr bgcolor="{tr_color2}">
+			     <td>{lang_groups}</td>
+			     <td colspan="3">{groups_select}&nbsp;</td>
+			    </tr>
+			
+				{permissions_list}
+			    
+				 {form_buttons}
+			
+			   </table>
+   			</td>
+   		</tr>
+   	</table>
+	</div>
  </form>
 <!-- END form -->
 
 <!-- BEGIN form_passwordinfo -->
-    <tr class="tr_color1">
+    <tr bgcolor="{tr_color1}">
      <td>{lang_password}</td>
      <td><input type="password" name="account_passwd" value="{account_passwd}"></td>
      <td>{lang_reenter_password}</td>
@@ -60,16 +78,13 @@
 <!-- END form_passwordinfo -->
 
 <!-- BEGIN form_buttons_ -->
-    <tr class="tr_color2">
-     <td colspan="2" align="left"><input type="submit" name="submit" value="{lang_button}"></td>
-    </form>
-    <form method="POST" action="{cancel_action}">
-     <td colspan="2" align="right"><input type="submit" name="cancel" value="{lang_cancel}"></td>
+    <tr bgcolor="{tr_color2}">
+     <td colspan="4" align="right"><input type="submit" name="submit" value="{lang_button}"></td>
     </tr>
 <!-- END form_buttons_ -->
 
 <!-- BEGIN form_logininfo -->
-    <tr class="tr_color1">
+    <tr bgcolor="{tr_color1}">
      <td>{lang_lastlogin}</td>
      <td>{account_lastlogin}</td>
 
@@ -79,7 +94,7 @@
 <!-- END form_logininfo -->
 
 <!-- BEGIN link_row -->
-  <tr class="{tr_color}">
-    <td>&nbsp;<a href="{row_link}">{row_text}</a></td>
-  </tr>
+	<tr bgcolor="{tr_color}">
+		<td>&nbsp;<a href="{row_link}">{row_text}</a></td>
+	</tr>
 <!-- END link_row -->
diff --git a/admin/templates/default/accounts.tpl b/admin/templates/default/accounts.tpl
new file mode 100644
index 0000000000..de2834693b
--- /dev/null
+++ b/admin/templates/default/accounts.tpl
@@ -0,0 +1,62 @@
+<!-- BEGIN list -->
+<p>
+ <div align="center">
+  <table border="0" width="70%">
+   <tr>
+    <td align="left">{left_next_matchs}</td>
+    <td align="center">{lang_user_accounts}</td>
+    <td align="right">{right_next_matchs}</td>
+   </tr>
+  </table>
+ </div>
+
+ <div align="center">
+  <table border="0" width="70%">
+   <tr bgcolor="{th_bg}">
+    <td>{lang_loginid}</td>
+    <td>{lang_lastname}</td>
+    <td>{lang_firstname}</td>
+    <td>{lang_edit}</td>
+    <td>{lang_delete}</td>
+    <td>{lang_view}</td>
+   </tr>
+
+   {rows}
+
+  </table>
+ </div>
+
+ <form method="POST" action="{actionurl}">
+  <div align="center">
+   <table border="0" width="70%">
+    <tr>
+     <td align="left">
+      {input_add}
+      </form>
+     </td>
+     <td align="right">
+      <form method="POST" action="{accounts_url}">
+       {input_search}
+      </form>
+     </td>
+    </tr>
+   </table>
+  </div>
+<!-- END list -->
+
+<!-- BEGIN row -->
+   <tr bgcolor="{tr_color}">
+    <td>{row_loginid}</td>
+    <td>{row_lastname}</td>
+    <td>{row_firstname}</td>
+    <td width="5%">{row_edit}</td>
+    <td width="5%">{row_delete}</td>
+    <td width="5%">{row_view}</td>
+   </tr>
+<!-- END row -->
+
+<!-- BEGIN row_empty -->
+   <tr>
+    <td colspan="5" align="center">{message}</td>
+   </tr>
+<!-- END row_empty -->
diff --git a/admin/templates/default/acl_accounts.tpl b/admin/templates/default/acl_accounts.tpl
index e2c30522fb..0938c91de7 100644
--- a/admin/templates/default/acl_accounts.tpl
+++ b/admin/templates/default/acl_accounts.tpl
@@ -14,7 +14,7 @@
 
  <div align="center">
   <table border="0" width="70%">
-   <tr class="th">
+   <tr bgcolor="{th_bg}">
     <td>{lang_loginid}</td>
     <td>{lang_lastname}</td>
     <td>{lang_firstname}</td>
@@ -42,7 +42,7 @@
 <!-- END list -->
 
 <!-- BEGIN row -->
-   <tr class="{tr_color}">
+   <tr bgcolor="{tr_color}">
     <td>{row_loginid}</td>
     <td>{row_lastname}</td>
     <td>{row_firstname}</td>
diff --git a/admin/templates/default/acl_applist.tpl b/admin/templates/default/acl_applist.tpl
index 3bfa6d08f3..ed5312c15c 100644
--- a/admin/templates/default/acl_applist.tpl
+++ b/admin/templates/default/acl_applist.tpl
@@ -1,21 +1,21 @@
 <!-- BEGIN list -->
-<b>{lang_header}</b>
-<hr><p>
-
 <table width="75%" border="0" cellspacing="0" cellpadding="0">
  {rows}
 </table>
+<form method="POST" action="{cancel_action}">
+	<input type="submit" name="cancel" value="{lang_cancel}">
+</form>
 <!-- END list -->
 
 <!-- BEGIN app_row -->
- <tr class="icon_backcolor">
+ <tr bgcolor="{icon_backcolor}">
   <td width="5%" valign="middle"><img src="{app_icon}" alt="[ {app_name} ]"> <a name="{a_name}"></a></td>
   <td width="95%" valign="middle"><strong>&nbsp;&nbsp;{app_name}</strong></td>
  </tr>
 <!-- END app_row -->
 
 <!-- BEGIN app_row_noicon -->
- <tr class="icon_backcolor">
+ <tr bgcolor="{icon_backcolor}">
   <td colspan="2" width="95%" valign="middle"><strong>&nbsp;&nbsp;{app_name}</strong> <a name="{a_name}"></a></td>
  </tr>
 <!-- END app_row_noicon -->
diff --git a/admin/templates/default/acl_manager_form.tpl b/admin/templates/default/acl_manager_form.tpl
index c10c9a75bd..0def47790c 100644
--- a/admin/templates/default/acl_manager_form.tpl
+++ b/admin/templates/default/acl_manager_form.tpl
@@ -1,20 +1,11 @@
 <!-- BEGIN form -->
-<b>{lang_title}</b>
-<hr><p>
-
 <form method="POST" action="{form_action}">
- <table border="0" width="60%" cellspacing="5" cellpadding="5">
-  <tr>
-   <td colspan="2">{lang_message}</td>
-  </tr>
-  <tr>
-   <td colspan="2">{select_values}</td>
-  </tr>
-  <tr>
-   <td align="left"><input type="submit" name="submit" value="{lang_submit}"></td>
-   <td align="left"><input type="submit" name="cancel" value="{lang_cancel}"></td>
-  </tr>
- </table>
+ <div align="left">
+  <p>{lang_message}</p>
+  <p>{select_values}</p>
+  <p><input type="submit" name="submit" value="{lang_submit}"> &nbsp;
+     <input type="submit" name="cancel" value="{lang_cancel}"></p>
+ </div>
 </form>
 
 <!-- END form -->
diff --git a/admin/templates/default/app_data.xsl b/admin/templates/default/app_data.xsl
deleted file mode 100644
index e70fafebdc..0000000000
--- a/admin/templates/default/app_data.xsl
+++ /dev/null
@@ -1,92 +0,0 @@
-<!-- $Id$ -->
-
-	<xsl:template name="app_data">
-		<xsl:choose>
-			<xsl:when test="list">
-				<xsl:apply-templates select="list"/>
-			</xsl:when>
-			<xsl:when test="cat_list">
-				<xsl:call-template name="cats"/>
-			</xsl:when>
-			<xsl:when test="cat_edit">
-				<xsl:call-template name="cats"/>
-			</xsl:when>
-			<xsl:when test="group_list">
-				<xsl:call-template name="groups"/>
-			</xsl:when>
-			<xsl:when test="group_edit">
-				<xsl:call-template name="groups"/>
-			</xsl:when>
-			<xsl:when test="account_list">
-				<xsl:call-template name="users"/>
-			</xsl:when>
-			<xsl:when test="account_edit">
-				<xsl:call-template name="users"/>
-			</xsl:when>
-			<xsl:when test="delete">
-				<xsl:call-template name="app_delete"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:apply-templates select="list"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-<!-- BEGIN mainscreen -->
-
-	<xsl:template match="list">
-		<table width="75%" border="0" cellspacing="0" cellpadding="0">
-			<xsl:choose>
-				<xsl:when test="app_row_icon">
-					<xsl:apply-templates select="app_row_icon"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates select="app_row_noicon"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</table>
-	</xsl:template>
-
-	<xsl:template match="app_row_icon">
-		<xsl:variable name="app_icon" select="app_icon"/>
-		<xsl:variable name="app_title" select="app_title"/>
-		<xsl:variable name="app_name" select="app_name"/>
-		<tr class="th_bright">
-			<td width="5%" valign="middle"><img src="{$app_icon}" alt="{$app_title}" name="{$app_title}"/></td>
-			<td width="95%" valign="middle" class="th_text"><xsl:value-of select="app_title"/></td>
-		</tr>
-		<xsl:apply-templates select="link_row"/>
-		<tr>
-			<td colspan="2">&nbsp;</td>
-		</tr>
-	</xsl:template>
-
-	<xsl:template match="app_row_noicon">
-		<tr class="th_bright">
-			<td colspan="2" width="100%" class="th_text">&nbsp;<xsl:value-of select="app_title"/></td>
-		</tr>
-		<xsl:apply-templates select="link_row"/>
-		<tr>
-			<td colspan="2">&nbsp;</td>
-		</tr>
-	</xsl:template>
-
-	<xsl:template match="link_row">
-		<xsl:variable name="pref_link" select="pref_link"/>
-		<tr>
-			<xsl:attribute name="class">
-				<xsl:choose>
-					<xsl:when test="@class">
-						<xsl:value-of select="@class"/>
-					</xsl:when>
-					<xsl:when test="position() mod 2 = 0">
-						<xsl:text>row_off</xsl:text>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>row_on</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
-			<td colspan="2">&nbsp;&#8226;&nbsp;<a href="{$pref_link}"><xsl:value-of select="pref_text"/></a></td>
-		</tr>
-	</xsl:template>
diff --git a/admin/templates/default/application_form.tpl b/admin/templates/default/application_form.tpl
index acbd227345..a584dffdd8 100644
--- a/admin/templates/default/application_form.tpl
+++ b/admin/templates/default/application_form.tpl
@@ -1,21 +1,25 @@
 <!-- BEGIN form -->
-<p><b>{lang_header}</b>
-<hr><p>
 {error}
-
+<br>
 <form action="{form_action}" method="POST">
  {hidden_vars}
  <div align="center">
  <table border="0" width="55%">
-  <tr class="th">
+  <tr bgcolor="{th_bg}">
    <td colspan="2">&nbsp;</td>
   </tr>
 
   {rows}
 
   <tr>
-   <td colspan="2" align="center">
-    <input type="submit" name="submit" value="{lang_submit_button}">
+   <td nowrap>
+    <input type="submit" name="save" value="{lang_save_button}"> &nbsp;
+    <input type="submit" name="cancel" value="{lang_cancel_button}">
+   </td>
+   <td align="right">&nbsp;
+<!-- BEGIN delete_button -->
+    <input type="submit" name="delete" value="{lang_delete_button}">
+<!-- END delete_button -->
    </td>
   </tr>
 
@@ -25,7 +29,7 @@
 <!-- END form -->
 
 <!-- BEGIN row -->
-  <tr class="{tr_color}">
+  <tr bgcolor="{tr_color}">
    <td>{label}</td>
    <td>{value}</td>
   </tr>
diff --git a/admin/templates/default/applications.tpl b/admin/templates/default/applications.tpl
index c92fa434e4..2b44c8f692 100644
--- a/admin/templates/default/applications.tpl
+++ b/admin/templates/default/applications.tpl
@@ -1,10 +1,8 @@
 <!-- BEGIN list -->
-<p><b>{lang_installed}</b><hr><p>
-
-<p>
+<br>
 <div align="center">
  <table border="0" width="45%">
-  <tr class="bg_color">
+  <tr bgcolor="{bg_color}">
 {left}
     <td align="center">{lang_showing}</td>
 {right}
@@ -12,7 +10,7 @@
  </table>
  
  <table border="0" width="45%">
-  <tr class="th">
+  <tr bgcolor="{th_bg}">
    <td> {sort_title} </td>
    <td>{lang_edit}</td>
    <td>{lang_delete}</td>
@@ -22,10 +20,14 @@
   {rows}
 
  </table>
+ 
+ {addbutton}
+<!-- END list -->
 
+<!-- BEGIN add -->
  <table border="0" width="45%">
   <tr>
-   <td align="left">
+   <td align="left" nobreak>
     <form method="POST" action="{new_action}">
      <input type="submit" value="{lang_add}"> 
     </form>
@@ -36,13 +38,13 @@
   </tr>
  </table>
 </div>
-<!-- END list -->
+<!-- END add -->
 
 <!-- BEGIN row -->
-  <tr class="{tr_color}">
+  <tr bgcolor="{tr_color}">
    <td>{name}</td>
    <td width="5%">{edit}</td>
    <td width="5%">{delete}</td>
-   <td width="5%">{status}</td>
+   <td width="5%" align="center">{status}</td>
   </tr>
 <!-- END row -->
diff --git a/admin/templates/default/category_form.tpl b/admin/templates/default/category_form.tpl
new file mode 100644
index 0000000000..1bea5d9bd8
--- /dev/null
+++ b/admin/templates/default/category_form.tpl
@@ -0,0 +1,28 @@
+<!-- $Id$ -->
+
+<!-- BEGIN form -->
+
+<div align="center">
+{message}<br>
+<form name="form" action="{action_url}" method="POST">
+<table border="0" width="80%" cellspacing="2" cellpadding="2"> 
+	<tr bgcolor="{row_on}">
+		<td>{lang_parent}</td>
+		<td><select name="new_parent"><option value="">{lang_none}</option>{category_list}</select></td>
+	</tr>
+	<tr bgcolor="{row_off}">
+		<td>{lang_name}:</td>
+		<td><input name="cat_name" size="50" value="{cat_name}"></td>
+	</tr>
+	<tr bgcolor="{row_on}">
+		<td valign="top">{lang_descr}:</td>
+		<td colspan="2"><textarea name="cat_description" rows="4" cols="50" wrap="virtual">{cat_description}</textarea></td>
+	</tr>
+	<tr height="50" valign="bottom">
+		<td><input type="submit" name="save" value="{lang_save}"></td>
+		<td align="right"><input type="submit" name="cancel" value="{lang_cancel}"></td>
+	</tr>
+</table>
+</form>
+
+<!-- END form -->
diff --git a/admin/templates/default/cats.xsl b/admin/templates/default/cats.xsl
deleted file mode 100644
index f376730482..0000000000
--- a/admin/templates/default/cats.xsl
+++ /dev/null
@@ -1,210 +0,0 @@
-<!-- $Id$ -->
-
-	<xsl:template name="cats">
-		<xsl:choose>
-			<xsl:when test="cat_list">
-				<xsl:apply-templates select="cat_list"/>
-			</xsl:when>
-			<xsl:when test="cat_edit">
-				<xsl:apply-templates select="cat_edit"/>
-			</xsl:when>
-		</xsl:choose>
-	</xsl:template>
-
-<!-- BEGIN cat_list -->
-
-	<xsl:template match="cat_list">
-		<center>
-		<table border="0" cellspacing="2" cellpadding="2">
-			<tr>
-				<td colspan="5" width="100%">
-					<xsl:call-template name="nextmatchs"/>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="5" width="100%" align="right">
-					<xsl:call-template name="search_field"/>
-				</td>
-			</tr>
-				<xsl:apply-templates select="cat_header"/>
-				<xsl:apply-templates select="cat_data"/>
-				<xsl:apply-templates select="cat_add"/>
-		</table>
-		</center>
-	</xsl:template>
-
-<!-- BEGIN cat_header -->
-
-	<xsl:template match="cat_header">
-		<xsl:variable name="sort_name" select="sort_name"/>
-		<xsl:variable name="sort_descr" select="sort_descr"/>
-		<xsl:variable name="lang_sort_statustext" select="lang_sort_statustext"/>
-		<tr class="th">
-			<td width="20%"><a href="{$sort_name}" onMouseover="window.status='{$lang_sort_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_name"/></a></td>
-			<td width="32%"><a href="{$sort_descr}" onMouseover="window.status='{$lang_sort_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_descr"/></a></td>
-			<td width="8%" align="center"><xsl:value-of select="lang_add_sub"/></td>
-			<td width="8%" align="center"><xsl:value-of select="lang_edit"/></td>
-			<td width="8%" align="center"><xsl:value-of select="lang_delete"/></td>
-		</tr>
-	</xsl:template>
-
-<!-- BEGIN cat_data -->
-
-	<xsl:template match="cat_data">
-		<xsl:variable name="lang_add_sub_statustext"><xsl:value-of select="lang_add_sub_statustext"/></xsl:variable>
-		<xsl:variable name="lang_edit_statustext"><xsl:value-of select="lang_edit_statustext"/></xsl:variable>
-		<xsl:variable name="lang_delete_statustext"><xsl:value-of select="lang_delete_statustext"/></xsl:variable>
-		<tr>
-			<xsl:attribute name="class">
-				<xsl:choose>
-					<xsl:when test="@class">
-						<xsl:value-of select="@class"/>
-					</xsl:when>
-					<xsl:when test="position() mod 2 = 0">
-						<xsl:text>row_off</xsl:text>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>row_on</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
-			<xsl:choose>
-				<xsl:when test="main = 'yes'">
-					<td class="alarm"><b><xsl:value-of disable-output-escaping="yes" select="name"/></b></td>
-					<td class="alarm"><b><xsl:value-of select="descr"/></b></td>
-				</xsl:when>
-				<xsl:otherwise>
-					<td><xsl:value-of disable-output-escaping="yes" select="name"/></td>
-					<td><xsl:value-of select="descr"/></td>
-				</xsl:otherwise>
-			</xsl:choose>
-			<td align="center">
-				<xsl:variable name="add_sub_url" select="add_sub_url"/>
-				<a href="{$add_sub_url}" onMouseover="window.status='{$lang_add_sub_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_add_sub"/></a>
-			</td>
-			<td align="center">
-				<xsl:variable name="edit_url" select="edit_url"/>
-				<a href="{$edit_url}" onMouseover="window.status='{$lang_edit_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_edit"/></a>
-			</td>
-			<td align="center">
-				<xsl:variable name="delete_url" select="delete_url"/>
-				<a href="{$delete_url}" onMouseover="window.status='{$lang_delete_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_delete"/></a>
-			</td>
-		</tr>
-	</xsl:template>
-
-<!-- BEGIN cat_add -->
-
-	<xsl:template match="cat_add">
-			<tr height="50" valign="bottom">
-			<xsl:variable name="action_url"><xsl:value-of select="action_url"/></xsl:variable>
-			<form method="post" action="{$action_url}">
-				<td colspan="2">
-				<xsl:variable name="lang_add"><xsl:value-of select="lang_add"/></xsl:variable>
-					<input type="submit" name="add" value="{$lang_add}" onMouseout="window.status='';return true;">
-						<xsl:attribute name="onMouseover">
-							<xsl:text>window.status='</xsl:text>
-								<xsl:value-of select="lang_add_statustext"/>
-							<xsl:text>'; return true;</xsl:text>
-						</xsl:attribute>
-					</input>
-				</td>
-				<td colspan="3" align="right">
-				<xsl:variable name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
-					<input type="submit" name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
-						<xsl:attribute name="onMouseover">
-							<xsl:text>window.status='</xsl:text>
-								<xsl:value-of select="lang_done_statustext"/>
-							<xsl:text>'; return true;</xsl:text>
-						</xsl:attribute>
-					</input>
-				</td>
-			</form>
-			</tr>
-	</xsl:template>
-
-<!-- END cat_list -->
-
-<!-- BEGIN cat_edit -->
-
-	<xsl:template match="cat_edit">
-		<table cellpadding="2" cellspacing="2" align="center">
-			<tr>
-				<td colspan="3" align="center">
-					<xsl:value-of select="message"/>
-				</td>
-			</tr>
-			<xsl:variable name="edit_url" select="edit_url"/>
-			<form method="post" action="{$edit_url}">
-			<tr>
-				<td width="23%" colspan="2">
-					<xsl:value-of select="lang_parent"/>
-				</td>
-				<td width="77%">
-					<xsl:call-template name="cat_select"/>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2"><xsl:value-of select="lang_name"/>:</td>
-				<td><input name="values[name]" size="50" onMouseout="window.status='';return true;">
-						<xsl:attribute name="onMouseover">
-							<xsl:text>window.status='</xsl:text>
-								<xsl:value-of select="lang_name_statustext"/>
-							<xsl:text>'; return true;</xsl:text>
-						</xsl:attribute>
-						<xsl:attribute name="value">
-							<xsl:value-of select="value_name"/>
-						</xsl:attribute>
-					</input>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2" valign="top"><xsl:value-of select="lang_descr"/>:</td>
-				<td><textarea cols="60" rows="10" name="values[descr]" wrap="virtual" onMouseout="window.status='';return true;">
-						<xsl:attribute name="onMouseover">
-							<xsl:text>window.status='</xsl:text>
-								<xsl:value-of select="lang_descr_statustext"/>
-							<xsl:text>'; return true;</xsl:text>
-						</xsl:attribute>
-						<xsl:value-of select="value_descr"/>		
-					</textarea>
-				</td>
-			</tr>
-
-			<tr height="50" valign="bottom">
-				<td>
-					<xsl:variable name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
-					<xsl:variable name="old_parent"><xsl:value-of select="old_parent"/></xsl:variable>
-					<input type="hidden" name="values[old_parent]" value="{$old_parent}"/>
-					<input type="submit" name="values[save]" value="{$lang_save}" onMouseout="window.status='';return true;">
-						<xsl:attribute name="onMouseover">
-							<xsl:text>window.status='</xsl:text>
-								<xsl:value-of select="lang_save_statustext"/>
-							<xsl:text>'; return true;</xsl:text>
-						</xsl:attribute>
-					</input>
-				</td>
-				<td>
-				<xsl:variable name="lang_apply" select="lang_apply"/>
-					<input type="reset" name="values[apply]" value="{$lang_apply}" onMouseout="window.status='';return true;">
-						<xsl:attribute name="onMouseover">
-							<xsl:text>window.status='</xsl:text>
-								<xsl:value-of select="lang_apply_statustext"/>
-							<xsl:text>'; return true;</xsl:text>
-						</xsl:attribute>
-					</input>
-				</td>
-				<td align="right">
-				<xsl:variable name="lang_cancel"><xsl:value-of select="lang_cancel"/></xsl:variable>
-					<input type="submit" name="values[cancel]" value="{$lang_cancel}" onMouseout="window.status='';return true;">
-						<xsl:attribute name="onMouseover">
-							<xsl:text>window.status='</xsl:text>
-								<xsl:value-of select="lang_cancel_statustext"/>
-							<xsl:text>'; return true;</xsl:text>
-						</xsl:attribute>
-					</input>
-				</td>
-			</tr>
-			</form>
-		</table>
-	</xsl:template>
diff --git a/admin/templates/default/config.tpl b/admin/templates/default/config.tpl
index fc0c79f8d8..71bf009dd0 100644
--- a/admin/templates/default/config.tpl
+++ b/admin/templates/default/config.tpl
@@ -1,19 +1,13 @@
-<!-- $Id$ -->
-
 <!-- BEGIN header -->
-
 <form method="POST" action="{action_url}">
-<table border="0" align="center" width="85%">
+<table align="center" width="85%" callspacing="0" style="{ border: 1px solid #000000; }">
    <tr class="th">
     <td colspan="2">&nbsp;<b>{title}</b></td>
    </tr>
-
 <!-- END header -->
-
 <!-- BEGIN body -->
-
    <tr class="row_on">
-    <td>{lang_Would_you_like_phpGroupWare_to_check_for_new_application_versions_when_admins_login_?}:</td>
+    <td>{lang_Would_you_like_phpGroupWare_to_check_for_a_new_version<br>when_admins_login_?}:</td>
     <td>
      <select name="newsettings[checkfornewversion]">
       <option value="">{lang_No}</option>
@@ -53,6 +47,11 @@
    </tr>
 
    <tr class="row_off">
+    <td>{lang_Maximum_entries_in_click_path_history}:</td>
+    <td><input size="8" name="newsettings[max_history]" value="{value_max_history}"></td>
+   </tr>
+
+   <tr class="row_on">
     <td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_(at_login-time)_?}:</td>
     <td>
      <select name="newsettings[disable_autoload_langfiles]">
@@ -62,27 +61,6 @@
     </td>
    </tr>
 
-<!-- not yet implemented (.16 only atm)
-   <tr class="row_on">
-    <td>{lang_Maximum_entries_in_click_path_history}:</td>
-    <td><input size="8" name="newsettings[max_history]" value="{value_max_history}"></td>
-   </tr>
--->
-<!--
-   <tr class="row_off">
-     <td>{lang_Default_file_system_space_per_user/lang_group_?}:</td>
-     <td>
-      <input type="text" name="newsettings[vfs_default_account_size_number]" size="7" value="{value_vfs_default_account_size_number}">&nbsp;&nbsp;
-      <select name="newsettings[vfs_default_account_size_type]">
-       <option value="gb"{selected_vfs_default_account_size_type_gb}>GB</option>
-       <option value="mb"{selected_vfs_default_account_size_type_mb}>MB</option>
-       <option value="kb"{selected_vfs_default_account_size_type_kb}>KB</option>
-       <option value="b"{selected_vfs_default_account_size_type_b}>B</option>
-      </select>
-     </td>
-    </tr>
--->
-
    <tr class="th">
     <td colspan="2">&nbsp;<b>{lang_appearance}</b></td>
    </tr>
@@ -92,8 +70,7 @@
     <td><input name="newsettings[site_title]" value="{value_site_title}"></td>
    </tr>
 
-<!-- not yet implemented (.16 only atm)
-    <tr class="row_off">
+   <tr class="row_off">
     <td>{lang_Enter_the_background_color_for_the_site_title}:</td>
     <td>#<input name="newsettings[login_bg_color_title]" value="{value_login_bg_color_title}"></td>
    </tr>
@@ -117,24 +94,32 @@
     <td>{lang_Enter_the_title_of_your_logo}:</td>
     <td><input name="newsettings[login_logo_title]" value="{value_login_logo_title}"></td>
    </tr>
--->
-<!--
-   <tr class="row_off">
-    <td>{lang_How_would_you_like_to_sort_applications_in_the_navbar?}:</td>
+
+   <tr class="row_on">
+    <td>{lang_Show_'powered_by'_logo_on}:</td>
     <td>
-     <select name="newsettings[app_order]">
-      <option value="">{lang_Order_id}</option>
-      <option value="True"{selected_app_order_True}>{lang_Alphabetically}</option>
+     <select name="newsettings[showpoweredbyon]">
+      <option value="bottom" {selected_showpoweredbyon_bottom}>{lang_bottom}</option>
+      <option value="top" {selected_showpoweredbyon_top}>{lang_top}</option>
+     </select>
+    </td>
+   </tr>
+
+   <tr class="row_off">
+    <td>{lang_Use_pure_HTML_compliant_code_(not_fully_working_yet)}:</td>
+    <td>
+     <select name="newsettings[htmlcompliant]">
+      <option value="">{lang_No}</option>
+      <option value="True"{selected_htmlcompliant_True}>{lang_Yes}</option>
      </select>
     </td>
    </tr>
--->
 
    <tr class="th">
     <td colspan="2">&nbsp;<b>{lang_security}</b></td>
    </tr>
 
-   <tr class="row_off">
+   <tr class="row_on">
     <td>{lang_Use_cookies_to_pass_sessionid}:</td>
     <td>
      <select name="newsettings[usecookies]">
@@ -144,7 +129,7 @@
     </td>
    </tr>
 
-   <tr class="row_on">
+   <tr class="row_off">
     <td>{lang_check_ip_address_of_all_sessions}:</td>
     <td>
      <select name="newsettings[sessions_checkip]">
@@ -164,38 +149,21 @@
     </td>
    </tr>
 
-   <tr class="row_off">
-    <td>{lang_Minimum_password_length}:</td>
-    <td><input size="4" name="newsettings[pass_min_length]" value="{value_pass_min_length}"></td>
-   </tr>
 
-   <tr class="row_on">
-    <td>{lang_Require_non-alpha_characters}:</td>
-    <td>
-     <select name="newsettings[pass_require_non_alpha]">
-      <option value="">{lang_No}</option>
-      <option value="True"{selected_pass_require_non_alpha_True}>{lang_Yes}</option>
-     </select>
-    </td>
-   </tr>
+<!--
    <tr class="row_off">
-    <td>{lang_Require_numerical_characters}:</td>
-    <td>
-     <select name="newsettings[pass_require_numbers]">
-      <option value="">{lang_No}</option>
-      <option value="True"{selected_pass_require_numbers_True}>{lang_Yes}</option>
-     </select>
-    </td>
-   </tr>
-   <tr class="row_on">
-    <td>{lang_Require_special_characters}:</td>
-    <td>
-     <select name="newsettings[pass_require_special_char]">
-      <option value="">{lang_No}</option>
-      <option value="True"{selected_pass_require_special_char_True}>{lang_Yes}</option>
-     </select>
-    </td>
-   </tr>
+     <td>{lang_Default_file_system_space_per_user}/{lang_group_?}:</td>
+     <td>
+      <input type="text" name="newsettings[vfs_default_account_size_number]" size="7" value="{value_vfs_default_account_size_number}">&nbsp;&nbsp;
+      <select name="newsettings[vfs_default_account_size_type]">
+       <option value="gb"{selected_vfs_default_account_size_type_gb}>GB</option>
+       <option value="mb"{selected_vfs_default_account_size_type_mb}>MB</option>
+       <option value="kb"{selected_vfs_default_account_size_type_kb}>KB</option>
+       <option value="b"{selected_vfs_default_account_size_type_b}>B</option>
+      </select>
+     </td>
+    </tr>
+-->
 
    <tr class="row_off">
     <td>{lang_How_many_days_should_entries_stay_in_the_access_log,_before_they_get_deleted_(default_90)_?}:</td>
@@ -232,17 +200,15 @@
     </td>
    </tr>
 
-<!-- not yet implemented (.16 only atm)
    <tr class="row_on">
     <td>{lang_Disable_"auto_completion"_of_the_login_form_}:</td>
     <td>
       <select name="newsettings[autocomplete_login]">
          <option value="">{lang_No}</option>
-         <option value="True"{autocomplete_login}>{lang_Yes}</option>
+	 <option value="True"{autocomplete_login}>{lang_Yes}</option>
        </select>
     </td>
    </tr>
--->
 <!-- END body -->
 
 <!-- BEGIN footer -->
@@ -255,6 +221,7 @@
     <td colspan="2" align="center">
       <input type="submit" name="submit" value="{lang_submit}">
       <input type="submit" name="cancel" value="{lang_cancel}">
+		  <br>
     </td>
   </tr>
 </table>
diff --git a/admin/templates/default/config_footer.tpl b/admin/templates/default/config_footer.tpl
index c640044646..dd925ed01c 100644
--- a/admin/templates/default/config_footer.tpl
+++ b/admin/templates/default/config_footer.tpl
@@ -1,5 +1,5 @@
 <!-- BEGIN footer -->
-  <tr class="th">
+  <tr bgcolor="{th_bg}">
     <td colspan="2">
 &nbsp;
     </td>
diff --git a/admin/templates/default/config_head.tpl b/admin/templates/default/config_head.tpl
index 7929450181..a30664540c 100644
--- a/admin/templates/default/config_head.tpl
+++ b/admin/templates/default/config_head.tpl
@@ -1,7 +1,7 @@
 <!-- BEGIN head -->
 <form method="POST" action="{action_url}">
 <table border="0" align="center">
-   <tr class="th">
+   <tr bgcolor="{th_bg}">
     <td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
    </tr>
 <!-- END head -->
diff --git a/admin/templates/default/currentusers.tpl b/admin/templates/default/currentusers.tpl
index 9c248d310a..0379944735 100644
--- a/admin/templates/default/currentusers.tpl
+++ b/admin/templates/default/currentusers.tpl
@@ -1,14 +1,14 @@
 <!-- BEGIN list -->
 <br>
 <table border="0" width="95%" align="center">
- <tr class="bg_color">
+ <tr bgcolor="{bg_color}">
    {left_next_matchs}
    <td>&nbsp;</td>
    <td>&nbsp;</td>
    {right_next_matchs}
  </tr> 
 
- <tr class="th">
+ <tr bgcolor="{th_bg}">
   <td>{sort_loginid}</td>
   <td>{sort_ip}</td>
   <td>{sort_login_time}</td>
@@ -24,7 +24,7 @@
 <!-- END list -->
 
 <!-- BEGIN row -->
- <tr class="{tr_color}">
+ <tr bgcolor="{tr_color}">
   <td>{row_loginid}</td>
   <td>{row_ip}</td>
   <td>{row_logintime}</td>
@@ -33,3 +33,5 @@
   <td>{row_kill}</td>
  </tr>
 <!-- END row -->
+
+
diff --git a/admin/templates/default/delete_cat.tpl b/admin/templates/default/delete_cat.tpl
new file mode 100644
index 0000000000..af38b9c23a
--- /dev/null
+++ b/admin/templates/default/delete_cat.tpl
@@ -0,0 +1,35 @@
+<!-- $Id$ -->
+
+<!-- BEGIN form -->
+<br>
+	<form method="POST" action="{action_url}">
+		{hidden_vars}
+		<table border="0" with="65%" cellpadding="2" cellspacing="2" align="center">
+			<tr>
+				<td align="center" colspan="2">
+					<p><b>{cat_name}</b></p>
+					{messages}
+				</td>
+			</tr>
+			<tr>
+				<td align="center" colspan="2">{lang_subs}&nbsp;{subs}</td>
+			</tr>
+			<tr>
+<!-- BEGIN delete -->
+				<td align="center">
+					<input type="submit" name="confirm" value="{lang_yes}">
+				</td>
+				<td align="center">
+					<input type="submit" name="cancel" value="{lang_no}">
+				</td>
+<!-- END delete -->
+<!-- BEGIN done -->
+				<td align="center">
+					<input type="submit" name="cancel" value="{lang_ok}">
+				</td>
+<!-- END done -->
+			</tr>
+		</table>
+	</form>
+
+<!-- END form -->
diff --git a/admin/templates/default/delete_common.tpl b/admin/templates/default/delete_common.tpl
index c92490b32a..188635320c 100644
--- a/admin/templates/default/delete_common.tpl
+++ b/admin/templates/default/delete_common.tpl
@@ -1,16 +1,20 @@
 <!-- BEGIN form -->
- <center>
+<p>
+<center>
+ <form action="{form_action}" method="POST">
+  {hidden_vars}
   <table align="center" border="0" width="55%" cols="2">
    {messages}
    <tr>
     <td width="50%" align="center">
-     {no}
+     <input type="submit" name="no" value="{no}">
     </td>
     <td width="50%" align="center">
-     {yes}
+     <input type="submit" name="yes" value="{yes}">
     </td>
    </tr>
   </table>
- </center>
+ </form> 
+</center>
 <!-- END form -->
 
diff --git a/admin/templates/default/group_form.tpl b/admin/templates/default/group_form.tpl
new file mode 100644
index 0000000000..012bd15057
--- /dev/null
+++ b/admin/templates/default/group_form.tpl
@@ -0,0 +1,79 @@
+<script language="JavaScript">
+	self.name="first_Window";
+	function accounts_popup()
+	{
+		Window1=window.open('{accounts_link}',"Search","width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes");
+	}
+</script>
+
+  {error}
+  <table border="0" width="50%" align="center">
+   <tr>
+    <td valign="top">
+     {rows}
+    </td>
+    <td valign="top">
+     <table border=0 width=100%>
+      <form action="{form_action}" method="POST" name="app_form">
+       {hidden_vars}
+       <tr>
+        <td>{lang_group_name}</td>
+        <td><input name="account_name" value="{group_name_value}"></td>
+       </tr>
+
+       <tr>
+        <td>{lang_include_user}</td>
+
+		<td>
+		{accounts}
+        </td>
+       </tr>
+
+       <tr>
+        <td>{lang_file_space}</td>
+        <td>
+           {account_file_space}{account_file_space_select}
+        </td>
+       </tr>
+
+       <tr>
+        <td>{lang_permissions}</td>
+        <td><table width="100%" border="0" cols="6">
+         {permissions_list}
+        </table></td>
+       </tr>
+
+       <tr>
+        <td colspan="2" align="center">
+         <input type="submit" name="edit" value="{lang_submit_button}">
+        </td>
+       </tr>
+      </form>
+     </table>
+    </td>
+   </tr>
+  </table>
+
+<!-- BEGIN select -->
+
+        <select name="account_user[]" multiple size="{select_size}">
+             {user_list}
+            </select>
+
+<!-- END select -->
+
+<!-- BEGIN popwin -->
+
+		<table>
+			<tr>
+				<td>
+					<select name="account_user[]" multiple size="{select_size}">{user_list}</select>
+				</td>
+				<td valign="top">
+        			<input type="button" value="{lang_open_popup}" onClick="accounts_popup()">
+					<input type="hidden" name="accountid" value="{accountid}">
+				</td>
+			</tr>
+		</table>
+
+<!-- END popwin -->
diff --git a/admin/templates/default/group_manager.tpl b/admin/templates/default/group_manager.tpl
index 82f2aa5575..7554e2abc2 100755
--- a/admin/templates/default/group_manager.tpl
+++ b/admin/templates/default/group_manager.tpl
@@ -10,14 +10,14 @@
 			<td valign="top">
 
 			   <table border="0" width="100%">
-			    <tr class="th">
+			    <tr bgcolor="{th_bg}">
 			      <td><b>{lang_group}:</b></td>
 			      <td><b>{group_name}</b></td>
 			    </tr>
 				
 			    <form action="{form_action}" method="post">
 			    {hidden}
-			    <tr class="tr_color1">
+			    <tr bgcolor="{tr_color1}">
 			     <td>{lang_select_managers}</td>
 			     <td>{group_members}</td>
 			    </tr>
@@ -31,7 +31,7 @@
 <!-- END form -->
 
 <!-- BEGIN link_row -->
-	<tr class="{tr_color}">
+	<tr bgcolor="{tr_color}">
 		<td>&nbsp;<a href="{row_link}">{row_text}</a></td>
 	</tr>
 <!-- END link_row -->
diff --git a/admin/templates/default/groups.tpl b/admin/templates/default/groups.tpl
new file mode 100644
index 0000000000..55a6d44ae9
--- /dev/null
+++ b/admin/templates/default/groups.tpl
@@ -0,0 +1,50 @@
+<!-- BEGIN list -->
+<p>
+ <table border="0" width="45%" align="center">
+  <tr>
+   <td align="left">{left_next_matchs}</td>
+   <td align="center">{lang_groups}</td>
+   <td align="right">{right_next_matchs}</td>
+  </tr>
+ </table>
+
+ <table border="0" width="45%" align="center">
+  <tr bgcolor="{th_bg}">
+   <td>{sort_name}</td>
+   <td>{header_edit}</td>
+   <td>{header_delete}</td>
+  </tr>
+
+  {rows}
+
+ </table>
+
+ <table border="0" width="45%" align="center">
+  <tr>
+   <td align="left">
+    <form method="POST" action="{new_action}">
+     {input_add}
+    </form>
+   </td>
+   <td align="right">
+    <form method="POST" action="{search_action}">
+     {input_search}
+    </form>
+   </td>
+  </tr>
+ </table>
+<!-- END list -->
+
+<!-- BEGIN row -->
+ <tr bgcolor="{tr_color}">
+  <td>{group_name}</td>
+  <td width="5%">{edit_link}</td>
+  <td width="5%">{delete_link}</td>
+ </tr>
+<!-- END row -->
+
+<!-- BEGIN row_empty -->
+   <tr>
+    <td colspan="5" align="center">{message}</td>
+   </tr>
+<!-- END row_empty -->
diff --git a/admin/templates/default/groups.xsl b/admin/templates/default/groups.xsl
deleted file mode 100644
index 1ccaebae6d..0000000000
--- a/admin/templates/default/groups.xsl
+++ /dev/null
@@ -1,244 +0,0 @@
-<!-- $Id$ -->
-
-	<xsl:template name="groups">
-		<xsl:choose>
-			<xsl:when test="group_list">
-				<xsl:apply-templates select="group_list"/>
-			</xsl:when>
-			<xsl:when test="group_edit">
-				<xsl:apply-templates select="group_edit"/>
-			</xsl:when>
-		</xsl:choose>
-	</xsl:template>
-
-<!-- BEGIN group_list -->
-
-	<xsl:template match="group_list">
-		<center>
-		<table border="0" cellspacing="2" cellpadding="2">
-			<tr>
-				<td colspan="3" width="100%">
-					<xsl:call-template name="nextmatchs"/>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="3" width="100%" align="right">
-					<xsl:choose>
-						<xsl:when test="search_access = 'yes'">
-							<xsl:call-template name="search_field"/>
-						</xsl:when>
-					</xsl:choose>
-				</td>
-			</tr>
-				<xsl:apply-templates select="group_header"/>
-				<xsl:apply-templates select="group_data"/>
-				<xsl:apply-templates select="group_add"/>
-		</table>
-		</center>
-	</xsl:template>
-
-<!-- BEGIN group_header -->
-
-	<xsl:template match="group_header">
-		<xsl:variable name="sort_name" select="sort_name"/>
-		<xsl:variable name="lang_sort_statustext" select="lang_sort_statustext"/>
-		<tr class="th">
-			<td width="20%"><a href="{$sort_name}" onMouseover="window.status='{$lang_sort_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_name"/></a></td>
-			<td width="8%" align="center"><xsl:value-of select="lang_edit"/></td>
-			<td width="8%" align="center"><xsl:value-of select="lang_delete"/></td>
-		</tr>
-	</xsl:template>
-
-<!-- BEGIN group_data -->
-
-	<xsl:template match="group_data">
-		<xsl:variable name="lang_edit_statustext"><xsl:value-of select="lang_edit_statustext"/></xsl:variable>
-		<xsl:variable name="lang_delete_statustext"><xsl:value-of select="lang_delete_statustext"/></xsl:variable>
-		<tr>
-			<xsl:attribute name="class">
-				<xsl:choose>
-					<xsl:when test="@class">
-						<xsl:value-of select="@class"/>
-					</xsl:when>
-					<xsl:when test="position() mod 2 = 0">
-						<xsl:text>row_off</xsl:text>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>row_on</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
-			<td><xsl:value-of select="group_name"/></td>
-			<td align="center">
-				<xsl:variable name="edit_url" select="edit_url"/>
-				<a href="{$edit_url}" onMouseover="window.status='{$lang_edit_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_edit"/></a>
-			</td>
-			<td align="center">
-				<xsl:variable name="delete_url" select="delete_url"/>
-				<a href="{$delete_url}" onMouseover="window.status='{$lang_delete_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_delete"/></a>
-			</td>
-		</tr>
-	</xsl:template>
-
-<!-- BEGIN group_add -->
-
-	<xsl:template match="group_add">
-			<tr height="50">
-			<xsl:variable name="action_url"><xsl:value-of select="action_url"/></xsl:variable>
-			<form method="post" action="{$action_url}">
-				<td valign="bottom">
-					<xsl:choose>
-						<xsl:when test="add_access = 'yes'">
-						<xsl:variable name="lang_add"><xsl:value-of select="lang_add"/></xsl:variable>
-							<input type="submit" name="add" value="{$lang_add}" onMouseout="window.status='';return true;">
-								<xsl:attribute name="onMouseover">
-									<xsl:text>window.status='</xsl:text>
-									<xsl:value-of select="lang_add_statustext"/>
-									<xsl:text>'; return true;</xsl:text>
-								</xsl:attribute>
-							</input>
-						</xsl:when>
-					</xsl:choose>
-				</td>
-				<td align="right" valign="bottom" colspan="2">
-				<xsl:variable name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
-					<input type="submit" name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
-						<xsl:attribute name="onMouseover">
-							<xsl:text>window.status='</xsl:text>
-								<xsl:value-of select="lang_done_statustext"/>
-							<xsl:text>'; return true;</xsl:text>
-						</xsl:attribute>
-					</input>
-				</td>
-			</form>
-			</tr>
-	</xsl:template>
-
-<!-- END group_list -->
-
-<!-- BEGIN group_edit -->
-
-	<xsl:template match="group_edit">
-		<table border="0" cellpadding="2" cellspacing="2" align="center" width="79%">
-			<xsl:choose>
-				<xsl:when test="msgbox_data != ''">
-					<tr>
-						<td align="center"><xsl:call-template name="msgbox"/></td>
-					</tr>
-				</xsl:when>
-			</xsl:choose>
-			<tr>
-				<td valign="top">
-<!-- {rows} -->
-				</td>
-				<td valign="top">
-					<table border="0" width="100%">
-						<xsl:variable name="edit_url"><xsl:value-of select="edit_url"/></xsl:variable>
-						<xsl:variable name="account_id" select="account_id"/>
-						<xsl:variable name="select_size" select="select_size"/>
-						<form action="{$edit_url}" method="POST">
-						<input type="hidden" name="values[account_id]" value="{$account_id}"/>
-						<tr>
-							<td><xsl:value-of select="lang_account_name"/></td>
-							<td><input name="values[account_name]">
-								<xsl:attribute name="value">
-									<xsl:value-of select="value_account_name"/>
-								</xsl:attribute>
-								</input>
-							</td>
-						</tr>
-						<tr>
-							<td><xsl:value-of select="lang_include_user"/></td>
-							<td>
-								<select name="account_user[]" multiple="multiple" size="{$select_size}">
-									<xsl:apply-templates select="user_list"/>
-								</select>
-							</td>
-						</tr>
-						<tr>
-							<td><xsl:value-of select="lang_file_space"/></td>
-							<td>
-<!-- {account_file_space}{account_file_space_select} -->
-							</td>
-						</tr>
-						<tr>
-							<td valign="top"><xsl:value-of select="lang_permissions"/></td>
-							<td>
-								<table width="100%" border="0" cellpadding="2" cellspacing="2">
-									<tr class="th">
-										<td><xsl:value-of select="lang_application"/></td>
-										<td>&nbsp;</td>
-										<td><xsl:value-of select="lang_acl"/></td>
-									</tr>
-										<xsl:apply-templates select="app_list"/>
-								</table>
-							</td>
-						</tr>
-						<tr>
-							<td>
-							<xsl:variable name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
-								<input type="submit" name="values[save]" value="{$lang_save}"/>
-							</td>
-							<td align="right">
-								<xsl:variable name="lang_cancel"><xsl:value-of select="lang_cancel"/></xsl:variable>
-								<input type="submit" name="values[cancel]" value="{$lang_cancel}"/>
-							</td>
-						</tr>
- 						</form>
-					</table>
-				</td>
-			</tr>
-		</table>
-	</xsl:template>
-
-	<xsl:template match="user_list">
-		<xsl:variable name="account_id" select="account_id"/>
-		<xsl:choose>
-			<xsl:when test="selected != ''">
-				<option value="{$account_id}" selected="selected"><xsl:value-of select="account_name"/></option>
-			</xsl:when>
-			<xsl:otherwise>
-				<option value="{$account_id}"><xsl:value-of select="account_name"/></option>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-	<xsl:template match="app_list">
-		<xsl:variable name="checkbox_name" select="checkbox_name"/>
-		<tr>
-			<xsl:attribute name="class">
-				<xsl:choose>
-					<xsl:when test="@class">
-						<xsl:value-of select="@class"/>
-					</xsl:when>
-					<xsl:when test="position() mod 2 = 0">
-						<xsl:text>row_off</xsl:text>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>row_on</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
-			<td width="40%"><xsl:value-of select="app_name"/></td>
-			<td width="5%" align="center">
-				<xsl:choose>
-					<xsl:when test="checked != ''">
-						<input type="checkbox" name="{$checkbox_name}" value="True" checked="checked"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<input type="checkbox" name="{$checkbox_name}" value="True"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</td>
-			<td width="5%" align="center">
-				<xsl:choose>
-					<xsl:when test="acl_url != ''">
-						<xsl:variable name="acl_url" select="acl_url"/>
-						<xsl:variable name="acl_img" select="acl_img"/>
-						<xsl:variable name="img_name" select="img_name"/>
-						<a href="{$acl_url}"><img src="{$acl_img}" border="0" hspace="3" align="absmiddle" alt="{$img_name}" name="{$img_name}"/></a>
-					</xsl:when>
-				</xsl:choose>
-			</td>
-		</tr>
-	</xsl:template>
diff --git a/admin/templates/default/images/navbar.png b/admin/templates/default/images/navbar.png
index 677112d33c..7bcb24ceec 100644
Binary files a/admin/templates/default/images/navbar.png and b/admin/templates/default/images/navbar.png differ
diff --git a/admin/templates/default/index.tpl b/admin/templates/default/index.tpl
new file mode 100755
index 0000000000..410675d84a
--- /dev/null
+++ b/admin/templates/default/index.tpl
@@ -0,0 +1,51 @@
+<!-- BEGIN list -->
+<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
+	var phpinfo;
+
+	function openwindow(url)
+	{
+		if (phpinfo)
+		{
+			if (phpinfo.closed)
+			{
+				phpinfo.stop;
+				phpinfo.close;
+			}
+		}
+		phpinfo = window.open(url, "phpinfoWindow","width=700,height=600,location=no,menubar=no,directories=no,toolbar=no,scrollbars=yes,resizable=yes,status=no");
+		if (phpinfo.opener == null)
+		{
+			phpinfo.opener = window;
+		}
+	}
+</SCRIPT>
+
+<table width="75%" border="0" cellspacing="0" cellpadding="0">
+ {rows}
+</table>
+<!-- END list -->
+
+<!-- BEGIN app_row -->
+ <tr bgcolor="{icon_backcolor}">
+  <td width="5%" valign="middle"><img src="{app_icon}" alt="[ {app_name} ]"> <a name="{a_name}"></a></td>
+  <td width="95%" valign="middle"><strong>&nbsp;&nbsp;{app_name}</strong></td>
+ </tr>
+<!-- END app_row -->
+
+<!-- BEGIN app_row_noicon -->
+ <tr bgcolor="{icon_backcolor}">
+  <td colspan="2" width="95%" valign="middle"><strong>&nbsp;&nbsp;{app_name}</strong> <a name="{a_name}"></a></td>
+ </tr>
+<!-- END app_row_noicon -->
+
+<!-- BEGIN link_row -->
+ <tr>
+  <td colspan="2">&nbsp;&#8226;&nbsp;<a href="{pref_link}">{pref_text}</a></td>
+ </tr>
+<!-- END link_row -->
+
+<!-- BEGIN spacer_row -->
+ <tr>
+  <td colspan="2">&nbsp;</td>
+ </tr>
+<!-- END spacer_row -->
diff --git a/admin/templates/default/kill_session.tpl b/admin/templates/default/kill_session.tpl
index fd47b4fef8..5f9d1eec8a 100644
--- a/admin/templates/default/kill_session.tpl
+++ b/admin/templates/default/kill_session.tpl
@@ -1,6 +1,4 @@
-<b>{lang_title}</b>
-<hr><p>
-
+<br>
 <table border="0" with="65%" align="center">
 	<tr colspan="2">
 		<td align="center">{lang_message}<td>
diff --git a/admin/templates/default/listcats.tpl b/admin/templates/default/listcats.tpl
new file mode 100644
index 0000000000..95ff7edf60
--- /dev/null
+++ b/admin/templates/default/listcats.tpl
@@ -0,0 +1,53 @@
+<!-- $Id$ -->
+
+	<center>
+		<table border="0" cellspacing="2" cellpadding="2">
+			<tr>
+				<td colspan="5" align="left">
+					<table border="0" width="100%">
+						<tr>
+						{left}
+							<td align="center">{lang_showing}</td>
+						{right}
+						</tr>
+					</table>
+				</td>
+			</tr>
+<!-- BEGIN search -->
+			<tr>
+				<td colspan="5" align="right">
+					<form method="post" action="{action_nurl}">
+					<input type="text" name="query">&nbsp;<input type="submit" name="search" value="{lang_search}"></form></td>
+			</tr>
+<!-- END search -->
+			<tr bgcolor="{th_bg}">
+				<td width="20%">{sort_name}</td>
+				<td width="32%">{sort_description}</td>
+				<td width="8%" align="center">{lang_sub}</td>
+				<td width="8%" align="center">{lang_edit}</td>
+				<td width="8%" align="center">{lang_delete}</td>
+			</tr>
+
+<!-- BEGIN cat_list -->
+
+			<tr bgcolor="{tr_color}">
+				<td>{name}</td>
+				<td>{descr}</td>
+				<td align="center">{add_sub}</a></td>
+				<td align="center">{edit}</a></td>
+				<td align="center">{delete}</a></td>  
+			</tr>
+
+<!-- END cat_list -->
+
+
+			<tr valign="bottom" height="50">
+			<form method="POST" action="{action_url}">
+<!-- BEGIN add -->
+				<td colspan="2"><input type="submit" name="add" value="{lang_add}"></td>
+<!-- END add -->
+				<td colspan="3" align="right"><input type="submit" name="done" value="{lang_done}"></td>
+			</form>
+			</tr>
+		</table>
+	</center>
diff --git a/admin/templates/default/listservers.tpl b/admin/templates/default/listservers.tpl
index aab1bf94f4..a5832a645d 100644
--- a/admin/templates/default/listservers.tpl
+++ b/admin/templates/default/listservers.tpl
@@ -1,8 +1,5 @@
  <center>
   <table border="0" cellspacing="2" cellpadding="2">
-   <tr>
-    <td colspan="6" align="center" bgcolor="#c9c9c9"><b>{title_servers}<b/></td>
-   </tr>
    <tr>
     <td colspan="6" align="left">
      <table border="0" width="100%">
@@ -14,42 +11,45 @@
      </table>
     </td>
    </tr>
+   
+<!-- BEGIN search -->
    <tr>
-    <td>&nbsp;</td>
     <td colspan="6" align="right">
      <form method="post" action="{actionurl}">
      <input type="text" name="query">&nbsp;<input type="submit" name="search" value="{lang_search}"></form></td>
    </tr>
-   <tr class="th">
-    <td class="th">{sort_name}</td>
-    <td class="th">{sort_url}</td>
-    <td class="th">{sort_mode}</td>
-    <td class="th">{sort_security}</td>
-    <td class="th" align="center">{lang_edit}</td>
-    <td class="th" align="center">{lang_delete}</td>
+<!-- END search -->
+
+   <tr bgcolor="{th_bg}">
+    <td bgcolor="{th_bg}">{sort_name}</td>
+    <td bgcolor="{th_bg}">{sort_url}</td>
+    <td bgcolor="{th_bg}">{sort_mode}</td>
+    <td bgcolor="{th_bg}">{sort_security}</td>
+    <td bgcolor="{th_bg}" align="center">{lang_edit}</td>
+    <td bgcolor="{th_bg}" align="center">{lang_delete}</td>
    </tr>
 
 <!-- BEGIN server_list -->
-   <tr class="{tr_color}">
+   <tr bgcolor="{tr_color}">
     <td>{server_name}</td>
     <td>{server_url}</td>
     <td>{server_mode}</td>
     <td>{server_security}&nbsp;</td>
-    <td align="center"><a href="{edit}">{lang_edit_entry}</a></td>
-    <td align="center"><a href="{delete}">{lang_delete_entry}</a></td>
+    <td align="center">{edit}</td>
+    <td align="center">{delete}</td>
    </tr>
 <!-- END server_list -->
 
-<!-- BEGIN add   -->
-</form>
    <tr valign="bottom">
-     <form method="POST" action="{add_action}">
-     <td colspan="3"><input type="submit" name="add" value="{lang_add}"></form></td>
-     </form>
-     <form method="POST" action="{doneurl}">
-     <td align="right" colspan="3"><input type="submit" name="done" value="{lang_done}"></form></td>
-   </tr>
+<!-- BEGIN add   -->
+     <td><form method="POST" action="{add_action}">
+       <input type="submit" name="add" value="{lang_add}"></form>
+     </td>
 <!-- END add -->
+     <td><form method="POST" action="{doneurl}">
+       <input type="submit" name="done" value="{lang_done}"></form>
+     </td>
+   </tr>
 
   </table>
  </center>
diff --git a/admin/templates/default/mainscreen_message.tpl b/admin/templates/default/mainscreen_message.tpl
index 43c6fbc8cc..7be96641cf 100644
--- a/admin/templates/default/mainscreen_message.tpl
+++ b/admin/templates/default/mainscreen_message.tpl
@@ -1,7 +1,5 @@
 <!-- BEGIN form -->
-<p><b>{header_lang}</b><hr>
-
-{error_message}<p>
+<p align="center">{error_message}</p>
 
 <form method="POST" action="{form_action}">
  <table border="0" align="center" width="60%">
@@ -14,14 +12,14 @@
 <!-- END form -->
  
 <!-- BEGIN row -->
-  <tr class="{tr_color}">
+  <tr bgcolor="{tr_color}">
    <td>{label}</td>
    <td align="center">{value}</td>
   </tr>
 <!-- END row -->
 
 <!-- BEGIN row_2 -->
-  <tr class="{tr_color}">
+  <tr bgcolor="{tr_color}">
    <td colspan="2" align="center">{value}</td>
   </tr>
 <!-- END row_2 -->
diff --git a/admin/templates/default/menurow.tpl b/admin/templates/default/menurow.tpl
index cd69238a5a..8a4dd5d2fa 100644
--- a/admin/templates/default/menurow.tpl
+++ b/admin/templates/default/menurow.tpl
@@ -1,6 +1,6 @@
 <!-- BEGIN menu_links -->
 				<table border="0" width="100%">
-					<tr class="th">
+					<tr bgcolor="{th_bg}">
 						<td>&nbsp;</td>
 					</tr>
   					{all_rows}
@@ -8,12 +8,12 @@
 						<td>&nbsp;</td>
 					</tr>
 					<tr>
-						<td class="row_on">&nbsp;&nbsp;<a href="{link_done}">{lang_done}</a></td>
+						<td bgcolor="{row_on}">&nbsp;&nbsp;<a href="{link_done}">{lang_done}</a></td>
 					</tr>
 				</table>
 <!-- END menu_links -->
 <!-- BEGIN link_row -->
-					<tr class="{tr_color}">
+					<tr bgcolor="{tr_color}">
 						<td>&nbsp;&nbsp;<a href="{row_link}">{row_text}</a></td>
 					</tr>
 <!-- END link_row -->
diff --git a/admin/templates/default/nntp.tpl b/admin/templates/default/nntp.tpl
index 2632a54fff..bcde39b313 100755
--- a/admin/templates/default/nntp.tpl
+++ b/admin/templates/default/nntp.tpl
@@ -34,7 +34,7 @@ function check_all()
   <form name="allow" action="{action_url}" method="POST">
   {common_hidden_vars}
   <table border="0" width="70%">
-    <tr class="th">
+    <tr bgcolor="{th_bg}">
       <td align="center"><font size="2" face="{th_font}">{sort_con}</font></td>
       <td><font size="2" face="{th_font}">{sort_group}</font></td>
       <td align="center"><font size="2" face="{th_font}">{sort_active}</font></td>
@@ -45,7 +45,7 @@ function check_all()
 
 <!-- BEGIN nntp_list -->
 
-    <tr class="{tr_color}">
+    <tr bgcolor="{tr_color}">
       <td align="center"><font face="{th_font}">{con}</font></td>
       <td><font face="{th_font}">{group}</font></td>
       <td align="center"><font face="{th_font}">{active}</font></td>
@@ -55,7 +55,7 @@ function check_all()
 
 <!-- BEGIN nntp_footer -->
 
-    <tr class="th">
+    <tr bgcolor="{th_bg}">
       <td>&nbsp;</td>
       <td align="center"><input type="submit" name="submit" value="{lang_update}"></td>
       <td align=center>
diff --git a/admin/templates/default/server_form.tpl b/admin/templates/default/server_form.tpl
index fc6dafda78..e859e50e3f 100644
--- a/admin/templates/default/server_form.tpl
+++ b/admin/templates/default/server_form.tpl
@@ -1,84 +1,63 @@
 <!-- BEGIN form -->
- <center>
-  <table border="0" width="80%" cellspacing="2" cellpadding="2">
-   <tr>
-    <td colspan="1" align="center" bgcolor="#c9c9c9"><b>{title_servers}<b/></td>
-   </tr>
-  </table>
-  {message}
+<center>
+ {message}
+ <form name="form" action="{actionurl}" method="POST">
+  <input type="hidden" name="server_id" value="{server_id}">
   <table border="0" width="80%" cellspacing="2" cellpadding="2"> 
-  <form name="form" action="{actionurl}" method="POST">
-   <tr>
+   <tr bgcolor="{row_on}">
     <td>{lang_name}:</td>
     <td><input name="server_name" size="50" value="{server_name}"></td>
    </tr>
-   <tr>
+   <tr bgcolor="{row_off}">
     <td>{lang_url}:</td>
     <td><input name="server_url" size="50" value="{server_url}"></td>
    </tr>
-   <tr>
+   <tr bgcolor="{row_on}">
     <td>{lang_mode}:</td>
     <td>{server_mode}</td>
    </tr>
-   <tr>
+   <tr bgcolor="{row_off}">
     <td>{lang_security}:</td>
     <td>{server_security}&nbsp;{ssl_note}</td>
    </tr>
-   <tr>
+   <tr bgcolor="{row_on}">
     <td>{lang_trust}:</td>
     <td>{trust_level}</td>
    </tr>
-   <tr>
+   <tr bgcolor="{row_off}">
     <td>{lang_relationship}:</td>
     <td>{trust_relationship}</td>
    </tr>
-   <tr>
+   <tr bgcolor="{row_on}">
     <td>{lang_username}:</td>
     <td><input name="server_username" size="30" value="{server_username}"></td>
    </tr>
-   <tr>
+   <tr bgcolor="{row_off}">
     <td>{lang_password}:</td>
     <td><input type="password" name="server_password" size="30" value="">&nbsp;{pass_note}</td>
    </tr>
-   <tr>
+   <tr bgcolor="{row_on}">
     <td>{lang_admin_name}:</td>
     <td><input name="admin_name" size="50" value="{admin_name}"></td>
    </tr>
-   <tr>
+   <tr bgcolor="{row_off}">
     <td>{lang_admin_email}:</td>
     <td><input name="admin_email" size="50" value="{admin_email}"></td>
    </tr>
-  </table>
 
-<!-- BEGIN add -->
-  <table width="50%" border="0" cellspacing="2" cellpadding="2">
-   <tr valign="bottom">
-    <td height="50" align="center">
-     <input type="submit" name="submit" value="{lang_add}"></td>
-    <td height="50" align="center">
-     <input type="reset" name="reset" value="{lang_reset}"></form></td>
-    <td height="50" align="center">
-     <form method="POST" action="{doneurl}">
-     <input type="submit" name="done" value="{lang_done}"></form></td>
+   <tr>
+    <td nowrap>
+     <input type="submit" name="save" value="{lang_save}"> &nbsp;
+     <input type="submit" name="done" value="{lang_done}">
+    </td>
+<!-- BEGIN delete -->
+    <td align="right">
+     <input type="submit" name="delete" value="{lang_delete}">
+    </td>
+<!-- END delete -->
    </tr>
+  
   </table>
- </center>
-<!-- END add -->
-
-<!-- BEGIN edit -->
-  <table width="50%" border="0" cellspacing="2" cellpadding="2">
-   <tr valign="bottom">
-    <td height="50" align="center">
-     <input type="submit" name="submit" value="{lang_edit}"></form></td>
-    <td height="50" align="center">
-     <form method="POST" action="{deleteurl}">
-     <input type="submit" name="delete" value="{lang_delete}"></form></td>
-    <td height="50" align="center">
-     <form method="POST" action="{doneurl}">
-     <input type="submit" name="done" value="{lang_done}"></form></td>
-   </tr>
-  </table>
- </center>
-<!-- END edit -->
-
+ </form>
+</center>
 <!-- END form -->
diff --git a/admin/templates/default/users.xsl b/admin/templates/default/users.xsl
deleted file mode 100644
index 9f3c7a5dd6..0000000000
--- a/admin/templates/default/users.xsl
+++ /dev/null
@@ -1,288 +0,0 @@
-<!-- $Id$ -->
-
-	<xsl:template name="users">
-		<xsl:choose>
-			<xsl:when test="account_list">
-				<xsl:apply-templates select="account_list"/>
-			</xsl:when>
-			<xsl:when test="account_edit">
-				<xsl:apply-templates select="account_edit"/>
-			</xsl:when>
-		</xsl:choose>
-	</xsl:template>
-
-<!-- BEGIN user_list -->
-
-	<xsl:template match="account_list">
-		<center>
-		<table border="0" cellspacing="2" cellpadding="2">
-			<tr>
-				<td colspan="6" width="100%">
-					<xsl:call-template name="nextmatchs"/>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="6" width="100%" align="right">
-					<xsl:choose>
-						<xsl:when test="search_access = 'yes'">
-							<xsl:call-template name="search_field"/>
-						</xsl:when>
-					</xsl:choose>
-				</td>
-			</tr>
-				<xsl:apply-templates select="user_header"/>
-				<xsl:apply-templates select="user_data"/>
-				<xsl:apply-templates select="user_add"/>
-		</table>
-		</center>
-	</xsl:template>
-
-<!-- BEGIN user_header -->
-
-	<xsl:template match="user_header">
-		<xsl:variable name="sort_lid" select="sort_lid"/>
-		<xsl:variable name="sort_firstname" select="sort_firstname"/>
-		<xsl:variable name="sort_lastname" select="sort_lastname"/>
-		<xsl:variable name="lang_sort_statustext" select="lang_sort_statustext"/>
-		<tr class="th">
-			<td width="20%"><a href="{$sort_lid}" onMouseover="window.status='{$lang_sort_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_lid"/></a></td>
-			<td width="20%"><a href="{$sort_firstname}" onMouseover="window.status='{$lang_sort_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_firstname"/></a></td>
-			<td width="20%"><a href="{$sort_lastname}" onMouseover="window.status='{$lang_sort_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_lastname"/></a></td>
-			<td width="8%" align="center"><xsl:value-of select="lang_view"/></td>
-			<td width="8%" align="center"><xsl:value-of select="lang_edit"/></td>
-			<td width="8%" align="center"><xsl:value-of select="lang_delete"/></td>
-		</tr>
-	</xsl:template>
-
-<!-- BEGIN user_data -->
-
-	<xsl:template match="user_data">
-		<xsl:variable name="lang_view_statustext"><xsl:value-of select="lang_view_statustext"/></xsl:variable>
-		<xsl:variable name="lang_edit_statustext"><xsl:value-of select="lang_edit_statustext"/></xsl:variable>
-		<xsl:variable name="lang_delete_statustext"><xsl:value-of select="lang_delete_statustext"/></xsl:variable>
-		<tr>
-			<xsl:attribute name="class">
-				<xsl:choose>
-					<xsl:when test="@class">
-						<xsl:value-of select="@class"/>
-					</xsl:when>
-					<xsl:when test="position() mod 2 = 0">
-						<xsl:text>row_off</xsl:text>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>row_on</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
-			<td><xsl:value-of select="lid"/></td>
-			<td><xsl:value-of select="firstname"/></td>
-			<td><xsl:value-of select="lastname"/></td>
-			<td align="center">
-				<xsl:variable name="view_url" select="view_url"/>
-				<a href="{$view_url}" onMouseover="window.status='{$lang_view_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_view"/></a>
-			</td>
-			<td align="center">
-				<xsl:variable name="edit_url" select="edit_url"/>
-				<a href="{$edit_url}" onMouseover="window.status='{$lang_edit_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_edit"/></a>
-			</td>
-			<td align="center">
-				<xsl:variable name="delete_url" select="delete_url"/>
-				<a href="{$delete_url}" onMouseover="window.status='{$lang_delete_statustext}';return true;" onMouseout="window.status='';return true;" class="th_text"><xsl:value-of select="lang_delete"/></a>
-			</td>
-		</tr>
-	</xsl:template>
-
-<!-- BEGIN user_add -->
-
-	<xsl:template match="user_add">
-		<tr height="50">
-			<xsl:variable name="action_url"><xsl:value-of select="action_url"/></xsl:variable>
-			<form method="post" action="{$action_url}">
-			<td valign="bottom" colspan="3">
-				<xsl:choose>
-					<xsl:when test="add_access = 'yes'">
-					<xsl:variable name="lang_add"><xsl:value-of select="lang_add"/></xsl:variable>
-						<input type="submit" name="add" value="{$lang_add}" onMouseout="window.status='';return true;">
-							<xsl:attribute name="onMouseover">
-								<xsl:text>window.status='</xsl:text>
-								<xsl:value-of select="lang_add_statustext"/>
-								<xsl:text>'; return true;</xsl:text>
-							</xsl:attribute>
-						</input>
-					</xsl:when>
-				</xsl:choose>
-			</td>
-			<td align="right" valign="bottom" colspan="3">
-			<xsl:variable name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
-				<input type="submit" name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
-					<xsl:attribute name="onMouseover">
-						<xsl:text>window.status='</xsl:text>
-							<xsl:value-of select="lang_done_statustext"/>
-						<xsl:text>'; return true;</xsl:text>
-					</xsl:attribute>
-				</input>
-			</td>
-		</form>
-		</tr>
-	</xsl:template>
-
-<!-- END user_list -->
-
-<!-- BEGIN account_edit -->
-
-	<xsl:template match="account_edit">
-		<table border="0" cellpadding="2" cellspacing="2" align="center" width="95%">
-			<xsl:choose>
-				<xsl:when test="msgbox_data != ''">
-					<tr>
-						<td align="center" colspan="2"><xsl:call-template name="msgbox"/></td>
-					</tr>
-				</xsl:when>
-			</xsl:choose>
-			<tr>
-				<td valign="top">
-<!-- {rows} -->
-				</td>
-				<td valign="top">
-				<xsl:variable name="edit_url"><xsl:value-of select="edit_url"/></xsl:variable>
-				<form method="POST" action="{$edit_url}">
-					<table border="0" width="100%">
-						<xsl:variable name="account_id" select="account_id"/>
-						<xsl:variable name="account_lid" select="account_lid"/>
-						<xsl:variable name="account_firstname" select="account_firstname"/>
-						<xsl:variable name="account_lastname" select="account_lastname"/>
-						<xsl:variable name="account_passwd" select="account_passwd"/>
-						<xsl:variable name="account_passwd_2" select="account_passwd_2"/>
-						<tr class="row_on">
-							<td width="25%"><xsl:value-of select="lang_lid"/></td>
-							<td width="25%"><input type="text" name="values[account_lid]" value="{$account_lid}"/></td>
-							<td width="25%"><xsl:value-of select="lang_account_active"/></td>
-							<td width="25%">
-								<xsl:choose>
-									<xsl:when test="account_status = 'yes'">
-										<input type="checkbox" name="values[account_status]" value="A" checked="checked"/>
-									</xsl:when>
-									<xsl:otherwise>
-										<input type="checkbox" name="values[account_status]" value="A"/>
-									</xsl:otherwise>
-								</xsl:choose>
-							</td>
-						</tr>
-						<tr class="row_off">
-							<td><xsl:value-of select="lang_firstname"/></td>
-							<td><input type="text" name="values[account_firstname]" value="{$account_firstname}"/></td>
-							<td><xsl:value-of select="lang_lastname"/></td>
-							<td><input type="text" name="values[account_lastname]" value="{$account_lastname}"/></td>
-						</tr>
-
-<!-- BEGIN form_passwordinfo -->
-
-						<tr class="row_on">
-							<td><xsl:value-of select="lang_password"/></td>
-							<td><input type="password" name="values[account_passwd]" value="{$account_passwd}"/></td>
-							<td><xsl:value-of select="lang_reenter_password"/></td>
-							<td><input type="password" name="values[account_passwd_2]" value="{$account_passwd_2}"/></td>
-						</tr>
-
-<!-- END form_passwordinfo -->
-
-						<tr class="row_off">
-							<td><xsl:value-of select="lang_groups"/></td>
-							<td colspan="3">
-								<select name="account_groups[]" multiple="multiple">
-									<xsl:apply-templates select="group_list"/>
-								</select>
-							</td>
-						</tr>
-
-						<tr class="row_on">
-							<td><xsl:value-of select="lang_expires"/></td>
-							<td><xsl:value-of disable-output-escaping="yes" select="select_expires"/></td>
-							<td><xsl:value-of select="lang_never"/></td>
-							<td>
-								<xsl:choose>
-									<xsl:when test="expires_never = 'yes'">
-										<input type="checkbox" name="values[expires_never]" value="True" checked="checked"/>
-									</xsl:when>
-									<xsl:otherwise>
-										<input type="checkbox" name="values[expires_never]" value="True"/>
-									</xsl:otherwise>
-								</xsl:choose>
-							</td>
-						</tr>
-						<tr>
-							<td colspan="4" height="5"></td>
-						</tr>
-						<tr>
-							<td colspan="4">
-								<table width="100%" border="0" cellpadding="2" cellspacing="2">
-									<tr class="th">
-										<td><xsl:value-of select="lang_applications"/></td>
-										<td></td>
-									</tr>
-										<xsl:apply-templates select="app_list"/>
-								</table>
-							</td>
-						</tr>
-						<tr height="50" valign="bottom">
-							<td colspan="3">
-							<xsl:variable name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
-								<input type="submit" name="values[save]" value="{$lang_save}"/>
-							</td>
-							<td colspan="3" align="right">
-								<xsl:variable name="lang_cancel"><xsl:value-of select="lang_cancel"/></xsl:variable>
-								<input type="submit" name="values[cancel]" value="{$lang_cancel}"/>
-							</td>
-						</tr>
-					</table>
-				</form>
-				</td>
-			</tr>
-		</table>
-	</xsl:template>
-
-<!-- BEGIN group_list -->
-
-	<xsl:template match="group_list">
-		<xsl:variable name="account_id" select="account_id"/>
-		<xsl:choose>
-			<xsl:when test="selected != ''">
-				<option value="{$account_id}" selected="selected"><xsl:value-of select="account_lid"/></option>
-			</xsl:when>
-			<xsl:otherwise>
-				<option value="{$account_id}"><xsl:value-of select="account_lid"/></option>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-<!-- BEGIN app_list -->
-
-	<xsl:template match="app_list">
-		<xsl:variable name="checkbox_name" select="checkbox_name"/>
-		<tr>
-			<xsl:attribute name="class">
-				<xsl:choose>
-					<xsl:when test="@class">
-						<xsl:value-of select="@class"/>
-					</xsl:when>
-					<xsl:when test="position() mod 2 = 0">
-						<xsl:text>row_off</xsl:text>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>row_on</xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
-			<td width="40%"><xsl:value-of select="app_title"/></td>
-			<td width="5%" align="center">
-				<xsl:choose>
-					<xsl:when test="checked != ''">
-						<input type="checkbox" name="{$checkbox_name}" value="True" checked="checked"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<input type="checkbox" name="{$checkbox_name}" value="True"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</td>
-		</tr>
-	</xsl:template>
diff --git a/admin/templates/idots/images/navbar.png b/admin/templates/idots/images/navbar.png
new file mode 100755
index 0000000000..5de9eb1142
Binary files /dev/null and b/admin/templates/idots/images/navbar.png differ
diff --git a/admin/templates/idots/index.tpl b/admin/templates/idots/index.tpl
new file mode 100644
index 0000000000..673af0e6b3
--- /dev/null
+++ b/admin/templates/idots/index.tpl
@@ -0,0 +1,51 @@
+<!-- BEGIN list -->
+<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
+	var phpinfo;
+
+	function openwindow(url)
+	{
+		if (phpinfo)
+		{
+			if (phpinfo.closed)
+			{
+				phpinfo.stop;
+				phpinfo.close;
+			}
+		}
+		phpinfo = window.open(url, "phpinfoWindow","width=700,height=600,location=no,menubar=no,directories=no,toolbar=no,scrollbars=yes,resizable=yes,status=no");
+		if (phpinfo.opener == null)
+		{
+			phpinfo.opener = window;
+		}
+	}
+</SCRIPT>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+ {rows}
+</table>
+<!-- END list -->
+
+<!-- BEGIN app_row -->
+ <tr height="60" bgcolor="{icon_backcolor}">
+  <td width="5%" align="center" valign="middle" background="../phpgwapi/templates/idots/images/panel.png"><img src="{app_icon}" alt="[ {app_name} ]"> <a name="{a_name}"></a></td>
+  <td width="95%" valign="middle" background="../phpgwapi/templates/idots/images/panel.png"><strong>&nbsp;&nbsp;{app_name}</strong></td>
+ </tr>
+<!-- END app_row -->
+
+<!-- BEGIN app_row_noicon -->
+ <tr bgcolor="{icon_backcolor}">
+  <td colspan="2" width="95%" valign="middle"><strong>&nbsp;&nbsp;{app_name}</strong> <a name="{a_name}"></a></td>
+ </tr>
+<!-- END app_row_noicon -->
+
+<!-- BEGIN link_row -->
+ <tr>
+  <td colspan="2">&nbsp;&#8226;&nbsp;<a href="{pref_link}">{pref_text}</a></td>
+ </tr>
+<!-- END link_row -->
+
+<!-- BEGIN spacer_row -->
+ <tr>
+  <td colspan="2">&nbsp;</td>
+ </tr>
+<!-- END spacer_row -->
diff --git a/admin/templates/verdilak/images/navbar.gif b/admin/templates/verdilak/images/navbar.gif
new file mode 100755
index 0000000000..d2b0bfccf1
Binary files /dev/null and b/admin/templates/verdilak/images/navbar.gif differ
diff --git a/admin/templates/verdilak/images/navbar.png b/admin/templates/verdilak/images/navbar.png
new file mode 100644
index 0000000000..7bcb24ceec
Binary files /dev/null and b/admin/templates/verdilak/images/navbar.png differ
diff --git a/admin/testbutton.php b/admin/testbutton.php
index 7235918686..78f3b4f624 100755
--- a/admin/testbutton.php
+++ b/admin/testbutton.php
@@ -28,4 +28,6 @@
 	print "<br>the same as ascii<br>";
 	print $button->createInputButton("Lars is the best ;)",'submit','ascii');
 	print "</form>";
+	
+	$phpgw->common->phpgw_footer();
 ?>
diff --git a/favicon.ico b/favicon.ico
deleted file mode 100644
index 8810f8a02a..0000000000
Binary files a/favicon.ico and /dev/null differ
diff --git a/header.inc.php.template b/header.inc.php.template
index 1a0e58defa..9a01218564 100644
--- a/header.inc.php.template
+++ b/header.inc.php.template
@@ -44,12 +44,6 @@
 	/* Select which login template set you want, most people will use default */
 	$GLOBALS['phpgw_info']['login_template_set'] = 'default';
 
-	/* Select which login theme you want */
-	$GLOBALS['phpgw_info']['login_theme'] = 'submarine';
-
-	/* Enables support for non xslt apps or apps which weren't already ported to the last version of class.Templates.inc.php */
-	$GLOBALS['phpgw_info']['server']['support_old_style_apps'] = True;
-
 	/* This is used to control mcrypt's use */
 	$GLOBALS['phpgw_info']['server']['mcrypt_enabled'] = {ENABLE_MCRYPT};
 	/* Set this to 'old' for versions < 2.4, otherwise the exact mcrypt version you use. */
diff --git a/help.php b/help.php
deleted file mode 100644
index d665efad36..0000000000
--- a/help.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-	/**************************************************************************\
-	* phpGroupWare - help                                                      *
-	* start file for the phpGroupWare help system                              *
-	* http://www.phpgroupware.org                                              *
-	* Written by Bettina Gille [ceb@phpgroupware.org]                          *
-	* -----------------------------------------------                          *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-	/* $Id$ */
-
-	$GLOBALS['phpgw_info'] = array();
-
-	$app = $HTTP_GET_VARS['app'];
-
-	if (!$app)
-	{
-		$app = 'help';
-	}
-
-	$GLOBALS['phpgw_info']['flags'] = array
-	(
-		'headonly'		=> True,
-		'currentapp'	=> $app
-	);
-	include('header.inc.php');
-
-	$GLOBALS['phpgw']->help = CreateObject('phpgwapi.help_helper');
-
-	if ($app == 'help')
-	{
-		$GLOBALS['phpgw']->hooks->process('help',array('manual'));
-	}
-	else
-	{
-		$GLOBALS['phpgw']->hooks->single('help',$app);
-	}
-
-	$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->help->output);
-?>
diff --git a/home.php b/home.php
index 161d2423e3..c3fc9db783 100755
--- a/home.php
+++ b/home.php
@@ -20,79 +20,124 @@
 		exit;
 	}
 
-	$GLOBALS['sessionid'] = $GLOBALS['HTTP_GET_VARS']['sessionid'] ? $GLOBALS['HTTP_GET_VARS']['sessionid'] : $GLOBALS['HTTP_COOKIE_VARS']['sessionid'];
+	$GLOBALS['sessionid'] = @$GLOBALS['HTTP_GET_VARS']['sessionid'] ? $GLOBALS['HTTP_GET_VARS']['sessionid'] : $GLOBALS['HTTP_COOKIE_VARS']['sessionid'];
 	if (!isset($GLOBALS['sessionid']) || !$GLOBALS['sessionid'])
 	{
 		Header('Location: login.php');
 		exit;
 	}
 
+	$GLOBALS['phpgw_info']['flags'] = array(
+		'noheader'                => True,
+		'nonavbar'                => True,
+		'currentapp'              => 'home',
+		'enable_network_class'    => True,
+		'enable_contacts_class'   => True,
+		'enable_nextmatchs_class' => True
+	);
+	include('header.inc.php');
+
+	if ($_GET['phpgw_forward'])
+	{
+		foreach($_GET as $name => $value)
+		{
+			if (ereg('phpgw_',$name))
+			{
+				$extra_vars .= '&' . $name . '=' . urlencode($value);
+			}
+		}
+		$GLOBALS['phpgw']->redirect_link($_GET['phpgw_forward'],$extra_vars);
+		exit;
+	}
+
 	if ($GLOBALS['phpgw_info']['server']['force_default_app'] && $GLOBALS['phpgw_info']['server']['force_default_app'] != 'user_choice')
 	{
 		$GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'] = $GLOBALS['phpgw_info']['server']['force_default_app'];
 	}
 
-	if ($GLOBALS['HTTP_GET_VARS']['cd']=='yes' && $GLOBALS['phpgw_info']['user']['preferences']['common']['default_app']
-		&& $GLOBALS['phpgw_info']['user']['apps'][$GLOBALS['phpgw_info']['user']['preferences']['common']['default_app']])
-	{
-		//$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/' . $GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'] . '/' . 'index.php'));
-		Header('Location: ' . $GLOBALS['phpgw']->link('/' . $GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'] . '/' . 'index.php'));
-	}
-	else
-	{
-	$GLOBALS['phpgw_info']['flags'] = array
-	(
-		'noheader'					=> True,
-		'nonavbar'					=> True,
-		'currentapp'				=> 'home',
-		'enable_network_class'		=> True,
-		'enable_contacts_class'		=> True,
-		'enable_nextmatchs_class'	=> True
-	);
-	include('header.inc.php');
-
-	if ($GLOBALS['phpgw_forward'])
-	{
-		while (list($name,$value) = each($GLOBALS['HTTP_GET_VARS']))
+	if (($GLOBALS['phpgw_info']['user']['preferences']['common']['useframes'] &&
+		$GLOBALS['phpgw_info']['server']['useframes'] == 'allowed') ||
+		($GLOBALS['phpgw_info']['server']['useframes'] == 'always'))
 		{
-			if (ereg('phpgw_',$name))
+			if ($GLOBALS['HTTP_GET_VARS']['cd'] == 'yes')
 			{
-				$extra_vars .= '&' . $name . '=' . urlencode($value);
+				if (! $navbarframe && ! $framebody)
+				{
+					$tpl = new Template(PHPGW_TEMPLATE_DIR);
+					$tpl->set_file(array(
+						'frames'       => 'frames.tpl',
+						'frame_body'   => 'frames_body.tpl',
+						'frame_navbar' => 'frames_navbar.tpl'
+					));
+					$tpl->set_var('navbar_link',$GLOBALS['phpgw']->link('index.php','navbarframe=True&cd=yes'));
+					if ($GLOBALS['forward'])
+					{
+						$tpl->set_var('body_link',$GLOBALS['phpgw']->link($GLOBALS['forward']));
+					}
+					else
+					{
+						$tpl->set_var('body_link',$GLOBALS['phpgw']->link('index.php','framebody=True&cd=yes'));
+					}
+
+					if ($GLOBALS['phpgw_info']['user']['preferences']['common']['frame_navbar_location'] == 'bottom')
+					{
+						$tpl->set_var('frame_size','*,60');
+						$tpl->parse('frames_','frame_body',True);
+						$tpl->parse('frames_','frame_navbar',True);
+					}
+					else
+					{
+						$tpl->set_var('frame_size','60,*');
+						$tpl->parse('frames_','frame_navbar',True);
+						$tpl->parse('frames_','frame_body',True);
+					}
+					$tpl->pparse('out','frames');
+				}
+				if ($navbarframe)
+				{
+					$GLOBALS['phpgw']->common->phpgw_header();
+					echo parse_navbar();
+				}
 			}
 		}
-		$GLOBALS['phpgw']->redirect_link($GLOBALS['phpgw_forward'],$extra_vars);
-	}
-
-	$GLOBALS['phpgw']->translation->add_app('mainscreen');
-	if (lang('mainscreen_message') != 'mainscreen_message'.lang_char())
-	{
-		$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array(
-			'mainscreen_message' => stripslashes(lang('mainscreen_message'))
-		));
-	}
-
-	if ((isset($GLOBALS['phpgw_info']['user']['apps']['admin']) &&
-		$GLOBALS['phpgw_info']['user']['apps']['admin']) &&
-		(isset($GLOBALS['phpgw_info']['server']['checkfornewversion']) &&
-		$GLOBALS['phpgw_info']['server']['checkfornewversion']))
-	{
-		$GLOBALS['phpgw']->network->set_addcrlf(False);
-		$lines = $GLOBALS['phpgw']->network->gethttpsocketfile('http://www.phpgroupware.org/currentversion');
-		for ($i=0; $i<count($lines); $i++)
+		elseif ($GLOBALS['HTTP_GET_VARS']['cd']=='yes' && $GLOBALS['phpgw_info']['user']['preferences']['common']['default_app']
+			&& $GLOBALS['phpgw_info']['user']['apps'][$GLOBALS['phpgw_info']['user']['preferences']['common']['default_app']])
 		{
-			if(@ereg('currentversion',$lines[$i]))
-			{
-				$line_found = explode(':',chop($lines[$i]));
-			}
+			$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/' . $GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'] . '/' . 'index.php'));
 		}
-		if($GLOBALS['phpgw']->common->cmp_version($GLOBALS['phpgw_info']['server']['versions']['phpgwapi'],$line_found[1]))
+		else
 		{
-			$message = '<p>There is a new version of phpGroupWare available. <a href="'
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+		}
+
+		$GLOBALS['phpgw']->translation->add_app('mainscreen');
+		if (lang('mainscreen_message') != 'mainscreen_message*')
+		{
+			echo '<center>' . stripslashes(lang('mainscreen_message')) . '</center>';
+		}
+
+		if ((isset($GLOBALS['phpgw_info']['user']['apps']['admin']) &&
+			$GLOBALS['phpgw_info']['user']['apps']['admin']) &&
+			(isset($GLOBALS['phpgw_info']['server']['checkfornewversion']) &&
+			$GLOBALS['phpgw_info']['server']['checkfornewversion']))
+		{
+			$GLOBALS['phpgw']->network->set_addcrlf(False);
+			$lines = $GLOBALS['phpgw']->network->gethttpsocketfile('http://www.phpgroupware.org/currentversion');
+			for ($i=0; $i<count($lines); $i++)
+			{
+				if (ereg('currentversion',$lines[$i]))
+				{
+					$line_found = explode(':',chop($lines[$i]));
+				}
+			}
+			if($GLOBALS['phpgw']->common->cmp_version($GLOBALS['phpgw_info']['server']['versions']['phpgwapi'],$line_found[1]))
+			{
+				echo '<p>There is a new version of phpGroupWare available. <a href="'
 					. 'http://www.phpgroupware.org">http://www.phpgroupware.org</a>';
-			$GLOBALS['phpgw_info']['flags']['msgbox_data'][$message]=True;
-		}
+			}
 
-		$_found = False;
+			$_found = False;
 			$GLOBALS['phpgw']->db->query("select app_name,app_version from phpgw_applications",__LINE__,__FILE__);
 			while($GLOBALS['phpgw']->db->next_record())
 			{
@@ -103,26 +148,25 @@
 				{
 					include($_versionfile);
 					$_file_version = $setup_info[$_app_name]['version'];
+					$_app_title    = $GLOBALS['phpgw_info']['apps'][$_app_name]['title'];
 					unset($setup_info);
 
 					if($GLOBALS['phpgw']->common->cmp_version_long($_db_version,$_file_version))
 					{
 						$_found = True;
-						$_app_string .= '<br>' . $GLOBALS['phpgw_info']['apps'][$_app_name]['title'];
+						$_app_string .= '<br>' . $_app_title;
 					}
 					unset($_file_version);
+					unset($_app_title);
 				}
 				unset($_db_version);
 				unset($_versionfile);
 			}
 			if($_found)
 			{
-				$message = '<br>' . lang('The following applications require upgrades') . ':' . "\n";
-				$message .= $_app_string . "\n";
-				$message .= '<br>' . lang('Please run setup to become current') . '.' . "\n";
-
-				$GLOBALS['phpgw_info']['flags']['msgbox_data'][$message]=False;
-				unset($message);
+				echo '<br>' . lang('The following applications require upgrades') . ':' . "\n";
+				echo $_app_string . "\n";
+				echo '<br>' . lang('Please run setup to become current') . '.' . "\n";
 				unset($_app_string);
 			}
 		}
@@ -130,7 +174,7 @@
 	if (isset($GLOBALS['phpgw_info']['user']['apps']['notifywindow']) &&
 		$GLOBALS['phpgw_info']['user']['apps']['notifywindow'])
 	{
-/* need to figure out how to implement this properly
+?>
 <SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
 	var NotifyWindow;
 
@@ -152,8 +196,8 @@
 	}
 </SCRIPT>
 
+<?php
 		echo '<a href="javascript:opennotifywindow()">' . lang('Open notify window') . '</a>';
-*/
 	}
 
 	/* This initializes the users portal_order preference if it does not exist. */
@@ -187,19 +231,15 @@
 	}
 	else
 	{
-		$sorted_apps = Array
-		(
+		$sorted_apps = Array(
 			'email',
 			'calendar',
-			'news',
+			'news_admin',
 			'addressbook',
 			'squirrelmail'
 		);
 	}
 	@reset($sorted_apps);
-
-	$GLOBALS['phpgw']->portalbox = CreateObject('phpgwapi.listbox');
-
 	$GLOBALS['phpgw']->hooks->process('home',$sorted_apps);
 
 	if($GLOBALS['portal_order'])
@@ -212,8 +252,8 @@
 		}
 		$GLOBALS['phpgw']->preferences->save_repository();
 	}
-	$GLOBALS['phpgw_info']['flags']['currentapp'] = 'home';	// has been changed by hook_home's
 
-	$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->portalbox->output);
-	}
+	//$phpgw->common->debug_phpgw_info();
+	//$phpgw->common->debug_list_core_functions();
+	$GLOBALS['phpgw']->common->phpgw_footer();
 ?>
diff --git a/index.php b/index.php
index 78f9b9d42e..66b80d0bd9 100755
--- a/index.php
+++ b/index.php
@@ -8,9 +8,10 @@
 	*  Free Software Foundation; either version 2 of the License, or (at your  *
 	*  option) any later version.                                              *
 	\**************************************************************************/
+
 	/* $Id$ */
 
-	$GLOBALS['phpgw_info'] = array();
+	$phpgw_info = array();
 	if (!file_exists('header.inc.php'))
 	{
 		Header('Location: setup/index.php');
@@ -44,20 +45,17 @@
 		$invalid_data = True;
 	}
 
-	// FIX ME! Don't leave this, we need to create a common place where applications can access
-	// things like the spell check class that the API has. (jengo)
 	if ($app == 'phpgwapi')
 	{
 		$app = 'home';
 		$api_requested = True;
 	}
 
-	$GLOBALS['phpgw_info']['flags'] = array
-	(
-		//'noheader'   => True,
+	$GLOBALS['phpgw_info']['flags'] = array(
+		'noheader'   => True,
+		'nonavbar'   => True,
 		'currentapp' => $app
 	);
-
 	include('./header.inc.php');
 
 	if ($app == 'home' && ! $api_requested)
@@ -76,12 +74,6 @@
 	{
 //		eval("\$GLOBALS['obj']->$method();");
 		execmethod($_GET['menuaction']);
-
-		if ($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
-		{
-			$GLOBALS['phpgw']->common->stop_xslt_capture();	// send captured output to the xslttpl
-		}
-
 		unset($app);
 		unset($obj);
 		unset($class);
@@ -118,4 +110,9 @@
 		$_obj->get_list();
 		*/
 	}
+
+	if (! $GLOBALS['phpgw_info']['nofooter'])
+	{
+		$GLOBALS['phpgw']->common->phpgw_footer();
+	}
 ?>
diff --git a/login.php b/login.php
index 5be600e240..6f0494d23d 100755
--- a/login.php
+++ b/login.php
@@ -10,15 +10,16 @@
 	*  Free Software Foundation; either version 2 of the License, or (at your  *
 	*  option) any later version.                                              *
 	\**************************************************************************/
-	/* $Id$ */
-	$GLOBALS['phpgw_info'] = array();
-	$GLOBALS['phpgw_info']['flags'] = array
-	(
-		'login'			=> True,
-		'currentapp'	=> 'login',
-		'noheader'		=> True,
-	);
 
+	/* $Id$ */
+
+	$phpgw_info = array();
+	$GLOBALS['phpgw_info']['flags'] = array(
+		'disable_template_class' => True,
+		'login'                  => True,
+		'currentapp'             => 'login',
+		'noheader'               => True
+	);
 	if(file_exists('./header.inc.php'))
 	{
 		include('./header.inc.php');
@@ -29,62 +30,72 @@
 		Header('Location: setup/index.php');
 		exit;
 	}
-	
+
 	$GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['login_template_set'];
-
-	if (!$GLOBALS['phpgw_info']['login_theme'])
-	{
-		$GLOBALS['phpgw_info']['login_theme'] = 'submarine';
-	}
-
-	$GLOBALS['phpgw']->common = CreateObject('phpgwapi.common');
-
-	$GLOBALS['phpgw']->xslttpl = CreateObject('phpgwapi.xslttemplates',$GLOBALS['phpgw_info']['server']['template_dir']);
-	$GLOBALS['phpgw']->xslttpl->add_file('login');
-
-	$data = array
-	(
-		'phpgw_theme'				=> 'phpgwapi/templates/' . $GLOBALS['phpgw_info']['login_template_set'] . '/css/phpgw.css',
-		'login_theme'				=> 'phpgwapi/templates/' . $GLOBALS['phpgw_info']['login_template_set'] . '/css/' . $GLOBALS['phpgw_info']['login_theme'] . '.css',
-		'phpgw_head_charset'		=> lang('charset'),
-		'phpgw_head_website_title'	=> $GLOBALS['phpgw_info']['server']['site_title']
-	);
-
-	$data['login_standard'] = array
-	(
-		'login_layout'			=> $GLOBALS['phpgw_info']['login_template_set'],
-		'lang_phpgw_statustext'	=> lang('phpGroupWare --> homepage')
-	);
+	$tmpl = CreateObject('phpgwapi.Template', $GLOBALS['phpgw_info']['server']['template_dir']);
 
 	// This is used for system downtime, to prevent new logins.
 	if ($GLOBALS['phpgw_info']['server']['deny_all_logins'])
 	{
-		$GLOBALS['phpgw']->xslttpl->set_var('login',$data);
-		$GLOBALS['phpgw']->xslttpl->pp();
+		$tmpl->set_file(array(
+			'login_form'  => 'login_denylogin.tpl'
+		));
+		$tmpl->set_var('template_set','default');
+		$tmpl->pfp('loginout','login_form');
 		exit;
 	}
 
-	$data['login_standard']['loginscreen'] = True;
+	// !! NOTE !!
+	// Do NOT and I repeat, do NOT touch ANYTHING to do with lang in this file.
+	// If there is a problem, tell me and I will fix it. (jengo)
 
-	function check_logoutcode()
+/*
+	if ($_GET['cd'] != 10 && $GLOBALS['phpgw_info']['server']['usecookies'] == False)
 	{
-		switch($_GET['code'])
+		$GLOBALS['phpgw']->sessions->setcookie('sessionid');
+		$GLOBALS['phpgw']->sessions->setcookie('kp3');
+		$GLOBALS['phpgw']->sessions->setcookie('domain');
+	}
+*/
+
+/* This is not working yet because I need to figure out a way to clear the $cd =1
+	if (isset($_SERVER['PHP_AUTH_USER']) && $_GET['cd'] == '1')
+	{
+		Header('HTTP/1.0 401 Unauthorized');
+		Header('WWW-Authenticate: Basic realm="phpGroupWare"'); 
+		echo 'You have to re-authentificate yourself'; 
+		exit;
+	}
+*/
+
+	if (! $deny_login && ! $GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
+	{
+		$tmpl->set_file(array('login_form'  => 'login.tpl'));
+		$tmpl->set_var('charset',lang('charset'));
+	}
+	elseif ($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
+	{
+		$tmpl->set_file(array('login_form'  => 'login_selectdomain.tpl'));
+		$tmpl->set_var('charset',lang('charset'));
+	}
+
+	function check_logoutcode($code)
+	{
+		switch($code)
 		{
 			case 1:
-				$GLOBALS['phpgw_info']['flags']['msgbox_data']['You have been successfully logged out'] = True;
+				return lang('You have been successfully logged out');
 				break;
 			case 2:
-				$GLOBALS['phpgw_info']['flags']['msgbox_data']['Sorry, your login has expired'] = False;
+				return lang('Sorry, your login has expired');
 				break;
 			case 5:
-				$GLOBALS['phpgw_info']['flags']['msgbox_data']['Bad login or password'] = False;
+				return '<font color="FF0000">' . lang('Bad login or password') . '</font>';
 				break;
 			case 99:
-				$GLOBALS['phpgw_info']['flags']['msgbox_data']['Blocked, too many attempts'] = False;
+				return '<font color="FF0000">' . lang('Blocked, too many attempts') . '</font>';
 				break;
 			case 10:
-				$GLOBALS['phpgw_info']['flags']['msgbox_data']['Your session could not be verified'] = False;
-
 				$GLOBALS['phpgw']->sessions->phpgw_setcookie('sessionid');
 				$GLOBALS['phpgw']->sessions->phpgw_setcookie('kp3');
 				$GLOBALS['phpgw']->sessions->phpgw_setcookie('domain');
@@ -94,17 +105,22 @@
 				{
 					$GLOBALS['phpgw']->sessions->phpgw_setcookie(PHPGW_PHPSESSID);
 				}
+
+				return '<font color=#FF0000>' . lang('Your session could not be verified.') . '</font>';
 				break;
+			default:
+				return '&nbsp;';
 		}
 	}
 	
 	function check_langs()
 	{
-		//$f = fopen('/tmp/log','a'); fwrite($f,"\ncheck_langs()\n");
+		//echo "<h1>check_langs()</h1>\n";
 		if ($GLOBALS['phpgw_info']['server']['lang_ctimes'] && !is_array($GLOBALS['phpgw_info']['server']['lang_ctimes']))
 		{
 			$GLOBALS['phpgw_info']['server']['lang_ctimes'] = unserialize($GLOBALS['phpgw_info']['server']['lang_ctimes']);
 		}
+		//_debug_array($GLOBALS['phpgw_info']['server']['lang_ctimes']);
 		
 		$lang = $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
 		$apps = $GLOBALS['phpgw_info']['user']['apps'];
@@ -117,18 +133,15 @@
 			{
 				$ctime = filectime($fname);
 				$ltime = intval($GLOBALS['phpgw_info']['server']['lang_ctimes'][$lang][$app]);
-				//fwrite($f,"checking lang='$lang', app='$app', ctime='$ctime', ltime='$ltime'\n");
+				//echo "checking lang='$lang', app='$app', ctime='$ctime', ltime='$ltime'<br>\n";
 				
 				if ($ctime != $ltime)
 				{
-					//fwrite($f,"\nupdate_langs()\n");
-		
 					update_langs();		// update all langs
 					break;
 				}
 			}
 		}
-		//fclose ($f);
 	}
 	
 	function update_langs()
@@ -151,6 +164,7 @@
 	}
 
 	/* Program starts here */
+  
 	if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'http' && isset($_SERVER['PHP_AUTH_USER']))
 	{
 		$submit = True;
@@ -160,7 +174,7 @@
 
 	# Apache + mod_ssl style SSL certificate authentication
 	# Certificate (chain) verification occurs inside mod_ssl
-	if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'sqlssl' && isset($_SERVER['SSL_CLIENT_S_DN']) && !isset($_GET['code']))
+	if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'sqlssl' && isset($_SERVER['SSL_CLIENT_S_DN']) && !isset($_GET['cd']))
 	{
 		# an X.509 subject looks like:
 		# /CN=john.doe/OU=Department/O=Company/C=xx/Email=john@comapy.tld/L=City/
@@ -205,9 +219,9 @@
 		}
 		$GLOBALS['sessionid'] = $GLOBALS['phpgw']->session->create($login,$_POST['passwd'],$_POST['passwd_type']);
 
-		if(!isset($GLOBALS['sessionid']) || !$GLOBALS['sessionid'])
+		if (! isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid'])
 		{
-			$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php?code=' . $GLOBALS['phpgw']->session->cd_reason);
+			$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php?cd=' . $GLOBALS['phpgw']->session->cd_reason);
 		}
 		else
 		{
@@ -262,22 +276,25 @@
 		$GLOBALS['phpgw']->translation->add_app('loginscreen');
 		if (lang('loginscreen_message') != 'loginscreen_message*')
 		{
-			$data['login_standard']['phpgw_loginscreen_message'] = stripslashes(lang('loginscreen_message'));
+			$tmpl->set_var('lang_message',stripslashes(lang('loginscreen_message')));
 		}
 	}
 
 	$last_loginid = $_COOKIE['last_loginid'];
 	if ($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
 	{
-		foreach ($phpgw_domain as $domain => $domain_data)
-		{
-			$ds = array('domain' => $domain);
-			if ($domain == $_COOKIE['last_domain'])
+		$domain_select = '';      // For security ... just in case
+		foreach($GLOBALS['phpgw_domain'] as $domain_name => $domain_vars)
+		{	
+			$domain_select .= '<option value="' . $domain_name . '"';
+
+			if ($domain_name == $_COOKIE['last_domain'])
 			{
-				$ds['selected'] = 'selected';
+				$domain_select .= ' selected';
 			}
-			$data['login_standard']['domain_select'][] = $ds;
+			$domain_select .= '>' . $domain_name . '</option>';
 		}
+		$tmpl->set_var('select_domain',$domain_select);
 	}
 	elseif ($last_loginid !== '')
 	{
@@ -302,27 +319,25 @@
 	{
 		$extra_vars = '?' . substr($extra_vars,1,strlen($extra_vars));
 	}
-	check_logoutcode();
 
-	/*$GLOBALS['phpgw']->template->set_var('phpgw_head_base',$GLOBALS['phpgw_info']['server']['webserver_url'].'/');
-	$GLOBALS['phpgw']->template->set_var('registration_url','registration/');*/
+	$tmpl->set_var('login_url', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php' . $extra_vars);
+	$tmpl->set_var('registration_url',$GLOBALS['phpgw_info']['server']['webserver_url'] . '/registration/');
+	$tmpl->set_var('version',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+	$tmpl->set_var('cd',check_logoutcode($_GET['cd']));
+	$tmpl->set_var('cookie',$last_loginid);
 
-	if($GLOBALS['phpgw_info']['flags']['msgbox_data'])
-	{
-		$data['login_standard']['msgbox_data'] = $GLOBALS['phpgw']->common->msgbox('',False);
-	}
+	$tmpl->set_var('lang_username',lang('username'));
+	$tmpl->set_var('lang_password',lang('password'));
+	$tmpl->set_var('lang_login',lang('login'));
 
-	$data['login_standard']['website_title']	= ($GLOBALS['phpgw_info']['server']['site_title']?$GLOBALS['phpgw_info']['server']['site_title']:'phpGroupWare');
-	$data['login_standard']['login_url']		= 'login.php' . $extra_vars;
-	$data['login_standard']['cookie']			= $last_loginid;
-	$data['login_standard']['lang_username']	= lang('username');
-	$data['login_standard']['lang_powered_by']	= lang('powered by');
-	$data['login_standard']['lang_version']		= lang('version');
-	$data['login_standard']['phpgw_version']	= $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'];
-	$data['login_standard']['lang_password']	= lang('password');
-	$data['login_standard']['lang_login']		= lang('login');
+	$tmpl->set_var('website_title', $GLOBALS['phpgw_info']['server']['site_title']);
+	$tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']);
+	$tmpl->set_var('bg_color',($GLOBALS['phpgw_info']['server']['login_bg_color']?$GLOBALS['phpgw_info']['server']['login_bg_color']:'FFFFFF'));
+	$tmpl->set_var('bg_color_title',($GLOBALS['phpgw_info']['server']['login_bg_color_title']?$GLOBALS['phpgw_info']['server']['login_bg_color_title']:'486591'));
+	$tmpl->set_var('logo_url',($GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'www.phpgroupware.org'));
+	$tmpl->set_var('logo_file',($GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo.gif'));
+	$tmpl->set_var('logo_title',($GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'phpGroupWare --&gt; home'));
+	$tmpl->set_var('autocomplete', ($GLOBALS['phpgw_info']['server']['autocomplete_login'] ? 'autocomplete="off"' : ''));
 
-	//_debug_array($data);
-
-	$GLOBALS['phpgw']->xslttpl->set_var('login',$data,False);
+	$tmpl->pfp('loginout','login_form');
 ?>
diff --git a/logout.php b/logout.php
index f347eca4cd..a5bd4c152d 100755
--- a/logout.php
+++ b/logout.php
@@ -23,18 +23,18 @@
 
 	include('./header.inc.php');
 
-	$GLOBALS['sessionid'] = $GLOBALS['HTTP_GET_VARS']['sessionid'] ? $GLOBALS['HTTP_GET_VARS']['sessionid'] : $GLOBALS['HTTP_COOKIE_VARS']['sessionid'];
-	$GLOBALS['kp3']       = $GLOBALS['HTTP_GET_VARS']['kp3'] ? $GLOBALS['HTTP_GET_VARS']['kp3'] : $GLOBALS['HTTP_COOKIE_VARS']['kp3'];
+	$GLOBALS['sessionid'] = get_var('sessionid',array('GET','COOKIE'));
+	$GLOBALS['kp3']       = get_var('kp3',array('GET','COOKIE'));
 
 	$verified = $GLOBALS['phpgw']->session->verify();
-	if($verified)
+	if ($verified)
 	{
-		if(file_exists($GLOBALS['phpgw_info']['server']['temp_dir'] . SEP . $GLOBALS['sessionid']))
+		if (file_exists($GLOBALS['phpgw_info']['server']['temp_dir'] . SEP . $GLOBALS['sessionid']))
 		{
 			$dh = opendir($GLOBALS['phpgw_info']['server']['temp_dir'] . SEP . $GLOBALS['sessionid']);
-			while($file = readdir($dh))
+			while ($file = readdir($dh))
 			{
-				if($file != '.' && $file != '..')
+				if ($file != '.' && $file != '..')
 				{
 					unlink($GLOBALS['phpgw_info']['server']['temp_dir'] . SEP . $GLOBALS['sessionid'] . SEP . $file);
 				}
@@ -55,13 +55,13 @@
 			));
 		}
 	}
-
-	if($GLOBALS['phpgw_info']['server']['usecookies'])
+	$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
+	$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
+	$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
+	if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php4')
 	{
-		$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
-		$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
-		$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
+		$GLOBALS['phpgw']->session->phpgw_setcookie(PHPGW_PHPSESSID);
 	}
 
-	$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'].'/login.php?code=1',True);
+	$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'].'/login.php?cd=1');
 ?>
diff --git a/notify.php b/notify.php
index 40b52b247e..8b01ad8100 100644
--- a/notify.php
+++ b/notify.php
@@ -24,21 +24,12 @@
 <head>
 	<meta http-equiv="Refresh" content="300">
 	<title>Notify Window</title>
-	
-	<script language="JavaScript">
-	<!-- Activate Cloaking Device
-	function CheckEmail()
-	{
-		window.opener.document.location.href="<?php echo $GLOBALS['phpgw']->link('/index.php','menuaction=email.uiindex.index'); ?>";
-	}
-	//-->
-	</script>
 </head>
 <body bgcolor="<?php echo $GLOBALS['phpgw_info']['theme']['bg_color']; ?>" alink="blue" vlink="blue" link="blue">
 <table>
 	<tr><td><a href="<?php echo $GLOBALS['phpgw']->link('/notify.php'); ?>">Check Now</a></td></tr>
 <?php
-	$GLOBALS['phpgw']->hooks->process('notifywindow',array('email'));
+	$GLOBALS['phpgw']->hooks->process('notifywindow');
 ?>
 </table>
 </body>
diff --git a/notify_simple.php b/notify_simple.php
index bbedabe9db..9e35e30ff6 100644
--- a/notify_simple.php
+++ b/notify_simple.php
@@ -15,11 +15,12 @@
 	$GLOBALS['phpgw_info']['flags'] = array(
 		'noheader' => True,
 		'nonavbar' => True,
+		'disable_Template_class' => True,
 		'currentapp' => 'notifywindow'
 	);
 	include('./header.inc.php');
 
 	echo '<html><body>';
-	$GLOBALS['phpgw']->hooks->process('simple',array('email'));
+	$GLOBALS['phpgw']->hooks->process('notifywindow_simple',array('email'));
 	echo '</body></html>';
 ?>
diff --git a/set_box.php b/set_box.php
index 300b138d3f..2b6b05fd8e 100755
--- a/set_box.php
+++ b/set_box.php
@@ -22,13 +22,13 @@
 //	if(basename($HTTP_REFERER) != 'home.php')
 //	{
 //		Header('Location: '.$GLOBALS['phpgw']->link('/home.php'));
+//		$GLOBALS['phpgw']->common->phpgw_exit();
 //	}
 
 //	$GLOBALS['phpgw']->preferences->delete('portal_order');
 //	unset($GLOBALS['phpgw_info']['user']['preferences']['portal_order']);
 //	$GLOBALS['phpgw']->preferences->save_repository();
 
-	$GLOBALS['app_box'] = intval(get_var('app',Array('GET')));
 	function move_boxes($curr_position,$new_order,$offset,$value_to_check,$max_num)
 	{
 		if(isset($GLOBALS['phpgw_info']['user']['preferences']['portal_order'][$new_order]))
@@ -60,15 +60,15 @@
 			}
 		}
 		$GLOBALS['phpgw']->preferences->delete('portal_order',$new_order);
-		$GLOBALS['phpgw']->preferences->add('portal_order',$new_order,$GLOBALS['app_box']);
+		$GLOBALS['phpgw']->preferences->add('portal_order',$new_order,intval($GLOBALS['HTTP_GET_VARS']['app']));
 			
 		$GLOBALS['phpgw']->preferences->save_repository();
 	}
 
-	switch(get_var('control',Array('GET')))
+	switch($GLOBALS['HTTP_GET_VARS']['control'])
 	{
 		case 'up':
-			$curr_position = $GLOBALS['phpgw']->common->find_portal_order($GLOBALS['app_box']);
+			$curr_position = $GLOBALS['phpgw']->common->find_portal_order(intval($GLOBALS['HTTP_GET_VARS']['app']));
 			$max_count = count($GLOBALS['phpgw_info']['user']['preferences']['portal_order']) - 1;
 			$offset = -1;
 			if($curr_position == 0)
@@ -82,7 +82,7 @@
 			move_boxes($curr_position,$new_order,$offset,0,$max_count);
 			break;
 		case 'down':
-			$curr_position = $GLOBALS['phpgw']->common->find_portal_order($GLOBALS['app_box']);
+			$curr_position = $GLOBALS['phpgw']->common->find_portal_order(intval($GLOBALS['HTTP_GET_VARS']['app']));
 			$max_count = count($GLOBALS['phpgw_info']['user']['preferences']['portal_order']) - 1;
 			$offset = 1;
 			if($curr_position == $max_count)
@@ -102,6 +102,6 @@
 	}
 
 	Header('Location: '.$GLOBALS['phpgw']->link('/home.php'));
-	$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
-	exit;
+	$GLOBALS['phpgw']->common->phpgw_exit();
 ?>
+
diff --git a/soap.php b/soap.php
index afadce7a73..7537e14eac 100644
--- a/soap.php
+++ b/soap.php
@@ -51,7 +51,6 @@
 		array('soapstruct'),
 		array('soapstruct')
 	);
-
 	$GLOBALS['server']->add_to_map(
 		'system_logout',
 		array('soapstruct'),
diff --git a/xmlrpc.php b/xmlrpc.php
index c26677678b..1487d3b2a0 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -1,50 +1,288 @@
 <?php
-  /**************************************************************************\
-  * phpGroupWare xmlrpc server                                               *
-  * http://www.phpgroupware.org                                              *
-  * Written by Miles Lott <milosch@phpgroupware.org>                         *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
+	/**************************************************************************\
+	* phpGroupWare xmlrpc server                                               *
+	* http://www.phpgroupware.org                                              *
+	* This file written by Joseph Engo <jengo@phpgroupware.org>                *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
 
-  /* $Id$ */
+	/* $Id$ */
+	/* $Source$ */
+
+	// NOTE! This file is still in the experimental stages, use at your own risk!
+	// The only current documentation for it is the code and the comments
+	// A document explaining its usage should be done shortly
+	// PLEASE, do *NOT* make any changes to this file without talking to me
+	// directly first.  Until I get it fully undercontrol.
+	// There might be possiable security holes in this, I haven't fully tested it
+	// (jengo)
 
 	$GLOBALS['phpgw_info'] = array();
 	$GLOBALS['phpgw_info']['flags'] = array(
-		'currentapp' => 'login',
-		'noheader'   => True,
+		'currentapp'            => 'login',
+		'noheader'              => True,
 		'disable_Template_class' => True
 	);
+	include('header.inc.php');
 
-	include('./header.inc.php');
+	// If XML-RPC isn't enabled in PHP, return an XML-RPC response stating so
+	if (! function_exists('xmlrpc_server_create'))
+	{
+		echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n";
+		echo "<methodResponse>\n";
+		echo "<fault>\n";
+		echo " <value>\n";
+		echo "  <struct>\n";
+		echo "   <member>\n";
+		echo "    <name>faultString</name>\n";
+		echo "    <value>\n";
+		echo "     <string>XML-RPC support NOT enabled in PHP installation</string>\n";
+		echo "    </value>\n";
+		echo "   </member>\n";
+		echo "   <member>\n";
+		echo "    <name>faultCode</name>\n";
+		echo "    <value>\n";
+		echo "     <int>1005</int>\n";
+		echo "    </value>\n";
+		echo "   </member>\n";
+		echo "  </struct>\n";
+		echo " </value>\n";
+		echo "</fault>\n";
+		echo "</methodResponse>\n";
 
-	$server = CreateObject('phpgwapi.xmlrpc_server');
-	$server->authed = False;
-	/* _debug_array($server);exit; */
-	/* include(PHPGW_API_INC . '/xmlrpc.interop.php'); */
+		exit;
+	}
+
+
+	// Return all PHP errors as faults
+	$GLOBALS['xmlrpc_server'] = xmlrpc_server_create();
+	error_reporting(E_ERROR | E_WARNING | E_PARSE);
+	set_error_handler('xmlrpc_custom_error');
 
 	$headers = getallheaders();
-
-	if(ereg('Basic',$headers['Authorization']))
+	if (ereg('Basic',$headers['Authorization']))
 	{
-		$tmp = $headers['Authorization'];
-		$tmp = ereg_replace(' ','',$tmp);
-		$tmp = ereg_replace('Basic','',$tmp);
+		$tmp  = $headers['Authorization'];
+		$tmp  = ereg_replace(' ','',$tmp);
+		$tmp  = ereg_replace('Basic','',$tmp);
 		$auth = base64_decode(trim($tmp));
 		list($sessionid,$kp3) = split(':',$auth);
 
-		if($GLOBALS['phpgw']->session->verify($sessionid,$kp3))
+		if ($GLOBALS['phpgw']->session->verify($sessionid,$kp3))
 		{
-			$server->authed = True;
+			$GLOBALS['xmlrpc_server'] = xmlrpc_server_create();
+			$request_xml              = $HTTP_RAW_POST_DATA;
+
+			// Find out what method they are calling
+			// This function is odd, you *NEED* to assign the results
+			// to a value, or $method is never returned.  (jengo)
+			$null = xmlrpc_decode_request($request_xml, &$method);
+			$GLOBALS['phpgw']->session->xmlrpc_method_called = $method;
+			$GLOBALS['phpgw']->session->update_dla();
+
+			// Check permissions and load the class, register all methods
+			// for that class, and execute it
+			list($app,$class,$func) = explode('.',$method);
+
+			if ($method == 'system.logout' || $GLOBALS['phpgw_info']['user']['apps'][$app] || $app == 'phpgwapi')
+			{
+				$GLOBALS['obj'] = CreateObject($app . '.' . $class);
+
+				xmlrpc_server_register_method($xmlrpc_server,sprintf('%s.%s.%s',$app,$class,'listMethods'),'xmlrpc_list_methods');
+				xmlrpc_server_register_method($xmlrpc_server,sprintf('%s.%s.%s',$app,$class,'describeMethods'),xmlrpc_describe_methods);
+				xmlrpc_server_register_method($xmlrpc_server,'system.logout','xmlrpc_logout');
+
+				while (list(,$new_method) = @each($obj->xmlrpc_methods))
+				{
+					$full_method_name = sprintf('%s.%s.%s',$app,$class,$new_method['name']);
+
+					xmlrpc_server_register_method($xmlrpc_server,$full_method_name,'xmlrpc_call_wrapper');
+					// The following function is listed as being in the API, but doesn't actually exisit.
+					// This is more of a mental note to track down its exisitence
+					//xmlrpc_server_set_method_description($xmlrpc_server,$full_method_name,$new_method);
+				}
+			}
+			else if ($method != 'system.listMethods' && $method != 'system.describeMethods')
+			{
+				xmlrpc_error(1001,'Access not permitted');
+			}
+
+			echo xmlrpc_server_call_method($xmlrpc_server,$request_xml,'');
+			xmlrpc_server_destroy($xmlrpc_server);
 		}
-		elseif($GLOBALS['phpgw']->session->verify_server($sessionid,$kp3))
+		else
 		{
-			$server->authed = True;
+			// Session is invailed
+			xmlrpc_error(1001,'Session expired');
+		}
+	}
+	else
+	{
+		// First, create a single method being system.login
+		// If they don't request this, then just return a failed session error
+		$xmlrpc_server = xmlrpc_server_create();
+		$request_xml   = $HTTP_RAW_POST_DATA;
+
+		// Find out what method they are calling
+		// This function is odd, you *NEED* to assign the results
+		// to a value, or $method is never returned.  (jengo)
+		$null = xmlrpc_decode_request($request_xml, &$method);
+
+		if ($method == 'system.login')
+		{
+			xmlrpc_server_register_method($xmlrpc_server,'system.login','xmlrpc_login');
+			echo xmlrpc_server_call_method($xmlrpc_server,$request_xml,'');
+			xmlrpc_server_destroy($xmlrpc_server);
+
+			exit;
+		}
+		else
+		{
+			// They didn't request system.login and they didn't pass sessionid or
+			// kp3, this is an invailed session (The session could have also been killed or expired)
+			xmlrpc_error(1001,'Session expired');
 		}
 	}
 
-	$server->service($HTTP_RAW_POST_DATA);
-?>
+	// When PHP returns an error, return that error with a fault instead of
+	// HTML with will make most parsers fall apart
+	function xmlrpc_custom_error($error_number, $error_string, $filename, $line, $vars)
+	{
+		if (error_reporting() & $error_number)
+		{
+			$error_string .= sprintf("\nFilename: %s\nLine: %s",$filename,$line);
+
+			xmlrpc_error(1005,$error_string);
+		}
+	}
+
+	// This will create an XML-RPC error
+	// FIXME!  This needs to be expanded to handle PHP errors themselfs
+	//         it will make debugging easier
+	function xmlrpc_error($error_number, $error_string)
+	{
+		$values = array(
+			'faultString' => $error_string,
+			'faultCode'   => $error_number
+		);
+
+		echo xmlrpc_encode_request(NULL,$values);
+
+		xmlrpc_server_destroy($GLOBALS['xmlrpc_server']);
+		exit;
+	}
+
+	// This will dynamicly create the avaiable methods for each class
+	function xmlrpc_list_methods($method)
+	{
+		list($app,$class,$func) = explode('.',$method);
+		$methods[] = 'system.login';
+		$methods[] = 'system.logout';
+		$methods[] = $method;
+		$methods[] = $app . '.' . $class . 'describeMethods';
+		for ($i=0; $i<count($GLOBALS['obj']->xmlrpc_methods); $i++)
+		{
+			$methods[] = $GLOBALS['obj']->xmlrpc_methods[$i]['name'];
+		}
+
+		return $methods;
+	}
+
+	function xmlrpc_describe_methods($method)
+	{
+		list($app,$class,$func) = explode('.',$method);
+		// FIXME! Add the missing pre-defined methods, example: system.login
+		for ($i=0; $i<count($GLOBALS['obj']->xmlrpc_methods); $i++)
+		{
+			$methods[] = $GLOBALS['obj']->xmlrpc_methods[$i];
+		}
+
+		return $methods;
+	}
+
+	// I know everyone hates wrappers, but this is the best way this can be done
+	// The XML-RPC functions pass method_name as the first parameter, which is
+	// unacceptable.
+	// Another reason for this, is it might be possiable to pass the sessionid
+	// and kp3 instead of using HTTP_AUTH features.
+	// Would be a nice workaround for librarys that don't support it, as its
+	// not in the XML-RPC spec.
+	function xmlrpc_call_wrapper($method_name, $parameters)
+	{
+		$a = explode('.',$method_name);
+
+		if (count($parameters) == 0)
+		{
+			$return = $GLOBALS['obj']->$a[2]();
+		}
+		else if (count($parameters) == 1)
+		{
+			$return = $GLOBALS['obj']->$a[2]($parameters[0]);
+		}
+		else
+		{
+			for ($i=0; $i<count($parameters); $i++)
+			{
+				$p[] = '$parameters[' . $i . ']';
+			}
+			eval('$return = $GLOBALS[\'obj\']->$a[2](' . implode(',',$p) . ');');
+		}
+
+		// This needs to be expanded and more fully tested
+		if (gettype($return) == 'NULL')
+		{
+			return xmlrpc_error(1002,'No return value detected');
+		}
+		else
+		{
+			return $return;
+		}
+	}
+
+	// The following are common functions used ONLY by XML-RPC
+	function xmlrpc_login($method_name, $parameters)
+	{
+		$p = $parameters[0];
+
+		if ($p['domain'])
+		{
+			$username = $p['username'] . '@' . $p['domain'];
+		}
+		else
+		{
+			$username = $p['username'];
+		}
+
+		$sessionid = $GLOBALS['phpgw']->session->create($username,$p['password'],'text');
+		$kp3       = $GLOBALS['phpgw']->session->kp3;
+		$domain    = $GLOBALS['phpgw']->session->account_domain;
+
+		if ($sessionid && $kp3)
+		{
+			return array(
+				'sessionid' => $sessionid,
+				'kp3'       => $kp3,
+				'domain'    => $domain
+			);
+		}
+		else
+		{
+			xmlrpc_error(1001,'Login failed');
+		}
+	}
+
+	function xmlrpc_logout($method, $parameters)
+	{
+		// We have already verified the session upon before this method is even created
+		// As long as nothing happens upon, its safe to destroy the session without
+		// fear of it being a hijacked session
+		$GLOBALS['phpgw']->session->destroy($GLOBALS['phpgw']->session->sessionid,$GLOBALS['phpgw']->session->kp3);
+
+		return True;
+	}
+
+