Skip to content

Commit 85e2b93

Browse files
branchzerobranchzero
committed
remove MySQL Driver && set_magic_quotes_runtime
1 parent d4d338d commit 85e2b93

File tree

19 files changed

+45
-1313
lines changed

19 files changed

+45
-1313
lines changed

‎api/db/dbbak.php‎

Lines changed: 1 addition & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -71,138 +71,6 @@
7171
}
7272
$get['time'] = $timestamp;
7373

74-
class dbstuff {
75-
var $querynum = 0;
76-
var $link;
77-
var $histories;
78-
var $time;
79-
var $tablepre;
80-
81-
function connect($dbhost, $dbuser, $dbpw, $dbname = '', $dbcharset, $pconnect = 0, $tablepre='', $time = 0) {
82-
$this->time = $time;
83-
$this->tablepre = $tablepre;
84-
if($pconnect) {
85-
if(!$this->link = mysql_pconnect($dbhost, $dbuser, $dbpw)) {
86-
$this->halt('Can not connect to MySQL server');
87-
}
88-
} else {
89-
if(!$this->link = mysql_connect($dbhost, $dbuser, $dbpw, 1)) {
90-
$this->halt('Can not connect to MySQL server');
91-
}
92-
}
93-
94-
if($this->version() > '4.1') {
95-
if($dbcharset) {
96-
mysql_query("SET character_set_connection=".$dbcharset.", character_set_results=".$dbcharset.", character_set_client=binary", $this->link);
97-
}
98-
99-
if($this->version() > '5.0.1') {
100-
mysql_query("SET sql_mode=''", $this->link);
101-
}
102-
}
103-
104-
if($dbname) {
105-
mysql_select_db($dbname, $this->link);
106-
}
107-
108-
}
109-
110-
function fetch_array($query, $result_type = MYSQL_ASSOC) {
111-
return mysql_fetch_array($query, $result_type);
112-
}
113-
114-
function result_first($sql) {
115-
$query = $this->query($sql);
116-
return $this->result($query, 0);
117-
}
118-
119-
function fetch_first($sql) {
120-
$query = $this->query($sql);
121-
return $this->fetch_array($query);
122-
}
123-
124-
function fetch_all($sql) {
125-
$arr = array();
126-
$query = $this->query($sql);
127-
while($data = $this->fetch_array($query)) {
128-
$arr[] = $data;
129-
}
130-
return $arr;
131-
}
132-
133-
function cache_gc() {
134-
$this->query("DELETE FROM {$this->tablepre}sqlcaches WHERE expiry<$this->time");
135-
}
136-
137-
function query($sql, $type = '', $cachetime = FALSE) {
138-
$func = $type == 'UNBUFFERED' && @function_exists('mysql_unbuffered_query') ? 'mysql_unbuffered_query' : 'mysql_query';
139-
if(!($query = $func($sql, $this->link)) && $type != 'SILENT') {
140-
$this->halt('MySQL Query Error', $sql);
141-
}
142-
$this->querynum++;
143-
$this->histories[] = $sql;
144-
return $query;
145-
}
146-
147-
function affected_rows() {
148-
return mysql_affected_rows($this->link);
149-
}
150-
151-
function error() {
152-
return (($this->link) ? mysql_error($this->link) : mysql_error());
153-
}
154-
155-
function errno() {
156-
return intval(($this->link) ? mysql_errno($this->link) : mysql_errno());
157-
}
158-
159-
function result($query, $row) {
160-
$query = @mysql_result($query, $row);
161-
return $query;
162-
}
163-
164-
function num_rows($query) {
165-
$query = mysql_num_rows($query);
166-
return $query;
167-
}
168-
169-
function num_fields($query) {
170-
return mysql_num_fields($query);
171-
}
172-
173-
function free_result($query) {
174-
return mysql_free_result($query);
175-
}
176-
177-
function insert_id() {
178-
return ($id = mysql_insert_id($this->link)) >= 0 ? $id : $this->result($this->query("SELECT last_insert_id()"), 0);
179-
}
180-
181-
function fetch_row($query) {
182-
$query = mysql_fetch_row($query);
183-
return $query;
184-
}
185-
186-
function fetch_fields($query) {
187-
return mysql_fetch_field($query);
188-
}
189-
190-
function version() {
191-
return mysql_get_server_info($this->link);
192-
}
193-
194-
function escape_string($str) {
195-
return mysql_escape_string($str);
196-
}
197-
198-
function close() {
199-
return mysql_close($this->link);
200-
}
201-
202-
function halt($message = '', $sql = '') {
203-
api_msg('run_sql_error', $message.'<br /><br />'.$sql.'<br /> '.mysql_error());
204-
}
205-
}
20674
class dbstuffi {
20775
var $querynum = 0;
20876
var $link;
@@ -333,7 +201,7 @@ function halt($message = '', $sql = '') {
333201
}
334202

335203

336-
$db = function_exists("mysql_connect") ? new dbstuff() : new dbstuffi();
204+
$db = new dbstuffi();
337205
$version = '';
338206
if($apptype == 'discuz') {
339207

‎install/include/install_function.php‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,13 @@ function show_msg($error_no, $error_msg = 'ok', $success = 1, $quit = TRUE) {
5858
}
5959

6060
function check_db($dbhost, $dbuser, $dbpw, $dbname, $tablepre) {
61-
if(!function_exists('mysql_connect') && !function_exists('mysqli_connect')) {
62-
show_msg('undefine_func', 'mysql_connect', 0);
61+
if(!function_exists('mysqli_connect')) {
62+
show_msg('undefine_func', 'mysqli_connect', 0);
6363
}
64-
$mysqlmode = function_exists('mysql_connect') ? 'mysql' : 'mysqli';
65-
$link = ($mysqlmode == 'mysql') ? @mysql_connect($dbhost, $dbuser, $dbpw) : new mysqli($dbhost, $dbuser, $dbpw);
64+
$link = new mysqli($dbhost, $dbuser, $dbpw);
6665
if(!$link) {
67-
$errno = ($mysqlmode == 'mysql') ? mysql_errno() : mysqli_errno();
68-
$error = ($mysqlmode == 'mysql') ? mysql_error() : mysqli_error();
66+
$errno = mysqli_errno();
67+
$error = mysqli_error();
6968
if($errno == 1045) {
7069
show_msg('database_errno_1045', $error, 0);
7170
} elseif($errno == 2003) {
@@ -74,11 +73,11 @@ function check_db($dbhost, $dbuser, $dbpw, $dbname, $tablepre) {
7473
show_msg('database_connect_error', $error, 0);
7574
}
7675
} else {
77-
if($query = (($mysqlmode == 'mysql') ? @mysql_query("SHOW TABLES FROM $dbname") : $link->query("SHOW TABLES FROM $dbname"))) {
76+
if($query = $link->query("SHOW TABLES FROM $dbname")) {
7877
if(!$query) {
7978
return false;
8079
}
81-
while($row = (($mysqlmode == 'mysql') ? mysql_fetch_row($query) : $query->fetch_row())) {
80+
while($row = $query->fetch_row()) {
8281
if(preg_match("/^$tablepre/", $row[0])) {
8382
return false;
8483
}
@@ -941,7 +940,7 @@ function check_env() {
941940
$errors = array('quit' => false);
942941
$quit = false;
943942

944-
if(!function_exists('mysql_connect') && !function_exists('mysqli_connect')) {
943+
if(!function_exists('mysqli_connect')) {
945944
$errors[] = 'mysql_unsupport';
946945
$quit = true;
947946
}
@@ -1151,7 +1150,7 @@ function save_uc_config($config, $file) {
11511150

11521151
list($appauthkey, $appid, $ucdbhost, $ucdbname, $ucdbuser, $ucdbpw, $ucdbcharset, $uctablepre, $uccharset, $ucapi, $ucip) = $config;
11531152

1154-
$link = function_exists('mysql_connect') ? mysql_connect($ucdbhost, $ucdbuser, $ucdbpw, 1) : new mysqli($ucdbhost, $ucdbuser, $ucdbpw, $ucdbname);
1153+
$link = new mysqli($ucdbhost, $ucdbuser, $ucdbpw, $ucdbname);
11551154
$uc_connnect = $link ? 'mysql' : '';
11561155

11571156
$date = gmdate("Y-m-d H:i:s", time() + 3600 * 8);
@@ -1718,4 +1717,4 @@ function install_extra_setting() {
17181717
foreach($settings as $key => $val) {
17191718
$db->query("REPLACE INTO {$tablepre}common_setting SET skey='$key', svalue='".addslashes(serialize($val))."'");
17201719
}
1721-
}
1720+
}

‎install/include/install_mysql.php‎

Lines changed: 0 additions & 145 deletions
This file was deleted.

‎install/include/install_var.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
define('MISSING_PARAMETER', 33);
6464
define('LOCK_FILE_NOT_TOUCH', 34);
6565

66-
$func_items = array(function_exists('mysql_connect') ? 'mysql_connect' : 'mysqli_connect', 'gethostbyname', 'file_get_contents', 'xml_parser_create');
66+
$func_items = array('mysqli_connect', 'gethostbyname', 'file_get_contents', 'xml_parser_create');
6767

6868
$filesock_items = array('fsockopen', 'pfsockopen', 'stream_socket_client', 'curl_init');
6969

@@ -419,4 +419,4 @@
419419
),
420420
);
421421

422-
?>
422+
?>

0 commit comments

Comments
 (0)