From df73824dd5dccad9ecdd5315df2b4cf618e086a4 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 03 Jul 2007 11:11:41 -0400
Subject: [PATCH] Fixed a bug in apache rewrite rules.

---
 interface/lib/classes/listform.inc.php |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index e81a256..492dae0 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -46,6 +46,7 @@
         var $pagingValues;
         var $searchChanged = 0;
         var $module;
+		var $dateformat = 'd.m.Y';
 
     function loadListDef($file,$module = '') {
                 global $app,$conf;
@@ -156,7 +157,8 @@
 
                 foreach($this->listDef["item"] as $i) {
                         $field = $i["field"];
-                        if($_REQUEST[$search_prefix.$field] != '') $sql_where .= " $field ".$i["op"]." '".$i["prefix"].$_REQUEST[$search_prefix.$field].$i["suffix"]."' and";
+                        //if($_REQUEST[$search_prefix.$field] != '') $sql_where .= " $field ".$i["op"]." '".$i["prefix"].$_REQUEST[$search_prefix.$field].$i["suffix"]."' and";
+						if($_SESSION["search"][$list_name][$search_prefix.$field] != '') $sql_where .= " $field ".$i["op"]." '".$i["prefix"].$_SESSION["search"][$list_name][$search_prefix.$field].$i["suffix"]."' and";
                 }
 
                 if($sql_where != '') {
@@ -189,10 +191,10 @@
 
                 $sql_von = $_SESSION["search"][$list_name]["page"] * $records_per_page;
                 $record_count = $app->db->queryOneRecord("SELECT count(*) AS anzahl FROM $table WHERE $sql_where");
-                $pages = intval($record_count["anzahl"] / $records_per_page);
+                $pages = intval(($record_count["anzahl"] - 1) / $records_per_page);
 
 
-                $vars["list_file"] = $this->listDef["file"];
+                $vars["list_file"] = $_SESSION["s"]["module"]["name"].'/'.$this->listDef["file"];
                 $vars["page"] = $_SESSION["search"][$list_name]["page"];
                 $vars["last_page"] = $_SESSION["search"][$list_name]["page"] - 1;
                 $vars["next_page"] = $_SESSION["search"][$list_name]["page"] + 1;
@@ -200,10 +202,11 @@
                 $vars["max_pages"] = $pages + 1;
                 $vars["records_gesamt"] = $record_count["anzahl"];
                 $vars["page_params"] = $this->listDef["page_params"];
+				//$vars["module"] = $_SESSION["s"]["module"]["name"];
 
 
                 if($_SESSION["search"][$list_name]["page"] > 0) $vars["show_page_back"] = 1;
-                if($_SESSION["search"][$list_name]["page"] <= $seiten - 1) $vars["show_page_next"] = 1;
+                if($_SESSION["search"][$list_name]["page"] <= $vars["pages"] - 1) $vars["show_page_next"] = 1;
 
                 $this->pagingValues = $vars;
                 $this->pagingHTML = $this->getPagingHTML($vars);
@@ -214,6 +217,17 @@
         }
 
         function getPagingHTML($vars) {
+                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; ';
+                if($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> ';
+                $content .= ' '.$app->lng('Page').' '.$vars["next_page"].' '.$app->lng('of').' '.$vars["max_pages"].' ';
+                if($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; ';
+                $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>';
+
+                return $content;
+        }
+		
+		function getPagingHTMLasTXT($vars) {
                 global $app;
                 $content = '[<a href="'.$vars["list_file"].'?page=0'.$vars["page_params"].'">|&lt;&lt; </a>]';
                 if($vars["show_page_back"] == 1) $content .= '[<< <a href="'.$vars["list_file"].'?page='.$vars["last_page"].$vars["page_params"].'">'.$app->lng('Back').'</a>] ';
@@ -254,9 +268,11 @@
                                 break;
 
                                 case 'DATE':
-                                        if($val > 0) {
+                                        if($record[$key] > 0) {
                                                 $record[$key] = date($this->dateformat,$record[$key]);
-                                        }
+                                        } else {
+											$record[$key] = '';
+										}
                                 break;
 
                                 case 'INTEGER':
@@ -274,6 +290,7 @@
                                 default:
                                         $record[$key] = stripslashes($record[$key]);
                                 }
+								
                         }
 
                 }

--
Gitblit v1.9.1