Fix the brand nav when there is no apphome

tsugiproject · May 15, 2024 · 6cdfe85 · 6cdfe85
1 parent 6de2585
commit 6cdfe85
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
         "react/dns" : ">=1.12.0",
         "react/socket" : ">=1.15.0",
 
-        "tsugi/lib": "dev-master#5143de10d4ca185330913494ddbf1b72816c05ea",
+        "tsugi/lib": "dev-master#25d7c67051c37e4121700e121415d19ab7dc7435",
         "koseu/lib": "dev-master#70c7ac1ca413c2dd541e078ebe07719405621b1b"
     },
     "config": {

diff --git a/composer.lock b/composer.lock
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
@@ -30,9 +30,9 @@
     '253c157292f75eb38082b5acb06f3f01' => $vendorDir . '/nikic/fast-route/src/functions.php',
     '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
     'bee9632da3ca00a99623b9c35d0c4f8b' => $vendorDir . '/laravel/lumen-framework/src/helpers.php',
+    'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
     '2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
     '1f87db08236948d07391152dccb70f04' => $vendorDir . '/google/apiclient-services/autoload.php',
-    'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
     'a8d3953fd9959404dd22d3dfcd0a79f0' => $vendorDir . '/google/apiclient/src/aliases.php',
     '972fda704d680a3a53c68e34e193cb22' => $vendorDir . '/react/promise-timer/src/functions_include.php',
 );
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -31,9 +31,9 @@ class ComposerStaticInit687bd735fc487d23f01529fcf7aa762c
         '253c157292f75eb38082b5acb06f3f01' => __DIR__ . '/..' . '/nikic/fast-route/src/functions.php',
         '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
         'bee9632da3ca00a99623b9c35d0c4f8b' => __DIR__ . '/..' . '/laravel/lumen-framework/src/helpers.php',
+        'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
         '2cffec82183ee1cea088009cef9a6fc3' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
         '1f87db08236948d07391152dccb70f04' => __DIR__ . '/..' . '/google/apiclient-services/autoload.php',
-        'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
         'a8d3953fd9959404dd22d3dfcd0a79f0' => __DIR__ . '/..' . '/google/apiclient/src/aliases.php',
         '972fda704d680a3a53c68e34e193cb22' => __DIR__ . '/..' . '/react/promise-timer/src/functions_include.php',
     );

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -7708,25 +7708,26 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/tsugiproject/tsugi-php.git",
-                "reference": "5143de10d4ca185330913494ddbf1b72816c05ea"
+                "reference": "25d7c67051c37e4121700e121415d19ab7dc7435"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/5143de10d4ca185330913494ddbf1b72816c05ea",
-                "reference": "5143de10d4ca185330913494ddbf1b72816c05ea",
+                "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/25d7c67051c37e4121700e121415d19ab7dc7435",
+                "reference": "25d7c67051c37e4121700e121415d19ab7dc7435",
                 "shasum": ""
             },
             "require": {
-                "ezyang/htmlpurifier": ">=4.14.0",
-                "firebase/php-jwt": ">=6.3.2",
-                "laravel/lumen-framework": ">=8.0.0",
-                "php": ">=8.2.0"
+                "ezyang/htmlpurifier": "v4.17.0",
+                "firebase/php-jwt": "v6.10.0",
+                "laravel/lumen-framework": "v10.0.3",
+                "php": ">=8.2.0",
+                "phpseclib/phpseclib": "v3.0.37"
             },
             "require-dev": {
                 "phpunit/php-timer": "v5.0.3",
                 "phpunit/phpunit": "9.*"
             },
-            "time": "2024-04-01T01:55:37+00:00",
+            "time": "2024-05-15T15:05:31+00:00",
             "default-branch": true,
             "type": "library",
             "installation-source": "dist",

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '4b7ad46ae4a196a72a7062c80b458d33e07339fd',
+        'reference' => '6de2585bae0a3f3ff57f012326c01fc85978dcb8',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '4b7ad46ae4a196a72a7062c80b458d33e07339fd',
+            'reference' => '6de2585bae0a3f3ff57f012326c01fc85978dcb8',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -1078,7 +1078,7 @@
         'tsugi/lib' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '5143de10d4ca185330913494ddbf1b72816c05ea',
+            'reference' => '25d7c67051c37e4121700e121415d19ab7dc7435',
             'type' => 'library',
             'install_path' => __DIR__ . '/../tsugi/lib',
             'aliases' => array(

diff --git a/vendor/tsugi/lib/composer.json b/vendor/tsugi/lib/composer.json
@@ -22,9 +22,10 @@
     },
     "require": {
         "php": ">=8.2.0",
-        "laravel/lumen-framework": ">=8.0.0",
-        "firebase/php-jwt" : ">=6.3.2",
-        "ezyang/htmlpurifier": ">=4.14.0"
+        "phpseclib/phpseclib": "v3.0.37",
+        "laravel/lumen-framework": "v10.0.3",
+        "firebase/php-jwt" : "v6.10.0",
+        "ezyang/htmlpurifier": "v4.17.0"
 
     },
     "require-dev": {

diff --git a/vendor/tsugi/lib/src/UI/Output.php b/vendor/tsugi/lib/src/UI/Output.php
@@ -771,7 +771,11 @@ function defaultMenuSet() {
 
         $R = $CFG->wwwroot . '/';
         $set = new \Tsugi\UI\MenuSet();
-        $set->setHome($CFG->servicename, $CFG->apphome);
+        if ( is_string($CFG->apphome) ) {
+            $set->setHome($CFG->servicename, $CFG->apphome);
+        } else {
+            $set->setHome($CFG->servicename, $R);
+        }
         $set->addLeft(_m('Tools'), $R.'store');
         if ( $this->session_get('id') ) {
                 $set->addLeft(_m('Settings'), $R . 'settings');