valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge logout.php inside backend.php

This commit is contained in:
Andrew Dolgov 2011-04-20 00:14:37 +04:00
parent e31ed61af3
commit 1ca77e0acd
6 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend.php
View File

@ -60,7 +60,7 @@
if (!($_SESSION["uid"] && validate_session($link)) && $op != "globalUpdateFeeds" && if (!($_SESSION["uid"] && validate_session($link)) && $op != "globalUpdateFeeds" &&
$op != "rss" && $op != "getUnread" && $op != "getProfiles" && $op != "rss" && $op != "getUnread" && $op != "getProfiles" &&
$op != "pubsub") { $op != "logout" && $op != "pubsub") {
header("Content-Type: text/plain"); header("Content-Type: text/plain");
print json_encode(array("error" => array("code" => 6))); print json_encode(array("error" => array("code" => 6)));
@ -571,6 +571,16 @@
} }
break; break;
case "logout":
logout_user();
header("Location: tt-rss.php");
break;
default:
header("Content-Type: text/plain");
print json_encode(array("error" => array("code" => 7)));
break;
} // Select action according to $op value. } // Select action according to $op value.
// We close the connection to database. // We close the connection to database.

2
db-updater.php
View File

@ -155,7 +155,7 @@ function confirmOP() {
print "<p>".T_sprintf("Finished. Performed <b>%d</b> update(s) up to schema print "<p>".T_sprintf("Finished. Performed <b>%d</b> update(s) up to schema
version <b>%d</b>.", $num_updates, $version)."</p>"; version <b>%d</b>.", $num_updates, $version)."</p>";
print "<form method=\"GET\" action=\"logout.php\"> print "<form method=\"GET\" action=\"backend.php?op=logout\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>"; </form>";

22
digest.php
View File

@ -1,12 +1,12 @@
<?php <?php
require_once "functions.php"; require_once "functions.php";
require_once "sessions.php"; require_once "sessions.php";
require_once "sanity_check.php"; require_once "sanity_check.php";
require_once "version.php"; require_once "version.php";
require_once "config.php"; require_once "config.php";
require_once "db-prefs.php"; require_once "db-prefs.php";
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
login_sequence($link); login_sequence($link);
@ -15,9 +15,9 @@
no_cache_incantation(); no_cache_incantation();
header('Content-Type: text/html; charset=utf-8'); header('Content-Type: text/html; charset=utf-8');
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html> <html>
@ -60,7 +60,7 @@
<img src="images/indicator_white.gif"/> <img src="images/indicator_white.gif"/>
<?php echo __("Loading, please wait...") ?> <?php echo __("Loading, please wait...") ?>
</div> </div>
</div> </div>
<div id="header"> <div id="header">
@ -71,7 +71,7 @@
<?php } ?> <?php } ?>
<?php if (!SINGLE_USER_MODE) { ?> <?php if (!SINGLE_USER_MODE) { ?>
<a href="logout.php"><?php echo __('Logout') ?></a> <a href="backend.php?op=logout"><?php echo __('Logout') ?></a>
<?php } ?> <?php } ?>
</div> </div>
@ -103,7 +103,7 @@
</div> </div>
<div id="headlines"> <div id="headlines">
<h1><a href="#" onclick="viewfeed(-4)"><?php echo __('headlines') ?></a>: <h1><a href="#" onclick="viewfeed(-4)"><?php echo __('headlines') ?></a>:
<span id="headlines-title"></span></h1> <span id="headlines-title"></span></h1>
<ul id="headlines-content"> </ul> <ul id="headlines-content"> </ul>
@ -117,11 +117,11 @@
<a href="http://tt-rss.org/">Tiny Tiny RSS</a> <a href="http://tt-rss.org/">Tiny Tiny RSS</a>
<?php if (!defined('HIDE_VERSION')) { ?> <?php if (!defined('HIDE_VERSION')) { ?>
v<?php echo VERSION ?> v<?php echo VERSION ?>
<?php } ?> <?php } ?>
&copy; 2005&ndash;<?php echo date('Y') ?> &copy; 2005&ndash;<?php echo date('Y') ?>
<a href="http://fakecake.org/">Andrew Dolgov</a> <a href="http://fakecake.org/">Andrew Dolgov</a>
<br/> <br/>
<a href="tt-rss.php"> <a href="tt-rss.php">

11
logout.php
View File

@ -1,11 +0,0 @@
<?php
require_once "functions.php";
require_once "sessions.php";
require_once "sanity_check.php";
require_once "version.php";
require_once "config.php";
require_once "db-prefs.php";
logout_user();
header("Location: tt-rss.php");
?>

2
register.php
View File

@ -148,7 +148,7 @@
if (!ENABLE_REGISTRATION) { if (!ENABLE_REGISTRATION) {
print_error(__("New user registrations are administratively disabled.")); print_error(__("New user registrations are administratively disabled."));
print "<p><form method=\"GET\" action=\"logout.php\"> print "<p><form method=\"GET\" action=\"backend.php?op=logout\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>"; </form>";
return; return;

2
tt-rss.php
View File

@ -79,7 +79,7 @@
<?php } ?> <?php } ?>
<?php if (!SINGLE_USER_MODE) { ?> <?php if (!SINGLE_USER_MODE) { ?>
| <a href="logout.php"><?php echo __('Logout') ?></a> | <a href="backend.php?op=logout"><?php echo __('Logout') ?></a>
<?php } ?> <?php } ?>
<img id="newVersionIcon" style="display:none" onclick="newVersionDlg()" <img id="newVersionIcon" style="display:none" onclick="newVersionDlg()"