diff -aburN --exclude='CVS*' phpgroupware16/tts/admin.php phpgroupware/tts/admin.php
--- phpgroupware16/tts/admin.php	2004-02-19 21:20:46.000000000 -0500
+++ phpgroupware/tts/admin.php	2003-12-22 10:38:49.000000000 -0500
@@ -9,7 +9,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: admin.php,v 1.2.2.1.4.2 2004/01/20 05:03:42 jengo Exp $ */
+  /* $Id: admin.php,v 1.2.2.1 2002/01/25 22:00:52 jengo Exp $ */
 
 	$GLOBALS['phpgw_info']['flags'] = array(
 		'currentapp'  => 'tts', 
diff -aburN --exclude='CVS*' phpgroupware16/tts/create_tables.mysql phpgroupware/tts/create_tables.mysql
--- phpgroupware16/tts/create_tables.mysql	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/create_tables.mysql	2003-12-22 10:38:49.000000000 -0500
@@ -0,0 +1,26 @@
+create table ticket (
+  t_id          int not null auto_increment,
+  t_category    varchar(40) not null,
+  t_detail      text,
+  t_priority    smallint,
+  t_user        varchar(10) not null,
+  t_assignedto  varchar(10) not null,
+  t_timestamp_opened    int,
+  t_timestamp_closed    int,
+  t_subject     varchar(255),
+  t_department  varchar(25),
+  t_watchers      text,
+  primary key (t_id)
+);
+
+create table category (
+  c_id          int not null auto_increment,
+  c_department  varchar(25) not null,
+  c_name        varchar(40) not null,
+  primary key (c_id)
+);
+
+create table department (
+  d_name                varchar(25) not null,
+  primary key (d_name)
+);
\ No newline at end of file
diff -aburN --exclude='CVS*' phpgroupware16/tts/create_tables.pgsql phpgroupware/tts/create_tables.pgsql
--- phpgroupware16/tts/create_tables.pgsql	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/create_tables.pgsql	2003-12-22 10:38:49.000000000 -0500
@@ -0,0 +1,23 @@
+create table ticket (
+  t_id		serial,
+  t_category	varchar(40) not null,
+  t_detail	text,
+  t_priority	smallint,
+  t_user	varchar(10) not null,
+  t_assignedto	varchar(10) not null,
+  t_timestamp_opened	int,
+  t_timestamp_closed	int,
+  t_subject	varchar(255),
+  t_department	varchar(25),
+  t_watchers	text
+);
+
+create table category (
+  c_id		 serial,
+  c_department	 varchar(25) not null,
+  c_name	 varchar(40) not null
+);
+
+create table department (
+  d_name	 varchar(25) not null
+);
diff -aburN --exclude='CVS*' phpgroupware16/tts/doc/README phpgroupware/tts/doc/README
--- phpgroupware16/tts/doc/README	2003-11-01 17:50:48.000000000 -0500
+++ phpgroupware/tts/doc/README	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-New functions for TroubleTicketSystem
-
-- Attachments
-To add an attachment to a ticket, a group tts has to be created and every user,
-who works with tts has to be in that group.
-
-- New field "Type"
-If Setup works correctly, the subcategories needed schould be created. If not,
-create a global (under admin->admin, not admin->tts) category called "tts" and
-a subcategory called "type". Every
-subcategory added under "type" will then appear in the field.
-
-- New field "Platform"
-Same as "Type", with "platform" being a subcategory of "tts".
-
-- New field "Effort"
-It's just a string ;-)
-
-- Auto-Filters
-There are dropdown-boxes for "category", "assigned to", "created by" and "priority".
-Choose any entry from the boxes and the list of tickets will be filtered.
-
diff -aburN --exclude='CVS*' phpgroupware16/tts/doc/README.NOW phpgroupware/tts/doc/README.NOW
--- phpgroupware16/tts/doc/README.NOW	2003-11-01 17:50:48.000000000 -0500
+++ phpgroupware/tts/doc/README.NOW	1969-12-31 19:00:00.000000000 -0500
@@ -1,8 +0,0 @@
-TTS is undergoing some masive changes at the molment, I have changed the format at least 4 times now.
-Everytime I do this, I have to create upgrades.  Which is making things more difficault.  As I make my way
-through the code, I am coming up with new and better ways of handling the data.  Until I have settled on a
-format DO NOT run upgrades on it.  DO NOT use it for production!!! You WILL loose data this way.  I hope to
-have everything settled in the next week.
-
-You have been warned.
-Joseph Engo
diff -aburN --exclude='CVS*' phpgroupware16/tts/droptables.sql phpgroupware/tts/droptables.sql
--- phpgroupware16/tts/droptables.sql	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/droptables.sql	2003-12-22 10:38:49.000000000 -0500
@@ -0,0 +1,3 @@
+DROP table ticket;
+DROP table category;
+DROP table department;
diff -aburN --exclude='CVS*' phpgroupware16/tts/inc/class.attachedFiles.inc.php phpgroupware/tts/inc/class.attachedFiles.inc.php
--- phpgroupware16/tts/inc/class.attachedFiles.inc.php	2004-02-19 21:20:47.000000000 -0500
+++ phpgroupware/tts/inc/class.attachedFiles.inc.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,70 +0,0 @@
-<?php
-  /**************************************************************************\
-  * phpGroupWare - attachedFiles                                             *
-  * http://www.phpgroupware.org                                              *
-  * This file is written by Lars Piepho <lpiepho@probusiness.de>             *
-  * Copyright (C) 2003 probusiness AG (Lars Piepho)                          *
-  *                                                                          *
-  * --------------------------------------------                             *
-  *  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.attachedFiles.inc.php,v 1.1.2.2 2004/01/20 05:03:42 jengo Exp $ */
-
-	
-	class attachedFiles
-	{
-
-		var $public_functions = array(
-			'show_file' => True
-		);
-		var $file;
-		var $vfs;
-
-		function attachedFiles()
-		{		
-		 $this->file = $_REQUEST['file'];
-		 		  
-		 $GLOBALS['phpgw_info']['flags'] = array
-		(
-			'currentapp'	=> 'tts',
-			'noheader'	=> True,
-			'nofooter'	=> True,
-			'enable_vfs_class'	=> True,
-			'enable_browser_class'	=> True
-		);
-		
-		$this->vfs = CreateObject('phpgwapi.vfs');
-		
-		}
-
-		function show_file()
-		{			
-			$ls_array = $this->vfs->ls(array (
-			'string'	=> $this->file,
-			'relatives'	=> array (RELATIVE_ALL),
-			'checksubdirs'	=> False,
-			'nofiles'	=> True));
-
-			if ($ls_array[0]['mime_type'])
-			{
-				$mime_type = $ls_array[0]['mime_type'];
-			}
-			elseif ($GLOBALS['settings']['viewtextplain'])
-			{
-				$mime_type = 'text/plain';
-			}
-			$filename = basename($this->file);
-			header('Content-type: ' . $mime_type);
-			header('Content-Disposition: attachment; filename=' . $filename);
-			echo $this->vfs->read (array (
-					'string'	=> $this->file,
-					'relatives'	=> array (RELATIVE_NONE)));
-			$GLOBALS['phpgw']->common->phpgw_exit ();
-		}
-		
-	}
-?>
diff -aburN --exclude='CVS*' phpgroupware16/tts/inc/class.bo.inc.php phpgroupware/tts/inc/class.bo.inc.php
--- phpgroupware16/tts/inc/class.bo.inc.php	2004-02-19 21:20:47.000000000 -0500
+++ phpgroupware/tts/inc/class.bo.inc.php	2003-12-22 10:38:48.000000000 -0500
@@ -428,9 +428,9 @@
 				$body .= 'TTS #'.$ticket_id."\n\n";
 				$body .= 'Subject: '.$this->db->f('t_subject')."\n\n";
 				$body .= 'Assigned To: '.$this->db->f('t_assignedto')."\n\n";
-				$body .= 'Priority: ' . $this->db->f('t_priority') . "\n\n";
-				$body .= 'Group: ' . $group."\n\n";
-				$body .= 'Opened By: ' . $this->db->f('t_user')."\n";
+				$body .= 'Priority: ".$this->db->f('t_priority')."\n\n";
+				$body .= 'Group: ".$group."\n\n";
+				$body .= 'Opened By: ".$this->db->f('t_user')."\n";
 				$body .= 'Date Opened: '.$GLOBALS['phpgw']->common->show_date($this->db->f('t_timestamp_opened'))."\n\n";
 				if($this->db->f('t_timestamp_closed'))
 				{
diff -aburN --exclude='CVS*' phpgroupware16/tts/inc/class.subcategories.inc.php phpgroupware/tts/inc/class.subcategories.inc.php
--- phpgroupware16/tts/inc/class.subcategories.inc.php	2004-02-19 21:20:47.000000000 -0500
+++ phpgroupware/tts/inc/class.subcategories.inc.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,110 +0,0 @@
-<?php
-	/**************************************************************************\
-	* phpGroupWare API - Subcategories                                         *
-	* This file written by Joseph Engo <jengo@phpgroupware.org>                *
-	*                  and Bettina Gille [ceb@phpgroupware.org]                *
-	* Subcategory manager                                                      *
-	* Copyright (C) 2000, 2001 Joseph Engo, Bettina Gille                      *
-	* Copyright (C) 2002, 2003 Bettina Gille                                   *
-	* Copyright (C) 2003 probusiness AG (Lars Piepho)						   *
-	* ------------------------------------------------------------------------ *
-	* This library is part of the phpGroupWare API                             *
-	* http://www.phpgroupware.org                                              * 
-	* ------------------------------------------------------------------------ *
-	* This library is free software; you can redistribute it and/or modify it  *
-	* under the terms of the GNU Lesser General Public License as published by *
-	* the Free Software Foundation; either version 2.1 of the License,         *
-	* or any later version.                                                    *
-	* This library 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 Lesser General Public License for more details.              *
-	* You should have received a copy of the GNU Lesser General Public License *
-	* along with this library; if not, write to the Free Software Foundation,  *
-	* Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA            *
-	\**************************************************************************/
-	// $Id: class.subcategories.inc.php,v 1.1.2.2 2004/01/20 05:03:42 jengo Exp $
-	// $Source: /cvsroot/phpgroupware/tts/inc/Attic/class.subcategories.inc.php,v $
-
-	require_once constant('PHPGW_INCLUDE_ROOT') . "/phpgwapi/inc/class.categories.inc.php";
-
-	/*!
-	@class subcategories
-	@abstract class adds ability for applications to make use of subcategories
-	@discussion examples can be found in notes app
-	*/
-	
-	class subcategories extends categories
-	{
-		var $platform_id = 0;
-		var $type_id = 0;
-		/*!
-		@function subcategories
-		@abstract constructor for subcategories class
-		@param $accountid account id
-		@param $app_name app name defaults to current app
-		*/
-		function subcategories($accountid = '',$app_name = '')
-		{
-			parent::categories($accountid,$app_name);
-			$this->platform_id = $this->getSubCatId('platform');
-			$this->type_id = $this->getSubCatId('type');			
-		}
-
-		/*!
-		@function filter
-		@abstract ?
-		@param $type string
-		@result string either subs or mains
-		*/
-		function filter($type)
-		{
-			$s = parent::filter($type);
-			switch ($type)
-			{
-				case 'appandplatform': $s = " OR (cat_appname='phpgw' AND cat_parent=" . $this->platform_id . ')'; break;
-				case 'appandtype': $s = " OR (cat_appname='phpgw' AND cat_parent=" . $this->type_id . ')'; break;
-				default:			return False;
-			}			
-			return $s;
-		}
-		
-		function getSubCatId($subcat_name)
-		{
-			$sql = "SELECT cat_id FROM phpgw_categories WHERE cat_name='tts' AND cat_appname='phpgw'";			
-			$this->db->query($sql,__LINE__,__FILE__);
-			if(!$this->db->num_rows())
-			{
-				return 0;
-			}
-			$this->db->next_record();
-			$tts_id = $this->db->f('cat_id');
-			
-			
-			$sql = "SELECT cat_id FROM phpgw_categories WHERE cat_name='" . $this->db->db_addslashes($subcat_name) . "' "
-							."AND cat_appname='phpgw' AND cat_parent=" . $tts_id;					
-			$this->db->query($sql,__LINE__,__FILE__);
-			if(!$this->db->num_rows())
-			{
-				return 0;
-			}
-			$this->db->next_record();			
-			return $this->db->f('cat_id');
-		}
-
-		
-		function getSubCatElementId($subcat_name,$subcatelement_name)
-		{         
-         $cat_id = $this->getSubCatId($subcat_name);
- 	  	 $sql = "SELECT cat_id FROM phpgw_categories WHERE cat_parent=" . $cat_id . " AND cat_name='" . $subcatelement_name . "'";					
-	 	 $this->db->query($sql,__LINE__,__FILE__);
-		 if(!$this->db->num_rows())
-		 {
-		  return 0;
-		 }
-		 $this->db->next_record();		 
-		 return $this->db->f('cat_id'); 
-		}
-		
-	}
-?>
diff -aburN --exclude='CVS*' phpgroupware16/tts/inc/hook_home.inc.php phpgroupware/tts/inc/hook_home.inc.php
--- phpgroupware16/tts/inc/hook_home.inc.php	2003-11-30 18:59:37.000000000 -0500
+++ phpgroupware/tts/inc/hook_home.inc.php	2003-12-22 10:38:48.000000000 -0500
@@ -9,7 +9,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-	/* $Id: hook_home.inc.php,v 1.9.2.2.4.3 2003/11/30 23:59:37 skwashd Exp $ */
+	/* $Id: hook_home.inc.php,v 1.9.2.2 2002/06/23 17:03:16 skeeter Exp $ */
 
 	$d1 = strtolower(substr($GLOBALS['phpgw_info']['server']['app_inc'],0,3));
 	if($d1 == 'htt' || $d1 == 'ftp' )
@@ -111,7 +111,7 @@
 				'tertiary'  => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
 				'width'     => '100%',
 				'outerborderwidth' => '0',
-				'header_background_image' => $GLOBALS['phpgw']->common->image('phpgwapi', 'bg_filler', '.png', 'bg_filler', False)
+				'header_background_image' => $GLOBALS['phpgw']->common->image('phpgwapi/templates/phpgw_website','bg_filler')
 			)
 		);
 
diff -aburN --exclude='CVS*' phpgroupware16/tts/index.php phpgroupware/tts/index.php
--- phpgroupware16/tts/index.php	2004-07-08 22:33:29.000000000 -0400
+++ phpgroupware/tts/index.php	2003-12-22 10:38:49.000000000 -0500
@@ -9,7 +9,7 @@
 	*  option) any later version.                                              *
 	\**************************************************************************/
 
-	/* $Id: index.php,v 1.43.2.7.2.2.2.5 2004/05/11 13:39:05 lpiepho Exp $ */
+	/* $Id: index.php,v 1.43.2.7.2.2 2003/03/05 22:34:55 gugux Exp $ */
 
 	/* Note to self:
 	** Self ... heres the query to use when limiting access to entrys within a group
@@ -40,8 +40,8 @@
 	$GLOBALS['phpgw']->template->set_block('index', 'tts_row', 'tts_row');
 	$GLOBALS['phpgw']->template->set_block('index', 'tts_col_ifviewall', 'tts_col_ifviewall');
 	$GLOBALS['phpgw']->template->set_block('index', 'tts_head_ifviewall', 'tts_head_ifviewall');
-	$GLOBALS['phpgw']->template->set_block('index', 'tts_ticket_id_read', 'tts_ticket_id_read');
-	$GLOBALS['phpgw']->template->set_block('index', 'tts_ticket_id_unread', 'tts_ticket_id_unread');
+//	$GLOBALS['phpgw']->template->set_block('index', 'tts_ticket_id_read', 'tts_ticket_id_read');
+//	$GLOBALS['phpgw']->template->set_block('index', 'tts_ticket_id_unread', 'tts_ticket_id_unread');
 
 	$GLOBALS['phpgw']->template->set_var('lang_appname', lang('Trouble Ticket System'));
 	$GLOBALS['phpgw']->template->set_var('tts_newticket_link', $GLOBALS['phpgw']->link('/tts/newticket.php'));
@@ -53,46 +53,20 @@
 	$GLOBALS['phpgw']->template->set_var('tts_head_status','');
 	$GLOBALS['phpgw']->template->set_var('tts_notickets','');
 	$GLOBALS['phpgw']->template->set_var('lang_category',lang('Category'));
-	$GLOBALS['phpgw']->template->set_var('tts_autofilter_link', $GLOBALS['phpgw']->link('/tts/index.php'));
-	$GLOBALS['phpgw']->template->set_var('lang_filter', lang('filter'));
-	
 	
 	// select what tickets to view
-	$filter = $_REQUEST['filter'];	
-	$start  = $_GET['start'];
-	$sort   = $_GET['sort'];
-	$order  = $_GET['order'];
-	$searchfilter = $_REQUEST['searchfilter'];
+	$filter = $HTTP_GET_VARS['filter'];
+	$start  = $HTTP_GET_VARS['start'];
+	$sort   = $HTTP_GET_VARS['sort'];
+	$order  = $HTTP_GET_VARS['order'];
 			
 	if (!$filter)
 	{
 		$filter='viewopen';
 	}
-		
-	if ($filter == 'viewopen' || 'search') 
+	if ($filter == 'viewopen') 
 	{
-		if($_POST['ticket']['filter_prio'] != "")
-		{
-			$filterstring = " and ticket_priority like ".$_POST['ticket']['filter_prio'];
-		}
-	
-		if($_POST['ticket']['filter_owner'] != "")
-		{
-			$filterstring1 = " and ticket_owner like '".$GLOBALS['phpgw']->accounts->name2id($_POST['ticket']['filter_owner'])."'";
-		}
-
-		if($_POST['ticket']['filter_assignedto'] != "")
-		{
-			$filterstring2 = " and ticket_assignedto like '".$GLOBALS['phpgw']->accounts->name2id($_POST['ticket']['filter_assignedto'])."'";
-		}
-	
-		if($_POST['ticket']['filter_category'] != "")
-		{
-			$filterstring3 = " and ticket_category like '" . $GLOBALS['phpgw']->categories->name2id($_POST['ticket']['filter_category']) . "'";
-		}
-		
-		$filtermethod = "where ticket_status='O'" . $filterstring . $filterstring1 . $filterstring2 . $filterstring3;
-		
+		$filtermethod = "where ticket_status='O'";
 
 		$GLOBALS['phpgw']->preferences->read_repository();
 		if ($GLOBALS['phpgw_info']['user']['preferences']['tts']['refreshinterval'])
@@ -104,36 +78,9 @@
 			$GLOBALS['phpgw']->template->set_var('autorefresh','');
 		}
 	}
-	
-	if ($filter == 'viewall')
-	{
-			
-		if($_POST['ticket']['filter_prio'] != "")
-		{
-			$filterstring = " and ticket_priority like ".$_POST['ticket']['filter_prio'];
-		}
-	
-		if($_POST['ticket']['filter_owner'] != "")
-		{
-			$filterstring1 = " and ticket_owner like '".$GLOBALS['phpgw']->accounts->name2id($_POST['ticket']['filter_owner'])."'";
-		}
-
-		if($_POST['ticket']['filter_assignedto'] != "")
-		{
-			$filterstring2 = " and ticket_assignedto like '".$GLOBALS['phpgw']->accounts->name2id($_POST['ticket']['filter_assignedto'])."'";
-		}
-	
-		if($_POST['ticket']['filter_category'] != "")
-		{
-			$filterstring3 = " and ticket_category like '" . $GLOBALS['phpgw']->categories->name2id($_POST['ticket']['filter_category']) . "'";
-		}
-			
-			$filtermethod = "where 1" . $filterstring . $filterstring1 . $filterstring2 . $filterstring3;
-	}
-	
-	if ($searchfilter != '') 
+	if ($filter == 'search') 
 	{		
-		$filtermethod = "where ticket_details like '%".addslashes($searchfilter)."%' or ticket_subject like '%".addslashes($searchfilter)."%'";
+		$filtermethod = "where ticket_details like '%".addslashes($searchfilter)."%'";
 		$GLOBALS['phpgw']->template->set_var('tts_searchfilter',addslashes($searchfilter));
 	}
 
@@ -157,39 +104,14 @@
 	$GLOBALS['phpgw']->template->set_var('tts_numtotal',lang('Tickets total %1',$numtotal));
 	$GLOBALS['phpgw']->template->set_var('tts_numopen',lang('Tickets open %1',$numopen));
 	
-	//Get filters to work
-/*	if($filter == 'viewopen')
-	{
-		if($_POST['ticket']['filter_prio'] != "")
-		{
-			$filterstring = " and ticket_priority like ".$_POST['ticket']['filter_prio'];
-		}
-	
-		if($_POST['ticket']['filter_owner'] != "")
-		{
-			$filterstring1 = " and ticket_owner like '".$GLOBALS['phpgw']->accounts->name2id($_POST['ticket']['filter_owner'])."'";
-		}
-
-		if($_POST['ticket']['filter_assignedto'] != "")
-		{
-			$filterstring2 = " and ticket_assignedto like '".$GLOBALS['phpgw']->accounts->name2id($_POST['ticket']['filter_assignedto'])."'";
-		}
-	
-		if($_POST['ticket']['filter_category'] != "")
-		{
-			$filterstring3 = " and ticket_category like '" . $GLOBALS['phpgw']->categories->name2id($_POST['ticket']['filter_category']) . "'";
-		}
-	
-		$filtermethod = "where 1=1" . $filterstring . $filterstring1 . $filterstring2 . $filterstring3; 
-	}
-*/	
 	
 	$db2 = $GLOBALS['phpgw']->db;
 	$GLOBALS['phpgw']->db->query("select * from phpgw_tts_tickets $filtermethod $sortmethod",__LINE__,__FILE__);
 	$numfound = $GLOBALS['phpgw']->db->num_rows();
 
-	if ($filter != '' || $filter == 'viewopen')
+	if ($filter == 'search')
 	{
+		$filtermethod = "where ticket_details like '%".addslashes($searchfilter)."%'";
 		$GLOBALS['phpgw']->template->set_var('tts_searchfilter',addslashes($searchfilter));
 		$GLOBALS['phpgw']->template->set_var('tts_numfound',lang('Tickets found %1',$numfound));
 	}
@@ -199,7 +121,7 @@
 		$GLOBALS['phpgw']->template->set_var('tts_numfound','');
 	}
 
