Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches
This commit is contained in:
ninadsp
@@ -1,21 +1,23 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Front controller for config view / download and clear
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
|
||||
/**
|
||||
* Core libraries.
|
||||
*/
|
||||
require './lib/common.inc.php';
|
||||
require_once './setup/lib/Form.class.php';
|
||||
require_once './setup/lib/FormDisplay.class.php';
|
||||
require_once './libraries/config/Form.class.php';
|
||||
require_once './libraries/config/FormDisplay.class.php';
|
||||
require_once './setup/lib/ConfigGenerator.class.php';
|
||||
|
||||
require './libraries/config/setup.forms.php';
|
||||
|
||||
$form_display = new FormDisplay();
|
||||
$form_display->registerForm('_config.php');
|
||||
$form_display->registerForm('_config.php', $forms['_config.php']);
|
||||
$form_display->save('_config.php');
|
||||
$config_file_path = ConfigFile::getInstance()->getFilePath();
|
||||
|
||||
@@ -27,7 +29,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
|
||||
//
|
||||
// Clear current config and return to main page
|
||||
//
|
||||
$_SESSION['ConfigFile'] = array();
|
||||
ConfigFile::getInstance()->resetConfigData();
|
||||
// drop post data
|
||||
header('HTTP/1.1 303 See Other');
|
||||
header('Location: index.php');
|
||||
@@ -38,13 +40,13 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
|
||||
//
|
||||
header('Content-Type: text/plain');
|
||||
header('Content-Disposition: attachment; filename="config.inc.php"');
|
||||
echo ConfigFile::getInstance()->getConfigFile();
|
||||
echo ConfigGenerator::getConfigFile();
|
||||
exit;
|
||||
} elseif (PMA_ifSetOr($_POST['submit_save'], '')) {
|
||||
//
|
||||
// Save generated config file on the server
|
||||
//
|
||||
file_put_contents($config_file_path, ConfigFile::getInstance()->getConfigFile());
|
||||
file_put_contents($config_file_path, ConfigGenerator::getConfigFile());
|
||||
header('HTTP/1.1 303 See Other');
|
||||
header('Location: index.php');
|
||||
exit;
|
||||
@@ -54,7 +56,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
|
||||
//
|
||||
$cfg = array();
|
||||
require_once $config_file_path;
|
||||
$_SESSION['ConfigFile'] = $cfg;
|
||||
ConfigFile::getInstance()->setConfigData($cfg);
|
||||
header('HTTP/1.1 303 See Other');
|
||||
header('Location: index.php');
|
||||
exit;
|
||||
|
||||
3
setup/frames/.htaccess
Normal file
3
setup/frames/.htaccess
Normal file
@@ -0,0 +1,3 @@
|
||||
# This folder does not require access over HTTP
|
||||
# (the following directive denies access by default)
|
||||
Order allow,deny
|
||||
@@ -1,10 +1,9 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Config file view and save screen
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
|
||||
if (!defined('PHPMYADMIN')) {
|
||||
@@ -14,8 +13,9 @@ if (!defined('PHPMYADMIN')) {
|
||||
/**
|
||||
* Core libraries.
|
||||
*/
|
||||
require_once './setup/lib/FormDisplay.class.php';
|
||||
require_once './libraries/config/FormDisplay.class.php';
|
||||
require_once './setup/lib/index.lib.php';
|
||||
require_once './setup/lib/ConfigGenerator.class.php';
|
||||
|
||||
$config_readable = false;
|
||||
$config_writable = false;
|
||||
@@ -29,7 +29,7 @@ check_config_rw($config_readable, $config_writable, $config_exists);
|
||||
<tr>
|
||||
<td>
|
||||
<textarea cols="50" rows="20" name="textconfig" id="textconfig" spellcheck="false"><?php
|
||||
echo htmlspecialchars(ConfigFile::getInstance()->getConfigFile())
|
||||
echo htmlspecialchars(ConfigGenerator::getConfigFile())
|
||||
?></textarea>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Form edit view
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
|
||||
if (!defined('PHPMYADMIN')) {
|
||||
@@ -14,36 +13,24 @@ if (!defined('PHPMYADMIN')) {
|
||||
/**
|
||||
* Core libraries.
|
||||
*/
|
||||
require_once './setup/lib/Form.class.php';
|
||||
require_once './setup/lib/FormDisplay.class.php';
|
||||
require_once './libraries/config/Form.class.php';
|
||||
require_once './libraries/config/FormDisplay.class.php';
|
||||
require_once './setup/lib/form_processing.lib.php';
|
||||
|
||||
$formsets = array(
|
||||
'features' => array(
|
||||
'forms' => array('Import_export', 'Security', 'Sql_queries', 'Other_core_settings')),
|
||||
'left_frame' => array(
|
||||
'forms' => array('Left_frame', 'Left_servers', 'Left_databases', 'Left_tables')),
|
||||
'main_frame' => array(
|
||||
'forms' => array('Startup', 'Browse', 'Edit', 'Tabs', 'Sql_box')),
|
||||
'import' => array(
|
||||
'forms' => array('Import_defaults')),
|
||||
'export' => array(
|
||||
'forms' => array('Export_defaults'))
|
||||
);
|
||||
require './libraries/config/setup.forms.php';
|
||||
|
||||
$formset_id = filter_input(INPUT_GET, 'formset');
|
||||
$mode = filter_input(INPUT_GET, 'mode');
|
||||
if (!isset($formsets[$formset_id])) {
|
||||
if (!isset($forms[$formset_id])) {
|
||||
die('Incorrect formset, check $formsets array in setup/frames/form.inc.php');
|
||||
}
|
||||
|
||||
$formset = $formsets[$formset_id];
|
||||
if (isset($GLOBALS['strSetupFormset_' . $formset_id])) {
|
||||
echo '<h2>' . $GLOBALS['strSetupFormset_' . $formset_id] . '</h2>';
|
||||
if (isset($GLOBALS['strConfigFormset_' . $formset_id])) {
|
||||
echo '<h2>' . $GLOBALS['strConfigFormset_' . $formset_id] . '</h2>';
|
||||
}
|
||||
$form_display = new FormDisplay();
|
||||
foreach ($formset['forms'] as $form_name) {
|
||||
$form_display->registerForm($form_name);
|
||||
foreach ($forms[$formset_id] as $form_name => $form) {
|
||||
$form_display->registerForm($form_name, $form);
|
||||
}
|
||||
process_formset($form_display);
|
||||
?>
|
||||
?>
|
||||
@@ -2,9 +2,7 @@
|
||||
/**
|
||||
* Overview (main page)
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
|
||||
if (!defined('PHPMYADMIN')) {
|
||||
@@ -15,7 +13,7 @@ if (!defined('PHPMYADMIN')) {
|
||||
* Core libraries.
|
||||
*/
|
||||
require_once './libraries/display_select_lang.lib.php';
|
||||
require_once './setup/lib/FormDisplay.class.php';
|
||||
require_once './libraries/config/FormDisplay.class.php';
|
||||
require_once './setup/lib/index.lib.php';
|
||||
|
||||
// prepare unfiltered language list
|
||||
@@ -48,7 +46,8 @@ $config_writable = false;
|
||||
$config_exists = false;
|
||||
check_config_rw($config_readable, $config_writable, $config_exists);
|
||||
if (!$config_writable || !$config_readable) {
|
||||
messages_set('error', 'config_rw', 'CannotLoadConfig', PMA_lang('CannotLoadConfigMsg'));
|
||||
messages_set('error', 'config_rw', __('Cannot load or save configuration'),
|
||||
PMA_lang(__('Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.')));
|
||||
}
|
||||
//
|
||||
// Check https connection
|
||||
@@ -56,11 +55,13 @@ if (!$config_writable || !$config_readable) {
|
||||
$is_https = !empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on';
|
||||
if (!$is_https) {
|
||||
$text = __('You are not using a secure connection; all data (including potentially sensitive information, like passwords) is transferred unencrypted!');
|
||||
|
||||
if (!empty($_SERVER['REQUEST_URI']) && !empty($_SERVER['HTTP_HOST'])) {
|
||||
$text .= ' ' . PMA_lang('InsecureConnectionMsg2',
|
||||
$strInsecureConnectionMsg2 = __('If your server is also configured to accept HTTPS requests follow [a@%s]this link[/a] to use a secure connection.');
|
||||
$text .= ' ' . PMA_lang($strInsecureConnectionMsg2,
|
||||
'https://' . htmlspecialchars($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']));
|
||||
}
|
||||
messages_set('warning', 'no_https', 'InsecureConnection', $text);
|
||||
messages_set('warning', 'no_https', __('Insecure connection'), $text);
|
||||
}
|
||||
?>
|
||||
|
||||
@@ -110,10 +111,10 @@ display_form_top('index.php', 'get', array(
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th><?php echo __('Name') ?></th>
|
||||
<th>Authentication type</th>
|
||||
<th><?php echo __('Authentication type') ?></th>
|
||||
<th colspan="2">DSN</th>
|
||||
</tr>
|
||||
<?php foreach ($_SESSION['ConfigFile']['Servers'] as $id => $server): ?>
|
||||
<?php foreach ($cf->getServers() as $id => $server): ?>
|
||||
<tr>
|
||||
<td><?php echo $id ?></td>
|
||||
<td><?php echo $cf->getServerName($id) ?></td>
|
||||
@@ -186,7 +187,7 @@ if ($cf->getServerCount() > 0) {
|
||||
}
|
||||
$opts['values_disabled'][] = '-';
|
||||
|
||||
foreach ($_SESSION['ConfigFile']['Servers'] as $id => $server) {
|
||||
foreach ($cf->getServers() as $id => $server) {
|
||||
$opts['values'][(string)$id] = $cf->getServerName($id) . " [$id]";
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -2,9 +2,7 @@
|
||||
/**
|
||||
* Menu items
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
|
||||
if (!defined('PHPMYADMIN')) {
|
||||
@@ -15,9 +13,10 @@ $separator = PMA_get_arg_separator('html');
|
||||
?>
|
||||
<ul>
|
||||
<li><a href="index.php"><?php echo __('Overview') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=features"><?php echo __('Features') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=left_frame"><?php echo __('Navigation frame') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=main_frame"><?php echo __('Main frame') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=import"><?php echo __('Import') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=export"><?php echo __('Export') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Features"><?php echo __('Features') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Sql_queries"><?php echo __('SQL queries') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Left_frame"><?php echo __('Navigation frame') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Main_frame"><?php echo __('Main frame') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Import"><?php echo __('Import') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Export"><?php echo __('Export') ?></a></li>
|
||||
</ul>
|
||||
|
||||
@@ -2,9 +2,7 @@
|
||||
/**
|
||||
* Server create and edit view
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
|
||||
if (!defined('PHPMYADMIN')) {
|
||||
@@ -14,10 +12,12 @@ if (!defined('PHPMYADMIN')) {
|
||||
/**
|
||||
* Core libraries.
|
||||
*/
|
||||
require_once './setup/lib/Form.class.php';
|
||||
require_once './setup/lib/FormDisplay.class.php';
|
||||
require_once './libraries/config/Form.class.php';
|
||||
require_once './libraries/config/FormDisplay.class.php';
|
||||
require_once './setup/lib/form_processing.lib.php';
|
||||
|
||||
require './libraries/config/setup.forms.php';
|
||||
|
||||
$mode = filter_input(INPUT_GET, 'mode');
|
||||
$id = filter_input(INPUT_GET, 'id', FILTER_VALIDATE_INT);
|
||||
|
||||
@@ -41,10 +41,8 @@ if (isset($page_title)) {
|
||||
echo '<h2>' . $page_title . '</h2>';
|
||||
}
|
||||
$form_display = new FormDisplay();
|
||||
$form_display->registerForm('Server', $id);
|
||||
$form_display->registerForm('Server_login_options', $id);
|
||||
$form_display->registerForm('Server_config', $id);
|
||||
$form_display->registerForm('Server_pmadb', $id);
|
||||
$form_display->registerForm('Server_tracking', $id);
|
||||
foreach ($forms['Servers'] as $form_name => $form) {
|
||||
$form_display->registerForm($form_name, $form, $id);
|
||||
}
|
||||
process_formset($form_display);
|
||||
?>
|
||||
?>
|
||||
@@ -5,7 +5,6 @@
|
||||
* @package phpMyAdmin-setup
|
||||
* @copyright Copyright (c) 2008, Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
/**
|
||||
@@ -37,6 +36,7 @@ require './libraries/header_http.inc.php';
|
||||
<script type="text/javascript" src="../js/jquery/jquery-1.4.2.js"></script>
|
||||
<script type="text/javascript" src="../js/jquery/jquery-ui-1.8.custom.js"></script>
|
||||
<script type="text/javascript" src="../js/jquery/jquery.json-2.2.js"></script>
|
||||
<script type="text/javascript" src="../js/config.js"></script>
|
||||
<script type="text/javascript" src="scripts.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@@ -1,322 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Config file management and generation
|
||||
*
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
|
||||
/**
|
||||
* Config file management and generation class
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
class ConfigFile
|
||||
{
|
||||
/**
|
||||
* Stores default PMA config from config.default.php
|
||||
* @var array
|
||||
*/
|
||||
private $cfg;
|
||||
|
||||
/**
|
||||
* Stores allowed values for non-standard fields
|
||||
* @var array
|
||||
*/
|
||||
private $cfgDb;
|
||||
|
||||
/**
|
||||
* Keys which will be always written to config file
|
||||
* @var array
|
||||
*/
|
||||
private $persistKeys;
|
||||
|
||||
/**
|
||||
* ConfigFile instance
|
||||
* @var ConfigFile
|
||||
*/
|
||||
private static $_instance;
|
||||
|
||||
/**
|
||||
* Private constructor, use {@link getInstance()}
|
||||
*/
|
||||
private function __construct()
|
||||
{
|
||||
// load default config values
|
||||
$cfg = &$this->cfg;
|
||||
require './libraries/config.default.php';
|
||||
|
||||
// load additionsl config information
|
||||
$cfg_db = &$this->cfgDb;
|
||||
$persist_keys = array();
|
||||
require './setup/lib/config_info.inc.php';
|
||||
|
||||
// apply default values overrides
|
||||
if (count($cfg_db['_overrides'])) {
|
||||
foreach ($cfg_db['_overrides'] as $path => $value) {
|
||||
array_write($path, $cfg, $value);
|
||||
}
|
||||
}
|
||||
|
||||
// checking key presence is much faster than searching so move values to keys
|
||||
$this->persistKeys = array_flip($persist_keys);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns class instance
|
||||
*
|
||||
* @return ConfigFile
|
||||
*/
|
||||
public static function getInstance()
|
||||
{
|
||||
if (is_null(self::$_instance)) {
|
||||
self::$_instance = new ConfigFile();
|
||||
}
|
||||
return self::$_instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets config value
|
||||
*
|
||||
* @param string $path
|
||||
* @param mixed $value
|
||||
* @param string $canonical_path
|
||||
*/
|
||||
public function set($path, $value, $canonical_path = null)
|
||||
{
|
||||
if ($canonical_path === null) {
|
||||
$canonical_path = $this->getCanonicalPath($path);
|
||||
}
|
||||
// remove if the path isn't protected and it's empty or has a default value
|
||||
$default_value = $this->getDefault($canonical_path);
|
||||
if (!isset($this->persistKeys[$canonical_path])
|
||||
&& (($value == $default_value) || (empty($value) && empty($default_value)))) {
|
||||
array_remove($path, $_SESSION['ConfigFile']);
|
||||
} else {
|
||||
array_write($path, $_SESSION['ConfigFile'], $value);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns config value or $default if it's not set
|
||||
*
|
||||
* @param string $path
|
||||
* @param mixed $default
|
||||
* @return mixed
|
||||
*/
|
||||
public function get($path, $default = null)
|
||||
{
|
||||
return array_read($path, $_SESSION['ConfigFile'], $default);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns default config value or $default it it's not set ie. it doesn't
|
||||
* exist in config.default.php ($cfg) and config_info.inc.php
|
||||
* ($_cfg_db['_overrides'])
|
||||
*
|
||||
* @param string $canonical_path
|
||||
* @param mixed $default
|
||||
* @return mixed
|
||||
*/
|
||||
public function getDefault($canonical_path, $default = null)
|
||||
{
|
||||
return array_read($canonical_path, $this->cfg, $default);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns config value, if it's not set uses the default one; returns
|
||||
* $default if the path isn't set and doesn't contain a default value
|
||||
*
|
||||
* @param string $path
|
||||
* @param mixed $default
|
||||
* @return mixed
|
||||
*/
|
||||
public function getValue($path, $default = null)
|
||||
{
|
||||
$v = array_read($path, $_SESSION['ConfigFile'], null);
|
||||
if ($v !== null) {
|
||||
return $v;
|
||||
}
|
||||
$path = $this->getCanonicalPath($path);
|
||||
return $this->getDefault($path, $default);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns canonical path
|
||||
*
|
||||
* @param string $path
|
||||
* @return string
|
||||
*/
|
||||
public function getCanonicalPath($path) {
|
||||
return preg_replace('#^Servers/([\d]+)/#', 'Servers/1/', $path);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns config database entry for $path ($cfg_db in config_info.php)
|
||||
*
|
||||
* @param string $path
|
||||
* @param mixed $default
|
||||
* @return mixed
|
||||
*/
|
||||
public function getDbEntry($path, $default = null)
|
||||
{
|
||||
return array_read($path, $this->cfgDb, $default);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns server count
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
public function getServerCount()
|
||||
{
|
||||
return isset($_SESSION['ConfigFile']['Servers'])
|
||||
? count($_SESSION['ConfigFile']['Servers'])
|
||||
: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns DSN of given server
|
||||
*
|
||||
* @param integer $server
|
||||
* @return string
|
||||
*/
|
||||
function getServerDSN($server)
|
||||
{
|
||||
if (!isset($_SESSION['ConfigFile']['Servers'][$server])) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$path = 'Servers/' . $server;
|
||||
$dsn = $this->getValue("$path/extension") . '://';
|
||||
if ($this->getValue("$path/auth_type") == 'config') {
|
||||
$dsn .= $this->getValue("$path/user");
|
||||
if (!$this->getValue("$path/nopassword")) {
|
||||
$dsn .= ':***';
|
||||
}
|
||||
$dsn .= '@';
|
||||
}
|
||||
if ($this->getValue("$path/connect_type") == 'tcp') {
|
||||
$dsn .= $this->getValue("$path/host");
|
||||
$port = $this->getValue("$path/port");
|
||||
if ($port) {
|
||||
$dsn .= ':' . $port;
|
||||
}
|
||||
} else {
|
||||
$dsn .= $this->getValue("$path/socket");
|
||||
}
|
||||
return $dsn;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns server name
|
||||
*
|
||||
* @param int $id
|
||||
* @return string
|
||||
*/
|
||||
public function getServerName($id)
|
||||
{
|
||||
if (!isset($_SESSION['ConfigFile']['Servers'][$id])) {
|
||||
return '';
|
||||
}
|
||||
$verbose = $this->get("Servers/$id/verbose");
|
||||
if (!empty($verbose)) {
|
||||
return $verbose;
|
||||
}
|
||||
$host = $this->get("Servers/$id/host");
|
||||
return empty($host) ? 'localhost' : $host;
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes server
|
||||
*
|
||||
* @param int $server
|
||||
*/
|
||||
public function removeServer($server)
|
||||
{
|
||||
if (!isset($_SESSION['ConfigFile']['Servers'][$server])) {
|
||||
return;
|
||||
}
|
||||
$last_server = $this->getServerCount();
|
||||
|
||||
for ($i = $server; $i < $last_server; $i++) {
|
||||
$_SESSION['ConfigFile']['Servers'][$i] = $_SESSION['ConfigFile']['Servers'][$i+1];
|
||||
}
|
||||
unset($_SESSION['ConfigFile']['Servers'][$last_server]);
|
||||
|
||||
if (isset($_SESSION['ConfigFile']['ServerDefault'])
|
||||
&& $_SESSION['ConfigFile']['ServerDefault'] >= 0) {
|
||||
unset($_SESSION['ConfigFile']['ServerDefault']);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns config file path
|
||||
*
|
||||
* @return unknown
|
||||
*/
|
||||
public function getFilePath()
|
||||
{
|
||||
return $this->getDbEntry('_config_file_path');
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates config file
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getConfigFile()
|
||||
{
|
||||
$crlf = (isset($_SESSION['eol']) && $_SESSION['eol'] == 'win') ? "\r\n" : "\n";
|
||||
$c = $_SESSION['ConfigFile'];
|
||||
|
||||
// header
|
||||
$ret = '<?php' . $crlf
|
||||
. '/*' . $crlf
|
||||
. ' * Generated configuration file' . $crlf
|
||||
. ' * Generated by: phpMyAdmin '
|
||||
. $GLOBALS['PMA_Config']->get('PMA_VERSION')
|
||||
. ' setup script by Piotr Przybylski <piotrprz@gmail.com>' . $crlf
|
||||
. ' * Date: ' . date(DATE_RFC1123) . $crlf
|
||||
. ' */' . $crlf . $crlf;
|
||||
|
||||
// servers
|
||||
if ($this->getServerCount() > 0) {
|
||||
$ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf;
|
||||
foreach ($c['Servers'] as $id => $server) {
|
||||
$ret .= '/* Server: ' . strtr($this->getServerName($id), '*/', '-') . " [$id] */" . $crlf
|
||||
. '$i++;' . $crlf;
|
||||
foreach ($server as $k => $v) {
|
||||
$k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
|
||||
$ret .= "\$cfg['Servers'][\$i]['$k'] = "
|
||||
. var_export($v, true) . ';' . $crlf;
|
||||
}
|
||||
$ret .= $crlf;
|
||||
}
|
||||
$ret .= '/* End of servers configuration */' . $crlf . $crlf;
|
||||
}
|
||||
unset($c['Servers']);
|
||||
|
||||
// other settings
|
||||
$persistKeys = $this->persistKeys;
|
||||
foreach ($c as $k => $v) {
|
||||
$k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
|
||||
$ret .= "\$cfg['$k'] = " . var_export($v, true) . ';' . $crlf;
|
||||
if (isset($persistKeys[$k])) {
|
||||
unset($persistKeys[$k]);
|
||||
}
|
||||
}
|
||||
// keep 1d array keys which are present in $persist_keys (config_info.inc.php)
|
||||
foreach (array_keys($persistKeys) as $k) {
|
||||
if (strpos($k, '/') === false) {
|
||||
$k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
|
||||
$ret .= "\$cfg['$k'] = " . var_export($this->getDefault($k), true) . ';' . $crlf;
|
||||
}
|
||||
}
|
||||
$ret .= '?>';
|
||||
|
||||
return $ret;
|
||||
}
|
||||
}
|
||||
?>
|
||||
151
setup/lib/ConfigGenerator.class.php
Normal file
151
setup/lib/ConfigGenerator.class.php
Normal file
@@ -0,0 +1,151 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Config file generator
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
|
||||
/**
|
||||
* Config file generation class
|
||||
*
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
class ConfigGenerator
|
||||
{
|
||||
/**
|
||||
* Creates config file
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function getConfigFile()
|
||||
{
|
||||
$cf = ConfigFile::getInstance();
|
||||
|
||||
$crlf = (isset($_SESSION['eol']) && $_SESSION['eol'] == 'win') ? "\r\n" : "\n";
|
||||
$c = $cf->getConfig();
|
||||
|
||||
// header
|
||||
$ret = '<?php' . $crlf
|
||||
. '/*' . $crlf
|
||||
. ' * Generated configuration file' . $crlf
|
||||
. ' * Generated by: phpMyAdmin '
|
||||
. $GLOBALS['PMA_Config']->get('PMA_VERSION')
|
||||
. ' setup script by Piotr Przybylski <piotrprz@gmail.com>' . $crlf
|
||||
. ' * Date: ' . date(DATE_RFC1123) . $crlf
|
||||
. ' */' . $crlf . $crlf;
|
||||
|
||||
// servers
|
||||
if ($cf->getServerCount() > 0) {
|
||||
$ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf;
|
||||
foreach ($c['Servers'] as $id => $server) {
|
||||
$ret .= '/* Server: ' . strtr($cf->getServerName($id), '*/', '-') . " [$id] */" . $crlf
|
||||
. '$i++;' . $crlf;
|
||||
foreach ($server as $k => $v) {
|
||||
$k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
|
||||
$ret .= "\$cfg['Servers'][\$i]['$k'] = "
|
||||
. (is_array($v) && self::_isZeroBasedArray($v)
|
||||
? self::_exportZeroBasedArray($v, $crlf)
|
||||
: var_export($v, true))
|
||||
. ';' . $crlf;
|
||||
}
|
||||
$ret .= $crlf;
|
||||
}
|
||||
$ret .= '/* End of servers configuration */' . $crlf . $crlf;
|
||||
}
|
||||
unset($c['Servers']);
|
||||
|
||||
// other settings
|
||||
$persistKeys = $cf->getPersistKeysMap();
|
||||
|
||||
foreach ($c as $k => $v) {
|
||||
$k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
|
||||
$ret .= self::_getVarExport($k, $v, $crlf);
|
||||
if (isset($persistKeys[$k])) {
|
||||
unset($persistKeys[$k]);
|
||||
}
|
||||
}
|
||||
// keep 1d array keys which are present in $persist_keys (config.values.php)
|
||||
foreach (array_keys($persistKeys) as $k) {
|
||||
if (strpos($k, '/') === false) {
|
||||
$k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
|
||||
$ret .= self::_getVarExport($k, $cf->getDefault($k), $crlf);
|
||||
}
|
||||
}
|
||||
$ret .= '?>';
|
||||
|
||||
return $ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns exported configuration variable
|
||||
*
|
||||
* @param string $var_name
|
||||
* @param mixed $var_value
|
||||
* @param string $crlf
|
||||
* @return string
|
||||
*/
|
||||
private static function _getVarExport($var_name, $var_value, $crlf)
|
||||
{
|
||||
if (!is_array($var_value) || empty($var_value)) {
|
||||
return "\$cfg['$var_name'] = " . var_export($var_value, true) . ';' . $crlf;
|
||||
}
|
||||
$ret = '';
|
||||
if (self::_isZeroBasedArray($var_value)) {
|
||||
$ret = "\$cfg['$var_name'] = " . self::_exportZeroBasedArray($var_value, $crlf)
|
||||
. ';' . $crlf;
|
||||
} else {
|
||||
// string keys: $cfg[key][subkey] = value
|
||||
foreach ($var_value as $k => $v) {
|
||||
$k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
|
||||
$ret .= "\$cfg['$var_name']['$k'] = " . var_export($v, true) . ';' . $crlf;
|
||||
}
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check whether $array is a continuous 0-based array
|
||||
*
|
||||
* @param array $array
|
||||
* @return boolean
|
||||
*/
|
||||
private static function _isZeroBasedArray(array $array)
|
||||
{
|
||||
for ($i = 0; $i < count($array); $i++) {
|
||||
if (!isset($array[$i])) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Exports continuous 0-based array
|
||||
*
|
||||
* @param array $array
|
||||
* @param string $crlf
|
||||
* @return string
|
||||
*/
|
||||
private static function _exportZeroBasedArray(array $array, $crlf)
|
||||
{
|
||||
$retv = array();
|
||||
foreach ($array as $v) {
|
||||
$retv[] = var_export($v, true);
|
||||
}
|
||||
$ret = "array(";
|
||||
if (count($retv) <= 4) {
|
||||
// up to 4 values - one line
|
||||
$ret .= implode(', ', $retv);
|
||||
} else {
|
||||
// more than 4 values - value per line
|
||||
$imax = count($retv)-1;
|
||||
for ($i = 0; $i <= $imax; $i++) {
|
||||
$ret .= ($i < $imax ? ($i > 0 ? ',' : '') : '') . $crlf . ' ' . $retv[$i];
|
||||
}
|
||||
}
|
||||
$ret .= ')';
|
||||
return $ret;
|
||||
}
|
||||
}
|
||||
?>
|
||||
@@ -1,182 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Form handling code.
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
/**
|
||||
* Base class for forms, loads default configuration options, checks allowed
|
||||
* values etc.
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
class Form
|
||||
{
|
||||
/**
|
||||
* Form name
|
||||
* @var string
|
||||
*/
|
||||
public $name;
|
||||
|
||||
/**
|
||||
* Arbitrary index, doesn't affect class' behavior
|
||||
* @var int
|
||||
*/
|
||||
public $index;
|
||||
|
||||
/**
|
||||
* Form fields (paths), filled by {@link readFormPaths()}, indexed by field name
|
||||
* @var array
|
||||
*/
|
||||
public $fields;
|
||||
|
||||
/**
|
||||
* Stores default values for some fields (eg. pmadb tables)
|
||||
* @var array
|
||||
*/
|
||||
public $default;
|
||||
|
||||
/**
|
||||
* Caches field types, indexed by field names
|
||||
* @var array
|
||||
*/
|
||||
private $fieldsTypes;
|
||||
|
||||
/**
|
||||
* Cached forms
|
||||
* @var array
|
||||
*/
|
||||
private static $_forms;
|
||||
|
||||
/**
|
||||
* Constructor, reads default config values
|
||||
*
|
||||
* @param string $form_name
|
||||
* @param int $index arbitrary index, stored in Form::$index
|
||||
*/
|
||||
public function __construct($form_name, $index = null)
|
||||
{
|
||||
$this->index = $index;
|
||||
$this->loadForm($form_name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns type of given option
|
||||
*
|
||||
* @param string $option_name path or field name
|
||||
* @return string|null one of: boolean, integer, double, string, select, array
|
||||
*/
|
||||
public function getOptionType($option_name)
|
||||
{
|
||||
$key = ltrim(substr($option_name, strrpos($option_name, '/')), '/');
|
||||
return isset($this->fieldsTypes[$key])
|
||||
? $this->fieldsTypes[$key]
|
||||
: null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns allowed values for select fields
|
||||
*
|
||||
* @param string $option_path
|
||||
* @return array
|
||||
*/
|
||||
public function getOptionValueList($option_path)
|
||||
{
|
||||
$value = ConfigFile::getInstance()->getDbEntry($option_path);
|
||||
if ($value === null) {
|
||||
trigger_error("$option_path - select options not defined", E_USER_ERROR);
|
||||
return array();
|
||||
}
|
||||
if (!is_array($value)) {
|
||||
trigger_error("$option_path - not a static value list", E_USER_ERROR);
|
||||
return array();
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* array_walk callback function, reads path of form fields from
|
||||
* array (see file comment in forms.inc.php)
|
||||
*
|
||||
* @param mixed $value
|
||||
* @param mixed $key
|
||||
* @param mixed $prefix
|
||||
*/
|
||||
private function _readFormPathsCallback($value, $key, $prefix)
|
||||
{
|
||||
if (is_array($value)) {
|
||||
$prefix .= (empty($prefix) ? '' : '/') . $key;
|
||||
array_walk($value, array($this, '_readFormPathsCallback'), $prefix);
|
||||
} else {
|
||||
if (!is_int($key)) {
|
||||
$this->default[$prefix . '/' . $key] = $value;
|
||||
$value = $key;
|
||||
}
|
||||
$this->fields[] = $prefix . '/' . $value;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads form paths to {@link $fields}
|
||||
*/
|
||||
protected function readFormPaths()
|
||||
{
|
||||
if (is_null(self::$_forms)) {
|
||||
$forms =& self::$_forms;
|
||||
require './setup/lib/forms.inc.php';
|
||||
}
|
||||
|
||||
if (!isset(self::$_forms[$this->name])) {
|
||||
return;
|
||||
}
|
||||
|
||||
// flatten form fields' paths and save them to $fields
|
||||
$this->fields = array();
|
||||
array_walk(self::$_forms[$this->name], array($this, '_readFormPathsCallback'), '');
|
||||
|
||||
// $this->fields is an array of the form: [0..n] => 'field path'
|
||||
// change numeric indexes to contain field names (last part of the path)
|
||||
$paths = $this->fields;
|
||||
$this->fields = array();
|
||||
foreach ($paths as $path) {
|
||||
$path = ltrim($path, '/');
|
||||
$key = ltrim(substr($path, strrpos($path, '/')), '/');
|
||||
$this->fields[$key] = $path;
|
||||
}
|
||||
// now $this->fields is an array of the form: 'field name' => 'field path'
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads fields' types to $this->fieldsTypes
|
||||
*/
|
||||
protected function readTypes()
|
||||
{
|
||||
$cf = ConfigFile::getInstance();
|
||||
foreach ($this->fields as $name => $path) {
|
||||
$v = $cf->getDbEntry($path);
|
||||
if ($v !== null) {
|
||||
$type = is_array($v) ? 'select' : $v;
|
||||
} else {
|
||||
$type = gettype($cf->getDefault($path));
|
||||
}
|
||||
$this->fieldsTypes[$name] = $type;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads form settings and prepares class to work with given subset of
|
||||
* config file
|
||||
*
|
||||
* @param string $form_name
|
||||
*/
|
||||
public function loadForm($form_name)
|
||||
{
|
||||
$this->name = $form_name;
|
||||
$this->readFormPaths();
|
||||
$this->readTypes();
|
||||
}
|
||||
}
|
||||
?>
|
||||
@@ -1,585 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Form management class, displays and processes forms
|
||||
*
|
||||
* Explanation of used terms:
|
||||
* o work_path - original field path, eg. Servers/4/verbose
|
||||
* o system_path - work_path modified so that it points to the first server, eg. Servers/1/verbose
|
||||
* o translated_path - work_path modified for HTML field name, a path with
|
||||
* slashes changed to hyphens, eg. Servers-4-verbose
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
/**
|
||||
* Core libraries.
|
||||
*/
|
||||
require_once './setup/lib/FormDisplay.tpl.php';
|
||||
require_once './setup/lib/validate.lib.php';
|
||||
require_once './libraries/js_escape.lib.php';
|
||||
|
||||
/**
|
||||
* Form management class, displays and processes forms
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
class FormDisplay
|
||||
{
|
||||
/**
|
||||
* Form list
|
||||
* @var array
|
||||
*/
|
||||
private $forms = array();
|
||||
|
||||
/**
|
||||
* Stores validation errors, indexed by paths
|
||||
* [ Form_name ] is an array of form errors
|
||||
* [path] is a string storing error associated with single field
|
||||
* @var array
|
||||
*/
|
||||
private $errors = array();
|
||||
|
||||
/**
|
||||
* Paths changed so that they can be used as HTML ids, indexed by paths
|
||||
* @var array
|
||||
*/
|
||||
private $translated_paths = array();
|
||||
|
||||
/**
|
||||
* Server paths change indexes so we define maps from current server
|
||||
* path to the first one, indexed by work path
|
||||
* @var array
|
||||
*/
|
||||
private $system_paths = array();
|
||||
|
||||
/**
|
||||
* Language strings which will be sent to PMA_messages JS variable
|
||||
* Will be looked up in $GLOBALS: str{value} or strSetup{value}
|
||||
* @var array
|
||||
*/
|
||||
private $js_lang_strings = array('error_nan_p', 'error_nan_nneg',
|
||||
'error_incorrect_port');
|
||||
|
||||
/**
|
||||
* Tells whether forms have been validated
|
||||
* @var bool
|
||||
*/
|
||||
private $is_valdiated = true;
|
||||
|
||||
/**
|
||||
* Registers form in form manager
|
||||
*
|
||||
* @param string $form_name
|
||||
* @param int $server_id 0 if new server, validation; >= 1 if editing a server
|
||||
*/
|
||||
public function registerForm($form_name, $server_id = null)
|
||||
{
|
||||
$this->forms[$form_name] = new Form($form_name, $server_id);
|
||||
$this->is_valdiated = false;
|
||||
foreach ($this->forms[$form_name]->fields as $path) {
|
||||
$work_path = $server_id === null
|
||||
? $path
|
||||
: str_replace('Servers/1/', "Servers/$server_id/", $path);
|
||||
$this->system_paths[$work_path] = $path;
|
||||
$this->translated_paths[$work_path] = str_replace('/', '-', $work_path);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Processes forms, returns true on successful save
|
||||
*
|
||||
* @param bool $allow_partial_save allows for partial form saving on failed validation
|
||||
* @return boolean
|
||||
*/
|
||||
public function process($allow_partial_save = true)
|
||||
{
|
||||
// gather list of forms to save
|
||||
if (!isset($_POST['submit_save'])) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// save forms
|
||||
if (count($this->forms) > 0) {
|
||||
return $this->save(array_keys($this->forms), $allow_partial_save);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs validation for all registered forms
|
||||
*/
|
||||
private function _validate()
|
||||
{
|
||||
if ($this->is_valdiated) {
|
||||
return;
|
||||
}
|
||||
|
||||
$cf = ConfigFile::getInstance();
|
||||
$paths = array();
|
||||
$values = array();
|
||||
foreach ($this->forms as $form) {
|
||||
/* @var $form Form */
|
||||
$paths[] = $form->name;
|
||||
// collect values and paths
|
||||
foreach ($form->fields as $path) {
|
||||
$work_path = array_search($path, $this->system_paths);
|
||||
$values[$path] = $cf->getValue($work_path);
|
||||
$paths[] = $path;
|
||||
}
|
||||
}
|
||||
|
||||
// run validation
|
||||
$errors = validate($paths, $values, false);
|
||||
|
||||
// change error keys from canonical paths to work paths
|
||||
if (is_array($errors) && count($errors) > 0) {
|
||||
$this->errors = array();
|
||||
foreach ($errors as $path => $error_list) {
|
||||
$work_path = array_search($path, $this->system_paths);
|
||||
// field error
|
||||
if (!$work_path) {
|
||||
// form error, fix path
|
||||
$work_path = $path;
|
||||
}
|
||||
$this->errors[$work_path] = $error_list;
|
||||
}
|
||||
}
|
||||
$this->is_valdiated = true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Outputs HTML for forms
|
||||
*
|
||||
* @param bool $tabbed_form
|
||||
* @param bool $show_restore_default whether show "restore default" button besides the input field
|
||||
*/
|
||||
public function display($tabbed_form = false, $show_restore_default = false)
|
||||
{
|
||||
static $js_lang_sent = false;
|
||||
|
||||
$js = array();
|
||||
$js_default = array();
|
||||
$tabbed_form = $tabbed_form && (count($this->forms) > 1);
|
||||
$validators = ConfigFile::getInstance()->getDbEntry('_validators');
|
||||
|
||||
display_form_top();
|
||||
|
||||
if ($tabbed_form) {
|
||||
$tabs = array();
|
||||
foreach ($this->forms as $form) {
|
||||
$tabs[$form->name] = PMA_lang("Form_$form->name");
|
||||
}
|
||||
display_tabs_top($tabs);
|
||||
}
|
||||
|
||||
// valdiate only when we aren't displaying a "new server" form
|
||||
$is_new_server = false;
|
||||
foreach ($this->forms as $form) {
|
||||
/* @var $form Form */
|
||||
if ($form->index === 0) {
|
||||
$is_new_server = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!$is_new_server) {
|
||||
$this->_validate();
|
||||
}
|
||||
|
||||
// display forms
|
||||
foreach ($this->forms as $form) {
|
||||
/* @var $form Form */
|
||||
$form_desc = isset($GLOBALS["strSetupForm_{$form->name}_desc"])
|
||||
? PMA_lang("Form_{$form->name}_desc")
|
||||
: '';
|
||||
$form_errors = isset($this->errors[$form->name])
|
||||
? $this->errors[$form->name] : null;
|
||||
display_fieldset_top(PMA_lang("Form_$form->name"),
|
||||
$form_desc, $form_errors, array('id' => $form->name));
|
||||
|
||||
foreach ($form->fields as $field => $path) {
|
||||
$work_path = array_search($path, $this->system_paths);
|
||||
$translated_path = $this->translated_paths[$work_path];
|
||||
// display input
|
||||
$this->_displayFieldInput($form, $field, $path, $work_path,
|
||||
$translated_path, $show_restore_default, $js_default);
|
||||
// register JS validators for this field
|
||||
if (isset($validators[$path])) {
|
||||
js_validate($translated_path, $validators[$path], $js);
|
||||
}
|
||||
}
|
||||
display_fieldset_bottom();
|
||||
}
|
||||
|
||||
if ($tabbed_form) {
|
||||
display_tabs_bottom();
|
||||
}
|
||||
display_form_bottom();
|
||||
|
||||
// if not already done, send strings used for valdiation to JavaScript
|
||||
if (!$js_lang_sent) {
|
||||
$js_lang_sent = true;
|
||||
$js_lang = array();
|
||||
foreach ($this->js_lang_strings as $str) {
|
||||
$lang = isset($GLOBALS["strSetup$str"])
|
||||
? $GLOBALS["strSetup$str"]
|
||||
: filter_input($GLOBALS["str$str"]); // null if not set
|
||||
$js_lang[] = "'$str': '" . PMA_jsFormat($lang, false) . '\'';
|
||||
}
|
||||
$js[] = '$.extend(PMA_messages, {' . implode(",\n\t", $js_lang) . '})';
|
||||
}
|
||||
|
||||
$js[] = '$.extend(defaultValues, {' . implode(",\n\t", $js_default) . '})';
|
||||
display_js($js);
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepares data for input field display and outputs HTML code
|
||||
*
|
||||
* @param Form $form
|
||||
* @param string $field field name as it appears in $form
|
||||
* @param string $system_path field path, eg. Servers/1/verbose
|
||||
* @param string $work_path work path, eg. Servers/4/verbose
|
||||
* @param string $translated_path work path changed so that it can be used as XHTML id
|
||||
* @param bool $show_restore_default whether show "restore default" button besides the input field
|
||||
* @param array &$js_default array which stores JavaScript code to be displayed
|
||||
*/
|
||||
private function _displayFieldInput(Form $form, $field, $system_path, $work_path,
|
||||
$translated_path, $show_restore_default, array &$js_default)
|
||||
{
|
||||
$name = PMA_lang_name($system_path);
|
||||
$description = PMA_lang_desc($system_path);
|
||||
|
||||
$cf = ConfigFile::getInstance();
|
||||
$value = $cf->get($work_path);
|
||||
$value_default = $cf->getDefault($system_path);
|
||||
$value_is_default = false;
|
||||
if ($value === null || $value === $value_default) {
|
||||
$value = $value_default;
|
||||
$value_is_default = true;
|
||||
}
|
||||
|
||||
$opts = array(
|
||||
'doc' => $this->getDocLink($system_path),
|
||||
'wiki' => $this->getWikiLink($system_path),
|
||||
'show_restore_default' => $show_restore_default);
|
||||
if (isset($form->default[$system_path])) {
|
||||
$opts['setvalue'] = $form->default[$system_path];
|
||||
}
|
||||
|
||||
if (isset($this->errors[$work_path])) {
|
||||
$opts['errors'] = $this->errors[$work_path];
|
||||
}
|
||||
switch ($form->getOptionType($field)) {
|
||||
case 'string':
|
||||
$type = 'text';
|
||||
break;
|
||||
case 'double':
|
||||
$type = 'text';
|
||||
break;
|
||||
case 'integer':
|
||||
$type = 'text';
|
||||
break;
|
||||
case 'boolean':
|
||||
$type = 'checkbox';
|
||||
break;
|
||||
case 'select':
|
||||
$type = 'select';
|
||||
$opts['values'] = array();
|
||||
$values = $form->getOptionValueList($form->fields[$field]);
|
||||
foreach ($values as $v) {
|
||||
$opts['values'][$v] = $v;
|
||||
}
|
||||
break;
|
||||
case 'array':
|
||||
$type = 'list';
|
||||
$value = (array) $value;
|
||||
$value_default = (array) $value_default;
|
||||
break;
|
||||
case 'NULL':
|
||||
trigger_error("Field $system_path has no type", E_USER_WARNING);
|
||||
return;
|
||||
}
|
||||
|
||||
// TrustedProxies requires changes before displaying
|
||||
if ($system_path == 'TrustedProxies') {
|
||||
foreach ($value as $ip => &$v) {
|
||||
if (!preg_match('/^-\d+$/', $ip)) {
|
||||
$v = $ip . ': ' . $v;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// send default value to form's JS
|
||||
$js_line = '\'' . $translated_path . '\': ';
|
||||
switch ($type) {
|
||||
case 'text':
|
||||
$js_line .= '\'' . PMA_escapeJsString($value_default) . '\'';
|
||||
break;
|
||||
case 'checkbox':
|
||||
$js_line .= $value_default ? 'true' : 'false';
|
||||
break;
|
||||
case 'select':
|
||||
$value_default_js = is_bool($value_default)
|
||||
? (int) $value_default
|
||||
: $value_default;
|
||||
$js_line .= '[\'' . PMA_escapeJsString($value_default_js) . '\']';
|
||||
break;
|
||||
case 'list':
|
||||
$js_line .= '\'' . PMA_escapeJsString(implode("\n", $value_default)) . '\'';
|
||||
break;
|
||||
}
|
||||
$js_default[] = $js_line;
|
||||
|
||||
display_input($translated_path, $name, $description, $type,
|
||||
$value, $value_is_default, $opts);
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays errors
|
||||
*/
|
||||
public function displayErrors()
|
||||
{
|
||||
$this->_validate();
|
||||
if (count($this->errors) == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
foreach ($this->errors as $system_path => $error_list) {
|
||||
if (isset($this->system_paths[$system_path])) {
|
||||
$path = $this->system_paths[$system_path];
|
||||
$name = PMA_lang_name($path);
|
||||
} else {
|
||||
$name = $GLOBALS["strSetupForm_$system_path"];
|
||||
}
|
||||
display_errors($name, $error_list);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverts erroneous fields to their default values
|
||||
*/
|
||||
public function fixErrors()
|
||||
{
|
||||
$this->_validate();
|
||||
if (count($this->errors) == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
$cf = ConfigFile::getInstance();
|
||||
foreach (array_keys($this->errors) as $work_path) {
|
||||
if (!isset($this->system_paths[$work_path])) {
|
||||
continue;
|
||||
}
|
||||
$canonical_path = $this->system_paths[$work_path];
|
||||
$cf->set($work_path, $cf->getDefault($canonical_path));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Validates select field and casts $value to correct type
|
||||
*
|
||||
* @param string $value
|
||||
* @param array $allowed
|
||||
* @return bool
|
||||
*/
|
||||
private function _validateSelect(&$value, array $allowed)
|
||||
{
|
||||
foreach ($allowed as $v) {
|
||||
if ($value == $v) {
|
||||
settype($value, gettype($v));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Validates and saves form data to session
|
||||
*
|
||||
* @param array|string $forms array of form names
|
||||
* @param bool $allow_partial_save allows for partial form saving on failed validation
|
||||
* @return boolean true on success (no errors and all saved)
|
||||
*/
|
||||
public function save($forms, $allow_partial_save = true)
|
||||
{
|
||||
$result = true;
|
||||
$cf = ConfigFile::getInstance();
|
||||
$forms = (array) $forms;
|
||||
|
||||
$values = array();
|
||||
$to_save = array();
|
||||
$this->errors = array();
|
||||
foreach ($forms as $form) {
|
||||
/* @var $form Form */
|
||||
if (isset($this->forms[$form])) {
|
||||
$form = $this->forms[$form];
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
// get current server id
|
||||
$change_index = $form->index === 0
|
||||
? $cf->getServerCount() + 1
|
||||
: false;
|
||||
// grab POST values
|
||||
foreach ($form->fields as $field => $system_path) {
|
||||
$work_path = array_search($system_path, $this->system_paths);
|
||||
$key = $this->translated_paths[$work_path];
|
||||
|
||||
// ensure the value is set
|
||||
if (!isset($_POST[$key])) {
|
||||
// checkboxes aren't set by browsers if they're off
|
||||
if ($form->getOptionType($field) == 'boolean') {
|
||||
$_POST[$key] = false;
|
||||
} else {
|
||||
$this->errors[$form->name][] = PMA_lang(
|
||||
'error_missing_field_data',
|
||||
'<i>' . PMA_lang_name($system_path) . '</i>');
|
||||
$result = false;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
// cast variables to correct type
|
||||
$type = $form->getOptionType($field);
|
||||
switch ($type) {
|
||||
case 'double':
|
||||
settype($_POST[$key], 'float');
|
||||
break;
|
||||
case 'boolean':
|
||||
case 'integer':
|
||||
if ($_POST[$key] !== '') {
|
||||
settype($_POST[$key], $type);
|
||||
}
|
||||
break;
|
||||
case 'select':
|
||||
if (!$this->_validateSelect($_POST[$key], $form->getOptionValueList($system_path))) {
|
||||
$this->errors[$work_path][] = __('Incorrect value');
|
||||
$result = false;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
case 'string':
|
||||
$_POST[$key] = trim($_POST[$key]);
|
||||
break;
|
||||
case 'array':
|
||||
// eliminate empty values and ensure we have an array
|
||||
$post_values = explode("\n", $_POST[$key]);
|
||||
$_POST[$key] = array();
|
||||
foreach ($post_values as $v) {
|
||||
$v = trim($v);
|
||||
if ($v !== '') {
|
||||
$_POST[$key][] = $v;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
// now we have value with proper type
|
||||
$values[$system_path] = $_POST[$key];
|
||||
if ($change_index !== false) {
|
||||
$work_path = str_replace("Servers/$form->index/",
|
||||
"Servers/$change_index/", $work_path);
|
||||
}
|
||||
$to_save[$work_path] = $system_path;
|
||||
}
|
||||
}
|
||||
|
||||
// save forms
|
||||
if ($allow_partial_save || empty($this->errors)) {
|
||||
foreach ($to_save as $work_path => $path) {
|
||||
// TrustedProxies requires changes before saving
|
||||
if ($path == 'TrustedProxies') {
|
||||
$proxies = array();
|
||||
$i = 0;
|
||||
foreach ($values[$path] as $value) {
|
||||
$matches = array();
|
||||
if (preg_match("/^(.+):(?:[ ]?)(\\w+)$/", $value, $matches)) {
|
||||
// correct 'IP: HTTP header' pair
|
||||
$ip = trim($matches[1]);
|
||||
$proxies[$ip] = trim($matches[2]);
|
||||
} else {
|
||||
// save also incorrect values
|
||||
$proxies["-$i"] = $value;
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
$values[$path] = $proxies;
|
||||
}
|
||||
$cf->set($work_path, $values[$path], $path);
|
||||
}
|
||||
}
|
||||
|
||||
// don't look for non-critical errors
|
||||
$this->_validate();
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Tells whether form validation failed
|
||||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function hasErrors()
|
||||
{
|
||||
return count($this->errors) > 0;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns link to documentation
|
||||
*
|
||||
* @param string $path
|
||||
* @return string
|
||||
*/
|
||||
public function getDocLink($path)
|
||||
{
|
||||
$test = substr($path, 0, 6);
|
||||
if ($test == 'Import' || $test == 'Export') {
|
||||
return '';
|
||||
}
|
||||
return '../Documentation.html#cfg_' . self::_getOptName($path);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns link to wiki
|
||||
*
|
||||
* @param string $path
|
||||
* @return string
|
||||
*/
|
||||
public function getWikiLink($path)
|
||||
{
|
||||
$opt_name = self::_getOptName($path);
|
||||
if (substr($opt_name, 0, 7) == 'Servers') {
|
||||
$opt_name = substr($opt_name, 8);
|
||||
if (strpos($opt_name, 'AllowDeny') === 0) {
|
||||
$opt_name = str_replace('_', '_.28', $opt_name) . '.29';
|
||||
}
|
||||
}
|
||||
$test = substr($path, 0, 6);
|
||||
if ($test == 'Import') {
|
||||
$opt_name = substr($opt_name, 7);
|
||||
if ($opt_name == 'format') {
|
||||
$opt_name = 'format_2';
|
||||
}
|
||||
}
|
||||
if ($test == 'Export') {
|
||||
$opt_name = substr($opt_name, 7);
|
||||
}
|
||||
return 'http://wiki.phpmyadmin.net/pma/Config#' . $opt_name;
|
||||
}
|
||||
|
||||
/**
|
||||
* Changes path so it can be used in URLs
|
||||
*
|
||||
* @param string $path
|
||||
* @return string
|
||||
*/
|
||||
private static function _getOptName($path)
|
||||
{
|
||||
return str_replace(array('Servers/1/', '/'), array('Servers/', '_'), $path);
|
||||
}
|
||||
}
|
||||
?>
|
||||
@@ -1,293 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Form templates
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
/**
|
||||
* Displays top part of the form
|
||||
*
|
||||
* @param string $action default: $_SERVER['REQUEST_URI']
|
||||
* @param string $method 'post' or 'get'
|
||||
* @param array $hidden_fields array of form hidden fields (key: field name)
|
||||
*/
|
||||
function display_form_top($action = null, $method = 'post', $hidden_fields = null)
|
||||
{
|
||||
static $has_check_page_refresh = false;
|
||||
|
||||
if ($action === null) {
|
||||
$action = $_SERVER['REQUEST_URI'];
|
||||
}
|
||||
if ($method != 'post') {
|
||||
$method = 'get';
|
||||
}
|
||||
?>
|
||||
<form method="<?php echo $method ?>" action="<?php echo htmlspecialchars($action) ?>">
|
||||
<?php
|
||||
// we do validation on page refresh when browser remembers field values,
|
||||
// add a field with known value which will be used for checks
|
||||
if (!$has_check_page_refresh) {
|
||||
$has_check_page_refresh = true;
|
||||
echo '<input type="hidden" name="check_page_refresh" id="check_page_refresh"'
|
||||
. ' value="" />' . "\n";
|
||||
}
|
||||
echo PMA_generate_common_hidden_inputs() . "\n";
|
||||
echo PMA_getHiddenFields((array)$hidden_fields);
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays form tabs which are given by an array indexed by fieldset id
|
||||
* ({@link display_fieldset_top}), with values being tab titles.
|
||||
*
|
||||
* @param array $tabs
|
||||
*/
|
||||
function display_tabs_top($tabs) {
|
||||
?>
|
||||
<ul class="tabs">
|
||||
<?php foreach ($tabs as $tab_id => $tab_name): ?>
|
||||
<li><a href="#<?php echo $tab_id ?>"><?php echo $tab_name ?></a></li>
|
||||
<?php endforeach; ?>
|
||||
</ul>
|
||||
<br clear="right" />
|
||||
<div class="tabs_contents">
|
||||
<?php
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Displays top part of a fieldset
|
||||
*
|
||||
* @param string $title
|
||||
* @param string $description
|
||||
* @param array $errors
|
||||
* @param array $attributes
|
||||
*/
|
||||
function display_fieldset_top($title = '', $description = '', $errors = null, $attributes = array())
|
||||
{
|
||||
$attributes = array_merge(array('class' => 'optbox'), $attributes);
|
||||
foreach ($attributes as $k => &$attr) {
|
||||
$attr = $k . '="' . htmlspecialchars($attr) . '"';
|
||||
}
|
||||
|
||||
echo '<fieldset ' . implode(' ', $attributes) . '>';
|
||||
echo '<legend>' . $title . '</legend>';
|
||||
if (!empty($description)) {
|
||||
echo '<p>' . $description . '</p>';
|
||||
}
|
||||
// this must match with displayErrors() in scripts.js
|
||||
if (is_array($errors) && count($errors) > 0) {
|
||||
echo '<dl class="errors">';
|
||||
foreach ($errors as $error) {
|
||||
echo '<dd>' . $error . '</dd>';
|
||||
}
|
||||
echo '</dl>';
|
||||
}
|
||||
?>
|
||||
<table width="100%" cellspacing="0">
|
||||
<?php
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays input field
|
||||
*
|
||||
* $opts keys:
|
||||
* o doc - (string) documentation link
|
||||
* o errors - error array
|
||||
* o setvalue - (string) shows button allowing to set poredefined value
|
||||
* o show_restore_default - (boolean) whether show "restore default" button
|
||||
* o values - key - value paris for <select> fields
|
||||
* o values_escaped - (boolean) tells whether values array is already escaped (defaults to false)
|
||||
* o values_disabled - (array)list of disabled values (keys from values)
|
||||
* o wiki - (string) wiki link
|
||||
*
|
||||
* @param string $path
|
||||
* @param string $name
|
||||
* @param string $description
|
||||
* @param string $type
|
||||
* @param mixed $value
|
||||
* @param bool $value_is_default
|
||||
* @param array $opts
|
||||
*/
|
||||
function display_input($path, $name, $description = '', $type, $value, $value_is_default = true, $opts = null)
|
||||
{
|
||||
$field_class = $value_is_default ? '' : ' class="custom"';
|
||||
$name_id = 'name="' . $path . '" id="' . $path . '"';
|
||||
?>
|
||||
<tr>
|
||||
<th>
|
||||
<label for="<?php echo htmlspecialchars($path) ?>"><?php echo $name ?></label>
|
||||
<?php if (!empty($opts['doc']) || !empty($opts['wiki'])): ?>
|
||||
<span class="doc">
|
||||
<?php if (!empty($opts['doc'])) { ?><a href="<?php echo $opts['doc'] ?>" target="documentation"><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/b_help.png" width="11" height="11" alt="Doc" title="<?php echo __('Documentation') ?>" /></a><?php } ?>
|
||||
<?php if (!empty($opts['wiki'])){ ?><a href="<?php echo $opts['wiki'] ?>" target="wiki"><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/b_info.png" width="11" height="11" alt="Wiki" title="Wiki" /></a><?php } ?>
|
||||
</span>
|
||||
<?php endif; ?>
|
||||
<?php if (!empty($description)) { ?><small><?php echo $description ?></small><?php } ?>
|
||||
|
||||
</th>
|
||||
<td>
|
||||
<?php
|
||||
switch ($type) {
|
||||
case 'text':
|
||||
echo '<input type="text" size="50" ' . $name_id . $field_class
|
||||
. ' value="' . htmlspecialchars($value) . '" />';
|
||||
break;
|
||||
case 'checkbox':
|
||||
echo '<span class="checkbox' . ($value_is_default ? '' : ' custom')
|
||||
. '"><input type="checkbox" ' . $name_id
|
||||
. ($value ? ' checked="checked"' : '') . ' /></span>';
|
||||
break;
|
||||
case 'select':
|
||||
echo '<select ' . $name_id . $field_class . '>';
|
||||
$escape = !(isset($opts['values_escaped']) && $opts['values_escaped']);
|
||||
$values_disabled = isset($opts['values_disabled'])
|
||||
? array_flip($opts['values_disabled']) : array();
|
||||
foreach ($opts['values'] as $opt_value => $opt_name) {
|
||||
// set names for boolean values
|
||||
if (is_bool($opt_name)) {
|
||||
$opt_name = $GLOBALS['strSetup' . ($opt_value ? 'True' : 'False')];
|
||||
}
|
||||
// cast boolean values to integers
|
||||
$display_value = is_bool($opt_value) ? (int) $opt_value : $opt_value;
|
||||
// escape if necessary
|
||||
if ($escape) {
|
||||
$display = htmlspecialchars($opt_name);
|
||||
$display_value = htmlspecialchars($display_value);
|
||||
} else {
|
||||
$display = $opt_name;
|
||||
}
|
||||
// compare with selected value
|
||||
// boolean values are cast to integers when used as array keys
|
||||
$selected = is_bool($value)
|
||||
? (int) $value === $opt_value
|
||||
: $opt_value === $value;
|
||||
echo '<option value="' . $display_value . '"'
|
||||
. ($selected ? ' selected="selected"' : '')
|
||||
. (isset($values_disabled[$opt_value]) ? ' disabled="disabled"' : '')
|
||||
. '>' . $display . '</option>';
|
||||
}
|
||||
echo '</select>';
|
||||
break;
|
||||
case 'list':
|
||||
echo '<textarea cols="40" rows="5" ' . $name_id . $field_class . '>'
|
||||
. htmlspecialchars(implode("\n", $value))
|
||||
. '</textarea>';
|
||||
break;
|
||||
}
|
||||
if (isset($opts['setvalue']) && $opts['setvalue']) {
|
||||
?>
|
||||
<a class="set-value" href="#<?php echo "$path={$opts['setvalue']}" ?>" title="<?php echo sprintf(__('Set value: %s'), htmlspecialchars($opts['setvalue'])) ?>" style="display:none"><img alt="set-value" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/b_edit.png" width="16" height="16" /></a>
|
||||
<?php
|
||||
}
|
||||
if (isset($opts['show_restore_default']) && $opts['show_restore_default']) {
|
||||
?>
|
||||
<a class="restore-default" href="#<?php echo $path ?>" title="<?php echo __('Restore default value') ?>" style="display:none"><img alt="restore-default" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/s_reload.png" width="16" height="16" /></a>
|
||||
<?php
|
||||
}
|
||||
// this must match with displayErrors() in scripts.js
|
||||
if (isset($opts['errors']) && !empty($opts['errors'])) {
|
||||
echo "\n <dl class=\"inline_errors\">";
|
||||
foreach ($opts['errors'] as $error) {
|
||||
echo '<dd>' . htmlspecialchars($error) . '</dd>';
|
||||
}
|
||||
echo '</dl>';
|
||||
}
|
||||
?>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays bottom part of a fieldset
|
||||
*
|
||||
* @param array $js_array
|
||||
*/
|
||||
function display_fieldset_bottom()
|
||||
{
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="2" class="lastrow">
|
||||
<input type="submit" name="submit_save" value="<?php echo __('Save') ?>" class="green" />
|
||||
<input type="button" name="submit_reset" value="<?php echo __('Reset') ?>" />
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
|
||||
<?php
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays simple bottom part of a fieldset (without submit buttons)
|
||||
*/
|
||||
function display_fieldset_bottom_simple()
|
||||
{
|
||||
?>
|
||||
</table>
|
||||
</fieldset>
|
||||
|
||||
<?php
|
||||
}
|
||||
|
||||
/**
|
||||
* Closes form tabs
|
||||
*/
|
||||
function display_tabs_bottom() {
|
||||
echo "</div>\n";
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays bottom part of the form
|
||||
*/
|
||||
function display_form_bottom()
|
||||
{
|
||||
echo "</form>\n";
|
||||
}
|
||||
|
||||
/**
|
||||
* Appends JS validation code to $js_array
|
||||
*
|
||||
* @param string $field_id
|
||||
* @param string $validator
|
||||
* @param array $js_array
|
||||
*/
|
||||
function js_validate($field_id, $validator, &$js_array) {
|
||||
$js_array[] = "validateField('$field_id', '$validator', true)";
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays JavaScript code
|
||||
*
|
||||
* @param array $js_array
|
||||
*/
|
||||
function display_js($js_array) {
|
||||
if (empty($js_array)) {
|
||||
return;
|
||||
}
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
<?php echo implode(";\n", $js_array) . ";\n" ?>
|
||||
</script>
|
||||
<?php
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays error list
|
||||
*
|
||||
* @param string $name
|
||||
* @param array $error_list
|
||||
*/
|
||||
function display_errors($name, $error_list) {
|
||||
echo '<dl>';
|
||||
echo '<dt>' . htmlspecialchars($name) . '</dt>';
|
||||
foreach ($error_list as $error) {
|
||||
echo '<dd>' . htmlspecialchars($error) . '</dd>';
|
||||
}
|
||||
echo '</dl>';
|
||||
}
|
||||
?>
|
||||
@@ -1,10 +1,9 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Loads libraries/common.inc.php and preforms some additional actions
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
|
||||
/**
|
||||
@@ -20,9 +19,11 @@ if (!file_exists('./libraries/common.inc.php')) {
|
||||
}
|
||||
|
||||
require_once './libraries/common.inc.php';
|
||||
require_once './libraries/config/config_functions.lib.php';
|
||||
require_once './libraries/config/messages.inc.php';
|
||||
require_once './libraries/config/ConfigFile.class.php';
|
||||
require_once './libraries/url_generating.lib.php';
|
||||
require_once './setup/lib/messages.inc.php';
|
||||
require_once './setup/lib/ConfigFile.class.php';
|
||||
require_once './libraries/user_preferences.lib.php';
|
||||
|
||||
// use default error handler
|
||||
restore_error_handler();
|
||||
@@ -30,201 +31,22 @@ restore_error_handler();
|
||||
// Save current language in a cookie, required since we use PMA_MINIMUM_COMMON
|
||||
$GLOBALS['PMA_Config']->setCookie('pma_lang', $GLOBALS['lang']);
|
||||
|
||||
if (!isset($_SESSION['ConfigFile'])) {
|
||||
$_SESSION['ConfigFile'] = array();
|
||||
}
|
||||
ConfigFile::getInstance()->setPersistKeys(array(
|
||||
'DefaultLang',
|
||||
'ServerDefault',
|
||||
'UploadDir',
|
||||
'SaveDir',
|
||||
'Servers/1/verbose',
|
||||
'Servers/1/host',
|
||||
'Servers/1/port',
|
||||
'Servers/1/socket',
|
||||
'Servers/1/extension',
|
||||
'Servers/1/connect_type',
|
||||
'Servers/1/auth_type',
|
||||
'Servers/1/user',
|
||||
'Servers/1/password'));
|
||||
|
||||
// allows for redirection even after sending some data
|
||||
ob_start();
|
||||
|
||||
/**
|
||||
* Returns value of an element in $array given by $path.
|
||||
* $path is a string describing position of an element in an associative array,
|
||||
* eg. Servers/1/host refers to $array[Servers][1][host]
|
||||
*
|
||||
* @param string $path
|
||||
* @param array $array
|
||||
* @param mixed $default
|
||||
* @return mixed array element or $default
|
||||
*/
|
||||
function array_read($path, $array, $default = null)
|
||||
{
|
||||
$keys = explode('/', $path);
|
||||
$value =& $array;
|
||||
foreach ($keys as $key) {
|
||||
if (!isset($value[$key])) {
|
||||
return $default;
|
||||
}
|
||||
$value =& $value[$key];
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Stores value in an array
|
||||
*
|
||||
* @param string $path
|
||||
* @param array &$array
|
||||
* @param mixed $value
|
||||
*/
|
||||
function array_write($path, &$array, $value)
|
||||
{
|
||||
$keys = explode('/', $path);
|
||||
$last_key = array_pop($keys);
|
||||
$a =& $array;
|
||||
foreach ($keys as $key) {
|
||||
if (!isset($a[$key])) {
|
||||
$a[$key] = array();
|
||||
}
|
||||
$a =& $a[$key];
|
||||
}
|
||||
$a[$last_key] = $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes value from an array
|
||||
*
|
||||
* @param string $path
|
||||
* @param array &$array
|
||||
* @param mixed $value
|
||||
*/
|
||||
function array_remove($path, &$array)
|
||||
{
|
||||
$keys = explode('/', $path);
|
||||
$keys_last = array_pop($keys);
|
||||
$path = array();
|
||||
$depth = 0;
|
||||
|
||||
$path[0] =& $array;
|
||||
$found = true;
|
||||
// go as deep as required or possible
|
||||
foreach ($keys as $key) {
|
||||
if (!isset($path[$depth][$key])) {
|
||||
$found = false;
|
||||
break;
|
||||
}
|
||||
$depth++;
|
||||
$path[$depth] =& $path[$depth-1][$key];
|
||||
}
|
||||
// if element found, remove it
|
||||
if ($found) {
|
||||
unset($path[$depth][$keys_last]);
|
||||
$depth--;
|
||||
}
|
||||
|
||||
// remove empty nested arrays
|
||||
for (; $depth >= 0; $depth--) {
|
||||
if (!isset($path[$depth+1]) || count($path[$depth+1]) == 0) {
|
||||
unset($path[$depth][$keys[$depth]]);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns sanitized language string, taking into account our special codes
|
||||
* for formatting. Takes variable number of arguments.
|
||||
* Based on PMA_sanitize from sanitize.lib.php.
|
||||
*
|
||||
* @param string $lang_key key in $GLOBALS WITHOUT 'strSetup' prefix
|
||||
* @param mixed $args arguments for sprintf
|
||||
* @return string
|
||||
*/
|
||||
function PMA_lang($lang_key)
|
||||
{
|
||||
static $search, $replace;
|
||||
|
||||
// some quick cache'ing
|
||||
if ($search === null) {
|
||||
$replace_pairs = array(
|
||||
'<' => '<',
|
||||
'>' => '>',
|
||||
'[em]' => '<em>',
|
||||
'[/em]' => '</em>',
|
||||
'[strong]' => '<strong>',
|
||||
'[/strong]' => '</strong>',
|
||||
'[code]' => '<code>',
|
||||
'[/code]' => '</code>',
|
||||
'[kbd]' => '<kbd>',
|
||||
'[/kbd]' => '</kbd>',
|
||||
'[br]' => '<br />',
|
||||
'[sup]' => '<sup>',
|
||||
'[/sup]' => '</sup>');
|
||||
$search = array_keys($replace_pairs);
|
||||
$replace = array_values($replace_pairs);
|
||||
}
|
||||
if (!isset($GLOBALS["strSetup$lang_key"])) {
|
||||
return $lang_key;
|
||||
}
|
||||
$message = str_replace($search, $replace, $GLOBALS["strSetup$lang_key"]);
|
||||
// replace [a@"$1"]$2[/a] with <a href="$1">$2</a>
|
||||
$message = preg_replace('#\[a@("?)([^\]]+)\1\]([^\[]+)\[/a\]#e',
|
||||
"PMA_lang_link_replace('$2', '$3')", $message);
|
||||
|
||||
if (func_num_args() == 1) {
|
||||
return $message;
|
||||
} else {
|
||||
$args = func_get_args();
|
||||
array_shift($args);
|
||||
return vsprintf($message, $args);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns translated field name
|
||||
*
|
||||
* @param string $canonical_path
|
||||
* @return string
|
||||
*/
|
||||
function PMA_lang_name($canonical_path)
|
||||
{
|
||||
$lang_key = str_replace(
|
||||
array('Servers/1/', '/'),
|
||||
array('Servers/', '_'),
|
||||
$canonical_path) . '_name';
|
||||
return isset($GLOBALS["strSetup$lang_key"])
|
||||
? $GLOBALS["strSetup$lang_key"]
|
||||
: $lang_key;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns translated field description
|
||||
*
|
||||
* @param string $canonical_path
|
||||
* @return string
|
||||
*/
|
||||
function PMA_lang_desc($canonical_path)
|
||||
{
|
||||
$lang_key = str_replace(
|
||||
array('Servers/1/', '/'),
|
||||
array('Servers/', '_'),
|
||||
$canonical_path) . '_desc';
|
||||
return isset($GLOBALS["strSetup$lang_key"])
|
||||
? PMA_lang($lang_key)
|
||||
: '';
|
||||
}
|
||||
|
||||
/**
|
||||
* Wraps link in <a> tags and replaces argument separator in internal links
|
||||
* to the one returned by PMA_get_arg_separator()
|
||||
*
|
||||
* @param string $link
|
||||
* @param string $text
|
||||
* @return string
|
||||
*/
|
||||
function PMA_lang_link_replace($link, $text)
|
||||
{
|
||||
static $separator;
|
||||
|
||||
if (!isset($separator)) {
|
||||
$separator = PMA_get_arg_separator('html');
|
||||
}
|
||||
|
||||
if (!preg_match('#^http://#', $link)) {
|
||||
$link = str_replace('&', $separator, $link);
|
||||
}
|
||||
|
||||
return '<a href="' . $link . '">' . $text . '</a>';
|
||||
}
|
||||
?>
|
||||
?>
|
||||
@@ -1,144 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Description of options with non-standard values, list of persistent options
|
||||
* and validator assignments.
|
||||
*
|
||||
* By default data types are taken from config.default.php, here we define
|
||||
* only allowed values for select fields and type overrides.
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
if (!defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
}
|
||||
|
||||
$cfg_db = array();
|
||||
|
||||
// path to config file, relative to phpMyAdmin's root path
|
||||
$cfg_db['_config_file_path'] = SETUP_CONFIG_FILE;
|
||||
|
||||
/**
|
||||
* Value meaning:
|
||||
* o array - select field, array contains allowed values
|
||||
* o string - type override
|
||||
*
|
||||
* Use normal array, paths won't be expanded
|
||||
*/
|
||||
$cfg_db['Servers'] = array(1 => array(
|
||||
'port' => 'integer',
|
||||
'connect_type' => array('tcp', 'socket'),
|
||||
'extension' => array('mysql', 'mysqli'),
|
||||
'auth_type' => array('config', 'http', 'signon', 'cookie'),
|
||||
'AllowDeny' => array(
|
||||
'order' => array('', 'deny,allow', 'allow,deny', 'explicit')),
|
||||
'only_db' => 'array'));
|
||||
$cfg_db['RecodingEngine'] = array('auto', 'iconv', 'recode', 'none');
|
||||
$cfg_db['OBGzip'] = array('auto', true, false);
|
||||
$cfg_db['ShowTooltipAliasTB'] = array('nested', true, false);
|
||||
$cfg_db['DisplayDatabasesList'] = array('auto', true, false);
|
||||
$cfg_db['LeftLogoLinkWindow'] = array('main', 'new');
|
||||
$cfg_db['LeftDefaultTabTable'] = array(
|
||||
'tbl_structure.php', // fields list
|
||||
'tbl_sql.php', // SQL form
|
||||
'tbl_select.php', // search page
|
||||
'tbl_change.php', // insert row page
|
||||
'sql.php'); // browse page
|
||||
$cfg_db['NavigationBarIconic'] = array(true, false, 'both');
|
||||
$cfg_db['Order'] = array('ASC', 'DESC', 'SMART');
|
||||
$cfg_db['ProtectBinary'] = array(false, 'blob', 'all');
|
||||
$cfg_db['CharEditing'] = array('input', 'textarea');
|
||||
$cfg_db['PropertiesIconic'] = array(true, false, 'both');
|
||||
$cfg_db['DefaultTabServer'] = array(
|
||||
'main.php', // the welcome page (recommended for multiuser setups)
|
||||
'server_databases.php', // list of databases
|
||||
'server_status.php', // runtime information
|
||||
'server_variables.php', // MySQL server variables
|
||||
'server_privileges.php', // user management
|
||||
'server_processlist.php'); // process list
|
||||
$cfg_db['DefaultTabDatabase'] = array(
|
||||
'db_structure.php', // tables list
|
||||
'db_sql.php', // SQL form
|
||||
'db_search.php', // search query
|
||||
'db_operations.php'); // operations on database
|
||||
$cfg_db['DefaultTabTable'] = array(
|
||||
'tbl_structure.php', // fields list
|
||||
'tbl_sql.php', // SQL form
|
||||
'tbl_select.php', // search page
|
||||
'tbl_change.php', // insert row page
|
||||
'sql.php'); // browse page
|
||||
$cfg_db['QueryWindowDefTab'] = array(
|
||||
'sql', // SQL
|
||||
'files', // Import files
|
||||
'history', // SQL history
|
||||
'full'); // All (SQL and SQL history)
|
||||
$cfg_db['Import']['format'] = array(
|
||||
'csv', // CSV
|
||||
'docsql', // DocSQL
|
||||
'ldi', // CSV using LOAD DATA
|
||||
'sql'); // SQL
|
||||
$cfg_db['Import']['sql_compatibility'] = array(
|
||||
'NONE', 'ANSI', 'DB2', 'MAXDB', 'MYSQL323', 'MYSQL40', 'MSSQL', 'ORACLE',
|
||||
// removed; in MySQL 5.0.33, this produces exports that
|
||||
// can't be read by POSTGRESQL (see our bug #1596328)
|
||||
//'POSTGRESQL',
|
||||
'TRADITIONAL');
|
||||
$cfg_db['Import']['ldi_local_option'] = array('auto', true, false);
|
||||
$cfg_db['Export']['format'] = array('codegen', 'csv', 'excel', 'htmlexcel',
|
||||
'htmlword', 'latex', 'ods', 'odt', 'pdf', 'sql', 'texytext', 'xls', 'xml',
|
||||
'yaml');
|
||||
$cfg_db['Export']['compression'] = array('none', 'zip', 'gzip', 'bzip2');
|
||||
$cfg_db['Export']['charset'] = array_merge(array(''), $GLOBALS['cfg']['AvailableCharsets']);
|
||||
$cfg_db['Export']['method'] = array('quick', 'custom', 'custom-no-form');
|
||||
|
||||
/**
|
||||
* Config options which will be placed in config file even if they are set
|
||||
* to their default values (use only full paths)
|
||||
*/
|
||||
$persist_keys = array(
|
||||
'DefaultLang',
|
||||
'ServerDefault',
|
||||
'UploadDir',
|
||||
'SaveDir',
|
||||
'Servers/1/verbose',
|
||||
'Servers/1/host',
|
||||
'Servers/1/port',
|
||||
'Servers/1/socket',
|
||||
'Servers/1/extension',
|
||||
'Servers/1/connect_type',
|
||||
'Servers/1/auth_type',
|
||||
'Servers/1/user',
|
||||
'Servers/1/password');
|
||||
|
||||
/**
|
||||
* Default values overrides
|
||||
* Use only full paths
|
||||
*/
|
||||
$cfg_db['_overrides'] = array();
|
||||
$cfg_db['_overrides']['Servers/1/extension'] = extension_loaded('mysqli')
|
||||
? 'mysqli' : 'mysql';
|
||||
|
||||
/**
|
||||
* Validator assignments (functions from validate.lib.php and 'validators'
|
||||
* object in scripts.js)
|
||||
* Use only full paths and form ids
|
||||
*/
|
||||
$cfg_db['_validators'] = array(
|
||||
'Server' => 'validate_server',
|
||||
'Server_pmadb' => 'validate_pmadb',
|
||||
'Servers/1/port' => 'validate_port_number',
|
||||
'Servers/1/hide_db' => 'validate_regex',
|
||||
'TrustedProxies' => 'validate_trusted_proxies',
|
||||
'LoginCookieValidity' => 'validate_positive_number',
|
||||
'LoginCookieStore' => 'validate_non_negative_number',
|
||||
'QueryHistoryMax' => 'validate_positive_number',
|
||||
'LeftFrameTableLevel' => 'validate_positive_number',
|
||||
'MaxRows' => 'validate_positive_number',
|
||||
'CharTextareaCols' => 'validate_positive_number',
|
||||
'CharTextareaRows' => 'validate_positive_number',
|
||||
'InsertRows' => 'validate_positive_number',
|
||||
'ForeignKeyMaxLimit' => 'validate_positive_number',
|
||||
'Import/skip_queries' => 'validate_non_negative_number');
|
||||
?>
|
||||
@@ -1,10 +1,9 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Formset processing library
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
|
||||
/**
|
||||
@@ -41,13 +40,13 @@ function process_formset(FormDisplay $form_display) {
|
||||
?>
|
||||
<div class="warning">
|
||||
<h4><?php echo __('Warning') ?></h4>
|
||||
<?php echo PMA_lang('error_form') ?><br />
|
||||
<a href="?page=<?php echo $page . $formset . $id . $separator ?>mode=revert"><?php echo PMA_lang('RevertErroneousFields') ?></a>
|
||||
<?php echo __('Submitted form contains errors') ?><br />
|
||||
<a href="?page=<?php echo $page . $formset . $id . $separator ?>mode=revert"><?php echo __('Try to revert erroneous fields to their default values') ?></a>
|
||||
</div>
|
||||
<?php $form_display->displayErrors() ?>
|
||||
<a class="btn" href="index.php"><?php echo PMA_lang('IgnoreErrors') ?></a>
|
||||
<a class="btn" href="index.php"><?php echo __('Ignore errors') ?></a>
|
||||
|
||||
<a class="btn" href="?page=<?php echo $page . $formset . $id . $separator ?>mode=edit"><?php echo PMA_lang('ShowForm') ?></a>
|
||||
<a class="btn" href="?page=<?php echo $page . $formset . $id . $separator ?>mode=edit"><?php echo __('Show form') ?></a>
|
||||
<?php
|
||||
} else {
|
||||
// drop post data
|
||||
|
||||
@@ -1,183 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* List of avaible forms, each form is described as an array of fields to display.
|
||||
* Fields MUST have their counterparts in the $cfg array.
|
||||
*
|
||||
* There are two possible notations:
|
||||
* $forms['Form name'] = array('Servers' => array(1 => array('host')));
|
||||
* can be written as
|
||||
* $forms['Form name'] = array('Servers/1/host');
|
||||
*
|
||||
* You can assign default values set by special button ("set value: ..."), eg.:
|
||||
* $forms['Server_pmadb'] = array('Servers' => array(1 => array(
|
||||
* 'pmadb' => 'phpmyadmin')));
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
$forms = array();
|
||||
$forms['_config.php'] = array(
|
||||
'DefaultLang',
|
||||
'ServerDefault');
|
||||
$forms['Server'] = array('Servers' => array(1 => array(
|
||||
'verbose',
|
||||
'host',
|
||||
'port',
|
||||
'socket',
|
||||
'ssl',
|
||||
'connect_type',
|
||||
'extension',
|
||||
'compress',
|
||||
'auth_type',
|
||||
'auth_http_realm',
|
||||
'user',
|
||||
'password',
|
||||
'nopassword',
|
||||
'auth_swekey_config' => './swekey.conf')));
|
||||
$forms['Server_login_options'] = array('Servers' => array(1 => array(
|
||||
'SignonSession',
|
||||
'SignonURL',
|
||||
'LogoutURL')));
|
||||
$forms['Server_config'] = array('Servers' => array(1 => array(
|
||||
'only_db',
|
||||
'hide_db',
|
||||
'AllowRoot',
|
||||
'AllowNoPassword',
|
||||
'DisableIS',
|
||||
'AllowDeny/order',
|
||||
'AllowDeny/rules',
|
||||
'ShowDatabasesCommand',
|
||||
'CountTables')));
|
||||
$forms['Server_pmadb'] = array('Servers' => array(1 => array(
|
||||
'pmadb' => 'phpmyadmin',
|
||||
'controluser',
|
||||
'controlpass',
|
||||
'verbose_check',
|
||||
'bookmarktable' => 'pma_bookmark',
|
||||
'relation' => 'pma_relation',
|
||||
'table_info' => 'pma_table_info',
|
||||
'table_coords' => 'pma_table_coords',
|
||||
'pdf_pages' => 'pma_pdf_pages',
|
||||
'column_info' => 'pma_column_info',
|
||||
'history' => 'pma_history',
|
||||
'tracking' => 'pma_tracking',
|
||||
'designer_coords' => 'pma_designer_coords')));
|
||||
$forms['Server_tracking'] = array('Servers' => array(1 => array(
|
||||
'tracking_version_auto_create',
|
||||
'tracking_default_statements',
|
||||
'tracking_add_drop_view',
|
||||
'tracking_add_drop_table',
|
||||
'tracking_add_drop_database',
|
||||
)));
|
||||
$forms['Import_export'] = array(
|
||||
'UploadDir',
|
||||
'SaveDir',
|
||||
'RecodingEngine',
|
||||
'IconvExtraParams',
|
||||
'ZipDump',
|
||||
'GZipDump',
|
||||
'BZipDump',
|
||||
'CompressOnFly');
|
||||
$forms['Security'] = array(
|
||||
'blowfish_secret',
|
||||
'ForceSSL',
|
||||
'CheckConfigurationPermissions',
|
||||
'TrustedProxies',
|
||||
'AllowUserDropDatabase',
|
||||
'AllowArbitraryServer',
|
||||
'LoginCookieRecall',
|
||||
'LoginCookieValidity',
|
||||
'LoginCookieStore',
|
||||
'LoginCookieDeleteAll');
|
||||
$forms['Sql_queries'] = array(
|
||||
'ShowSQL',
|
||||
'Confirm',
|
||||
'QueryHistoryDB',
|
||||
'QueryHistoryMax',
|
||||
'IgnoreMultiSubmitErrors',
|
||||
'VerboseMultiSubmit');
|
||||
$forms['Other_core_settings'] = array(
|
||||
'MaxDbList',
|
||||
'MaxTableList',
|
||||
'MaxCharactersInDisplayedSQL',
|
||||
'OBGzip',
|
||||
'PersistentConnections',
|
||||
'ExecTimeLimit',
|
||||
'MemoryLimit',
|
||||
'SkipLockedTables',
|
||||
'UseDbSearch');
|
||||
$forms['Left_frame'] = array(
|
||||
'LeftFrameLight',
|
||||
'LeftDisplayLogo',
|
||||
'LeftLogoLink',
|
||||
'LeftLogoLinkWindow',
|
||||
'LeftDefaultTabTable',
|
||||
'LeftPointerEnable');
|
||||
$forms['Left_servers'] = array(
|
||||
'LeftDisplayServers',
|
||||
'DisplayServersList');
|
||||
$forms['Left_databases'] = array(
|
||||
'DisplayDatabasesList',
|
||||
'LeftFrameDBTree',
|
||||
'LeftFrameDBSeparator',
|
||||
'ShowTooltipAliasDB');
|
||||
$forms['Left_tables'] = array(
|
||||
'LeftFrameTableSeparator',
|
||||
'LeftFrameTableLevel',
|
||||
'ShowTooltip',
|
||||
'ShowTooltipAliasTB');
|
||||
$forms['Startup'] = array(
|
||||
'ShowStats',
|
||||
'ShowPhpInfo',
|
||||
'ShowServerInfo',
|
||||
'ShowChgPassword',
|
||||
'ShowCreateDb',
|
||||
'SuggestDBName');
|
||||
$forms['Browse'] = array(
|
||||
'NavigationBarIconic',
|
||||
'ShowAll',
|
||||
'MaxRows',
|
||||
'Order',
|
||||
'BrowsePointerEnable',
|
||||
'BrowseMarkerEnable');
|
||||
$forms['Edit'] = array(
|
||||
'ProtectBinary',
|
||||
'ShowFunctionFields',
|
||||
'CharEditing',
|
||||
'CharTextareaCols',
|
||||
'CharTextareaRows',
|
||||
'InsertRows',
|
||||
'ForeignKeyDropdownOrder',
|
||||
'ForeignKeyMaxLimit');
|
||||
$forms['Tabs'] = array(
|
||||
'LightTabs',
|
||||
'PropertiesIconic',
|
||||
'DefaultTabServer',
|
||||
'DefaultTabDatabase',
|
||||
'DefaultTabTable',
|
||||
'QueryWindowDefTab');
|
||||
$forms['Sql_box'] = array('SQLQuery' => array(
|
||||
'Edit',
|
||||
'Explain',
|
||||
'ShowAsPHP',
|
||||
'Validate',
|
||||
'Refresh'));
|
||||
$forms['Import_defaults'] = array('Import' => array(
|
||||
'format',
|
||||
'allow_interrupt',
|
||||
'skip_queries'));
|
||||
$forms['Export_defaults'] = array('Export' => array(
|
||||
'format',
|
||||
'method',
|
||||
'compression',
|
||||
'asfile',
|
||||
'charset',
|
||||
'onserver',
|
||||
'onserver_overwrite',
|
||||
'remember_file_template',
|
||||
'file_template_table',
|
||||
'file_template_database',
|
||||
'file_template_server'));
|
||||
?>
|
||||
@@ -1,14 +1,12 @@
|
||||
<?php
|
||||
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Various checks and message functions used on index page.
|
||||
*
|
||||
* Security checks are the idea of Aung Khant <aungkhant[at]yehg.net>, http://yehg.net/lab
|
||||
* Version check taken from the old setup script by Michal Čihař <michal@cihar.com>
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
|
||||
if (!defined('PHPMYADMIN')) {
|
||||
@@ -44,7 +42,6 @@ function messages_begin()
|
||||
function messages_set($type, $id, $title, $message)
|
||||
{
|
||||
$fresh = !isset($_SESSION['messages'][$type][$id]);
|
||||
$title = PMA_lang($title);
|
||||
$_SESSION['messages'][$type][$id] = array(
|
||||
'fresh' => $fresh,
|
||||
'active' => true,
|
||||
@@ -118,15 +115,15 @@ function PMA_version_check()
|
||||
$data = curl_exec($ch);
|
||||
curl_close($ch);
|
||||
} else {
|
||||
messages_set('error', $message_id, 'VersionCheck',
|
||||
PMA_lang('VersionCheckWrapperError'));
|
||||
messages_set('error', $message_id, __('Version check'),
|
||||
__('Neither URL wrapper nor CURL is available. Version check is not possible.'));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (empty($data)) {
|
||||
messages_set('error', $message_id, 'VersionCheck',
|
||||
PMA_lang('VersionCheckDataError'));
|
||||
messages_set('error', $message_id, __('Version check'),
|
||||
__('Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.'));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -142,30 +139,30 @@ function PMA_version_check()
|
||||
|
||||
$version_upstream = version_to_int($version);
|
||||
if ($version_upstream === false) {
|
||||
messages_set('error', $message_id, 'VersionCheck',
|
||||
PMA_lang('VersionCheckInvalid'));
|
||||
messages_set('error', $message_id, __('Version check'),
|
||||
__('Got invalid version string from server'));
|
||||
return;
|
||||
}
|
||||
|
||||
$version_local = version_to_int($GLOBALS['PMA_Config']->get('PMA_VERSION'));
|
||||
if ($version_local === false) {
|
||||
messages_set('error', $message_id, 'VersionCheck',
|
||||
PMA_lang('VersionCheckUnparsable'));
|
||||
messages_set('error', $message_id, __('Version check'),
|
||||
__('Unparsable version string'));
|
||||
return;
|
||||
}
|
||||
|
||||
if ($version_upstream > $version_local) {
|
||||
$version = htmlspecialchars($version);
|
||||
$date = htmlspecialchars($date);
|
||||
messages_set('notice', $message_id, 'VersionCheck',
|
||||
PMA_lang('VersionCheckNewAvailable', $version, $date));
|
||||
messages_set('notice', $message_id, __('Version check'),
|
||||
sprintf(__('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.'), $version, $date));
|
||||
} else {
|
||||
if ($version_local % 100 == 0) {
|
||||
messages_set('notice', $message_id, 'VersionCheck',
|
||||
PMA_lang('VersionCheckNewAvailableSvn', $version, $date));
|
||||
messages_set('notice', $message_id, __('Version check'),
|
||||
PMA_sanitize(sprintf(__('You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable version is %s, released on %s.'), $version, $date)));
|
||||
} else {
|
||||
messages_set('notice', $message_id, 'VersionCheck',
|
||||
PMA_lang('VersionCheckNone'));
|
||||
messages_set('notice', $message_id, __('Version check'),
|
||||
__('No newer stable version is available'));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -200,7 +197,7 @@ function version_to_int($version)
|
||||
$added = 0;
|
||||
break;
|
||||
default:
|
||||
messages_set('notice', 'version_match', 'VersionCheck',
|
||||
messages_set('notice', 'version_match', __('Version check'),
|
||||
'Unknown version part: ' . htmlspecialchars($matches[6]));
|
||||
$added = 0;
|
||||
break;
|
||||
@@ -249,6 +246,19 @@ function perform_config_checks()
|
||||
$blowfish_secret = $cf->get('blowfish_secret');
|
||||
$blowfish_secret_set = false;
|
||||
$cookie_auth_used = false;
|
||||
|
||||
$strAllowArbitraryServerWarning = __('This [a@?page=form&formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
|
||||
$strBlowfishSecretMsg = __('You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.');
|
||||
$strBZipDumpWarning = __('[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.');
|
||||
$strDirectoryNotice = __('This value should be double checked to ensure that this directory is neither world accessible nor readable or writable by other users on your server.');
|
||||
$strForceSSLNotice = __('This [a@?page=form&formset=features#tab_Security]option[/a] should be enabled if your web server supports it');
|
||||
$strGZipDumpWarning = __('[a@?page=form&formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.');
|
||||
$strLoginCookieValidityWarning = __('[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.');
|
||||
$strSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - [a@?page=servers&mode=edit&id=%1$d#tab_Server_config]host authentication[/a] settings and [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
|
||||
$strServerAuthConfigMsg = __('You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/kbd].');
|
||||
$strZipDumpExportWarning = __('[a@?page=form&formset=features#tab_Import_export]Zip compression[/a] requires functions (%s) which are unavailable on this system.');
|
||||
$strZipDumpImportWarning = __('[a@?page=form&formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.');
|
||||
|
||||
for ($i = 1, $server_cnt = $cf->getServerCount(); $i <= $server_cnt; $i++) {
|
||||
$cookie_auth_server = ($cf->getValue("Servers/$i/auth_type") == 'cookie');
|
||||
$cookie_auth_used |= $cookie_auth_server;
|
||||
@@ -268,9 +278,9 @@ function perform_config_checks()
|
||||
// should be enabled if possible
|
||||
//
|
||||
if (!$cf->getValue("Servers/$i/ssl")) {
|
||||
$title = PMA_lang_name('Servers/1/ssl') . " ($server_name)";
|
||||
$title = PMA_lang(PMA_lang_name('Servers/1/ssl')) . " ($server_name)";
|
||||
messages_set('notice', "Servers/$i/ssl", $title,
|
||||
PMA_lang('ServerSslMsg'));
|
||||
__('You should use SSL connections if your web server supports it'));
|
||||
}
|
||||
|
||||
//
|
||||
@@ -278,9 +288,9 @@ function perform_config_checks()
|
||||
// warn about using 'mysql'
|
||||
//
|
||||
if ($cf->getValue("Servers/$i/extension") == 'mysql') {
|
||||
$title = PMA_lang_name('Servers/1/extension') . " ($server_name)";
|
||||
$title = PMA_lang(PMA_lang_name('Servers/1/extension')) . " ($server_name)";
|
||||
messages_set('notice', "Servers/$i/extension", $title,
|
||||
PMA_lang('ServerExtensionMsg'));
|
||||
__('You should use mysqli for performance reasons'));
|
||||
}
|
||||
|
||||
//
|
||||
@@ -288,12 +298,12 @@ function perform_config_checks()
|
||||
// warn about full user credentials if 'auth_type' is 'config'
|
||||
//
|
||||
if ($cf->getValue("Servers/$i/auth_type") == 'config'
|
||||
&& $cf->getValue("Servers/$i/user") != ''
|
||||
&& $cf->getValue("Servers/$i/password") != '') {
|
||||
$title = PMA_lang_name('Servers/1/auth_type') . " ($server_name)";
|
||||
&& $cf->getValue("Servers/$i/user") != ''
|
||||
&& $cf->getValue("Servers/$i/password") != '') {
|
||||
$title = PMA_lang(PMA_lang_name('Servers/1/auth_type')) . " ($server_name)";
|
||||
messages_set('warning', "Servers/$i/auth_type", $title,
|
||||
PMA_lang('ServerAuthConfigMsg', $i) . ' ' .
|
||||
PMA_lang('ServerSecurityInfoMsg', $i));
|
||||
PMA_lang($strServerAuthConfigMsg, $i) . ' ' .
|
||||
PMA_lang($strSecurityInfoMsg, $i));
|
||||
}
|
||||
|
||||
//
|
||||
@@ -302,11 +312,11 @@ function perform_config_checks()
|
||||
// serious security flaw
|
||||
//
|
||||
if ($cf->getValue("Servers/$i/AllowRoot")
|
||||
&& $cf->getValue("Servers/$i/AllowNoPassword")) {
|
||||
$title = PMA_lang_name('Servers/1/AllowNoPassword') . " ($server_name)";
|
||||
&& $cf->getValue("Servers/$i/AllowNoPassword")) {
|
||||
$title = PMA_lang(PMA_lang_name('Servers/1/AllowNoPassword')) . " ($server_name)";
|
||||
messages_set('warning', "Servers/$i/AllowNoPassword", $title,
|
||||
PMA_lang('ServerNoPasswordMsg') . ' ' .
|
||||
PMA_lang('ServerSecurityInfoMsg', $i));
|
||||
__('You allow for connecting to the server without a password.') . ' ' .
|
||||
PMA_lang($strSecurityInfoMsg, $i));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -317,25 +327,27 @@ function perform_config_checks()
|
||||
if ($cookie_auth_used) {
|
||||
if ($blowfish_secret_set) {
|
||||
// 'cookie' auth used, blowfish_secret was generated
|
||||
messages_set('notice', 'blowfish_secret_created', 'blowfish_secret_name',
|
||||
PMA_lang('BlowfishSecretMsg'));
|
||||
messages_set('notice', 'blowfish_secret_created',
|
||||
PMA_lang(PMA_lang_name('blowfish_secret')),
|
||||
$strBlowfishSecretMsg);
|
||||
} else {
|
||||
$blowfish_warnings = array();
|
||||
// check length
|
||||
if (strlen($blowfish_secret) < 8) {
|
||||
// too short key
|
||||
$blowfish_warnings[] = PMA_lang('BlowfishSecretLengthMsg');
|
||||
$blowfish_warnings[] = __('Key is too short, it should have at least 8 characters');
|
||||
}
|
||||
// check used characters
|
||||
$has_digits = (bool) preg_match('/\d/', $blowfish_secret);
|
||||
$has_chars = (bool) preg_match('/\S/', $blowfish_secret);
|
||||
$has_nonword = (bool) preg_match('/\W/', $blowfish_secret);
|
||||
if (!$has_digits || !$has_chars || !$has_nonword) {
|
||||
$blowfish_warnings[] = PMA_lang('BlowfishSecretCharsMsg');
|
||||
$blowfish_warnings[] = PMA_lang(__('Key should contain letters, numbers [em]and[/em] special characters'));
|
||||
}
|
||||
if (!empty($blowfish_warnings)) {
|
||||
messages_set('warning', 'blowfish_warnings' . count($blowfish_warnings),
|
||||
'blowfish_secret_name', implode("<br />", $blowfish_warnings));
|
||||
PMA_lang(PMA_lang_name('blowfish_secret')),
|
||||
implode("<br />", $blowfish_warnings));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -345,8 +357,9 @@ function perform_config_checks()
|
||||
// should be enabled if possible
|
||||
//
|
||||
if (!$cf->getValue('ForceSSL')) {
|
||||
messages_set('notice', 'ForceSSL', 'ForceSSL_name',
|
||||
PMA_lang('ForceSSLMsg'));
|
||||
messages_set('notice', 'ForceSSL',
|
||||
PMA_lang(PMA_lang_name('ForceSSL')),
|
||||
PMA_lang($strForceSSLNotice));
|
||||
}
|
||||
|
||||
//
|
||||
@@ -354,8 +367,9 @@ function perform_config_checks()
|
||||
// should be disabled
|
||||
//
|
||||
if ($cf->getValue('AllowArbitraryServer')) {
|
||||
messages_set('warning', 'AllowArbitraryServer', 'AllowArbitraryServer_name',
|
||||
PMA_lang('AllowArbitraryServerMsg'));
|
||||
messages_set('warning', 'AllowArbitraryServer',
|
||||
PMA_lang(PMA_lang_name('AllowArbitraryServer')),
|
||||
PMA_lang($strAllowArbitraryServerWarning));
|
||||
}
|
||||
|
||||
//
|
||||
@@ -363,8 +377,9 @@ function perform_config_checks()
|
||||
// should be at most 1800 (30 min)
|
||||
//
|
||||
if ($cf->getValue('LoginCookieValidity') > 1800) {
|
||||
messages_set('warning', 'LoginCookieValidity', 'LoginCookieValidity_name',
|
||||
PMA_lang('LoginCookieValidityMsg'));
|
||||
messages_set('warning', 'LoginCookieValidity',
|
||||
PMA_lang(PMA_lang_name('LoginCookieValidity')),
|
||||
PMA_lang($strLoginCookieValidityWarning));
|
||||
}
|
||||
|
||||
//
|
||||
@@ -372,8 +387,9 @@ function perform_config_checks()
|
||||
// should not be world-accessible
|
||||
//
|
||||
if ($cf->getValue('SaveDir') != '') {
|
||||
messages_set('notice', 'SaveDir', 'SaveDir_name',
|
||||
PMA_lang('DirectoryNotice'));
|
||||
messages_set('notice', 'SaveDir',
|
||||
PMA_lang(PMA_lang_name('SaveDir')),
|
||||
PMA_lang($strDirectoryNotice));
|
||||
}
|
||||
|
||||
//
|
||||
@@ -381,8 +397,9 @@ function perform_config_checks()
|
||||
// should not be world-accessible
|
||||
//
|
||||
if ($cf->getValue('TempDir') != '') {
|
||||
messages_set('notice', 'TempDir', 'TempDir_name',
|
||||
PMA_lang('DirectoryNotice'));
|
||||
messages_set('notice', 'TempDir',
|
||||
PMA_lang(PMA_lang_name('TempDir')),
|
||||
PMA_lang($strDirectoryNotice));
|
||||
}
|
||||
|
||||
//
|
||||
@@ -390,9 +407,10 @@ function perform_config_checks()
|
||||
// requires zlib functions
|
||||
//
|
||||
if ($cf->getValue('GZipDump')
|
||||
&& (@!function_exists('gzopen') || @!function_exists('gzencode'))) {
|
||||
messages_set('warning', 'GZipDump', 'GZipDump_name',
|
||||
PMA_lang('GZipDumpWarning', 'gzencode'));
|
||||
&& (@!function_exists('gzopen') || @!function_exists('gzencode'))) {
|
||||
messages_set('warning', 'GZipDump',
|
||||
PMA_lang(PMA_lang_name('GZipDump')),
|
||||
PMA_lang($strGZipDumpWarning, 'gzencode'));
|
||||
}
|
||||
|
||||
//
|
||||
@@ -400,15 +418,16 @@ function perform_config_checks()
|
||||
// requires bzip2 functions
|
||||
//
|
||||
if ($cf->getValue('BZipDump')
|
||||
&& (!@function_exists('bzopen') || !@function_exists('bzcompress'))) {
|
||||
&& (!@function_exists('bzopen') || !@function_exists('bzcompress'))) {
|
||||
$functions = @function_exists('bzopen')
|
||||
? '' :
|
||||
'bzopen';
|
||||
? '' :
|
||||
'bzopen';
|
||||
$functions .= @function_exists('bzcompress')
|
||||
? ''
|
||||
: ($functions ? ', ' : '') . 'bzcompress';
|
||||
messages_set('warning', 'BZipDump', 'BZipDump_name',
|
||||
PMA_lang('BZipDumpWarning', $functions));
|
||||
? ''
|
||||
: ($functions ? ', ' : '') . 'bzcompress';
|
||||
messages_set('warning', 'BZipDump',
|
||||
PMA_lang(PMA_lang_name('BZipDump')),
|
||||
PMA_lang($strBZipDumpWarning, $functions));
|
||||
}
|
||||
|
||||
//
|
||||
@@ -416,8 +435,9 @@ function perform_config_checks()
|
||||
// requires zip_open in import
|
||||
//
|
||||
if ($cf->getValue('ZipDump') && !@function_exists('zip_open')) {
|
||||
messages_set('warning', 'ZipDump_import', 'ZipDump_name',
|
||||
PMA_lang('ZipDumpImportWarning', 'zip_open'));
|
||||
messages_set('warning', 'ZipDump_import',
|
||||
PMA_lang(PMA_lang_name('ZipDump')),
|
||||
PMA_lang($strZipDumpImportWarning, 'zip_open'));
|
||||
}
|
||||
|
||||
//
|
||||
@@ -425,8 +445,9 @@ function perform_config_checks()
|
||||
// requires gzcompress in export
|
||||
//
|
||||
if ($cf->getValue('ZipDump') && !@function_exists('gzcompress')) {
|
||||
messages_set('warning', 'ZipDump_export', 'ZipDump_name',
|
||||
PMA_lang('ZipDumpExportWarning', 'gzcompress'));
|
||||
messages_set('warning', 'ZipDump_export',
|
||||
PMA_lang(PMA_lang_name('ZipDump')),
|
||||
PMA_lang($strZipDumpExportWarning, 'gzcompress'));
|
||||
}
|
||||
}
|
||||
?>
|
||||
?>
|
||||
@@ -1,381 +0,0 @@
|
||||
<?php
|
||||
/* $Id$ */
|
||||
/**
|
||||
* Messages for phpMyAdmin.
|
||||
*
|
||||
* This file is here for easy transition to Gettext. You should not add any
|
||||
* new messages here, use instead gettext directly in your template/PHP
|
||||
* file.
|
||||
*/
|
||||
|
||||
if (!function_exists('__')) {
|
||||
die('Bad invocation!');
|
||||
}
|
||||
|
||||
|
||||
$strSetupAllowArbitraryServer_desc = __('If enabled user can enter any MySQL server in login form for cookie auth');
|
||||
$strSetupAllowArbitraryServerMsg = __('This [a@?page=form&formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
|
||||
$strSetupAllowArbitraryServer_name = __('Allow login to any MySQL server');
|
||||
$strSetupAllowUserDropDatabase_name = __('Show "Drop database" link to normal users');
|
||||
$strSetupBlowfishSecretCharsMsg = __('Key should contain letters, numbers [em]and[/em] special characters');
|
||||
$strSetupblowfish_secret_desc = __('Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication');
|
||||
$strSetupBlowfishSecretLengthMsg = __('Key is too short, it should have at least 8 characters');
|
||||
$strSetupBlowfishSecretMsg = __('You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.');
|
||||
$strSetupblowfish_secret_name = __('Blowfish secret');
|
||||
$strSetupBrowseMarkerEnable_desc = __('Highlight selected rows');
|
||||
$strSetupBrowseMarkerEnable_name = __('Row marker');
|
||||
$strSetupBrowsePointerEnable_desc = __('Highlight row pointed by the mouse cursor');
|
||||
$strSetupBrowsePointerEnable_name = __('Highlight pointer');
|
||||
$strSetupBZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for import and export operations');
|
||||
$strSetupBZipDump_name = __('Bzip2');
|
||||
$strSetupBZipDumpWarning = __('[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.');
|
||||
$strSetupCannotLoadConfig = __('Cannot load or save configuration');
|
||||
$strSetupCannotLoadConfigMsg = __('Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.');
|
||||
$strSetupCharEditing_desc = __('Defines which type of editing controls should be used for CHAR and VARCHAR columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in columns');
|
||||
$strSetupCharEditing_name = __('CHAR columns editing');
|
||||
$strSetupCharTextareaCols_desc = __('Number of columns for CHAR/VARCHAR textareas');
|
||||
$strSetupCharTextareaCols_name = __('CHAR textarea columns');
|
||||
$strSetupCharTextareaRows_desc = __('Number of rows for CHAR/VARCHAR textareas');
|
||||
$strSetupCharTextareaRows_name = __('CHAR textarea rows');
|
||||
$strSetupCheckConfigurationPermissions_name = __('Check config file permissions');
|
||||
$strSetupClear = __('Clear');
|
||||
$strSetupCompressOnFly_desc = __('Compress gzip/bzip2 exports on the fly without the need for much memory; if you encounter problems with created gzip/bzip2 files disable this feature');
|
||||
$strSetupCompressOnFly_name = __('Compress on the fly');
|
||||
$strSetupConfigurationFile = __('Configuration file');
|
||||
$strSetupConfirm_desc = __('Whether a warning ("Are your really sure...") should be displayed when you\'re about to lose data');
|
||||
$strSetupConfirm_name = __('Confirm DROP queries');
|
||||
$strSetupDefaultLanguage = __('Default language');
|
||||
$strSetupDefaultServer = __('Default server');
|
||||
$strSetupDefaultTabDatabase_desc = __('Tab that is displayed when entering a database');
|
||||
$strSetupDefaultTabDatabase_name = __('Default database tab');
|
||||
$strSetupDefaultTabServer_desc = __('Tab that is displayed when entering a server');
|
||||
$strSetupDefaultTabServer_name = __('Default server tab');
|
||||
$strSetupDefaultTabTable_desc = __('Tab that is displayed when entering a table');
|
||||
$strSetupDefaultTabTable_name = __('Default table tab');
|
||||
$strSetupDirectoryNotice = __('This value should be double checked to ensure that this directory is neither world accessible nor readable or writable by other users on your server.');
|
||||
$strSetupDisplayDatabasesList_desc = __('Show database listing as a list instead of a drop down');
|
||||
$strSetupDisplayDatabasesList_name = __('Display databases as a list');
|
||||
$strSetupDisplay = __('Display');
|
||||
$strSetupDisplayServersList_desc = __('Show server listing as a list instead of a drop down');
|
||||
$strSetupDisplayServersList_name = __('Display servers as a list');
|
||||
$strSetupDonateLink = __('Donate');
|
||||
$strSetupDownload = __('Download');
|
||||
$strSetupEndOfLine = __('End of line');
|
||||
$strSetuperror_connection = __('Could not connect to MySQL server');
|
||||
$strSetuperror_empty_pmadb_password = __('Empty phpMyAdmin control user password while using pmadb');
|
||||
$strSetuperror_empty_pmadb_user = __('Empty phpMyAdmin control user while using pmadb');
|
||||
$strSetuperror_empty_signon_session = __('Empty signon session name while using signon authentication method');
|
||||
$strSetuperror_empty_signon_url = __('Empty signon URL while using signon authentication method');
|
||||
$strSetuperror_empty_user_for_config_auth = __('Empty username while using config authentication method');
|
||||
$strSetuperror_form = __('Submitted form contains errors');
|
||||
$strSetuperror_incorrect_ip_address = __('Incorrect IP address: %s');
|
||||
$strSetuperror_incorrect_port = __('Not a valid port number');
|
||||
$strSetuperror_incorrect_value = __('Incorrect value');
|
||||
$strSetuperror_missing_field_data = __('Missing data for %s');
|
||||
$strSetuperror_nan_nneg = __('Not a non-negative number');
|
||||
$strSetuperror_nan_p = __('Not a positive number');
|
||||
$strSetupExecTimeLimit_desc = __('Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)');
|
||||
$strSetupExecTimeLimit_name = __('Maximum execution time');
|
||||
$strSetupExport_asfile_name = __('Save as file');
|
||||
$strSetupExport_charset_name = __('Character set of the file');
|
||||
$strSetupExport_compression_name = __('Compression');
|
||||
$strSetupExport_file_template_database_name = __('Database name template');
|
||||
$strSetupExport_file_template_server_name = __('Server name template');
|
||||
$strSetupExport_file_template_table_name = __('Table name template');
|
||||
$strSetupExport_format_name = __('Format');
|
||||
$strSetupExport_method_name = __('Method');
|
||||
$strSetupExport_onserver_name = __('Save on server');
|
||||
$strSetupExport_onserver_overwrite_name = __('Overwrite existing file(s)');
|
||||
$strSetupExport_remember_file_template_name = __('Remember file name template');
|
||||
$strSetupFalse = __('no');
|
||||
$strSetupForceSSL_desc = __('Force secured connection while using phpMyAdmin');
|
||||
$strSetupForceSSLMsg = __('This [a@?page=form&formset=features#tab_Security]option[/a] should be enabled if your web server supports it');
|
||||
$strSetupForceSSL_name = __('Force SSL connection');
|
||||
$strSetupForeignKeyDropdownOrder_desc = __('Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is the referenced data, [kbd]id[/kbd] is the key value');
|
||||
$strSetupForeignKeyDropdownOrder_name = __('Foreign key dropdown order');
|
||||
$strSetupForeignKeyMaxLimit_desc = __('A dropdown will be used if fewer items are present');
|
||||
$strSetupForeignKeyMaxLimit_name = __('Foreign key limit');
|
||||
$strSetupForm_Browse = __('Browse mode');
|
||||
$strSetupForm_Browse_desc = __('Customize browse mode');
|
||||
$strSetupForm_Edit_desc = __('Customize edit mode');
|
||||
$strSetupForm_Edit = __('Edit mode');
|
||||
$strSetupForm_Export_defaults_desc = __('Customize default export options');
|
||||
$strSetupForm_Export_defaults = __('Export defaults');
|
||||
$strSetupForm_Import_defaults_desc = __('Customize default common import options');
|
||||
$strSetupForm_Import_defaults = __('Import defaults');
|
||||
$strSetupForm_Import_export_desc = __('Set import and export directories and compression options');
|
||||
$strSetupForm_Import_export = __('Import / export');
|
||||
$strSetupForm_Left_databases = __('Databases');
|
||||
$strSetupForm_Left_databases_desc = __('Databases display options');
|
||||
$strSetupForm_Left_frame_desc = __('Customize appearance of the navigation frame');
|
||||
$strSetupForm_Left_frame = __('Navigation frame');
|
||||
$strSetupForm_Left_servers_desc = __('Servers display options');
|
||||
$strSetupForm_Left_servers = __('Servers');
|
||||
$strSetupForm_Left_tables_desc = __('Tables display options');
|
||||
$strSetupForm_Left_tables = __('Tables');
|
||||
$strSetupForm_Main_frame = __('Main frame');
|
||||
$strSetupForm_Other_core_settings_desc = __('Settings that didn\'t fit enywhere else');
|
||||
$strSetupForm_Other_core_settings = __('Other core settings');
|
||||
$strSetupForm_Query_window_desc = __('Customize query window options');
|
||||
$strSetupForm_Query_window = __('Query window');
|
||||
$strSetupForm_Security_desc = __('Please note that phpMyAdmin is just a user interface and its features do not limit MySQL');
|
||||
$strSetupForm_Security = __('Security');
|
||||
$strSetupForm_Server = __('Basic settings');
|
||||
$strSetupForm_Server_config_desc = __('Advanced server configuration, do not change these options unless you know what they are for');
|
||||
$strSetupForm_Server_config = __('Server configuration');
|
||||
$strSetupForm_Server_desc = __('Enter server connection parameters');
|
||||
$strSetupForm_Server_login_options_desc = __('Enter login options for signon authentication');
|
||||
$strSetupForm_Server_login_options = __('Signon login options');
|
||||
$strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@../Documentation.html#linked-tables]phpMyAdmin configuration storage[/a] in documentation');
|
||||
$strSetupForm_Server_pmadb = __('PMA database');
|
||||
$strSetupForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
|
||||
$strSetupForm_Server_tracking = __('Changes tracking');
|
||||
$strSetupFormset_customization = __('Customization');
|
||||
$strSetupFormset_export = __('Customize export options');
|
||||
$strSetupFormset_features = __('Features');
|
||||
$strSetupFormset_import = __('Customize import defaults');
|
||||
$strSetupFormset_left_frame = __('Customize navigation frame');
|
||||
$strSetupFormset_main_frame = __('Customize main frame');
|
||||
$strSetupForm_Sql_box_desc = __('Customize links shown in SQL Query boxes');
|
||||
$strSetupForm_Sql_box = __('SQL Query box');
|
||||
$strSetupForm_Sql_queries_desc = __('SQL queries settings, for SQL Query box options see [a@?page=form&formset=main_frame#tab_Sql_box]Navigation frame[/a] settings');
|
||||
$strSetupForm_Sql_queries = __('SQL queries');
|
||||
$strSetupForm_Startup_desc = __('Customize startup page');
|
||||
$strSetupForm_Startup = __('Startup');
|
||||
$strSetupForm_Tabs_desc = __('Choose how you want tabs to work');
|
||||
$strSetupForm_Tabs = __('Tabs');
|
||||
$strSetupGZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import and export operations');
|
||||
$strSetupGZipDump_name = __('GZip');
|
||||
$strSetupGZipDumpWarning = __('[a@?page=form&formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.');
|
||||
$strSetupHomepageLink = __('phpMyAdmin homepage');
|
||||
$strSetupIconvExtraParams_name = __('Extra parameters for iconv');
|
||||
$strSetupIgnoreErrors = __('Ignore errors');
|
||||
$strSetupIgnoreMultiSubmitErrors_desc = __('If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed');
|
||||
$strSetupIgnoreMultiSubmitErrors_name = __('Ignore multiple statement errors');
|
||||
$strSetupImport_allow_interrupt_desc = __('Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.');
|
||||
$strSetupImport_allow_interrupt_name = __('Partial import: allow interrupt');
|
||||
$strSetupImport_format_desc = __('Default format; be aware that this list depends on location (database, table) and only SQL is always available');
|
||||
$strSetupImport_format_name = __('Format of imported file');
|
||||
$strSetupImport_skip_queries_desc = __('Number of queries to skip from start');
|
||||
$strSetupImport_skip_queries_name = __('Partial import: skip queries');
|
||||
$strSetupInsecureConnection = __('Insecure connection');
|
||||
$strSetupInsecureConnectionMsg1 = __('You are not using a secure connection; all data (including potentially sensitive information, like passwords) is transferred unencrypted!');
|
||||
$strSetupInsecureConnectionMsg2 = __('If your server is also configured to accept HTTPS requests follow [a@%s]this link[/a] to use a secure connection.');
|
||||
$strSetupInsertRows_desc = __('How many rows can be inserted at one time');
|
||||
$strSetupInsertRows_name = __('Number of inserted rows');
|
||||
$strSetupLeftDefaultTabTable_name = __('Target for quick access icon');
|
||||
$strSetupLeftDisplayLogo_desc = __('Show logo in left frame');
|
||||
$strSetupLeftDisplayLogo_name = __('Display logo');
|
||||
$strSetupLeftDisplayServers_desc = __('Display server choice at the top of the left frame');
|
||||
$strSetupLeftDisplayServers_name = __('Display servers selection');
|
||||
$strSetupLeftFrameDBSeparator_desc = __('String that separates databases into different tree levels');
|
||||
$strSetupLeftFrameDBSeparator_name = __('Database tree separator');
|
||||
$strSetupLeftFrameDBTree_desc = __('Only light version; display databases in a tree (determined by the separator defined below)');
|
||||
$strSetupLeftFrameDBTree_name = __('Display databases in a tree');
|
||||
$strSetupLeftFrameLight_desc = __('Disable this if you want to see all databases at once');
|
||||
$strSetupLeftFrameLight_name = __('Use light version');
|
||||
$strSetupLeftFrameTableLevel_name = __('Maximum table tree depth');
|
||||
$strSetupLeftFrameTableSeparator_desc = __('String that separates tables into different tree levels');
|
||||
$strSetupLeftFrameTableSeparator_name = __('Table tree separator');
|
||||
$strSetupLeftLogoLink_name = __('Logo link URL');
|
||||
$strSetupLeftLogoLinkWindow_desc = __('Open the linked page in the main window ([kbd]main[/kbd]) or in a new one ([kbd]new[/kbd])');
|
||||
$strSetupLeftLogoLinkWindow_name = __('Logo link target');
|
||||
$strSetupLeftPointerEnable_desc = __('Highlight server under the mouse cursor');
|
||||
$strSetupLeftPointerEnable_name = __('Enable highlighting');
|
||||
$strSetupLetUserChoose = __('let the user choose');
|
||||
$strSetupLightTabs_desc = __('Use less graphically intense tabs');
|
||||
$strSetupLightTabs_name = __('Light tabs');
|
||||
$strSetupLoad = __('Load');
|
||||
$strSetupLoginCookieDeleteAll_desc = __('If TRUE, logout deletes cookies for all servers; when set to FALSE, logout only occurs for the current server. Setting this to FALSE makes it easy to forget to log out from other servers when connected to multiple servers.');
|
||||
$strSetupLoginCookieDeleteAll_name = __('Delete all cookies on logout');
|
||||
$strSetupLoginCookieRecall_desc = __('Define whether the previous login should be recalled or not in cookie authentication mode');
|
||||
$strSetupLoginCookieRecall_name = __('Recall user name');
|
||||
$strSetupLoginCookieStore_desc = __('Defines how long (in seconds) a login cookie should be stored in browser. The default of 0 means that it will be kept for the existing session only, and will be deleted as soon as you close the browser window. This is recommended for non-trusted environments.');
|
||||
$strSetupLoginCookieStore_name = __('Login cookie store');
|
||||
$strSetupLoginCookieValidity_desc = __('Define how long (in seconds) a login cookie is valid');
|
||||
$strSetupLoginCookieValidityMsg = __('[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.');
|
||||
$strSetupLoginCookieValidity_name = __('Login cookie validity');
|
||||
$strSetupMaxCharactersInDisplayedSQL_desc = __('Maximum number of characters used when a SQL query is displayed');
|
||||
$strSetupMaxCharactersInDisplayedSQL_name = __('Maximum displayed SQL length');
|
||||
$strSetupMaxDbList_desc = __('Maximum number of databases displayed in left frame and database list');
|
||||
$strSetupMaxDbList_name = __('Maximum databases');
|
||||
$strSetupMaxRows_desc = __('Number of rows displayed when browsing a result set. If the result set contains more rows, "Previous" and "Next" links will be shown.');
|
||||
$strSetupMaxRows_name = __('Maximum number of rows to display');
|
||||
$strSetupMaxTableList_desc = __('Maximum number of tables displayed in table list');
|
||||
$strSetupMaxTableList_name = __('Maximum tables');
|
||||
$strSetupMemoryLimit_desc = __('The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ([kbd]0[/kbd] for no limit)');
|
||||
$strSetupMemoryLimit_name = __('Memory limit');
|
||||
$strSetupNavigationBarIconic_desc = __('Use only icons, only text or both');
|
||||
$strSetupNavigationBarIconic_name = __('Iconic navigation bar');
|
||||
$strSetupNewServer = __('New server');
|
||||
$strSetupNoServers = __('There are no configured servers');
|
||||
$strSetupOBGzip_desc = __('use GZip output buffering for increased speed in HTTP transfers');
|
||||
$strSetupOBGzip_name = __('GZip output buffering');
|
||||
$strSetupOptionNone = __('- none -');
|
||||
$strSetupOrder_desc = __('[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, DATETIME and TIMESTAMP, ascending order otherwise');
|
||||
$strSetupOrder_name = __('Default sorting order');
|
||||
$strSetupOverview = __('Overview');
|
||||
$strSetupPersistentConnections_desc = __('Use persistent connections to MySQL databases');
|
||||
$strSetupPersistentConnections_name = __('Persistent connections');
|
||||
$strSetupPropertiesIconic_desc = __('Use only icons, only text or both');
|
||||
$strSetupPropertiesIconic_name = __('Iconic table operations');
|
||||
$strSetupProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing');
|
||||
$strSetupProtectBinary_name = __('Protect binary columns');
|
||||
$strSetupQueryHistoryDB_desc = __('Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).');
|
||||
$strSetupQueryHistoryDB_name = __('Permanent query history');
|
||||
$strSetupQueryHistoryMax_desc = __('How many queries are kept in history');
|
||||
$strSetupQueryHistoryMax_name = __('Query history length');
|
||||
$strSetupQueryWindowDefTab_desc = __('Tab displayed when opening a new query window');
|
||||
$strSetupQueryWindowDefTab_name = __('Default query window tab');
|
||||
$strSetupRecodingEngine_desc = __('Select which functions will be used for character set conversion');
|
||||
$strSetupRecodingEngine_name = __('Recoding engine');
|
||||
$strSetupRestoreDefaultValue = __('Restore default value');
|
||||
$strSetupRevertErroneousFields = __('Try to revert erroneous fields to their default values');
|
||||
$strSetupSaveDir_desc = __('Directory where exports can be saved on server');
|
||||
$strSetupSaveDir_name = __('Save directory');
|
||||
$strSetupServerAuthConfigMsg = __('You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/kbd].');
|
||||
$strSetupServerExtensionMsg = __('You should use mysqli for performance reasons');
|
||||
$strSetupServerNoPasswordMsg = __('You allow for connecting to the server without a password.');
|
||||
$strSetupServersAdd = __('Add a new server');
|
||||
$strSetupServers_AllowDeny_order_desc = __('Leave blank if not used');
|
||||
$strSetupServers_AllowDeny_order_name = __('Host authentication order');
|
||||
$strSetupServers_AllowDeny_rules_desc = __('Leave blank for defaults');
|
||||
$strSetupServers_AllowDeny_rules_name = __('Host authentication rules');
|
||||
$strSetupServers_AllowNoPassword_name = __('Allow logins without a password');
|
||||
$strSetupServers_AllowRoot_name = __('Allow root login');
|
||||
$strSetupServers_auth_http_realm_desc = __('HTTP Basic Auth Realm name to display when doing HTTP Auth');
|
||||
$strSetupServers_auth_http_realm_name = __('HTTP Realm');
|
||||
$strSetupServers_auth_swekey_config_desc = __('The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)');
|
||||
$strSetupServers_auth_swekey_config_name = __('SweKey config file');
|
||||
$strSetupServers_auth_type_desc = __('Authentication method to use');
|
||||
$strSetupServers_auth_type_name = __('Authentication type');
|
||||
$strSetupServers_bookmarktable_desc = __('Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] support, suggested: [kbd]pma_bookmark[/kbd]');
|
||||
$strSetupServers_bookmarktable_name = __('Bookmark table');
|
||||
$strSetupServers_column_info_desc = __('Leave blank for no column comments/mime types, suggested: [kbd]pma_column_info[/kbd]');
|
||||
$strSetupServers_column_info_name = __('Column information table');
|
||||
$strSetupServers_compress_desc = __('Compress connection to MySQL server');
|
||||
$strSetupServers_compress_name = __('Compress connection');
|
||||
$strSetupServers_connect_type_desc = __('How to connect to server, keep [kbd]tcp[/kbd] if unsure');
|
||||
$strSetupServers_connect_type_name = __('Connection type');
|
||||
$strSetupServers_controlpass_name = __('Control user password');
|
||||
$strSetupServers_controluser_desc = __('A special MySQL user configured with limited permissions, more information available on [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]');
|
||||
$strSetupServers_controluser_name = __('Control user');
|
||||
$strSetupServers_CountTables_desc = __('Count tables when showing database list');
|
||||
$strSetupServers_CountTables_name = __('Count tables');
|
||||
$strSetupServers_designer_coords_desc = __('Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/kbd]');
|
||||
$strSetupServers_designer_coords_name = __('Designer table');
|
||||
$strSetupServers_DisableIS_desc = __('More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]');
|
||||
$strSetupServers_DisableIS_name = __('Disable use of INFORMATION_SCHEMA');
|
||||
$strSetupServerSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - [a@?page=servers&mode=edit&id=%1$d#tab_Server_config]host authentication[/a] settings and [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
|
||||
$strSetupServersEdit = __('Edit server');
|
||||
$strSetupServers_extension_desc = __('What PHP extension to use; you should use mysqli if supported');
|
||||
$strSetupServers_extension_name = __('PHP extension to use');
|
||||
$strSetupServers_hide_db_desc = __('Hide databases matching regular expression (PCRE)');
|
||||
$strSetupServers_hide_db_name = __('Hide databases');
|
||||
$strSetupServers_history_desc = __('Leave blank for no SQL query history support, suggested: [kbd]pma_history[/kbd]');
|
||||
$strSetupServers_history_name = __('SQL query history table');
|
||||
$strSetupServers_tracking_desc = __('Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/kbd]');
|
||||
$strSetupServers_tracking_name = __('SQL query tracking table');
|
||||
$strSetupServers_host_desc = __('Hostname where MySQL server is running');
|
||||
$strSetupServers_host_name = __('Server hostname');
|
||||
$strSetupServers_LogoutURL_name = __('Logout URL');
|
||||
$strSetupServers_nopassword_desc = __('Try to connect without password');
|
||||
$strSetupServers_nopassword_name = __('Connect without password');
|
||||
$strSetupServers_only_db_desc = __('You can use MySQL wildcard characters (% and _), escape them if you want to use their literal instances, i.e. use \'my\_db\' and not \'my_db\'');
|
||||
$strSetupServers_only_db_name = __('Show only listed databases');
|
||||
$strSetupServers_password_desc = __('Leave empty if not using config auth');
|
||||
$strSetupServers_password_name = __('Password for config auth');
|
||||
$strSetupServers_pdf_pages_desc = __('Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]');
|
||||
$strSetupServers_pdf_pages_name = __('PDF schema: pages table');
|
||||
$strSetupServers_pmadb_desc = __('Database used for relations, bookmarks, and PDF features. See [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for no support. Suggested: [kbd]phpmyadmin[/kbd]');
|
||||
$strSetupServers_pmadb_name = __('PMA database');
|
||||
$strSetupServers_port_desc = __('Port on which MySQL server is listening, leave empty for default');
|
||||
$strSetupServers_port_name = __('Server port');
|
||||
$strSetupServers_relation_desc = __('Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links[/a] support, suggested: [kbd]pma_relation[/kbd]');
|
||||
$strSetupServers_relation_name = __('Relation table');
|
||||
$strSetupServers_ShowDatabasesCommand_desc = __('SQL command to fetch available databases');
|
||||
$strSetupServers_ShowDatabasesCommand_name = __('SHOW DATABASES command');
|
||||
$strSetupServers_SignonSession_desc = __('See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types[/a] for an example');
|
||||
$strSetupServers_SignonSession_name = __('Signon session name');
|
||||
$strSetupServers_SignonURL_name = __('Signon URL');
|
||||
$strSetupServers_tracking_version_auto_create_desc = __('Whether the tracking mechanism creates versions for tables and views automatically.');
|
||||
$strSetupServers_tracking_version_auto_create_name = __('Automatically create versions');
|
||||
$strSetupServers_tracking_default_statements_desc = __('Defines the list of statements the auto-creation uses for new versions.');
|
||||
$strSetupServers_tracking_default_statements_name = __('Statements to track');
|
||||
$strSetupServers_tracking_add_drop_view_desc = __('Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view.');
|
||||
$strSetupServers_tracking_add_drop_view_name = __('Add DROP VIEW');
|
||||
$strSetupServers_tracking_add_drop_table_desc = __('Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table.');
|
||||
$strSetupServers_tracking_add_drop_table_name = __('Add DROP TABLE');
|
||||
$strSetupServers_tracking_add_drop_database_desc = __('Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.');
|
||||
$strSetupServers_tracking_add_drop_database_name = __('Add DROP DATABASE');
|
||||
$strSetupServerSslMsg = __('You should use SSL connections if your web server supports it');
|
||||
$strSetupServers_socket_desc = __('Socket on which MySQL server is listening, leave empty for default');
|
||||
$strSetupServers_socket_name = __('Server socket');
|
||||
$strSetupServers_ssl_desc = __('Enable SSL for connection to MySQL server');
|
||||
$strSetupServers_ssl_name = __('Use SSL');
|
||||
$strSetupServers_table_coords_desc = __('Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]');
|
||||
$strSetupServers_table_coords_name = __('PDF schema: table coordinates');
|
||||
$strSetupServers_table_info_desc = __('Table to describe the display columns, leave blank for no support; suggested: [kbd]pma_table_info[/kbd]');
|
||||
$strSetupServers_table_info_name = __('Display columns table');
|
||||
$strSetupServers_user_desc = __('Leave empty if not using config auth');
|
||||
$strSetupServers_user_name = __('User for config auth');
|
||||
$strSetupServers_verbose_check_desc = __('Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance');
|
||||
$strSetupServers_verbose_check_name = __('Verbose check');
|
||||
$strSetupServers_verbose_desc = __('A user-friendly description of this server. Leave blank to display the hostname instead.');
|
||||
$strSetupServers_verbose_name = __('Verbose name of this server');
|
||||
$strSetupSetValue = __('Set value: %s');
|
||||
$strSetupShowAll_desc = __('Whether a user should be displayed a "show all (rows)" button');
|
||||
$strSetupShowAll_name = __('Allow to display all the rows');
|
||||
$strSetupShowChgPassword_desc = __('Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly');
|
||||
$strSetupShowChgPassword_name = __('Show password change form');
|
||||
$strSetupShowCreateDb_name = __('Show create database form');
|
||||
$strSetupShowForm = __('Show form');
|
||||
$strSetupShowFunctionFields_desc = __('Display the function fields in edit/insert mode');
|
||||
$strSetupShowFunctionFields_name = __('Show function fields');
|
||||
$strSetupShowHiddenMessages = __('Show hidden messages (#MSG_COUNT)');
|
||||
$strSetupShowPhpInfo_desc = __('Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output');
|
||||
$strSetupShowPhpInfo_name = __('Show phpinfo() link');
|
||||
$strSetupShowServerInfo_name = __('Show detailed MySQL server information');
|
||||
$strSetupShowSQL_desc = __('Defines whether SQL queries generated by phpMyAdmin should be displayed');
|
||||
$strSetupShowSQL_name = __('Show SQL queries');
|
||||
$strSetupShowStats_desc = __('Allow to display database and table statistics (eg. space usage)');
|
||||
$strSetupShowStats_name = __('Show statistics');
|
||||
$strSetupShowTooltipAliasDB_desc = __('If tooltips are enabled and a database comment is set, this will flip the comment and the real name');
|
||||
$strSetupShowTooltipAliasDB_name = __('Display database comment instead of its name');
|
||||
$strSetupShowTooltipAliasTB_desc = __('When setting this to [kbd]nested[/kbd], the alias of the table name is only used to split/nest the tables according to the $cfg[\'LeftFrameTableSeparator\'] directive, so only the folder is called like the alias, the table name itself stays unchanged');
|
||||
$strSetupShowTooltipAliasTB_name = __('Display table comment instead of its name');
|
||||
$strSetupShowTooltip_name = __('Display table comments in tooltips');
|
||||
$strSetupSkipLockedTables_desc = __('Mark used tables and make it possible to show databases with locked tables');
|
||||
$strSetupSkipLockedTables_name = __('Skip locked tables');
|
||||
$strSetupSQLQuery_Edit_name = __('Edit');
|
||||
$strSetupSQLQuery_Explain_name = __('Explain SQL');
|
||||
$strSetupSQLQuery_Refresh_name = __('Refresh');
|
||||
$strSetupSQLQuery_ShowAsPHP_name = __('Create PHP Code');
|
||||
$strSetupSQLQuery_Validate_name = __('Validate SQL');
|
||||
$strSetupSuggestDBName_desc = __('Suggest a database name on the "Create Database" form (if possible) or keep the text field empty');
|
||||
$strSetupSuggestDBName_name = __('Suggest new database name');
|
||||
$strSetupTrue = __('yes');
|
||||
$strSetupTrustedProxies_desc = __('Input proxies as [kbd]IP: trusted HTTP header[/kbd]. The following example specifies that phpMyAdmin should trust a HTTP_X_FORWARDED_FOR (X-Forwarded-For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: HTTP_X_FORWARDED_FOR[/kbd]');
|
||||
$strSetupTrustedProxies_name = __('List of trusted proxies for IP allow/deny');
|
||||
$strSetupUploadDir_desc = __('Directory on server where you can upload files for import');
|
||||
$strSetupUploadDir_name = __('Upload directory');
|
||||
$strSetupUseDbSearch_desc = __('Allow for searching inside the entire database');
|
||||
$strSetupUseDbSearch_name = __('Use database search');
|
||||
$strSetupVerboseMultiSubmit_desc = __('Show affected rows of each statement on multiple-statement queries. See libraries/import.lib.php for defaults on how many queries a statement may contain.');
|
||||
$strSetupVerboseMultiSubmit_name = __('Verbose multiple statements');
|
||||
$strSetupVersionCheckDataError = __('Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.');
|
||||
$strSetupVersionCheckInvalid = __('Got invalid version string from server');
|
||||
$strSetupVersionCheckLink = __('Check for latest version');
|
||||
$strSetupVersionCheckNewAvailable = __('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.');
|
||||
$strSetupVersionCheckNewAvailableSvn = __('You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable version is %s, released on %s.');
|
||||
$strSetupVersionCheckNone = __('No newer stable version is available');
|
||||
$strSetupVersionCheckUnparsable = __('Unparsable version string');
|
||||
$strSetupVersionCheck = __('Version check');
|
||||
$strSetupVersionCheckWrapperError = __('Neither URL wrapper nor CURL is available. Version check is not possible.');
|
||||
$strSetupWarning = __('Warning');
|
||||
$strSetupZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression for import and export operations');
|
||||
$strSetupZipDumpExportWarning = __('[a@?page=form&formset=features#tab_Import_export]Zip compression[/a] requires functions (%s) which are unavailable on this system.');
|
||||
$strSetupZipDumpImportWarning = __('[a@?page=form&formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.');
|
||||
$strSetupZipDump_name = __('ZIP');
|
||||
|
||||
?>
|
||||
@@ -1,361 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Various validation functions
|
||||
*
|
||||
* Validation function takes two argument: id for which it is called
|
||||
* and array of fields' values (usually values for entire formset, as defined
|
||||
* in forms.inc.php).
|
||||
* The function must always return an array with an error (or error array)
|
||||
* assigned to a form element (formset name or field path). Even if there are
|
||||
* no errors, key must be set with an empty value.
|
||||
*
|
||||
* Valdiation functions are assigned in $cfg_db['_validators'] (config_info.inc.php).
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
/**
|
||||
* Runs validation $validator_id on values $values and returns error list.
|
||||
*
|
||||
* Return values:
|
||||
* o array, keys - field path or formset id, values - array of errors
|
||||
* when $isPostSource is true values is an empty array to allow for error list
|
||||
* cleanup in HTML documen
|
||||
* o false - when no validators match name(s) given by $validator_id
|
||||
*
|
||||
* @param string|array $validator_id
|
||||
* @param array $values
|
||||
* @param bool $isPostSource tells whether $values are directly from POST request
|
||||
* @return bool|array
|
||||
*/
|
||||
function validate($validator_id, &$values, $isPostSource)
|
||||
{
|
||||
// find validators
|
||||
$cf = ConfigFile::getInstance();
|
||||
$validator_id = (array) $validator_id;
|
||||
$validators = $cf->getDbEntry('_validators');
|
||||
$vids = array();
|
||||
foreach ($validator_id as &$vid) {
|
||||
$vid = $cf->getCanonicalPath($vid);
|
||||
if (isset($validators[$vid])) {
|
||||
$vids[] = $vid;
|
||||
}
|
||||
}
|
||||
if (empty($vids)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// create argument list with canonical paths and remember path mapping
|
||||
$arguments = array();
|
||||
$key_map = array();
|
||||
foreach ($values as $k => $v) {
|
||||
$k2 = $isPostSource ? str_replace('-', '/', $k) : $k;
|
||||
$k2 = strpos($k2, '/') ? $cf->getCanonicalPath($k2) : $k2;
|
||||
$key_map[$k2] = $k;
|
||||
$arguments[$k2] = $v;
|
||||
}
|
||||
|
||||
// validate
|
||||
$result = array();
|
||||
foreach ($vids as $vid) {
|
||||
$r = call_user_func($validators[$vid], $vid, $arguments);
|
||||
// merge results
|
||||
if (is_array($r)) {
|
||||
foreach ($r as $key => $error_list) {
|
||||
// skip empty values if $isPostSource is false
|
||||
if (!$isPostSource && empty($error_list)) {
|
||||
continue;
|
||||
}
|
||||
if (!isset($result[$key])) {
|
||||
$result[$key] = array();
|
||||
}
|
||||
$result[$key] = array_merge($result[$key], (array)$error_list);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// restore original paths
|
||||
$new_result = array();
|
||||
foreach ($result as $k => $v) {
|
||||
$k2 = isset($key_map[$k]) ? $key_map[$k] : $k;
|
||||
$new_result[$k2] = $v;
|
||||
}
|
||||
return empty($new_result) ? true : $new_result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensures that $php_errormsg variable will be registered in case of an error
|
||||
* and enables output buffering (when $start = true).
|
||||
* Called with $start = false disables output buffering end restores
|
||||
* html_errors and track_errors.
|
||||
*
|
||||
* @param boolean $start
|
||||
*/
|
||||
function test_php_errormsg($start = true)
|
||||
{
|
||||
static $old_html_errors, $old_track_errors;
|
||||
if ($start) {
|
||||
$old_html_errors = ini_get('html_errors');
|
||||
$old_track_errors = ini_get('track_errors');
|
||||
ini_set('html_errors', false);
|
||||
ini_set('track_errors', true);
|
||||
ob_start();
|
||||
} else {
|
||||
ob_end_clean();
|
||||
ini_set('html_errors', $old_html_errors);
|
||||
ini_set('track_errors', $old_track_errors);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Test database connection
|
||||
*
|
||||
* @param string $extension 'mysql' or 'mysqli'
|
||||
* @param string $connect_type 'tcp' or 'socket'
|
||||
* @param string $host
|
||||
* @param string $port
|
||||
* @param string $socket
|
||||
* @param string $user
|
||||
* @param string $pass
|
||||
* @param string $error_key
|
||||
* @return bool|array
|
||||
*/
|
||||
function test_db_connection($extension, $connect_type, $host, $port, $socket, $user, $pass = null, $error_key = 'Server')
|
||||
{
|
||||
// test_php_errormsg();
|
||||
$socket = empty($socket) || $connect_type == 'tcp' ? null : ':' . $socket;
|
||||
$port = empty($port) || $connect_type == 'socket' ? null : ':' . $port;
|
||||
$error = null;
|
||||
if ($extension == 'mysql') {
|
||||
$conn = @mysql_connect($host . $socket . $port, $user, $pass);
|
||||
if (!$conn) {
|
||||
$error = PMA_lang('error_connection');
|
||||
} else {
|
||||
mysql_close($conn);
|
||||
}
|
||||
} else {
|
||||
$conn = @mysqli_connect($host, $user, $pass, null, $port, $socket);
|
||||
if (!$conn) {
|
||||
$error = PMA_lang('error_connection');
|
||||
} else {
|
||||
mysqli_close($conn);
|
||||
}
|
||||
}
|
||||
// test_php_errormsg(false);
|
||||
if (isset($php_errormsg)) {
|
||||
$error .= " - $php_errormsg";
|
||||
}
|
||||
return is_null($error) ? true : array($error_key => $error);
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate server config
|
||||
*
|
||||
* @param string $path
|
||||
* @param array $values
|
||||
* @return array
|
||||
*/
|
||||
function validate_server($path, $values)
|
||||
{
|
||||
$result = array('Server' => '', 'Servers/1/user' => '', 'Servers/1/SignonSession' => '', 'Servers/1/SignonURL' => '');
|
||||
$error = false;
|
||||
if ($values['Servers/1/auth_type'] == 'config' && empty($values['Servers/1/user'])) {
|
||||
$result['Servers/1/user'] = PMA_lang('error_empty_user_for_config_auth');
|
||||
$error = true;
|
||||
}
|
||||
if ($values['Servers/1/auth_type'] == 'signon' && empty($values['Servers/1/SignonSession'])) {
|
||||
$result['Servers/1/SignonSession'] = PMA_lang('error_empty_signon_session');
|
||||
$error = true;
|
||||
}
|
||||
if ($values['Servers/1/auth_type'] == 'signon' && empty($values['Servers/1/SignonURL'])) {
|
||||
$result['Servers/1/SignonURL'] = PMA_lang('error_empty_signon_url');
|
||||
$error = true;
|
||||
}
|
||||
|
||||
if (!$error && $values['Servers/1/auth_type'] == 'config') {
|
||||
$password = $values['Servers/1/nopassword'] ? null : $values['Servers/1/password'];
|
||||
$test = test_db_connection($values['Servers/1/extension'], $values['Servers/1/connect_type'], $values['Servers/1/host'], $values['Servers/1/port'], $values['Servers/1/socket'], $values['Servers/1/user'], $password, 'Server');
|
||||
if ($test !== true) {
|
||||
$result = array_merge($result, $test);
|
||||
}
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate pmadb config
|
||||
*
|
||||
* @param string $path
|
||||
* @param array $values
|
||||
* @return array
|
||||
*/
|
||||
function validate_pmadb($path, $values)
|
||||
{
|
||||
$tables = array('Servers/1/bookmarktable', 'Servers/1/relation', 'Servers/1/table_info', 'Servers/1/table_coords', 'Servers/1/pdf_pages', 'Servers/1/column_info', 'Servers/1/history', 'Servers/1/designer_coords');
|
||||
$result = array('Server_pmadb' => '', 'Servers/1/controluser' => '', 'Servers/1/controlpass' => '');
|
||||
$error = false;
|
||||
|
||||
if ($values['Servers/1/pmadb'] == '') {
|
||||
return $result;
|
||||
}
|
||||
|
||||
$result = array();
|
||||
if ($values['Servers/1/controluser'] == '') {
|
||||
$result['Servers/1/controluser'] = PMA_lang('error_empty_pmadb_user');
|
||||
$error = true;
|
||||
}
|
||||
if ($values['Servers/1/controlpass'] == '') {
|
||||
$result['Servers/1/controlpass'] = PMA_lang('error_empty_pmadb_password');
|
||||
$error = true;
|
||||
}
|
||||
if (!$error) {
|
||||
$test = test_db_connection($values['Servers/1/extension'], $values['Servers/1/connect_type'], $values['Servers/1/host'], $values['Servers/1/port'], $values['Servers/1/socket'], $values['Servers/1/controluser'], $values['Servers/1/controlpass'], 'Server_pmadb');
|
||||
if ($test !== true) {
|
||||
$result = array_merge($result, $test);
|
||||
}
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Validates regular expression
|
||||
*
|
||||
* @param string $path
|
||||
* @param array $values
|
||||
* @return array
|
||||
*/
|
||||
function validate_regex($path, $values)
|
||||
{
|
||||
$result = array($path => '');
|
||||
|
||||
if ($values[$path] == '') {
|
||||
return $result;
|
||||
}
|
||||
|
||||
test_php_errormsg();
|
||||
|
||||
$matches = array();
|
||||
preg_match($values[$path], '', $matches);
|
||||
ob_end_clean();
|
||||
|
||||
test_php_errormsg(false);
|
||||
|
||||
if (isset($php_errormsg)) {
|
||||
$error = preg_replace('/^preg_match\(\): /', '', $php_errormsg);
|
||||
return array($path => $error);
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Validates TrustedProxies field
|
||||
*
|
||||
* @param string $path
|
||||
* @param array $values
|
||||
* @return array
|
||||
*/
|
||||
function validate_trusted_proxies($path, $values)
|
||||
{
|
||||
$result = array($path => array());
|
||||
|
||||
if (empty($values[$path])) {
|
||||
return $result;
|
||||
}
|
||||
|
||||
if (is_array($values[$path])) {
|
||||
// value already processed by FormDisplay::save
|
||||
$lines = array();
|
||||
foreach ($values[$path] as $ip => $v) {
|
||||
$lines[] = preg_match('/^-\d+$/', $ip)
|
||||
? $v
|
||||
: $ip . ': ' . $v;
|
||||
}
|
||||
} else {
|
||||
// AJAX validation
|
||||
$lines = explode("\n", $values[$path]);
|
||||
}
|
||||
foreach ($lines as $line) {
|
||||
$line = trim($line);
|
||||
$matches = array();
|
||||
// we catch anything that may (or may not) be an IP
|
||||
if (!preg_match("/^(.+):(?:[ ]?)\\w+$/", $line, $matches)) {
|
||||
$result[$path][] = PMA_lang('error_incorrect_value') . ': ' . $line;
|
||||
continue;
|
||||
}
|
||||
// now let's check whether we really have an IP address
|
||||
if (filter_var($matches[1], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false
|
||||
&& filter_var($matches[1], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) {
|
||||
$ip = htmlspecialchars(trim($matches[1]));
|
||||
$result[$path][] = PMA_lang('error_incorrect_ip_address', $ip);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Tests integer value
|
||||
*
|
||||
* @param string $path
|
||||
* @param array $values
|
||||
* @param bool $allow_neg allow negative values
|
||||
* @param bool $allow_zero allow zero
|
||||
* @param int $max_value max allowed value
|
||||
* @param string $error_lang_key error message key: $GLOBALS["strSetup$error_lang_key"]
|
||||
* @return string empty string if test is successful
|
||||
*/
|
||||
function test_number($path, $values, $allow_neg, $allow_zero, $max_value, $error_lang_key)
|
||||
{
|
||||
if ($values[$path] === '') {
|
||||
return '';
|
||||
}
|
||||
|
||||
if (intval($values[$path]) != $values[$path] || (!$allow_neg && $values[$path] < 0) || (!$allow_zero && $values[$path] == 0) || $values[$path] > $max_value) {
|
||||
return PMA_lang($error_lang_key);
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
|
||||
/**
|
||||
* Validates port number
|
||||
*
|
||||
* @param string $path
|
||||
* @param array $values
|
||||
* @return array
|
||||
*/
|
||||
function validate_port_number($path, $values)
|
||||
{
|
||||
return array($path => test_number($path, $values, false, false, 65536, 'error_incorrect_port'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Validates positive number
|
||||
*
|
||||
* @param string $path
|
||||
* @param array $values
|
||||
* @return array
|
||||
*/
|
||||
function validate_positive_number($path, $values)
|
||||
{
|
||||
return array($path => test_number($path, $values, false, false, PHP_INT_MAX, 'error_nan_p'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Validates non-negative number
|
||||
*
|
||||
* @param string $path
|
||||
* @param array $values
|
||||
* @return array
|
||||
*/
|
||||
function validate_non_negative_number($path, $values)
|
||||
{
|
||||
return array($path => test_number($path, $values, false, true, PHP_INT_MAX, 'error_nan_nneg'));
|
||||
}
|
||||
?>
|
||||
586
setup/scripts.js
586
setup/scripts.js
@@ -1,7 +1,5 @@
|
||||
/**
|
||||
* functions used in setup script
|
||||
*
|
||||
* @version $Id$
|
||||
* Functions used in Setup configuration forms
|
||||
*/
|
||||
|
||||
// show this window in top frame
|
||||
@@ -9,163 +7,6 @@ if (top != self) {
|
||||
window.top.location.href = location;
|
||||
}
|
||||
|
||||
// default values for fields
|
||||
var defaultValues = {};
|
||||
|
||||
// language strings
|
||||
var PMA_messages = {};
|
||||
|
||||
/**
|
||||
* Returns field type
|
||||
*
|
||||
* @param Element field
|
||||
*/
|
||||
function getFieldType(field) {
|
||||
field = $(field);
|
||||
var tagName = field.attr('tagName');
|
||||
if (tagName == 'INPUT') {
|
||||
return field.attr('type');
|
||||
} else if (tagName == 'SELECT') {
|
||||
return 'select';
|
||||
} else if (tagName == 'TEXTAREA') {
|
||||
return 'text';
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets field value
|
||||
*
|
||||
* value must be of type:
|
||||
* o undefined (omitted) - restore default value (form default, not PMA default)
|
||||
* o String - if field_type is 'text'
|
||||
* o boolean - if field_type is 'checkbox'
|
||||
* o Array of values - if field_type is 'select'
|
||||
*
|
||||
* @param Element field
|
||||
* @param String field_type see getFieldType
|
||||
* @param mixed value
|
||||
*/
|
||||
function setFieldValue(field, field_type, value) {
|
||||
field = $(field);
|
||||
switch (field_type) {
|
||||
case 'text':
|
||||
field.attr('value', (value != undefined ? value : field.attr('defaultValue')));
|
||||
break;
|
||||
case 'checkbox':
|
||||
field.attr('checked', (value != undefined ? value : field.attr('defaultChecked')));
|
||||
break;
|
||||
case 'select':
|
||||
var options = field.attr('options');
|
||||
var i, imax = options.length;
|
||||
if (value == undefined) {
|
||||
for (i = 0; i < imax; i++) {
|
||||
options[i].selected = options[i].defaultSelected;
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < imax; i++) {
|
||||
options[i].selected = (value.indexOf(options[i].value) != -1);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
markField(field);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets field value
|
||||
*
|
||||
* Will return one of:
|
||||
* o String - if type is 'text'
|
||||
* o boolean - if type is 'checkbox'
|
||||
* o Array of values - if type is 'select'
|
||||
*
|
||||
* @param Element field
|
||||
* @param String field_type see getFieldType
|
||||
* @return mixed
|
||||
*/
|
||||
function getFieldValue(field, field_type) {
|
||||
field = $(field);
|
||||
switch (field_type) {
|
||||
case 'text':
|
||||
return field.attr('value');
|
||||
case 'checkbox':
|
||||
return field.attr('checked');
|
||||
case 'select':
|
||||
var options = field.attr('options');
|
||||
var i, imax = options.length, items = [];
|
||||
for (i = 0; i < imax; i++) {
|
||||
if (options[i].selected) {
|
||||
items.push(options[i].value);
|
||||
}
|
||||
}
|
||||
return items;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns values for all fields in fieldsets
|
||||
*/
|
||||
function getAllValues() {
|
||||
var elements = $('fieldset input, fieldset select, fieldset textarea');
|
||||
var values = {};
|
||||
var type, value;
|
||||
for (var i = 0; i < elements.length; i++) {
|
||||
type = getFieldType(elements[i]);
|
||||
value = getFieldValue(elements[i], type);
|
||||
if (typeof value != 'undefined') {
|
||||
// we only have single selects, fatten array
|
||||
if (type == 'select') {
|
||||
value = value[0];
|
||||
}
|
||||
values[elements[i].name] = value;
|
||||
}
|
||||
}
|
||||
return values;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks whether field has its default value
|
||||
*
|
||||
* @param Element field
|
||||
* @param String type
|
||||
* @return boolean
|
||||
*/
|
||||
function checkFieldDefault(field, type) {
|
||||
field = $(field);
|
||||
var field_id = field.attr('id');
|
||||
if (typeof defaultValues[field_id] == 'undefined') {
|
||||
return true;
|
||||
}
|
||||
var isDefault = true;
|
||||
var currentValue = getFieldValue(field, type);
|
||||
if (type != 'select') {
|
||||
isDefault = currentValue == defaultValues[field_id];
|
||||
} else {
|
||||
// compare arrays, will work for our representation of select values
|
||||
if (currentValue.length != defaultValues[field_id].length) {
|
||||
isDefault = false;
|
||||
}
|
||||
else {
|
||||
for (var i = 0; i < currentValue.length; i++) {
|
||||
if (currentValue[i] != defaultValues[field_id][i]) {
|
||||
isDefault = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return isDefault;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns element's id prefix
|
||||
* @param Element element
|
||||
*/
|
||||
function getIdPrefix(element) {
|
||||
return $(element).attr('id').replace(/[^-]+$/, '');
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
// Messages
|
||||
//
|
||||
@@ -200,49 +41,13 @@ $(function() {
|
||||
// Form validation and field operations
|
||||
//
|
||||
|
||||
// form validator assignments
|
||||
var validate = {};
|
||||
|
||||
// form validator list
|
||||
var validators = {
|
||||
// regexp: numeric value
|
||||
_regexp_numeric: new RegExp('^[0-9]*$'),
|
||||
/**
|
||||
* Validates positive number
|
||||
*
|
||||
* @param boolean isKeyUp
|
||||
*/
|
||||
validate_positive_number: function (isKeyUp) {
|
||||
var result = this.value != '0' && validators._regexp_numeric.test(this.value);
|
||||
return result ? true : PMA_messages['error_nan_p'];
|
||||
},
|
||||
/**
|
||||
* Validates non-negative number
|
||||
*
|
||||
* @param boolean isKeyUp
|
||||
*/
|
||||
validate_non_negative_number: function (isKeyUp) {
|
||||
var result = validators._regexp_numeric.test(this.value);
|
||||
return result ? true : PMA_messages['error_nan_nneg'];
|
||||
},
|
||||
/**
|
||||
* Validates port number
|
||||
*
|
||||
* @param boolean isKeyUp
|
||||
*/
|
||||
validate_port_number: function(isKeyUp) {
|
||||
var result = validators._regexp_numeric.test(this.value) && this.value != '0';
|
||||
if (!result || this.value > 65536) {
|
||||
result = PMA_messages['error_incorrect_port'];
|
||||
}
|
||||
return result;
|
||||
},
|
||||
$.extend(true, validators, {
|
||||
// field validators
|
||||
_field: {
|
||||
/**
|
||||
* hide_db field
|
||||
*
|
||||
* @param boolean isKeyUp
|
||||
* @param {boolean} isKeyUp
|
||||
*/
|
||||
hide_db: function(isKeyUp) {
|
||||
if (!isKeyUp && this.value != '') {
|
||||
@@ -255,7 +60,7 @@ var validators = {
|
||||
/**
|
||||
* TrustedProxies field
|
||||
*
|
||||
* @param boolean isKeyUp
|
||||
* @param {boolean} isKeyUp
|
||||
*/
|
||||
TrustedProxies: function(isKeyUp) {
|
||||
if (!isKeyUp && this.value != '') {
|
||||
@@ -271,7 +76,7 @@ var validators = {
|
||||
/**
|
||||
* Validates Server fieldset
|
||||
*
|
||||
* @param boolean isKeyUp
|
||||
* @param {boolean} isKeyUp
|
||||
*/
|
||||
Server: function(isKeyUp) {
|
||||
if (!isKeyUp) {
|
||||
@@ -282,7 +87,7 @@ var validators = {
|
||||
/**
|
||||
* Validates Server_login_options fieldset
|
||||
*
|
||||
* @param boolean isKeyUp
|
||||
* @param {boolean} isKeyUp
|
||||
*/
|
||||
Server_login_options: function(isKeyUp) {
|
||||
return validators._fieldset.Server.apply(this, [isKeyUp]);
|
||||
@@ -290,7 +95,7 @@ var validators = {
|
||||
/**
|
||||
* Validates Server_pmadb fieldset
|
||||
*
|
||||
* @param boolean isKeyUp
|
||||
* @param {boolean} isKeyUp
|
||||
*/
|
||||
Server_pmadb: function(isKeyUp) {
|
||||
if (isKeyUp) {
|
||||
@@ -306,14 +111,14 @@ var validators = {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
/**
|
||||
* Calls server-side validation procedures
|
||||
*
|
||||
* @param Element parent input field in <fieldset> or <fieldset>
|
||||
* @param String id validator id
|
||||
* @param Object values values hash (element_id: value)
|
||||
* @param {Element} parent input field in <fieldset> or <fieldset>
|
||||
* @param {String} id validator id
|
||||
* @param {Object} values values hash {element1_id: value, ...}
|
||||
*/
|
||||
function ajaxValidate(parent, id, values) {
|
||||
parent = $(parent);
|
||||
@@ -324,7 +129,7 @@ function ajaxValidate(parent, id, values) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (parent.data('ajax') != null) {
|
||||
parent.data('ajax').abort();
|
||||
}
|
||||
@@ -349,7 +154,7 @@ function ajaxValidate(parent, id, values) {
|
||||
} else if (typeof response['error'] != 'undefined') {
|
||||
error[parent.id] = [response['error']];
|
||||
} else {
|
||||
for (key in response) {
|
||||
for (var key in response) {
|
||||
var value = response[key];
|
||||
error[key] = jQuery.isArray(value) ? value : [value];
|
||||
}
|
||||
@@ -364,366 +169,27 @@ function ajaxValidate(parent, id, values) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers validator for given field
|
||||
*
|
||||
* @param String id field id
|
||||
* @param String type validator (key in validators object)
|
||||
* @param boolean onKeyUp whether fire on key up
|
||||
* @param mixed params validation function parameters
|
||||
*/
|
||||
function validateField(id, type, onKeyUp, params) {
|
||||
if (typeof validators[type] == 'undefined') {
|
||||
return;
|
||||
}
|
||||
if (typeof validate[id] == 'undefined') {
|
||||
validate[id] = [];
|
||||
}
|
||||
validate[id].push([type, params, onKeyUp]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns valdiation functions associated with form field
|
||||
*
|
||||
* @param String field_id form field id
|
||||
* @param boolean onKeyUpOnly see validateField
|
||||
* @return Array array of [function, paramseters to be passed to function]
|
||||
*/
|
||||
function getFieldValidators(field_id, onKeyUpOnly) {
|
||||
// look for field bound validator
|
||||
var name = field_id.match(/[^-]+$/)[0];
|
||||
if (typeof validators._field[name] != 'undefined') {
|
||||
return [[validators._field[name], null]];
|
||||
}
|
||||
|
||||
// look for registered validators
|
||||
var functions = [];
|
||||
if (typeof validate[field_id] != 'undefined') {
|
||||
// validate[field_id]: array of [type, params, onKeyUp]
|
||||
for (var i = 0, imax = validate[field_id].length; i < imax; i++) {
|
||||
if (onKeyUpOnly && !validate[field_id][i][2]) {
|
||||
continue;
|
||||
}
|
||||
functions.push([validators[validate[field_id][i][0]], validate[field_id][i][1]]);
|
||||
}
|
||||
}
|
||||
|
||||
return functions;
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays errors for given form fields
|
||||
*
|
||||
* WARNING: created DOM elements must be identical with the ones made by
|
||||
* display_input() in FormDisplay.tpl.php!
|
||||
*
|
||||
* @param Object error list (key: field id, value: error array)
|
||||
*/
|
||||
function displayErrors(error_list) {
|
||||
for (field_id in error_list) {
|
||||
var errors = error_list[field_id];
|
||||
var field = $('#'+field_id);
|
||||
var isFieldset = field.attr('tagName') == 'FIELDSET';
|
||||
var errorCnt = isFieldset
|
||||
? field.find('dl.errors')
|
||||
: field.siblings('.inline_errors');
|
||||
|
||||
// remove empty errors (used to clear error list)
|
||||
errors = $.grep(errors, function(item) {
|
||||
return item != '';
|
||||
});
|
||||
|
||||
if (errors.length) {
|
||||
// if error container doesn't exist, create it
|
||||
if (errorCnt.length == 0) {
|
||||
if (isFieldset) {
|
||||
errorCnt = $('<dl class="errors" />');
|
||||
field.find('table').before(errorCnt);
|
||||
} else {
|
||||
errorCnt = $('<dl class="inline_errors" />');
|
||||
field.closest('td').append(errorCnt);
|
||||
}
|
||||
}
|
||||
|
||||
var html = '';
|
||||
for (var i = 0, imax = errors.length; i < imax; i++) {
|
||||
html += '<dd>' + errors[i] + '</dd>';
|
||||
}
|
||||
errorCnt.html(html);
|
||||
} else if (errorCnt !== null) {
|
||||
// remove useless error container
|
||||
errorCnt.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Validates fieldset and puts errors in 'errors' object
|
||||
*
|
||||
* @param Element field
|
||||
* @param boolean isKeyUp
|
||||
* @param Object errors
|
||||
*/
|
||||
function validate_fieldset(fieldset, isKeyUp, errors) {
|
||||
fieldset = $(fieldset);
|
||||
if (fieldset.length && typeof validators._fieldset[fieldset.attr('id')] != 'undefined') {
|
||||
var fieldset_errors = validators._fieldset[fieldset.attr('id')].apply(fieldset[0], [isKeyUp]);
|
||||
for (field_id in fieldset_errors) {
|
||||
if (typeof errors[field_id] == 'undefined') {
|
||||
errors[field_id] = [];
|
||||
}
|
||||
if (typeof fieldset_errors[field_id] == 'string') {
|
||||
fieldset_errors[field_id] = [fieldset_errors[field_id]];
|
||||
}
|
||||
$.merge(errors[field_id], fieldset_errors[field_id]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Validates form field and puts errors in 'errors' object
|
||||
*
|
||||
* @param Element field
|
||||
* @param boolean isKeyUp
|
||||
* @param Object errors
|
||||
*/
|
||||
function validate_field(field, isKeyUp, errors) {
|
||||
field = $(field);
|
||||
var field_id = field.attr('id');
|
||||
errors[field_id] = [];
|
||||
var functions = getFieldValidators(field_id, isKeyUp);
|
||||
for (var i = 0; i < functions.length; i++) {
|
||||
var result = functions[i][0].apply(field[0], [isKeyUp, functions[i][1]]);
|
||||
if (result !== true) {
|
||||
if (typeof result == 'string') {
|
||||
result = [result];
|
||||
}
|
||||
$.merge(errors[field_id], result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Validates form field and parent fieldset
|
||||
*
|
||||
* @param Element field
|
||||
* @param boolean isKeyUp
|
||||
*/
|
||||
function validate_field_and_fieldset(field, isKeyUp) {
|
||||
field = $(field);
|
||||
var errors = {};
|
||||
validate_field(field, isKeyUp, errors);
|
||||
validate_fieldset(field.closest('fieldset'), isKeyUp, errors);
|
||||
displayErrors(errors);
|
||||
}
|
||||
|
||||
/**
|
||||
* Marks field depending on its value (system default or custom)
|
||||
*
|
||||
* @param Element field
|
||||
*/
|
||||
function markField(field) {
|
||||
field = $(field);
|
||||
var type = getFieldType(field);
|
||||
var isDefault = checkFieldDefault(field, type);
|
||||
|
||||
// checkboxes uses parent <span> for marking
|
||||
var fieldMarker = (type == 'checkbox') ? field.parent() : field;
|
||||
setRestoreDefaultBtn(field, !isDefault);
|
||||
fieldMarker[isDefault ? 'removeClass' : 'addClass']('custom');
|
||||
}
|
||||
|
||||
/**
|
||||
* Enables or disables the "restore default value" button
|
||||
*
|
||||
* @param Element field
|
||||
* @param bool display
|
||||
*/
|
||||
function setRestoreDefaultBtn(field, display) {
|
||||
var el = $(field).closest('td').find('.restore-default');
|
||||
el.css('display', (el.css('display') ? '' : 'none'));
|
||||
}
|
||||
|
||||
$(function() {
|
||||
// register validators and mark custom values
|
||||
var elements = $('input[id], select[id], textarea[id]');
|
||||
$('input[id], select[id], textarea[id]').each(function(){
|
||||
markField(this);
|
||||
var el = $(this);
|
||||
el.bind('change', function() {
|
||||
validate_field_and_fieldset(this, false);
|
||||
markField(this);
|
||||
});
|
||||
var tagName = el.attr('tagName');
|
||||
// text fields can be validated after each change
|
||||
if (tagName == 'INPUT' && el.attr('type') == 'text') {
|
||||
el.keyup(function() {
|
||||
validate_field_and_fieldset(el, true);
|
||||
markField(el);
|
||||
});
|
||||
}
|
||||
// disable textarea spellcheck
|
||||
if (tagName == 'TEXTAREA') {
|
||||
el.attr('spellcheck', false);
|
||||
}
|
||||
});
|
||||
|
||||
// check whether we've refreshed a page and browser remembered modified
|
||||
// form values
|
||||
var check_page_refresh = $('#check_page_refresh');
|
||||
if (check_page_refresh.length == 0 || check_page_refresh.val() == '1') {
|
||||
// run all field validators
|
||||
var errors = {};
|
||||
for (var i = 0; i < elements.length; i++) {
|
||||
validate_field(elements[i], false, errors);
|
||||
}
|
||||
// run all fieldset validators
|
||||
$('fieldset').each(function(){
|
||||
validate_fieldset(this, false, errors);
|
||||
});
|
||||
|
||||
displayErrors(errors);
|
||||
} else if (check_page_refresh) {
|
||||
check_page_refresh.val('1');
|
||||
}
|
||||
});
|
||||
|
||||
//
|
||||
// END: Form validation and field operations
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
// Tabbed forms
|
||||
//
|
||||
|
||||
/**
|
||||
* Sets active tab
|
||||
*
|
||||
* @param Element tab_link
|
||||
*/
|
||||
function setTab(tab_link) {
|
||||
var tabs_menu = $(tab_link).closest('.tabs');
|
||||
|
||||
var links = tabs_menu.find('a');
|
||||
var contents, link;
|
||||
for (var i = 0, imax = links.length; i < imax; i++) {
|
||||
link = $(links[i]);
|
||||
contents = $(link.attr('href'));
|
||||
if (links[i] == tab_link) {
|
||||
link.addClass('active');
|
||||
contents.css('display', 'block');
|
||||
} else {
|
||||
link.removeClass('active');
|
||||
contents.css('display', 'none');
|
||||
}
|
||||
}
|
||||
location.hash = 'tab_' + $(tab_link).attr('href').substr(1);
|
||||
}
|
||||
|
||||
$(function() {
|
||||
var tabs = $('.tabs');
|
||||
var url_tab = location.hash.match(/^#tab_.+/)
|
||||
? $('a[href$="' + location.hash.substr(5) + '"]') : null;
|
||||
if (url_tab) {
|
||||
url_tab = url_tab[0];
|
||||
}
|
||||
// add tabs events and activate one tab (the first one or indicated by location hash)
|
||||
for (var i = 0, imax = tabs.length; i < imax; i++) {
|
||||
var links = $(tabs[i]).find('a');
|
||||
var selected_tab = links[0];
|
||||
for (var j = 0, jmax = links.length; j < jmax; j++) {
|
||||
$(links[j]).click(function(e) {
|
||||
e.preventDefault();
|
||||
setTab(this);
|
||||
});
|
||||
if (links[j] == url_tab) {
|
||||
selected_tab = links[j];
|
||||
}
|
||||
}
|
||||
setTab(selected_tab);
|
||||
}
|
||||
// tab links handling, check each 200ms
|
||||
// (works with history in FF, further browser support here would be an overkill)
|
||||
var prev_hash = location.hash;
|
||||
setInterval(function() {
|
||||
if (location.hash != prev_hash) {
|
||||
prev_hash = location.hash;
|
||||
var url_tab = location.hash.match(/^#tab_.+/)
|
||||
? $('a[href$="' + location.hash.substr(5) + '"]') : null;
|
||||
if (url_tab) {
|
||||
setTab(url_tab[0]);
|
||||
}
|
||||
}
|
||||
}, 200);
|
||||
});
|
||||
|
||||
//
|
||||
// END: Tabbed forms
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
// Form reset buttons
|
||||
// User preferences allow/disallow UI
|
||||
//
|
||||
|
||||
$(function() {
|
||||
$('input[type=button]').click(function(e) {
|
||||
var fields = $(this).closest('fieldset').find('input, select, textarea');
|
||||
for (var i = 0, imax = fields.length; i < imax; i++) {
|
||||
setFieldValue(fields[i], getFieldType(fields[i]));
|
||||
}
|
||||
});
|
||||
$('.userprefs-allow').click(function(e) {
|
||||
if (this != e.target) {
|
||||
return;
|
||||
}
|
||||
var el = $(this).find('input');
|
||||
if (el.attr('disabled')) {
|
||||
return;
|
||||
}
|
||||
el.attr('checked', !el.attr('checked'));
|
||||
});
|
||||
});
|
||||
|
||||
//
|
||||
// END: Form reset buttons
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
// "Restore default" and "set value" buttons
|
||||
//
|
||||
|
||||
/**
|
||||
* Restores field's default value
|
||||
*
|
||||
* @param String field_id
|
||||
*/
|
||||
function restoreField(field_id) {
|
||||
var field = $('#'+field_id);
|
||||
if (field.length == 0 || defaultValues[field_id] == undefined) {
|
||||
return;
|
||||
}
|
||||
setFieldValue(field, getFieldType(field), defaultValues[field_id]);
|
||||
}
|
||||
|
||||
$(function() {
|
||||
$('.restore-default, .set-value').each(function() {
|
||||
var link = $(this);
|
||||
link.css('opacity', 0.25);
|
||||
if (!link.hasClass('restore-default')) {
|
||||
// restore-default is handled by markField
|
||||
link.css('display', '');
|
||||
}
|
||||
link.bind({
|
||||
mouseenter: function() {$(this).css('opacity', 1);},
|
||||
mouseleave: function() {$(this).css('opacity', 0.25);},
|
||||
click: function(e) {
|
||||
e.preventDefault();
|
||||
var href = $(this).attr('href').substr(1);
|
||||
var field_id;
|
||||
if ($(this).hasClass('restore-default')) {
|
||||
field_id = href;
|
||||
restoreField(field_id);
|
||||
} else {
|
||||
field_id = href.match(/^[^=]+/)[0];
|
||||
var value = href.match(/=(.+)$/)[1];
|
||||
setFieldValue($('#'+field_id), 'text', value);
|
||||
}
|
||||
$('#'+field_id).trigger('change');
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
//
|
||||
// END: "Restore default" and "set value" buttons
|
||||
// ------------------------------------------------------------------
|
||||
// END: User preferences allow/disallow UI
|
||||
// ------------------------------------------------------------------
|
||||
@@ -195,6 +195,11 @@ ul.tabs li a:hover, ul.tabs li a:active {
|
||||
margin-bottom: -3px;
|
||||
}
|
||||
|
||||
.userprefs-comment {
|
||||
cursor: help;
|
||||
float: right;
|
||||
}
|
||||
|
||||
/* forms */
|
||||
|
||||
fieldset {
|
||||
@@ -253,10 +258,6 @@ fieldset th {
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
fieldset th small {
|
||||
display: block;
|
||||
}
|
||||
|
||||
fieldset .doc {
|
||||
margin-left: 1em;
|
||||
}
|
||||
@@ -266,27 +267,50 @@ fieldset td {
|
||||
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 {
|
||||
fieldset th, fieldset td, .form .lastrow {
|
||||
border-top: 1px #555 dotted;
|
||||
}
|
||||
|
||||
fieldset .group-header th {
|
||||
background: #EAEDFF;
|
||||
border: none;
|
||||
}
|
||||
|
||||
fieldset .group-header + tr th, fieldset .group-header + tr td,
|
||||
fieldset p + table tr:first-child td, fieldset p + table tr:first-child th {
|
||||
border-top: none;
|
||||
}
|
||||
|
||||
fieldset .group-field th {
|
||||
padding-left: 1em;
|
||||
}
|
||||
|
||||
fieldset .lastrow, .form .lastrow {
|
||||
background: #F7FBFF;
|
||||
padding: 0.5em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.form .lastrow {
|
||||
border-top: 1px #555 dotted;
|
||||
}
|
||||
|
||||
fieldset .lastrow input, .form .lastrow input {
|
||||
font-weight: bold;
|
||||
}
|
||||
@@ -314,16 +338,20 @@ fieldset.simple .lastrow {
|
||||
|
||||
span.checkbox {
|
||||
padding: 2px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.custom { /* customized field */
|
||||
background: #FFC;
|
||||
}
|
||||
|
||||
span.checkbox.custom {
|
||||
.checkbox.custom {
|
||||
padding: 1px;
|
||||
border: 1px #EDEC90 solid;
|
||||
background: #FFC;
|
||||
}
|
||||
|
||||
.field-error {
|
||||
border-color: #C11 !important;
|
||||
}
|
||||
|
||||
input[type="text"], select, textarea {
|
||||
@@ -335,6 +363,22 @@ input[type="text"]:focus, select:focus, textarea:focus {
|
||||
background: #F7FBFF;
|
||||
}
|
||||
|
||||
.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;
|
||||
}
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Validation callback.
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @copyright Copyright (c) 2008, Piotr Przybylski <piotrprz@gmail.com>
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
|
||||
/**
|
||||
@@ -14,7 +12,7 @@
|
||||
require './lib/common.inc.php';
|
||||
|
||||
$validators = array();
|
||||
require './setup/lib/validate.lib.php';
|
||||
require './libraries/config/validate.lib.php';
|
||||
|
||||
header('Content-type: application/json');
|
||||
|
||||
@@ -24,7 +22,7 @@ if (!($values instanceof stdClass)) {
|
||||
die('Wrong data');
|
||||
}
|
||||
$values = (array)$values;
|
||||
$result = validate($vids, $values, true);
|
||||
$result = PMA_config_validate($vids, $values, true);
|
||||
if ($result === false) {
|
||||
$result = 'Wrong data or no validation for ' . $vids;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user