PHP 8.1 fixes; fixed adding users

Layout/default/Cpeprovisioning/Index.php

@@ -1,3 +1,6 @@
+<?php
+  if(!is_array($filter)) $filter = [];
+?>
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->

Layout/default/Cpeshipping/Index.php

@@ -2,6 +2,7 @@
   $pagination_baseurl = $this->getUrl($Mod,"Index");
   $pagination_baseurl_params = ["filter" => $filter];
   $pagination_entity_name = "CPEs";
+  
 ?>
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 

Layout/default/Linework/Index.php

@@ -2,6 +2,8 @@
   $pagination_baseurl = $this->getUrl($Mod,"Index");
   $pagination_baseurl_params = ["filter" => $filter];
   $pagination_entity_name = "Leitungsbauaufträge";
+  
+  if(!is_array($filter)) $filter = [];
 ?>
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 <?php $wftype = "term"; ?>

Layout/default/Patching/Index.php

@@ -2,6 +2,8 @@
   $pagination_baseurl = $this->getUrl($Mod,"Index");
   $pagination_baseurl_params = ["filter" => $filter];
   $pagination_entity_name = "Patchungen";
+  
+  if(!is_array($filter)) $filter = [];
 ?>
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 

Layout/default/Pipework/Index.php

@@ -2,6 +2,8 @@
   $pagination_baseurl = $this->getUrl($Mod,"Index");
   $pagination_baseurl_params = ["filter" => $filter];
   $pagination_entity_name = "Tiefbauaufträge";
+  
+  if(!is_array($filter)) $filter = [];
 ?>
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 <?php $wftype = "building"; ?>

application/Address/AddressModel.php

@@ -221,7 +221,7 @@ class AddressModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     //var_dump($filter);exit;

application/AddressFile/AddressFileModel.php

@@ -104,7 +104,7 @@ class AddressFileModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     

application/AddressLink/AddressLinkModel.php

@@ -108,7 +108,7 @@ class AddressLinkModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     //var_dump($filter);exit;

application/Addressattribute/AddressattributeModel.php

