Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Added voicenumber list to Voicenumberblock

Browse Source
This commit is contained in:
Frank Schubert
2022-01-11 23:01:28 +01:00
parent a9b51281f9
commit f2a33a02ef
4 changed files with 75 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
application/Voicenumber/VoicenumberModel.php
View File

@@ -52,10 +52,11 @@ class VoicenumberModel {
}
public static function getFirst() {
public static function getFirst($filter = null) {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
mfLoghandler::singleton()->debug($where);
$res = $db->select("Voicenumber", "*", "$where ORDER BY voicenumberblock_id, number");
if($db->num_rows($res)) {
$data = $db->fetch_object($res);
@@ -137,41 +138,6 @@ class VoicenumberModel {
}
}
if(array_key_exists("first", $filter)) {
$add_zero = false;
$first = $filter['first'];
mfLoghandler::singleton()->debug($first);
if(substr($first,0, 1) === "0") {
$add_zero = true;
$first = substr($first, 1);
}
if(is_numeric($first)) {
$where .= " AND first like '%$first%'";
if($add_zero) {
$where .= " AND number_prepend_zero = 1";
}
}
}
if(array_key_exists("last", $filter)) {
$add_zero = false;
$last = $filter['last'];
mfLoghandler::singleton()->debug($last);
if(substr($last,0, 1) === "0") {
$add_zero = true;
$last = substr($last, 1);
}
if(is_numeric($last)) {
$where .= " AND last like '%$last%'";
}
}
if(array_key_exists("number", $filter)) {
$add_zero = false;
$number = $filter['number'];
@@ -183,7 +149,7 @@ class VoicenumberModel {
$number = substr($number, 1);
}
if(is_numeric($number)) {
$where .= " AND first <= $number AND last >= $number";
$where .= " AND number = $number";
if($add_zero) {
$where .= " AND number_prepend_zero = 1";
@@ -191,13 +157,6 @@ class VoicenumberModel {
}
}
if(array_key_exists("name", $filter)) {
$name = $db->escape($filter['name']);
if($name) {
$where .= " AND name like '%$name%'";
}
}
if(array_key_exists("comment", $filter)) {
$comment = $db->escape($filter['comment']);
if($comment) {