diff options
Diffstat (limited to 'index.php')
| -rw-r--r-- | index.php | 102 |
1 files changed, 46 insertions, 56 deletions
@@ -1,9 +1,4 @@ <?php - if (!file_exists("config.php")) { - print "<b>Fatal Error</b>: You forgot to copy - <b>config.php-dist</b> to <b>config.php</b> and edit it.\n"; - exit; - } // we need a separate check here because functions.php might get parsed // incorrectly before 5.3 because of :: syntax. @@ -12,15 +7,13 @@ exit; } - set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR . + set_include_path(__DIR__ ."/include" . PATH_SEPARATOR . get_include_path()); require_once "autoload.php"; require_once "sessions.php"; require_once "functions.php"; require_once "sanity_check.php"; - require_once "config.php"; - require_once "db-prefs.php"; if (!init_plugins()) return; @@ -42,12 +35,12 @@ } } ?> - <?php if (theme_exists(LOCAL_OVERRIDE_STYLESHEET)) { - echo stylesheet_tag(get_theme_path(LOCAL_OVERRIDE_STYLESHEET)); + <?php if (theme_exists(Config::get(Config::LOCAL_OVERRIDE_STYLESHEET))) { + echo stylesheet_tag(get_theme_path(Config::get(Config::LOCAL_OVERRIDE_STYLESHEET))); } ?> <script type="text/javascript"> - const __csrf_token = "<?php echo $_SESSION["csrf_token"]; ?>"; + const __csrf_token = "<?= $_SESSION["csrf_token"]; ?>"; </script> <?php UserHelper::print_user_stylesheet() ?> @@ -68,7 +61,7 @@ <script> dojoConfig = { async: true, - cacheBust: "<?php echo get_scripts_timestamp(); ?>", + cacheBust: "<?= get_scripts_timestamp(); ?>", packages: [ { name: "fox", location: "../../js" }, ] @@ -76,13 +69,10 @@ </script> <?php - foreach (array("lib/prototype.js", - "lib/scriptaculous/scriptaculous.js?load=effects,controls", - "lib/dojo/dojo.js", + foreach (["lib/dojo/dojo.js", "lib/dojo/tt-rss-layer.js", "js/tt-rss.js", - "js/common.js", - "errors.php?mode=js") as $jsfile) { + "js/common.js"] as $jsfile) { echo javascript_tag($jsfile); @@ -132,7 +122,7 @@ <div id="overlay" style="display : block"> <div id="overlay_inner"> - <?php echo __("Loading, please wait...") ?> + <?= __("Loading, please wait...") ?> <div dojoType="dijit.ProgressBar" places="0" style="width : 300px" id="loading_bar" progress="0" maximum="100"> </div> @@ -147,7 +137,7 @@ <div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true"> <div id="feedlistLoading"> <img src='images/indicator_tiny.gif'/> - <?php echo __("Loading, please wait..."); ?></div> + <?= __("Loading, please wait..."); ?></div> <?php PluginHost::getInstance()->run_hooks_callback(PluginHost::HOOK_FEED_TREE, function ($result) { echo $result; @@ -161,13 +151,13 @@ <div id="toolbar" dojoType="fox.Toolbar"> <i class="material-icons net-alert" style="display : none" - title="<?php echo __("Communication problem with server.") ?>">error_outline</i> + title="<?= __("Communication problem with server.") ?>">error_outline</i> <i class="material-icons log-alert" style="display : none" onclick="App.openPreferences('system')" - title="<?php echo __("Recent entries found in event log.") ?>">warning</i> + title="<?= __("Recent entries found in event log.") ?>">warning</i> <i id="updates-available" class="material-icons icon-new-version" style="display : none" - title="<?php echo __('Updates are available from Git.') ?>">new_releases</i> + title="<?= __('Updates are available from Git.') ?>">new_releases</i> <?php @@ -176,32 +166,32 @@ }); ?> - <form id="toolbar-headlines" action="" style="order : 10" onsubmit='return false'> + <div id="toolbar-headlines" dojoType="fox.Toolbar" style="order : 10"> - </form> + </div> <form id="toolbar-main" action="" style="order : 20" onsubmit='return false'> - <select name="view_mode" title="<?php echo __('Show articles') ?>" + <select name="view_mode" title="<?= __('Show articles') ?>" onchange="App.onViewModeChanged()" dojoType="fox.form.Select"> - <option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option> - <option value="all_articles"><?php echo __('All Articles') ?></option> - <option value="marked"><?php echo __('Starred') ?></option> - <option value="published"><?php echo __('Published') ?></option> - <option value="unread"><?php echo __('Unread') ?></option> - <option value="has_note"><?php echo __('With Note') ?></option> - <!-- <option value="noscores"><?php echo __('Ignore Scoring') ?></option> --> + <option selected="selected" value="adaptive"><?= __('Adaptive') ?></option> + <option value="all_articles"><?= __('All Articles') ?></option> + <option value="marked"><?= __('Starred') ?></option> + <option value="published"><?= __('Published') ?></option> + <option value="unread"><?= __('Unread') ?></option> + <option value="has_note"><?= __('With Note') ?></option> + <!-- <option value="noscores"><?= __('Ignore Scoring') ?></option> --> </select> - <select title="<?php echo __('Sort articles') ?>" + <select title="<?= __('Sort articles') ?>" onchange="App.onViewModeChanged()" dojoType="fox.form.Select" name="order_by"> - <option selected="selected" value="default"><?php echo __('Default') ?></option> - <option value="feed_dates"><?php echo __('Newest first') ?></option> - <option value="date_reverse"><?php echo __('Oldest first') ?></option> - <option value="title"><?php echo __('Title') ?></option> + <option selected="selected" value="default"><?= __('Default') ?></option> + <option value="feed_dates"><?= __('Newest first') ?></option> + <option value="date_reverse"><?= __('Oldest first') ?></option> + <option value="title"><?= __('Title') ?></option> <?php PluginHost::getInstance()->run_hooks_callback(PluginHost::HOOK_HEADLINES_CUSTOM_SORT_MAP, function ($result) { @@ -213,16 +203,16 @@ </select> <div dojoType="fox.form.ComboButton" onclick="Feeds.catchupCurrent()"> - <span><?php echo __('Mark as read') ?></span> + <span><?= __('Mark as read') ?></span> <div dojoType="dijit.DropDownMenu"> <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1day')"> - <?php echo __('Older than one day') ?> + <?= __('Older than one day') ?> </div> <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1week')"> - <?php echo __('Older than one week') ?> + <?= __('Older than one week') ?> </div> <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('2week')"> - <?php echo __('Older than two weeks') ?> + <?= __('Older than two weeks') ?> </div> </div> </div> @@ -237,21 +227,21 @@ }); ?> - <div dojoType="fox.form.DropDownButton" class="action-button" title="<?php echo __('Actions...') ?>"> + <div dojoType="fox.form.DropDownButton" class="action-button" title="<?= __('Actions...') ?>"> <span><i class="material-icons">menu</i></span> <div dojoType="dijit.Menu" style="display: none"> - <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcPrefs')"><?php echo __('Preferences...') ?></div> - <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcSearch')"><?php echo __('Search...') ?></div> - <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Feed actions:') ?></div> - <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcAddFeed')"><?php echo __('Subscribe to feed...') ?></div> - <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcEditFeed')"><?php echo __('Edit this feed...') ?></div> - <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcRemoveFeed')"><?php echo __('Unsubscribe') ?></div> - <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('All feeds:') ?></div> - <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcCatchupAll')"><?php echo __('Mark as read') ?></div> - <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div> - <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div> - <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div> - <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div> + <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcPrefs')"><?= __('Preferences...') ?></div> + <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcSearch')"><?= __('Search...') ?></div> + <div dojoType="dijit.MenuItem" disabled="1"><?= __('Feed actions:') ?></div> + <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcAddFeed')"><?= __('Subscribe to feed...') ?></div> + <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcEditFeed')"><?= __('Edit this feed...') ?></div> + <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcRemoveFeed')"><?= __('Unsubscribe') ?></div> + <div dojoType="dijit.MenuItem" disabled="1"><?= __('All feeds:') ?></div> + <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcCatchupAll')"><?= __('Mark as read') ?></div> + <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcShowOnlyUnread')"><?= __('(Un)hide read feeds') ?></div> + <div dojoType="dijit.MenuItem" disabled="1"><?= __('Other actions:') ?></div> + <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcToggleWidescreen')"><?= __('Toggle widescreen mode') ?></div> + <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcHKhelp')"><?= __('Keyboard shortcuts help') ?></div> <?php PluginHost::getInstance()->run_hooks_callback(PluginHost::HOOK_ACTION_ITEM, function ($result) { @@ -260,7 +250,7 @@ ?> <?php if (empty($_SESSION["hide_logout"])) { ?> - <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcLogout')"><?php echo __('Logout') ?></div> + <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcLogout')"><?= __('Logout') ?></div> <?php } ?> </div> </div> @@ -271,7 +261,7 @@ <div id="headlines-frame" dojoType="dijit.layout.ContentPane" tabindex="0" region="center"> <div id="headlinesInnerContainer"> - <div class="whiteBox"><?php echo __('Loading, please wait...') ?></div> + <div class="whiteBox"><?= __('Loading, please wait...') ?></div> </div> </div> <div id="content-insert" dojoType="dijit.layout.ContentPane" region="bottom" |