From 00d96ba2cd3f93272474e51a2c7f5b1a35616ec3 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 23 May 2008 13:58:42 -0400
Subject: [PATCH] Rewriting of the config files is optional during update now.

---
 interface/lib/classes/listform.inc.php |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index 27d1c8a..dae0269 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-Copyright (c) 2005, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -48,10 +48,12 @@
     private $module;
 	private $dateformat = 'd.m.Y';
 
-    public function loadListDef($file,$module = '')
+    public function loadListDef($file, $module = '')
     {
         global $app,$conf;
-        if(!is_file($file)) die("List-Definition: $file not found.");
+        if(!is_file($file)){
+            die("List-Definition: $file not found.");
+        }
         require_once($file);
         $this->listDef = $liste;
         $this->module = $module;
@@ -131,7 +133,7 @@
             $field = $i['field'];
 
             //*TODO: comment =  hat sich die suche ge�ndert
-            if(isset($_REQUEST[$search_prefix.$field]) and $_REQUEST[$search_prefix.$field] != $_SESSION['search'][$list_name][$search_prefix.$field]){
+            if(isset($_REQUEST[$search_prefix.$field]) && isset($_SESSION['search'][$list_name][$search_prefix.$field]) && $_REQUEST[$search_prefix.$field] != $_SESSION['search'][$list_name][$search_prefix.$field]){
                     $this->searchChanged = 1;
             }
 
@@ -222,20 +224,20 @@
     {
         global $app;
         $content = '<a href="'."javascript:loadContent('".$vars['list_file'].'?page=0'.$vars['page_params']."');".'">'
-                    .'<img src="themes/grey/images/btn_left.png" border="0"></a> &nbsp; ';
+                    .'<img src="themes/'.$_SESSION['s']['theme'].'/images/btn_left.png" border="0"></a> &nbsp; ';
         //* Show Back 
         if(isset($vars['show_page_back']) && $vars['show_page_back'] == 1){
             $content .= '<a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['last_page'].$vars['page_params']."');".'">'
-                        .'<img src="themes/grey/images/btn_back.png" border="0"></a> ';
+                        .'<img src="themes/'.$_SESSION['s']['theme'].'/images/btn_back.png" border="0"></a> ';
         }
         $content .= ' '.$app->lng('Page').' '.$vars['next_page'].' '.$app->lng('of').' '.$vars['max_pages'].' ';
         //* Show Next
         if(isset($vars['show_page_next']) && $vars['show_page_next'] == 1){
             $content .= '<a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['next_page'].$vars['page_params']."');".'">'
-                        .'<img src="themes/grey/images/btn_next.png" border="0"></a> &nbsp; ';
+                        .'<img src="themes/'.$_SESSION['s']['theme'].'/images/btn_next.png" border="0"></a> &nbsp; ';
         }
         $content .= '<a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['pages'].$vars['page_params']."');".'">'
-                    .'<img src="themes/grey/images/btn_right.png" border="0"></a>';
+                    .'<img src="themes/'.$_SESSION['s']['theme'].'/images/btn_right.png" border="0"></a>';
         return $content;
     }
 		
@@ -268,8 +270,8 @@
         if(is_array($record)) {
             foreach($this->listDef['item'] as $field){
                 $key = $field['field'];
-                switch ($field['datatype']){
-
+				if(isset($record[$key])) {
+                	switch ($field['datatype']){
                     case 'VARCHAR':
                     case 'TEXT':
                         $record[$key] = stripslashes($record[$key]);
@@ -293,7 +295,8 @@
 
                     default:
                         $record[$key] = stripslashes($record[$key]);
-                }	
+                	}
+				}
             }
         }
         return $record;

--
Gitblit v1.9.1