nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplified PMA_SETUP checks

Browse Source
This commit is contained in:
Crack
2010-08-27 15:57:45 +02:00
parent 1dba66c13f
commit a82b355fc9
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/config/FormDisplay.class.php
View File

@@ -498,7 +498,7 @@ class FormDisplay
$values = array(); $values = array();
$to_save = array(); $to_save = array();
$is_setup_script = defined('PMA_SETUP') && PMA_SETUP; $is_setup_script = defined('PMA_SETUP');
if ($is_setup_script) { if ($is_setup_script) {
$this->_loadUserprefsInfo(); $this->_loadUserprefsInfo();
} }
@@ -706,7 +706,7 @@ class FormDisplay
if ($this->userprefs_keys === null) { if ($this->userprefs_keys === null) {
$this->userprefs_keys = array_flip(PMA_read_userprefs_fieldnames()); $this->userprefs_keys = array_flip(PMA_read_userprefs_fieldnames());
// read real config for user preferences display // read real config for user preferences display
$userprefs_disallow = defined('PMA_SETUP') && PMA_SETUP $userprefs_disallow = defined('PMA_SETUP')
? ConfigFile::getInstance()->get('UserprefsDisallow', array()) ? ConfigFile::getInstance()->get('UserprefsDisallow', array())
: $GLOBALS['cfg']['UserprefsDisallow']; : $GLOBALS['cfg']['UserprefsDisallow'];
$this->userprefs_disallow = array_flip($userprefs_disallow); $this->userprefs_disallow = array_flip($userprefs_disallow);
@@ -767,7 +767,7 @@ class FormDisplay
} }
} }
} }
if (!defined('PMA_SETUP') || !PMA_SETUP) { if (!defined('PMA_SETUP')) {
if (($system_path == 'MaxDbList' || $system_path == 'MaxTableList' if (($system_path == 'MaxDbList' || $system_path == 'MaxTableList'
|| $system_path == 'QueryHistoryMax')) { || $system_path == 'QueryHistoryMax')) {
$opts['comment'] = sprintf(__('maximum %s'), $GLOBALS['cfg'][$system_path]); $opts['comment'] = sprintf(__('maximum %s'), $GLOBALS['cfg'][$system_path]);

6
libraries/config/FormDisplay.tpl.php
View File

@@ -132,7 +132,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
global $_FormDisplayGroup; global $_FormDisplayGroup;
static $base_dir, $img_path; static $base_dir, $img_path;
$is_setup_script = defined('PMA_SETUP') && PMA_SETUP; $is_setup_script = defined('PMA_SETUP');
if ($base_dir === null) { if ($base_dir === null) {
$base_dir = $is_setup_script ? '../' : ''; $base_dir = $is_setup_script ? '../' : '';
$img_path = $is_setup_script $img_path = $is_setup_script
@@ -298,7 +298,7 @@ function display_group_header($header_text)
return; return;
} }
$colspan = 2; $colspan = 2;
if (defined('PMA_SETUP') && PMA_SETUP) { if (defined('PMA_SETUP')) {
$colspan++; $colspan++;
} }
?> ?>
@@ -328,7 +328,7 @@ function display_group_footer()
function display_fieldset_bottom() function display_fieldset_bottom()
{ {
$colspan = 2; $colspan = 2;
if (defined('PMA_SETUP') && PMA_SETUP) { if (defined('PMA_SETUP')) {
$colspan++; $colspan++;
} }
?> ?>

2
libraries/config/validate.lib.php
View File

@@ -29,7 +29,7 @@ function PMA_config_get_validators()
if ($validators === null) { if ($validators === null) {
$cf = ConfigFile::getInstance(); $cf = ConfigFile::getInstance();
$validators = $cf->getDbEntry('_validators', array()); $validators = $cf->getDbEntry('_validators', array());
if (!defined('PMA_SETUP') || !PMA_SETUP) { if (!defined('PMA_SETUP')) {
$uvs = $cf->getDbEntry('_userValidators', array()); $uvs = $cf->getDbEntry('_userValidators', array());
foreach ($uvs as $field => $uv_list) { foreach ($uvs as $field => $uv_list) {
$uv_list = (array)$uv_list; $uv_list = (array)$uv_list;