update tpl

phpgwapi/inc/class.categories.inc.php

@@ -4,7 +4,7 @@
 	* This file written by Joseph Engo <jengo@phpgroupware.org>                *
 	*                  and Bettina Gille [ceb@phpgroupware.org]                *
 	* Category manager                                                         *
-	* Copyright (C) 2000 - 2002 Joseph Engo                                    *
+	* Copyright (C) 2000 - 2003 Joseph Engo                                    *
 	* ------------------------------------------------------------------------ *
 	* This library is part of the phpGroupWare API                             *
 	* http://www.phpgroupware.org/api                                          * 
@@ -53,7 +53,7 @@
 			}
 
 			$this->account_id	= $account_id;
-			$this->app_name		= $GLOBALS['phpgw']->db->db_addslashes($app_name);
+			$this->app_name		= $app_name;
 			$this->db			= $GLOBALS['phpgw']->db;
 			$this->db2			= $this->db;
 			$this->grants		= $GLOBALS['phpgw']->acl->get_grants($app_name);
@@ -142,8 +142,6 @@
 		{
 			$start = intval($start);
 			$query = $this->db->db_addslashes($query);
-			$sort  = $this->db->db_addslashes($sort);
-			$order = $this->db->db_addslashes($order);
 
 			if ($globals)
 			{
@@ -188,9 +186,9 @@
 				}
 			}
 
-			if (strlen($parent_id) != 0)
+			if (intval($parent_id) > 0)
 			{
-				$parent_id		= (int) $parent_id;
+				$parent_id		= intval($parent_id);
 				$parent_filter	= ' AND cat_parent=' . $parent_id;
 			}
 
@@ -225,10 +223,8 @@
 		function return_sorted_array($start,$limit = True,$query = '',$sort = '',$order = '',$globals = False, $parent_id = '')
 		{
 			$start		= intval($start);
-			$query		= $this->db->db_addslashes($query);
-			$sort		= $this->db->db_addslashes($sort);
-			$order		= $this->db->db_addslashes($order);
 			$parent_id	= intval($parent_id);
+			$query		= $this->db->db_addslashes($query);
 
 			if ($globals)
 			{

phpgwapi/templates/funkwerk/css/funkwerk.css

@@ -79,11 +79,16 @@ a.portal_text,.portal_text
 	text-decoration: none;
 }
 
-.row_on,.th_bright,.app_header
+.row_on,.app_header
 {
 	background-color: #ADADAD;
 }
 
+.th_bright
+{
+	background-color: #999999;
+}
+
 .msgbox
 {
 	background-color: #FFFFFF;

phpgwapi/templates/funkwerk/css/mit.css

@@ -0,0 +1,141 @@
+body,p,td,th,table,input,form,option
+{
+	color: #333333;
+}
+
+body
+{
+	background-color: #CCCCCC;
+}
+
+.top_top
+{
+	background-color: #999999;
+}
+
+.top_bottom
+{
+	background-color: #FFCCCC;
+}
+
+td.left
+{
+	background-color: #999999;
+}
+
+.left_app
+{
+	background-color: #990000;
+}
+
+.top_menu
+{
+	background-color: #990000;
+}
+
+.user_info
+{
+	background-color: #ADADAD;
+	color: #FFFFFF;
+}
+
+.admin_info,a:link.admin_info,a:active.admin_info,a:visited.admin_info,a:hover.admin_info
+{
+	background-color: #999999;
+	color: #FFFFFF;
+}
+
+.bottom
+{
+	color: #FFFFFF;
+	background-color: #999999;
+}
+
+a:link,a:active,a:visited,a:hover
+{
+	color: #333333;
+}
+
+a:link.bottom,a:active.bottom,a:visited.bottom,a:hover.bottom,a:link.top_menu,a:active.top_menu,a:visited.top_menu,a:link.left,a:active.left,a:visited.left
+{
+	color: #FFFFFF;
+}
+
+a:hover.top_menu,a:link.top_menu_selected,a:active.top_menu_selected,a:visited.top_menu_selected,a:hover.top_menu_selected
+{
+	color: #660000;
+	background-color: #FFFFFF;
+}
+
+a:hover.left,a:link.left_selected,a:active.left_selected,a:visited.left_selected,a:hover.left_selected
+{
+	color: #660000;
+	background-color: #FFFFFF;
+}
+
+.login,.portal,.about
+{
+	background-color: #ADADAD;
+	border-color: #000000;
+}
+
+a.portal_text,.portal_text
+{
+	color: #FFFFFF;
+	text-decoration: none;
+    background-color: #000066;
+}
+
+a:hover.portal_text
+{
+	text-decoration: underline;
+	color: #000066;
+	background-color: #FFFFFF;
+}
+
+
+.row_on,.app_header
+{
+	background-color: #ADADAD;
+}
+
+.th_bright
+{
+	background-color: #FFFFFF;
+}
+
+.msgbox
+{
+	background-color: #FFFFFF;
+}
+
+.row_off
+{
+	background-color: #999999;
+}
+
+.th
+{
+	background-color: #FFCCCC;
+}
+
+.th_text
+{
+	color: #333333;
+}
+
+.cal_today
+{
+	background-color: #ffffcc;
+}
+
+.cal_dayview
+{
+	background-color: #C0C0C0;
+}
+
+.email_folder
+{
+	background-color: #adadad;
+	color: #ffffff;
+}

phpgwapi/templates/funkwerk/css/werft.css

@@ -88,11 +88,16 @@ a:hover.portal_text
 }
 
 
-.row_on,.th_bright,.app_header
+.row_on,.app_header
 {
 	background-color: #ADADAD;
 }
 
+.th_bright
+{
+	background-color: #FFFFFF;
+}
+
 .msgbox
 {
 	background-color: #FFFFFF;