mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Bugfix - sql table data extraction would fail under some circumstances.

Browse Source
This commit is contained in:
CaMer0n
2012-11-02 19:54:50 +00:00
parent 2c3a9f3fc5
commit c3cd3ccc3b
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
e107_handlers/db_verify_class.php
View File

@@ -134,8 +134,8 @@ class db_verify
{ {
$mes->add("Tables appear to be okay!",E_MESSAGE_SUCCESS); //TODO LAN $mes->add("Tables appear to be okay!",E_MESSAGE_SUCCESS); //TODO LAN
$mes->add("<a href='".$this->backUrl."'>".LAN_BACK."</a>", E_MESSAGE_SUCCESS); $mes->add("<a href='".$this->backUrl."'>".LAN_BACK."</a>", E_MESSAGE_SUCCESS);
$debug = "<pre>".print_r($this->results,TRUE)."</pre>"; //$debug = "<pre>".print_r($this->results,TRUE)."</pre>";
$mes->add($debug,E_MESSAGE_DEBUG); //$mes->add($debug,E_MESSAGE_DEBUG);
//$text .= "<div class='buttons-bar center'>".$frm->admin_button('back', DBVLAN_17, 'back')."</div>"; //$text .= "<div class='buttons-bar center'>".$frm->admin_button('back', DBVLAN_17, 'back')."</div>";
$ns->tablerender("Okay",$mes->render().$text); $ns->tablerender("Okay",$mes->render().$text);
} }
@@ -192,6 +192,8 @@ class db_verify
{ {
if($language) continue; if($language) continue;
$this->errors[$tbl]['_status'] = 'missing_table'; $this->errors[$tbl]['_status'] = 'missing_table';
$this->results[$tbl]['_file'] = $selection; $this->results[$tbl]['_file'] = $selection;
// echo "missing table: $tbl"; // echo "missing table: $tbl";
@@ -214,7 +216,8 @@ class db_verify
$debugB .= print_r($sqlIndexData,TRUE); $debugB .= print_r($sqlIndexData,TRUE);
*/ */
// $debugA = $this->tables[$selection]['data'][$key]; // Extracted Raw Field Text $debugA = $this->tables[$selection]['data'][$key]; // Extracted Raw Field Text
$debugB = $rawSqlData;
// $debugB = $sqlDataArr['data'][0]; // Extracted Raw Field Text // $debugB = $sqlDataArr['data'][0]; // Extracted Raw Field Text
if(isset($debugA)) if(isset($debugA))
@@ -705,7 +708,7 @@ class db_verify
$sql_data = preg_replace("#\/\*.*?\*\/#mis", '', $sql_data); // remove comments $sql_data = preg_replace("#\/\*.*?\*\/#mis", '', $sql_data); // remove comments
// $regex = "/CREATE TABLE `?([\w]*)`?\s*?\(([\sa-z0-9_\(\),' `]*)\)\s*(ENGINE|TYPE)\s*?=\s?([\w]*)[\w =]*;/i"; // $regex = "/CREATE TABLE `?([\w]*)`?\s*?\(([\sa-z0-9_\(\),' `]*)\)\s*(ENGINE|TYPE)\s*?=\s?([\w]*)[\w =]*;/i";
$regex = "/CREATE TABLE `?([\w]*)`?\s*?\(([\s\w\+\-_\(\),' `]*)\)\s*(ENGINE|TYPE)\s*?=\s?([\w]*)[\w =]*;/i"; $regex = "/CREATE TABLE `?([\w]*)`?\s*?\(([\s\w\+\-_\(\),'\. `]*)\)\s*(ENGINE|TYPE)\s*?=\s?([\w]*)[\w =]*;/i";
$table = preg_match_all($regex,$sql_data,$match); $table = preg_match_all($regex,$sql_data,$match);
@@ -818,10 +821,13 @@ class db_verify
mysql_query('SET SQL_QUOTE_SHOW_CREATE = 1'); mysql_query('SET SQL_QUOTE_SHOW_CREATE = 1');
$qry = 'SHOW CREATE TABLE `' . $prefix . $tbl . "`"; $qry = 'SHOW CREATE TABLE `' . $prefix . $tbl . "`";
$z = mysql_query($qry); $z = mysql_query($qry);
if($z) if($z)
{ {
$row = mysql_fetch_row($z); $row = mysql_fetch_row($z);
//return $row[1];
return stripslashes($row[1]).';'; // backticks needed. return stripslashes($row[1]).';'; // backticks needed.
// return str_replace("`", "", stripslashes($row[1])).';'; // return str_replace("`", "", stripslashes($row[1])).';';
} }