-	if ($filter != 'viewopen' && $filter != 'search')
+	if ($filter != 'viewopen')
 	{
 		$GLOBALS['phpgw']->template->set_var('tts_changeview_link', $GLOBALS['phpgw']->link('/tts/index.php'));
 		$GLOBALS['phpgw']->template->set_var('tts_changeview', lang('View only open tickets'));
@@ -226,7 +148,7 @@
 	// I am not sure how the sorting will work for this, if at all. (jengo)
 	$GLOBALS['phpgw']->template->set_var('tts_head_dateopened',lang('Date opened'));
 //	$GLOBALS['phpgw']->template->set_var('tts_head_dateopened', $GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'',$order,'/tts/index.php',lang('Date opened')));
-	if ($filter != 'viewopen' && $filter != 'search')
+	if ($filter != 'viewopen')
 	{
 		$GLOBALS['phpgw']->template->set_var('tts_head_dateclosed', $GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'ticket_status',$order,'/tts/index.php',lang('Status/Date closed')));
 		$GLOBALS['phpgw']->template->parse('tts_head_status','tts_head_ifviewall',false);
@@ -245,17 +167,17 @@
 			$priority = $GLOBALS['phpgw']->db->f('ticket_priority');
 			switch ($priority)
 			{
-				case 1:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg01']; $prio = '1'; break;
-				case 2:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg02']; $prio = '2'; break;
-				case 3:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg03']; $prio = '3'; break;
-				case 4:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg04']; $prio = '4'; break;
-				case 5:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg05']; $prio = '5'; break;
-				case 6:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg06']; $prio = '6'; break;
-				case 7:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg07']; $prio = '7'; break;
-				case 8:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg08']; $prio = '8'; break;
-				case 9:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg09']; $prio = '9'; break;
-				case 10: $tr_color = $GLOBALS['phpgw_info']['theme']['bg10']; $prio = '10'; break;
-				default: $tr_color = $GLOBALS['phpgw_info']['theme']['bg_color']; $prio = '-';
+				case 1:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg01']; break;
+				case 2:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg02']; break;
+				case 3:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg03']; break;
+				case 4:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg04']; break;
+				case 5:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg05']; break;
+				case 6:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg06']; break;
+				case 7:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg07']; break;
+				case 8:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg08']; break;
+				case 9:  $tr_color = $GLOBALS['phpgw_info']['theme']['bg09']; break;
+				case 10: $tr_color = $GLOBALS['phpgw_info']['theme']['bg10']; break;
+				default: $tr_color = $GLOBALS['phpgw_info']['theme']['bg_color'];
 			}
 
 			if ($filter!="viewopen" && $GLOBALS['phpgw']->db->f('t_timestamp_closed'))
@@ -283,7 +205,7 @@
 
 			if (! $ticket_read)
 			{
-				$GLOBALS['phpgw']->template->set_var('row_status','<img src="templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/images/updated.png">');
+				$GLOBALS['phpgw']->template->set_var('row_status','<img src="templates/default/images/updated.gif">');
 			}
 			else
 			{
@@ -291,13 +213,12 @@
 			}
 
 			$priostr = '';
-
 			while ($priority > 0)
 			{
 				$priostr = $priostr . "||";
 				$priority--;
 			}
-			$GLOBALS['phpgw']->template->set_var('tts_t_priostr',$priostr);
+			$GLOBALS['phpgw']->template->set_var('tts_t_priostr',$priostr );
 
 			$cat_name   = $GLOBALS['phpgw']->categories->id2name($GLOBALS['phpgw']->db->f('ticket_category'));
 			$GLOBALS['phpgw']->template->set_var('row_category',$cat_name);
@@ -318,7 +239,7 @@
 				$GLOBALS['phpgw']->template->set_var('tts_t_timestampclosed',$GLOBALS['phpgw']->common->show_date($history_values[0]['datetime'] - ((60*60) * $GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'])));
 				$GLOBALS['phpgw']->template->parse('tts_col_status','tts_col_ifviewall',False);
 			}
-			elseif ($filter != 'viewopen' && $filter != 'search')
+			elseif ($filter != 'viewopen')
 			{
 //				if ($GLOBALS['phpgw']->db->f('ticket_assignedto') != -1)
 //				{
@@ -333,7 +254,6 @@
 				$GLOBALS['phpgw']->template->parse('tts_col_status','tts_col_ifviewall',False);
 			}
 			$GLOBALS['phpgw']->template->set_var('tts_t_subject', $GLOBALS['phpgw']->db->f('ticket_subject'));
-			$GLOBALS['phpgw']->template->set_var('tts_t_prio', $prio);
 
 			$GLOBALS['phpgw']->template->parse('rows','tts_row',True);
 		}
@@ -346,120 +266,6 @@
 	$GLOBALS['phpgw']->template->set_var('tts_ticket_id_read','');
 	$GLOBALS['phpgw']->template->set_var('tts_ticket_id_unread','');
 
-	//Create Autofilters
-	$GLOBALS['phpgw']->db->query("select count(*) from phpgw_tts_tickets");
-	$GLOBALS['phpgw']->db->next_record();
-	$exists = $GLOBALS['phpgw']->db->f('0');
-	if ($exists != 0)
-	{
-		$GLOBALS['phpgw']->db->query("select distinct ticket_priority from phpgw_tts_tickets order by ticket_priority desc");
-		$y=0;
-		while ($GLOBALS['phpgw']->db->next_record() != 0)
- 		{
-			$dbvalue[$y] = $GLOBALS['phpgw']->db->f('0') ;
-   			++$y;
- 		}
- 		
-		unset($sel);
-		for($y-=1;$y>=0;--$y)
-		{
-			if($dbvalue[$y] == $_POST['ticket']['filter_prio'])
-			{
-				$selected = " selected";
-			}
-			else
-			{
-				$selected = "";
-			}
-			$sel .= '<option'.$selected.'>'.$dbvalue[$y].'</option>' ;
-		}
-		$GLOBALS['phpgw']->template->set_var('filter_prio','<select name=ticket[filter_prio] onChange="document.search.submit()"><option> </option>'.$sel.'</select>');
-		
-
-		$GLOBALS['phpgw']->db->query("select distinct ticket_owner from phpgw_tts_tickets order by ticket_owner desc");
-		$y=0;
-		while ($GLOBALS['phpgw']->db->next_record() != 0)
- 		{
-			$dbvalue[$y] = $GLOBALS['phpgw']->db->f('0') ;
-			$db2name[$y] = $GLOBALS['phpgw']->accounts->id2name($dbvalue[$y]);
-   			++$y;
- 		}
-		
-		unset($sel);
-		natsort($db2name);
-		reset($db2name);
-		while(list($dummy,$entry) = each($db2name))
-		{
-			if($entry == $_POST['ticket']['filter_owner'])
-			{
-				$selected = " selected";
-			}
-			else
-			{
-				$selected = "";
-			}
-			$sel .= '<option'.$selected.'>'.$entry.'</option>' ;
-		}
-		$GLOBALS['phpgw']->template->set_var('filter_owner','<select name=ticket[filter_owner] onChange="document.search.submit()"><option> </option>'.$sel.'</select>');
-	
-	
-		$GLOBALS['phpgw']->db->query("select distinct ticket_assignedto from phpgw_tts_tickets order by ticket_assignedto desc");
-		$y=0;
-		while ($GLOBALS['phpgw']->db->next_record() != 0)
- 		{
-			$dbvalue[$y] = $GLOBALS['phpgw']->db->f('0') ;
-			$db2name[$y] = $GLOBALS['phpgw']->accounts->id2name($dbvalue[$y]);
-   			++$y;
- 		}
-
-		unset($sel);
-		natsort($db2name);
-		reset($db2name);
-		while(list($dummy,$entry) = each($db2name))
-		{
-			if($entry == $_POST['ticket']['filter_assignedto'])
-			{
-				$selected = " selected";
-			}
-			else
-			{
-				$selected = "";
-			}
-			$sel .= '<option'.$selected.'>'.$entry.'</option>' ;
-		}
-
-		$GLOBALS['phpgw']->template->set_var('filter_assignedto','<select name=ticket[filter_assignedto] onChange="document.search.submit()"><option> </option>'.$sel.'</select>');
-	
-		
-		$GLOBALS['phpgw']->db->query("select distinct ticket_category from phpgw_tts_tickets order by ticket_category");
-		$y=0;
-		unset($db2name);
-		while ($GLOBALS['phpgw']->db->next_record() != 0)
- 		{
-			$dbvalue[$y] = $GLOBALS['phpgw']->db->f('0');
-			$db2name[$y] = $GLOBALS['phpgw']->categories->id2name($dbvalue[$y]);
-   			++$y;
- 		}
-		
-		unset($sel);
-		natsort($db2name);
-		reset($db2name);
-		while(list($dummy,$entry) = each($db2name))
-		{
-			if($entry == $_POST['ticket']['filter_category'])
-			{
-				$selected = " selected";				
-			}
-			else
-			{
-				$selected = "";
-			}			
-			$sel .= '<option'.$selected.'>'.$entry.'</option>' ;
-		}
-	
-		$GLOBALS['phpgw']->template->set_var('filter_category','<select name=ticket[filter_category] onChange="document.search.submit()"><option></option>'.$sel.'</select>');
-	}
-	
 	$GLOBALS['phpgw']->template->pfp('out','index');
 
 	$GLOBALS['phpgw']->common->phpgw_footer();
diff -aburN --exclude='CVS*' phpgroupware16/tts/lang.sql phpgroupware/tts/lang.sql
--- phpgroupware16/tts/lang.sql	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/lang.sql	2003-12-22 10:38:49.000000000 -0500
@@ -0,0 +1,257 @@
+DELETE FROM lang WHERE app_name='tts';
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'additional notes','tts','br','Notas adicionais');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'additional notes','tts','cs','Dal¹í poznámky');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'additional notes','tts','de','Zus&auml;tzliche Notizen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'additional notes','tts','en','Additional notes');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'additional notes','tts','fr','Notes suppl&eacute;mentaires');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'additional notes','tts','kr','³»¿ë Ãß°¡');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'additional notes','tts','nl','Opmerkingen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'additional notes','tts','sp','Notas adicionales');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add new ticket','tts','br','Adicionar novo ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add new ticket','tts','cs','Pøidej novou zprávu');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add new ticket','tts','de','Neues Ticket hinzuf&uuml;gen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add new ticket','tts','en','Add new ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add new ticket','tts','fr','Ajouter un nouveau ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add new ticket','tts','kr','»õ ÀÛ¾÷Ãß°¡');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add new ticket','tts','nl','Voeg nieuwe melding toe');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add new ticket','tts','sp','Agregar nuevo ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add ticket','tts','br','Criar ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add ticket','tts','cs','Pøidat zprávu');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add ticket','tts','de','Ticket hinzuf&uuml;gen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add ticket','tts','en','Add ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add ticket','tts','fr','Ajouter un ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add ticket','tts','kr','»õÀÛ¾÷ Ãß°¡');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add ticket','tts','nl','Voeg melding toe');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'add ticket','tts','sp','Agregar ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned from','tts','br','Atribuido de');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned from','tts','cs','Zadal');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned from','tts','de','Zugewiesen von');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned from','tts','en','Assigned from');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned from','tts','fr','Assign&eacute; par');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned from','tts','kr','ÀÛ¾÷ÀÚ');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned from','tts','nl','Toegewezen door');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned from','tts','sp','Asignado desde');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned to','tts','br','Atribuido a');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned to','tts','cs','Pøiøazeno k');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned to','tts','de','Zugewiesen an');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned to','tts','en','Assigned to');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned to','tts','fr','Assign&eacute; &agrave;');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned to','tts','kr','ÇÒ´ç');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned to','tts','nl','Toegewezen aan');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assigned to','tts','sp','Asignado a');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assign to','tts','cs','Pøiøadit k');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assign to','tts','de','Zuweisen an');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assign to','tts','en','Assign to');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assign to','tts','nl','Toewijzen aan');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'assign to','tts','sp','Asignar a');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'clear form','tts','br','Limpar formulario');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'clear form','tts','cs','Smazat formuláø');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'clear form','tts','de','Eingabe l&ouml;schen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'clear form','tts','en','Clear form');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'clear form','tts','fr','Effacer le formulaire');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'clear form','tts','kr','ÀçÀÛ¼º');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'clear form','tts','nl','Formulier wissen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'clear form','tts','sp','Limpiar formulario');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close date','tts','br','Data fechamento');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close date','tts','cs','Datum uzavøení');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close date','tts','de','Geschlossen am');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close date','tts','en','Close date');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close date','tts','fr','Date de fermeture');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close date','tts','kr','Á¾·á ³¯Â¥');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close date','tts','nl','Datum sluiting');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close date','tts','sp','Fecha cierre');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'closed','tts','br','Fechado');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'closed','tts','cs','Uzavøen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'closed','tts','de','Geschlossen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'closed','tts','en','Closed');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'closed','tts','fr','Ferm&eacute;');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'closed','tts','kr','Á¾·áµÊ');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'closed','tts','nl','Gesloten');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'closed','tts','sp','Cerrado');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close','tts','br','Feche');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close','tts','cs','Zavøít');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close','tts','de','Schlie&szlig;en');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close','tts','en','Close');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close','tts','fr','Fermer');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close','tts','kr','Á¾·á');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close','tts','nl','Sluiten');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'close','tts','sp','Cerrar');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'date opened','tts','br','Data abertura');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'date opened','tts','cs','Datum otevøení');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'date opened','tts','de','Angelegt am');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'date opened','tts','en','Date opened');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'date opened','tts','fr','Date d\'ouverture');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'date opened','tts','kr','ÀÛ¼ºÀÏ');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'date opened','tts','nl','Aanmaak datum');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'date opened','tts','sp','Fecha apertura');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'details','tts','br','Detalhes');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'details','tts','cs','Detaily');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'details','tts','de','Details');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'details','tts','en','Details');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'details','tts','fr','D&eacute;tails');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'details','tts','kr','¼³¸í');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'details','tts','nl','Details');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'details','tts','sp','Detalles');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'detail','tts','br','Detalhes');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'detail','tts','cs','Detail');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'detail','tts','de','Detail');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'detail','tts','en','Detail');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'detail','tts','fr','D&eacute;tail');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'detail','tts','kr','¼³¸í');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'detail','tts','nl','Detail');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'detail','tts','sp','Detalle');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'group','tts','br','Grupo');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'group','tts','cs','Skupina');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'group','tts','de','Gruppe');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'group','tts','en','Group');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'group','tts','fr','Groupe');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'group','tts','kr','±×·ì');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'group','tts','nl','Groep');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'group','tts','sp','Groupo');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'in progress','tts','br','Em progresso');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'in progress','tts','cs','Probíhá');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'in progress','tts','de','In Bearbeitung');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'in progress','tts','en','In progress');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'in progress','tts','fr','En cours');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'in progress','tts','kr','ÁøÇàÁß');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'in progress','tts','nl','In uitvoering');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'in progress','tts','sp','En progreso');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'new ticket','tts','br','Novo ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'new ticket','tts','cs','Nová zpráva');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'new ticket','tts','de','Neues Ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'new ticket','tts','en','New ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'new ticket','tts','fr','Nouveau ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'new ticket','tts','kr','»õ ÀÛ¾÷');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'new ticket','tts','nl','Nieuwe melding');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'new ticket','tts','sp','Nuevo ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no subject','tts','br','Sem assunto');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no subject','tts','cs','®ádný pøedmìt');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no subject','tts','de','Kein Betreff');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no subject','tts','en','No subject');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no subject','tts','fr','Pas de sujet');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no subject','tts','kr','Á¦¸ñ¾øÀ½');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no subject','tts','nl','Geen onderwerp');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no subject','tts','sp','Sin asunto');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no tickets found','tts','br','Nao foram encontrados tickets');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no tickets found','tts','cs','®ádné zprávy nenalezeny');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no tickets found','tts','de','Keine Tickets gefunden');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no tickets found','tts','en','No tickets found');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no tickets found','tts','fr','Aucun ticket trouv&eacute;');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no tickets found','tts','kr','ÀÛ¾÷ÀÌ ¾øÀ½');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no tickets found','tts','nl','Geen meldingen gevonden');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'no tickets found','tts','sp','No se encontraron tickets');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ok','tts','br','OK');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ok','tts','cs','OK');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ok','tts','de','OK');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ok','tts','en','OK');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ok','tts','fr','OK');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ok','tts','kr','È®ÀÎ');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ok','tts','nl','OK');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ok','tts','sp','OK');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'open date','tts','br','Data abertura');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'open date','tts','cs','Datum otevøení');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'open date','tts','de','Angelegt am');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'open date','tts','en','Open date');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'open date','tts','fr','Date d\'ouverture');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'open date','tts','kr','½ÃÀÛ ³¯Â¥');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'open date','tts','nl','Datum opening');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'open date','tts','sp','Fecha apertura');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'opened by','tts','br','Aberto por');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'opened by','tts','cs','Otevøel');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'opened by','tts','de','Angelegt von');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'opened by','tts','en','Opened by');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'opened by','tts','fr','Ouvert par');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'opened by','tts','kr','ÀÛ¼ºÀÚ');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'opened by','tts','nl','Aangenomen door');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'opened by','tts','sp','Abierto por');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'priority','tts','br','Prioridade');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'priority','tts','cs','Priorita');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'priority','tts','de','Priorit&auml;t');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'priority','tts','en','Priority');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'priority','tts','fr','Priorit&eacute;');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'priority','tts','kr','Áß¿äµµ');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'priority','tts','nl','Prioriteit');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'priority','tts','sp','Prioridad');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'prio','tts','br','Prio');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'prio','tts','cs','Prio');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'prio','tts','de','Prio');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'prio','tts','en','Prio');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'prio','tts','fr','Prio');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'prio','tts','kr','Áß¿äµµ');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'prio','tts','nl','Prio');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'prio','tts','sp','Prioridad');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'reopen','tts','br','Reaberto');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'reopen','tts','cs','Znovu otevøen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'reopen','tts','de','Wieder &ouml;ffnen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'reopen','tts','en','ReOpen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'reopen','tts','fr','ReOuvert');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'reopen','tts','kr','Àç½ÃÀÛ');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'reopen','tts','nl','Heropenen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'reopen','tts','sp','ReAbierto');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'status/date closed','tts','br','Estado/Data fechado');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'status/date closed','tts','cs','Stav/Datum closed');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'status/date closed','tts','de','Status/Schlie&szlig;datum');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'status/date closed','tts','en','Status/Date closed');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'status/date closed','tts','fr','Etat/Date de fermeture');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'status/date closed','tts','kr','ºñÈ°¼ºµÈ »óÅÂ/³¯Â¥');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'status/date closed','tts','nl','Status/Datum gesloten');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'status/date closed','tts','sp','Estado/Fecha cierre');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'subject','tts','br','Assunto');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'subject','tts','cs','Pøedmìt');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'subject','tts','de','Betreff');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'subject','tts','en','Subject');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'subject','tts','fr','Sujet');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'subject','tts','kr','Á¦¸ñ');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'subject','tts','nl','Onderwerp');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'subject','tts','sp','Asunto');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ticket assigned to x','tts','en','Ticket assigned to %1');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'tickets open x','tts','en','Tickets open %1');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'tickets total x','tts','en','Tickets total %1');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ticket','tts','br','Ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ticket','tts','cs','Zpráva');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ticket','tts','de','Ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ticket','tts','en','Ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ticket','tts','fr','Ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ticket','tts','kr','ÀÛ¾÷');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ticket','tts','nl','Melding');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'ticket','tts','sp','Ticket');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'trouble ticket system','tts','br','Trouble Ticket System');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'trouble ticket system','tts','cs','Sledování problémù');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'trouble ticket system','tts','de','Trouble Ticket System');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'trouble ticket system','tts','en','Trouble Ticket System');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'trouble ticket system','tts','fr','Trouble Ticket System');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'trouble ticket system','tts','kr','¿¡·¯¸®Æ÷Æ® ½Ã½ºÅÛ');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'trouble ticket system','tts','nl','Problemen Registratie Systeem');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'trouble ticket system','tts','sp','Trouble Ticket System');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'update','tts','br','Atualize');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'update','tts','cs','Obnovit');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'update','tts','de','Aktualisieren');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'update','tts','en','Update');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'update','tts','fr','Mettre &agrave; jour');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'update','tts','kr','¾÷µ¥ÀÌÆ®');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'update','tts','nl','Bijwerken');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'update','tts','sp','Actualizar');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view all tickets','tts','br','Visualizar todos tickets');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view all tickets','tts','cs','Uka¾ v¹echny');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view all tickets','tts','de','Alle Tickets anzeigen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view all tickets','tts','en','View all tickets');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view all tickets','tts','fr','Voir tous les tickets');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view all tickets','tts','kr','¸ðµç ÀÛ¾÷º¸±â');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view all tickets','tts','nl','Geef alle meldingen weer');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view all tickets','tts','sp','Ver todos los tickets');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view job detail','tts','br','Ver detalhes');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view job detail','tts','cs','ukázat detail úkolu');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view job detail','tts','de','Details anzeigen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view job detail','tts','en','view job detail');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view job detail','tts','fr','voir le d&eacute;tail du travail');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view job detail','tts','kr','ÀÛ¾÷ ³»¿ëº¸±â');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view job detail','tts','nl','Details werkzaamheden weergeven');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view job detail','tts','sp','ver detalle del trabajo');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view only open tickets','tts','br','Ver todos tickets abertos');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view only open tickets','tts','cs','Uka¾ jenom otevøené zprávy');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view only open tickets','tts','de','Nur offene Tickets anzeigen');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view only open tickets','tts','en','View only open tickets');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view only open tickets','tts','fr','Voir uniquement les tickets ouverts');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view only open tickets','tts','kr','È°¼ºµÈ ÀÛ¾÷º¸±â');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view only open tickets','tts','nl','Geef alleen openstaande meldingen weer');
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'view only open tickets','tts','sp','Ver solo los tickets abiertos');
diff -aburN --exclude='CVS*' phpgroupware16/tts/newticket.php phpgroupware/tts/newticket.php
--- phpgroupware16/tts/newticket.php	2004-05-03 21:37:39.000000000 -0400
+++ phpgroupware/tts/newticket.php	2003-12-22 10:38:49.000000000 -0500
@@ -9,11 +9,11 @@
 	*  option) any later version.                                              *
 	\**************************************************************************/
 
-	// $Id: newticket.php,v 1.31.2.3.4.4 2004/04/20 12:52:17 lpiepho Exp $
+	// $Id: newticket.php,v 1.31.2.3 2002/05/17 12:59:17 milosch Exp $
 	// $Source: /cvsroot/phpgroupware/tts/newticket.php,v $
 
