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');
<title>Tiny Tiny RSS</title>
<?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
- <?php echo stylesheet_tag("tt-rss.css"); ?>
- <?php echo stylesheet_tag("cdm.css"); ?>
+ <?php echo stylesheet_tag("css/layout.css"); ?>
<?php if ($_SESSION["uid"]) {
- $theme = get_pref($link, "USER_CSS_THEME", $_SESSION["uid"], false);
- if ($theme) {
+ $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
+ if ($theme && file_exists("themes/$theme")) {
echo stylesheet_tag("themes/$theme");
+ } else {
+ echo stylesheet_tag("themes/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();
}
<?php
foreach (array("lib/prototype.js",
- "lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls",
+ "lib/scriptaculous/scriptaculous.js?load=effects,controls",
"lib/dojo/dojo.js",
- "lib/dijit/dijit.js",
"lib/dojo/tt-rss-layer.js",
"errors.php?mode=js") as $jsfile) {
} ?>
<script type="text/javascript">
+ require({cache:{}});
<?php
- require 'lib/jshrink/Minifier.php';
+ require_once 'lib/jshrink/Minifier.php';
- global $pluginhost;
+ print get_minified_js(array("tt-rss",
+ "functions", "feedlist", "viewfeed", "FeedTree", "PluginHost"));
- foreach ($pluginhost->get_plugins() as $n => $p) {
+ foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
if (method_exists($p, "get_js")) {
echo JShrink\Minifier::minify($p->get_js());
}
}
- print get_minified_js(array("tt-rss",
- "functions", "feedlist", "viewfeed", "FeedTree"));
-
init_js_translations();
?>
</script>
</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" style="display : none"></div>
<div id="cmdline" style="display : none"></div>
<div id="headlines-tmp" style="display : none"></div>
<div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
<div id="main-toolbar" dojoType="dijit.Toolbar">
+ <form id="headlines-toolbar" action="" onsubmit='return false'>
+
+ </form>
+
<form id="main_toolbar_form" action="" onsubmit='return false'>
<button dojoType="dijit.form.Button" id="collapse_feeds_btn"
onclick="collapse_feedlist()"
- title="<?php echo __('Collapse feedlist') ?>" style="display : inline">
+ title="<?php echo __('Collapse feedlist') ?>" style="display : none">
<<</button>
<select name="view_mode" title="<?php echo __('Show articles') ?>"
<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>
- <!-- deprecated -->
- <button dojoType="dijit.form.Button" name="update" style="display : none"
- onclick="viewCurrentFeed()">
- <?php echo __('Update') ?></button>
-
- <select title="<?php echo __('Mark feed as read') ?>"
- onchange="catchupCurrentFeed(this)"
- 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>
+ <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" />
+ src="images/error.png" />
</button>
<button id="newVersionIcon" dojoType="dijit.form.Button" style="display : none">
<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('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('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 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="display : none"></div>
<div id="headlines-frame" dojoType="dijit.layout.ContentPane"
onscroll="headlines_scroll_handler(this)" region="center">
</div>
</div>
-<?php db_close($link); ?>
-
</body>
</html>