UniFi API browser 2.0.8

- included PHP API client version 1.1.49
- minor changes and improvements

Author: malle-pietje

ajax/fetch_sites.php

@@ -47,8 +47,7 @@
      * we first check for connectivity to the host and port provided in the URL
      */
     $host = parse_url($controller['url'], PHP_URL_HOST);
-    $port = parse_url($controller['url'], PHP_URL_PORT);
-    $port = $port ?: 443;
+    $port = parse_url($controller['url'], PHP_URL_PORT) ?: 443;
 
     if (!empty($host) && !empty($port)) {
         $fp = @fsockopen($host, $port, $errno, $errstr, 2);

ajax/show_api_debug.php

@@ -38,8 +38,7 @@
          * we first check for connectivity to the host and port provided in the URL
          */
         $host = parse_url($controller['url'], PHP_URL_HOST);
-        $port = parse_url($controller['url'], PHP_URL_PORT);
-        $port = $port ?: 443;
+        $port = parse_url($controller['url'], PHP_URL_PORT) ?: 443;
 
         if (!empty($host) && !empty($port)) {
             $fp = @fsockopen($host, $port, $errno, $errstr, 2);

ajax/update_controller.php

@@ -46,7 +46,7 @@
     /**
      * we also unset the cookie for access to the UniFi controller
      */
-    unset($_SESSION['unificookie']);
+    $_SESSION['unificookie'] = '';
 } else {
     $results['status']  = 'error';
     $results['message'] = 'empty POST';

common.php

@@ -7,7 +7,7 @@
  * with this package in the file LICENSE.md
  *
  */
-define('TOOL_VERSION', '2.0.7');
+define('TOOL_VERSION', '2.0.8');
 
 /**
  * gather some basic information for the About modal

composer.lock

@@ -24,7 +24,7 @@ var theme                  = 'bootstrap',
 /**
  * check whether user has stored a custom theme, if yes we switch to the stored value
  */
-if (localStorage.getItem('api_browser_tool_theme') == null || localStorage.getItem('api_browser_tool_theme') === 'bootstrap') {
+if (localStorage.getItem('api_browser_tool_theme') === null || localStorage.getItem('api_browser_tool_theme') === 'bootstrap') {
     $('#bootstrap').addClass('active').find('a').append(' <i class="fas fa-check"></i>');
 } else {
     var stored_theme = localStorage.getItem('api_browser_tool_theme');

js/custom.js

@@ -17,52 +17,56 @@
  * Check whether the cURL module supports SSL
  */
 if (!curl_version()['features'] & CURL_VERSION_SSL) {
-    print 'SSL is not supported with this cURL installation!' . PHP_EOL;
+    print PHP_EOL . 'SSL is not supported with this cURL installation!' . PHP_EOL;
 }
 
 /**
  * create cURL resource
  */
 $ch = curl_init();
 
-/**
- * Set the required cURL options
- */
-curl_setopt($ch, CURLOPT_URL, $controllerurl);
-curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');
-curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+if (is_resource($ch)) {
+    /**
+     * If we have a resource, we proceed and set the required cURL options
+     */
+    curl_setopt($ch, CURLOPT_URL, $controllerurl);
+    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');
+    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
-/**
- * This cURL option can have a value of 0-6
- * see this URL for more details:
- * http://php.net/manual/en/function.curl-setopt.php
- * 0 is the default value and is used by the PHP API client class
- */
-curl_setopt($ch, CURLOPT_SSLVERSION, 0);
+    /**
+     * This cURL option can have a value of 0-6
+     * see this URL for more details:
+     * http://php.net/manual/en/function.curl-setopt.php
+     * 0 is the default value and is used by the PHP API client class
+     */
+    curl_setopt($ch, CURLOPT_SSLVERSION, 0);
 
-/**
- * Be more verbose
- */
-curl_setopt($ch, CURLOPT_VERBOSE, true);
+    /**
+     * Be more verbose
+     */
+    curl_setopt($ch, CURLOPT_VERBOSE, true);
 
-/**
- * $results contains the output as returned by the cURL request,
- * returns true when successful, else returns false
- */
-print 'verbose output from the cURL request:' . PHP_EOL;
-$results = curl_exec($ch);
+    /**
+     * $results contains the output as returned by the cURL request,
+     * returns true when successful, else returns false
+     */
+    print PHP_EOL . 'verbose output from the cURL request:' . PHP_EOL;
+    $results = curl_exec($ch);
 
-print PHP_EOL . 'curl_getinfo output:' . PHP_EOL;
-print_r(curl_getinfo($ch));
+    print PHP_EOL . 'curl_getinfo output:' . PHP_EOL;
+    print_r(curl_getinfo($ch));
 
-/**
- * If we receive a cURL error, output it before the results
- */
-if (curl_errno($ch)) {
-    print PHP_EOL . 'cURL error: ' . curl_error($ch) . PHP_EOL;
-}
+    /**
+     * If we receive a cURL error, output it before the results
+     */
+    if (curl_errno($ch)) {
+        print PHP_EOL . 'cURL error: ' . curl_error($ch) . PHP_EOL;
+    }
 
-print PHP_EOL . '$results:' . PHP_EOL;
-print_r($results);
-print PHP_EOL;
+    print PHP_EOL . '$results:' . PHP_EOL;
+    print_r($results);
+    print PHP_EOL;
+} else {
+    print PHP_EOL . 'ERROR: cURL could not be initialized!' . PHP_EOL;
+}