@@ -102,7 +102,7 @@ class AddressattributeModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     if(array_key_exists("address_id", $filter)) {

application/Addresstype/AddresstypeModel.php

@@ -108,7 +108,7 @@ class AddresstypeModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     /*

application/Building/BuildingModel.php

@@ -134,7 +134,7 @@ class BuildingModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
 

application/BuildingFile/BuildingFileModel.php

@@ -102,7 +102,7 @@ class BuildingFileModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     

application/Buildingstatus/BuildingstatusModel.php

@@ -75,7 +75,7 @@ class BuildingstatusModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     if(array_key_exists("code", $filter)) {

application/Buildingtype/BuildingtypeModel.php

@@ -75,7 +75,7 @@ class BuildingtypeModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     if(array_key_exists("name", $filter)) {

application/Contract/ContractModel.php

@@ -142,7 +142,7 @@ class ContractModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     $db = FronkDB::singleton();

application/ContractconfigGroup/ContractconfigGroupModel.php

@@ -82,7 +82,7 @@ class ContractconfigGroupModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

application/ContractconfigItem/ContractconfigItemModel.php

@@ -82,7 +82,7 @@ class ContractconfigItemModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

application/ContractconfigValue/ContractconfigValueModel.php

@@ -82,7 +82,7 @@ class ContractconfigValueModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

application/Cpeprovisioning/CpeprovisioningController.php

@@ -81,6 +81,8 @@ class CpeprovisioningController extends mfBaseController {
   private function getPreparedFilter($filter) {
     $new_filter = [];
     
+    if(!is_array($filter)) $filter = [];
+    
     if(array_key_exists("hide_delayed_finish", $filter)) {
       if($filter["hide_delayed_finish"] == "1") {
         $new_filter["hide_delayed_finish"] = true;

application/Cpeprovisioning/CpeprovisioningModel.php

@@ -139,7 +139,7 @@ class CpeprovisioningModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     if(array_key_exists("termination_id", $filter)) {

application/CpeshippingFile/CpeshippingFileModel.php

@@ -125,7 +125,7 @@ class CpeshippingFileModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     if(array_key_exists("file_id", $filter)) {

application/File/FileModel.php

@@ -97,7 +97,7 @@ class FileModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

application/IvtCustomer/IvtCustomerModel.php

@@ -62,7 +62,7 @@ class IvtCustomerModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     /*

application/Linework/LineworkController.php

@@ -123,7 +123,9 @@ class LineworkController extends mfBaseController {
       }
     }
     
-    $term = reset(reset($networks));
+    if(is_array($networks) && count($networks)) {
+      $term = reset(reset($networks));
+    }
     $item_colspan = 0;
     $i = 0;
     

application/Network/NetworkModel.php

@@ -95,7 +95,7 @@ class NetworkModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

application/NetworkAddress/NetworkAddressModel.php

@@ -93,7 +93,7 @@ class NetworkAddressModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     $db = FronkDB::singleton();
     

application/Networksection/NetworksectionModel.php

@@ -96,7 +96,7 @@ class NetworksectionModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

application/News/NewsModel.php

@@ -93,7 +93,7 @@ class NewsModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     $db = FronkDB::singleton();

application/Order/OrderController.php

@@ -100,7 +100,7 @@ class OrderController extends mfBaseController {
         return true;
       }*/
       
-      if($filter['network_id']) {
+      if(array_key_exists("network_id", $filter) && $filter['network_id']) {
         //$this->layout()->set("orders", OrderModel::search(['network_id' => $filter['network_id']]));
         $my_networks = [];
         $my_networks[] = new Network($filter['network_id']);
@@ -231,10 +231,10 @@ class OrderController extends mfBaseController {
         $has_bras = false;
         $has_voice = false;
         foreach($order->products as $lop) {
-          if(array_key_exists("bras_type", $lop->product->attributes) && $lop->product->attributes['bras_type']) {
+          if(is_array($lop->product->attributes) && array_key_exists("bras_type", $lop->product->attributes) && $lop->product->attributes['bras_type']) {
             $has_bras = true;
           }
-          if(array_key_exists("voip_chan", $lop->product->attributes) && $lop->product->attributes['voip_chan']) {
+          if(is_array($lop->product->attributes) && array_key_exists("voip_chan", $lop->product->attributes) && $lop->product->attributes['voip_chan']) {
             $has_voice = true;
           }
         }

application/Order/OrderModel.php

@@ -226,7 +226,7 @@ class OrderModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

application/OrderFile/OrderFileModel.php

@@ -102,7 +102,7 @@ class OrderFileModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     

application/OrderJournal/OrderJournalModel.php

@@ -94,7 +94,7 @@ class OrderJournalModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

application/OrderProduct/OrderProductModel.php

@@ -113,7 +113,7 @@ class OrderProductModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

application/Patching/PatchingController.php

@@ -112,6 +112,8 @@ class PatchingController extends mfBaseController {
     $new_filter = [];
     //var_dump($filter);
     
+    if(!is_array($filter)) $filter = [];
+    
     if(array_key_exists("hide_delayed_finish", $filter)) {
       if($filter["hide_delayed_finish"] == "1") {
         $new_filter["hide_delayed_finish"] = true;

application/Patching/PatchingModel.php

@@ -291,7 +291,7 @@ class PatchingModel {
     return $items;
   }
   
-  private function getTerminationSqlFilter($filter = []) {
+  private static function getTerminationSqlFilter($filter = []) {
     $where = "1=1 ";
     if(!is_array($filter) || !count($filter)) {
       return $where;
@@ -358,7 +358,7 @@ class PatchingModel {
     return $where;
   }
   
-  private function getPatchingSqlFilter($filter = []) {
+  private static function getPatchingSqlFilter($filter = []) {
     $where = "1=1 ";
     if(!is_array($filter) || !count($filter)) {
       return $where;

application/Pipework/PipeworkController.php

@@ -119,8 +119,11 @@ class PipeworkController extends mfBaseController {
         $networks[$b->network->name][$b->id] = $b;
       }
     }
-    
+    if(is_array($networks) && count($networks)) {
-    $building = reset(reset($networks));
+      $building = reset(reset($networks));
+    } else {
+      $building = [];
+    }
     $item_colspan = 0;
     $i = 0;
     

application/Pop/PopModel.php

@@ -112,7 +112,7 @@ class PopModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

application/Preorder/PreorderModel.php

@@ -109,7 +109,7 @@ class PreorderModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

application/Preordercampaign/PreordercampaignModel.php

@@ -88,7 +88,7 @@ class PreordercampaignModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

application/PreordercampaignType/PreordercampaignTypeModel.php

@@ -81,7 +81,7 @@ class PreordercampaignTypeModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

application/Product/ProductModel.php

@@ -115,7 +115,7 @@ class ProductModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     $db = FronkDB::singleton();

application/ProductAttribute/ProductAttributeModel.php

@@ -94,7 +94,7 @@ class ProductAttributeModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     $db = FronkDB::singleton();

application/ProductNetwork/ProductNetworkModel.php

@@ -93,7 +93,7 @@ class ProductNetworkModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     $db = FronkDB::singleton();

application/Productgroup/ProductgroupModel.php

@@ -95,7 +95,7 @@ class ProductgroupModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     $db = FronkDB::singleton();

application/Producttech/ProducttechModel.php

@@ -96,7 +96,7 @@ class ProducttechModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     $db = FronkDB::singleton();

application/ProducttechAttribute/ProducttechAttributeModel.php

@@ -97,7 +97,7 @@ class ProducttechAttributeModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     $db = FronkDB::singleton();

application/Sla/SlaModel.php

@@ -94,7 +94,7 @@ class SlaModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     $db = FronkDB::singleton();

application/Termination/TerminationModel.php

@@ -124,7 +124,7 @@ class TerminationModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
   
     //var_dump($filter);exit;

application/TerminationFile/TerminationFileModel.php

@@ -106,7 +106,7 @@ class TerminationFileModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     

application/Terminationstatus/TerminationstatusModel.php

@@ -75,7 +75,7 @@ class TerminationstatusModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     if(array_key_exists("code", $filter)) {

application/User/UserController.php

@@ -92,6 +92,9 @@ class UserController extends mfBaseController {
     }
     
     $user = new User($id);
+    if(!$user->permissions) {
+      $user->permissions = new WorkerPermission();
+    }
     if($r->username) {
       $user->username = $r->username;
     }

application/User/UserModel.php

@@ -80,7 +80,7 @@ class UserModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
     
     //var_dump($filter);exit;

application/Voicenumber/VoicenumberModel.php

@@ -115,7 +115,7 @@ class VoicenumberModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $db = FronkDB::singleton();
     $where = "1=1 ";
     

application/Voicenumberblock/VoicenumberblockModel.php

@@ -114,7 +114,7 @@ class VoicenumberblockModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $db = FronkDB::singleton();
     $where = "1=1 ";
     

application/Workflowitem/WorkflowitemModel.php

@@ -108,7 +108,7 @@ class WorkflowitemModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

application/Workflowvalue/WorkflowvalueModel.php

@@ -109,7 +109,7 @@ class WorkflowvalueModel {
     return $items;
   }
   
-  private function getSqlFilter($filter) {
+  private static function getSqlFilter($filter) {
     $where = "1=1 ";
 
     //var_dump($filter);exit;

lib/FronkDB/FronkDB.php

@@ -253,6 +253,8 @@ class FronkDB {
 		if(!is_array($fields)) {
 			$fields=preg_split('/ ?, ?/',$fields);
 		}
+    
+    $fstr = "";
 
 		foreach($fields as $f)
 		{

lib/mvcfronk/mfBase/mfBaseModel.php

@@ -58,6 +58,10 @@ class mfBaseModel {
 	}
 
 	public function load($row) {
+    if(!is_object($this->data)) {
+      $this->data = new stdClass();
+    }
+    
 		foreach($row as $field => $value) {
 			if($this->fieldprefix) {
 				if(preg_match('/^'.$this->fieldprefix.'_(.+)$/',$field,$m)) {

lib/mvcfronk/mfRouter/mfRouter.php

@@ -31,7 +31,7 @@ class mfRouter {
 		if(defined("DEFAULT_ROUTE") && strlen(DEFAULT_ROUTE)) {
 			$defroute=explode("_",DEFAULT_ROUTE);
 			$this->default['mod']=$defroute[0];
-			if($defroute[1]) {
+			if(count($defroute) == 2 && $defroute[1]) {
 				$this->default['action']=$defroute[1];
 			}
 			
@@ -49,9 +49,9 @@ class mfRouter {
     // get mod and action
 		if(preg_match('/^([^_]+)(?:_(.+)?)?$/',$request['action'],$m)) {
       $umod = $m[1];
-			$this->mod=$m[1];
+			$this->mod = $m[1];
-			$this->action="Index";
+			$this->action = "Index";
-			if($m[2]) {
+			if(count($m) == 3 && $m[2]) {
         $uaction = $m[2];
 				$this->action=$m[2];
 			}

lib/mvcfronk/mfUser/mfUser.php

@@ -5,7 +5,7 @@ class mfUser extends mfBaseModel {
 	public $data;
 	
   
-  public function __construct() {
+  public function __construct($_ = null) {
     $this->db=FronkDB::singleton();
 		$this->log=mfLoghandler::singleton();