diff options
| author | 2018-05-01 17:02:11 +0200 | |
|---|---|---|
| committer | 2018-05-01 17:02:11 +0200 | |
| commit | b552abb3327f09baa1c0f4e821dc9f6bd6ef738e (patch) | |
| tree | dc5439bcf0e65d16fda118d45d2ded0c7ff7230c /lib/Minz | |
| parent | 404ca869e9aafa40931914812b8552e4b9973694 (diff) | |
JSON column for feeds (#1838)
* Draft of JSON column for feeds
https://github.com/FreshRSS/FreshRSS/issues/1654
* Add some per-feed options
* Feed cURL timeout
* Mark updated articles as read https://github.com/FreshRSS/FreshRSS/issues/891
* Mark as read upon reception https://github.com/FreshRSS/FreshRSS/issues/1702
* Ignore SSL (unsafe) https://github.com/FreshRSS/FreshRSS/issues/1811
* Try PHPCS workaround
While waiting for a better syntax support
Diffstat (limited to 'lib/Minz')
| -rw-r--r-- | lib/Minz/ModelPdo.php | 4 | ||||
| -rw-r--r-- | lib/Minz/Request.php | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php index d769e0ff4..6928a2857 100644 --- a/lib/Minz/ModelPdo.php +++ b/lib/Minz/ModelPdo.php @@ -69,7 +69,7 @@ class Minz_ModelPdo { case 'sqlite': $string = 'sqlite:' . join_path(DATA_PATH, 'users', $currentUser, 'db.sqlite'); $this->prefix = ''; - $this->bd = new MinzPDOMSQLite($string, $db['user'], $db['password'], $driver_options); + $this->bd = new MinzPDOSQLite($string, $db['user'], $db['password'], $driver_options); $this->bd->exec('PRAGMA foreign_keys = ON;'); break; case 'pgsql': @@ -160,7 +160,7 @@ class MinzPDOMySql extends MinzPDO { } } -class MinzPDOMSQLite extends MinzPDO { +class MinzPDOSQLite extends MinzPDO { public function lastInsertId($name = null) { return parent::lastInsertId(); //We discard the name, only used by PostgreSQL } diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php index a43509ded..e21697e42 100644 --- a/lib/Minz/Request.php +++ b/lib/Minz/Request.php @@ -39,6 +39,19 @@ class Minz_Request { return $default; } } + public static function paramTernary($key) { + if (isset(self::$params[$key])) { + $p = self::$params[$key]; + $tp = trim($p); + if ($p === null || $tp === '' || $tp === 'null') { + return null; + } elseif ($p == false || $tp == '0' || $tp === 'false' || $tp === 'no') { + return false; + } + return true; + } + return null; + } public static function defaultControllerName() { return self::$default_controller_name; } |
