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

Fixed User::MyNetwork (NetworkAddress)

Browse Source
This commit is contained in:
Frank Schubert
2022-11-15 16:20:33 +01:00
parent 95707ab92a
commit 08b29a4e13
10 changed files with 160 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
application/NetworkAddress/NetworkAddressModel.php
View File

@@ -66,7 +66,11 @@ class NetworkAddressModel {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$res = $db->select("NetworkAddress", "*", "$where ORDER BY `type`");
$sql = "SELECT * FROM NetworkAddress WHERE $where ORDER BY `type`";
mfLoghandler::singleton()->debug($sql);
$res = $db->query($sql);
//$res = $db->select("NetworkAddress", "*", "$where ORDER BY `type`");
if($db->num_rows($res)) {
$data = $db->fetch_object($res);
$item = new NetworkAddress($data);
@@ -84,7 +88,10 @@ class NetworkAddressModel {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$res = $db->select("NetworkAddress", "*", "$where ORDER BY `type`");
$sql = "SELECT * FROM NetworkAddress WHERE $where ORDER BY `type`";
mfLoghandler::singleton()->debug($sql);
$res = $db->query($sql);
//$res = $db->select("NetworkAddress", "*", "$where ORDER BY `type`");
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
$items[$data->id] = new NetworkAddress($data->id);
@@ -112,8 +119,26 @@ class NetworkAddressModel {
}
}
if(array_key_exists("addresstype", $filter)) {
if(is_array($filter['addresstype'])) {
$addresstypes = [];
foreach(TT_ROLES as $role) {
if(in_array($role, $filter['addresstype'])) {
$addresstypes[] = $role;
}
}
$where .= " AND NetworkAddress.type IN ('".implode("', '", $addresstypes)."')";
} else {
$addresstype = FronkDB::singleton()->escape($filter['addresstype']);
if(in_array($addresstype, TT_ROLES)) {
$where .= " AND NetworkAddress.type = '$addresstype'";
}
}
}
if(is_array($filter['addresstype']) && count($filter['addresstype'])) {
$at = $filter['addresstype'];
/*$at = $filter['addresstype'];
$in = [];
foreach(TT_ROLES as $role) {
if(in_array($role, $at)) {
@@ -126,7 +151,9 @@ class NetworkAddressModel {
if(count($in)) {
$or = implode(" OR ", $in);
$where .= " AND ( $or )";
}
}*/
}
//var_dump($filter, $where);exit;