@@ -17,8 +17,7 @@ |
||
| 17 | 17 | * |
| 18 | 18 | * @access public |
| 19 | 19 | */ |
| 20 | -class Db extends Generic implements Db_Interface |
|
| 21 | -{ |
|
| 20 | +class Db extends Generic implements Db_Interface { |
|
| 22 | 21 | /** |
| 23 | 22 | * @var string |
| 24 | 23 | */ |
@@ -13,8 +13,7 @@ |
||
| 13 | 13 | * |
| 14 | 14 | * @package MyDb |
| 15 | 15 | */ |
| 16 | -interface Db_Interface |
|
| 17 | -{ |
|
| 16 | +interface Db_Interface { |
|
| 18 | 17 | |
| 19 | 18 | /** |
| 20 | 19 | * Db_Interface constructor. |
@@ -17,8 +17,7 @@ discard block |
||
| 17 | 17 | * |
| 18 | 18 | * @access public |
| 19 | 19 | */ |
| 20 | -class Db extends Generic implements Db_Interface |
|
| 21 | -{ |
|
| 20 | +class Db extends Generic implements Db_Interface { |
|
| 22 | 21 | /* public: connection parameters */ |
| 23 | 22 | public $driver = 'mysql'; |
| 24 | 23 | public $Rows = []; |
@@ -76,11 +75,9 @@ discard block |
||
| 76 | 75 | if ($this->characterSet != '') |
| 77 | 76 | $dSN .= ';charset='.$this->characterSet; |
| 78 | 77 | if ($this->linkId === FALSE) { |
| 79 | - try |
|
| 80 | - { |
|
| 78 | + try { |
|
| 81 | 79 | $this->linkId = new \PDO($dSN, $user, $password); |
| 82 | - } |
|
| 83 | - catch (\PDOException $e) { |
|
| 80 | + } catch (\PDOException $e) { |
|
| 84 | 81 | $this->halt('Connection Failed '.$e->getMessage()); |
| 85 | 82 | return 0; |
| 86 | 83 | } |
@@ -12,8 +12,7 @@ |
||
| 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 = ''; |
@@ -17,8 +17,7 @@ |
||
| 17 | 17 | * |
| 18 | 18 | * @access public |
| 19 | 19 | */ |
| 20 | -class Db extends Generic implements Db_Interface |
|
| 21 | -{ |
|
| 20 | +class Db extends Generic implements Db_Interface { |
|
| 22 | 21 | public $host = 'localhost'; |
| 23 | 22 | public $user = 'pdns'; |
| 24 | 23 | public $password = ''; |
@@ -13,8 +13,7 @@ |
||
| 13 | 13 | * |
| 14 | 14 | * @package MyDb |
| 15 | 15 | */ |
| 16 | -class Loader |
|
| 17 | -{ |
|
| 16 | +class Loader { |
|
| 18 | 17 | /* public: connection parameters */ |
| 19 | 18 | public $Type = 'mysqli'; |
| 20 | 19 | public $host = 'localhost'; |
@@ -17,8 +17,7 @@ discard block |
||
| 17 | 17 | * |
| 18 | 18 | * @access public |
| 19 | 19 | */ |
| 20 | -class Db extends Generic implements Db_Interface |
|
| 21 | -{ |
|
| 20 | +class Db extends Generic implements Db_Interface { |
|
| 22 | 21 | public $driver = 'mysql'; |
| 23 | 22 | public $Rows = []; |
| 24 | 23 | public $type = 'adodb'; |
@@ -172,11 +171,9 @@ discard block |
||
| 172 | 171 | |
| 173 | 172 | } |
| 174 | 173 | |
| 175 | - try |
|
| 176 | - { |
|
| 174 | + try { |
|
| 177 | 175 | $this->queryId = $this->linkId->Execute($queryString); |
| 178 | - } |
|
| 179 | - catch (exception $e) { |
|
| 176 | + } catch (exception $e) { |
|
| 180 | 177 | $email = "MySQL Error<br>\n".'Query: '.$queryString . "<br>\n".'Error #'.print_r($e, TRUE) . "<br>\n".'Line: '.$line . "<br>\n".'File: '.$file . "<br>\n" . (isset($GLOBALS['tf']) ? |
| 181 | 178 | 'User: '.$GLOBALS['tf']->session->account_id . "<br>\n" : ''); |
| 182 | 179 | |
@@ -17,8 +17,7 @@ |
||
| 17 | 17 | * |
| 18 | 18 | * @access public |
| 19 | 19 | */ |
| 20 | -class Db extends Generic implements Db_Interface |
|
| 21 | -{ |
|
| 20 | +class Db extends Generic implements Db_Interface { |
|
| 22 | 21 | /* public: this is an api revision, not a CVS revision. */ |
| 23 | 22 | public $type = 'pgsql'; |
| 24 | 23 | public $port = '5432'; |