API client class v1.1.79

- updated README to reflect support for 7.X - `get_last_error_message()` now always returns a string which is empty if no message is available - applied PR #151 in slightly different way for consistency with other similar code sections, contributed by @banakito - changed default argument values in several methods/functions from null to an empty string
Art-of-WiFi · Mar 28, 2022 · cbe89d9 · cbe89d9
1 parent 4fe1780
commit cbe89d9
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -2,8 +2,9 @@
 
 A PHP class that provides access to Ubiquiti's [**UniFi Network Controller**](https://unifi-network.ui.com/) API.
 
-UniFi Network Controller software versions 4.X.X, 5.X.X and 6.X.X are supported  as well as UniFi OS-based controllers (version 6.5.55 has been confirmed to work). 
-This class is used by our API browser tool which can be found [here](https://github.com/Art-of-WiFi/UniFi-API-browser).
+UniFi Network Controller software versions 4.X.X, 5.X.X, 6.X.X, and 7.X.X (version 7.0.23 has been confirmed to work)
+are supported as well as UniFi OS-based controllers. This class is used by our API browser tool which can be found
+[here](https://github.com/Art-of-WiFi/UniFi-API-browser).
 
 The package can be installed manually or by using
 composer/[packagist](https://packagist.org/packages/art-of-wifi/unifi-api-client) for
@@ -15,20 +16,23 @@ easy inclusion in your projects.
   - PHP 5.5.0 or higher 
   - PHP json and PHP cURL modules
   - tested on Apache 2.4 with PHP 5.6.1 and cURL 7.42.1 and with PHP 7.4.9 and cURL 7.68.0
-- direct network connectivity between this server and the host and port (normally TCP port 8443 or port 443 for 
+- direct network connectivity between this server and the host and port (usually TCP port 8443 or port 443 for 
   UniFi OS) where the UniFi Controller is running
-- you must use **accounts with local access**, not pure UniFi Cloud accounts, to access the UniFi Controller API through 
-  this class
+- you must use **accounts with local access**, not UniFi Cloud accounts, to access the UniFi Controller API 
+  through this class
 
 ## UniFi OS Support
 
-Support for UniFi OS-based controllers (UniFi Dream Router, UniFi Dream Machine, UniFi Dream Machine Pro 
-or Cloud Key Gen2/Cloud Key Gen2 Plus with firmware version 2.0.24 or higher) has 
-been added as of version 1.1.47. The class automatically detects UniFi OS devices and
-adjusts URLs and several functions/methods accordingly. If your own code implements strict
-validation of the URL that is passed to the constructor, please adapt your logic to 
-allow URLs without a port suffix or with port 443 when dealing with a UniFi OS-based
-controller.
+Support for UniFi OS-based controllers has been added as of version 1.1.47:
+- UniFi Dream Router (UDR)
+- UniFi Dream Machine (UDM)
+- UniFi Dream Machine Pro (UDM PRO)
+- Cloud Key Gen2 (UCK G2), firmware version 2.0.24 or higher
+- Cloud Key Gen2 Plus (UCK G2 Plus), firmware version 2.0.24 or higher
+
+The class automatically detects UniFi OS-based controllers and adjusts URLs and several functions/methods accordingly.
+If your own code implements strict validation of the URL that is passed to the constructor, please adapt your
+logic to allow URLs without a port suffix or with port 443 when working with a UniFi OS-based controller.
 
 Please test all methods you plan on using thoroughly before using the API Client with
 UniFi OS devices in a production environment.
@@ -128,9 +132,10 @@ own PHP code.
    associated with the FQDN in the `controller_url` parameter. This option was added with API client version 1.1.16.
 
 3. Using an administrator account (`$controller_user` in the above example) with **read-only** permissions can limit 
-   visibility on certain collection/object properties. See this [issue](https://github.com/Art-of-WiFi/UniFi-API-client/issues/129)
-   and this [issue](https://github.com/Art-of-WiFi/UniFi-API-browser/issues/94) for an example where the WPA2 password
-   isn't accessible for **read-only** administrator accounts.
+   visibility on certain collection/object properties. See this
+   [issue](https://github.com/Art-of-WiFi/UniFi-API-client/issues/129) and this 
+   [issue](https://github.com/Art-of-WiFi/UniFi-API-browser/issues/94) for an example where the WPA2 password isn't
+   visible for **read-only** administrator accounts.
 
 ## Functions/methods supported
 
@@ -347,7 +352,7 @@ This class is based on the initial work by the following developers:
 
 and the API as published by Ubiquiti:
 
-- https://dl.ui.com/unifi/6.5.55/unifi_sh_api
+- https://dl.ui.com/unifi/7.0.23/unifi_sh_api
 
 ## Important Disclaimer
 

diff --git a/src/Client.php b/src/Client.php
@@ -13,7 +13,7 @@
  *
  * @package UniFi_Controller_API_Client_Class
  * @author  Art of WiFi <info@artofwifi.net>
- * @version Release: 1.1.78
+ * @version Release: 1.1.79
  * @license This class is subject to the MIT license that is bundled with this package in the file LICENSE.md
  * @example This directory in the package repository contains a collection of examples:
  *          https://github.com/Art-of-WiFi/UniFi-API-client/tree/master/examples
@@ -26,7 +26,7 @@ class Client
      * NOTE:
      * do not modify the values here, instead use the constructor or the getter and setter functions/methods
      */
-    const CLASS_VERSION             = '1.1.78';
+    const CLASS_VERSION             = '1.1.79';
     protected $baseurl              = 'https://127.0.0.1:8443';
     protected $user                 = '';
     protected $password             = '';
@@ -38,7 +38,7 @@ class Client
     protected $exec_retries         = 0;
     protected $cookies              = '';
     protected $last_results_raw     = null;
-    protected $last_error_message   = null;
+    protected $last_error_message   = '';
     protected $curl_ssl_verify_peer = false;
     protected $curl_ssl_verify_host = false;
     protected $curl_http_version    = CURL_HTTP_VERSION_NONE;
@@ -428,7 +428,7 @@ public function create_user($mac, $user_group_id, $name = null, $note = null, $i
      *                        the existing note for the client-device is removed and "noted" attribute set to false
      * @return bool returns true upon success
      */
-    public function set_sta_note($user_id, $note = null)
+    public function set_sta_note($user_id, $note = '')
     {
         $payload = ['note' => $note];
         return $this->fetch_results_boolean('/api/s/' . $this->site . '/upd/user/' . trim($user_id), $payload);
@@ -442,7 +442,7 @@ public function set_sta_note($user_id, $note = null)
      *                        the existing name for the client device is removed
      * @return bool returns true upon success
      */
-    public function set_sta_name($user_id, $name = null)
+    public function set_sta_name($user_id, $name = '')
     {
         $payload = ['name' => $name];
         return $this->fetch_results_boolean('/api/s/' . $this->site . '/upd/user/' . trim($user_id), $payload);
@@ -1706,15 +1706,16 @@ public function invite_admin(
         $device_adopt = false,
         $device_restart = false
     ) {
-        $email_valid = filter_var(trim($email), FILTER_VALIDATE_EMAIL);
+        $email       = trim($email);
+        $email_valid = filter_var($email, FILTER_VALIDATE_EMAIL);
         if (!$email_valid) {
             trigger_error('The email address provided is invalid!');
             return false;
         }
 
         $payload = [
             'name'        => trim($name),
-            'email'       => trim($email),
+            'email'       => $email,
             'for_sso'     => $enable_sso,
             'cmd'         => 'invite-admin',
             'role'        => 'admin',
@@ -1895,10 +1896,10 @@ public function stat_payment($within = null)
      * @param string $note       optional, note to attach to the hotspot operator
      * @return bool true upon success
      */
-    public function create_hotspotop($name, $x_password, $note = null)
+    public function create_hotspotop($name, $x_password, $note = '')
     {
         $payload = ['name' => $name, 'x_password' => $x_password];
-        if (is_string($note)) {
+        if (!empty($note)) {
             $payload['note'] = trim($note);
         }
 
@@ -1934,7 +1935,7 @@ public function create_voucher(
         $minutes,
         $count = 1,
         $quota = 0,
-        $note = null,
+        $note = '',
         $up = null,
         $down = null,
         $megabytes = null
@@ -1946,7 +1947,7 @@ public function create_voucher(
             'quota'  => intval($quota),
         ];
 
-        if (is_string($note)) {
+        if (!empty($note)) {
             $payload['note'] = trim($note);
         }
 
@@ -2575,7 +2576,7 @@ public function delete_network($network_id)
      * @return array containing wireless networks and their settings, or an array containing a single wireless network
      *               when using the <wlan_id> parameter
      */
-    public function list_wlanconf($wlan_id = null)
+    public function list_wlanconf($wlan_id = '')
     {
         return $this->fetch_results('/api/s/' . $this->site . '/rest/wlanconf/' . trim($wlan_id));
     }
@@ -2676,12 +2677,12 @@ public function set_wlansettings_base($wlan_id, $payload)
      * @param string $name         optional, SSID
      * @return bool true on success
      */
-    public function set_wlansettings($wlan_id, $x_passphrase, $name = null)
+    public function set_wlansettings($wlan_id, $x_passphrase, $name = '')
     {
         $payload                 = [];
         $payload['x_passphrase'] = trim($x_passphrase);
 
-        if (is_string($name)) {
+        if (!empty($name)) {
             $payload['name'] = trim($name);
         }
 
@@ -2804,7 +2805,7 @@ public function count_alarms($archived = null)
      *                         by default all alarms are archived
      * @return bool true on success
      */
-    public function archive_alarm($alarm_id = null)
+    public function archive_alarm($alarm_id = '')
     {
         $payload = ['cmd' => 'archive-all-alarms'];
         if (!empty($alarm_id)) {
@@ -3364,7 +3365,7 @@ public function get_debug()
      *
      * @param boolean $return_json true returns the results in "pretty printed" json format,
      *                             false returns PHP stdClass Object format (default)
-     * @return false|string|null the raw results as returned by the controller API
+     * @return false|string|object|null the raw results as returned by the controller API
      */
     public function get_last_results_raw($return_json = false)
     {
@@ -3382,16 +3383,12 @@ public function get_last_results_raw($return_json = false)
     /**
      * Get last error message
      *
-     * @return object|bool the error message of the last method called in PHP stdClass Object format, returns false if
-     *                     unavailable
+     * @return string the error message of the last method called in PHP stdClass Object format, an empty string when
+     *                none available
      */
     public function get_last_error_message()
     {
-        if (!is_null($this->last_error_message)) {
-            return $this->last_error_message;
-        }
-
-        return false;
+        return $this->last_error_message;
     }
 
     /**
@@ -3655,7 +3652,7 @@ protected function fetch_results($path, $payload = null, $boolean = false, $logi
 
             if (isset($response->meta->rc)) {
                 if ($response->meta->rc === 'ok') {
-                    $this->last_error_message = null;
+                    $this->last_error_message = '';
                     if (is_array($response->data) && !$boolean) {
                         return $response->data;
                     }