andom-tec changes

application/Address/AddressController.php

@@ -102,13 +102,15 @@ class AddressController extends mfBaseController {
       
       if(!array_key_exists("customer_number", $filter) || !$filter["customer_number"]) {
         if(array_key_exists("type", $filter)) {
-          if($filter["type"] == "xinon") {
+          if($filter["type"] == "systemowner") {
             $new_filter["customer_or_fibu_numbers"] = true;
           } elseif($filter["type"] == "others") {
             $new_filter["customer_or_fibu_numbers"] = false;
           }
         } else {
-          $new_filter["customer_or_fibu_numbers"] = true; // default
+            if(defined("TT_ADDRESS_FILTER_DEFAULT_SYSOWNER") && TT_ADDRESS_FILTER_DEFAULT_SYSOWNER) {
+                $new_filter["customer_or_fibu_numbers"] = true; // default
+            }
         }
         unset($filter["type"]);
         unset($filter["customer_number"]);

application/Device/DeviceController.php

@@ -49,8 +49,8 @@ class DeviceController extends mfBaseController
             "DEVICE_MANUFACTURERS" => $deviceManufacturers,
             "DEVICE_TYPES" => $deviceTypes,
             "DEVICES" => $this->getDevices(),
-            "ZABBIX_URL" => ZABBIX_URL,
-            "GRAFANA_URL" => GRAFANA_URL,
+            "ZABBIX_URL" => (defined("ZABBIX_URL")) ? ZABBIX_URL : "",
+            "GRAFANA_URL" => (defined("GRAFANA_URL")) ? GRAFANA_URL : "",
         ];
 
         $this->layout()->set("vueViewName", "Device");

application/Order/Order.php

@@ -145,7 +145,7 @@ class Order extends mfBaseModel {
     $to = $owner->email;
     
     if(!$subject || !$from || !$from_name || !$to) {
-      $this->log->warn("Service PIN Email not sent. (subject: '$subject', from: '$from_email', from_email: '$from', to: '$to')");
+      $this->log->warn("Service PIN Email not sent. (subject: '$subject', from: '$from_name', from_email: '$from', to: '$to')");
     } else {
       $email = new Emailnotification();
       $email->setSubject($subject);

application/User/UserController.php

@@ -39,8 +39,8 @@ class UserController extends mfBaseController
         }
         $this->layout()->set('users', $users);
 
-        $addresses = AddressModel::getAll();
-        $this->layout()->set("addresses", $addresses);
+        //$addresses = AddressModel::getAll();
+        //$this->layout()->set("addresses", $addresses);
         $this->layout()->set("filter", $this->request->filter);
     }