-	$submit = $_POST['submit'];
-	$cancel = $_POST['cancel'];
+	$submit = $HTTP_POST_VARS['submit'];
+	$cancel = $HTTP_POST_VARS['cancel'];
 	if($submit || $cancel)
 	{
 		$GLOBALS['phpgw_info']['flags'] = array(
@@ -26,7 +26,6 @@
 	$GLOBALS['phpgw_info']['flags']['enable_send_class']   = True;
 	$GLOBALS['phpgw_info']['flags']['enable_config_class'] = True;
 	$GLOBALS['phpgw_info']['flags']['enable_categories_class'] = True;
-	$GLOBALS['phpgw_info']['flags']['enable_vfs_class'] = True;
 
 	include('../header.inc.php');
  
@@ -39,61 +38,17 @@
 
 	if($submit)
 	{	
-		//File-Upload
-		if ($HTTP_POST_FILES['attachment']['name'] != '')
-		{	
-			$basedir = $GLOBALS['basedir'] . "/tts";
-			//Check if home/groupdirectory exists. If not, we create it
-			if (!file_exists($basedir))
-			{
-				$GLOBALS['phpgw']->vfs->override_acl = 1;
-				$GLOBALS['phpgw']->vfs->mkdir (array (
-						'string' => $basedir,
-						'relatives' => array (RELATIVE_ALL)));
-				$GLOBALS['phpgw']->vfs->override_acl = 0;
-			}			
-			
-			$GLOBALS['phpgw']->db->query("SELECT max(ticket_id) from phpgw_tts_tickets",__LINE__,__FILE__);
-			$GLOBALS['phpgw']->db->next_record();
-			$tid = ($GLOBALS['phpgw']->db->f('max(ticket_id)')) + 1;
-			
-			//$tid = $ticket_id = $phpgw->db->get_last_insert_id('phpgw_tts_tickets','ticket_id');			
-			$attdir = $basedir . "/" . $tid;			
-
-			$GLOBALS['phpgw']->vfs->override_acl = 1;
-			$GLOBALS['phpgw']->vfs->mkdir (array (
-						'string' => $attdir,
-						'relatives' => array (RELATIVE_ALL)));
-			$GLOBALS['phpgw']->vfs->override_acl = 0;
-						
-			$GLOBALS['phpgw']->vfs->override_acl = 1;
-			$GLOBALS['phpgw']->vfs->cp(array (
-						'from'	=> $HTTP_POST_FILES['attachment']['tmp_name'],
-						'to'	=> $attdir . '/' . $HTTP_POST_FILES['attachment']['name'],
-						'relatives'	=> array (RELATIVE_NONE|VFS_REAL, RELATIVE_ALL)));
-			$GLOBALS['phpgw']->vfs->override_acl = 0;
-			
-			$GLOBALS['phpgw']->db->query("SELECT max(file_id) from phpgw_vfs",__LINE__,__FILE__);
-			$GLOBALS['phpgw']->db->next_record();
-			$file_id = $GLOBALS['phpgw']->db->f('max(file_id)');
-		}
-
 		$GLOBALS['phpgw']->db->query("insert into phpgw_tts_tickets (ticket_group,ticket_priority,ticket_owner,"
 			. "ticket_assignedto,ticket_subject,ticket_category,ticket_billable_hours,"
-			. "ticket_billable_rate,ticket_status,ticket_deadline,ticket_effort,ticket_type,ticket_platform,ticket_attachment,ticket_details) values ('"
-                        . $_POST['ticket']['group'] . "','"
-			. $_POST['ticket']['priority'] . "','"
+			. "ticket_billable_rate,ticket_status,ticket_details) values ('"
+                        . $ticket['group'] . "','"
+			. $ticket['priority'] . "','"
 			. $GLOBALS['phpgw_info']['user']['account_id'] . "','"
-			. $_POST['ticket']['assignedto'] . "','"
-			. $_POST['ticket']['subject'] . "','"
-			. $_POST['ticket']['category'] . "','"
-			. $_POST['ticket']['billable_hours'] . "','"
-			. $_POST['ticket']['billable_rate'] . "','O','"
-			. $_POST['ticket']['deadline']['year'] . "-" . $_POST['ticket']['deadline']['month'] . "-" . $_POST['ticket']['deadline']['day'] . "','"
-			. $_POST['ticket']['effort'] . "','"
-			. ($_POST['ticket']['type'] ? $_POST['ticket']['type'] : 0) . "','"
-			. ($_POST['ticket']['platform'] ? $_POST['ticket']['platform'] : 0) . "','"
-			. ($file_id ? $file_id : 0). "','"
+			. $ticket['assignedto'] . "','"
+			. $ticket['subject'] . "','"
+			. $ticket['category'] . "','"
+			. $ticket['billable_hours'] . "','"
+			. $ticket['billable_rate'] . "','O','"
 			. addslashes($ticket['details']) . "')",__LINE__,__FILE__);
 
 		$ticket_id = $GLOBALS['phpgw']->db->get_last_insert_id('phpgw_tts_tickets','ticket_id');
@@ -117,8 +72,6 @@
 	if(!$submit)
 	{
 		$GLOBALS['phpgw']->preferences->read_repository();
-		
-		/*
 		if($GLOBALS['phpgw_info']['user']['preferences']['tts']['groupdefault'])
 		{
 			$entry_selected[$GLOBALS['phpgw_info']['user']['preferences']['tts']['groupdefault']] = ' selected';
@@ -133,7 +86,7 @@
 		{
 			$priority_selected[$GLOBALS['phpgw_info']['user']['preferences']['tts']['prioritydefault']] = ' selected';
 		}
-		*/
+
 		$GLOBALS['phpgw']->template->set_file(array(
 			'newticket'   => 'newticket.tpl'
 		));
@@ -169,13 +122,6 @@
 		$GLOBALS['phpgw']->template->set_var('value_subject',$ticket['details']);
 		$GLOBALS['phpgw']->template->set_var('value_billable_hours',($ticket['billable_hours']?$ticket['billable_hours']:'0.00'));
 		$GLOBALS['phpgw']->template->set_var('value_billable_hours_rate',($ticket['billable_rate']?$ticket['billable_rate']:'0.00'));
-		$GLOBALS['phpgw']->template->set_var('currency',$GLOBALS['phpgw_info']['user']['preferences']['common']['currency']);
-
-		$GLOBALS['phpgw']->template->set_var('lang_type',lang('Type'));
-		$GLOBALS['phpgw']->template->set_var('lang_deadline',lang('Deadline'));
-		$GLOBALS['phpgw']->template->set_var('lang_effort',lang('Effort'));
-		$GLOBALS['phpgw']->template->set_var('lang_platform',lang('Platform'));
-		$GLOBALS['phpgw']->template->set_var('lang_attachment',lang('Attachment'));
 		
 		unset($s);
 		$groups = CreateObject('phpgwapi.accounts');
@@ -184,71 +130,26 @@
 
 		while(list($key,$entry) = each($group_list))
 		{
-			if($GLOBALS['phpgw_info']['user']['preferences']['tts']['groupdefault'] == $entry['account_id'])
-			{
-				$selected = 'selected';
-			}
-			else
-			{
-				$selected = '';
-			}
-			$s .= '<option value="' . $entry['account_id'] . '" ' . $selected
-				. '>' . $entry['account_name'] . '</option>';
+			$GLOBALS['phpgw']->template->set_var('optionname', $entry['account_name']);
+			$GLOBALS['phpgw']->template->set_var('optionvalue', $entry['account_id']);
+			$GLOBALS['phpgw']->template->set_var('optionselected', $tag);
+			$GLOBALS['phpgw']->template->parse('options_group','options_select',true);
 		}
-		$GLOBALS['phpgw']->template->set_var('options_group',$s);
 
-		$s = '<select name="ticket[category]">' . $GLOBALS['phpgw']->categories->formated_list('select','',$group,False) . '</select>';
+		$s = '<select name="ticket[category]">' . $GLOBALS['phpgw']->categories->formated_list('select','',$group,True) . '</select>';
 		$GLOBALS['phpgw']->template->set_var('value_category',$s);
 
 		unset($s);
-		for($i=1; $i<=31; $i++)
-		{
-			$i < 10 ? $y = '0' . $i : $y = $i;
-			$s .= '<option>' . $y . '</option>';
-		}
-		$GLOBALS['phpgw']->template->set_var('option_day','<select name="ticket[deadline][day]"><option selected></option>' . $s . '</select>');
-		
-		unset($s);
-		for($i=1; $i<=12; $i++)
-		{
-			$i < 10 ? $y = '0' . $i : $y = $i;
-			$s .= '<option>' . $y . '</option>';
-		}
-		$GLOBALS['phpgw']->template->set_var('option_month','<select name="ticket[deadline][month]"><option selected></option>' . $s . '</select>');
-		
-		unset($s);
 		$accounts = $groups;
 		$accounts->account_id = $group_id;
 		$account_list = $accounts->get_list('accounts');
 		while(list($key,$entry) = each($account_list))
 		{
-			if($GLOBALS['phpgw_info']['user']['preferences']['tts']['assigntodefault'] == $entry['account_id'])
-			{
-				$account_selected = 'selected';
-			}
-			else
-			{
-				$account_selected = '';
-			}
-			$s .= '<option value="' . $entry['account_id'] . '" ' . $account_selected
+			$s .= '<option value="' . $entry['account_id'] . '" ' . $account_selected[$entry['account_lid']]
 				. '>' . $entry['account_lid'] . '</option>';
 		}
 		$GLOBALS['phpgw']->template->set_var('value_assignedto','<select name="ticket[assignedto]">' . $s . '</select>');
 
-		//auswahlfelder type und platform
-
-
-        $platform = CreateObject('tts.subcategories',$GLOBALS['phpgw_info']['user']['account_id'],'tts');
-		unset($s);
-		$s = '<select name="ticket[platform]">' . $platform->formated_list('select','appandplatform','',False) . '</select>';
-		$GLOBALS['phpgw']->template->set_var('value_platform',$s);
-		
-		
-		$type = CreateObject('tts.subcategories',$GLOBALS['phpgw_info']['user']['account_id'],'tts');
-		unset($s);
-		$s = '<select name="ticket[type]">' . $type->formated_list('select','appandtype','',False) . '</select>';
-		$GLOBALS['phpgw']->template->set_var('value_type',$s);
-		
 		//$GLOBALS['phpgw']->template->set_var('tts_account_lid','0');
 		//$GLOBALS['phpgw']->template->set_var('tts_account_name',lang('None'));
 
@@ -259,15 +160,7 @@
 		$priority_comment[10] = ' - '.lang('Highest');
 		for($i=1; $i<=10; $i++)
 		{
-			if($GLOBALS['phpgw_info']['user']['preferences']['tts']['prioritydefault'] == $i)
-			{
-				$prio_selected = 'selected';
-			}
-			else
-			{
-				$prio_selected = '';
-			}
-			$priority_select .= '<option value="' . $i . '" ' . $prio_selected . '>' . $i . $priority_comment[$i] . '</option>';
+			$priority_select .= '<option value="' . $i . '">' . $i . $priority_comment[$i] . '</option>';
 		}
 		$GLOBALS['phpgw']->template->set_var('value_priority','<select name="ticket[priority]">' . $priority_select . '</select>');
 
diff -aburN --exclude='CVS*' phpgroupware16/tts/preferences.php phpgroupware/tts/preferences.php
--- phpgroupware16/tts/preferences.php	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/preferences.php	2003-12-22 10:38:49.000000000 -0500
@@ -0,0 +1,182 @@
+<?php
+/**************************************************************************\
+* phpGroupWare - TTS		                                           *
+* 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: preferences.php,v 1.3.2.1 2001/08/10 16:46:30 q-bert Exp $ */
+
+	$phpgw_info['flags'] = array(
+		'currentapp'              => 'tts', 
+		'noheader'                => True, 
+		'nonavbar'                => True, 
+		'noappheader'             => True,
+		'noappfooter'             => True,
+		'enable_contacts_class'   => True,
+		'enable_nextmatchs_class' => True
+	);
+
+	include('../header.inc.php');
+
+	$account_selected = array();
+	$entry_selected = array();
+	$priority_selected = array();
+	
+	$phpgw->preferences->read_repository();
+
+	if ($submit)
+	{
+		$totalerrors = 0;
+		if (! $totalerrors)
+		{
+
+ 			if ($mainscreen_show_new_updated)
+			{
+				$phpgw->preferences->delete('tts','mainscreen_show_new_updated');
+				$phpgw->preferences->add('tts','mainscreen_show_new_updated');
+			}
+			else
+			{
+				$phpgw->preferences->delete('tts','mainscreen_show_new_updated');
+			}
+
+ 			if ($groupdefault)
+			{
+				$phpgw->preferences->delete('tts','groupdefault');
+				$phpgw->preferences->add('tts','groupdefault',$groupdefault);
+			}
+			else
+			{
+				$phpgw->preferences->delete('tts','groupdefault');
+			}
+
+ 			if ($assigntodefault)
+			{
+				$phpgw->preferences->delete('tts','assigntodefault');
+				$phpgw->preferences->add('tts','assigntodefault',$assigntodefault);
+			}
+			else
+			{
+				$phpgw->preferences->delete('tts','assigntodefault');
+			}
+
+ 			if ($prioritydefault)
+			{
+				$phpgw->preferences->delete('tts','prioritydefault');
+				$phpgw->preferences->add('tts','prioritydefault',$prioritydefault);
+			}
+			else
+			{
+				$phpgw->preferences->delete('tts','prioritydefault');
+			}
+
+ 			if ($refreshinterval)
+			{
+				$phpgw->preferences->delete('tts','refreshinterval');
+				$phpgw->preferences->add('tts','refreshinterval',$refreshinterval);
+			}
+			else
+			{
+				$phpgw->preferences->delete('tts','refreshinterval');
+			}
+
+			$phpgw->preferences->save_repository(True);
+			Header('Location: ' . $phpgw->link('/preferences/index.php'));
+		}
+	}
+
+	$phpgw->common->phpgw_header();
+	echo parse_navbar();
+
+	if ($totalerrors)
+	{
+		echo '<p><center>' . $phpgw->common->error_list($errors) . '</center>';
+	}
+
+	$t = new Template(PHPGW_APP_TPL);
+	$t->set_file(array(
+		'preferences' => 'preferences.tpl',
+	));
+	$t->set_block('preferences', 'tts_select_options','tts_select_options');
+
+	$t->set_var(action_url,$phpgw->link('/tts/preferences.php'));
+
+	$tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
+	$t->set_var(tr_color,$tr_color);
+	$t->set_var(lang_show_new_updated,lang('show new/updated tickets on main screen'));
+
+	if ($phpgw_info['user']['preferences']['tts']['mainscreen_show_new_updated'])
+	{
+		$t->set_var(show_new_updated,' checked');
+	}
+	else
+	{
+		$t->set_var(show_new_updated,'');
+	}
+
+	if ($phpgw_info['user']['preferences']['tts']['groupdefault']) { $entry_selected[$phpgw_info['user']['preferences']['tts']['groupdefault']]=" selected"; };
+	if ($phpgw_info['user']['preferences']['tts']['assigntodefault']) { $account_selected[$phpgw_info['user']['preferences']['tts']['assigntodefault']]=" selected"; };
+	if ($phpgw_info['user']['preferences']['tts']['prioritydefault']) { $priority_selected[$phpgw_info['user']['preferences']['tts']['prioritydefault']]=" selected"; };
+
+	if ($phpgw_info['user']['preferences']['tts']['refreshinterval']) {
+		$t->set_var(refreshinterval,$phpgw_info['user']['preferences']['tts']['refreshinterval']);
+	} else {
+		$t->set_var(refreshinterval,"");
+	}
+
+	$groups = CreateObject('phpgwapi.accounts');
+	$group_list = $groups->get_list('groups');
+	while (list($key,$entry) = each($group_list))
+	{
+		    $t->set_var('tts_optionvalue', $entry['account_lid']);
+    		    $t->set_var('tts_optionname', $entry['account_lid']);
+		    $t->set_var('tts_optionselected', $entry_selected[$entry['account_lid']]);
+		    $t->parse('tts_groupoptions','tts_select_options',true);
+	}
+
+        $t->set_var('tts_lang_assignto', lang("assign to"));
+	$accounts = CreateObject('phpgwapi.accounts',$group_id);
+	$account_list = $accounts->get_list('accounts');
+	$t->set_var('tts_account_lid', "none" );
+	$t->set_var('tts_account_name', lang("none"));
+	$t->parse('tts_assignoptions','tts_select_options',false);
+	while (list($key,$entry) = each($account_list))
+	{
+		if ($entry['account_lid'])
+		{
+			$t->set_var('tts_optionvalue', $entry['account_lid']);
+    			$t->set_var('tts_optionname', $entry['account_lid']);
+			$t->set_var('tts_optionselected', $account_selected[$entry['account_lid']]);
+		}
+		$t->parse('tts_assigntooptions','tts_select_options',true);
+	}
+
+	// Choose the correct priority to display
+	$prority_selected[$phpgw->db->f("t_priority")] = " selected";
+	$priority_comment[1]=" - ".lang("Lowest"); 
+	$priority_comment[5]=" - ".lang("Medium"); 
+	$priority_comment[10]=" - ".lang("Highest"); 
+
+    	for ($i=1; $i<=10; $i++) {
+	    $t->set_var('tts_optionname', $i.$priority_comment[$i]);
+	    $t->set_var('tts_optionvalue', $i);
+	    $t->set_var('tts_optionselected', $priority_selected[$i]);
+	    $t->parse('tts_priorityoptions','tts_select_options',true);
+	}
+
+	$t->set_var(lang_refreshinterval,lang('Refresh every (seconds)'));
+	$t->set_var(lang_ttsprefs,lang('tts preferences'));
+	$t->set_var(lang_defaultgroup,lang('Default group'));
+	$t->set_var(lang_defaultassignto,lang('Default assign to'));
+	$t->set_var(lang_defaultpriority,lang('Default Priority'));
+	$t->set_var(lang_submit,lang('submit'));
+	$t->set_var(tts_select_options,'');
+
+	$t->pparse('out','preferences');
+	$phpgw->common->phpgw_footer();
+?>
diff -aburN --exclude='CVS*' phpgroupware16/tts/README.NOW phpgroupware/tts/README.NOW
--- phpgroupware16/tts/README.NOW	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/README.NOW	2003-12-22 10:38:49.000000000 -0500
@@ -0,0 +1,8 @@
+TTS is undergoing some masive changes at the molment, I have changed the format at least 4 times now.
+Everytime I do this, I have to create upgrades.  Which is making things more difficault.  As I make my way
+through the code, I am coming up with new and better ways of handling the data.  Until I have settled on a
+format DO NOT run upgrades on it.  DO NOT use it for production!!! You WILL loose data this way.  I hope to
+have everything settled in the next week.
+
+You have been warned.
+Joseph Engo
diff -aburN --exclude='CVS*' phpgroupware16/tts/setup/config.inc.php phpgroupware/tts/setup/config.inc.php
--- phpgroupware16/tts/setup/config.inc.php	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/setup/config.inc.php	2003-12-22 10:38:48.000000000 -0500
@@ -0,0 +1,14 @@
+<!-- BEGIN tts/setup/config.inc.php -->
+   <tr bgcolor="FFFFFF">
+    <td colspan="2">&nbsp;</td>
+   </tr>
+   <tr bgcolor="486591">
+    <td colspan="2"><font color="fefefe">&nbsp;<b>Trouble Ticket System settings</b></font></td>
+   </tr>
+   <tr bgcolor="FFFFFF">
+    <td colspan="2">&nbsp;</td>
+   </tr>
+   <tr bgcolor="e6e6e6">
+    <td>Do you want to enable the automatic mailing of tickets?:</td>
+    <td><input type="checkbox" name="newsettings[tts_mailticket]" value="True"<?php echo ($current_config["tts_mailticket"]?" checked":""); ?>></td>
+   </tr>
diff -aburN --exclude='CVS*' phpgroupware16/tts/setup/default_records.inc.php phpgroupware/tts/setup/default_records.inc.php
--- phpgroupware16/tts/setup/default_records.inc.php	2004-02-29 17:01:50.000000000 -0500
+++ phpgroupware/tts/setup/default_records.inc.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,51 +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: default_records.inc.php,v 1.1.2.3 2004/02/29 22:01:50 ceb Exp $ */
-
-	$GLOBALS['phpgw_setup']->oProc->query('INSERT into phpgw_categories (cat_main,cat_parent,cat_level,cat_owner,cat_access,cat_appname,cat_name,cat_description,cat_data)'
-										. " values(0,0,0,-1,'public','tts','Platform','Global category for tts','platform')",__LINE__,__FILE__);
-
-	$GLOBALS['phpgw_setup']->oProc->query("SELECT cat_id from phpgw_categories where cat_name='Platform' and cat_owner=-1 and cat_appname='tts'",__LINE__,__FILE__);
-	if($GLOBALS['phpgw_setup']->oProc->next_record())
-	{
-		$main = $GLOBALS['phpgw_setup']->oProc->f('cat_id');
-	}
-	$main = intval($main);
-
-	$GLOBALS['phpgw_setup']->oProc->query('UPDATE phpgw_categories set cat_main=' . $main . ' where cat_id=' . $main,__LINE__,__FILE__);
-
-	$GLOBALS['phpgw_setup']->oProc->query('INSERT into phpgw_categories (cat_main,cat_parent,cat_level,cat_owner,cat_access,cat_appname,cat_name,cat_description,cat_data)'
-										. ' values('. $main . ',' . $main . ",1,-1,'public','tts','Linux','Global category for tts','platform')",__LINE__,__FILE__);
-
-	$GLOBALS['phpgw_setup']->oProc->query('INSERT into phpgw_categories (cat_main,cat_parent,cat_level,cat_owner,cat_access,cat_appname,cat_name,cat_description,cat_data)'
-										. ' values('. $main . ',' . $main . ",1,-1,'public','tts','Windows','Global category for tts','platform')",__LINE__,__FILE__);
-
-	$GLOBALS['phpgw_setup']->oProc->query('INSERT into phpgw_categories (cat_main,cat_parent,cat_level,cat_owner,cat_access,cat_appname,cat_name,cat_description,cat_data)'
-										. ' values('. $main . ',' . $main . ",1,-1,'public','tts','MacOS','Global category for tts','platform')",__LINE__,__FILE__);
-
-
-	$GLOBALS['phpgw_setup']->oProc->query('INSERT into phpgw_categories (cat_main,cat_parent,cat_level,cat_owner,cat_access,cat_appname,cat_name,cat_description,cat_data)'
-										. " values(0,0,0,-1,'public','tts','Type','Global category for tts','type')",__LINE__,__FILE__);
-
-	$GLOBALS['phpgw_setup']->oProc->query("SELECT cat_id from phpgw_categories where cat_name='Type' and cat_owner=-1 and cat_appname='tts'",__LINE__,__FILE__);
-	if($GLOBALS['phpgw_setup']->oProc->next_record())
-	{
-		$main = $GLOBALS['phpgw_setup']->oProc->f('cat_id');
-	}
-	$main = intval($main);
-
-	$GLOBALS['phpgw_setup']->oProc->query('UPDATE phpgw_categories set cat_main=' . $main . ' where cat_id=' . $main,__LINE__,__FILE__);
-
-	$GLOBALS['phpgw_setup']->oProc->query('INSERT into phpgw_categories (cat_main,cat_parent,cat_level,cat_owner,cat_access,cat_appname,cat_name,cat_description,cat_data)'
-										. ' values('. $main . ',' . $main . ",1,-1,'public','tts','Bug','Global category for tts','type')",__LINE__,__FILE__);
-
-	$GLOBALS['phpgw_setup']->oProc->query('INSERT into phpgw_categories (cat_main,cat_parent,cat_level,cat_owner,cat_access,cat_appname,cat_name,cat_description,cat_data)'
-										. ' values('. $main . ',' . $main . ",1,-1,'public','tts','Feature Request','Global category for tts','type')",__LINE__,__FILE__);
diff -aburN --exclude='CVS*' phpgroupware16/tts/setup/phpgw_de.lang phpgroupware/tts/setup/phpgw_de.lang
--- phpgroupware16/tts/setup/phpgw_de.lang	2004-05-03 21:37:41.000000000 -0400
+++ phpgroupware/tts/setup/phpgw_de.lang	2003-12-22 10:38:48.000000000 -0500
@@ -5,48 +5,23 @@
 assign to	tts	de	zuweisen an
 assigned from	tts	de	Zugewiesen von
 assigned to	tts	de	Zugewiesen an
-Attachment	tts	de	Anhang:
-billable hours	tts	de	Abrechenbare Stunden
-billable hours rate	tts	de	Abrechenbarer Stundensatz
 close	tts	de	Schließen
-Closed	tts	de	Geschlossen
 close date	tts	de	Geschlossen am
 date opened	tts	de	Angelegt am
-Default assign to	tts	de	Standardmässig zuweisen an
-Default group	tts	de	Standard Gruppe
-Default Priority	tts	de	Standard Priorität
-create new ticket	tts	de	Neues Ticket anlegen
-deadline	tts	de	Abgabetermin
-Default assign to	tts	de	Standard Zugewiesen an
 detail	tts	de	Detail
 details	tts	de	Details
-effort	tts	de	Leistung
-force	tts	de	erzwungen
 in progress	tts	de	in Bearbeitung
 new ticket	tts	de	Neues Ticket
 no tickets found	tts	de	Keine Tickets gefunden
-Open	tts	de	Offen
 open date	tts	de	Angelegt am
-Opened	tts	de	Geöffnet
 opened by	tts	de	Angelegt von
-platform	tts	de	Plattform
-Platform changed	tts	de	Plattform geändert
 prio	tts	de	Prio
-Refresh every (seconds)	tts	de	Aktualisieren jede (Sekunden)
-Re-assigned	tts	de	neu zuweisen
-show new/updated tickets on main screen	tts	de	Zeige neue/aktualisierte Tickets auf dem Hauptschirm
-status/date closed	tts	de	Status/Datum geschlossen
 ticket	tts	de	Ticket
-Tickets found	tts	de	Tickets gefunden
-tickets found %1	tts	de	%1 Tickets gefunden
 tickets open %1	tts	de	offene tickets: %1
 tickets total %1	tts	de	Tickets insgesamt: %1
-trouble ticket system	common	de	TTS
-tts	common	de	TTS
+trouble ticket system	common	de	Trouble Ticket System
+tts	common	de	Trouble Ticket System
 tts preferences	tts	de	Trouble Ticket System - Einstellungen
-type	tts	de	Typ
-Type changed	tts	de	Typ geändert
-Use email notification	tts	de	Benutze e-Mail Benachrichtigung
 view all tickets	tts	de	Alle Tickets anzeigen
 view job detail	tts	de	Detailansicht
 view only open tickets	tts	de	Nur offene Tickets anzeigen
diff -aburN --exclude='CVS*' phpgroupware16/tts/setup/phpgw_en.lang phpgroupware/tts/setup/phpgw_en.lang
--- phpgroupware16/tts/setup/phpgw_en.lang	2003-11-03 16:58:02.000000000 -0500
+++ phpgroupware/tts/setup/phpgw_en.lang	2003-12-22 10:38:48.000000000 -0500
@@ -6,8 +6,6 @@
 assign to	tts	en	Assign to
 assigned from	tts	en	Assigned from
 assigned to	tts	en	Assigned to
-attachment	tts	en	Attachment
-attachment changed	tts	en	Attachment changed
 billable hours	tts	en	Billable hours
 billable hours changed	tts	en	Billable hours changed
 billable hours rate	tts	en	Billable hours rate
@@ -20,11 +18,7 @@
 creates a new ticket, returns ticket_id	tts	en	Creates a new ticket, returns ticket_id
 creates a struct of tickets	tts	en	Creates a struct of tickets
 date opened	tts	en	Date opened
-deadline	tts	en	Deadline
-deadline changed	tts	en	Deadline changed
 detail	tts	en	Detail
-effort	tts	en	Effort
-effort changed	tts	en	Effort changed
 force	tts	en	Force
 group ownership changed	tts	en	Group ownership changed
 in progress	tts	en	In progress
@@ -41,22 +35,20 @@
 opened	tts	en	Opened
 opened by	tts	en	Opened by
 original ticket details	tts	en	Original Ticket Details
-platform	tts	en	Platform
-platform changed	tts	en	Platform changed
 prio	tts	en	Prio
 priority	tts	en	Priority
 priority changed	tts	en	Priority changed
 re-assigned	tts	en	Re-assigned
 re-opened	tts	en	Re-opened
-returns a struct of a tickets history	tts	en	Returns a struct of a tickets history
-returns a struct of values of a single ticket	tts	en	Returns a struct of values of a single ticket
-returns the additional notes attached to a ticket	tts	en	Returns the additional notes attached to a ticket
+Returns a struct of a tickets history	tts	en	Returns a struct of a tickets history
+Returns a struct of values of a single ticket	tts	en	Returns a struct of values of a single ticket
+Returns the additional notes attached to a ticket	tts	en	Returns the additional notes attached to a ticket
 status/date closed	tts	en	Status/Date closed
 subject changed	tts	en	Subject changed
-test	tts	en	TEST
+TEST	tts	en	TEST
 ticket	tts	en	Ticket
 ticket has been updated	tts	en	Ticket has been updated
-tickets found %1	tts	en	Tickets found %1
+Tickets found %1	tts	en	Tickets found %1
 tickets open %1	tts	en	Tickets open %1
 tickets total %1	tts	en	Tickets total %1
 to go back to the tts index, click <a href= %1 >here</a>	tts	en	To go back to the tts index, click <a href="%1">here</a>
@@ -64,9 +56,7 @@
 trouble ticket system	common	en	Trouble Ticket System
 tts	common	en	Trouble Ticket System
 tts preferences	tts	en	Trouble Ticket System - preferences
-type	tts	en	Type
-type changed	tts	en	Type changed
-updates ticket	tts	en	Updates ticket
+Updates ticket	tts	en	Updates ticket
 use email notification	tts	en	Use email notification
 view all tickets	tts	en	View all tickets
 view job detail	tts	en	View Job Detail
diff -aburN --exclude='CVS*' phpgroupware16/tts/setup/phpgw_fr.lang phpgroupware/tts/setup/phpgw_fr.lang
--- phpgroupware16/tts/setup/phpgw_fr.lang	2003-11-03 16:58:03.000000000 -0500
+++ phpgroupware/tts/setup/phpgw_fr.lang	2003-12-22 10:38:48.000000000 -0500
@@ -6,8 +6,6 @@
 assign to	tts	fr	Assigner à
 assigned from	tts	fr	Assigné depuis
 assigned to	tts	fr	Assigné à
-attachment	tts	fr	Attachement
-attachment changed	tts	fr	Attachement changé
 billable hours	tts	fr	Heures facturables
 billable hours changed	tts	fr	Heures facturables changées
 billable hours rate	tts	fr	Taux d'heures facturables
@@ -20,11 +18,7 @@
 creates a new ticket, returns ticket_id	tts	fr	Crée un nouveau ticket, retourne l'id du ticket
 creates a struct of tickets	tts	fr	Crée une structure de tickets
 date opened	tts	fr	Date d'ouverture
-deadline	tts	fr	Date butoir
-deadline changed	tts	fr	Date butoir changée
 detail	tts	fr	Détail
-effort	tts	fr	Effort
-effort changed	tts	fr	Effort changé
 force	tts	fr	Force
 group ownership changed	tts	fr	Propriété du groupe changée
 in progress	tts	fr	En progression
@@ -41,22 +35,20 @@
 opened	tts	fr	Ouvert
 opened by	tts	fr	Ouvert par
 original ticket details	tts	fr	Détails du ticket original
-platform	tts	fr	Plate-forme
-platform changed	tts	fr	Plate-forme changée
 prio	tts	fr	Prio
 priority	tts	fr	Priorité
 priority changed	tts	fr	Priorité changée
 re-assigned	tts	fr	Réassigné
 re-opened	tts	fr	Rouvert
-returns a struct of a tickets history	tts	fr	Retourne une structure d'historique des tickets
-returns a struct of values of a single ticket	tts	fr	Retourne une structure de valeurs d'un seul ticket
-returns the additional notes attached to a ticket	tts	fr	Retourne les notes additionnelles attachées à un ticket
+Returns a struct of a tickets history	tts	fr	Retourne une structure d'historique des tickets
+Returns a struct of values of a single ticket	tts	fr	Retourne une structure de valeurs d'un seul ticket
+Returns the additional notes attached to a ticket	tts	fr	Retourne les notes additionnelles attachées à un ticket
 status/date closed	tts	fr	Statut/Date de fermeture
 subject changed	tts	fr	Sujet changé
-test	tts	fr	TEST
+TEST	tts	fr	TEST
 ticket	tts	fr	Ticket
 ticket has been updated	tts	fr	Le ticket a été mis à jour
-tickets found %1	tts	fr	Tickets trouvés %1
+Tickets found %1	tts	fr	Tickets trouvés %1
 tickets open %1	tts	fr	Tickets ouverts %1
 tickets total %1	tts	fr	Tickets total %1
 to go back to the tts index, click <a href= %1 >here</a>	tts	fr	Pour retourner à l'index de tts, cliquez <a href="%1">ici</a>
@@ -64,9 +56,7 @@
 trouble ticket system	common	fr	Système de tickets d'incidents
 tts	common	fr	Système de tickets d'incidents
 tts preferences	tts	fr	Système de tickets d'incidents - préférences
-type	tts	fr	Type
-type changed	tts	fr	Type changé
-updates ticket	tts	fr	Met à jour le ticket
+Updates ticket	tts	fr	Met à jour le ticket
 use email notification	tts	fr	Utiliser la notification par EMail
 view all tickets	tts	fr	Voir tous les tickets
 view job detail	tts	fr	Voir le détail du travail
diff -aburN --exclude='CVS*' phpgroupware16/tts/setup/phpgw_ja.lang phpgroupware/tts/setup/phpgw_ja.lang
--- phpgroupware16/tts/setup/phpgw_ja.lang	2004-07-08 22:33:30.000000000 -0400
+++ phpgroupware/tts/setup/phpgw_ja.lang	2003-12-22 10:38:48.000000000 -0500
@@ -1,4 +1,5 @@
-action	tts	ja	¥¢¥¯¥·¥ç¥ó
+Default Priority	tts	ja	½é´üÍ¥ÀèÅÙ
+Default assign to	tts	ja	½é´ü¥¢¥µ¥¤¥ó
 add new ticket	tts	ja	ÄÉ²Ã
 add ticket	tts	ja	ÄÉ²Ã
 additional notes	tts	ja	ÄÉ²Ã¾ðÊó
@@ -6,51 +7,25 @@
 assign to	tts	ja	¥¢¥µ¥¤¥ó
 assigned from	tts	ja	Äó¶¡¼Ô
 assigned to	tts	ja	¥¢¥µ¥¤¥ó
-attachment	tts	ja	ÅºÉÕ¾ðÊó
-attachment added	tts	ja	ÅºÉÕ¾ðÊóÄÉ²Ã
-attachment changed	tts	ja	ÅºÉÕ¾ðÊóÊÑ¹¹
-billable hours	tts	ja	»ÙÊ§»þ´Ö
-billable hours changed	tts	ja	»ÙÊ§»þ´ÖÊÑ¹¹
-billable hours rate	tts	ja	»ÙÊ§¥ì¡¼¥È
-billable rate	tts	ja	»ÙÊ§¥ì¡¼¥È
-billable rate changed	tts	ja	»ÙÊ§¥ì¡¼¥ÈÊÑ¹¹
-category changed	tts	ja	¥«¥Æ¥´¥êÊÑ¹¹
-clear form	tts	ja	Clear Form
 close	tts	ja	ºî¶È½ªÎ»
 close date	tts	ja	½ªÎ»Æü
 closed	tts	ja	ºî¶È½ªÎ»
-create new ticket	tts	ja	¿·µ¬ºîÀ®
 date opened	tts	ja	Äó¶¡Æü
-deadline	tts	ja	´üÆü
-deadline changed	tts	ja	´üÆüÊÑ¹¹
-default assign to	tts	ja	½é´ü¥¢¥µ¥¤¥ó
 default group	tts	ja	½é´ü¥°¥ë¡¼¥×
-default priority	tts	ja	½é´üÍ¥ÀèÅÙ
 detail	tts	ja	¾ÜºÙ
 details	tts	ja	¾ÜºÙ¾ðÊó
 disabled	tts	ja	¤Ê¤·
-effort	tts	ja	Effort
-effort changed	tts	ja	Effort changed
 force	tts	ja	É¬¿Ü
-group ownership changed	tts	ja	¥°¥ë¡¼¥×ÊÑ¹¹
 highest	tts	ja	¹â
 in progress	tts	ja	ºî¶È¿Ê¹ÔÃæ
 lowest	tts	ja	Äã
 new ticket	tts	ja	¿·¤·¤¤¥Á¥±¥Ã¥È
-new value	tts	ja	ÊÑ¹¹¸å
-no additional notes	tts	ja	ÄÉ²Ã¾ðÊó¤Ï¤¢¤ê¤Þ¤»¤ó
 no subject	tts	ja	·ïÌ¾¤Ê¤·
 no tickets found	tts	ja	¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£
 not assigned	tts	ja	¥¢¥µ¥¤¥ó¤Ê¤·
-old value	tts	ja	ÊÑ¹¹Á°
-open	tts	ja	¥ª¡¼¥×¥ó
 open date	tts	ja	Äó¶¡Æü
-opened	tts	ja	¥ª¡¼¥×¥ó
 opened by	tts	ja	Äó¶¡¼Ô
 prio	tts	ja	Í¥ÀèÅÙ
-priority	tts	ja	Í¥ÀèÅÙ
-priority changed	tts	ja	Í¥ÀèÅÙÊÑ¹¹
-re-assigned	tts	ja	¥¢¥µ¥¤¥óÊÑ¹¹
 refresh every (seconds)	tts	ja	¹¹¿·´Ö³Ö¡ÊÉÃ¡Ë
 reopen	tts	ja	ºî¶ÈºÆ³«
 search	tts	ja	¸¡º÷
@@ -59,12 +34,10 @@
 ticket	tts	ja	¥Á¥±¥Ã¥È
 ticket assigned to %1	tts	ja	%1 ¤Ë¥¢¥µ¥¤¥ó
 ticket closed	tts	ja	ºî¶È½ªÎ»
-ticket has been updated	tts	ja	¥Á¥±¥Ã¥È¤ò¹¹¿·¤·¤Þ¤·¤¿
-ticket reopened	tts	ja	ºî¶ÈºÆ³«
 tickets found %1	tts	ja	%1 ·ï¸«¤Ä¤«¤ê¤Þ¤·¤¿
+ticket reopened	tts	ja	ºî¶ÈºÆ³«
 tickets open %1	tts	ja	¥ª¡¼¥×¥ó %1
 tickets total %1	tts	ja	¹ç·× %1
-total billable	tts	ja	»ÙÊ§¹ç·×
 trouble ticket system	common	ja	¥Á¥±¥Ã¥È¥·¥¹¥Æ¥à
 tts	common	ja	¥Á¥±¥Ã¥È¥·¥¹¥Æ¥à
 tts preferences	tts	ja	¥Á¥±¥Ã¥È¥·¥¹¥Æ¥à¥æ¡¼¥¶ÀßÄê
diff -aburN --exclude='CVS*' phpgroupware16/tts/setup/phpgw_sv.lang phpgroupware/tts/setup/phpgw_sv.lang
--- phpgroupware16/tts/setup/phpgw_sv.lang	2003-11-03 17:35:52.000000000 -0500
+++ phpgroupware/tts/setup/phpgw_sv.lang	2003-12-22 10:38:48.000000000 -0500
@@ -1,63 +1 @@
-action	tts	sv	Aktion
-add new ticket	tts	sv	Lägg till ny anmälan
-add ticket	tts	sv	Lägg till anmälan
-additional notes	tts	sv	Ytterligare notiser
-admin options	admin	sv	Admin tilläggsval
-assign to	tts	sv	Delegerat till
-assigned from	tts	sv	Delegerat från
-assigned to	tts	sv	Delegerade till
-billable hours	tts	sv	Faktureringsbara timmar
-billable hours changed	tts	sv	Faktureringsbara timmar ändrades
-billable hours rate	tts	sv	Faktureringsbara timmar pris
-billable rate	tts	sv	Faktureringsbara pris
-billable rate changed	tts	sv	Faktureringsbara pris ändrades
-category changed	tts	sv	Kategori ändrades
-clear form	tts	sv	Töm blad
-closed	tts	sv	Stängd
-create new ticket	tts	sv	Skapa ny anmälan
-creates a new ticket, returns ticket_id	tts	sv	Skapa en ny anmälan, visa ticket_id
-creates a struct of tickets	tts	sv	Skapar en struktur av anmälningar
-date opened	tts	sv	Öppnat datum
-detail	tts	sv	Detalj
-force	tts	sv	Tvinga
-group ownership changed	tts	sv	Ägarskap för grupp ändrades
-in progress	tts	sv	I arbete
-latest note added	tts	sv	Senaste notering inlagd
-new ticket	tts	sv	Ny anmälan
-new value	tts	sv	Nytt värde
-no additional notes	tts	sv	Inga fler noteringar
-no notes for this ticket	tts	sv	Inga noteringar för denna anmälan
-no tickets found	tts	sv	Inga anmälningar hittade.
-not assigned	tts	sv	Ej delegerad
-old value	tts	sv	Gammalt värde
-open	tts	sv	Öppna
-open date	tts	sv	Öppnat datum
-opened	tts	sv	Öppnad
-opened by	tts	sv	Öppnad av
-original ticket details	tts	sv	Original anmälning detaljer
-prio	tts	sv	Prio
-priority	tts	sv	Prioritet
-priority changed	tts	sv	Prioritet ändrades
-re-assigned	tts	sv	Omdelegerad
-re-opened	tts	sv	Återöppnad
-returns a struct of a tickets history	tts	sv	Visar en struktur av anmälningens historik
-returns a struct of values of a single ticket	tts	sv	Visar en struktur av värden för en enstaka anmälning
-returns the additional notes attached to a ticket	tts	sv	Visar ytterligare noteringar bifogade en anmälning
-status/date closed	tts	sv	Status/datum stängd
-subject changed	tts	sv	Rubrik ändrades
-test	tts	sv	TEST
-ticket	tts	sv	Anmälning
-ticket has been updated	tts	sv	Anmälning har uppdaterats
-tickets found %1	tts	sv	Anmälningar hittade %1
-tickets open %1	tts	sv	Anmälningar öppna %1
-tickets total %1	tts	sv	Anmälningar totalt %1
-to go back to the tts index, click <a href= %1 >here</a>	tts	sv	För att gå tillbaka till index, klicka <a href="%1">här</a>
-total billable	tts	sv	Totalt faktureringsbart
-trouble ticket system	common	sv	Problem Anmälning System
-tts	common	sv	Problem Anmälning System
-tts preferences	tts	sv	Problem Anmälning System - inställningar
-updates ticket	tts	sv	Uppdatera anmälning
-use email notification	tts	sv	Använd epost-påminnelse
-view all tickets	tts	sv	Visa alla anmälningar
-view job detail	tts	sv	Visa jobbdetalj
-view only open tickets	tts	sv	Visa bara öppna anmälningar
+trouble ticket system	common	sv	Trouble Ticket System
diff -aburN --exclude='CVS*' phpgroupware16/tts/setup/setup.inc.php phpgroupware/tts/setup/setup.inc.php
--- phpgroupware16/tts/setup/setup.inc.php	2004-05-03 21:37:41.000000000 -0400
+++ phpgroupware/tts/setup/setup.inc.php	2004-07-23 15:03:41.000000000 -0400
@@ -9,15 +9,14 @@
 	*  option) any later version.                                              *
 	\**************************************************************************/
 
-	/* $Id: setup.inc.php,v 1.6.4.2 2004/04/16 11:30:05 lpiepho Exp $ */
+	/* $Id: setup.inc.php,v 1.6 2002/01/07 10:50:42 seek3r Exp $ */
 
 	/* Basic information about this app */
 	$setup_info['tts']['name']                = 'tts';
 	$setup_info['tts']['title']               = 'Trouble Ticket System';
-	$setup_info['tts']['version']             = '0.9.16.001';
+	$setup_info['tts']['version']   = '0.8.1.003';
 	$setup_info['tts']['app_order']           = 99;
 	$setup_info['tts']['enable']              = 1;
-	$setup_info['todo']['globals_checked']    = True;
 
 	/* The tables this app creates */
 	$setup_info['tts']['tables']    = array(
@@ -35,6 +34,6 @@
 	/* Dependencies for this app to work */
 	$setup_info['tts']['depends'][] = array(
 		 'appname' => 'phpgwapi',
-		 'versions' => Array('0.9.13','0.9.14', '0.9.16')
+		 'versions' => Array('0.9.13','0.9.14','0.9.16')
 	);
 ?>
diff -aburN --exclude='CVS*' phpgroupware16/tts/setup/setup_info.inc.php phpgroupware/tts/setup/setup_info.inc.php
--- phpgroupware16/tts/setup/setup_info.inc.php	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/setup/setup_info.inc.php	2003-12-22 10:38:48.000000000 -0500
@@ -0,0 +1,3 @@
+<?php
+	$setup_info["tts"] = array("name" => "Trouble Ticket System", "app_order" => 99, "version" => "0.0.1");
+?>
diff -aburN --exclude='CVS*' phpgroupware16/tts/setup/tables_current.inc.php phpgroupware/tts/setup/tables_current.inc.php
--- phpgroupware16/tts/setup/tables_current.inc.php	2004-02-19 21:21:00.000000000 -0500
+++ phpgroupware/tts/setup/tables_current.inc.php	2003-12-22 10:38:48.000000000 -0500
@@ -9,7 +9,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: tables_current.inc.php,v 1.6.4.1 2004/01/20 05:03:42 jengo Exp $ */
+  /* $Id: tables_current.inc.php,v 1.6 2001/10/24 12:47:58 milosch Exp $ */
 
 	$phpgw_baseline = array(
 		'phpgw_tts_tickets' => array(
@@ -24,12 +24,7 @@
 				'ticket_billable_hours' => array('type' => 'decimal', 'precision' => 8, 'scale' => 2, 'nullable' => False),
 				'ticket_billable_rate'  => array('type' => 'decimal', 'precision' => 8, 'scale' => 2, 'nullable' => False),
 				'ticket_status'         => array('type' => 'char','precision' => 1, 'nullable' => False),
-				'ticket_details'        => array('type' => 'text','nullable' => False),
-				'ticket_type'           => array('type' => 'int', 'precision' => 2, 'nullable' => False),
-				'ticket_deadline'       => array('type' => 'varchar', 'precision' => 10, 'nullable' => False),
-				'ticket_effort'         => array('type' => 'varchar', 'precision' => 4, 'nullable' => False),
-				'ticket_platform'       => array('type' => 'int', 'precision' => 2, 'nullable' => False),
-				'ticket_attachment'     => array('type' => 'int', 'precision' => 2, 'nullable' => False)
+				'ticket_details'        => array('type' => 'text','nullable' => False)
 			),
 			'pk' => array('ticket_id'),
 			'ix' => array(),
diff -aburN --exclude='CVS*' phpgroupware16/tts/setup/tables_new.inc.php phpgroupware/tts/setup/tables_new.inc.php
--- phpgroupware16/tts/setup/tables_new.inc.php	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/setup/tables_new.inc.php	2003-12-22 10:38:48.000000000 -0500
@@ -0,0 +1,42 @@
+<?php
+	$app_tables = array(
+		"ticket" => array(
+			"fd" => array(
+				"t_id"				=> array("type" => "auto", "nullable" => false),
+				"t_category"	=> array("type" => "varchar", "precision" => 40, "nullable" => True),
+				"t_detail"		=> array("type" => "text", "nullable" => True),
+				"t_priority"	=> array("type" => "int", "precision" => 2, "nullable" => False),
+				"t_user"			=> array("type" => "varchar", "precision" => 10, "nullable" => True),
+				"t_assignedto"	=> array("type" => "varchar", "precision" => 10, "nullable" => True),
+				"t_timestamp_opened"	=> array("type" => "int", "precision" => 2, "nullable" => False),
+				"t_timestamp_closed"	=> array("type" => "int", "precision" => 2, "nullable" => False),
+				"t_timestamp_subject"	=> array("type" => "varchar", "precision" => 255, "nullable" => True),
+				"t_department"	=> array("type" => "varchar", "precision" => 25, "nullable" => True),
+				"t_watchers"	=> array("type" => "text", "nullable" => True),
+			),
+			"pk" => array("t_id"),
+			"ix" => array(),
+			"fk" => array(),
+			"uc" => array()
+		),
+	"category" => array(
+			"fd" => array(
+				"c_id"				=> array("type" => "auto", "nullable" => false),
+				"c_department"	=> array("type" => "varchar", "precision" => 25, "nullable" => True),
+				"c_name"			=> array("type" => "varchar", "precision" => 40, "nullable" => True),
+			),
+			"pk" => array("c_id"),
+			"ix" => array(),
+			"fk" => array(),
+			"uc" => array()
+		),
+	"department" => array(
+			"fd" => array(
+				"d_name"			=> array("type" => "varchar", "precision" => 25, "nullable" => True),
+			),
+			"pk" => array(),
+			"ix" => array(),
+			"fk" => array(),
+			"uc" => array()
+		)
+	);
diff -aburN --exclude='CVS*' phpgroupware16/tts/setup/tables_update.inc.php phpgroupware/tts/setup/tables_update.inc.php
--- phpgroupware16/tts/setup/tables_update.inc.php	2004-02-19 21:21:00.000000000 -0500
+++ phpgroupware/tts/setup/tables_update.inc.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,55 +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: tables_update.inc.php,v 1.1.2.2 2004/01/20 05:03:42 jengo Exp $
-	// $Source: /cvsroot/phpgroupware/tts/setup/Attic/tables_update.inc.php,v $
-
-	/* This is since the last release */
-	$test[] = '0.9.16';
-	function phpgwapi_upgrade0_9_16()
-	{
-		global $setup_info,$phpgw_setup;
-		
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_tts_tickets','type',array(
-			'type' => 'int',
-			'precision' => '',
-			'nullable' => True
-			));
-			
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_tts_tickets','deadline',array(
-			'type' => 'varchar',
-			'precision' => '10',
-			'nullable' => True
-			));
-		
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_tts_tickets','effort',array(
-			'type' => 'varchar',
-			'precision' => '4',
-			'nullable' => True
-			));
-			
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_tts_tickets','platform',array(
-			'type' => 'int',
-			'precision' => '',
-			'nullable' => True
-			));
-			
-		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_tts_tickets','attachment',array(
-			'type' => 'int',
-			'precision' => '',
-			'nullable' => True
-			));
-		
-		$setup_info['phpgwapi']['currentver'] = '0.9.16.001';
-		return $setup_info['phpgwapi']['currentver'];
-	}
-
-?>
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/default/index.tpl phpgroupware/tts/templates/default/index.tpl
--- phpgroupware16/tts/templates/default/index.tpl	2004-07-08 22:33:31.000000000 -0400
+++ phpgroupware/tts/templates/default/index.tpl	2003-12-22 10:38:48.000000000 -0500
@@ -1,9 +1,10 @@
-<!-- $Id: index.tpl,v 1.15.2.3.4.2 2004/05/11 13:39:22 lpiepho Exp $ -->
+<!-- $Id: index.tpl,v 1.15.2.3 2002/01/25 23:03:30 jengo Exp $ -->
 <!-- BEGIN index.tpl -->
