@@ -12,8 +12,7 @@ discard block |
||
12 | 12 | /** |
13 | 13 | * Class Generic |
14 | 14 | */ |
15 | -abstract class Generic |
|
16 | -{ |
|
15 | +abstract class Generic { |
|
17 | 16 | /* public: connection parameters */ |
18 | 17 | public $host = 'localhost'; |
19 | 18 | public $database = ''; |
@@ -71,8 +70,7 @@ discard block |
||
71 | 70 | * @param string $query Optional query to perform immediately |
72 | 71 | * @param string $port optional port for the connection |
73 | 72 | */ |
74 | - public function __construct($database = '', $user = '', $password = '', $host = 'localhost', $query = '', $port = '') |
|
75 | - { |
|
73 | + public function __construct($database = '', $user = '', $password = '', $host = 'localhost', $query = '', $port = '') { |
|
76 | 74 | $this->database = $database; |
77 | 75 | $this->user = $user; |
78 | 76 | $this->password = $password; |
@@ -90,24 +88,21 @@ discard block |
||
90 | 88 | * @param string $file |
91 | 89 | * @return void |
92 | 90 | */ |
93 | - public function log($message, $line = '', $file = '', $level = 'info') |
|
94 | - { |
|
91 | + public function log($message, $line = '', $file = '', $level = 'info') { |
|
95 | 92 | error_log($message); |
96 | 93 | } |
97 | 94 | |
98 | 95 | /** |
99 | 96 | * @return int|object |
100 | 97 | */ |
101 | - public function linkId() |
|
102 | - { |
|
98 | + public function linkId() { |
|
103 | 99 | return $this->linkId; |
104 | 100 | } |
105 | 101 | |
106 | 102 | /** |
107 | 103 | * @return int|object |
108 | 104 | */ |
109 | - public function queryId() |
|
110 | - { |
|
105 | + public function queryId() { |
|
111 | 106 | return $this->queryId; |
112 | 107 | } |
113 | 108 | |
@@ -115,8 +110,7 @@ discard block |
||
115 | 110 | * @param $string |
116 | 111 | * @return string |
117 | 112 | */ |
118 | - public function real_escape($string = '') |
|
119 | - { |
|
113 | + public function real_escape($string = '') { |
|
120 | 114 | if ((!is_resource($this->linkId) || $this->linkId == 0) && !$this->connect()) { |
121 | 115 | return $this->escape($string); |
122 | 116 | } |
@@ -127,8 +121,7 @@ discard block |
||
127 | 121 | * @param $string |
128 | 122 | * @return string |
129 | 123 | */ |
130 | - public function escape($string = '') |
|
131 | - { |
|
124 | + public function escape($string = '') { |
|
132 | 125 | //if (function_exists('mysql_escape_string')) |
133 | 126 | //return mysql_escape_string($string); |
134 | 127 | return str_replace(array('\\', "\0", "\n", "\r", "'", '"', "\x1a"), array('\\\\', '\\0', '\\n', '\\r', "\\'", '\\"', '\\Z'), $string); |
@@ -138,8 +131,7 @@ discard block |
||
138 | 131 | * @param mixed $str |
139 | 132 | * @return string |
140 | 133 | */ |
141 | - public function dbAddslashes($str = '') |
|
142 | - { |
|
134 | + public function dbAddslashes($str = '') { |
|
143 | 135 | if (!isset($str) || $str == '') { |
144 | 136 | return ''; |
145 | 137 | } |
@@ -151,8 +143,7 @@ discard block |
||
151 | 143 | * @param mixed $epoch |
152 | 144 | * @return bool|string |
153 | 145 | */ |
154 | - public function toTimestamp($epoch) |
|
155 | - { |
|
146 | + public function toTimestamp($epoch) { |
|
156 | 147 | return date('Y-m-d H:i:s', $epoch); |
157 | 148 | } |
158 | 149 | |
@@ -161,8 +152,7 @@ discard block |
||
161 | 152 | * @param mixed $timestamp |
162 | 153 | * @return bool|int|mixed |
163 | 154 | */ |
164 | - public function fromTimestamp($timestamp) |
|
165 | - { |
|
155 | + public function fromTimestamp($timestamp) { |
|
166 | 156 | if (preg_match('/([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})/', $timestamp, $parts)) { |
167 | 157 | $time = mktime($parts[4], $parts[5], $parts[6], $parts[2], $parts[3], $parts[1]); |
168 | 158 | } elseif (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $timestamp, $parts)) { |
@@ -188,8 +178,7 @@ discard block |
||
188 | 178 | * @param string $file |
189 | 179 | * @return mixed |
190 | 180 | */ |
191 | - public function limitQuery($queryString, $numRows = '', $offset = 0, $line = '', $file = '') |
|
192 | - { |
|
181 | + public function limitQuery($queryString, $numRows = '', $offset = 0, $line = '', $file = '') { |
|
193 | 182 | if (!$numRows) { |
194 | 183 | $numRows = $this->maxMatches; |
195 | 184 | } |
@@ -216,8 +205,7 @@ discard block |
||
216 | 205 | * @param string $file optionally pass __FILE__ calling the query for logging |
217 | 206 | * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only |
218 | 207 | */ |
219 | - public function qr($query, $line = '', $file = '') |
|
220 | - { |
|
208 | + public function qr($query, $line = '', $file = '') { |
|
221 | 209 | return $this->queryReturn($query, $line, $file); |
222 | 210 | } |
223 | 211 | |
@@ -228,8 +216,7 @@ discard block |
||
228 | 216 | * @param string $stripSlashes |
229 | 217 | * @return string |
230 | 218 | */ |
231 | - public function f($name, $stripSlashes = '') |
|
232 | - { |
|
219 | + public function f($name, $stripSlashes = '') { |
|
233 | 220 | if ($stripSlashes || ($this->autoStripslashes && !$stripSlashes)) { |
234 | 221 | return stripslashes($this->Record[$name]); |
235 | 222 | } else { |
@@ -245,8 +232,7 @@ discard block |
||
245 | 232 | * @param string $file |
246 | 233 | * @return void |
247 | 234 | */ |
248 | - public function halt($msg, $line = '', $file = '') |
|
249 | - { |
|
235 | + public function halt($msg, $line = '', $file = '') { |
|
250 | 236 | $this->unlock(false); |
251 | 237 | /* Just in case there is a table currently locked */ |
252 | 238 | |
@@ -273,8 +259,7 @@ discard block |
||
273 | 259 | * @param string $file |
274 | 260 | * @return mixed|void |
275 | 261 | */ |
276 | - public function logBackTrace($msg, $line = '', $file = '') |
|
277 | - { |
|
262 | + public function logBackTrace($msg, $line = '', $file = '') { |
|
278 | 263 | $backtrace = (function_exists('debug_backtrace') ? debug_backtrace() : []); |
279 | 264 | $this->log( |
280 | 265 | ('' !== getenv('REQUEST_URI') ? ' '.getenv('REQUEST_URI') : ''). |
@@ -305,8 +290,7 @@ discard block |
||
305 | 290 | } |
306 | 291 | } |
307 | 292 | |
308 | - public function emailError($queryString, $error, $line, $file) |
|
309 | - { |
|
293 | + public function emailError($queryString, $error, $line, $file) { |
|
310 | 294 | $subject = php_uname('n').' MySQLi Error'; |
311 | 295 | $smarty = new \TFSmarty(); |
312 | 296 | $smarty->assign([ |
@@ -333,8 +317,7 @@ discard block |
||
333 | 317 | * @param string $file |
334 | 318 | * @return mixed|void |
335 | 319 | */ |
336 | - public function haltmsg($msg, $line = '', $file = '') |
|
337 | - { |
|
320 | + public function haltmsg($msg, $line = '', $file = '') { |
|
338 | 321 | $email = "DB Error {$msg} {$file}:{$line}"; |
339 | 322 | \MyAdmin\Mail::failsafeMail($email, $email, ['[email protected]', '[email protected]']); |
340 | 323 | return; |
@@ -349,8 +332,7 @@ discard block |
||
349 | 332 | /** |
350 | 333 | * @return array |
351 | 334 | */ |
352 | - public function indexNames() |
|
353 | - { |
|
335 | + public function indexNames() { |
|
354 | 336 | return []; |
355 | 337 | } |
356 | 338 | |
@@ -362,8 +344,7 @@ discard block |
||
362 | 344 | * @param string|int $line Line Number |
363 | 345 | * @param string $file File Name |
364 | 346 | */ |
365 | - public function addLog($statement, $time, $line = '', $file = '') |
|
366 | - { |
|
347 | + public function addLog($statement, $time, $line = '', $file = '') { |
|
367 | 348 | $query = [ |
368 | 349 | 'statement' => $statement, |
369 | 350 | 'time' => $time * 1000 |
@@ -385,8 +366,7 @@ discard block |
||
385 | 366 | * Return logged queries. |
386 | 367 | * @return array Logged queries |
387 | 368 | */ |
388 | - public function getLog() |
|
389 | - { |
|
369 | + public function getLog() { |
|
390 | 370 | return $this->log; |
391 | 371 | } |
392 | 372 | } |