diff --git a/common.php b/common.php index c569320..632a69c 100644 --- a/common.php +++ b/common.php @@ -70,4 +70,4 @@ PicoDb\Database::setInstance('db', function() { die($html); } -}); \ No newline at end of file +}); diff --git a/composer.json b/composer.json index 93ca5a0..d622c0c 100644 --- a/composer.json +++ b/composer.json @@ -1,4 +1,12 @@ { + "name": "miniflux/miniflux", + "description": "Minimalist RSS reader", + "license": "AGPLv3", + "authors": [ + { + "name": "Frédéric Guillot" + } + ], "config": { "preferred-install": "dist" }, diff --git a/controllers/item.php b/controllers/item.php index 35ba78e..5912bbe 100644 --- a/controllers/item.php +++ b/controllers/item.php @@ -87,7 +87,7 @@ Router\get_action('show', function() { } Response\html(Template\layout('show_item', array( - 'nb_unread_items' => $nb_unread_items = Model\Item\count_by_status('unread'), + 'nb_unread_items' => Model\Item\count_by_status('unread'), 'item' => $item, 'feed' => $feed, 'item_nav' => isset($nav) ? $nav : null, diff --git a/lib/Response.php b/lib/Response.php index e1594ec..43d5a85 100644 --- a/lib/Response.php +++ b/lib/Response.php @@ -161,4 +161,4 @@ function hsts() function xframe($mode = 'DENY', array $urls = array()) { header('X-Frame-Options: '.$mode.' '.implode(' ', $urls)); -} \ No newline at end of file +} diff --git a/lib/Session.php b/lib/Session.php index 3d818f1..43a9ae9 100644 --- a/lib/Session.php +++ b/lib/Session.php @@ -54,4 +54,4 @@ function flash($message) function flash_error($message) { $_SESSION['flash_error_message'] = $message; -} \ No newline at end of file +} diff --git a/locales/sr_RS/translations.php b/locales/sr_RS/translations.php old mode 100755 new mode 100644 diff --git a/locales/sr_RS@latin/translations.php b/locales/sr_RS@latin/translations.php old mode 100755 new mode 100644 diff --git a/models/feed.php b/models/feed.php index 5176c58..bdf5a4e 100644 --- a/models/feed.php +++ b/models/feed.php @@ -219,7 +219,7 @@ function create($url, $enable_grabber = false, $force_rtl = false, $cloak_referr // Refresh all feeds function refresh_all($limit = LIMIT_ALL) { - foreach (@get_ids($limit) as $feed_id) { + foreach (get_ids($limit) as $feed_id) { refresh($feed_id); } @@ -283,9 +283,6 @@ function refresh($feed_id) return true; } - catch (InvalidUrlException $e) { - // disable($feed_id); - } catch (PicoFeedException $e) { } diff --git a/models/schema.php b/models/schema.php index 6acd42a..605649c 100644 --- a/models/schema.php +++ b/models/schema.php @@ -7,7 +7,7 @@ use Model\Config; const VERSION = 41; -function version_41($pdo) +function version_41(PDO $pdo) { $pdo->exec(' CREATE TABLE "groups" ( @@ -27,32 +27,32 @@ function version_41($pdo) '); } -function version_40($pdo) +function version_40(PDO $pdo) { $pdo->exec('UPDATE settings SET "value"="https://github.com/miniflux/miniflux/archive/master.zip" WHERE "key"="auto_update_url"'); } -function version_39($pdo) +function version_39(PDO $pdo) { $pdo->exec('ALTER TABLE feeds ADD COLUMN cloak_referrer INTEGER DEFAULT 0'); } -function version_38($pdo) +function version_38(PDO $pdo) { $pdo->exec('INSERT INTO settings ("key", "value") VALUES ("original_marks_read", 1)'); } -function version_37($pdo) +function version_37(PDO $pdo) { $pdo->exec('INSERT INTO settings ("key", "value") VALUES ("debug_mode", 0)'); } -function version_36($pdo) +function version_36(PDO $pdo) { $pdo->exec('INSERT INTO settings ("key", "value") VALUES ("frontend_updatecheck_interval", 10)'); } -function version_35($pdo) +function version_35(PDO $pdo) { $pdo->exec('DELETE FROM favicons WHERE icon = ""'); @@ -96,7 +96,7 @@ function version_35($pdo) $pdo->exec('DROP TABLE config'); } -function version_34($pdo) +function version_34(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN favicons INTEGER DEFAULT 0'); @@ -110,51 +110,51 @@ function version_34($pdo) ); } -function version_33($pdo) +function version_33(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN image_proxy INTEGER DEFAULT 0'); } -function version_32($pdo) +function version_32(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN instapaper_enabled INTEGER DEFAULT 0'); $pdo->exec('ALTER TABLE config ADD COLUMN instapaper_username TEXT'); $pdo->exec('ALTER TABLE config ADD COLUMN instapaper_password TEXT'); } -function version_31($pdo) +function version_31(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN pinboard_enabled INTEGER DEFAULT 0'); $pdo->exec('ALTER TABLE config ADD COLUMN pinboard_token TEXT'); $pdo->exec('ALTER TABLE config ADD COLUMN pinboard_tags TEXT DEFAULT "miniflux"'); } -function version_30($pdo) +function version_30(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN autoflush_unread INTEGER DEFAULT 45'); } -function version_29($pdo) +function version_29(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN fever_token INTEGER DEFAULT "'.substr(Config\generate_token(), 0, 8).'"'); } -function version_28($pdo) +function version_28(PDO $pdo) { $pdo->exec('ALTER TABLE feeds ADD COLUMN rtl INTEGER DEFAULT 0'); } -function version_27($pdo) +function version_27(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN items_display_mode TEXT DEFAULT "summaries"'); } -function version_26($pdo) +function version_26(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN bookmarklet_token TEXT DEFAULT "'.Config\generate_token().'"'); } -function version_25($pdo) +function version_25(PDO $pdo) { $pdo->exec( 'CREATE TABLE remember_me ( @@ -170,33 +170,33 @@ function version_25($pdo) ); } -function version_24($pdo) +function version_24(PDO $pdo) { $pdo->exec("ALTER TABLE config ADD COLUMN auto_update_url TEXT DEFAULT 'https://github.com/fguillot/miniflux/archive/master.zip'"); } -function version_23($pdo) +function version_23(PDO $pdo) { $pdo->exec('ALTER TABLE items ADD COLUMN language TEXT'); } -function version_22($pdo) +function version_22(PDO $pdo) { $pdo->exec("ALTER TABLE config ADD COLUMN timezone TEXT DEFAULT 'UTC'"); } -function version_21($pdo) +function version_21(PDO $pdo) { $pdo->exec('ALTER TABLE items ADD COLUMN enclosure TEXT'); $pdo->exec('ALTER TABLE items ADD COLUMN enclosure_type TEXT'); } -function version_20($pdo) +function version_20(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN redirect_nothing_to_read TEXT DEFAULT "feeds"'); } -function version_19($pdo) +function version_19(PDO $pdo) { $rq = $pdo->prepare('SELECT autoflush FROM config'); $rq->execute(); @@ -209,43 +209,43 @@ function version_19($pdo) } } -function version_18($pdo) +function version_18(PDO $pdo) { $pdo->exec('ALTER TABLE feeds ADD COLUMN parsing_error INTEGER DEFAULT 0'); } -function version_17($pdo) +function version_17(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN items_sorting_direction TEXT DEFAULT "desc"'); } -function version_16($pdo) +function version_16(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN auth_google_token TEXT DEFAULT ""'); $pdo->exec('ALTER TABLE config ADD COLUMN auth_mozilla_token TEXT DEFAULT ""'); } -function version_15($pdo) +function version_15(PDO $pdo) { $pdo->exec('ALTER TABLE feeds ADD COLUMN download_content INTEGER DEFAULT 0'); } -function version_14($pdo) +function version_14(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN feed_token TEXT DEFAULT "'.Config\generate_token().'"'); } -function version_13($pdo) +function version_13(PDO $pdo) { $pdo->exec('ALTER TABLE feeds ADD COLUMN enabled INTEGER DEFAULT 1'); } -function version_12($pdo) +function version_12(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN api_token TEXT DEFAULT "'.Config\generate_token().'"'); } -function version_11($pdo) +function version_11(PDO $pdo) { $rq = $pdo->prepare(' SELECT @@ -274,53 +274,53 @@ function version_11($pdo) } } -function version_10($pdo) +function version_10(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN theme TEXT DEFAULT "original"'); } -function version_9($pdo) +function version_9(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN items_per_page INTEGER DEFAULT 100'); } -function version_8($pdo) +function version_8(PDO $pdo) { $pdo->exec('ALTER TABLE items ADD COLUMN bookmark INTEGER DEFAULT 0'); } -function version_7($pdo) +function version_7(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN nocontent INTEGER DEFAULT 0'); } -function version_6($pdo) +function version_6(PDO $pdo) { $pdo->exec('ALTER TABLE config ADD COLUMN autoflush INTEGER DEFAULT 0'); } -function version_5($pdo) +function version_5(PDO $pdo) { $pdo->exec('ALTER TABLE feeds ADD COLUMN last_checked INTEGER'); } -function version_4($pdo) +function version_4(PDO $pdo) { $pdo->exec('CREATE INDEX idx_status ON items(status)'); } -function version_3($pdo) +function version_3(PDO $pdo) { $pdo->exec("ALTER TABLE config ADD COLUMN language TEXT DEFAULT 'en_US'"); } -function version_2($pdo) +function version_2(PDO $pdo) { $pdo->exec('ALTER TABLE feeds ADD COLUMN last_modified TEXT'); $pdo->exec('ALTER TABLE feeds ADD COLUMN etag TEXT'); } -function version_1($pdo) +function version_1(PDO $pdo) { $pdo->exec(" CREATE TABLE config ( diff --git a/scripts/sync-locales.php b/scripts/sync-locales.php index 87ea804..f36fc70 100755 --- a/scripts/sync-locales.php +++ b/scripts/sync-locales.php @@ -73,4 +73,4 @@ function getFunctionCode($name) $end = strrpos($sourcecode, '}'); return substr($sourcecode, $begin, $end - $begin + 1); -} \ No newline at end of file +}