+
 {autorefresh}
 
 <!-- BEGIN tts_title -->
-<!-- <div align="center">{tts_appname}</div><p></p> -->
+<!-- <center>{tts_appname}</center><p /> -->
 <!-- END tts_title -->
 
 <!-- _BEGIN tts_links -->
@@ -11,43 +12,36 @@
 <!-- _END tts_links -->
 
 <!-- BEGIN tts_search -->
-<form action="{tts_search_link}" method="post" name="search">
-  <table width="100%" cellspacing="0" cellpadding="0" border="0">
-    <tr bgcolor="{th_bg}"><td>{lang_appname}</td></tr>
+<table width="100%" cellspacing="0" cellpadding="0" border="0">
+	<tr bgcolor="{th_bg}">
+		<td colspan="2">{lang_appname}</td>
+	</tr>
     <tr>
-      <td align="left">
-        <a href="{tts_newticket_link}">{tts_newticket}</a>&nbsp;|&nbsp;
-        <a href="{tts_prefs_link}">{lang_preferences}</a>&nbsp;|&nbsp;
-        <a href="{tts_changeview_link}">{tts_changeview}</a>&nbsp;
+		<td align="left"><a href="{tts_newticket_link}">{tts_newticket}</a>&nbsp;|&nbsp;<a href="{tts_prefs_link}">{lang_preferences}</a>&nbsp;|&nbsp;<a href="{tts_changeview_link}">{tts_changeview}</a>&nbsp;</td>
+		<td align="right">
+			<form action="{tts_search_link}" method="POST" name="search">
+				<input type="hidden" name="filter" value="search">
+				<input name="searchfilter" value="{tts_searchfilter}">
+				<input type="submit" value="{lang_search}">
+			</form>
       </td>
     </tr>
