- Added funtion to convert currency formatted numbers back to floating numb...

Falko Timme

2013-10-18 2d2fd172e1548dd24e1719accd0b856cff6a31a0

- Added funtion to convert currency formatted numbers back to floating numbers.
- Improved getSearchSQL() function so that users can use their native date format so search for dates in lists.

 interface/lib/classes/functions.inc.php

@@ -129,6 +129,20 @@
        return number_format((double)$number, $number_format_decimals, $number_format_dec_point, $number_format_thousands_sep);
    }
    
    //* convert currency formatted number back to floating number
    public function currency_unformat($number) {
        global $app;
        
        $number_format_dec_point = $app->lng('number_format_dec_point');
        $number_format_thousands_sep = $app->lng('number_format_thousands_sep');
        if($number_format_thousands_sep == 'number_format_thousands_sep') $number_format_thousands_sep = '';
		
        if($number_format_thousands_sep != '') $number = str_replace($number_format_thousands_sep, '', $number);
        if($number_format_dec_point != '.' && $number_format_dec_point != '') $number = str_replace($number_format_dec_point, '.', $number);
		
        return (double)$number;
    }
	
    public function get_ispconfig_url() {
        global $app;
        

 interface/lib/classes/listform.inc.php

@@ -181,9 +181,56 @@
            foreach($this->listDef['item'] as $i) {
                $field = $i['field'];
                $table = $i['table'];
				
                $searchval = $_SESSION['search'][$list_name][$search_prefix.$field];
                // format user date format to MySQL date format 0000-00-00
                if($i['datatype'] == 'DATE' && $this->lng('conf_format_dateshort') != 'Y-m-d'){
                    $dateformat = preg_replace("@[^Ymd]@", "", $this->lng('conf_format_dateshort'));
                    $yearpos = strpos($dateformat, 'Y') + 1;
                    $monthpos = strpos($dateformat, 'm') + 1;
                    $daypos = strpos($dateformat, 'd') + 1;
						
                    $full_date_trans = array    ('Y' => '((?:19|20)\d\d)',
                                     'm' => '(0[1-9]|1[012])',
                                     'd' => '(0[1-9]|[12][0-9]|3[01])'
                                    );
                    // d.m.Y  Y/m/d				
                    $full_date_regex = strtr(preg_replace("@[^Ymd]@", "[^0-9]", $this->lng('conf_format_dateshort')), $full_date_trans);
                    //echo $full_date_regex;
					
                    if (preg_match("@^\d+$@", $_SESSION['search'][$list_name][$search_prefix.$field])) { // we just have digits
                        $searchval = $_SESSION['search'][$list_name][$search_prefix.$field];
                    } elseif(preg_match("@^[^0-9]?\d+[^0-9]?$@", $_SESSION['search'][$list_name][$search_prefix.$field])){ // 10. or .10.
                        $searchval = preg_replace("@[^0-9]@", "", $_SESSION['search'][$list_name][$search_prefix.$field]);
                    } elseif(preg_match("@^[^0-9]?(\d{1,2})[^0-9]((?:19|20)\d\d)$@", $_SESSION['search'][$list_name][$search_prefix.$field], $matches)){ // 10.2013
                        $month = $matches[1];
                        $year = $matches[2];
                        $searchval = $year.'-'.$month;
                    } elseif(preg_match("@^((?:19|20)\d\d)[^0-9](\d{1,2})[^0-9]?$@", $_SESSION['search'][$list_name][$search_prefix.$field], $matches)){ // 2013-10
                        $month = $matches[2];
                        $year = $matches[1];
                        $searchval = $year.'-'.$month;
                    } elseif(preg_match("@^[^0-9]?(\d{1,2})[^0-9](\d{1,2})[^0-9]?$@", $_SESSION['search'][$list_name][$search_prefix.$field], $matches)){ // 04.10.
                        if($monthpos < $daypos){
                        $month = $matches[1];
                        $day = $matches[2];
                        } else {
                            $month = $matches[2];
                            $day = $matches[1];
                        }
                        $searchval = $month.'-'.$day;
                    } elseif (preg_match("@^".$full_date_regex."$@", $_SESSION['search'][$list_name][$search_prefix.$field], $matches)) {
                        //print_r($matches);
                        $day = $matches[$daypos];
                        $month = $matches[$monthpos];
                        $year = $matches[$yearpos];
                        $searchval = $year.'-'.$month.'-'.$day;
                    }
                }
				
                // 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 .= " ".($table != ''? $table.'.' : $this->listDef['table'].'.')."$field ".$i['op']." '".$app->db->quote($i['prefix'].$_SESSION['search'][$list_name][$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";
                }
            }
        }