From d22277878254cf33fd63ca1bf12b215f4e030a27 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 04 Jan 2016 05:12:49 -0500
Subject: [PATCH] - merged different fixes and updates from foreign branches
---
interface/lib/classes/listform.inc.php | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index d4ed752..120e652 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -257,10 +257,23 @@
$searchval = $year.'-'.$month.'-'.$day;
}
}
+
+ if($i['datatype'] == 'BOOLEAN' && $searchval != ''){
+ if (!function_exists('boolval')) {
+ $searchval = (bool) $searchval;
+ if($searchval === true){
+ $searchval = 'TRUE';
+ } else {
+ $searchval = 'FALSE';
+ }
+ } else {
+ $searchval = boolval($searchval)? 'TRUE' : 'FALSE';
+ }
+ }
// if($_REQUEST[$search_prefix.$field] != '') $sql_where .= " $field ".$i["op"]." '".$i["prefix"].$_REQUEST[$search_prefix.$field].$i["suffix"]."' and";
if(isset($searchval) && $searchval != ''){
- $sql_where .= " ".($table != ''? $table.'.' : $this->listDef['table'].'.')."$field ".$i['op']." '".$app->db->quote($i['prefix'].$searchval.$i['suffix'])."' and";
+ $sql_where .= " ".($table != ''? $table.'.' : $this->listDef['table'].'.')."$field ".$i['op']." ".($i['datatype'] == 'BOOLEAN'? "" : "'").$app->db->quote($i['prefix'].$searchval.$i['suffix']).($i['datatype'] == 'BOOLEAN'? "" : "'")." and";
}
}
}
@@ -384,7 +397,7 @@
if(isset($vars['show_page_back']) && $vars['show_page_back'] == 1){
$content .= '<li><a href="#" data-load-content="'.$vars['list_file'].'?page=0'.$vars['page_params'].'" aria-label="First">
<span aria-hidden="true">«</span></a></li>';
- $content .= '<li><a href="#" data-load-content='.$vars['list_file'].'?page='.$vars['last_page'].$vars['page_params'].'" aria-label="Previous">
+ $content .= '<li><a href="#" data-load-content="'.$vars['list_file'].'?page='.$vars['last_page'].$vars['page_params'].'" aria-label="Previous">
<span aria-hidden="true">‹</span></a></li>';
}
$prev = -1;
@@ -501,6 +514,14 @@
case 'CURRENCY':
$record[$key] = $app->functions->currency_format($record[$key]);
break;
+
+ case 'BOOLEAN':
+ if (!function_exists('boolval')) {
+ $record[$key] = (bool) $record[$key];
+ } else {
+ $record[$key] = boolval($record[$key]);
+ }
+ break;
default:
$record[$key] = htmlentities(stripslashes($record[$key]), ENT_QUOTES, $conf["html_content_encoding"]);
@@ -564,6 +585,14 @@
case 'CURRENCY':
$record[$key] = str_replace(',', '.', $record[$key]);
break;
+
+ case 'BOOLEAN':
+ if (!function_exists('boolval')) {
+ $record[$key] = (bool) $record[$key];
+ } else {
+ $record[$key] = boolval($record[$key]);
+ }
+ break;
}
}
}
--
Gitblit v1.9.1