-  </table>
-  <div align="center"><b>{tts_numfound}</b><br /></div>
+</table>
+
+<center>
+<b>{tts_numfound}</b>
+<br />
+</center>
 <!-- END tts_search -->
 
 <!-- BEGIN tts_list -->
 <!--
-  <div align="center">{tts_numtotal}<br />{tts_numopen}</div><p></p>
-  <div align="center">{tts_notickets}</div>
+<center>{tts_numtotal}<br />{tts_numopen}</center><p />
+<center>{tts_notickets}</center>
 -->
-    <table width="98%" cellspacing="1" cellpadding="1" border=0" align="center">
+<table width="98%" cellspacing="1" cellpadding="1" border="0" align="center">
       <tr bgcolor="{tts_head_bgcolor}">
-        <td align="center"></td>
-        <td align="center"></td>
-        <td align="center">
-          <input type="hidden" name="filter" value="search" />
-          <input class="text" name="searchfilter" value="{tts_searchfilter}" />
-          <input class="button" type="submit" value="{lang_search}" />
-        </td>
-        <td align="center"></td>
-        <td align="center"></td>
-        <td align="center">{filter_category}</td>
-        <td align="center">{filter_assignedto}</td>
-        <td align="center">{filter_owner}</td>
-        <td align="center">{filter_prio}</td>
-      </tr>
-      <tr>
-        <td align="center">&nbsp;</td>
+		<td width="22">&nbsp;</td>
         <td align="center">{tts_head_ticket}</td>
         <td align="center">{tts_head_subject}</td>
         <td align="center">{tts_head_dateopened}</td>
@@ -55,27 +49,25 @@
         <td align="center">{tts_head_category}</td>
         <td align="center">{tts_head_assignedto}</td>
         <td align="center">{tts_head_openedby}</td>
-        <td align="center">{tts_head_prio}</td>
+
         {tts_head_status}
       </tr>
       {rows}
-    </table>
-</form>
+</table>
 <!-- END tts_list -->
 
 <!-- END index.tpl -->
 
 <!-- BEGIN tts_row -->
       <tr bgcolor="{tts_row_color}">
-        <td>{row_status}</td>
+		<td width="22">{row_status}</td>
         <td align="center">{row_ticket_id}</td>
-        <td>{tts_t_subject}</td>
-        <td>{tts_t_timestampopened}</td>
-        <td>{row_group}</td>
-        <td>{row_category}</td>
-        <td>{tts_t_assignedto}</td>
-        <td>{tts_t_user}</td>
-        <td>{tts_t_prio}</td>
+		<td align="center">{tts_t_subject}</td>
+		<td align="center">{tts_t_timestampopened}</td>
+		<td style="font-size=12" align=center>{row_group}</td>
+		<td style="font-size=12" align=center>{row_category}</td>
+		<td align="center">{tts_t_assignedto}</td>
+		<td align="center">{tts_t_user}</td>
         {tts_col_status}
       </tr>
 <!-- END tts_row -->
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/default/newticket.tpl phpgroupware/tts/templates/default/newticket.tpl
--- phpgroupware16/tts/templates/default/newticket.tpl	2004-05-03 21:37:42.000000000 -0400
+++ phpgroupware/tts/templates/default/newticket.tpl	2003-12-22 10:38:48.000000000 -0500
@@ -3,64 +3,132 @@
 <!-- END options_select -->
 
 <!-- BEGIN form -->
+<form method="POST" action="{form_action}">
+
 <b>{lang_create_new_ticket}</b>
-<hr />
-<p></p>
+<hr><p>
+
 {messages}
-<form method="post" action="{form_action}" enctype="multipart/form-data">
-          <table border="0" width="80%" cellspacing="0" align="center">
-            <tr bgcolor="{th_bg}"><td colspan="4">&nbsp;</td></tr>
+
+<form method="POST" action="{form_action}">
+
+<table border="0" width="80%" cellspacing="0" align="center">
+	<tr bgcolor="{th_bg}">
+		<td colspan="4">&nbsp;</td>
+	</tr>
+
             <tr bgcolor="{row_off}">
               <td align="left">{lang_assignedto}:</td>
               <td align="left">{value_assignedto}</td>
-              <td align="left">{lang_category}:</td> <!-- <td class="left">{lang_billable_hours}:</td> -->
-              <td align="left">{value_category}</td> <!-- <td class="left"><input name="ticket[billable_hours]" value="{value_billable_hours}" /></td> -->
+		<td align="left">{lang_billable_hours}:</td>
+		<td align="left"><input name="ticket[billable_hours]" value="{value_billable_hours}"></td>
             </tr>
-            <tr bgcolor="{row_on}">
+
+	<tr bgcolor="{row_off}">
               <td align="left">{lang_priority}:</td>
               <td align="left">{value_priority}</td>
-              <td align="left">{lang_effort}:</td> <!-- <td class="left">{lang_billable_hours_rate} {currency}:</td> -->
-              <td align="left"><input type="text" name="ticket[effort]" /></td> <!-- <td class="left"><input name="ticket[billable_rate]" value="{value_billable_hours_rate}" /></td> -->
+		<td align="left">{lang_billable_hours_rate}:</td>
+		<td align="left"><input name="ticket[billable_rate]" value="{value_billable_hours_rate}"></td>
             </tr>
+
             <tr bgcolor="{row_off}">
               <td align="left">{lang_group}:</td>
               <td align="left"><select name="ticket[group]">{options_group}</select></b></td>
-              <td align="left">{lang_billable_hours}: {currency}</td>
-              <td align="left"><input name="ticket[billable_hours]" value="{value_billable_hours}" /></td>
+		<td align="left">{lang_category}:</td>
+		<td align="left">{value_category}</td>
             </tr>
-            <tr bgcolor="{row_on}">
-              <td align="left" colspan="2"></td>
-              <td align="left" colspan="2"></td>
-<!--          <td align="left"> {lang_type}: </td>	-->
-<!--          <td align="left">{value_type}</td>	-->
-            </tr>
-            <tr bgcolor="{row_on}">
-              <td align="left">{lang_deadline}:</td>
-              <td align="left"><input type="text" name="ticket[deadline][year]" size="4" /> . {option_month} . {option_day}</td>
-              <td align="left">{lang_billable_hours_rate}: {currency}</td>
-              <td align="left"><input name="ticket[billable_rate]" value="{value_billable_hours_rate}" /></td>
-            </tr>
-	        <tr bgcolor="{row_off}"
-	          <td align="left">&nbsp;</td>	
-	          <td align="left">&nbsp;</td>	
-              <td align="left"> {lang_attachment} </td>	
-              <td align="left"> <input type="file" name="attachment" /> </td> 
-            </tr>
-            <tr><td bgcolor="{row_on}" colspan="4" align="center">&nbsp;</td></tr>
-            <tr bgcolor="{row_off}"><td colspan="4">{lang_subject}:</td></tr>
-            <tr bgcolor="{row_on}"><td colspan="4"><input name="ticket[subject]" value="{value_subject}" size="65" /></td></tr>
-            <tr bgcolor="{row_off}"><td colspan="4">&nbsp;</td></tr>
-            <tr bgcolor="{row_on}">
-              <td colspan="4">
-                {lang_details}:<br />
-                <textarea rows="10" name="ticket[details]" cols="65" wrap="hard">{value_details}</textarea>
-              </td>
+
+	<tr bgcolor="{row_off}">
+		<td colspan="4" align="center"><hr></td>
+	</tr>
+
+	<tr bgcolor="{row_off}">
+		<td colspan="4">{lang_subject}:</td>
             </tr>
+
+	<tr bgcolor="{row_off}">
+		<td colspan="4"><input name="ticket[subject]" value="{value_subject}" size="65"></td>
+	</tr>
+
+	<tr bgcolor="{row_off}">
+		<td colspan="4">&nbsp;</td>
+	</tr>
+
+	<tr bgcolor="{row_off}">
+		<td colspan="4">{lang_details}:<br><textarea rows="10" name="ticket[details]" cols="65" wrap="hard">{value_details}</textarea></td>
+	</tr>
+
             <tr>
-              <td align="left"><input type="submit" name="submit" value="{lang_submit}" /></td>
+		<td align="left"><input type="submit" name="submit" value="{lang_submit}"></td>
               <td colspan="2">&nbsp;</td>
-              <td align="right"><input type="submit" name="cancel" value="{lang_cancel}" /></td>
+		<td align="right"><input type="submit" name="cancel" value="{lang_cancel}"></td>
+	</tr>
+</table>
+
+
+
+
+
+
+
+
+
+<!--
+<center>
+<table bgcolor="{tts_bgcolor}" cellpadding="3" border="1" width="600">
+ <tr>
+  <td width="100%" valign="center" align="center"><font color="{tts_textcolor}"><b>{tts_lang_addnewticket}</b></font></td>
+ </tr>
+ <tr>
+  <td width="100%" align="left">
+    <table cellspacing="0" cellpadding="5" border="0" width="100%">
+     <tr>
+      <td width="75%" valign="middle"></td>
+     </tr> 
+     <tr>
+      <td width="15%" valign="middle" align="right"><b>{tts_lang_group}:</b> </td>
+      <td width="75%" valign="middle"><select size="1" name="lstCategory">
+      {tts_new_lstcategories}
+      </select></td>
+     </tr>
+      <tr>
+       <td width="15%" valign="middle" align="right"><b>{tts_lang_assignto}:</b></td>
+       <td width="75%" valign="middle">
+        <select size="1" name="assignto">
+	  {tts_new_lstassigntos}
+        </select></td>
+      </tr>
+      <tr>
+       <td width="15%" valign="middle" align="right"><b>{tts_lang_subject}:</b></td>
+       <td width="75%" valign="middle"><input type=text size=50 maxlength=80 name="subject" value="{tts_lang_nosubject}"></td>
+      </tr>
+      <tr>
+       <td width="15%" valign="top" align="right"><b>{tts_lang_details}:</b></td>
+       <td width="75%"><textarea rows="10" name="txtAdditional" cols="65" wrap="virtual"></textarea></td>
+      </tr>
+      <tr>
+       <td width="15%" valign="middle" align="right"><b>{tts_lang_priority}:</b> </td>
+       <td width="75%" valign="middle">
+          <table border="0" width="100%" cellspacing="0" cellpadding="0">
+              <tr>
+               <td width="25%">
+                <select name="optPriority">
+		    {tts_priority_options}
+                </select>
+               </td>
+              </tr>
+          </table>
+       </td>
             </tr>
           </table>
+    
+    <p align="center"><center><input type="submit" value="{tts_lang_addticket}" name="submit">
+    <input type="reset" value="{tts_lang_clearform}"></center>
+  </td>
+ </tr>
+</table>
+</center>
+</div>
 </form>
+-->
 <!-- END form -->
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/default/preferences.tpl phpgroupware/tts/templates/default/preferences.tpl
--- phpgroupware16/tts/templates/default/preferences.tpl	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/templates/default/preferences.tpl	2003-12-22 10:38:48.000000000 -0500
@@ -0,0 +1,51 @@
+<!-- $Id: preferences.tpl,v 1.3.2.1 2001/08/10 15:31:32 q-bert Exp $ -->
+<!-- BEGIN preferences.tpl -->
+<!-- BEGIN tts_select_options -->
+    <option value="{tts_optionvalue}" {tts_optionselected}>{tts_optionname}</option>
+<!-- END tts_select_options -->
+
+<p><b>{lang_ttsprefs}:</b><hr><p>
+   
+  <form method="POST" action="{action_url}">
+   <table border="0" align="center" cellspacing="1" cellpadding="1">
+    <tr bgcolor="EEEEEE">
+     <td>{lang_show_new_updated}</td>
+     <td><input type="checkbox" name="mainscreen_show_new_updated" {show_new_updated}></td>
+    </tr>
+    <tr bgcolor="EEEEEE">
+     <td>{lang_defaultgroup}</td>
+     <td>
+      <select size="1" name="groupdefault">
+           {tts_groupoptions}
+      </select>
+    </td>
+    </tr>
+    <tr bgcolor="EEEEEE">
+     <td>{lang_defaultassignto}</td>
+     <td>
+       <select size="1" name="assigntodefault">
+           {tts_assigntooptions}
+       </select>
+    </td>
+    </tr>
+    <tr bgcolor="EEEEEE">
+     <td>{lang_defaultpriority}</td>
+     <td>
+       <select size="1" name="prioritydefault">
+           {tts_priorityoptions}
+       </select>
+     </td>
+    </tr>
+    <tr bgcolor="EEEEEE">
+     <td>{lang_refreshinterval}</td>
+     <td>
+        <input name="refreshinterval" value="{refreshinterval}" size="60"></input>
+     </td>
+    </tr>
+    <tr colspan="2" >
+     <td colspan="5" align="center">
+      <input type="submit" name="submit" value="{lang_submit}">
+     </td>
+    </tr>
+   </table>
+   </form>
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/default/viewticket_details.tpl phpgroupware/tts/templates/default/viewticket_details.tpl
--- phpgroupware16/tts/templates/default/viewticket_details.tpl	2004-05-03 21:37:42.000000000 -0400
+++ phpgroupware/tts/templates/default/viewticket_details.tpl	2004-06-11 15:38:25.000000000 -0400
@@ -42,7 +42,7 @@
 
 <center><font color=red>{messages}</font></center>
 
-<form method="POST" action="{viewticketdetails_link}" enctype="multipart/form-data">
+<form method="POST" action="{viewticketdetails_link}">
 <input type="hidden" name="ticket_id" value="{ticket_id}">
 <input type="hidden" name="lstAssignedfrom" value="{ticket_user}">
 
@@ -55,28 +55,28 @@
 		<td align="left">{lang_opendate}:</td>
 		<td align="left"><b>{value_opendate}</b></td>
 		<td align="left">{lang_billable_hours}:</td>
-		<td align="left"><b>{currency} {value_billable_hours}</b></td>
+		<td align="left"><b>$ {value_billable_hours}</b></td>
 	</tr>
 
 	<tr bgcolor="{row_off}">
 		<td align="left">{lang_assignedfrom}:</td>
 		<td align="left"><b>{value_owner}</b></td>
-		<td align="left">{lang_billable_hours_rate}: </td>
-		<td align="left"><b>{currency} {value_billable_hours_rate}</b></td>
+		<td align="left">{lang_billable_hours_rate}:</td>
+		<td align="left"><b>$ {value_billable_hours_rate}</b></td>
 	</tr>
 
 	<tr bgcolor="{row_off}">
 		<td align="left">{lang_assignedto}:</td>
 		<td align="left"><b>{value_assignedto}</b></td>
 		<td align="left">{lang_billable_hours_total}:</td>
-		<td align="left"><b>{currency} {value_billable_hours_total}</b></td>
+		<td align="left"><b>$ {value_billable_hours_total}</b></td>
 	</tr>
 
 	<tr bgcolor="{row_off}">
 		<td align="left">{lang_priority}:</td>
 		<td align="left"><b>{value_priority}</b></td>
-		<td align="left">{lang_attachment}</td>
-		<td align="left">{value_attachment}</td>
+		<td align="left">&nbsp;</td>
+		<td align="left">&nbsp;</td>
 	</tr>
 
 	<tr bgcolor="{row_off}">
@@ -120,17 +120,16 @@
 	</tr>
 
 	<tr bgcolor="{row_off}">
-		<td align="center"><b>{lang_priority}: </b><select name="ticket[priority]">{options_priority}</select></td>
-		<td align="center"><b>{lang_category}: </b><select size="1" name="ticket[category]">{options_category}</select></td>
-		<td align="center"><b>{lang_assignedto}: </b><select size="1" name="ticket[assignedto]">{options_assignedto}</select></td>
-		<td align="center"><b>{lang_attachment} </b><input type="file" name="attachment"></td>
+		<td align="center"><b>{lang_priority}:</b><select name="ticket[priority]">{options_priority}</select></td>
+		<td align="center"><b>{lang_category}:</b><select size="1" name="ticket[category]">{options_category}</select></td>
+		<td colspan="2" align="center"><b>{lang_assignedto}:</b><select size="1" name="ticket[assignedto]">{options_assignedto}</select></td>
 	</tr>
 
 	<tr bgcolor="{row_off}">
-		<td align="center"><b>{lang_status}: </b><select name="ticket[status]">{options_status}</select></td>
-		<td align="center"><b>{lang_group}: </b><select name="ticket[group]">{options_group}</select></td>
-		<td align="center"><b>{lang_billable_hours_rate}: <input name="ticket[billable_rate]" value="{value_billable_hours_rate}"></td>
-		<td align="center"><b>{lang_billable_hours}: <input name="ticket[billable_hours]" value="{value_billable_hours}"></td>
+		<td align="right"><b>{lang_status}:</b><select name="ticket[status]">{options_status}</select></td>
+		<td align="right"><b>{lang_group}:</b><select name="ticket[group]">{options_group}</select></td>
+		<td><b>{lang_billable_hours_rate}: <input name="ticket[billable_rate]" value="{value_billable_hours_rate}"></td>
+		<td><b>{lang_billable_hours}: <input name="ticket[billable_hours]" value="{value_billable_hours}"></td>
 	</tr>
 
 	<tr bgcolor="{row_off}">
@@ -143,9 +142,10 @@
 
 	<tr bgcolor="{row_off}">
 		<td>&nbsp;</td>
