Update website

admin/phpMyAdmin/setup/config.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Front controller for config view / download and clear
+ */
+
+declare(strict_types=1);
+
+use PhpMyAdmin\Config\Forms\Setup\ConfigForm;
+use PhpMyAdmin\Core;
+use PhpMyAdmin\Response;
+use PhpMyAdmin\Setup\ConfigGenerator;
+use PhpMyAdmin\Url;
+
+if (! defined('ROOT_PATH')) {
+    // phpcs:disable PSR1.Files.SideEffects
+    define('ROOT_PATH', dirname(__DIR__) . DIRECTORY_SEPARATOR);
+    // phpcs:enable
+}
+
+/**
+ * Core libraries.
+ */
+require ROOT_PATH . 'setup/lib/common.inc.php';
+
+$form_display = new ConfigForm($GLOBALS['ConfigFile']);
+$form_display->save('Config');
+
+$response = Response::getInstance();
+$response->disable();
+
+if (isset($_POST['eol'])) {
+    $_SESSION['eol'] = $_POST['eol'] === 'unix' ? 'unix' : 'win';
+}
+
+if (Core::ifSetOr($_POST['submit_clear'], '')) {
+    // Clear current config and return to main page
+    $GLOBALS['ConfigFile']->resetConfigData();
+    // drop post data
+    $response->generateHeader303('index.php' . Url::getCommonRaw());
+    exit;
+}
+
+if (Core::ifSetOr($_POST['submit_download'], '')) {
+    // Output generated config file
+    Core::downloadHeader('config.inc.php', 'text/plain');
+    $response->disable();
+    echo ConfigGenerator::getConfigFile($GLOBALS['ConfigFile']);
+    exit;
+}
+
+// Show generated config file in a <textarea>
+$response->generateHeader303('index.php' . Url::getCommonRaw(['page' => 'config']));
+exit;

admin/phpMyAdmin/setup/index.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * Front controller for setup script
+ */
+
+declare(strict_types=1);
+
+use PhpMyAdmin\Controllers\Setup\ConfigController;
+use PhpMyAdmin\Controllers\Setup\FormController;
+use PhpMyAdmin\Controllers\Setup\HomeController;
+use PhpMyAdmin\Controllers\Setup\ServersController;
+use PhpMyAdmin\Core;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Url;
+
+if (! defined('ROOT_PATH')) {
+    // phpcs:disable PSR1.Files.SideEffects
+    define('ROOT_PATH', dirname(__DIR__) . DIRECTORY_SEPARATOR);
+    // phpcs:enable
+}
+
+global $cfg;
+
+require ROOT_PATH . 'setup/lib/common.inc.php';
+
+if (@file_exists(CONFIG_FILE) && ! $cfg['DBG']['demo']) {
+    Core::fatalError(__('Configuration already exists, setup is disabled!'));
+}
+
+$page = Core::isValid($_GET['page'], 'scalar') ? (string) $_GET['page'] : '';
+$page = preg_replace('/[^a-z]/', '', $page);
+if ($page === '') {
+    $page = 'index';
+}
+
+Core::noCacheHeader();
+
+if ($page === 'form') {
+    $controller = new FormController($GLOBALS['ConfigFile'], new Template());
+    echo $controller->index([
+        'formset' => $_GET['formset'] ?? null,
+    ]);
+
+    return;
+}
+
+if ($page === 'config') {
+    $controller = new ConfigController($GLOBALS['ConfigFile'], new Template());
+    echo $controller->index([
+        'formset' => $_GET['formset'] ?? null,
+        'eol' => $_GET['eol'] ?? null,
+    ]);
+
+    return;
+}
+
+if ($page === 'servers') {
+    $controller = new ServersController($GLOBALS['ConfigFile'], new Template());
+    if (isset($_GET['mode']) && $_GET['mode'] === 'remove' && $_SERVER['REQUEST_METHOD'] === 'POST') {
+        $controller->destroy([
+            'id' => $_GET['id'] ?? null,
+        ]);
+        header('Location: index.php' . Url::getCommonRaw());
+
+        return;
+    }
+
+    echo $controller->index([
+        'formset' => $_GET['formset'] ?? null,
+        'mode' => $_GET['mode'] ?? null,
+        'id' => $_GET['id'] ?? null,
+    ]);
+
+    return;
+}
+
+$controller = new HomeController($GLOBALS['ConfigFile'], new Template());
+echo $controller->index([
+    'formset' => $_GET['formset'] ?? null,
+    'action_done' => $_GET['action_done'] ?? null,
+    'version_check' => $_GET['version_check'] ?? null,
+]);

