// we need a separate check here because functions.php might get parsed
// incorrectly before 5.3 because of :: syntax.
- if (version_compare(PHP_VERSION, '5.3.0', '<')) {
- print "<b>Fatal Error</b>: PHP version 5.3.0 or newer required.\n";
+ if (version_compare(PHP_VERSION, '5.6.0', '<')) {
+ print "<b>Fatal Error</b>: PHP version 5.6.0 or newer required. You're using " . PHP_VERSION . ".\n";
exit;
}
set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
get_include_path());
+ require_once "autoload.php";
require_once "sessions.php";
require_once "functions.php";
require_once "sanity_check.php";
$mobile = new Mobile_Detect();
- $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
- if (!init_connection($link)) return;
-
- global $pluginhost;
+ if (!init_plugins()) return;
if (!$_REQUEST['mobile']) {
- if ($mobile->isTablet() && $pluginhost->get_plugin("digest")) {
+ if ($mobile->isTablet() && PluginHost::getInstance()->get_plugin("digest")) {
header('Location: backend.php?op=digest');
exit;
- } else if ($mobile->isMobile() && $pluginhost->get_plugin("mobile")) {
+ } else if ($mobile->isMobile() && PluginHost::getInstance()->get_plugin("mobile")) {
header('Location: backend.php?op=mobile');
exit;
- } else if ($mobile->isMobile() && $pluginhost->get_plugin("digest")) {
+ } else if ($mobile->isMobile() && PluginHost::getInstance()->get_plugin("digest")) {
header('Location: backend.php?op=digest');
exit;
}
}
- login_sequence($link);
-
- no_cache_incantation();
+ login_sequence();
header('Content-Type: text/html; charset=utf-8');
<html>
<head>
<title>Tiny Tiny RSS</title>
+ <meta name="viewport" content="initial-scale=1,width=device-width" />
+
+ <script type="text/javascript">
+ var __ttrss_version = "<?php echo VERSION ?>"
+ </script>
<?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
- <?php echo stylesheet_tag("tt-rss.css"); ?>
- <?php echo stylesheet_tag("cdm.css"); ?>
<?php if ($_SESSION["uid"]) {
- $theme = get_pref($link, "USER_CSS_THEME", $_SESSION["uid"], false);
- if ($theme) {
- echo stylesheet_tag("themes/$theme");
+ $theme = get_pref("USER_CSS_THEME", false, false);
+ if ($theme && theme_valid("$theme")) {
+ echo stylesheet_tag(get_theme_path($theme));
+ } else {
+ echo stylesheet_tag("css/default.css");
}
}
?>
- <?php print_user_stylesheet($link) ?>
+ <?php print_user_stylesheet() ?>
<style type="text/css">
<?php
- foreach ($pluginhost->get_plugins() as $n => $p) {
+ foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
if (method_exists($p, "get_css")) {
echo $p->get_css();
}
<link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png" />
+ <script>
+ dojoConfig = {
+ async: true,
+ cacheBust: new Date(),
+ packages: [
+ { name: "fox", location: "../../js" },
+ ]
+ };
+ </script>
+
<?php
foreach (array("lib/prototype.js",
- "lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls",
+ "//ajax.googleapis.com/ajax/libs/scriptaculous/1.8.3/scriptaculous.js?load=effects,controls",
+ // "//ajax.googleapis.com/ajax/libs/dojo/1.8.3/dojo/dojo.js",
"lib/dojo/dojo.js",
- "lib/dijit/dijit.js",
"lib/dojo/tt-rss-layer.js",
"errors.php?mode=js") as $jsfile) {
+ if ($jsfile == "klib/dojo/dojo.js") {?>
+ <script data-dojo-config="async: 1, dojoBlankHtmlUrl: '/lib/dojo/resources/blank.html',
+ packages: [ {
+ name: 'custom',
+ location: location.pathname.replace(/\/[^/]+$/, '') + '/js/custom'
+ } ]"
+ src="//ajax.googleapis.com/ajax/libs/dojo/1.8.3/dojo/dojo.js"></script>
+ <?} else
+
echo javascript_tag($jsfile);
} ?>
<script type="text/javascript">
+ 'use strict';
+ require({cache:{}});
<?php
- require 'lib/jshrink/Minifier.php';
-
- global $pluginhost;
-
- foreach ($pluginhost->get_plugins() as $n => $p) {
+ print get_minified_js(["tt-rss.js",
+ "functions.js", "feedlist.js", "viewfeed.js", "PluginHost.js"]);
+ ?>
+ </script>
+ <script type="text/javascript">
+ <?php
+ foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
if (method_exists($p, "get_js")) {
+ echo "try {";
echo JShrink\Minifier::minify($p->get_js());
+ echo "} catch (e) {
+ console.warn('failed to initialize plugin JS: $n');
+ console.warn(e);
+ }";
}
}
- print get_minified_js(array("tt-rss",
- "functions", "feedlist", "viewfeed", "FeedTree"));
-
init_js_translations();
?>
</script>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta name="referrer" content="no-referrer"/>
<script type="text/javascript">
Event.observe(window, 'load', function() {
</script>
</head>
-<body id="ttrssMain" class="claro">
+<body class="claro ttrss_main">
<div id="overlay" style="display : block">
<div id="overlay_inner">
</div>
</div>
-<div style="display : none" onclick="Element.hide(this)" id="small_article_preview"></div>
-
-<div id="notify" class="notify"><span id="notify_body"> </span></div>
+<div id="notify" class="notify"></div>
<div id="cmdline" style="display : none"></div>
-<div id="headlines-tmp" style="display : none"></div>
<div id="main" dojoType="dijit.layout.BorderContainer">
<div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
<div id="main-toolbar" dojoType="dijit.Toolbar">
- <form id="main_toolbar_form" action="" onsubmit='return false'>
+ <?php
+ foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_MAIN_TOOLBAR_BUTTON) as $p) {
+ echo $p->hook_main_toolbar_button();
+ }
+ ?>
+
+ <form id="headlines-toolbar" action="" onsubmit='return false'>
- <button dojoType="dijit.form.Button" id="collapse_feeds_btn"
- onclick="collapse_feedlist()"
- title="<?php echo __('Collapse feedlist') ?>" style="display : inline">
- <<</button>
+ </form>
+
+ <form id="main_toolbar_form" action="" onsubmit='return false'>
<select name="view_mode" title="<?php echo __('Show articles') ?>"
onchange="viewModeChanged()"
<option value="marked"><?php echo __('Starred') ?></option>
<option value="published"><?php echo __('Published') ?></option>
<option value="unread"><?php echo __('Unread') ?></option>
- <option value="unread_first"><?php echo __('Unread First') ?></option>
<option value="has_note"><?php echo __('With Note') ?></option>
<!-- <option value="noscores"><?php echo __('Ignore Scoring') ?></option> -->
</select>
<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>
</select>
- <select title="<?php echo __('Mark feed as read') ?>"
- onchange="catchupCurrentFeed(event)"
- dojoType="dijit.form.Select" name="catchup_feed">
- <option selected="selected" value="default"><?php echo __('Mark as read') ?></option>
- <option value="all"><?php echo __('All articles') ?></option>
- <option value="1day"><?php echo __('Older than one day') ?></option>
- <option value="1week"><?php echo __('Older than one week') ?></option>
- <option value="2weeks"><?php echo __('Older than two weeks') ?></option>
- </select>
-
- <button dojoType="dijit.form.Button"
- onclick="viewCurrentFeed()">
- <?php echo __('Refresh') ?></button>
+ <div dojoType="dijit.form.ComboButton" onclick="catchupCurrentFeed()">
+ <span><?php echo __('Mark as read') ?></span>
+ <div dojoType="dijit.DropDownMenu">
+ <div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('1day')">
+ <?php echo __('Older than one day') ?>
+ </div>
+ <div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('1week')">
+ <?php echo __('Older than one week') ?>
+ </div>
+ <div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('2week')">
+ <?php echo __('Older than two weeks') ?>
+ </div>
+ </div>
+ </div>
</form>
<div class="actionChooser">
+ <?php
+ foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_TOOLBAR_BUTTON) as $p) {
+ echo $p->hook_toolbar_button();
+ }
+ ?>
+
<button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true"
title="<?php echo __("Communication problem with server.") ?>">
- <img
- src="images/alert.png" />
- </button>
-
- <button id="newVersionIcon" dojoType="dijit.form.Button" style="display : none">
- <img onclick="newVersionDlg()"
- src="images/new_version.png"
- title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" />
+ <img src="images/error.png" />
</button>
-
<div dojoType="dijit.form.DropDownButton">
<span><?php echo __('Actions...') ?></span>
<div dojoType="dijit.Menu" style="display: none">
<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Feed actions:') ?></div>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFeed')"><?php echo __('Subscribe to feed...') ?></div>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcEditFeed')"><?php echo __('Edit this feed...') ?></div>
- <!-- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcRescoreFeed')"><?php echo __('Rescore feed') ?></div> -->
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcRemoveFeed')"><?php echo __('Unsubscribe') ?></div>
<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('All feeds:') ?></div>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcCatchupAll')"><?php echo __('Mark as read') ?></div>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div>
- <!-- <?php if ($pluginhost->get_plugin("digest")) { ?>
- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcDigest')"><?php echo __('Switch to digest...') ?></div>
- <?php } ?> -->
- <!-- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div> -->
- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagSelect')"><?php echo __('Select by tags...') ?></div>
- <!-- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div>
- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div> -->
+ <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
+
+ <?php
+ foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ACTION_ITEM) as $p) {
+ echo $p->hook_action_item();
+ }
+ ?>
+
<?php if (!$_SESSION["hide_logout"]) { ?>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcLogout')"><?php echo __('Logout') ?></div>
<?php } ?>
</div>
</div>
+
+ <button id="updatesIcon" dojoType="dijit.form.Button" style="display : none">
+ <img src="images/new_version.png" title="<?php echo __('Updates are available from Git.') ?>"/>
+ </button>
</div>
</div> <!-- toolbar -->
</div> <!-- toolbar pane -->
<div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">
- <div id="headlines-toolbar" dojoType="dijit.layout.ContentPane" region="top">
- </div>
+ <div id="floatingTitle" style="visibility : hidden"></div>
- <div id="headlines-frame" dojoType="dijit.layout.ContentPane"
+ <div id="headlines-frame" dojoType="dijit.layout.ContentPane" tabindex="0"
onscroll="headlines_scroll_handler(this)" region="center">
<div id="headlinesInnerContainer">
<div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
</div>
</div>
-<?php db_close($link); ?>
-
</body>
</html>
git.wh0rd.org / tt-rss.git / blobdiff