diff --git a/webui/system/database/sphinx.php b/webui/system/database/sphinx.php index 944e7d2f..63d0e46d 100644 --- a/webui/system/database/sphinx.php +++ b/webui/system/database/sphinx.php @@ -4,70 +4,65 @@ class Sphinx { private $link; private $prefix; - public function __construct($hostname, $username, $password, $database, $prefix = NULL) { - if (!$this->link = mysql_connect($hostname, $username, $password)) { - exit('Error: Could not make a database connection using ' . $username . '@' . $hostname); + list($host, $port) = explode(":", $hostname); + + try { + $this->link = new PDO("mysql:host=$host;port=$port;dbname=$database;charset=utf8", $username, $password); + } + catch(PDOException $exception) { + exit('Error: ' . $exception->getMessage() . " on database: $database
"); } - $this->prefix = $prefix; - mysql_query("SET NAMES 'utf8'", $this->link); - mysql_query("SET CHARACTER SET utf8", $this->link); + $this->affected = 0; } - public function query($sql) { + public function select_db($database) { } + + + public function query($sql, $arr = array()) { $query = new stdClass(); + $query->error = 1; + $query->errmsg = "Error"; $query->query = $sql; - $query->error = 0; - $query->errmsg = ""; $time_start = microtime(true); - $resource = mysql_query(str_replace('#__', $this->prefix, $sql), $this->link); + $i = 0; + $data = array(); - if($resource){ - if(is_resource($resource)){ - $i = 0; + $s = $this->link->prepare($sql); + if(!$s) { return $query; } - $data = array(); + $s->execute($arr); - while ($result = mysql_fetch_assoc($resource)) { - $data[$i] = $result; + $this->affected = $s->rowCount(); - $i++; - } + $R = $s->fetchAll(); - mysql_free_result($resource); - - $query->row = isset($data[0]) ? $data[0] : array(); - $query->rows = $data; - $query->num_rows = $i; - - unset($data); - - $time_end = microtime(true); - - $query->exec_time = $time_end - $time_start; - - return $query; - } - else { - return $query; - } - } - else { - $_SESSION['error'] = 'Error: ' . mysql_error() . '
Error No: ' . mysql_errno() . '
' . $sql; - - $query->errmsg = 'Error: ' . mysql_error() . '
Error No: ' . mysql_errno() . '
' . $sql; - $query->error = 1; - - return $query; + while(list ($k, $v) = each($R)){ + $data[$i] = $v; + $i++; } + $query->row = isset($data[0]) ? $data[0] : array(); + $query->rows = $data; + $query->num_rows = $i; + + $query->error = 0; + $query->errmsg = ""; + + unset($data); + + $time_end = microtime(true); + + $query->exec_time = $time_end - $time_start; + + return $query; } @@ -81,10 +76,7 @@ class Sphinx { } - public function __destruct() { - mysql_close($this->link); - } - + public function __destruct() { } }