a number of minor changes

changed function to fetch API client version to use Composer\InstalledVersions instead
changed 2021 to 2023

Author: malle-pietje

ajax/fetch_about_modal_metrics.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2021, Art of WiFi
+ * Copyright (c) 2023, Art of WiFi
  * www.artofwifi.net
  *
  * This file is subject to the MIT license that is bundled

ajax/fetch_collection.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2021, Art of WiFi
+ * Copyright (c) 2023, Art of WiFi
  * www.artofwifi.net
  *
  * This file is subject to the MIT license that is bundled
@@ -16,6 +16,8 @@
 require_once '../collections.php';
 require_once '../vendor/autoload.php';
 
+use UniFi_API\Client as ApiClient;
+
 /**
  * load the configuration file if readable
  */
@@ -124,14 +126,19 @@
         /**
          * create an instance of the Unifi API client class, log in to the controller and pull the requested data
          */
-        $unifi_connection = new UniFi_API\Client(trim($controller['user']), trim($controller['password']),
-            trim(rtrim($controller['url'], "/")), $site_id);
-        $loginresults     = $unifi_connection->login();
+        $unifi_connection = new ApiClient(
+            trim($controller['user']),
+            trim($controller['password']),
+            trim(rtrim($controller['url'], "/")),
+            $site_id
+        );
+
+        $login_results = $unifi_connection->login();
 
         /**
          * check for login errors
          */
-        if ($loginresults === 400) {
+        if ($login_results === 400) {
             $results['state']   = 'error';
             $results['message'] = 'UniFi controller login failure, please check your credentials in config/config.php!';
         } else {

ajax/fetch_sites.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2021, Art of WiFi
+ * Copyright (c) 2023, Art of WiFi
  * www.artofwifi.net
  *
  * This file is subject to the MIT license that is bundled

ajax/show_api_debug.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2021, Art of WiFi
+ * Copyright (c) 2023, Art of WiFi
  * www.artofwifi.net
  *
  * This file is subject to the MIT license that is bundled

ajax/update_controller.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2021, Art of WiFi
+ * Copyright (c) 2023, Art of WiFi
  * www.artofwifi.net
  *
  * This file is subject to the MIT license that is bundled with this package in the file LICENSE.md

ajax/update_theme.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2021, Art of WiFi
+ * Copyright (c) 2023, Art of WiFi
  * www.artofwifi.net
  *
  * This file is subject to the MIT license that is bundled with this package in the file LICENSE.md

collections.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2021, Art of WiFi
+ * Copyright (c) 2023, Art of WiFi
  * www.artofwifi.net
  *
  * This file is subject to the MIT license that is bundled with this package in the file LICENSE.md

common.php

@@ -1,11 +1,16 @@
 <?php
 /**
- * Copyright (c) 2021, Art of WiFi
+ * Copyright (c) 2023, Art of WiFi
  * www.artofwifi.net
  *
  * This file is subject to the MIT license that is bundled with this package in the file LICENSE.md
  */
-const TOOL_VERSION = '2.0.24';
+
+use Composer\InstalledVersions;
+
+require_once 'vendor/autoload.php';
+
+const TOOL_VERSION = '2.0.25';
 
 /**
  * gather some basic information for the About modal
@@ -32,21 +37,11 @@
  */
 
 /**
- * function which returns the version of the included API client class by
- * extracting it from the composer.lock file
+ * returns the version of the included API client class
+ *
+ * @see https://getcomposer.org/doc/07-runtime.md
  */
 function getClientVersion()
 {
-    if (is_readable('composer.lock')) {
-        $composer_lock = file_get_contents('composer.lock');
-        $json_decoded  = json_decode($composer_lock, true);
-        if (isset($json_decoded['packages'])) {
-            foreach ($json_decoded['packages'] as $package) {
-                if ($package['name'] === 'art-of-wifi/unifi-api-client') {
-                    return substr($package['version'], 1);
-                }
-            }
-        }
-    }
-    return 'unknown';
+    return InstalledVersions::getVersion('art-of-wifi/unifi-api-client');
 }

config/config-template.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2021, Art of WiFi
+ * Copyright (c) 2023, Art of WiFi
  * www.artofwifi.net
  *
  * This file is subject to the MIT license that is bundled with this package in the file LICENSE.md

config/users-template.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2021, Art of WiFi
+ * Copyright (c) 2023, Art of WiFi
  * www.artofwifi.net
  *
  * This file is subject to the MIT license that is bundled with this package in the file LICENSE.md
@@ -33,4 +33,4 @@
        'user_name' => '', // string, the user name
        'password'  => '', // string, the SHA512 hash of the password
     ],
-];
+];