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

Various bug fixes (bug #1435700, bug #1435806, undefined indexes).

Browse Source
This commit is contained in:
Michal Čihař
2006-02-21 17:21:19 +00:00
parent ac9d8b21a3
commit 6c877664af
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2006-02-21 Michal Čihař <michal@cihar.com>
* scripts/setup.php: Various bug fixes (bug #1435700, bug #1435806,
undefined indexes).
2006-02-21 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2006-02-21 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/common.lib.php PMA_getUvaCondition(): * libraries/common.lib.php PMA_getUvaCondition():
do not test for isset but strlen on orgname of table do not test for isset but strlen on orgname of table

10
scripts/setup.php
View File

@@ -434,7 +434,7 @@ function get_cfg_val($name, $val) {
if ($type == 'string') { if ($type == 'string') {
$ret .= $name. "['$k'] = " . var_export($v, TRUE) . ";\n"; $ret .= $name. "['$k'] = " . var_export($v, TRUE) . ";\n";
} elseif ($type == 'int') { } elseif ($type == 'int') {
$ret .= " " . var_export($v, TRUE) . ";\n"; $ret .= " " . var_export($v, TRUE) . ",\n";
} }
} }
if ($type == 'int') { if ($type == 'int') {
@@ -1119,9 +1119,13 @@ function load_config($config_file) {
unset( $old_error_reporting ); unset( $old_error_reporting );
if ($success_apply_user_config === FALSE) { if ($success_apply_user_config === FALSE) {
message('error', 'Error while parsing configuration file!'); message('error', 'Error while parsing configuration file!');
} elseif (count($cfg) == 0 || (isset($cfg['Servers']) && count($cfg) == 1 || count($cfg['Servers']) == 0)) { } elseif (!isset($cfg) || count($cfg) == 0) {
message('error', 'Config file seems to contain no configuration!'); message('error', 'Config file seems to contain no configuration!');
} else { } else {
// This must be set
if (!isset($cfg['Servers'])) {
$cfg['Servers'] = array();
}
message('notice', 'Configuration loaded'); message('notice', 'Configuration loaded');
compress_servers($cfg); compress_servers($cfg);
return $cfg; return $cfg;
@@ -1214,7 +1218,7 @@ switch ($action) {
case 'addserver_real': case 'addserver_real':
if (isset($_POST['submit_save'])) { if (isset($_POST['submit_save'])) {
$new_server = grab_values('host;port;socket;connect_type;compress:bool;controluser;controlpass;auth_type;user;password;only_db;verbose;pmadb;bookmarktable:serialized;relation:serialized;table_info:serialized;table_coords:serialized;pdf_pages:serialized;column_info:serialized;history:serialized;AllowDeny:serialized'); $new_server = grab_values('host;extension;port;socket;connect_type;compress:bool;controluser;controlpass;auth_type;user;password;only_db;verbose;pmadb;bookmarktable:serialized;relation:serialized;table_info:serialized;table_coords:serialized;pdf_pages:serialized;column_info:serialized;history:serialized;AllowDeny:serialized');
$err = FALSE; $err = FALSE;
if (empty($new_server['host'])) { if (empty($new_server['host'])) {
message('error', 'Empty hostname!'); message('error', 'Empty hostname!');