UniFi API browser 2.0.5

- fixed error when using the PHP reset function

Author: malle-pietje

ajax/fetch_collection.php

@@ -72,7 +72,7 @@
     $params = [];
 
     /**
-     * POSTed object:
+     * POSTed object properties:
      * selected_collection_method
      * selected_collection_label
      * selected_collection_key
@@ -97,15 +97,19 @@
         $output_method = $_POST['selected_output_method'];
     }
 
-    switch ($method) {
-        case 'stat_5minutes_gateway':
-            $params = [null, null, $gateway_stats_attribs];
-            break;
-        case 'stat_hourly_gateway':
-            $params = [null, null, $gateway_stats_attribs];
-            break;
-        case 'stat_daily_gateway':
-            $params = [null, null, $gateway_stats_attribs];
+    if (empty($params)) {
+        switch ($method) {
+            case 'stat_5minutes_gateway':
+                $params = [null, null, $gateway_stats_attribs];
+
+                break;
+            case 'stat_hourly_gateway':
+                $params = [null, null, $gateway_stats_attribs];
+
+                break;
+            case 'stat_daily_gateway':
+                $params = [null, null, $gateway_stats_attribs];
+        }
     }
 
     if (!empty($method) && !empty($site_id)) {
@@ -162,17 +166,14 @@
                     /**
                      * Plain render mode
                      */
+                    Kint_Renderer_Text::$decorations = false;
                     Kint::$display_called_from = false;
                     $results['data'] = @s($data_array);
                 } else {
                     $results['data'] = $data_array;
                 }
-
-                /**
-                 * for other future output methods
-                 */
-                //$results['data']  = print_r($data_array, true);
             }
+
             /**
              * execute timing of data collection from UniFi controller
              */

common.php

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

composer.lock

@@ -14,14 +14,18 @@
 session_start();
 
 /**
- * check whether user has requested to clear (force expiry) the PHP session
+ * check whether user has requested to clear (force expiry) the PHP session, if so we
+ * clear the session and reload the page without the query string
  * - this feature can be useful when login errors occur, mostly after upgrades or credential changes
  */
 if (isset($_GET['reset_session']) && $_GET['reset_session'] == true) {
     $_SESSION = [];
     session_unset();
     session_destroy();
     session_start();
+    $current_url = $_SERVER['REQUEST_URI'];
+    $current_url = strtok($current_url, '?');
+    header("refresh: 0; url = $current_url");
 }
 
 /**

index.php

@@ -547,6 +547,7 @@ $('#about_modal').on('shown.bs.modal', function (e) {
                     $('#span_api_browser_update').removeClass('badge-success').addClass('badge-warning');
                 } else if (api_browser_version == json.tag_name.substring(1)) {
                     $('#span_api_browser_update').html('up to date');
+                    $('#span_api_browser_update').removeClass('badge-danger').addClass('badge-success');
                 } else {
                     $('#span_api_browser_update').html('bleeding edge!');
                     $('#span_api_browser_update').removeClass('badge-success').addClass('badge-danger');

js/custom.js

@@ -110,17 +110,17 @@
     },
     {
         "name": "symfony/polyfill-ctype",
-        "version": "v1.12.0",
-        "version_normalized": "1.12.0.0",
+        "version": "v1.13.0",
+        "version_normalized": "1.13.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/polyfill-ctype.git",
-            "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
+            "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
-            "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
+            "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
+            "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
             "shasum": ""
         },
         "require": {
@@ -129,11 +129,11 @@
         "suggest": {
             "ext-ctype": "For best performance"
         },
-        "time": "2019-08-06T08:03:45+00:00",
+        "time": "2019-11-27T13:56:44+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.12-dev"
+                "dev-master": "1.13-dev"
             }
         },
         "installation-source": "dist",
@@ -170,17 +170,17 @@
     },
     {
         "name": "twig/twig",
-        "version": "v1.42.3",
-        "version_normalized": "1.42.3.0",
+        "version": "v1.42.4",
+        "version_normalized": "1.42.4.0",
         "source": {
             "type": "git",
             "url": "https://github.com/twigphp/Twig.git",
-            "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e"
+            "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/twigphp/Twig/zipball/201baee843e0ffe8b0b956f336dd42b2a92fae4e",
-            "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e",
+            "url": "https://api.github.com/repos/twigphp/Twig/zipball/e587180584c3d2d6cb864a0454e777bb6dcb6152",
+            "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152",
             "shasum": ""
         },
         "require": {
@@ -192,7 +192,7 @@
             "symfony/debug": "^3.4|^4.2",
             "symfony/phpunit-bridge": "^4.4@dev|^5.0"
         },
-        "time": "2019-08-24T12:51:03+00:00",
+        "time": "2019-11-11T16:49:32+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {