From ada1e6979c92651c13e8538881d2d756c7b54e6d Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Sun, 08 Mar 2009 13:36:34 -0400
Subject: [PATCH] better form lengths
---
interface/lib/classes/listform.inc.php | 53 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index 2c1ef02..542bce6 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -28,14 +28,6 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/**
-* Listenbehandlung
-*
-* @package listform
-* @author Till Brehm
-* @version 1.1
-*/
-
class listform {
private $debug = 0;
@@ -46,7 +38,6 @@
private $pagingValues;
private $searchChanged = 0;
private $module;
- private $dateformat = 'd.m.Y';
public $wordbook;
public function loadListDef($file, $module = '')
@@ -123,7 +114,7 @@
$record = array();
$values = $app->$datasource_class->$datasource_function($field, $record);
} else {
- $this->errorMessage .= "Custom datasource class or function is empty<br>\r\n";
+ $this->errorMessage .= "Custom datasource class or function is empty<br />\r\n";
}
}
return $values;
@@ -144,6 +135,9 @@
//*TODO: comment = hat sich die suche ge�ndert
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;
+
+ //* Jump back to page 1 of the list when search has changed.
+ $_SESSION['search'][$list_name]['page'] = 0;
}
//* Store field in session
@@ -276,6 +270,7 @@
public function decode($record)
{
+ global $conf;
if(is_array($record)) {
foreach($this->listDef['item'] as $field){
$key = $field['field'];
@@ -283,11 +278,29 @@
switch ($field['datatype']){
case 'VARCHAR':
case 'TEXT':
- $record[$key] = htmlentities(stripslashes($record[$key]));
+ $record[$key] = htmlentities(stripslashes($record[$key]),ENT_QUOTES,$conf["html_content_encoding"]);
break;
case 'DATE':
- $record[$key] = ($record[$key] > 0) ? date($this->dateformat,$record[$key]) : '';
+ if ($record[$key] > 0) {
+ // is value int?
+ if (ereg("^[0-9]+[.]?[0-9]*$", $record[$key], $p)) {
+ $record[$key] = date($this->lng('conf_format_dateshort'), $record[$key]);
+ } else {
+ $record[$key] = date($this->lng('conf_format_dateshort'), strtotime($record[$key]));
+ }
+ }
+ break;
+
+ case 'DATETIME':
+ if ($record[$key] > 0) {
+ // is value int?
+ if (ereg("^[0-9]+[.]?[0-9]*$", $record[$key], $p)) {
+ $record[$key] = date($this->lng('conf_format_datetime'), $record[$key]);
+ } else {
+ $record[$key] = date($this->lng('conf_format_datetime'), strtotime($record[$key]));
+ }
+ }
break;
case 'INTEGER':
@@ -295,7 +308,7 @@
break;
case 'DOUBLE':
- $record[$key] = htmlentities($record[$key]);
+ $record[$key] = htmlentities($record[$key],ENT_QUOTES,$conf["html_content_encoding"]);
break;
case 'CURRENCY':
@@ -303,7 +316,7 @@
break;
default:
- $record[$key] = htmlentities(stripslashes($record[$key]));
+ $record[$key] = htmlentities(stripslashes($record[$key]),ENT_QUOTES,$conf["html_content_encoding"]);
}
}
}
@@ -329,8 +342,13 @@
case 'DATE':
if($record[$key] > 0) {
- list($tag,$monat,$jahr) = explode('.',$record[$key]);
- $record[$key] = mktime(0,0,0,$monat,$tag,$jahr);
+ $record[$key] = date('Y-m-d',strtotime($record[$key]));
+ }
+ break;
+
+ case 'DATETIME':
+ if($record[$key] > 0) {
+ $record[$key] = date('Y-m-d H:i:s',strtotime($record[$key]));
}
break;
@@ -362,11 +380,12 @@
}
function escapeArrayValues($search_values) {
+ global $conf;
$out = array();
if(is_array($search_values)) {
foreach($search_values as $key => $val) {
- $out[$key] = htmlentities($val,ENT_QUOTES);
+ $out[$key] = htmlentities($val,ENT_QUOTES,$conf["html_content_encoding"]);
}
}
--
Gitblit v1.9.1