aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2019-09-29 16:22:50 +0200
committerGravatar GitHub <noreply@github.com> 2019-09-29 16:22:50 +0200
commite3e5954394f4523850c78e80e496f1b916622677 (patch)
tree2e20d9091735e1da1de85e273e19635f58111e0f /app/Controllers
parentec4307c1a64a0f60648fdd7d0a2eb819bbf12965 (diff)
PDO refactoring for code simplification (#2522)
* PDO refactor * Automatic prefix when using the syntax `_tableName` * Uniformity: MySQL is now PDO::ATTR_EMULATE_PREPARES = false just like SQLite and PostgreSQL, with consequences such as only one statement per query * Use PDO methods exec(), query(), prepare() + execute() in a more efficient way * Remove auto-update SQL code for versions older than FreshRSS 1.5 (3 years old) * The name of the default category is set in PHP instead of in the DB (simplies SQL and allows changing the name according to the FreshRSS language) * Rename `->bd` to `->pdo` (less of a frenshism, and more informative) * Fix some requests, which were not compatible with MySQL prepared statements * Whitespace * Fix syntax for PostgreSQL sequences + MySQL install * Minor formatting * Fix lastInsertId for PostgreSQL * Use PHP 5.6+ const Take advantage of https://github.com/FreshRSS/FreshRSS/pull/2527 https://www.php.net/manual/en/migration56.new-features.php * A bit of forgotten PHP 5.6 simplification for cURL * Forgotten $s * Mini fix custom user config https://github.com/FreshRSS/FreshRSS/pull/2490/files#r326290346 * More work on install.php but not finished * install.php working * More cleaning of PDO in install * Even more simplification Take advantage of PDO->exec() to run multiple statements * Disallow changing the name of the default category https://github.com/FreshRSS/FreshRSS/pull/2522#discussion_r326967724
Diffstat (limited to 'app/Controllers')
-rwxr-xr-xapp/Controllers/configureController.php3
-rwxr-xr-xapp/Controllers/feedController.php2
-rw-r--r--app/Controllers/userController.php13
3 files changed, 8 insertions, 10 deletions
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index b02ad02e4..85ca9da39 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -167,8 +167,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
* tab and up.
*/
public function shortcutAction() {
- global $SHORTCUT_KEYS;
- $this->view->list_keys = $SHORTCUT_KEYS;
+ $this->view->list_keys = SHORTCUT_KEYS;
if (Minz_Request::isPost()) {
FreshRSS_Context::$user_conf->shortcuts = validateShortcutList(Minz_Request::param('shortcuts'));
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index c2c0cce37..ea07d96e4 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -429,7 +429,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$feedDAO->updateLastUpdate($feed->id(), false, $mtime);
if ($needFeedCacheRefresh) {
- $feedDAO->updateCachedValue($feed->id());
+ $feedDAO->updateCachedValues($feed->id());
}
if ($entryDAO->inTransaction()) {
$entryDAO->commit();
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index ab8dfb0b2..6afc91b4e 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -211,16 +211,15 @@ class FreshRSS_user_Controller extends Minz_ActionController {
}
}
- public static function createUser($new_user_name, $email, $passwordPlain, $apiPasswordPlain, $userConfigOverride = array(), $insertDefaultFeeds = true) {
- $userConfig = array();
+ public static function createUser($new_user_name, $email, $passwordPlain, $apiPasswordPlain = '', $userConfigOverride = [], $insertDefaultFeeds = true) {
+ $userConfig = [];
$customUserConfigPath = join_path(DATA_PATH, 'config-user.custom.php');
if (file_exists($customUserConfigPath)) {
$customUserConfig = include($customUserConfigPath);
- }
-
- if (is_array($customUserConfig)) {
- $userConfig = $customUserConfig;
+ if (is_array($customUserConfig)) {
+ $userConfig = $customUserConfig;
+ }
}
if (is_array($userConfigOverride)) {
@@ -249,7 +248,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
}
if ($ok) {
$newUserDAO = FreshRSS_Factory::createUserDao($new_user_name);
- $ok &= $newUserDAO->createUser($userConfig['language'], $insertDefaultFeeds);
+ $ok &= $newUserDAO->createUser($insertDefaultFeeds);
$ok &= self::updateUser($new_user_name, $email, $passwordPlain, $apiPasswordPlain);
}
return $ok;