initial

classes/db.php

@@ -5,6 +5,12 @@ class Db implements IDb {
 	private $link;
 
 	private function __construct() {
+
+		$er = error_reporting(E_ALL);
+
+		if (class_exists("PDO")) {
+			$this->adapter = new Db_PDO();
+		} else {
 			switch (DB_TYPE) {
 			case "mysql":
 				if (function_exists("mysqli_connect")) {
@@ -19,8 +25,17 @@ class Db implements IDb {
 			default:
 				die("Unknown DB_TYPE: " . DB_TYPE);
 			}
+		}
+
+		if (!$this->adapter) die("Error initializing database adapter for " . DB_TYPE);
 
 		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : false);
+
+		if (!$this->link) {
+			die("Error connecting through adapter: " . $this->adapter->last_error());
+		}
+
+		error_reporting($er);
 	}
 
 	private function __clone() {

classes/db/pdo.php

@@ -0,0 +1,87 @@
+<?php
+class Db_PDO implements IDb {
+	private $pdo;
+
+	function connect($host, $user, $pass, $db, $port) {
+		$connstr = DB_TYPE . ":host=$host;dbname=$db;charset=utf8";
+
+		try {
+			$this->pdo = new PDO($connstr, $user, $pass);
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+
+		return $this->pdo;
+	}
+
+	function escape_string($s, $strip_tags = true) {
+		if ($strip_tags) $s = strip_tags($s);
+
+		$qs = $this->pdo->quote($s);
+
+		return mb_substr($qs, 1, mb_strlen($qs)-2);
+	}
+
+	function query($query, $die_on_error = true) {
+		try {
+			return $this->pdo->query($query);
+		} catch (PDOException $e) {
+			user_error($e->getMessage(), $die_on_error ? E_USER_ERROR : E_USER_WARNING);
+		}
+	}
+
+	function fetch_assoc($result) {
+		try {
+			if ($result) {
+				return $result->fetch();
+			} else {
+				return null;
+			}
+		} catch (PDOException $e) {
+			user_error($e->getMessage(), E_USER_WARNING);
+		}
+	}
+
+	function num_rows($result) {
+		try {
+			if ($result) {
+				return $result->rowCount();
+			} else {
+				return false;
+			}
+		} catch (PDOException $e) {
+			user_error($e->getMessage(), E_USER_WARNING);
+		}
+	}
+
+	function fetch_result($result, $row, $param) {
+		$line = $this->fetch_assoc($result);
+
+		if ($line)
+			return $line[$param];
+		else
+			return null;
+
+	}
+
+	function close() {
+		$this->pdo = null;
+	}
+
+	function affected_rows($result) {
+		try {
+			if ($result) {
+				return $result->rowCount();
+			} else {
+				return null;
+			}
+		} catch (PDOException $e) {
+			user_error($e->getMessage(), E_USER_WARNING);
+		}
+	}
+
+	function last_error() {
+		return join(" ", $pdo->errorInfo());
+	}
+}
+?>

include/errorhandler.php

@@ -49,6 +49,6 @@ function ttrss_fatal_handler() {
 	return false;
 }
 
-register_shutdown_function('ttrss_fatal_handler');
-set_error_handler('ttrss_error_handler');
+//register_shutdown_function('ttrss_fatal_handler');
+//set_error_handler('ttrss_error_handler');
 ?>

plugins/auth_internal/init.php

@@ -24,10 +24,12 @@ class Auth_Internal extends Plugin implements IAuthModule {
 
 		if (get_schema_version() > 96) {
 			if (!defined('AUTH_DISABLE_OTP') || !AUTH_DISABLE_OTP) {
+
 				$result = db_query("SELECT otp_enabled,salt FROM ttrss_users WHERE
 					login = '$login'");
 
 				if (db_num_rows($result) > 0) {
+
 					require_once "lib/otphp/vendor/base32.php";
 					require_once "lib/otphp/lib/otp.php";
 					require_once "lib/otphp/lib/totp.php";