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

allow to use PMA_query_as_cu without die on error

Browse Source 
ignore gracefully if pmadb is set wrongly
This commit is contained in:
Mike Beck
2002-07-08 09:36:17 +00:00
parent 00579e7b76
commit 74ed4db63d
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libraries/relation.lib.php3
View File

@@ -16,16 +16,22 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){
* @author Mike Beck<mikebeck@users.sourceforge.net> * @author Mike Beck<mikebeck@users.sourceforge.net>
* @access public * @access public
*/ */
function PMA_query_as_cu($sql) { function PMA_query_as_cu($sql,$showerror=TRUE) {
global $err_url_0, $db, $dbh, $cfgRelation; global $err_url_0, $db, $dbh, $cfgRelation;
if (isset($dbh)) { if (isset($dbh)) {
PMA_mysql_select_db($cfgRelation['db'],$dbh); PMA_mysql_select_db($cfgRelation['db'],$dbh);
$result = @PMA_mysql_query($sql, $dbh) or PMA_mysqlDie(mysql_error($dbh), $sql, '', $err_url_0); $result = @PMA_mysql_query($sql, $dbh);
if(!$result && $showerror==TRUE){
PMA_mysqlDie(mysql_error($dbh), $sql, '', $err_url_0);
}
PMA_mysql_select_db($db,$dbh); PMA_mysql_select_db($db,$dbh);
} else { } else {
PMA_mysql_select_db($cfgRelation['db']); PMA_mysql_select_db($cfgRelation['db']);
$result = @PMA_mysql_query($sql) or PMA_mysqlDie('', $sql, '', $err_url_0); $result = @PMA_mysql_query($sql);
if($result && $showerror==TRUE){
PMA_mysqlDie('', $sql, '', $err_url_0);
}
PMA_mysql_select_db($db); PMA_mysql_select_db($db);
} }
if($result){ if($result){
@@ -66,6 +72,19 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){
return ''; return '';
} }
// check if pmadb exists
$tab_query = 'SHOW DATABASES';
$tab_rs = PMA_query_as_cu($tab_query);
while ($curr_db = @PMA_mysql_fetch_array($tab_rs)) {
if($curr_db[0] == $cfg['Server']['pmadb']) {
$cfgRelation['db'] = $GLOBALS['cfg']['Server']['pmadb'];
}
}
if(!isset($cfgRelation['db'])){
$GLOBALS['cfg']['Server']['pmadb'] = FALSE;
return;
}
$cfgRelation['user'] = $GLOBALS['cfg']['Server']['user']; $cfgRelation['user'] = $GLOBALS['cfg']['Server']['user'];
$cfgRelation['db'] = $GLOBALS['cfg']['Server']['pmadb']; $cfgRelation['db'] = $GLOBALS['cfg']['Server']['pmadb'];

6
pdf_pages.php3
View File

@@ -7,7 +7,13 @@
*/ */
require('./libraries/grab_globals.lib.php3'); require('./libraries/grab_globals.lib.php3');
require('./libraries/common.lib.php3'); require('./libraries/common.lib.php3');
<<<<<<< pdf_pages.php3
require('./tbl_properties_common.php3');
require('./tbl_properties_table_info.php3');
require('./libraries/relation.lib.php3');
=======
include('./db_details_common.php3'); include('./db_details_common.php3');
>>>>>>> 1.6
/** /**
* Settings for relation stuff * Settings for relation stuff