From d9bcf68e395d6156645a7974b1a992aa6e6c00aa Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 08:57:25 -0400
Subject: [PATCH] Added missing empty directories from svn import
---
interface/lib/classes/listform.inc.php | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index 314b257..ef3a52f 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -180,9 +180,10 @@
if(@is_array($this->listDef['item'])) {
foreach($this->listDef['item'] as $i) {
$field = $i['field'];
+ $table = $i['table'];
// if($_REQUEST[$search_prefix.$field] != '') $sql_where .= " $field ".$i["op"]." '".$i["prefix"].$_REQUEST[$search_prefix.$field].$i["suffix"]."' and";
if(isset($_SESSION['search'][$list_name][$search_prefix.$field]) && $_SESSION['search'][$list_name][$search_prefix.$field] != ''){
- $sql_where .= " $field ".$i['op']." '".$app->db->quote($i['prefix'].$_SESSION['search'][$list_name][$search_prefix.$field].$i['suffix'])."' and";
+ $sql_where .= " ".($table != ''? $table.'.' : $this->listDef['table'].'.')."$field ".$i['op']." '".$app->db->quote($i['prefix'].$_SESSION['search'][$list_name][$search_prefix.$field].$i['suffix'])."' and";
}
}
}
@@ -192,11 +193,16 @@
public function getPagingSQL($sql_where = '1')
{
global $app, $conf;
-
- //* Add Global Limit from selectbox
- if(!empty($_POST['search_limit']) AND $app->functions->intval($_POST['search_limit'])){
+
+ //* Add Global Limit from selectbox
+ if(!empty($_POST['search_limit']) AND $app->functions->intval($_POST['search_limit']) > 0){
$_SESSION['search']['limit'] = $app->functions->intval($_POST['search_limit']);
}
+
+ //if(preg_match('{^[0-9]$}',$_SESSION['search']['limit'])){
+ // $_SESSION['search']['limit'] = 15;
+ //}
+ if(intval($_SESSION['search']['limit']) < 1) $_SESSION['search']['limit'] = 15;
//* Get Config variables
$list_name = $this->listDef['name'];
@@ -216,7 +222,7 @@
if($this->searchChanged == 1) $_SESSION['search'][$list_name]['page'] = 0;
$sql_von = $app->functions->intval($_SESSION['search'][$list_name]['page'] * $records_per_page);
- $record_count = $app->db->queryOneRecord("SELECT count(*) AS anzahl FROM $table WHERE $sql_where");
+ $record_count = $app->db->queryOneRecord("SELECT count(*) AS anzahl FROM $table".($app->listform->listDef['additional_tables'] != ''? ','.$app->listform->listDef['additional_tables'] : '')." WHERE $sql_where");
$pages = $app->functions->intval(($record_count['anzahl'] - 1) / $records_per_page);
@@ -244,13 +250,21 @@
{
global $app;
- // we want to show at max 15 page numbers (7 left, current, 7 right)
- $show_pages_count = 15;
+ // we want to show at max 17 page numbers (8 left, current, 8 right)
+ $show_pages_count = 17;
$show_pages = array(0); // first page
if($vars['pages'] > 0) $show_pages[] = $vars['pages']; // last page
- for($p = $vars['page'] - 3; $p <= $vars['page'] + 3; $p++) { // surrounding pages
+ for($p = $vars['page'] - 2; $p <= $vars['page'] + 2; $p++) { // surrounding pages
if($p > 0 && $p < $vars['pages']) $show_pages[] = $p;
+ }
+
+ $l_start = $vars['page'] - 13;
+ $l_start -= ($l_start % 10) + 1;
+ $h_end = $vars['page'] + 23;
+ $h_end -= ($h_end % 10) + 1;
+ for($p = $l_start; $p <= $h_end; $p += 10) { // surrounding pages
+ if($p > 0 && $p < $vars['pages'] && !in_array($p, $show_pages, true) && count($show_pages) < $show_pages_count) $show_pages[] = $p;
}
$l_start = $vars['page'] - 503;
@@ -266,15 +280,7 @@
$h_end = $vars['page'] + 228;
$h_end -= ($h_end % 25) + 1;
for($p = $l_start; $p <= $h_end; $p += 25) { // surrounding pages
- if($p > 0 && $p < $vars['pages'] && !in_array($p, $show_pages, true) && count($show_pages) < $show_pages_count) $show_pages[] = $p;
- }
-
- $l_start = $vars['page'] - 53;
- $l_start -= ($l_start % 10) + 1;
- $h_end = $vars['page'] + 63;
- $h_end -= ($h_end % 10) + 1;
- for($p = $l_start; $p <= $h_end; $p += 10) { // surrounding pages
- if($p > 0 && $p < $vars['pages'] && !in_array($p, $show_pages, true) && count($show_pages) < $show_pages_count) $show_pages[] = $p;
+ if($p > 0 && $p < $vars['pages'] && abs($p - $vars['page']) > 30 && !in_array($p, $show_pages, true) && count($show_pages) < $show_pages_count) $show_pages[] = $p;
}
sort($show_pages);
@@ -357,6 +363,16 @@
}
}
break;
+ case 'DATETIMETSTAMP':
+ if ($record[$key] > 0) {
+ // is value int?
+ if (preg_match("/^[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 'DATE':
if ($record[$key] > 0) {
// is value int?
@@ -422,6 +438,12 @@
$record[$key] = date('Y-m-d',strtotime($record[$key]));
}
break;
+
+ case 'DATETIMETSTAMP':
+ if($record[$key] > 0) {
+ $record[$key] = date('Y-m-d H:i:s',strtotime($record[$key]));
+ }
+ break;
case 'DATE':
if($record[$key] != '' && $record[$key] != '0000-00-00') {
--
Gitblit v1.9.1