phpBO
/
MySQLDumper
1
0
Fork 0
Code Issues Pull-Requests Releases Aktivität

Merge pull request #15 from e-dschungel/fix_selectdb 

Fix quotation issues
Dieser Commit ist enthalten in:
Daniel Schlichtholz 2017-01-30 23:10:21 +01:00 committet von GitHub
Ursprung 8da0e93144 6c39f2a306
Commit 455c566aad
11 geänderte Dateien mit 25 neuen und 25 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
config_overview.php
Datei anzeigen

@ -355,7 +355,7 @@ if (isset($_POST['save']))
{ {
if (MSD_mysql_connect()) if (MSD_mysql_connect())
{ {
$res=@((bool)mysqli_query($config['dbconnection'], "USE " . $to_add)); $res=@mysqli_select_db($config['dbconnection'], $to_add);
if (!$res === false) if (!$res === false)
{ {
$databases['Name'][] = $to_add; $databases['Name'][] = $to_add;
@ -1002,4 +1002,4 @@ if (( $showVP ) || ( !isset($databases['Name']) ) || ( isset($databases['name'])
echo '</script>'; echo '</script>';
echo MSDFooter(); echo MSDFooter();
$_SESSION['config']=$config; $_SESSION['config']=$config;
ob_end_flush(); ob_end_flush();

4
inc/functions.php
Datei anzeigen

@ -173,7 +173,7 @@ function SetDefault($load_default = false)
$a = 0; $a = 0;
for ($i = 0; $i < count($found_dbs); $i++) { for ($i = 0; $i < count($found_dbs); $i++) {
$found_db = $found_dbs[$i]; $found_db = $found_dbs[$i];
$use = @((bool)mysqli_query($GLOBALS["___mysqli_ston"], "USE " . $found_db)); $use = @mysqli_select_db($GLOBALS["___mysqli_ston"], $found_db);
if ($use) { if ($use) {
if (isset($old_db) && $found_db == $old_db) { if (isset($old_db) && $found_db == $old_db) {
$databases['db_selected_index'] = $a; $databases['db_selected_index'] = $a;
@ -799,4 +799,4 @@ function db_escape($string)
return $string; return $string;
} }
?> ?>

6
inc/functions_dump.php
Datei anzeigen

@ -129,7 +129,7 @@ function get_def($db,$table,$withdata=1)
} }
else else
$def.="DROP TABLE IF EXISTS `$table`;\n"; $def.="DROP TABLE IF EXISTS `$table`;\n";
((bool)mysqli_query($GLOBALS["___mysqli_ston"], "USE " . $db)); mysqli_select_db($GLOBALS["___mysqli_ston"], $db);
$result=mysqli_query($config['dbconnection'], 'SHOW CREATE TABLE `'.$table.'`'); $result=mysqli_query($config['dbconnection'], 'SHOW CREATE TABLE `'.$table.'`');
$row=@mysqli_fetch_row($result); $row=@mysqli_fetch_row($result);
if ($row===false) return false; if ($row===false) return false;
@ -152,7 +152,7 @@ function get_content($db,$table)
$table_ready=0; $table_ready=0;
$query='SELECT * FROM `'.$table.'` LIMIT '.$dump['zeilen_offset'].','.($dump['restzeilen']+1); $query='SELECT * FROM `'.$table.'` LIMIT '.$dump['zeilen_offset'].','.($dump['restzeilen']+1);
((bool)mysqli_query($GLOBALS["___mysqli_ston"], "USE " . $db)); mysqli_select_db($GLOBALS["___mysqli_ston"], $db);
$result=mysqli_query($config['dbconnection'], $query); $result=mysqli_query($config['dbconnection'], $query);
$ergebnisse=@mysqli_num_rows($result); $ergebnisse=@mysqli_num_rows($result);
if ($ergebnisse!==false) if ($ergebnisse!==false)
@ -275,7 +275,7 @@ function ExecuteCommand($when)
if (substr(strtolower($cd),0,7)!='system:') if (substr(strtolower($cd),0,7)!='system:')
{ {
$cad=array(); $cad=array();
@((bool)mysqli_query($GLOBALS["___mysqli_ston"], "USE " . $databases['Name'][$dump['dbindex']])); mysqli_select_db($GLOBALS["___mysqli_ston"], $databases['Name'][$dump['dbindex']]);
if (strpos($cd,';')) if (strpos($cd,';'))
{ {
$cad=explode(';',$cd); $cad=explode(';',$cd);

4
inc/functions_global.php
Datei anzeigen

@ -116,7 +116,7 @@ function DBDetailInfo($index)
$databases['Detailinfo']['tables'] = $databases['Detailinfo']['records'] = $databases['Detailinfo']['size'] = 0; $databases['Detailinfo']['tables'] = $databases['Detailinfo']['records'] = $databases['Detailinfo']['size'] = 0;
MSD_mysql_connect(); MSD_mysql_connect();
if (isset($databases['Name'][$index])) { if (isset($databases['Name'][$index])) {
((bool)mysqli_query($GLOBALS["___mysqli_ston"], "USE " . $databases['Name'][$index])); mysqli_select_db($GLOBALS["___mysqli_ston"], $databases['Name'][$index]);
$databases['Detailinfo']['Name'] = $databases['Name'][$index]; $databases['Detailinfo']['Name'] = $databases['Name'][$index];
$res = @mysqli_query( $res = @mysqli_query(
$GLOBALS["___mysqli_ston"], $GLOBALS["___mysqli_ston"],
@ -1420,4 +1420,4 @@ function fetchFileDataFromURL($url)
return $in; return $in;
} }
?> ?>

2
inc/functions_imexport.php
Datei anzeigen

@ -206,7 +206,7 @@ function ImportCreateTable()
{ {
global $sql,$lang,$db,$config; global $sql,$lang,$db,$config;
$tbl=Array(); $tbl=Array();
$tabellen=mysqli_query($config['dbconnection'], "SHOW TABLES FROM $db"); $tabellen=mysqli_query($config['dbconnection'], "SHOW TABLES FROM `$db`");
$num_tables=mysqli_num_rows($tabellen); $num_tables=mysqli_num_rows($tabellen);
for ($i=0; $i < $num_tables; $i++) for ($i=0; $i < $num_tables; $i++)
{ {

6
inc/functions_sql.php
Datei anzeigen

@ -97,7 +97,7 @@ function Table_ComboBox()
function TableComboBox($default='') function TableComboBox($default='')
{ {
global $db,$config,$lang,$nl; global $db,$config,$lang,$nl;
$tabellen=mysqli_query($config['dbconnection'], "SHOW TABLES FROM $db"); $tabellen=mysqli_query($config['dbconnection'], "SHOW TABLES FROM `$db`");
$num_tables=mysqli_num_rows($tabellen); $num_tables=mysqli_num_rows($tabellen);
$s='<option value="" ' . ( ( $default == '' ) ? 'selected' : '' ) . '> </option>' . $nl; $s='<option value="" ' . ( ( $default == '' ) ? 'selected' : '' ) . '> </option>' . $nl;
for ($i=0; $i < $num_tables; $i++) for ($i=0; $i < $num_tables; $i++)
@ -207,7 +207,7 @@ function DB_Copy($source, $destination, $drop_source=0, $insert_data=1)
} }
} }
$SQL_Array.="USE `$destination` ;\n"; $SQL_Array.="USE `$destination` ;\n";
$tabellen=mysqli_query($config['dbconnection'], "SHOW TABLES FROM $source"); $tabellen=mysqli_query($config['dbconnection'], "SHOW TABLES FROM `$source`");
$num_tables=mysqli_num_rows($tabellen); $num_tables=mysqli_num_rows($tabellen);
for ($i=0; $i < $num_tables; $i++) for ($i=0; $i < $num_tables; $i++)
{ {
@ -226,7 +226,7 @@ function DB_Copy($source, $destination, $drop_source=0, $insert_data=1)
return false; return false;
} }
} }
((bool)mysqli_query($GLOBALS["___mysqli_ston"], "USE " . $destination)); mysqli_select_db($GLOBALS["___mysqli_ston"], $destination);
$res=MSD_DoSQL($SQL_Array); $res=MSD_DoSQL($SQL_Array);
if ($drop_source == 1 && $res) MSD_query("DROP DATABASE `$source`;"); if ($drop_source == 1 && $res) MSD_query("DROP DATABASE `$source`;");
return $res; return $res;

8
inc/home/databases.php
Datei anzeigen

@ -23,7 +23,7 @@ for ($i=0; $i<count($databases['Name']); $i++)
} }
if (isset($_POST['optimize'.$i])) if (isset($_POST['optimize'.$i]))
{ {
((bool)mysqli_query( $config['dbconnection'], "USE " . $databases['Name'][$i])); mysqli_select_db($config['dbconnection'], $databases['Name'][$i]);
$res=mysqli_query($config['dbconnection'], 'SHOW TABLES FROM `'.$databases['Name'][$i].'`'); $res=mysqli_query($config['dbconnection'], 'SHOW TABLES FROM `'.$databases['Name'][$i].'`');
$tabellen=''; $tabellen='';
WHILE ($row=mysqli_fetch_row($res)) WHILE ($row=mysqli_fetch_row($res))
@ -63,7 +63,7 @@ for ($i=0; $i<count($databases['Name']); $i++)
if ($i==$databases['db_selected_index']) $rowclass="dbrowsel"; if ($i==$databases['db_selected_index']) $rowclass="dbrowsel";
//gibts die Datenbank überhaupt? //gibts die Datenbank überhaupt?
if (!((bool)mysqli_query($config['dbconnection'], "USE " . $databases['Name'][$i]))) if (!mysqli_select_db($config['dbconnection'], $databases['Name'][$i]))
{ {
$tpl->assign_block_vars('DB_NOT_FOUND',array( $tpl->assign_block_vars('DB_NOT_FOUND',array(
'ROWCLASS' => $rowclass, 'ROWCLASS' => $rowclass,
@ -73,7 +73,7 @@ for ($i=0; $i<count($databases['Name']); $i++)
} }
else else
{ {
((bool)mysqli_query($config['dbconnection'], "USE " . $databases['Name'][$i])); mysqli_select_db($config['dbconnection'], $databases['Name'][$i]);
$tabellen=mysqli_query($config['dbconnection'], 'SHOW TABLES FROM `'.$databases['Name'][$i].'`'); $tabellen=mysqli_query($config['dbconnection'], 'SHOW TABLES FROM `'.$databases['Name'][$i].'`');
$num_tables=mysqli_num_rows($tabellen); $num_tables=mysqli_num_rows($tabellen);
$tpl->assign_block_vars('ROW',array( $tpl->assign_block_vars('ROW',array(
@ -102,7 +102,7 @@ if (isset($_GET['dbid']))
$numrows=0; $numrows=0;
$res=@mysqli_query($GLOBALS["___mysqli_ston"], "SHOW TABLE STATUS FROM `".$databases['Name'][$dbid]."`"); $res=@mysqli_query($GLOBALS["___mysqli_ston"], "SHOW TABLE STATUS FROM `".$databases['Name'][$dbid]."`");
((bool)mysqli_query($GLOBALS["___mysqli_ston"], "USE " . $databases['Name'][$dbid])); mysqli_select_db($GLOBALS["___mysqli_ston"], $databases['Name'][$dbid]);
if ($res) $numrows=mysqli_num_rows($res); if ($res) $numrows=mysqli_num_rows($res);
$tpl->assign_vars(array( $tpl->assign_vars(array(
'DB_NAME' => $databases['Name'][$dbid], 'DB_NAME' => $databases['Name'][$dbid],

4
inc/mysql.php
Datei anzeigen

@ -254,7 +254,7 @@ function MSD_mysql_connect($encoding='utf8', $keycheck_off=false, $actual_table=
} }
$port=( isset($config['dbport']) && !empty($config['dbport']) ) ? $config['dbport'] : ini_get("mysqli.default_port"); $port=( isset($config['dbport']) && !empty($config['dbport']) ) ? $config['dbport'] : ini_get("mysqli.default_port");
$socket=( isset($config['dbsocket']) && !empty($config['dbsocket']) ) ? $config['dbsocket'] : ini_get("mysqli.default_socket"); $socket=( isset($config['dbsocket']) && !empty($config['dbsocket']) ) ? $config['dbsocket'] : ini_get("mysqli.default_socket");
$config['dbconnection']=($GLOBALS["___mysqli_ston"] = mysqli_connect($config['dbhost'], $config['dbuser'], $config['dbpass'], "", $port, $socket)) or die(SQLError("Error establishing a database connection!", ((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false)))); $config['dbconnection']=@($GLOBALS["___mysqli_ston"] = mysqli_connect($config['dbhost'], $config['dbuser'], $config['dbpass'], "", $port, $socket)) or die(SQLError("Error establishing a database connection!", ((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false))));
if (!defined('MSD_MYSQL_VERSION')) GetMySQLVersion(); if (!defined('MSD_MYSQL_VERSION')) GetMySQLVersion();
if (!isset($config['mysql_standard_character_set']) || $config['mysql_standard_character_set'] == '') get_sql_encodings(); if (!isset($config['mysql_standard_character_set']) || $config['mysql_standard_character_set'] == '') get_sql_encodings();
@ -403,7 +403,7 @@ function getDBInfos()
} }
if ($config['optimize_tables_beforedump'] == 1 && $dump['table_offset'] == -1 if ($config['optimize_tables_beforedump'] == 1 && $dump['table_offset'] == -1
&& $databases['Name'][$dump['dbindex']]!='information_schema') { && $databases['Name'][$dump['dbindex']]!='information_schema') {
((bool)mysqli_query($GLOBALS["___mysqli_ston"], "USE " . $databases['Name'][$dump['dbindex']])); mysqli_select_db($GLOBALS["___mysqli_ston"], $databases['Name'][$dump['dbindex']]);
$opt = 'OPTIMIZE TABLE `' . $row['Name'] . '`'; $opt = 'OPTIMIZE TABLE `' . $row['Name'] . '`';
$res = mysqli_query($GLOBALS["___mysqli_ston"], 'OPTIMIZE TABLE `' . $row['Name'] . '`'); $res = mysqli_query($GLOBALS["___mysqli_ston"], 'OPTIMIZE TABLE `' . $row['Name'] . '`');
if ($res === false) { if ($res === false) {

4
inc/sqlbrowser/sql_tables.php
Datei anzeigen

@ -278,7 +278,7 @@ if (isset($_POST['newfield_posted']))
$fields_infos=getFieldinfos($databases['Name'][$dbid],$table_edit_name); $fields_infos=getFieldinfos($databases['Name'][$dbid],$table_edit_name);
} }
} }
((bool)mysqli_query($GLOBALS["___mysqli_ston"], "USE " . $databases['Name'][$dbid])); mysqli_select_db($GLOBALS["___mysqli_ston"], $databases['Name'][$dbid]);
$sqlt="SHOW TABLE STATUS FROM `".$databases['Name'][$dbid]."` ;"; $sqlt="SHOW TABLE STATUS FROM `".$databases['Name'][$dbid]."` ;";
$res=MSD_query($sqlt); $res=MSD_query($sqlt);
$anz_tabellen=mysqli_num_rows($res); $anz_tabellen=mysqli_num_rows($res);
@ -592,4 +592,4 @@ if ($table_edit_name!="")
echo '<br><input name="setNewKeys" type="submit" value="'.$lang['L_SAVE'].'" class="Formbutton">'; echo '<br><input name="setNewKeys" type="submit" value="'.$lang['L_SAVE'].'" class="Formbutton">';
echo '</form>'; echo '</form>';
} }
} }

4
restore.php
Datei anzeigen

@ -78,7 +78,7 @@ $pageheader=MSDheader().headline($lang['L_RESTORE']);
$aus1=$page_parameter=''; $aus1=$page_parameter='';
$RestoreFertig=$eingetragen=$dauer=$filegroesse=0; $RestoreFertig=$eingetragen=$dauer=$filegroesse=0;
MSD_mysql_connect($restore['dump_encoding'],true,$restore['actual_table']); MSD_mysql_connect($restore['dump_encoding'],true,$restore['actual_table']);
@((bool)mysqli_query($GLOBALS["___mysqli_ston"], "USE " . $databases['db_actual'])) or die($lang['L_DB_SELECT_ERROR'].$databases['db_actual'].$lang['L_DB_SELECT_ERROR2']); @mysqli_select_db($GLOBALS["___mysqli_ston"], $databases['db_actual']) or die($lang['L_DB_SELECT_ERROR'].$databases['db_actual'].$lang['L_DB_SELECT_ERROR2']);
// open backup file // open backup file
$restore['filehandle']=($restore['compressed']==1) ? gzopen($config['paths']['backup'].$restore['filename'],'r') : fopen($config['paths']['backup'].$restore['filename'],'r'); $restore['filehandle']=($restore['compressed']==1) ? gzopen($config['paths']['backup'].$restore['filename'],'r') : fopen($config['paths']['backup'].$restore['filename'],'r');
@ -306,4 +306,4 @@ else
} }
echo $complete_page; echo $complete_page;
ob_end_flush(); ob_end_flush();
?> ?>

4
sql.php
Datei anzeigen

@ -124,7 +124,7 @@ if ($sql_to_display_data==1)
if (isset($_POST['tableselect'])&&$_POST['tableselect']!='1') $tablename=$_POST['tableselect']; if (isset($_POST['tableselect'])&&$_POST['tableselect']!='1') $tablename=$_POST['tableselect'];
MSD_mysql_connect(); MSD_mysql_connect();
((bool)mysqli_query($config['dbconnection'], "USE " . $db)); mysqli_select_db($config['dbconnection'], $db);
///*** EDIT / UPDATES / INSERTS ***/// ///*** EDIT / UPDATES / INSERTS ***///
///*** ***/// ///*** ***///
@ -295,4 +295,4 @@ function FormHiddenParams()
$s.='<input type="hidden" name="order" value="'.$order.'">'; $s.='<input type="hidden" name="order" value="'.$order.'">';
$s.='<input type="hidden" name="orderdir" value="'.$orderdir.'">'; $s.='<input type="hidden" name="orderdir" value="'.$orderdir.'">';
return $s; return $s;
} }