Fix cosmetic errors

This commit is contained in:
Frederic Guillot 2015-10-19 21:21:18 -04:00
parent e8cfe21cd4
commit 9b08fc9160
10 changed files with 55 additions and 50 deletions

View File

@ -70,4 +70,4 @@ PicoDb\Database::setInstance('db', function() {
die($html); die($html);
} }
}); });

View File

@ -1,4 +1,12 @@
{ {
"name": "miniflux/miniflux",
"description": "Minimalist RSS reader",
"license": "AGPLv3",
"authors": [
{
"name": "Frédéric Guillot"
}
],
"config": { "config": {
"preferred-install": "dist" "preferred-install": "dist"
}, },

View File

@ -87,7 +87,7 @@ Router\get_action('show', function() {
} }
Response\html(Template\layout('show_item', array( 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, 'item' => $item,
'feed' => $feed, 'feed' => $feed,
'item_nav' => isset($nav) ? $nav : null, 'item_nav' => isset($nav) ? $nav : null,

View File

@ -161,4 +161,4 @@ function hsts()
function xframe($mode = 'DENY', array $urls = array()) function xframe($mode = 'DENY', array $urls = array())
{ {
header('X-Frame-Options: '.$mode.' '.implode(' ', $urls)); header('X-Frame-Options: '.$mode.' '.implode(' ', $urls));
} }

View File

@ -54,4 +54,4 @@ function flash($message)
function flash_error($message) function flash_error($message)
{ {
$_SESSION['flash_error_message'] = $message; $_SESSION['flash_error_message'] = $message;
} }

0
locales/sr_RS/translations.php Executable file → Normal file
View File

0
locales/sr_RS@latin/translations.php Executable file → Normal file
View File

View File

@ -219,7 +219,7 @@ function create($url, $enable_grabber = false, $force_rtl = false, $cloak_referr
// Refresh all feeds // Refresh all feeds
function refresh_all($limit = LIMIT_ALL) function refresh_all($limit = LIMIT_ALL)
{ {
foreach (@get_ids($limit) as $feed_id) { foreach (get_ids($limit) as $feed_id) {
refresh($feed_id); refresh($feed_id);
} }
@ -283,9 +283,6 @@ function refresh($feed_id)
return true; return true;
} }
catch (InvalidUrlException $e) {
// disable($feed_id);
}
catch (PicoFeedException $e) { catch (PicoFeedException $e) {
} }

View File

@ -7,7 +7,7 @@ use Model\Config;
const VERSION = 41; const VERSION = 41;
function version_41($pdo) function version_41(PDO $pdo)
{ {
$pdo->exec(' $pdo->exec('
CREATE TABLE "groups" ( 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"'); $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'); $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)'); $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)'); $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)'); $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 = ""'); $pdo->exec('DELETE FROM favicons WHERE icon = ""');
@ -96,7 +96,7 @@ function version_35($pdo)
$pdo->exec('DROP TABLE config'); $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'); $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'); $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_enabled INTEGER DEFAULT 0');
$pdo->exec('ALTER TABLE config ADD COLUMN instapaper_username TEXT'); $pdo->exec('ALTER TABLE config ADD COLUMN instapaper_username TEXT');
$pdo->exec('ALTER TABLE config ADD COLUMN instapaper_password 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_enabled INTEGER DEFAULT 0');
$pdo->exec('ALTER TABLE config ADD COLUMN pinboard_token TEXT'); $pdo->exec('ALTER TABLE config ADD COLUMN pinboard_token TEXT');
$pdo->exec('ALTER TABLE config ADD COLUMN pinboard_tags TEXT DEFAULT "miniflux"'); $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'); $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).'"'); $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'); $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"'); $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().'"'); $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( $pdo->exec(
'CREATE TABLE remember_me ( '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'"); $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'); $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'"); $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 TEXT');
$pdo->exec('ALTER TABLE items ADD COLUMN enclosure_type 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"'); $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 = $pdo->prepare('SELECT autoflush FROM config');
$rq->execute(); $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'); $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"'); $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_google_token TEXT DEFAULT ""');
$pdo->exec('ALTER TABLE config ADD COLUMN auth_mozilla_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'); $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().'"'); $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'); $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().'"'); $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(' $rq = $pdo->prepare('
SELECT 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"'); $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'); $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'); $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'); $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'); $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'); $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)'); $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'"); $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 last_modified TEXT');
$pdo->exec('ALTER TABLE feeds ADD COLUMN etag TEXT'); $pdo->exec('ALTER TABLE feeds ADD COLUMN etag TEXT');
} }
function version_1($pdo) function version_1(PDO $pdo)
{ {
$pdo->exec(" $pdo->exec("
CREATE TABLE config ( CREATE TABLE config (

View File

@ -73,4 +73,4 @@ function getFunctionCode($name)
$end = strrpos($sourcecode, '}'); $end = strrpos($sourcecode, '}');
return substr($sourcecode, $begin, $end - $begin + 1); return substr($sourcecode, $begin, $end - $begin + 1);
} }