Fixes

RobiNN1 · RobiNN1 · commit 9b80ba8a2d6a · 2024-12-23T01:03:34.000+01:00
diff --git a/assets/css/styles.css b/assets/css/styles.css
@@ -27,7 +27,7 @@
 }
 
 /*
-! tailwindcss v3.4.15 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.17 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -721,10 +721,6 @@ video {
   margin-left: calc(-1px * calc(1 - var(--tw-space-x-reverse)));
 }
 
-.self-center {
-  align-self: center;
-}
-
 .overflow-hidden {
   overflow: hidden;
 }
@@ -1226,8 +1222,9 @@ video {
   margin-right: 0.75rem;
 }
 
-.file\:rounded::file-selector-button {
-  border-radius: 0.25rem;
+.file\:rounded-l::file-selector-button {
+  border-top-left-radius: 0.25rem;
+  border-bottom-left-radius: 0.25rem;
 }
 
 .file\:border::file-selector-button {
@@ -1601,10 +1598,6 @@ video {
     display: flex;
   }
 
-  .md\:inline-flex {
-    display: inline-flex;
-  }
-
   .md\:table-cell {
     display: table-cell;
   }
diff --git a/assets/icons/back.svg b/assets/icons/back.svg
diff --git a/assets/icons/loading.svg b/assets/icons/loading.svg
diff --git a/assets/icons/menu.svg b/assets/icons/menu.svg
diff --git a/index.php b/index.php
@@ -56,10 +56,6 @@
 if (isset($_GET['ajax'])) {
     echo $dashboard->ajax();
 } else {
-    if (isset($_GET['moreinfo']) || isset($_GET['form']) || isset($_GET['view'], $_GET['key'])) {
-        $back_url = Http::queryString(['db', 's']);
-    }
-
     if (isset($info['colors'])) {
         $colors = '';
 
@@ -75,7 +71,6 @@
         'logout_url' => isset($auth) ? Http::queryString([], ['logout' => 'yes']) : null,
         'version'    => Admin::VERSION,
         'repo'       => 'https://github.com/RobiNN1/phpCacheAdmin',
-        'back_url'   => $back_url ?? null,
         'dashboard'  => $dashboard->dashboard(),
     ]);
 }
diff --git a/src/Dashboards/APCu/APCuTrait.php b/src/Dashboards/APCu/APCuTrait.php
@@ -58,7 +58,7 @@ private function panels(): string {
             ],
         ];
 
-        return $this->template->render('partials/info', ['panels' => $panels, 'left' => true]);
+        return $this->template->render('partials/info', ['panels' => $panels]);
     }
 
     private function moreInfo(): string {
diff --git a/src/Dashboards/Memcached/MemcachedTrait.php b/src/Dashboards/Memcached/MemcachedTrait.php
@@ -33,10 +33,9 @@ private function panels(): string {
 
             $panels = [
                 [
-                    'title'     => $title ?? null,
-                    'moreinfo'  => true,
-                    'server_id' => $this->current_server,
-                    'data'      => [
+                    'title'    => $title ?? null,
+                    'moreinfo' => true,
+                    'data'     => [
                         'Version'          => $info['version'],
                         'Open connections' => $info['curr_connections'],
                         'Uptime'           => Format::seconds((int) $info['uptime']),
@@ -71,7 +70,7 @@ private function panels(): string {
             $panels = ['error' => $e->getMessage()];
         }
 
-        return $this->template->render('partials/info', ['panels' => $panels, 'left' => true]);
+        return $this->template->render('partials/info', ['panels' => $panels]);
     }
 
     /**
diff --git a/src/Dashboards/OPCache/OPCacheTrait.php b/src/Dashboards/OPCache/OPCacheTrait.php
@@ -95,7 +95,7 @@ private function panels(): string {
             ],
         ];
 
-        return $this->template->render('partials/info', ['panels' => $panels, 'left' => true]);
+        return $this->template->render('partials/info', ['panels' => $panels]);
     }
 
     private function moreInfo(): string {
diff --git a/src/Dashboards/Realpath/RealpathTrait.php b/src/Dashboards/Realpath/RealpathTrait.php
@@ -35,7 +35,7 @@ private function panels(): string {
             ],
         ];
 
-        return $this->template->render('partials/info', ['panels' => $panels, 'left' => true]);
+        return $this->template->render('partials/info', ['panels' => $panels]);
     }
 
     /**
diff --git a/src/Dashboards/Redis/RedisTrait.php b/src/Dashboards/Redis/RedisTrait.php
@@ -52,10 +52,9 @@ private function panels(): string {
 
             $panels = [
                 [
-                    'title'     => $title ?? null,
-                    'moreinfo'  => true,
-                    'server_id' => $this->current_server,
-                    'data'      => [
+                    'title'    => $title ?? null,
+                    'moreinfo' => true,
+                    'data'     => [
                         'Version' => $info['server']['redis_version'].', '.$info['server']['redis_mode'].' mode',
                         'Cluster' => $info['cluster']['cluster_enabled'] ? 'Enabled' : 'Disabled',
                         'Uptime'  => Format::seconds((int) $info['server']['uptime_in_seconds']),
@@ -89,7 +88,7 @@ private function panels(): string {
             $panels = ['error' => $e->getMessage()];
         }
 
-        return $this->template->render('partials/info', ['panels' => $panels, 'left' => true]);
+        return $this->template->render('partials/info', ['panels' => $panels]);
     }
 
     /**
@@ -166,7 +165,7 @@ private function viewKey(): string {
         $key = Http::get('key', '');
 
         if (!$this->redis->exists($key)) {
-            Http::redirect(['db']);
+            Http::redirect();
         }
 
         try {
@@ -187,12 +186,12 @@ private function viewKey(): string {
 
             $this->deleteSubKey($type, $key, $subkey);
 
-            Http::redirect(['db', 'key', 'view', 'p']);
+            Http::redirect(['key', 'view', 'p']);
         }
 
         if (isset($_GET['delete'])) {
             $this->redis->del($key);
-            Http::redirect(['db']);
+            Http::redirect();
         }
 
         $ttl = $this->redis->ttl($key);
@@ -213,7 +212,7 @@ private function viewKey(): string {
 
         if (is_array($value)) {
             $items = $this->formatViewItems($key, $value, $type);
-            $paginator = new Paginator($this->template, $items, [['db', 'view', 'key', 'pp'], ['p' => '']]);
+            $paginator = new Paginator($this->template, $items, [['view', 'key', 'pp'], ['p' => '']]);
             $value = $paginator->getPaginated();
             $paginator = $paginator->render();
         } else {
@@ -228,11 +227,11 @@ private function viewKey(): string {
             'size'           => Format::bytes($this->redis->size($key)),
             'encode_fn'      => $encode_fn,
             'formatted'      => $is_formatted,
-            'add_subkey_url' => Http::queryString(['db'], ['form' => 'new', 'key' => $key]),
-            'deletesub_url'  => Http::queryString(['db', 'view', 'p'], ['deletesub' => 'key', 'key' => $key]),
-            'edit_url'       => Http::queryString(['db'], ['form' => 'edit', 'key' => $key]),
-            'export_url'     => Http::queryString(['db', 'view', 'p', 'key'], ['export' => 'key']),
-            'delete_url'     => Http::queryString(['db', 'view'], ['delete' => 'key', 'key' => $key]),
+            'add_subkey_url' => Http::queryString([], ['form' => 'new', 'key' => $key]),
+            'deletesub_url'  => Http::queryString(['view', 'p'], ['deletesub' => 'key', 'key' => $key]),
+            'edit_url'       => Http::queryString([], ['form' => 'edit', 'key' => $key]),
+            'export_url'     => Http::queryString(['view', 'p', 'key'], ['export' => 'key']),
+            'delete_url'     => Http::queryString(['view'], ['delete' => 'key', 'key' => $key]),
             'paginator'      => $paginator,
             'types'          => $this->typesTplOptions(),
         ]);
@@ -268,7 +267,7 @@ public function saveKey(): void {
             $this->redis->expire($key, $expire);
         }
 
-        Http::redirect(['db'], ['view' => 'key', 'key' => $key]);
+        Http::redirect([], ['view' => 'key', 'key' => $key]);
     }
 
     /**
@@ -461,13 +460,13 @@ function (string $key, string $value, int $ttl): bool {
             Helpers::export($keys, 'redis_backup', fn (string $key): string => bin2hex($this->redis->dump($key)));
         }
 
-        $paginator = new Paginator($this->template, $keys, [['db', 's', 'pp'], ['p' => '']]);
+        $paginator = new Paginator($this->template, $keys, [['s', 'pp'], ['p' => '']]);
 
         return $this->template->render('dashboards/redis/redis', [
             'keys'      => $paginator->getPaginated(),
             'all_keys'  => $this->redis->dbSize(),
             'paginator' => $paginator->render(),
-            'view_key'  => Http::queryString(['db', 's'], ['view' => 'key', 'key' => '__key__']),
+            'view_key'  => Http::queryString(['s'], ['view' => 'key', 'key' => '__key__']),
         ]);
     }
 }
diff --git a/src/Dashboards/Server/ServerDashboard.php b/src/Dashboards/Server/ServerDashboard.php
@@ -9,7 +9,6 @@
 namespace RobiNN\Pca\Dashboards\Server;
 
 use RobiNN\Pca\Dashboards\DashboardInterface;
-use RobiNN\Pca\Http;
 use RobiNN\Pca\Template;
 
 class ServerDashboard implements DashboardInterface {
@@ -44,7 +43,6 @@ public function dashboard(): string {
         return $this->template->render('dashboards/server', [
             'panels'     => $this->panels(),
             'extensions' => get_loaded_extensions(),
-            'ext_link'   => Http::queryString([], ['moreinfo' => 0]),
         ]);
     }
 }
diff --git a/src/Dashboards/Server/ServerTrait.php b/src/Dashboards/Server/ServerTrait.php
@@ -21,29 +21,33 @@ private function getDisabledFunctions(): string {
         return $disabled_functions;
     }
 
-    private function panels(): string {
-        $panels = [
+    /**
+     * @return array<int, array<string, mixed>>
+     */
+    private function panels(): array {
+        return [
             [
-                'title'    => 'PHP Info',
-                'moreinfo' => true,
-                'data'     => [
-                    'PHP Version'        => PHP_VERSION,
-                    'PHP Interface'      => PHP_SAPI,
-                    'Disabled functions' => $this->getDisabledFunctions(),
-                    'Xdebug'             => extension_loaded('xdebug') ? 'Enabled - v'.phpversion('xdebug') : 'Disabled',
+                'title' => 'PHP Info',
+                'data'  => [
+                    'PHP Version'         => PHP_VERSION,
+                    'Disabled functions'  => $this->getDisabledFunctions(),
+                    'Loaded php.ini file' => php_ini_loaded_file(),
+                    'Memory limit'        => ini_get('memory_limit'),
+                    'Max execution time'  => ini_get('max_execution_time').'s',
+                    'Xdebug'              => extension_loaded('xdebug') ? 'Enabled - v'.phpversion('xdebug') : 'Disabled',
                 ],
             ],
             [
                 'title' => 'Server Info',
                 'data'  => [
+                    'OS'         => PHP_OS,
                     'Server'     => php_uname(),
                     'Web Server' => $_SERVER['SERVER_SOFTWARE'],
+                    'Server API' => PHP_SAPI,
                     'User Agent' => $_SERVER['HTTP_USER_AGENT'],
                 ],
             ],
         ];
-
-        return $this->template->render('partials/info', ['panels' => $panels]);
     }
 
     private function phpInfo(): string {
diff --git a/src/Helpers.php b/src/Helpers.php
@@ -151,7 +151,7 @@ public static function import(callable $exists, callable $store): void {
                 //
             }
 
-            Http::redirect(['db']);
+            Http::redirect();
         }
     }
 