admin/phpMyAdmin/setup/lib/common.inc.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Loads libraries/common.inc.php and preforms some additional actions
+ */
+
+declare(strict_types=1);
+
+use PhpMyAdmin\Config\ConfigFile;
+use PhpMyAdmin\DatabaseInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+define('PMA_MINIMUM_COMMON', true);
+// phpcs:enable
+
+chdir('..');
+
+if (! file_exists(ROOT_PATH . 'libraries/common.inc.php')) {
+    die('Bad invocation!');
+}
+
+require_once ROOT_PATH . 'libraries/common.inc.php';
+
+// use default error handler
+restore_error_handler();
+
+// Save current language in a cookie, required since we use PMA_MINIMUM_COMMON
+$GLOBALS['PMA_Config']->setCookie('pma_lang', (string) $GLOBALS['lang']);
+$GLOBALS['PMA_Config']->set('is_setup', true);
+
+$GLOBALS['ConfigFile'] = new ConfigFile();
+$GLOBALS['ConfigFile']->setPersistKeys(
+    [
+        'DefaultLang',
+        'ServerDefault',
+        'UploadDir',
+        'SaveDir',
+        'Servers/1/verbose',
+        'Servers/1/host',
+        'Servers/1/port',
+        'Servers/1/socket',
+        'Servers/1/auth_type',
+        'Servers/1/user',
+        'Servers/1/password',
+    ]
+);
+
+$GLOBALS['dbi'] = DatabaseInterface::load();
+
+// allows for redirection even after sending some data
+ob_start();

admin/phpMyAdmin/setup/styles.css