-		<td align="center"><input type="submit" value="{lang_ok}" name="submit"></td>
-		<td align="center"><input name="done" type="button" value="{lang_done}" onClick="self.location.href='{done_url}'" /></td>
-		<td>&nbsp;</td>
+		<td align="center"><input type="submit" value="{lang_ok}" name="submit">   
+                        <input type="submit" name="close" value="{lang_close}">
+		</td>
+		<td colspan="2">&nbsp;</td>
 	</tr>
 
 		<tr>
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/idots/images/navbar.png phpgroupware/tts/templates/idots/images/navbar.png
--- phpgroupware16/tts/templates/idots/images/navbar.png	2003-04-18 10:35:44.000000000 -0400
+++ phpgroupware/tts/templates/idots/images/navbar.png	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-‰PNG
-
-
IHDR(<¹øà	pHYsÒÝ~ütIMEÓ
ƒ,¹Q‡IDATxœí™klTÇÇ3÷îÃ»k{í±�	2!&á!Hš¢´�JpP"¤(m’@i«æKÒO•¢|©ªJ­ªJ¨_ª¾h£Vm”H¥�)!B		‰Z’(¼m0/æa?Ø½»ö¾fúaîÝ½{w×­B+ü�c]ùÎ¹sçÿŸsÎœ9sWìù×1Í,;oºÕfÛêVs˜Ql©f;AëVS˜Yl�·šÃŒb9Ë	êÙ‚Ø‚Y�±…·šÃŒ2ë	ÎîÂmÞ¼ÌzÞ&x³r;oVn¼Y¹ƒ7+6Bà§è_A]pA]°=99�Ú’mußâ4Â•º¦Ô¾îžÆüuUí@åkYVÝIUÞŽY×¶„Uõ@”Ã²¢³êê, BÊ¡ª6ZsýêÚÚÚ}cƒ	{]ƒÓWÖ�Á€ª^£
ûLNŒÓOÔìïWõN=B`�·�uBTGáÂž»B uµÛüx5Ø5“‰¨ Æ`B×èDð=YÝ¾pv°¶�0cïgÂµQ
-!|§w7Ø…ð¥HUÂ¸§¢Ó¥"BZx3ÖÅB†ÊÏO?F8æØ‰|võC´ß1´íâiZW°àÚBÖ£®jc-í3}>—cìúŽ9Ê'cã<ýìfÂ!M!›%›Nsðãyå·ÛÈçr¤ÒižÛ´™ö¶v¾Ø÷(ó»ç<Â¿ŽàÚJj¤®€kÏA�/c^º8Ä™Óý<¼¦�Ds’?½ö–'¤wìdt÷.~
-\qß
…BìÛûËV¬àÂ¥¼üýï!µ¡¦….ãÔÃUBcGd‚B)_V†D€¢.”ua™@©%]`qï½,½o•G©7`à�·™ç8|xø�Âá0­­­$š›i‰Ç9°÷]¾°æ"á&¤�eìz¸™ÀV…°|Ö*¹± }3)”ÐRW¥•/2Ü˜+ïàÎ³g(:!`è6oÑh”|>O6“!‹šÊ�N¥·EPZ—±ëã*liåÑÂ®ø]]ÿWŽ°Š˜ ©ðµã°÷¥ï2:0@0ÈE 	X
ìÇabb‚ññqb±:!™L"¤B É: ¦§øø£YóØ†2†´òØRjJ¾øÒ¯òé,©8|èC/
-…hmm%µgcD�˜KÊ¢@xX|”Ëá8YÇ!•J1ry˜ñ«Wè¸«�&–h6	¹9FßúõU\¤ÔØJÙUfÕÚ2ºÏ�ýËÜ˜œä‘u_bdè,'·þ„Ñ£GËÖ
-»ÿ%Ðê^Q`+0Ì¹v�Á°ä}¥Èô.¡­£­-Ðé~]SÚv=çs±²±•´«ªv÷DO—qÒÄâ	ž|ê9šS¿ÛÆÔáÃóy".¹¤k5é“®~¡ÛŽ‹¬>w‘µ#cl[ýáH´@‰
-N@I[Kðoååî¶£‘(k¿¼žb©@!ãp}ûvRù<Âu­l÷X€‰E�dkehæg2<Û½�I!Zˆ2v×Û¦Z,ÏÄî
-…	Á`ÿQNo•CŽCJ.�Ì=@;Pp	G\À˜oü–g6�Öœ¸¸·…¨®0Ê…£O7�›æÊéd÷¿MÑ%¦]b6Æ½€NL‚.¹Ö´1Ç“KM0v}”yóî¬Á©‡ëy§¦TÒº:ç
�ejçn.ž¹X5;�Ys�`“œ�R˜´Bóçqùé¯òÁþ}”ŠE6nÚR…ãÝWUÔZ#kKˆÀ,´¦˜Ï“ß½›l±HãÎ¢Ï:s]Ë�¤¶.ŽÂ|ò�çYðòÙðÄWX²d	¯þþ•@IW¿ä“Au°=•Íppç›ôæód€·OÄ}Þƒ‰¹a*õ´Ä¸¹8@îá•ðí—�v˜h4JGgçÏ�­Áª×¶kÌê>(
-üæW?çÈ‘C,:Ï*`8åñv‹ÆµÂ%:‰I;Y “Œ|ã:­Êr<ÙœH$RãÒz$%B ¥,_Þ¢9y²ŸÁÁ|=K››IOãÞ$,³`“Vp‰O»DÐ±øõÜ¹µšÊcƒ)6vuáÇöpý\Ûºª,÷|nY[¾õ<ÙÔªX$t»à1	
-ÎQ‰Ã¸ûlS0,èìDnÝÊÚxMÍÍh­,{Ñµå›ø±e9ËøMl!TÀ°¦Ã²åËx÷{ñeËEä:`à²YÉÞnRÀ¤ˆ'Ä~ñK¬¾>>ï¦Ù!¼£ƒ 
ƒPTœìüG#•6½rá^¦Ý»t9¹ûïÇK0ªF§�¥”Kªà^y ùÀ*–¾þ:É¾u(­I¥Ó¤ÒéòxUxš†¸^_Û²,”ï�7#¯Äom¿ƒ{ûå½Ë—É~‹îŒCjn¸–ËºîMwÍaÕÆ-ônþ:ñÅ÷šáÁ3ìØµ›¯mÜHk[“ë”–æPÞ	/€&ˆK×Ç´ò•ÙÁO×.
qáÌiF†Oáü`+Ó™ÑÔDÇüÎ¦³üøÀ{Xñ¤/víø=w/æ¾+Ëc¡QZTÝ7Â•Bc§ÓÙ*e½Ž‰äºA¤)ÆÉ_$:1ÁgÂaZöÐùà*2oî"oEÐÓ9ÌbdÍºÇÐ€ãdjÆnôM&ÈÅVZ |ßU¼cŸÿ[‹’æö¹4µ´qW¯Y<RZ ~í�,]ùJK”{fqBR­3yÏà™Å Ê8�pm�þJ\óãÿ™V›ï)v¨rîZrðŸïÐìO>õfœÀÑQtÚ�ÒÃå/”B›Ÿ5EWôŸ¿ª«Î¤^<þºá¡Ó¨©)îZºÂô	žmktÂõ¯®³†íä>­$;;p¦3ÿ¡ç§ûgßÿü!öÜîÅ·šÃŒ"R¹Â¬þÉ]hUšÕÿ
ÇnŽ'U)IEND®B`‚
\ No newline at end of file
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/idsociety/index.tpl phpgroupware/tts/templates/idsociety/index.tpl
--- phpgroupware16/tts/templates/idsociety/index.tpl	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/templates/idsociety/index.tpl	2003-12-22 10:38:48.000000000 -0500
@@ -0,0 +1,63 @@
+<!-- $Id $  -->
+
+<!-- BEGIN index.tpl -->
+<!-- BEGIN tts_title -->
+<center>{tts_appname}</center><p />
+<!-- END tts_title -->
+
+<!-- BEGIN tts_links -->
+<center>[&nbsp;<a href="{tts_newticket_link}">{tts_newticket}</a>&nbsp;|&nbsp;<a href="{tts_changeview_link}">{tts_changeview}</a>&nbsp;]<br></center>
+<!-- END tts_links -->
+
+<!-- BEGIN tts_list -->
+<center>{tts_numtotal}<br />{tts_numopen}</center><p />
+<center>{tts_notickets}</center>
+<center><br />
+  <table CELLSPACING=1 CELLPADDING=1 BORDER=0>
+   <tr bgcolor="{tts_head_bgcolor}">
+    <td align=center>{tts_head_ticket}</td>
+    <td align=center>{tts_head_prio}</td>
+    <td align=center>{tts_head_group}</td>
+    <td align=center>{tts_head_assignedto}</td>
+    <td align=center>{tts_head_openedby}</td>
+    <td align=center>{tts_head_dateopened}</td>
+    {tts_head_status}
+    <td align=center>{tts_head_subject}</td>
+   </tr>
+   {rows}
+  </table>
+</center>
+<!-- END tts_list -->
+
+<!-- END index.tpl -->
+
+<!-- BEGIN tts_row -->
+   <tr bgcolor="{tts_row_color}">
+     <td align=center><a href="{tts_ticketdetails_link}">
+     {tts_ticket_id}
+     </a></td>
+     <td align=left><font size=-2>{tts_t_priostr}</font></td>
+     <td align=center>{tts_t_catstr}</td>
+     <td align=center>{tts_t_assignedto}</td>
+     <td align=center>{tts_t_user}</td>
+     <td align=center>{tts_t_timestampopened}</td>
+     {tts_col_status}
+     <td align=center>{tts_t_subject}</td>
+   </tr>
+<!-- END tts_row -->
+
+<!-- BEGIN tts_ticket_id_unread -->
+&gt;{tts_t_id}&lt;
+<!-- END tts_ticket_id_unread -->
+
+<!-- BEGIN tts_ticket_id_read -->
+{tts_t_id}
+<!-- END tts_ticket_id_read -->
+
+<!-- BEGIN tts_col_ifviewall -->
+  <td align=center>{tts_t_timestampclosed}</td>
+<!-- END tts_col_ifviewall -->
+
+<!-- BEGIN tts_head_ifviewall -->
+    <td align=center>{tts_head_dateclosed}</td>
+<!-- END tts_head_ifviewall -->
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/idsociety/newticket.tpl phpgroupware/tts/templates/idsociety/newticket.tpl
--- phpgroupware16/tts/templates/idsociety/newticket.tpl	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/templates/idsociety/newticket.tpl	2003-12-22 10:38:48.000000000 -0500
@@ -0,0 +1,78 @@
+<!-- $Id $ -->
+
+<form method=POST action="{tts_newticket_link}">
+<div align="center">
+<center>
+<table bgcolor="{tts_bgcolor}" cellpadding="3" border="1" width="600">
+ <tr>
+  <td width="100%" valign="center" align="center"><font color="{tts_textcolor}"><b>{tts_lang_addnewticket}</b></font></td>
+ </tr>
+ <tr>
+  <td width="100%" align="left">
+    <table cellspacing="0" cellpadding="5" border="0" width="100%">
+     <tr>
+      <td width="75%" valign="middle"></td>
+     </tr> 
+     <tr>
+      <td width="15%" valign="middle" align="right"><b>{tts_lang_group}:</b> </td>
+      <td width="75%" valign="middle"><select size="1" name="lstCategory">
+      {tts_new_lstcategories}
+      </select></td>
+     </tr>
+      <tr>
+       <td width="15%" valign="middle" align="right"><b>{tts_lang_assignto}:</b></td>
+       <td width="75%" valign="middle">
+        <select size="1" name="assignto">
+	  {tts_new_lstassigntos}
+        </select></td>
+      </tr>
+      <tr>
+       <td width="15%" valign="middle" align="right"><b>{tts_lang_subject}:</b></td>
+       <td width="75%" valign="middle"><input type=text size=50 maxlength=80 name="subject" value="{tts_lang_nosubject}"></td>
+      </tr>
+      <tr>
+       <td width="15%" valign="top" align="right"><b>{tts_lang_details}:</b></td>
+       <td width="75%"><textarea rows="10" name="txtAdditional" cols="65" wrap="virtual"></textarea></td>
+      </tr>
+      <tr>
+       <td width="15%" valign="middle" align="right"><b>{tts_lang_priority}:</b> </td>
+       <td width="75%" valign="middle">
+          <table border="0" width="100%" cellspacing="0" cellpadding="0">
+              <tr>
+               <td width="25%">
+                <select name="optPriority">
+                 <option value="1">1 - {tts_lang_lowest}</option>
+                 <option value="2">2</option>
+                 <option value="3">3</option>
+                 <option value="4">4</option>
+                 <option value="5" selected>5 - {tts_lang_medium}</option>
+                 <option value="6">6</option>
+                 <option value="7">7</option>
+                 <option value="8">8</option>
+                 <option value="9">9</option>
+                 <option value="10">10 - {tts_lang_highest}</option>
+                </select>
+               </td>
+              </tr>
+          </table>
+       </td>
+      </tr>
+    </table>
+    
+    <p align="center"><center><input type="submit" value="{tts_lang_addticket}" name="submit">
+    <input type="reset" value="{tts_lang_clearform}"></center>
+  </td>
+ </tr>
+</table>
+</center>
+</div>
+</form>
+<!-- END tts_new_form -->
+
+<!-- BEGIN tts_new_lstcategory -->
+            <option value= "{tts_account_lid}" {tts_categoryselected}>{tts_account_name}</option>
+<!-- END tts_new_lstcategory -->
+
+<!-- BEGIN tts_new_lstassignto -->
+          <option value= "{tts_account_lid}" {tts_assignedtoselected}>{tts_account_name}</option>
+<!-- END tts_new_lstassignto -->
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/idsociety/viewticket_details.tpl phpgroupware/tts/templates/idsociety/viewticket_details.tpl
--- phpgroupware16/tts/templates/idsociety/viewticket_details.tpl	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/templates/idsociety/viewticket_details.tpl	2003-12-22 10:38:48.000000000 -0500
@@ -0,0 +1,84 @@
+<!-- $Id $  -->
+
+<!-- BEGIN tts_select_options -->
+    <option value="{tts_optionvalue}" {tts_optionselected}>{tts_optionname}</option>
+<!-- END tts_select_options -->
+
+
+<form method="POST" action="{tts_viewticketdetails_link}">
+ <input type=hidden value="{tts_t_id}" name="t_id">
+ <input type=hidden value="{tts_t_user}" name="lstAssignedfrom">
+  <div align=center>
+   <center>
+    <table border=0 width="80%" bgcolor="{tts_th_bg}" cellspacing=0>
+     <tr>
+       <td width=33%>&nbsp;</td>
+       <td width=33%>&nbsp;</td>
+       <td width=33%>&nbsp;</td>
+     </tr>
+     <tr>
+       <td colspan=3 align=center><font size=+2>{tts_lang_viewjobdetails}</font></td>
+     </tr>
+     <tr>
+       <td colspan=3 align=center><hr noshade></td>
+     </tr>
+     <tr>
+       <td align=center>
+         <font size=3>ID: <b>{tts_t_id}</b>
+       </td>
+       <td align=center>
+         {tts_lang_assignedfrom}: <br><b>{tts_t_user}</b>
+       </td>
+       <td align=center>
+         {tts_lang_opendate}: <br><b>{tts_t_opendate}</b>
+         <br>
+         {tts_lang_closedate}: <br><b>{tts_t_status}</b>
+       </td>
+
+     </tr>
+     <tr>
+       <td colspan=3 align=center><hr noshade></td>
+     </tr>
+     <tr>
+       <td align=center>
+         <b>{tts_lang_priority}:</b>
+         <select name="optPriority">
+	   {tts_priority_options}
+         </select>
+
+       </td>
+       <td align=center>
+         <b>{tts_lang_group}:</b>
+         <select size="1" name="lstCategory">
+            {tts_group_options}
+         </select>
+       </td>
+       <td align=center>
+         <b>{tts_lang_assignedto}:</b>
+         <select size="1" name="lstAssignedto">
+           {tts_assignedto_options}
+         </select>
+       </td>
+     </tr>
+     <input type=hidden value="{tts_hidden_detailstring}" name="prevtxtdetail">
+	 <tr><td colspan=3 align=left><br><b>{tts_lang_subject}:</b>{tts_t_subject}<br><br>
+	 <tr><td colspan=3 align=left><B>{tts_lang_details}:</B><BR>{tts_detailstring}</td></tr>
+         <tr><td colspan=3 align=left><BR><BR>{tts_lang_additionalnotes}:<BR></td></tr>
+	 <tr><td colspan=3 align=center><textarea rows="12" name="txtAdditional" cols="70" wrap=physical></textarea></td>
+         <tr><td colspan=3 align=center><hr noshade></td></tr>
+        <tr>
+         <td align=center>
+	   <input type=radio value='{tts_leftradiovalue}' name='optUpdateclose' checked>{tts_leftradio}
+         </td>
+         <td align=center>
+           <input type=submit value='{tts_lang_ok}' name='submit'>
+         </td>
+         <td align=center>
+           <input type=radio value='{tts_rightradiovalue}' name='optUpdateclose'>{tts_rightradio}
+         </td>
+       </tr>
+       <tr>
+         <td colspan=3>&nbsp;</td>
+       </tr>
+   </table>
+</form>
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/probusiness/admin.tpl phpgroupware/tts/templates/probusiness/admin.tpl
--- phpgroupware16/tts/templates/probusiness/admin.tpl	2004-03-02 17:59:09.000000000 -0500
+++ phpgroupware/tts/templates/probusiness/admin.tpl	1969-12-31 19:00:00.000000000 -0500
@@ -1,43 +0,0 @@
-<!-- BEGIN tts_select_options -->
-<option value="{tts_optionvalue}" {tts_optionselected}>{tts_optionname}</option>
-<!-- END tts_select_options -->
-
-<!-- BEGIN admin.tpl -->
-<p><b>{lang_admin}:</b></p>
-<hr />
-<p></p>
-<form method="post" action="{action_url}">
-    <table class="padding" align="center">
-      <tr class="header">
-        <td>{lang_mailnotification}</td>
-        <td><input type="checkbox" name="usemailnotification"{mailnotification} /></td>
-      </tr>
-      <tr class="bg_color1">
-        <td>{lang_ownernotification}</td>
-        <td>
-          <select size="1" name="ownernotification">
-            {tts_owneroptions}
-          </select>
-        </td>
-      </tr>
-      <tr class="bg_color2">
-        <td>{lang_groupnotification}</td>
-        <td>
-          <select size="1" name="groupnotification">
-            {tts_groupoptions}
-          </select>
-        </td>
-      </tr>
-      <tr class="bg_color1">
-        <td>{lang_assignednotification}</td>
-        <td>
-          <select size="1" name="assignednotification">
-            {tts_assignedoptions}
-          </select>
-        </td>
-      </tr>
-      <tr><td colspan="3" class="center"><input type="submit" name="submit" value="{lang_submit}" /></td></tr>
-    </table>
-  </div>
-</form>
-
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/probusiness/hook_home.tpl phpgroupware/tts/templates/probusiness/hook_home.tpl
--- phpgroupware16/tts/templates/probusiness/hook_home.tpl	2004-03-02 17:59:09.000000000 -0500
+++ phpgroupware/tts/templates/probusiness/hook_home.tpl	1969-12-31 19:00:00.000000000 -0500
@@ -1,32 +0,0 @@
-<!-- BEGIN tts_list -->
-
-  <table class="padding">
-    <tr>
-      <td class="center">{tts_head_id}</td>
-      <td class="center">{tts_head_openedby}</td>
-      <td class="center">{tts_head_dateopened}</td>
-      <td class="center">{tts_head_subject}</td>
-    </tr>
-    {rows}
-  </table>
-
-<!-- END tts_list -->
-
-<!-- BEGIN tts_row -->
-    <tr>
-      <td class="center">{tts_ticket_id}</td>
-      <td class="center">{tts_t_user}</td>
-      <td class="center">{tts_t_timestampopened}</td>
-      {tts_col_status}
-      <td class="center"><a href="{tts_ticketdetails_link}">{tts_t_subject}</a></td>
-    </tr>
-<!-- END tts_row -->
-
-<!-- BEGIN tts_ticket_id_unread -->
-&gt;{tts_t_id}&lt;
-<!-- END tts_ticket_id_unread -->
-
-<!-- BEGIN tts_ticket_id_read -->
-{tts_t_id}
-<!-- END tts_ticket_id_read -->
-
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/probusiness/images/folders.png phpgroupware/tts/templates/probusiness/images/folders.png
--- phpgroupware16/tts/templates/probusiness/images/folders.png	2004-05-03 21:37:44.000000000 -0400
+++ phpgroupware/tts/templates/probusiness/images/folders.png	1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
-‰PNG
-
-
IHDReå®XìPLTEÿÿÿ%4�	LR$bB)2
-	
#
-&
-B9
-
/<BO -|,9BFI?26 U
/FL"\ UL&i?	L U6<IR"\$b	
#)
-&2B)o+u'l*rI	I!.#1…#1…$2ˆ%4�%e
/,&i&5’):Ÿ-?«-?¯,>¨$3Œ&i9LO!.,>¨0C¸4IÈ2FÂ-?«"0‚$b?F>RÎK^ÑDXÐ;PÍ Y9,#_9-?«NaÒar×^oÖNaÒ):Ÿ,y"\, Y'7•4IÈjzÚw…ÝgwÙ7LÍ/Bµ2%eG[ÑzˆÞ~ŒÞ -|
-&$2ˆ)o+<¥AUÏn}ÚTfÔ4IÈ.A²(8˜%e<22I$2ˆ3HÅ#1…!.O	
#	&5’ Y$3Œ,y)oB)R
-&,+u4IÈê›‘˜tRNS@æØfbKGDˆH	pHYs’ù¥tIMEÓ
-�µ©fIDATxœc` X¢qEÑD,EeDa {‚³ýœyÌŒpK«–öÎFç~„zQ³òÏ6(Ÿ—Á€%,":6A—Ìge°b±aQ¶sÔa�"!ÄÂÂ¬®©Ã3ƒˆ¹ù…(ñ^!�lµîIEND®B`‚
\ No newline at end of file
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/probusiness/images/navbar.png phpgroupware/tts/templates/probusiness/images/navbar.png
--- phpgroupware16/tts/templates/probusiness/images/navbar.png	2004-01-07 18:36:22.000000000 -0500
+++ phpgroupware/tts/templates/probusiness/images/navbar.png	1969-12-31 19:00:00.000000000 -0500
@@ -1,12 +0,0 @@
-‰PNG
-
-
IHDR00`Ü	µtIMEÓ
-ãGœã	pHYs­#½ugAMA±�üaìPLTEÿ%4�	LR$bB)2
-	
#
-&
-B9
-
/<BO -|,9BFI?26 U
/FL"\ UL&i?	L U6<IR"\$b	
#)
-&2B)o+u'l*rI	I!.#1…#1…$2ˆ%4�%e
/,&i&5’):Ÿ-?«-?¯,>¨$3Œ&i9LO!.,>¨0C¸4IÈ2FÂ-?«"0‚$b?F>RÎK^ÑDXÐ;PÍ Y9,#_9-?«NaÒar×^oÖNaÒ):Ÿ,y"\, Y'7•4IÈjzÚw…ÝgwÙ7LÍ/Bµ2%eG[ÑzˆÞ~ŒÞ -|
-&$2ˆ)o+<¥AUÏn}ÚTfÔ4IÈ.A²(8˜%e<22I$2ˆ3HÅ#1…!.O	
#	&5’ Y$3Œ,y)oB)R
-&,+u4IÈÇ{à?tRNS@æØfsIDATxÚí’ëWAÆwÚˆk
°›š°yY#QiÖTdS#ÍŠL	)¼t!µ2ì&e%],»Q–ÙÍ²þÑf(;‹Ñ—N§ãóeÞ=çùíûÎ3/Ã¬ë¿ÆEsN„0FEØCID¬9ŒœþPQ-(@0†s×ä3q!êüÂÊý^edb,¥5AÀÚn!+,#ÙŽ2ËHË²�•³‚Àc$/d–>)@²"¨ d=�A²6YzÓúöÝûÔ‡%{®±'?æg#ryyÞ-ðõÓ=‘¹ðââ|ªAYV}z=Í{mB¶êy,�~	Ï¿|µ AøÚ¦Ü¡�‹±ìuß½wvöÁÃ¹G3�Ÿ(º§Ï
-ä´}—8=vóÖí©‘øÄLo9 Tõ_ÂXbi"Êdãå+W¯M�§¯‡[R7I£JœIâÐY€ì,kMDÇÆÏ�¿0Ÿ¸˜�€U|&²yMh!J£±á‘“§â‘öÓƒå˜ù2Õ1ŒùŽ’»úúû¢Çbñã'ƒ~QÊoQ‹}ô��Ñ¢#„ØÕ} £çà¡Ã‘#½Í~’ùåv’åd’ºYãa±²7ØÞÑ¹/Ü¹¿ÁÍCHzüüÊ%¹Cn’ ‡ÛÃy Dbs ¥5ØÖ¨© @Ê¿víNäÛUçƒ:Yàñ×74»«+]¤ë¡lpnÛneè1€ãåwTVU×¸hr¿| ÔÄ}+ …eå[+\n±ÀK“ÕX©8;f‡Öá4:yA¶Õ��ú¥Áh0™-–MœÖlµqL•¬ª�†Ž¤Õš&wçÕêë³†ÀŸÙÿ°®[_©�mF9bìYIEND®B`‚
\ No newline at end of file
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/probusiness/images/updated.gif phpgroupware/tts/templates/probusiness/images/updated.gif
--- phpgroupware16/tts/templates/probusiness/images/updated.gif	2003-10-22 22:08:43.000000000 -0400
+++ phpgroupware/tts/templates/probusiness/images/updated.gif	1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-GIF89a÷/D!Y*c*
D*
N!
c4
n4x=‚F�Fx=‚=�F—P¢P(xF(¢Y(¬Y1¬c1·c1Ál9‚Y9·l9Ál9Ìl9ÌvBÁvBÌvBÖvKÌKÖT·vT·TÁTÌTÌˆTÖˆTë’]Ìˆ]ë’fÖ’fë›nÖ›wÁ’wÖ›wë¥€á¥€ë®‰á¥‰á®‰ë®’ë®’ö·›ë·›ö·¬öÁ¬öÊµöÊµöÔ¾ëÔÇöÝÐöÝ!ùÿ,@½ÿ	8�A�@h�¨á €@
-8X�@à 2`°@âÃ†*PX0pRXÉr€@%LÈ4Q¢&ˆ¾è¡â„(P0a�€�#bxØ¢D‡!'0Hà’à€£³jý·aÅÁ@Âþà¡‡�-,Løâ‡F'BxÐ`�ÂÈª7v|H�€À	h A 1>ˆXq„†	(8 pÀ&Dø¹`¨U+'ÀºµôÖ€;
\ No newline at end of file
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/probusiness/images/updated.png phpgroupware/tts/templates/probusiness/images/updated.png
--- phpgroupware16/tts/templates/probusiness/images/updated.png	2003-10-22 22:08:43.000000000 -0400
+++ phpgroupware/tts/templates/probusiness/images/updated.png	1969-12-31 19:00:00.000000000 -0500
@@ -1,6 +0,0 @@
-‰PNG
-
-
IHDRóÿagAMA¯È7ŠétEXtSoftwareAdobe ImageReadyqÉe<hIDATxÚb´8žÏ@0q°ô^©ØôîÓÎÛ­èrÄô�á?Ã¯àø7ÿÿËðŠÿúý?lBv»–hºÄÂÎÄzLš]˜“•�hü‡C†¿Œÿ€ø¿”±”ÃÑZ—þÛ­»™þ\y3f@A¾ÿpÖ—þ€(^ãúìûþõÿùñþõóýõõûøñúõ÷ýøëöðÃßÏñéîã�ÃsúÑéŽA¾ÿõÜüè´÷Íûþîýôíþóñøóøôöúô÷ùôøùóøý		
-N%�úîõüãô’0<G7‚0Dã
-ì?�khü¿LSµ€�àÞ­}Út4*êM†E1Ru†„K‹ÇÊ×)ûÅ³�÷kÈ¿baúþóÿ¯þ~b¸zó*Ã«kOþ|ùÉð¨øÏ¯ß¿ýf`ªÓ–axÿø-ÃëÍW¯3œ|¹(tˆ¿A¾ÿðÿõßïä,ØîïÈ‚³žßö-
-Q*`ìØçõêìC%
>-NÚ‹¼Èùˆ)’ÏšáîÛÇÂ/˜´Õ5nÿytçWF1îûŒ‚œ78YŸ~÷…áëóWÂJ"?ØØd>ýx­Ž,F€b<øîÒçM×ððÊ1ìýx‘Aä9ƒˆ¤ÃG¦ïàxÿþ=Ã—oX8þ3¼{ù™áÛ½÷ß½xþcÓƒH GˆiòÉ•Ü<2‚ûÞ]`ø
í¿¬o}`xÿî-Ã—7~ýÎÀÂÏÎðýç`¸ôÏ_`ìü…'$€bY;añ¡ËñVö"Ê’ÿ¾þf¸qÿ:ÃŸŸÀò¿ïþþø
Áßÿ20þ&.ÍÌÄKtÄò×£�ÛÖÿ7¶ùùæÃ›O�‰Ÿ‰áß?  fü¡�iŒY™þ332�²È€bÅ›{…>b`XÃf nýûÐãMÏ¾íÆÈ�Œà8Œ°´’&†w € ¨ð‹{…þ`bØ´ýÃÏ¿›€boÚÐHdÁ_€BfcRgàf
²Dˆ�$�‚½ôpIEND®B`‚
\ No newline at end of file
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/probusiness/index.tpl phpgroupware/tts/templates/probusiness/index.tpl
--- phpgroupware16/tts/templates/probusiness/index.tpl	2004-03-02 17:59:09.000000000 -0500
+++ phpgroupware/tts/templates/probusiness/index.tpl	1969-12-31 19:00:00.000000000 -0500
@@ -1,89 +0,0 @@
-<!-- BEGIN index.tpl -->
-{autorefresh}
-
-<!-- BEGIN tts_title -->
-<!-- <div align="center">{tts_appname}</div><p></p> -->
-<!-- END tts_title -->
-
-<!-- _BEGIN tts_links -->
-
-<!-- _END tts_links -->
-
-<!-- BEGIN tts_search -->
-<form action="{tts_search_link}" method="post" name="search">
-  <table class="basic" align="center">
-    <thead><tr><td>{lang_appname}</td></tr></thead>
-    <tr>
-      <td class="left">
-        <a href="{tts_newticket_link}">{tts_newticket}</a>&nbsp;|&nbsp;
-        <a href="{tts_prefs_link}">{lang_preferences}</a>&nbsp;|&nbsp;
-        <a href="{tts_changeview_link}">{tts_changeview}</a>&nbsp;
-      </td>
-    </tr>
-  </table>
-  <div class="center"><b>{tts_numfound}</b><br /></div>
-<!-- END tts_search -->
-
-<!-- BEGIN tts_list -->
-<!--
-  <div align="center">{tts_numtotal}<br />{tts_numopen}</div><p></p>
-  <div align="center">{tts_notickets}</div>
--->
-    <table class="defaulttable" align="center">
-      <tr>
-        <td id="transparent" class="center"></td>
-        <td id="transparent" class="center"></td>
-        <td id="transparent" class="center">
-          <input type="hidden" name="filter" value="search" />
-          <input name="searchfilter" value="{tts_searchfilter}" />
-          <input type="submit" value="{lang_search}" />
-        </td>
-        <td id="transparent" class="center"></td>
-        <td id="transparent" class="center"></td>
-        <td id="transparent" class="center">{filter_category}</td>
-        <td id="transparent" class="center">{filter_assignedto}</td>
-        <td id="transparent" class="center">{filter_owner}</td>
-        <td id="transparent" class="center">{filter_prio}</td>
-      </tr>
-      <tr>
-        <td id="transparent">&nbsp;</td>
-        <td id="transparent" class="center"><div class="basicListHeader">{tts_head_ticket}</div></td>
-        <td id="transparent" class="center"><div class="basicListHeader">{tts_head_subject}</div></td>
-        <td id="transparent" class="center"><div class="basicListHeader">{tts_head_dateopened}</div></td>
-        <td id="transparent" class="center"><div class="basicListHeader">{tts_head_group}</div></td>
-        <td id="transparent" class="center"><div class="basicListHeader">{tts_head_category}</div></td>
-        <td id="transparent"class="center"><div class="basicListHeader">{tts_head_assignedto}</div></td>
-        <td id="transparent" class="center"><div class="basicListHeader">{tts_head_openedby}</div></td>
-        <td id="transparent" class="center"><div class="basicListHeader">{tts_head_prio}</div></td>
-        {tts_head_status}
-      </tr>
-      {rows}
-    </table>
-</form>
-<!-- END tts_list -->
-
-<!-- END index.tpl -->
-
-<!-- BEGIN tts_row -->
-      <tr>
-        <td id="22">{row_status}</td>
-        <td class="center">{row_ticket_id}</td>
-        <td class="center">{tts_t_subject}</td>
-        <td class="center">{tts_t_timestampopened}</td>
-        <td class="center">{row_group}</td>
-        <td class="center">{row_category}</td>
-        <td class="center">{tts_t_assignedto}</td>
-        <td class="center">{tts_t_user}</td>
-        <td class="center">{tts_t_prio}</td>
-        {tts_col_status}
-      </tr>
-<!-- END tts_row -->
-
-<!-- BEGIN tts_col_ifviewall -->
-        <td class="center">{tts_t_timestampclosed}</td>
-<!-- END tts_col_ifviewall -->
-
-<!-- BEGIN tts_head_ifviewall -->
-        <td class="center">{tts_head_dateclosed}</td>
-<!-- END tts_head_ifviewall -->
-
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/probusiness/newticket.tpl phpgroupware/tts/templates/probusiness/newticket.tpl
--- phpgroupware16/tts/templates/probusiness/newticket.tpl	2004-03-02 17:59:09.000000000 -0500
+++ phpgroupware/tts/templates/probusiness/newticket.tpl	1969-12-31 19:00:00.000000000 -0500
@@ -1,67 +0,0 @@
-<!-- BEGIN options_select -->
-    <option value="{optionvalue}" {optionselected}>{optionname}</option>
-<!-- END options_select -->
-
-<!-- BEGIN form -->
-<b>{lang_create_new_ticket}</b>
-<hr />
-<p></p>
-{messages}
-<form method="post" action="{form_action}" enctype="multipart/form-data">
-  <table class="basic_with_background-color" align="center">
-            <tr><td class="header" colspan="4">&nbsp;</td></tr>
-            <tr>
-              <td class="bg_color1" align="left">{lang_assignedto}:</td>
-              <td class="bg_color1" align="left">{value_assignedto}</td>
-              <td class="bg_color1" align="left">{lang_billable_hours}:</td>
-              <td class="bg_color1" align="left"><input name="ticket[billable_hours]" value="{value_billable_hours}" /></td>
-            </tr>
-            <tr class="bg_color2">
-              <td class="bg_color2" align="left">{lang_priority}:</td>
-              <td class="bg_color2" align="left">{value_priority}</td>
-              <td class="bg_color2" align="left">{lang_billable_hours_rate} {currency}:</td>
-              <td class="bg_color2" align="left"><input name="ticket[billable_rate]" value="{value_billable_hours_rate}" /></td>
-            </tr>
-            <tr>
-              <td class="bg_color1" align="left">{lang_group}:</td>
-              <td class="bg_color1" align="left"><select name="ticket[group]">{options_group}</select></b></td>
-              <td class="bg_color1" align="left">{lang_category}:</td>
-              <td class="bg_color1" align="left">{value_category}</td>
-            </tr>
-            <tr>
-              <td class="bg_color2" align="left"></td>
-              <td class="bg_color2" align="left"></td>
-              <td class="bg_color2" align="left">{lang_type}:</td>
-              <td class="bg_color2" align="left">{value_type}</td>
-            </tr>
-            <tr>
-              <td class="bg_color1" align="left">{lang_deadline}:</td>
-              <td class="bg_color1" align="left"><input type="text" name="ticket[deadline][year]" size="4" /> . {option_month} . {option_day}</td>
-              <td class="bg_color1" align="left">{lang_effort}:</td>
-              <td class="bg_color1" align="left"><input type="text" name="ticket[effort]" /></td>
-            </tr>
-            <tr>
-              <td class="bg_color2" align="left">{lang_platform}:</td>
-              <td class="bg_color2" align="left">{value_platform}</td>
-              <td class="bg_color2" align="left">{lang_attachment}</td>
-              <td class="bg_color2" align="left"><input type="file" name="attachment" /></td>
-            </tr>
-            <tr><td class="header" colspan="4" class="center">&nbsp;</td></tr>
-            <tr><td class="bg_color1" colspan="4">{lang_subject}:</td></tr>
-            <tr><td class="header" colspan="4"><input name="ticket[subject]" value="{value_subject}" size="65" /></td></tr>
-            <tr><td class="bg_color1" colspan="4">&nbsp;</td></tr>
-            <tr>
-              <td class="header" colspan="4">
-                {lang_details}:<br />
-                <textarea rows="10" name="ticket[details]" cols="65" wrap="hard">{value_details}</textarea>
-              </td>
-            </tr>
-            <tr>
-              <td class="bg_color1" align="left"><input type="submit" name="submit" value="{lang_submit}" /></td>
-              <td class="bg_color1" colspan="2">&nbsp;</td>
-              <td class="bg_color1" class="right"><input type="submit" name="cancel" value="{lang_cancel}" /></td>
-            </tr>
-  </table>
-</form>
-<!-- END form -->
-
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/probusiness/preference_acl_row.tpl phpgroupware/tts/templates/probusiness/preference_acl_row.tpl
--- phpgroupware16/tts/templates/probusiness/preference_acl_row.tpl	2004-03-02 17:59:09.000000000 -0500
+++ phpgroupware/tts/templates/probusiness/preference_acl_row.tpl	1969-12-31 19:00:00.000000000 -0500
@@ -1,7 +0,0 @@
-<tr>
-  <td class="bg_color2">{user}</td>
-  <td class="bg_color1" align="center"><input type="checkbox" name="{read}" value="Y"{read_selected} /></td>
-  <td class="bg_color2" align="center"><input type="checkbox" name="{add}" value="Y"{add_selected} /></td>
-  <td class="bg_color1" align="center"><input type="checkbox" name="{edit}" value="Y"{edit_selected} /></td>
-</tr>
-
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/probusiness/preference_acl.tpl phpgroupware/tts/templates/probusiness/preference_acl.tpl
--- phpgroupware16/tts/templates/probusiness/preference_acl.tpl	2004-03-02 17:59:09.000000000 -0500
+++ phpgroupware/tts/templates/probusiness/preference_acl.tpl	1969-12-31 19:00:00.000000000 -0500
@@ -1,28 +0,0 @@
-  {errors}
-  {title}
-<table class="basic" align="center">
-  <tr>
-    {nml}
-    <td>
-      <div class="center">
-        <form method="post" action="{action_url}">
-          {common_hidden_vars}
-          <input type="text" name="query" value="{search_value}" />
-          <input type="submit" name="search" value="{search}" />
-        </form>
-      </div>
-    </td>
-    {nmr}
-  </tr>
-</table>
-<form method="post" action="{action_url}">
-    <table class="basic" align="center">
-      {row}
-    </table>
-  {common_hidden_vars_form}
-  <input type="hidden" name="processed" value="{processed}" />
-  <div class="center">
-    <input type="submit" name="submit" value="{submit_lang}" />
-  </div>
-</form>
-
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/probusiness/preference_colspan.tpl phpgroupware/tts/templates/probusiness/preference_colspan.tpl
--- phpgroupware16/tts/templates/probusiness/preference_colspan.tpl	2004-03-02 17:59:09.000000000 -0500
+++ phpgroupware/tts/templates/probusiness/preference_colspan.tpl	1969-12-31 19:00:00.000000000 -0500
@@ -1,6 +0,0 @@
-<tr class="header">
-  <td align="center">{string}</td>
-  <td class="center">{lang_read_tickets_within_group_only}</td>
-  <td class="center">{lang_close_ticket}</td>
-  <td class="center">{lang_can_make_full_changes}</td>
-</tr>
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/probusiness/viewticket_details.tpl phpgroupware/tts/templates/probusiness/viewticket_details.tpl
--- phpgroupware16/tts/templates/probusiness/viewticket_details.tpl	2004-07-08 22:33:32.000000000 -0400
+++ phpgroupware/tts/templates/probusiness/viewticket_details.tpl	1969-12-31 19:00:00.000000000 -0500
@@ -1,230 +0,0 @@
-<!-- BEGIN options_select -->
-    <option value="{optionvalue}" {optionselected}>{optionname}</option>
-<!-- END options_select -->
-
-<!-- BEGIN additional_notes_row -->
-  <tr>
-    <td colspan="4" class="bg_view" style="color:#000000">
-      <hr />
-      {lang_date}: &nbsp; {value_date}<br />
-      {lang_user}: &nbsp; {value_user}<br /><br />
-      {value_note}
-      <p></p>
-    </td>
-  </tr>
-<!-- END additional_notes_row -->
-
-<!-- BEGIN additional_notes_row_empty -->
-  <tr><td colspan="4"><b>{lang_no_additional_notes}</b></td></tr>
-<!-- END additional_notes_row_empty -->
-
-<!-- BEGIN row_history -->
-  <tr>
-    <td class="bg_color1">{value_date}</td>
-    <td class="bg_color2">{value_user}</td>
-    <td class="bg_color1">{value_action}</td>
-    <td class="bg_color2">{value_old_value}</td>
-    <td class="bg_color1">{value_new_value}</td>
-  </tr>
-<!-- END row_history -->
-
-<!-- BEGIN row_history_empty -->
-  <tr class="bg_color1"><td colspan="4" class="center"><b>{lang_no_history}</b></td></tr>
-<!-- END row_history_empty -->
-
-<!-- BEGIN form -->
-<p><b>{lang_viewjobdetails}</b></p>
-<table class="tabletab">
-  <tr>
-    <th id="tab1" class="activetab" valign="top" onclick="javascript:tab.display(1);">
-      <table class="basic">
-        <tr>
-          <td id="starttab"></td>
-          <td>
-            <a href="#" tabindex="0" accesskey="1" onfocus="tab.display(1);" onclick="tab.display(1); return(false);">{lang_details}</a>
-          </td>
-          <td id="tweentab_r"></td>
-        </tr>
-      </table>
-    </th>
-    <th id="tab2" class="activetab" onclick="javascript:tab.display(2);">
-      <table>
-        <tr>
-          <td id="tweentab_l"></td>
-          <td>
-            <a href="#" tabindex="0" accesskey="2" onfocus="tab.display(2);" onclick="tab.display(2); return(false);">{lang_update}</a>
-          </td>
-          <td id="tweentab_r"></td>
-        </tr>
-      </table>
-    </th>
-    <th id="tab3" class="activetab" onclick="javascript:tab.display(3);">
-      <table>
-        <tr>
-          <td id="tweentab_l"></td>
-          <td>
-            <a href="#" tabindex="0" accesskey="3" onfocus="tab.display(3);" onclick="tab.display(3); return(false);">history</a>
-          </td>
-          <td id="tweentab_r"></td>
-        </tr>
-      </table>
-    </th>
-  </tr>
-</table>
-
-<form method="post" action="{viewticketdetails_link}">
-  <input type="hidden" name="ticket_id" value="{ticket_id}" />
-  <input type="hidden" name="lstAssignedfrom" value="{ticket_user}" />
-
-  <div id="tabcontent1" class="activetab">
-
-    <table class="basic" id="tab1" style="visibility: visible;">
-      {messages}
-<tr><td>
-          <table class="padding">
-            <thead class="center">
-              <tr><td colspan="4">&nbsp;<b>[ #{ticket_id} ] - {value_subject}</b></td></tr>
-            </thead>
-            <tbody>
-            <tr class="left">
-              <td class="bg_color1">{lang_opendate}:</td>
-              <td class="bg_color1"><b>{value_opendate}</b></td>
-              <td class="bg_color2">{lang_billable_hours}:</td>
-              <td class="bg_color2"><b>{currency} {value_billable_hours}</b></td>
-            </tr>
-            <tr class="left">
-              <td class="bg_color2">{lang_assignedfrom}:</td>
-              <td class="bg_color2"><b>{value_owner}</b></td>
-              <td class="bg_color1">{lang_billable_hours_rate}:</td>
-              <td class="bg_color1"><b>{currency} {value_billable_hours_rate}</b></td>
-            </tr>
-            <tr class="left">
-              <td class="bg_color1">{lang_assignedto}:</td>
-              <td class="bg_color1"><b>{value_assignedto}</b></td>
-              <td class="bg_color2">{lang_billable_hours_total}:</td>
-              <td class="bg_color2"><b>{currency} {value_billable_hours_total}</b></td>
-            </tr>
-            <tr class="left">
-              <td class="bg_color2">{lang_priority}:</td>
-              <td class="bg_color2"><b>{value_priority}</b></td>
-              <td class="bg_color1">&nbsp;</td>
-              <td class="bg_color1">&nbsp;</td>
-            </tr>
-            <tr class="left">
-              <td class="bg_color1">{lang_category}:</td>
-              <td class="bg_color1"><b>{value_category}</b></td>
-              <td class="bg_color2">{lang_type}:</td>
-              <td class="bg_color2"><b>{value_type}</b></td>
-            </tr>
-            <tr class="left">
-              <td class="bg_color2">{lang_group}:</td>
-              <td class="bg_color2"><b>{value_group}</b></td>
-              <td class="bg_color1">{lang_attachment}</td>
-              <td class="bg_color1">{value_attachment}</td>
-            </tr>
-            <tr><td colspan="4" class="center">&nbsp;</td></tr>
-
-              <tr class="header"><td colspan="4" class="left"><b>{lang_details}:</b><br>{value_details}</td></tr>
-
-            <tr><td class="tts_height" colspan="4"></td></tr>
-
-              <tr class="header"><td colspan="4" class="left"><b>{lang_additional_notes}:</b></td></tr>
-
-            {rows_notes}
-            <tr><td colspan="4"><input name="done" type="button" value="{lang_done}" onClick="self.location.href='{done_url}'" /></td></tr>
-            </tbody>
-          </table>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="tabcontent2" class="activetab">
-    <table class="basic" id="tab2" style="visibility: visible;">
-      <tr>
-        <td>
-          <table class="basic">
-            <tr>
-              <td>
-                <table cellpadding="4">
-                    <tr class="header"><td colspan="4" class="left">{lang_update}:&nbsp;</td></tr>
-                  <tr class="left">
-                    <td class="bg_color1">
-                    	<b>{lang_priority}:&nbsp;</b>
-                      <select name="ticket[priority]">
-                        {options_priority}
-                      </select>
-                    </td>
-                    <td class="bg_color1">
-                      <b>{lang_category}:&nbsp;</b>
-                      <select size="1" name="ticket[category]">
-                        {options_category}
-                      </select>
-                    </td>
-                    <td class="bg_color1">
-                      <b>{lang_assignedto}:&nbsp;</b>
-                      <select size="1" name="ticket[assignedto]">
-                        {options_assignedto}
-                      </select>
-                    </td>
-                  </tr>
-                  <tr class="left">
-                    <td class="bg_color2">
-                      <b>{lang_status}:&nbsp;</b>
-                      <select name="ticket[status]">
-                        {options_status}
-                      </select>
-                    </td>
-                    <td class="bg_color2">
-                      <b>{lang_group}:&nbsp;</b>
-                      <select name="ticket[group]">
-                        {options_group}
-                      </select>
-                    </td>
-                    <td class="bg_color2"><b>{lang_billable_hours_rate}:&nbsp;</b><input name="ticket[billable_rate]" value="{value_billable_hours_rate}" /></td>
-                  </tr>
-                  <tr class="left">
-                    <td class="bg_color1"><b>{lang_platform}:</b>{option_platform}</td>
-                    <td class="bg_color1"><b>{lang_attachment}</b><input type="file" name="attachment" /></td>
-                    <td class="bg_color1"><b>{lang_billable_hours}: </b><input name="ticket[billable_hours]" value="{value_billable_hours}" /></td>
-                  </tr>
-                  <tr class="bg_color2"><td colspan="3" class="center">{additonal_details_rows}<textarea rows="12" name="ticket[note]" cols="70" wrap="physical"></textarea></td></tr>
-                  <tr>
-                    <td class="center" colspan="2"><input type="submit" value="{lang_ok}" name="submit" /></td>
-                    <td class="left" colspan="2"><input name="done" type="button" value="{lang_done}" onClick="self.location.href='{done_url}'" /></td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <div id="tabcontent3" class="activetab">
-    <table id="tab3" class="basic" style="visibility: visible;">
-      <tr class="left"><td colspan="4">{lang_history}</td></tr>
-      <tr class="top">
-        <td colspan="4">
-        	<table class="basic">
-							<tr class="bg_color2">
-								<td><b>{lang_date}</b></td>
-								<td><b>{lang_user}</b></td>
-								<td><b>{lang_action}</b></td>
-								<td><b>{lang_old_value}</b></td>
-								<td><b>{lang_new_value}</b></td>
-							</tr>
-					{rows_history}
-				</table>
-        </td>
-      </tr>
-    </table>
-  </div>
-</form>
-
-<script language="JavaScript1.1" type="text/javascript"><!--
-  var tab = new Tabs(3,'activetab','inactivetab','tab','tabcontent','','','tabpage');
-  tab.init();
-  // -->
-</script>
-<!-- END form -->
-
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/verdilak/index.tpl phpgroupware/tts/templates/verdilak/index.tpl
--- phpgroupware16/tts/templates/verdilak/index.tpl	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/templates/verdilak/index.tpl	2003-12-22 10:38:49.000000000 -0500
@@ -0,0 +1,63 @@
+<!-- $Id $  -->
+
+<!-- BEGIN index.tpl -->
+<!-- BEGIN tts_title -->
+<center>{tts_appname}</center><p />
+<!-- END tts_title -->
+
+<!-- BEGIN tts_links -->
+<center>[&nbsp;<a href="{tts_newticket_link}">{tts_newticket}</a>&nbsp;|&nbsp;<a href="{tts_changeview_link}">{tts_changeview}</a>&nbsp;]<br></center>
+<!-- END tts_links -->
+
+<!-- BEGIN tts_list -->
+<center>{tts_numtotal}<br />{tts_numopen}</center><p />
+<center>{tts_notickets}</center>
+<center><br />
+  <table CELLSPACING=1 CELLPADDING=1 BORDER=0>
+   <tr bgcolor="{tts_head_bgcolor}">
+    <td align=center>{tts_head_ticket}</td>
+    <td align=center>{tts_head_prio}</td>
+    <td align=center>{tts_head_group}</td>
+    <td align=center>{tts_head_assignedto}</td>
+    <td align=center>{tts_head_openedby}</td>
+    <td align=center>{tts_head_dateopened}</td>
+    {tts_head_status}
+    <td align=center>{tts_head_subject}</td>
+   </tr>
+   {rows}
+  </table>
+</center>
+<!-- END tts_list -->
+
+<!-- END index.tpl -->
+
+<!-- BEGIN tts_row -->
+   <tr bgcolor="{tts_row_color}">
+     <td align=center><a href="{tts_ticketdetails_link}">
+     {tts_ticket_id}
+     </a></td>
+     <td align=left><font size=-2>{tts_t_priostr}</font></td>
+     <td align=center>{tts_t_catstr}</td>
+     <td align=center>{tts_t_assignedto}</td>
+     <td align=center>{tts_t_user}</td>
+     <td align=center>{tts_t_timestampopened}</td>
+     {tts_col_status}
+     <td align=center>{tts_t_subject}</td>
+   </tr>
+<!-- END tts_row -->
+
+<!-- BEGIN tts_ticket_id_unread -->
+&gt;{tts_t_id}&lt;
+<!-- END tts_ticket_id_unread -->
+
+<!-- BEGIN tts_ticket_id_read -->
+{tts_t_id}
+<!-- END tts_ticket_id_read -->
+
+<!-- BEGIN tts_col_ifviewall -->
+  <td align=center>{tts_t_timestampclosed}</td>
+<!-- END tts_col_ifviewall -->
+
+<!-- BEGIN tts_head_ifviewall -->
+    <td align=center>{tts_head_dateclosed}</td>
+<!-- END tts_head_ifviewall -->
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/verdilak/newticket.tpl phpgroupware/tts/templates/verdilak/newticket.tpl
--- phpgroupware16/tts/templates/verdilak/newticket.tpl	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/templates/verdilak/newticket.tpl	2003-12-22 10:38:49.000000000 -0500
@@ -0,0 +1,78 @@
+<!-- $Id $ -->
+
+<form method=POST action="{tts_newticket_link}">
+<div align="center">
+<center>
+<table bgcolor="{tts_bgcolor}" cellpadding="3" border="1" width="600">
+ <tr>
+  <td width="100%" valign="center" align="center"><font color="{tts_textcolor}"><b>{tts_lang_addnewticket}</b></font></td>
+ </tr>
+ <tr>
+  <td width="100%" align="left">
+    <table cellspacing="0" cellpadding="5" border="0" width="100%">
+     <tr>
+      <td width="75%" valign="middle"></td>
+     </tr> 
+     <tr>
+      <td width="15%" valign="middle" align="right"><b>{tts_lang_group}:</b> </td>
+      <td width="75%" valign="middle"><select size="1" name="lstCategory">
+      {tts_new_lstcategories}
+      </select></td>
+     </tr>
+      <tr>
+       <td width="15%" valign="middle" align="right"><b>{tts_lang_assignto}:</b></td>
+       <td width="75%" valign="middle">
+        <select size="1" name="assignto">
+	  {tts_new_lstassigntos}
+        </select></td>
+      </tr>
+      <tr>
+       <td width="15%" valign="middle" align="right"><b>{tts_lang_subject}:</b></td>
+       <td width="75%" valign="middle"><input type=text size=50 maxlength=80 name="subject" value="{tts_lang_nosubject}"></td>
+      </tr>
+      <tr>
+       <td width="15%" valign="top" align="right"><b>{tts_lang_details}:</b></td>
+       <td width="75%"><textarea rows="10" name="txtAdditional" cols="65" wrap="virtual"></textarea></td>
+      </tr>
+      <tr>
+       <td width="15%" valign="middle" align="right"><b>{tts_lang_priority}:</b> </td>
+       <td width="75%" valign="middle">
+          <table border="0" width="100%" cellspacing="0" cellpadding="0">
+              <tr>
+               <td width="25%">
+                <select name="optPriority">
+                 <option value="1">1 - {tts_lang_lowest}</option>
+                 <option value="2">2</option>
+                 <option value="3">3</option>
+                 <option value="4">4</option>
+                 <option value="5" selected>5 - {tts_lang_medium}</option>
+                 <option value="6">6</option>
+                 <option value="7">7</option>
+                 <option value="8">8</option>
+                 <option value="9">9</option>
+                 <option value="10">10 - {tts_lang_highest}</option>
+                </select>
+               </td>
+              </tr>
+          </table>
+       </td>
+      </tr>
+    </table>
+    
+    <p align="center"><center><input type="submit" value="{tts_lang_addticket}" name="submit">
+    <input type="reset" value="{tts_lang_clearform}"></center>
+  </td>
+ </tr>
+</table>
+</center>
+</div>
+</form>
+<!-- END tts_new_form -->
+
+<!-- BEGIN tts_new_lstcategory -->
+            <option value= "{tts_account_lid}" {tts_categoryselected}>{tts_account_name}</option>
+<!-- END tts_new_lstcategory -->
+
+<!-- BEGIN tts_new_lstassignto -->
+          <option value= "{tts_account_lid}" {tts_assignedtoselected}>{tts_account_name}</option>
+<!-- END tts_new_lstassignto -->
diff -aburN --exclude='CVS*' phpgroupware16/tts/templates/verdilak/viewticket_details.tpl phpgroupware/tts/templates/verdilak/viewticket_details.tpl
--- phpgroupware16/tts/templates/verdilak/viewticket_details.tpl	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/templates/verdilak/viewticket_details.tpl	2003-12-22 10:38:49.000000000 -0500
@@ -0,0 +1,84 @@
+<!-- $Id $  -->
+
+<!-- BEGIN tts_select_options -->
+    <option value="{tts_optionvalue}" {tts_optionselected}>{tts_optionname}</option>
+<!-- END tts_select_options -->
+
+
+<form method="POST" action="{tts_viewticketdetails_link}">
+ <input type=hidden value="{tts_t_id}" name="t_id">
+ <input type=hidden value="{tts_t_user}" name="lstAssignedfrom">
+  <div align=center>
+   <center>
+    <table border=0 width="80%" bgcolor="{tts_th_bg}" cellspacing=0>
+     <tr>
+       <td width=33%>&nbsp;</td>
+       <td width=33%>&nbsp;</td>
+       <td width=33%>&nbsp;</td>
+     </tr>
+     <tr>
+       <td colspan=3 align=center><font size=+2>{tts_lang_viewjobdetails}</font></td>
+     </tr>
+     <tr>
+       <td colspan=3 align=center><hr noshade></td>
+     </tr>
+     <tr>
+       <td align=center>
+         <font size=3>ID: <b>{tts_t_id}</b>
+       </td>
+       <td align=center>
+         {tts_lang_assignedfrom}: <br><b>{tts_t_user}</b>
+       </td>
+       <td align=center>
+         {tts_lang_opendate}: <br><b>{tts_t_opendate}</b>
+         <br>
+         {tts_lang_closedate}: <br><b>{tts_t_status}</b>
+       </td>
+
+     </tr>
+     <tr>
+       <td colspan=3 align=center><hr noshade></td>
+     </tr>
+     <tr>
+       <td align=center>
+         <b>{tts_lang_priority}:</b>
+         <select name="optPriority">
+	   {tts_priority_options}
+         </select>
+
+       </td>
+       <td align=center>
+         <b>{tts_lang_group}:</b>
+         <select size="1" name="lstCategory">
+            {tts_group_options}
+         </select>
+       </td>
+       <td align=center>
+         <b>{tts_lang_assignedto}:</b>
+         <select size="1" name="lstAssignedto">
+           {tts_assignedto_options}
+         </select>
+       </td>
+     </tr>
+     <input type=hidden value="{tts_hidden_detailstring}" name="prevtxtdetail">
+	 <tr><td colspan=3 align=left><br><b>{tts_lang_subject}:</b>{tts_t_subject}<br><br>
+	 <tr><td colspan=3 align=left><B>{tts_lang_details}:</B><BR>{tts_detailstring}</td></tr>
+         <tr><td colspan=3 align=left><BR><BR>{tts_lang_additionalnotes}:<BR></td></tr>
+	 <tr><td colspan=3 align=center><textarea rows="12" name="txtAdditional" cols="70" wrap=physical></textarea></td>
+         <tr><td colspan=3 align=center><hr noshade></td></tr>
+        <tr>
+         <td align=center>
+	   <input type=radio value='{tts_leftradiovalue}' name='optUpdateclose' checked>{tts_leftradio}
+         </td>
+         <td align=center>
+           <input type=submit value='{tts_lang_ok}' name='submit'>
+         </td>
+         <td align=center>
+           <input type=radio value='{tts_rightradiovalue}' name='optUpdateclose'>{tts_rightradio}
+         </td>
+       </tr>
+       <tr>
+         <td colspan=3>&nbsp;</td>
+       </tr>
+   </table>
+</form>
diff -aburN --exclude='CVS*' phpgroupware16/tts/test.php phpgroupware/tts/test.php
--- phpgroupware16/tts/test.php	2004-02-19 21:20:47.000000000 -0500
+++ phpgroupware/tts/test.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-<?php
-
-$GLOBALS['phpgw_info']['flags'] = array
-(
-	'currentapp'	=> 'tts',
-	'noheader'	=> True,
-	'nofooter'	=> True,
-	'enable_vfs_class'	=> True,
-	'enable_browser_class'	=> True
-);
-
-include ('../header.inc.php');
-
-echo ($GLOBALS['phpgw_info']['user']['preferences']['common']['currency']);
-
-$GLOBALS['phpgw']->common->phpgw_footer();
-
-?>
\ No newline at end of file
diff -aburN --exclude='CVS*' phpgroupware16/tts/TODO phpgroupware/tts/TODO
--- phpgroupware16/tts/TODO	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/TODO	2003-12-22 10:38:49.000000000 -0500
@@ -0,0 +1,7 @@
+$Id $
+
+- better look for visual notification of updated tickets
+- options for notification : 
+	- To : group / owner / assigned / nobody / fixed user
+	- Trigger on : Create / Update / Close
+- full text search
\ No newline at end of file
diff -aburN --exclude='CVS*' phpgroupware16/tts/version.inc.php phpgroupware/tts/version.inc.php
--- phpgroupware16/tts/version.inc.php	1969-12-31 19:00:00.000000000 -0500
+++ phpgroupware/tts/version.inc.php	2003-12-22 10:38:49.000000000 -0500
@@ -0,0 +1,14 @@
+<?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: version.inc.php,v 1.1 2001/05/10 03:23:11 skeeter Exp $ */
+
+  $phpgw_info["server"]["versions"]["tts"] = $phpgw_info["server"]["versions"]["phpgwapi"];
diff -aburN --exclude='CVS*' phpgroupware16/tts/viewticket_details.php phpgroupware/tts/viewticket_details.php
--- phpgroupware16/tts/viewticket_details.php	2004-05-03 21:37:39.000000000 -0400
+++ phpgroupware/tts/viewticket_details.php	2004-06-11 15:53:32.000000000 -0400
@@ -9,36 +9,34 @@
 	*  option) any later version.                                              *
 	\**************************************************************************/
 
-	// $Id: viewticket_details.php,v 1.42.2.6.4.4 2004/04/20 12:52:17 lpiepho Exp $
+	// $Id: viewticket_details.php,v 1.42.2.6 2002/06/09 01:44:03 skeeter Exp $
 	// $Source: /cvsroot/phpgroupware/tts/viewticket_details.php,v $
 
+        $submit = $HTTP_POST_VARS['submit'];
+        $close = $HTTP_POST_VARS['close'];
+
 	$GLOBALS['phpgw_info']['flags'] = array(
 		'enable_nextmatchs_class' => True,
 		'enable_categories_class' => True,
 		'enable_config_class' => True,
-		'currentapp'              => 'tts',
-		'enable_vfs_class' => True
+                'currentapp'              => 'tts'
 	);
-	$submit = $_POST['submit'];
-	$cancel = $_POST['cancel'];
-	$ticket_id = $_REQUEST['ticket_id'];
 
-	if($submit)
+        if($submit || $close)
 	{
 		$GLOBALS['phpgw_info']['flags']['noheader'] = True;
 		$GLOBALS['phpgw_info']['flags']['nonavbar'] = True;
-		$GLOBALS['phpgw_info']['flags']['enable_config_class'] = True;
 	}
+
 	include('../header.inc.php');
 	
 	$GLOBALS['phpgw']->config->read_repository();
 
-	if($cancel)
+        if($close)
 	{
 		$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/tts/index.php'));
 	}
 	
-	
 	$GLOBALS['phpgw']->historylog = createobject('phpgwapi.historylog','tts');
 	$GLOBALS['phpgw']->historylog->types = array(
 		'R' => 'Re-opened',
@@ -50,11 +48,7 @@
 		'S' => 'Subject changed',
 		'B' => 'Billing rate',
 		'H' => 'Billing hours',
-		'G' => 'Group ownership changed',
-		'Y' => 'Type',
-		'D' => 'Deadline',
-		'E' => 'Effort',
-		'L' => 'Platform'
+		'G' => 'Group ownership changed'
 	);
 
 	if(!$submit)
@@ -84,24 +78,6 @@
 		$ticket['owner']          = $GLOBALS['phpgw']->db->f('ticket_owner');
 		$ticket['group']          = $GLOBALS['phpgw']->db->f('ticket_group');
 
-		$ticket['type']           = $GLOBALS['phpgw']->categories->id2name($GLOBALS['phpgw']->db->f('ticket_type'));		
-		if ($GLOBALS['phpgw']->db->f('ticket_deadline') == '0000-00-00')
-		{
-			$ticket['deadline'] = '';
-		}
-		$ticket['deadline'] = $GLOBALS['phpgw']->db->f('ticket_deadline');
-			
-		$ticket['effort']         = $GLOBALS['phpgw']->db->f('ticket_effort');
-		$ticket['platform']       = $GLOBALS['phpgw']->categories->id2name($GLOBALS['phpgw']->db->f('ticket_platform'));
-		
-		$GLOBALS['phpgw']->db->query("SELECT name from phpgw_vfs where directory like '/tts/" . $ticket_id . "' AND size > 0",__LINE__,__FILE__);
-		$x = 0;
-		while ($GLOBALS['phpgw']->db->next_record() != "")
-		{
-			$ticket['attachment'][$x] =  '/tts/' . $ticket_id . '/' . $GLOBALS['phpgw']->db->f('name');
-			++$x;
-		}
-		
 		$GLOBALS['phpgw']->template->set_file('viewticket','viewticket_details.tpl');
 		$GLOBALS['phpgw']->template->set_block('viewticket','options_select');
 		$GLOBALS['phpgw']->template->set_block('viewticket','additional_notes_row');
@@ -194,7 +170,7 @@
 			$GLOBALS['phpgw']->template->parse('options_group','options_select',true);
 		}
 
-		$GLOBALS['phpgw']->template->set_var('options_category',$GLOBALS['phpgw']->categories->formated_list('select','',$ticket['category'],False));
+		$GLOBALS['phpgw']->template->set_var('options_category',$GLOBALS['phpgw']->categories->formated_list('select','',$ticket['category'],$ticket['category'],True));
 
 		$ticket_status[$ticket['status']] = ' selected';
 		$s = '<option value="O"' . $ticket_status['O'] . '>' . lang('Open') . '</option>';
@@ -254,11 +230,6 @@
 				case 'H': $type = lang('Billable hours changed'); break;
 				case 'B': $type = lang('Billable rate changed'); break;
 				case 'G': $type = lang('Group ownership changed'); break;
-				case 'Y': $type = lang('Type changed'); break;
-				case 'D': $type = lang('Deadline changed'); break;
-				case 'E': $type = lang('Effort changed'); break;
-				case 'L': $type = lang('Platform changed'); break;
-				case 'M': $type = lang('Attachment added'); break;
 				default: break;
 			}
 
@@ -353,44 +324,9 @@
 		$GLOBALS['phpgw']->template->set_var('lang_billable_hours_rate',lang('Billable rate'));
 		$GLOBALS['phpgw']->template->set_var('value_billable_hours_rate',$ticket['billable_rate']);
 		
-		$GLOBALS['phpgw']->template->set_var('currency',$GLOBALS['phpgw_info']['user']['preferences']['common']['currency']);
-
-		$GLOBALS['phpgw']->template->set_var('lang_type',lang('Type'));
-		$GLOBALS['phpgw']->template->set_var('value_type',$ticket['type']);
-		
-		$GLOBALS['phpgw']->template->set_var('lang_deadline',lang('Deadline'));
-		$GLOBALS['phpgw']->template->set_var('value_deadline',$ticket['deadline']);
-		
-		$GLOBALS['phpgw']->template->set_var('lang_effort',lang('Effort'));
-		$GLOBALS['phpgw']->template->set_var('value_effort',$ticket['effort']);
-		
-		$GLOBALS['phpgw']->template->set_var('lang_platform',lang('Platform'));
-		$GLOBALS['phpgw']->template->set_var('value_platform',$ticket['platform']);
-
-		for($i=0; $i <= $x-1; $i++)
-		{
-		$file = $GLOBALS['phpgw']->link('/index.php',Array(
-															'menuaction' => 'tts.attachedFiles.show_file',
-															'file' => $ticket['attachment'][$i]
-															));															                                                            
-		$attLink .= "<a href=\"" . $file . "\" target=\"_NEW\">" . basename($ticket['attachment'][$i]) . " </a><br>";
-		}
-		$GLOBALS['phpgw']->template->set_var('lang_attachment',lang('Attachment'));
-		$GLOBALS['phpgw']->template->set_var('value_attachment',$attLink);
-		
 		$GLOBALS['phpgw']->template->set_var('lang_billable_hours_total',lang('Total billable'));
 		$GLOBALS['phpgw']->template->set_var('value_billable_hours_total',sprintf('%01.2f',($ticket['billable_hours'] * $ticket['billable_rate'])));
 
-		$type = CreateObject('tts.subcategories',$GLOBALS['phpgw_info']['user']['account_id'],'tts');
-		unset($s);
-		$s = '<select name="ticket[type]">' . $type->formated_list('select','appandtype',$type->getSubCatElementId('type',$ticket['type']),False) . '</select>';
-		$GLOBALS['phpgw']->template->set_var('option_type',$s);
-		
-		$platform = CreateObject('tts.subcategories',$GLOBALS['phpgw_info']['user']['account_id'],'tts');
-		unset($s);
-		$s = '<select name="ticket[platform]">' . $platform->formated_list('select','appandplatform',$platform->getSubCatElementId('platform',$ticket['platform']),False) .'</select>';
-		$GLOBALS['phpgw']->template->set_var('option_platform',$s);
-		
 		$GLOBALS['phpgw']->template->set_var('lang_assignedto',lang('Assigned to'));
 		if($ticket['assignedto'])
 		{
@@ -410,9 +346,11 @@
 		$GLOBALS['phpgw']->template->set_var('value_subject', stripslashes($ticket['subject']));
 
 		$GLOBALS['phpgw']->template->set_var('lang_additional_notes',lang('Additional notes'));
-		$GLOBALS['phpgw']->template->set_var('lang_ok', lang('Save'));
-		$GLOBALS['phpgw']->template->set_var('done_url',$GLOBALS['phpgw']->link('/tts/index.php'));
-		$GLOBALS['phpgw']->template->set_var('lang_done', lang('done'));
+		$GLOBALS['phpgw']->template->set_var('lang_ok', lang('OK'));
+                $GLOBALS['phpgw']->template->set_var('lang_close', lang('Close'));
+		$GLOBALS['phpgw']->template->set_var('close_action',$GLOBALS['phpgw']->link('/tts/index.php'));
+		//<input type="submit" value="{lang_close}" name="close">
+		//$GLOBALS['phpgw']->template->set_var('row_ticket_id','<a href="' . $GLOBALS['phpgw']->link('/tts/viewticket_details.php','ticket_id=' . $GLOBALS['phpgw']->db->f('ticket_id')) . '">' . $GLOBALS['phpgw']->db->f('ticket_id') . '</a>');
 
 		$GLOBALS['phpgw']->template->set_var('lang_category',lang('Category'));
 		$GLOBALS['phpgw']->template->set_var('value_category',$GLOBALS['phpgw']->categories->id2name($ticket['category']));
@@ -428,20 +366,6 @@
 		$GLOBALS['phpgw']->db->query("select * from phpgw_tts_tickets where ticket_id='$ticket_id'",__LINE__,__FILE__);
 		$GLOBALS['phpgw']->db->next_record();
 
-		$ticket['billable_hours'] = $_POST['ticket']['billable_hours'];
-		$ticket['billable_rate']  = $_POST['ticket']['billable_rate'];
-		$ticket['assignedto']     = $_POST['ticket']['assignedto'];
-		$ticket['category']       = $_POST['ticket']['category'];
-		$ticket['note']           = $_POST['ticket']['note'];
-		$ticket['priority']       = $_POST['ticket']['priority'];
-		$ticket['group']          = $_POST['ticket']['group'];
-		$ticket['status']         = $_POST['ticket']['status'];
-		$ticket['type']           = $_POST['ticket']['type'];
-		$ticket['deadline']       = $_POST['ticket']['deadline'];
-		$ticket['effort']         = $_POST['ticket']['effort'];
-		$ticket['platform']       = $_POST['ticket']['platform'];
-		$ticket['attachment']     = $_POST['ticket']['attachment'];
-		
 		$oldassigned = $GLOBALS['phpgw']->db->f('ticket_assignedto');
 		$oldpriority = $GLOBALS['phpgw']->db->f('ticket_priority');
 		$oldcategory = $GLOBALS['phpgw']->db->f('ticket_category');
@@ -449,12 +373,6 @@
 		$old_billable_hours = $GLOBALS['phpgw']->db->f('ticket_billable_hours');
 		$old_billable_rate = $GLOBALS['phpgw']->db->f('ticket_billable_rate');
 		$old_group   = $GLOBALS['phpgw']->db->f('ticket_group');
-		$old_type = $GLOBALS['phpgw']->db->f('ticket_type');
-		$old_deadline = $GLOBALS['phpgw']->db->f('ticket_deadline');
-		$old_effort = $GLOBALS['phpgw']->db->f('ticket_effort');
-		$old_platform = $GLOBALS['phpgw']->db->f('ticket_platform');
-		$old_attachment = $GLOBALS['phpgw']->db->f('ticket_attachment');
-		$old_details = $GLOBALS['phpgw']->db->f('ticket_details');
 		
 		$GLOBALS['phpgw']->db->transaction_begin();
 
@@ -471,14 +389,26 @@
 		** B - Billing rate
 		** H - Billing hours
 		** G - Group
-		** Y - Type
-		** D - Deadline
-		** E - Effort
-		** L - Platform
-		** M - Attachment
 		*/
 
+		if($old_status != $ticket['status'])
+		{
+ 			//only allow assigned-to or admin members to close tickets
+			if(($GLOBALS['phpgw_info']['user']['account_id'] == $oldassigned) ||
+				($GLOBALS['phpgw']->acl->get_specific_rights('Admins','phpgw_group')))
+			{
+				$fields_updated = True;
+				$GLOBALS['phpgw']->historylog->add($ticket['status'],$ticket_id,$ticket['status'],$old_status);
 		
+				$GLOBALS['phpgw']->db->query("update phpgw_tts_tickets set ticket_status='"
+					. $ticket['status'] . "' where ticket_id='$ticket_id'",__LINE__,__FILE__);
+			}
+ 			else
+			{
+				$messages .= '<br>You can only close a ticket if it is assigned to you.';
+				$GLOBALS['phpgw']->session->appsession('messages','tts',lang($messages));
+			}
+		}
 
 		if($old_group != $ticket['group'])
 		{
@@ -512,7 +442,7 @@
 			$GLOBALS['phpgw']->historylog->add('T',$ticket_id,$ticket['category'],$oldcategory);
 		}
 
-		if($old_billable_hours != $ticket['billable_hours'] && $ticket['billable_hours'])
+		if($old_billable_hours != $ticket['billable_hours'])
 		{
 			$fields_updated = True;
 			$GLOBALS['phpgw']->db->query("update phpgw_tts_tickets set ticket_billable_hours='" . $ticket['billable_hours']
@@ -520,7 +450,7 @@
 			$GLOBALS['phpgw']->historylog->add('H',$ticket_id,$ticket['billable_hours'],$old_billable_hours);
 		}
 
-		if($old_billable_rate != $ticket['billable_rate'] && $ticket['billable_rate'])
+		if($old_billable_rate != $ticket['billable_rate'])
 		{
 			$fields_updated = True;
 			$GLOBALS['phpgw']->db->query("update phpgw_tts_tickets set ticket_billable_rate='" . $ticket['billable_rate']
@@ -528,84 +458,6 @@
 			$GLOBALS['phpgw']->historylog->add('B',$ticket_id,$ticket['billable_rate'],$old_billable_rate);
 		}
 
-		if ($old_type != $ticket['type'] && $ticket['type'] != "")
-		{
-			$fields_updated = True;
-			$GLOBALS['phpgw']->db->query("update phpgw_tts_tickets set ticket_type='" . $ticket['type']
-				. "' where ticket_id='$ticket_id'",__LINE__,__FILE__);
-			$GLOBALS['phpgw']->historylog->add('Y',$ticket_id,$ticket['type'],$old_type);
-		}
-
-		if ($old_deadline != $ticket['deadline'] && $ticket['deadline'] != "")
-		{
-			$fields_updated = True;
-			$GLOBALS['phpgw']->db->query("update phpgw_tts_tickets set ticket_deadline='" . $ticket['deadline']
-				. "' where ticket_id='$ticket_id'",__LINE__,__FILE__);
-			$GLOBALS['phpgw']->historylog->add('D',$ticket_id,$ticket['deadline'],$old_deadline);
-		}
-
-		if ($old_effort != $ticket['effort'] && $ticket['effort'] != "")
-		{
-			$fields_updated = True;
-			$GLOBALS['phpgw']->db->query("update phpgw_tts_tickets set ticket_effort='" . $ticket['effort']
-				. "' where ticket_id='$ticket_id'",__LINE__,__FILE__);
-			$GLOBALS['phpgw']->historylog->add('E',$ticket_id,$ticket['effort'],$old_effort);
-		}
-		
-		if ($old_platform != $ticket['platform'] && $ticket['platform'] != "")
-		{
-			$fields_updated = True;
-			$GLOBALS['phpgw']->db->query("update phpgw_tts_tickets set ticket_platform='" . $ticket['platform']
-				. "' where ticket_id='$ticket_id'",__LINE__,__FILE__);
-			$GLOBALS['phpgw']->historylog->add('L',$ticket_id,$ticket['platform'],$old_platform);
-		}
-		
-		if ($HTTP_POST_FILES['attachment']['name'] != '')
-		{
-			$fields_updated = True;
-			$attdir = "/tts/" . $ticket_id;
-			$basedir = $GLOBALS['basedir'] . "/tts";
-			
-			if (!file_exists($basedir . "/" . $attdir))
-			{
-				$GLOBALS['phpgw']->vfs->override_acl = 1;
-				$GLOBALS['phpgw']->vfs->mkdir (array (
-						'string' => $attdir,
-						'relatives' => array (RELATIVE_ALL)));
-				$GLOBALS['phpgw']->vfs->override_acl = 0;
-			}
-						
-			$GLOBALS['phpgw']->vfs->override_acl = 1;
-			$GLOBALS['phpgw']->vfs->cp(array (
-						'from'	=> $HTTP_POST_FILES['attachment']['tmp_name'],
-						'to'	=> $attdir . '/' . $HTTP_POST_FILES['attachment']['name'],
-						'relatives'	=> array (RELATIVE_NONE|VFS_REAL, RELATIVE_ALL)));
-			$GLOBALS['phpgw']->vfs->override_acl = 0;
-			
-			$GLOBALS['phpgw']->historylog->add('M',$ticket_id,$HTTP_POST_FILES['attachment']['name'],'');
-		}
-		
-
-		if($old_status != $_POST['ticket']['status'])
-		{
- 			//only allow assigned-to or admin members to close tickets
-			if(($GLOBALS['phpgw_info']['user']['account_id'] == $oldassigned) ||
-				($GLOBALS['phpgw']->applications->data['admin']['enabled'] == 1))
-			{
-
-				$fields_updated = True;
-				$GLOBALS['phpgw']->historylog->add($_POST['ticket']['status'],$ticket_id,$_POST['ticket']['status'],$old_status);
-
-				$GLOBALS['phpgw']->db->query("update phpgw_tts_tickets set ticket_status='"
-					. $_POST['ticket']['status'] . "' where ticket_id='$ticket_id'",__LINE__,__FILE__);
-			}
- 			else
-			{
-				$messages .= '<br>You can only close a ticket if it is assigned to you.';
-				$GLOBALS['phpgw']->session->appsession('messages','tts',lang($messages));
-			}
-		}
-		
 		if($ticket['note'])
 		{
 			$fields_updated = True;