diff --git a/src/Http.php b/src/Http.php
@@ -23,18 +23,20 @@ public static function stopRedirect(): void {
      */
     public static function queryString(array $preserve = [], array $additional = []): string {
         $keep = ['dashboard', 'server', 'db', 's', 'sortdir', 'sortcol'];
-        $preserve = array_flip(array_merge($keep, $preserve));
+        $preserve = array_fill_keys(array_merge($keep, $preserve), true);
         $query = [];
 
-        if ($url = parse_url($_SERVER['REQUEST_URI'])) {
-            parse_str($url['query'] ?? '', $query);
-
-            $query = array_intersect_key($query, $preserve);
+        if (!empty($_SERVER['REQUEST_URI'])) {
+            $url_parts = parse_url($_SERVER['REQUEST_URI']);
+            if (!empty($url_parts['query'])) {
+                parse_str($url_parts['query'], $query);
+                $query = array_intersect_key($query, $preserve);
+            }
         }
 
         $query += $additional;
 
-        return ($query !== [] ? '?' : '').http_build_query($query);
+        return $query ? '?'.http_build_query($query) : '';
     }
 
     /**
diff --git a/templates/dashboards/redis/redis.twig b/templates/dashboards/redis/redis.twig
@@ -57,7 +57,7 @@
             <div class="md:flex gap-1">
                 {{ include('components/button.twig', {
                     text: 'Reset',
-                    link: link(['tab'], {'resetlog': '1'}),
+                    link: link(['tab'], {'resetlog': 1}),
                     btn_green: true,
                     small: true,
                 }) }}
diff --git a/templates/dashboards/server.twig b/templates/dashboards/server.twig
@@ -1,9 +1,24 @@
-{{ panels|raw }}
+<div class="md:grid md:grid-cols-2 md:gap-4">
+    {% for panel in panels %}
+        {{ include('partials/info_table.twig', {
+            panel_title: panel.title,
+            array: panel.data,
+        }) }}
+    {% endfor %}
+</div>
+
+{{ include('components/button.twig', {
+    text: 'PHP Info',
+    link: link([], {'moreinfo': 1}),
+    small: true,
+    class: 'mb-4',
+}) }}
+
 <div class="mb-4 text-lg font-semibold">Loaded PHP extensions ({{ extensions|length }})</div>
 
 <div>
     {% for extension in extensions %}
-        <a href="{{ ext_link ~ '#module_' ~ extension|replace({' ': '+'})|lower }}">
+        <a href="{{ link([''], {'moreinfo': 1}) ~ '#module_' ~ extension|replace({' ': '+'})|lower }}">
             {{ include('components/badge.twig', {
                 text: extension,
                 txt: 'font-semibold',
diff --git a/templates/layout.twig b/templates/layout.twig
@@ -21,12 +21,6 @@
 <header class="grid md:grid-cols-3 p-4 bg-white dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700">
     <div class="flex">
         <a class="block w-72 md:me-4" href="/">{{ svg('logo', null) }}</a>
-
-        {% if back_url %}
-            <a class="hidden md:inline-flex self-center text-lg text-primary-500 font-semibold items-center hover:text-primary-700 dark:text-primary-400 dark:hover:text-primary-500" href="{{ back_url }}">
-                {{ svg('back', 16, 'mr-1') }} Back
-            </a>
-        {% endif %}
     </div>
 
     <div class="flex items-center justify-center gap-4">
diff --git a/templates/partials/import_form.twig b/templates/partials/import_form.twig
@@ -3,7 +3,10 @@
         <div class="mb-4">
             <label for="import" class="mb-2 block text-sm font-semibold dark:text-gray-300">JSON file</label>
             <input id="import" name="import" type="file" accept="application/json"
-                   class="w-full text-base file:border file:border-transparent file:rounded file:py-1.5 file:px-2 file:mr-3 file:text-base file:font-semibold file:text-white file:bg-slate-500 file:hover:bg-slate-600 dark:file:bg-slate-900 dark:file:hover:bg-slate-800">
+                   class="w-full text-base rounded border border-gray-300 bg-white
+                   focus:outline-none focus:ring focus:ring-primary-200 focus:border-primary-300
+               dark:border-gray-600 dark:bg-gray-800 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-400
+                   file:border file:border-transparent file:rounded-l file:py-1.5 file:px-2 file:mr-3 file:text-base file:font-semibold file:text-white file:bg-slate-500 file:hover:bg-slate-600 dark:file:bg-slate-900 dark:file:hover:bg-slate-800">
         </div>
 
         <div class="text-right">
diff --git a/templates/partials/info.twig b/templates/partials/info.twig
diff --git a/templates/partials/info_table.twig b/templates/partials/info_table.twig
diff --git a/templates/partials/keys_table.twig b/templates/partials/keys_table.twig
diff --git a/templates/partials/panel.twig b/templates/partials/panel.twig

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/*`
`30`		`-! tailwindcss v3.4.15 \| MIT License \| https://tailwindcss.com`
	`30`	`+! tailwindcss v3.4.17 \| MIT License \| https://tailwindcss.com`
`31`	`31`	`*/`
`32`	`32`
`33`	`33`	`/*`
`@@ -721,10 +721,6 @@ video {`
`721`	`721`	`margin-left: calc(-1px * calc(1 - var(--tw-space-x-reverse)));`
`722`	`722`	`}`
`723`	`723`
`724`		`-.self-center {`
`725`		`- align-self: center;`
`726`		`-}`
`727`		`-`
`728`	`724`	`.overflow-hidden {`
`729`	`725`	`overflow: hidden;`
`730`	`726`	`}`
`@@ -1226,8 +1222,9 @@ video {`
`1226`	`1222`	`margin-right: 0.75rem;`
`1227`	`1223`	`}`
`1228`	`1224`
`1229`		`-.file\:rounded::file-selector-button {`
`1230`		`- border-radius: 0.25rem;`
	`1225`	`+.file\:rounded-l::file-selector-button {`
	`1226`	`+ border-top-left-radius: 0.25rem;`
	`1227`	`+ border-bottom-left-radius: 0.25rem;`
`1231`	`1228`	`}`
`1232`	`1229`
`1233`	`1230`	`.file\:border::file-selector-button {`
`@@ -1601,10 +1598,6 @@ video {`
`1601`	`1598`	`display: flex;`
`1602`	`1599`	`}`
`1603`	`1600`
`1604`		`- .md\:inline-flex {`
`1605`		`- display: inline-flex;`
`1606`		`- }`
`1607`		`-`
`1608`	`1601`	`.md\:table-cell {`
`1609`	`1602`	`display: table-cell;`
`1610`	`1603`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ private function panels(): string {`
`58`	`58`	`],`
`59`	`59`	`];`
`60`	`60`
`61`		`- return $this->template->render('partials/info', ['panels' => $panels, 'left' => true]);`
	`61`	`+ return $this->template->render('partials/info', ['panels' => $panels]);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`private function moreInfo(): string {`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,9 @@ private function panels(): string {`
`33`	`33`
`34`	`34`	`$panels = [`
`35`	`35`	`[`
`36`		`- 'title' => $title ?? null,`
`37`		`- 'moreinfo' => true,`
`38`		`- 'server_id' => $this->current_server,`
`39`		`- 'data' => [`
	`36`	`+ 'title' => $title ?? null,`
	`37`	`+ 'moreinfo' => true,`
	`38`	`+ 'data' => [`
`40`	`39`	`'Version' => $info['version'],`
`41`	`40`	`'Open connections' => $info['curr_connections'],`
`42`	`41`	`'Uptime' => Format::seconds((int) $info['uptime']),`
`@@ -71,7 +70,7 @@ private function panels(): string {`
`71`	`70`	`$panels = ['error' => $e->getMessage()];`
`72`	`71`	`}`
`73`	`72`
`74`		`- return $this->template->render('partials/info', ['panels' => $panels, 'left' => true]);`
	`73`	`+ return $this->template->render('partials/info', ['panels' => $panels]);`
`75`	`74`	`}`
`76`	`75`
`77`	`76`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ private function panels(): string {`
`95`	`95`	`],`
`96`	`96`	`];`
`97`	`97`
`98`		`- return $this->template->render('partials/info', ['panels' => $panels, 'left' => true]);`
	`98`	`+ return $this->template->render('partials/info', ['panels' => $panels]);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`private function moreInfo(): string {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ private function panels(): string {`
`35`	`35`	`],`
`36`	`36`	`];`
`37`	`37`
`38`		`- return $this->template->render('partials/info', ['panels' => $panels, 'left' => true]);`
	`38`	`+ return $this->template->render('partials/info', ['panels' => $panels]);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/**`