@@ -0,0 +1,618 @@
+/* global styles */
+
+body {
+  margin-right: auto;
+  min-width: 960px;
+  padding-bottom: 1em;
+  color: #444;
+  font: 0.8em sans-serif;
+  background: url(../themes/pmahomme/img/left_nav_bg.png) repeat-y 80px 0 #f3f3f3;
+}
+
+input,
+button,
+select,
+textarea,
+th,
+td {
+  font: 1em sans-serif;
+}
+
+img {
+  border: 0;
+}
+
+a,
+a:link,
+a:visited,
+a:active {
+  text-decoration: none;
+  color: #235a81;
+  cursor: pointer;
+  outline: none;
+}
+
+a:hover {
+  text-decoration: underline;
+  color: #235a81;
+}
+
+h1 {
+  font-size: 1.5em;
+}
+
+/* language selection box */
+
+#select_lang {
+  position: absolute;
+  right: 1em;
+  top: 1em;
+}
+
+/* menu */
+
+#menu {
+  float: left;
+  width: 220px;
+  font-size: 1.1em;
+}
+
+#menu ul {
+  margin: 1em 1em 1em 0.5em;
+  padding: 0;
+  list-style: none;
+}
+
+#menu li a {
+  padding: 0.5em 0.6em;
+  margin-right: 0.6em;
+  display: block;
+  color: #333;
+  text-decoration: none;
+  zoom: 1; /* IE fix */
+}
+
+#menu li a:hover,
+#menu li a:active,
+#menu li a.active {
+  background-color: #e4e4e4;
+}
+
+/* page contents and footer layout */
+
+#page {
+  margin-left: 220px;
+  margin-right: 25px;
+}
+
+#footer {
+  margin-top: 1em;
+}
+
+#footer a {
+  margin-right: 0.5em;
+  text-decoration: none;
+  font-size: small;
+}
+
+/* phpMyAdmin logo colors */
+
+.blue {
+  color: #669;
+}
+
+.orange {
+  color: #f90;
+}
+
+.red {
+  color: #c00;
+}
+
+/* main page messages */
+
+/* message boxes: error, confirmation */
+.success h4,
+.notice h4,
+div.error h4 {
+  border-bottom: 1px solid;
+  font-weight: bold;
+  margin: 0 0 0.2em 0;
+}
+
+div.success,
+div.notice,
+div.error {
+  margin: 0.5em 0 1.3em 0;
+  border: 1px solid;
+  background: no-repeat 10px 10px;
+  padding: 10px 10px 10px 25px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+  -moz-box-shadow: 0 1px 1px #fff inset;
+  -webkit-box-shadow: 0 1px 1px #fff inset;
+  box-shadow: 0 1px 1px #fff inset;
+}
+
+.success a,
+.notice a,
+.error a {
+  text-decoration: underline;
+}
+
+.success {
+  color: #000;
+  background-color: #ebf8a4;
+}
+
+h1.success,
+div.success {
+  border-color: #a2d246;
+  background: url(../themes/pmahomme/img/s_success.png) no-repeat 5px 10px;
+}
+
+.success h4 {
+  border-color: #0f0;
+}
+
+.notice {
+  color: #000;
+  background-color: #e8eef1;
+}
+
+h1.notice,
+div.notice {
+  border-color: #3a6c7e;
+  background: url(../themes/pmahomme/img/s_notice.png) no-repeat 5px 10px;
+}
+
+.notice h4 {
+  border-color: #ffb10a;
+}
+
+.error {
+  border: 1px solid maroon !important;
+  color: #000;
+  background: pink;
+}
+
+h1.error,
+div.error {
+  border-color: #333;
+  background: url(../themes/pmahomme/img/s_error.png) no-repeat 5px 10px;
+}
+
+div.error h4 {
+  border-color: #f00;
+}
+
+div.notice[id^=version_check] {
+  border-color: #002dff;
+  background-color: #eef;
+}
+
+div.notice[id^=version_check] h4 {
+  border-color: #002dff;
+}
+
+
+/* form tabs */
+
+ul.tabs {
+  margin: 1.1em 2px 0;
+  padding: 0 0 3px 0;
+  list-style: none;
+  font-weight: bold;
+}
+
+ul.tabs li {
+  float: left;
+  margin-bottom: -1px;
+}
+
+ul.tabs li a {
+  display: block;
+  margin: 1px 0.2em 0;
+  white-space: nowrap;
+  text-decoration: none;
+  border: 1px solid #d5d5d5;
+  border-bottom: 1px solid #aaa;
+}
+
+ul.tabs li a {
+  padding: 7px 10px;
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+  background: #f2f2f2;
+  color: #555;
+  text-shadow: 0 1px 0 #fff;
+}
+
+ul.tabs li a:hover,
+ul.tabs li a:active {
+  background: #e5e5e5;
+}
+
+ul.tabs li.active a {
+  background-color: #fff;
+  margin-top: 1px;
+  color: #000;
+  text-shadow: none;
+  border-color: #aaa;
+  border-bottom: 1px solid #fff;
+}
+
+.tabs_contents {
+  margin-top: 13px;
+}
+
+.tabs_contents fieldset {
+  margin-top: 0;
+}
+
+.tabs_contents legend {
+  display: none;
+}
+
+/* "restore default value" and "set value: foo" buttons */
+
+.restore-default img,
+.set-value img {
+  margin-bottom: -3px;
+}
+
+.userprefs-comment {
+  cursor: help;
+  float: right;
+}
+
+/* forms */
+
+fieldset {
+  margin-top: 1em;
+  border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  -webkit-border-radius: 4px 4px 0 0;
+  border: #aaa solid 1px;
+  padding: 1.5em;
+  background: #eee;
+  text-shadow: 0 1px 0 #fff;
+  -moz-box-shadow: 1px 1px 2px #fff inset;
+  -webkit-box-shadow: 1px 1px 2px #fff inset;
+  box-shadow: 1px 1px 2px #fff inset;
+}
+
+fieldset.optbox {
+  padding: 0;
+}
+
+.setup-page fieldset.optbox {
+  width: 100%;
+}
+
+fieldset fieldset {
+  margin: 0.8em;
+  border: 1px solid #aaa;
+  background: #e8e8e8;
+}
+
+fieldset legend {
+  font-weight: bold;
+  color: #444;
+  padding: 5px 10px;
+  border-radius: 2px;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  border: 1px solid #aaa;
+  background-color: #fff;
+  -moz-box-shadow: 3px 3px 15px #bbb;
+  -webkit-box-shadow: 3px 3px 15px #bbb;
+  box-shadow: 3px 3px 15px #bbb;
+}
+
+.form {
+  border: 2px #dee1ff solid;
+}
+
+fieldset p {
+  margin: 0;
+  padding: 0.5em;
+  background: #fff;
+  border-top: 0;
+}
+
+fieldset .errors { /* form error list */
+  margin: 0 -2px 1em -2px;
+  padding: 0.5em 1.5em;
+  background: #fbead9;
+  border: 1px #c83838 solid;
+  border-width: 1px 0;
+  list-style: none;
+  font-family: sans-serif;
+  font-size: small;
+}
+
+fieldset .inline_errors { /* field error list */
+  margin: 0.3em 0.3em 0.3em 0;
+  padding: 0;
+  list-style: none;
+  color: #9a0000;
+  font-size: small;
+}
+
+table caption,
+table th,
+table td {
+  text-shadow: 0 1px 0 #fff;
+}
+
+fieldset th {
+  width: 40%;
+  min-width: 350px;
+  padding: 0.3em 0.3em 0.3em 0.5em;
+  text-align: left;
+  font-weight: bold;
+  vertical-align: top;
+}
+
+fieldset.simple th {
+  width: auto;
+  min-width: 0;
+}
+
+fieldset .doc {
+  margin-left: 1em;
+}
+
+fieldset td {
+  padding-top: 0.3em;
+  vertical-align: top;
+}
+
+fieldset td.userprefs-allow {
+  padding: 0;
+  vertical-align: middle;
+  text-align: center;
+  width: 3em;
+}
+
+fieldset td.userprefs-allow:hover {
+  cursor: pointer;
+  background-color: #eee;
+}
+
+fieldset th small {
+  display: block;
+  font-weight: normal;
+  font-family: sans-serif;
+  font-size: x-small;
+  color: #666;
+}
+
+fieldset th,
+fieldset td,
+.form .lastrow {
+  border-top: 1px solid #d5d5d5;
+}
+
+fieldset .group-header th {
+  background: #eaedff;
+  border: none;
+}
+
+fieldset .group-field-1 th,
+fieldset .group-header-2 th {
+  padding-left: 1em;
+}
+
+fieldset .group-field-2 th,
+fieldset .group-header-3 th {
+  padding-left: 2em;
+}
+
+fieldset .group-field-3 th {
+  padding-left: 3em;
+}
+
+fieldset .lastrow,
+.form .lastrow {
+  border-top: 1px #000 solid;
+  background: #d3dce3;
+  padding: 0.5em;
+  text-align: center;
+}
+
+input[type=text],
+input[type=password],
+input[type=number] {
+  border-radius: 2px;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  box-shadow: 0 1px 2px #ddd;
+  -moz-box-shadow: 0 1px 2px #ddd;
+  -webkit-box-shadow: 0 1px 2px #ddd;
+  background: white;
+  border: 1px solid #aaa;
+  color: #555;
+  padding: 4px;
+  margin: 6px;
+}
+
+input[type=submit],
+button[type=submit]:not(.mult_submit) {
+  font-weight: bold !important;
+}
+
+input[type=submit],
+button[type=submit]:not(.mult_submit),
+input[type=reset],
+input[name=submit_reset],
+input.button {
+  margin-left: 14px;
+  border: 1px solid #aaa;
+  padding: 3px 7px;
+  color: #111;
+  text-decoration: none;
+  background: #ddd;
+  border-radius: 12px;
+  -webkit-border-radius: 12px;
+  -moz-border-radius: 12px;
+  text-shadow: 0 1px 0 #fff;
+  background-image: url(../themes/svg_gradient.php?from=ffffff&to=cccccc);
+  background-size: 100% 100%;
+  background: -webkit-gradient(top, #fff, #ccc);
+  background: -webkit-linear-gradient(top, #fff, #ccc);
+  background: -moz-linear-gradient(top, #fff, #ccc);
+  background: -ms-linear-gradient(top, #fff, #ccc);
+  background: -o-linear-gradient(top, #fff, #ccc);
+}
+
+input[type=submit]:hover,
+button[type=submit]:not(.mult_submit):hover,
+input[type=reset]:hover,
+input[name=submit_reset]:hover,
+input.button:hover {
+  position: relative;
+  background-image: url(../themes/svg_gradient.php?from=cccccc&to=dddddd);
+  background-size: 100% 100%;
+  background: -webkit-gradient(top, #ccc, #ddd);
+  background: -webkit-linear-gradient(top, #ccc, #ddd);
+  background: -moz-linear-gradient(top, #ccc, #ddd);
+  background: -ms-linear-gradient(top, #ccc, #ddd);
+  background: -o-linear-gradient(top, #ccc, #ddd);
+  cursor: pointer;
+}
+
+input[type=submit]:active,
+button[type=submit]:not(.mult_submit):active,
+input[type=reset]:active,
+input[name=submit_reset]:active,
+input.button:active {
+  position: relative;
+  top: 1px;
+  left: 1px;
+}
+
+input[type="checkbox"],
+input[type="radio"] {
+  vertical-align: -11%;
+}
+
+select {
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  border-radius: 2px;
+  -moz-box-shadow: 0 1px 2px #ddd;
+  -webkit-box-shadow: 0 1px 2px #ddd;
+  box-shadow: 0 1px 2px #ddd;
+  border: 1px solid #aaa;
+  color: #333;
+  padding: 3px;
+  background: white;
+  margin: 6px;
+}
+
+fieldset.simple th,
+fieldset.simple td {
+  border-top: none;
+  border-bottom: 1px #555 dotted;
+}
+
+fieldset.simple .lastrow {
+  border: 0;
+}
+
+/* form elements */
+
+span.checkbox {
+  padding: 2px;
+  display: inline-block;
+}
+
+.custom { /* customized field */
+  background: #ffc;
+}
+
+.checkbox.custom {
+  padding: 1px;
+  border: 1px #edec90 solid;
+}
+
+.field-error {
+  border-color: #c11 !important;
+}
+
+.field-comment {
+  position: relative;
+}
+
+.field-comment-mark {
+  cursor: help;
+  padding: 0 0.2em;
+  font-weight: bold;
+  font-style: italic;
+}
+
+.field-comment-warning {
+  color: #a00;
+}
+
+.green { /* default form button */
+  color: #080 !important;
+}
+
+table.datatable {
+  margin: 0.5em 0 1em;
+}
+
+table.datatable th {
+  padding: 0 1em 0 0.5em;
+  border-bottom: 1px #999 solid;
+  text-align: left;
+}
+
+table.datatable td {
+  padding: 1px 0.5em;
+  border-bottom: 1px #dee1ff solid;
+}
+
+/* textarea with config file's contents */
+
+#textconfig {
+  width: 100%;
+  border: 0;
+}
+
+/* error list */
+
+dd {
+  margin-left: 0.5em;
+}
+
+dd::before {
+  content: "\25B8  ";
+}
+
+/* links on failed validation page, when saving a form */
+
+a.btn {
+  padding: 1px 5px;
+  text-decoration: none;
+  background: #e2e8ff;
+  border: 1px #a6c8ff solid;
+  border-top-color: #afd0ff;
+  border-left-color: #afd0ff;
+  font-weight: bold;
+}
+
+a.btn:hover,
+a.btn:active {
+  background: #e6f5ff;
+  color: #004c96;
+}
+
+.hide {
+  display: none;
+}

admin/phpMyAdmin/setup/validate.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Validation callback.
+ */
+
+declare(strict_types=1);
+
+use PhpMyAdmin\Config\Validator;
+use PhpMyAdmin\Core;
+
+if (! defined('ROOT_PATH')) {
+    // phpcs:disable PSR1.Files.SideEffects
+    define('ROOT_PATH', dirname(__DIR__) . DIRECTORY_SEPARATOR);
+    // phpcs:enable
+}
+
+/**
+ * Core libraries.
+ */
+require ROOT_PATH . 'setup/lib/common.inc.php';
+
+$validators = [];
+
+Core::headerJSON();
+
+$ids = Core::isValid($_POST['id'], 'scalar') ? $_POST['id'] : null;
+$vids = explode(',', $ids);
+$vals = Core::isValid($_POST['values'], 'scalar') ? $_POST['values'] : null;
+$values = json_decode($vals);
+if (! ($values instanceof stdClass)) {
+    Core::fatalError(__('Wrong data'));
+}
+$values = (array) $values;
+$result = Validator::validate($GLOBALS['ConfigFile'], $vids, $values, true);
+if ($result === false) {
+    $result = sprintf(
+        __('Wrong data or no validation for %s'),
+        implode(',', $vids)
+    );
+}
+echo $result !== true ? json_encode($result) : '';