From 31241f79cfd29a0be5f070da928eeabef7c9e6dc Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Tue, 9 Aug 2022 16:08:04 +0200 Subject: [PATCH] PHP 8.1 fixes; fixed adding users --- Layout/default/Cpeprovisioning/Index.php | 3 +++ Layout/default/Cpeshipping/Index.php | 1 + Layout/default/Linework/Index.php | 2 ++ Layout/default/Patching/Index.php | 2 ++ Layout/default/Pipework/Index.php | 2 ++ application/Address/AddressModel.php | 2 +- application/AddressFile/AddressFileModel.php | 2 +- application/AddressLink/AddressLinkModel.php | 2 +- application/Addressattribute/AddressattributeModel.php | 2 +- application/Addresstype/AddresstypeModel.php | 2 +- application/Building/BuildingModel.php | 2 +- application/BuildingFile/BuildingFileModel.php | 2 +- application/Buildingstatus/BuildingstatusModel.php | 2 +- application/Buildingtype/BuildingtypeModel.php | 2 +- application/Contract/ContractModel.php | 2 +- .../ContractconfigGroup/ContractconfigGroupModel.php | 2 +- .../ContractconfigItem/ContractconfigItemModel.php | 2 +- .../ContractconfigValue/ContractconfigValueModel.php | 2 +- application/Cpeprovisioning/CpeprovisioningController.php | 2 ++ application/Cpeprovisioning/CpeprovisioningModel.php | 2 +- application/CpeshippingFile/CpeshippingFileModel.php | 2 +- application/File/FileModel.php | 2 +- application/IvtCustomer/IvtCustomerModel.php | 2 +- application/Linework/LineworkController.php | 4 +++- application/Network/NetworkModel.php | 2 +- application/NetworkAddress/NetworkAddressModel.php | 2 +- application/Networksection/NetworksectionModel.php | 2 +- application/News/NewsModel.php | 2 +- application/Order/OrderController.php | 6 +++--- application/Order/OrderModel.php | 2 +- application/OrderFile/OrderFileModel.php | 2 +- application/OrderJournal/OrderJournalModel.php | 2 +- application/OrderProduct/OrderProductModel.php | 2 +- application/Patching/PatchingController.php | 2 ++ application/Patching/PatchingModel.php | 4 ++-- application/Pipework/PipeworkController.php | 7 +++++-- application/Pop/PopModel.php | 2 +- application/Preorder/PreorderModel.php | 2 +- application/Preordercampaign/PreordercampaignModel.php | 2 +- .../PreordercampaignType/PreordercampaignTypeModel.php | 2 +- application/Product/ProductModel.php | 2 +- application/ProductAttribute/ProductAttributeModel.php | 2 +- application/ProductNetwork/ProductNetworkModel.php | 2 +- application/Productgroup/ProductgroupModel.php | 2 +- application/Producttech/ProducttechModel.php | 2 +- .../ProducttechAttribute/ProducttechAttributeModel.php | 2 +- application/Sla/SlaModel.php | 2 +- application/Termination/TerminationModel.php | 2 +- application/TerminationFile/TerminationFileModel.php | 2 +- application/Terminationstatus/TerminationstatusModel.php | 2 +- application/User/UserController.php | 3 +++ application/User/UserModel.php | 2 +- application/Voicenumber/VoicenumberModel.php | 2 +- application/Voicenumberblock/VoicenumberblockModel.php | 2 +- application/Workflowitem/WorkflowitemModel.php | 2 +- application/Workflowvalue/WorkflowvalueModel.php | 2 +- lib/FronkDB/FronkDB.php | 2 ++ lib/mvcfronk/mfBase/mfBaseModel.php | 4 ++++ lib/mvcfronk/mfRouter/mfRouter.php | 8 ++++---- lib/mvcfronk/mfUser/mfUser.php | 2 +- 60 files changed, 85 insertions(+), 57 deletions(-) diff --git a/Layout/default/Cpeprovisioning/Index.php b/Layout/default/Cpeprovisioning/Index.php index 00517a107..a2cd614e6 100644 --- a/Layout/default/Cpeprovisioning/Index.php +++ b/Layout/default/Cpeprovisioning/Index.php @@ -1,3 +1,6 @@ + diff --git a/Layout/default/Cpeshipping/Index.php b/Layout/default/Cpeshipping/Index.php index 838cfba97..bd29ece9e 100644 --- a/Layout/default/Cpeshipping/Index.php +++ b/Layout/default/Cpeshipping/Index.php @@ -2,6 +2,7 @@ $pagination_baseurl = $this->getUrl($Mod,"Index"); $pagination_baseurl_params = ["filter" => $filter]; $pagination_entity_name = "CPEs"; + ?> diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php index 4f9555161..edc21fb3f 100644 --- a/Layout/default/Linework/Index.php +++ b/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 = []; ?> diff --git a/Layout/default/Patching/Index.php b/Layout/default/Patching/Index.php index b98c233b0..168dfbf56 100644 --- a/Layout/default/Patching/Index.php +++ b/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 = []; ?> diff --git a/Layout/default/Pipework/Index.php b/Layout/default/Pipework/Index.php index 40980d9da..10e475dba 100644 --- a/Layout/default/Pipework/Index.php +++ b/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 = []; ?> diff --git a/application/Address/AddressModel.php b/application/Address/AddressModel.php index cfa87d0fe..aba807353 100644 --- a/application/Address/AddressModel.php +++ b/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; diff --git a/application/AddressFile/AddressFileModel.php b/application/AddressFile/AddressFileModel.php index b4fa3725e..4c5985e9c 100644 --- a/application/AddressFile/AddressFileModel.php +++ b/application/AddressFile/AddressFileModel.php @@ -104,7 +104,7 @@ class AddressFileModel { return $items; } - private function getSqlFilter($filter) { + private static function getSqlFilter($filter) { $where = "1=1 "; diff --git a/application/AddressLink/AddressLinkModel.php b/application/AddressLink/AddressLinkModel.php index 45c95b4fd..dc27046f5 100644 --- a/application/AddressLink/AddressLinkModel.php +++ b/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; diff --git a/application/Addressattribute/AddressattributeModel.php b/application/Addressattribute/AddressattributeModel.php index 4f00cc6f1..e16d6eb8b 100644 --- a/application/Addressattribute/AddressattributeModel.php +++ b/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)) { diff --git a/application/Addresstype/AddresstypeModel.php b/application/Addresstype/AddresstypeModel.php index 311bbbc19..992228eec 100644 --- a/application/Addresstype/AddresstypeModel.php +++ b/application/Addresstype/AddresstypeModel.php @@ -108,7 +108,7 @@ class AddresstypeModel { return $items; } - private function getSqlFilter($filter) { + private static function getSqlFilter($filter) { $where = "1=1 "; /* diff --git a/application/Building/BuildingModel.php b/application/Building/BuildingModel.php index 2e485c249..282392876 100644 --- a/application/Building/BuildingModel.php +++ b/application/Building/BuildingModel.php @@ -134,7 +134,7 @@ class BuildingModel { return $items; } - private function getSqlFilter($filter) { + private static function getSqlFilter($filter) { $where = "1=1 "; diff --git a/application/BuildingFile/BuildingFileModel.php b/application/BuildingFile/BuildingFileModel.php index 5243a46cf..93b072869 100644 --- a/application/BuildingFile/BuildingFileModel.php +++ b/application/BuildingFile/BuildingFileModel.php @@ -102,7 +102,7 @@ class BuildingFileModel { return $items; } - private function getSqlFilter($filter) { + private static function getSqlFilter($filter) { $where = "1=1 "; diff --git a/application/Buildingstatus/BuildingstatusModel.php b/application/Buildingstatus/BuildingstatusModel.php index 66fe62943..f5ce74a51 100644 --- a/application/Buildingstatus/BuildingstatusModel.php +++ b/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)) { diff --git a/application/Buildingtype/BuildingtypeModel.php b/application/Buildingtype/BuildingtypeModel.php index d92861486..0e4bfc8c4 100644 --- a/application/Buildingtype/BuildingtypeModel.php +++ b/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)) { diff --git a/application/Contract/ContractModel.php b/application/Contract/ContractModel.php index 1413d607a..d05f95155 100644 --- a/application/Contract/ContractModel.php +++ b/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(); diff --git a/application/ContractconfigGroup/ContractconfigGroupModel.php b/application/ContractconfigGroup/ContractconfigGroupModel.php index 77a41f055..220b38ac3 100644 --- a/application/ContractconfigGroup/ContractconfigGroupModel.php +++ b/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; diff --git a/application/ContractconfigItem/ContractconfigItemModel.php b/application/ContractconfigItem/ContractconfigItemModel.php index a0a19637d..7533d5929 100644 --- a/application/ContractconfigItem/ContractconfigItemModel.php +++ b/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; diff --git a/application/ContractconfigValue/ContractconfigValueModel.php b/application/ContractconfigValue/ContractconfigValueModel.php index a4dbe801d..f3e8441c2 100644 --- a/application/ContractconfigValue/ContractconfigValueModel.php +++ b/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; diff --git a/application/Cpeprovisioning/CpeprovisioningController.php b/application/Cpeprovisioning/CpeprovisioningController.php index ee1830c5e..8c46266ac 100644 --- a/application/Cpeprovisioning/CpeprovisioningController.php +++ b/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; diff --git a/application/Cpeprovisioning/CpeprovisioningModel.php b/application/Cpeprovisioning/CpeprovisioningModel.php index c3daab295..19d17cfe6 100644 --- a/application/Cpeprovisioning/CpeprovisioningModel.php +++ b/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)) { diff --git a/application/CpeshippingFile/CpeshippingFileModel.php b/application/CpeshippingFile/CpeshippingFileModel.php index 088d4f100..8a5ee1dba 100644 --- a/application/CpeshippingFile/CpeshippingFileModel.php +++ b/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)) { diff --git a/application/File/FileModel.php b/application/File/FileModel.php index 4e02e6cb8..d3d709180 100644 --- a/application/File/FileModel.php +++ b/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; diff --git a/application/IvtCustomer/IvtCustomerModel.php b/application/IvtCustomer/IvtCustomerModel.php index 0471a163b..3ccf5aea5 100644 --- a/application/IvtCustomer/IvtCustomerModel.php +++ b/application/IvtCustomer/IvtCustomerModel.php @@ -62,7 +62,7 @@ class IvtCustomerModel { return $items; } - private function getSqlFilter($filter) { + private static function getSqlFilter($filter) { $where = "1=1 "; /* diff --git a/application/Linework/LineworkController.php b/application/Linework/LineworkController.php index 1260605c0..8b9a73da0 100644 --- a/application/Linework/LineworkController.php +++ b/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; diff --git a/application/Network/NetworkModel.php b/application/Network/NetworkModel.php index 7f5b6a495..e5cd2614e 100644 --- a/application/Network/NetworkModel.php +++ b/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; diff --git a/application/NetworkAddress/NetworkAddressModel.php b/application/NetworkAddress/NetworkAddressModel.php index 753bce567..cdd7d4e5b 100644 --- a/application/NetworkAddress/NetworkAddressModel.php +++ b/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(); diff --git a/application/Networksection/NetworksectionModel.php b/application/Networksection/NetworksectionModel.php index f3b4c0b8b..caea0f6ae 100644 --- a/application/Networksection/NetworksectionModel.php +++ b/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; diff --git a/application/News/NewsModel.php b/application/News/NewsModel.php index 13536249d..44b3aac6b 100644 --- a/application/News/NewsModel.php +++ b/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(); diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php index 2368727d2..5ffa2c29a 100644 --- a/application/Order/OrderController.php +++ b/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; } } diff --git a/application/Order/OrderModel.php b/application/Order/OrderModel.php index 9a383529c..724bb3787 100644 --- a/application/Order/OrderModel.php +++ b/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; diff --git a/application/OrderFile/OrderFileModel.php b/application/OrderFile/OrderFileModel.php index 7b5099e26..ff6838c10 100644 --- a/application/OrderFile/OrderFileModel.php +++ b/application/OrderFile/OrderFileModel.php @@ -102,7 +102,7 @@ class OrderFileModel { return $items; } - private function getSqlFilter($filter) { + private static function getSqlFilter($filter) { $where = "1=1 "; diff --git a/application/OrderJournal/OrderJournalModel.php b/application/OrderJournal/OrderJournalModel.php index ee6bba369..07ec75218 100644 --- a/application/OrderJournal/OrderJournalModel.php +++ b/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; diff --git a/application/OrderProduct/OrderProductModel.php b/application/OrderProduct/OrderProductModel.php index f5dc895df..2d842b129 100644 --- a/application/OrderProduct/OrderProductModel.php +++ b/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; diff --git a/application/Patching/PatchingController.php b/application/Patching/PatchingController.php index d2f2b6adb..9f9ed1777 100644 --- a/application/Patching/PatchingController.php +++ b/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; diff --git a/application/Patching/PatchingModel.php b/application/Patching/PatchingModel.php index b9b93a1c1..e7411e96d 100644 --- a/application/Patching/PatchingModel.php +++ b/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; diff --git a/application/Pipework/PipeworkController.php b/application/Pipework/PipeworkController.php index 7da2b0875..001309c9b 100644 --- a/application/Pipework/PipeworkController.php +++ b/application/Pipework/PipeworkController.php @@ -119,8 +119,11 @@ class PipeworkController extends mfBaseController { $networks[$b->network->name][$b->id] = $b; } } - - $building = reset(reset($networks)); + if(is_array($networks) && count($networks)) { + $building = reset(reset($networks)); + } else { + $building = []; + } $item_colspan = 0; $i = 0; diff --git a/application/Pop/PopModel.php b/application/Pop/PopModel.php index 132d09f64..a2d6f3ee0 100644 --- a/application/Pop/PopModel.php +++ b/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; diff --git a/application/Preorder/PreorderModel.php b/application/Preorder/PreorderModel.php index 08bb9a8b5..b5e7f8895 100644 --- a/application/Preorder/PreorderModel.php +++ b/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; diff --git a/application/Preordercampaign/PreordercampaignModel.php b/application/Preordercampaign/PreordercampaignModel.php index 7dfbe74b1..1f3d0db50 100644 --- a/application/Preordercampaign/PreordercampaignModel.php +++ b/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; diff --git a/application/PreordercampaignType/PreordercampaignTypeModel.php b/application/PreordercampaignType/PreordercampaignTypeModel.php index 1681ffb48..ea31f91c0 100644 --- a/application/PreordercampaignType/PreordercampaignTypeModel.php +++ b/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; diff --git a/application/Product/ProductModel.php b/application/Product/ProductModel.php index 5d6b49b95..ad869f938 100644 --- a/application/Product/ProductModel.php +++ b/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(); diff --git a/application/ProductAttribute/ProductAttributeModel.php b/application/ProductAttribute/ProductAttributeModel.php index 959483f61..3a0759ac4 100644 --- a/application/ProductAttribute/ProductAttributeModel.php +++ b/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(); diff --git a/application/ProductNetwork/ProductNetworkModel.php b/application/ProductNetwork/ProductNetworkModel.php index edecc3fb9..6273a03f6 100644 --- a/application/ProductNetwork/ProductNetworkModel.php +++ b/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(); diff --git a/application/Productgroup/ProductgroupModel.php b/application/Productgroup/ProductgroupModel.php index 67bbcd7dd..184d946f1 100644 --- a/application/Productgroup/ProductgroupModel.php +++ b/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(); diff --git a/application/Producttech/ProducttechModel.php b/application/Producttech/ProducttechModel.php index e5e84bc8e..df2540111 100644 --- a/application/Producttech/ProducttechModel.php +++ b/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(); diff --git a/application/ProducttechAttribute/ProducttechAttributeModel.php b/application/ProducttechAttribute/ProducttechAttributeModel.php index cf98a9c10..6f72c54a9 100644 --- a/application/ProducttechAttribute/ProducttechAttributeModel.php +++ b/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(); diff --git a/application/Sla/SlaModel.php b/application/Sla/SlaModel.php index c2e179595..5d389ef3c 100644 --- a/application/Sla/SlaModel.php +++ b/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(); diff --git a/application/Termination/TerminationModel.php b/application/Termination/TerminationModel.php index 1dc4bfcf7..815b7d11f 100644 --- a/application/Termination/TerminationModel.php +++ b/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; diff --git a/application/TerminationFile/TerminationFileModel.php b/application/TerminationFile/TerminationFileModel.php index 8dec7f378..af77d4350 100644 --- a/application/TerminationFile/TerminationFileModel.php +++ b/application/TerminationFile/TerminationFileModel.php @@ -106,7 +106,7 @@ class TerminationFileModel { return $items; } - private function getSqlFilter($filter) { + private static function getSqlFilter($filter) { $where = "1=1 "; diff --git a/application/Terminationstatus/TerminationstatusModel.php b/application/Terminationstatus/TerminationstatusModel.php index 8951e7dd6..32818bcd8 100644 --- a/application/Terminationstatus/TerminationstatusModel.php +++ b/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)) { diff --git a/application/User/UserController.php b/application/User/UserController.php index 5993d6bdb..7eb5d27cc 100644 --- a/application/User/UserController.php +++ b/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; } diff --git a/application/User/UserModel.php b/application/User/UserModel.php index 4506263d6..d39dff2ef 100644 --- a/application/User/UserModel.php +++ b/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; diff --git a/application/Voicenumber/VoicenumberModel.php b/application/Voicenumber/VoicenumberModel.php index be01b2901..24341b417 100644 --- a/application/Voicenumber/VoicenumberModel.php +++ b/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 "; diff --git a/application/Voicenumberblock/VoicenumberblockModel.php b/application/Voicenumberblock/VoicenumberblockModel.php index 05574b1f0..ad13be2fd 100644 --- a/application/Voicenumberblock/VoicenumberblockModel.php +++ b/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 "; diff --git a/application/Workflowitem/WorkflowitemModel.php b/application/Workflowitem/WorkflowitemModel.php index ed728096f..b5c0078f8 100644 --- a/application/Workflowitem/WorkflowitemModel.php +++ b/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; diff --git a/application/Workflowvalue/WorkflowvalueModel.php b/application/Workflowvalue/WorkflowvalueModel.php index a066a4e13..7d13ed375 100644 --- a/application/Workflowvalue/WorkflowvalueModel.php +++ b/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; diff --git a/lib/FronkDB/FronkDB.php b/lib/FronkDB/FronkDB.php index 891d874ee..4f69b629c 100644 --- a/lib/FronkDB/FronkDB.php +++ b/lib/FronkDB/FronkDB.php @@ -253,6 +253,8 @@ class FronkDB { if(!is_array($fields)) { $fields=preg_split('/ ?, ?/',$fields); } + + $fstr = ""; foreach($fields as $f) { diff --git a/lib/mvcfronk/mfBase/mfBaseModel.php b/lib/mvcfronk/mfBase/mfBaseModel.php index 5c4a7fd3f..0868d60fe 100644 --- a/lib/mvcfronk/mfBase/mfBaseModel.php +++ b/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)) { diff --git a/lib/mvcfronk/mfRouter/mfRouter.php b/lib/mvcfronk/mfRouter/mfRouter.php index 269c86748..875579ad9 100644 --- a/lib/mvcfronk/mfRouter/mfRouter.php +++ b/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->action="Index"; - if($m[2]) { + $this->mod = $m[1]; + $this->action = "Index"; + if(count($m) == 3 && $m[2]) { $uaction = $m[2]; $this->action=$m[2]; } diff --git a/lib/mvcfronk/mfUser/mfUser.php b/lib/mvcfronk/mfUser/mfUser.php index abfff2a53..c7593a383 100644 --- a/lib/mvcfronk/mfUser/mfUser.php +++ b/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();