UniFi API browser 2.0.5

- fixed error when using the PHP reset function

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

index.php

@@ -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");
 }
 
 /**

js/custom.js

@@ -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');

vendor/composer/installed.json

@@ -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": {

vendor/symfony/polyfill-ctype/composer.json

@@ -28,7 +28,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.12-dev"
+            "dev-master": "1.13-dev"
         }
     }
 }

vendor/twig/twig/.gitattributes

@@ -0,0 +1,2 @@
+/tests export-ignore
+/phpunit.xml.dist export-ignore

vendor/twig/twig/CHANGELOG

@@ -1,3 +1,8 @@
+* 1.42.4 (2019-11-11)
+
+ * optimized "block('foo') ?? 'bar"
+ * added supported for exponential numbers
+
 * 1.42.3 (2019-08-24)
 
  * fixed the "split" filter when the delimiter is "0"

vendor/twig/twig/doc/filters/batch.rst

@@ -49,3 +49,4 @@ Arguments
 
 * ``size``: The size of the batch; fractional numbers will be rounded up
 * ``fill``: Used to fill in missing items
+* ``preserve_keys``: Whether to preserve keys or not

vendor/twig/twig/doc/filters/map.rst

@@ -34,5 +34,4 @@ Note that the arrow function has access to the current context.
 Arguments
 ---------
 
-* ``array``: The sequence or mapping
 * ``arrow``: The arrow function

vendor/twig/twig/doc/filters/reduce.rst

@@ -28,6 +28,5 @@ Note that the arrow function has access to the current context.
 Arguments
 ---------
 
-* ``array``: The sequence or mapping
 * ``arrow``: The arrow function
 * ``initial``: The initial value

vendor/twig/twig/ext/twig/php_twig.h

@@ -15,7 +15,7 @@
 #ifndef PHP_TWIG_H
 #define PHP_TWIG_H
 
-#define PHP_TWIG_VERSION "1.42.3"
+#define PHP_TWIG_VERSION "1.42.4"
 
 #include "php.h"
 

vendor/twig/twig/src/Environment.php

@@ -41,11 +41,11 @@
  */
 class Environment
 {
-    const VERSION = '1.42.3';
-    const VERSION_ID = 14203;
+    const VERSION = '1.42.4';
+    const VERSION_ID = 14204;
     const MAJOR_VERSION = 1;
     const MINOR_VERSION = 42;
-    const RELEASE_VERSION = 3;
+    const RELEASE_VERSION = 4;
     const EXTRA_VERSION = '';
 
     protected $charset;
@@ -515,7 +515,7 @@ public function loadClass($cls, $name, $index = null)
      *
      * This method should not be used as a generic way to load templates.
      *
-     * @param string $template The template name
+     * @param string $template The template source
      * @param string $name     An optional name of the template to be used in error messages
      *
      * @return TemplateWrapper A template instance representing the given template name

vendor/twig/twig/src/Lexer.php

@@ -47,7 +47,7 @@ class Lexer implements \Twig_LexerInterface
     const STATE_INTERPOLATION = 4;
 
     const REGEX_NAME = '/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A';
-    const REGEX_NUMBER = '/[0-9]+(?:\.[0-9]+)?/A';
+    const REGEX_NUMBER = '/[0-9]+(?:\.[0-9]+)?([Ee][\+\-][0-9]+)?/A';
     const REGEX_STRING = '/"([^#"\\\\]*(?:\\\\.[^#"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As';
     const REGEX_DQ_STRING_DELIM = '/"/A';
     const REGEX_DQ_STRING_PART = '/[^#"\\\\]*(?:(?:\\\\.|#(?!\{))[^#"\\\\]*)*/As';

vendor/twig/twig/src/Node/Expression/NullCoalesceExpression.php

@@ -22,11 +22,15 @@ class NullCoalesceExpression extends ConditionalExpression
 {
     public function __construct(\Twig_NodeInterface $left, \Twig_NodeInterface $right, $lineno)
     {
-        $test = new AndBinary(
-            new DefinedTest(clone $left, 'defined', new Node(), $left->getTemplateLine()),
-            new NotUnary(new NullTest($left, 'null', new Node(), $left->getTemplateLine()), $left->getTemplateLine()),
-            $left->getTemplateLine()
-        );
+        $test = new DefinedTest(clone $left, 'defined', new Node(), $left->getTemplateLine());
+        // for "block()", we don't need the null test as the return value is always a string
+        if (!$left instanceof BlockReferenceExpression) {
+            $test = new AndBinary(
+                $test,
+                new NotUnary(new NullTest($left, 'null', new Node(), $left->getTemplateLine()), $left->getTemplateLine()),
+                $left->getTemplateLine()
+            );
+        }
 
         parent::__construct($test, $left, $right, $lineno);
     }