From 73b21039b953c45b43f9b8c857ee0280fd0fa918 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 10 Jul 2024 19:29:51 +0200
Subject: [PATCH 1/3] rewrite of the script to import config

allow mysql and sqlite
---
 bin/import_config.php | 80 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 67 insertions(+), 13 deletions(-)

diff --git a/bin/import_config.php b/bin/import_config.php
index f2fbd14..db5857d 100644
--- a/bin/import_config.php
+++ b/bin/import_config.php
@@ -1,21 +1,75 @@
 <?php
-/**
- * Imports a json configuration into a sqlite database.
- *
- * Usage:
- *   php bin/import_config.php /path/to/config.json /path/to/owncloud.db
- */
 
-$configFile = $argv[1];
-$databaseFile = $argv[2];
+function showUsageAndExit(int $code)
+{
+    global $argv;
 
-$content = file_get_contents($configFile);
-$config = json_decode($content, true);
+    echo "${argv[0]} [--help] --config /path/to/config/config.php --file /path/to/config.json\n";
 
-$pdo = new \Pdo(sprintf('sqlite:%s', $databaseFile));
-$stmt = $pdo->prepare('UPDATE oc_appconfig SET configvalue=:value WHERE configkey=:key and appid=:appId');
+    exit($code);
+}
 
-foreach ($config as $key => $value) {
+function value(string $shortName, string $longName, array $options, bool $required = true): ?string
+{
+    $value = $options[$shortName] ?? $options[$longName] ?? null;
+
+    if (is_array($value)) {
+        echo "To much --{$longName}\n";
+        showUsageAndExit(1);
+    }
+
+    if (empty($value) && $required) {
+        echo "--{$longName} is missing\n";
+        showUsageAndExit(1);
+    }
+
+    return $value;
+}
+
+$options = getopt('t:f:c:h', [
+    'type:',
+    'file:',
+    'config:',
+    'help',
+]);
+
+$help = value('h', 'help', $options, false);
+$config = value('c', 'config', $options);
+$file = value('f', 'file', $options);
+
+if (!is_readable($config) && !is_file($config)) {
+    echo "No such file: {$config}\n";
+
+    exit(1);
+}
+
+if (!is_readable($file) && !is_file($file)) {
+    echo "No such file: {$file}\n";
+
+    exit(1);
+}
+
+$appConfig = json_decode(file_get_contents($file), true);
+
+require $config;
+
+if ('mysql' === $CONFIG['dbtype']) {
+    $pdo = new \PDO(
+        'mysql:host='.$CONFIG['dbhost'].';dbname='.$CONFIG['dbname'],
+        $CONFIG['dbuser'],
+        $CONFIG['dbpassword']
+    );
+} elseif ($CONFIG['dbtype']) {
+    $pdo = new \PDO(sprintf('sqlite:%s', $CONFIG['datadirectory'].'/owncloud.db'));
+} else {
+    echo "dbtype is not valid\n";
+
+    exit(1);
+}
+
+$stmt = $pdo->prepare('UPDATE '.$CONFIG['dbtableprefix'].'appconfig SET configvalue=:value WHERE configkey=:key and appid=:appId');
+
+foreach ($appConfig as $key => $value) {
     $stmt->execute([
         'appId' => 'side_menu',
         'key' => $key,

From 827bbd7c70bdebbf17e0e6c27d17be3b31b62c34 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 10 Jul 2024 19:39:52 +0200
Subject: [PATCH 2/3] fix #354: remove the opener when the menu is always
 displayed

---
 src/SideMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SideMenu.vue b/src/SideMenu.vue
index 95731b3..20c7163 100644
--- a/src/SideMenu.vue
+++ b/src/SideMenu.vue
@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         v-bind:label="settings.name"
         v-bind:avatar="settings.avatar" />
       <AppSearch v-model:search="search" />
-      <OpenerButton />
+      <OpenerButton v-if="!alwaysDisplayed" />
       <Logo
         v-if="!avatar && !alwaysDisplayed && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
         v-bind:image="logo"

From 9ed36b6944ac685d8b3a6f63e466d65b3c91407a Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 10 Jul 2024 19:47:09 +0200
Subject: [PATCH 3/3] fix extra margin between the logo and the opener

---
 css/sideMenu.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/css/sideMenu.css b/css/sideMenu.css
index 6b30509..6971df0 100644
--- a/css/sideMenu.css
+++ b/css/sideMenu.css
@@ -89,6 +89,10 @@
 .side-menu-opener span {
   position: relative;
   left: 50px;
+  display: block;
+  width: 1px;
+  height: 1px;
+  overflow: hidden;
 }
 
 .side-menu-opener:active, .side-menu-opener:focus {