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

12
application/User/User.php
View File

@@ -185,7 +185,7 @@ class User extends mfBaseModel {
}
//var_dump($this->address->types);exit;
if(is_object($this->address) && property_exists($this->address, "types") && is_array($this->address->types)) {
if($this->address->types[$w]->id) {
if(array_key_exists($w, $this->address->types) && $this->address->types[$w]->id) {
return true;
}
}
@@ -234,10 +234,15 @@ class User extends mfBaseModel {
return $this->$name;
}
public function myNetworks($type) {
public function myNetworks($types) {
$typenets = [];
$my_networks = $this->getProperty("my_networks");
if(!is_array($types)) {
$types = [$types];
}
//var_dump($types);exit;
//var_dump($my_networks);exit;
foreach($my_networks as $net) {
@@ -246,8 +251,7 @@ class User extends mfBaseModel {
if($this->address->parent_id) {
$address_id = $this->address->parent_id;
}
$found = NetworkaddressModel::search(['network_id' => $net->id, "addresstype" => [$type], 'address_id' => $address_id]);
//var_dump($found);exit;
$found = NetworkaddressModel::search(['network_id' => $net->id, "addresstype" => $types, 'address_id' => $address_id]);
if($found) {
$this->log->debug("allowed net: ".$net->id);
$typenets[] = $net;