Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #384 from roidelapluie/master

Browse source 
fill session info when shaarli is in open mode
This commit is contained in:
VirtualTam 2015-11-23 20:24:35 +01:00
commit c580024cfb
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
index.php
View file

@ -248,11 +248,11 @@ function stripslashes_deep($value) { $value = is_array($value) ? array_map('stri
//================================================================================================== //==================================================================================================
function setup_login_state() { function setup_login_state() {
if ($GLOBALS['config']['OPEN_SHAARLI']) {
return true;
}
$userIsLoggedIn = false; // By default, we do not consider the user as logged in; $userIsLoggedIn = false; // By default, we do not consider the user as logged in;
$loginFailure = false; // If set to true, every attempt to authenticate the user will fail. This indicates that an important condition isn't met. $loginFailure = false; // If set to true, every attempt to authenticate the user will fail. This indicates that an important condition isn't met.
if ($GLOBALS['config']['OPEN_SHAARLI']) {
$userIsLoggedIn = true;
}
if (!isset($GLOBALS['login'])) { if (!isset($GLOBALS['login'])) {
$userIsLoggedIn = false; // Shaarli is not configured yet. $userIsLoggedIn = false; // Shaarli is not configured yet.
$loginFailure = true; $loginFailure = true;
@ -727,7 +727,7 @@ function showRSS()
// If cached was not found (or not usable), then read the database and build the response: // If cached was not found (or not usable), then read the database and build the response:
$LINKSDB = new LinkDB( $LINKSDB = new LinkDB(
$GLOBALS['config']['DATASTORE'], $GLOBALS['config']['DATASTORE'],
isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI'], isLoggedIn(),
$GLOBALS['config']['HIDE_PUBLIC_LINKS'] $GLOBALS['config']['HIDE_PUBLIC_LINKS']
); );
// Read links from database (and filter private links if user it not logged in). // Read links from database (and filter private links if user it not logged in).
@ -816,7 +816,7 @@ function showATOM()
// Read links from database (and filter private links if used it not logged in). // Read links from database (and filter private links if used it not logged in).
$LINKSDB = new LinkDB( $LINKSDB = new LinkDB(
$GLOBALS['config']['DATASTORE'], $GLOBALS['config']['DATASTORE'],
isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI'], isLoggedIn(),
$GLOBALS['config']['HIDE_PUBLIC_LINKS'] $GLOBALS['config']['HIDE_PUBLIC_LINKS']
); );
@ -910,7 +910,7 @@ function showDailyRSS() {
// Read links from database (and filter private links if used it not logged in). // Read links from database (and filter private links if used it not logged in).
$LINKSDB = new LinkDB( $LINKSDB = new LinkDB(
$GLOBALS['config']['DATASTORE'], $GLOBALS['config']['DATASTORE'],
isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI'], isLoggedIn(),
$GLOBALS['config']['HIDE_PUBLIC_LINKS'] $GLOBALS['config']['HIDE_PUBLIC_LINKS']
); );
@ -997,7 +997,7 @@ function showDaily()
{ {
$LINKSDB = new LinkDB( $LINKSDB = new LinkDB(
$GLOBALS['config']['DATASTORE'], $GLOBALS['config']['DATASTORE'],
isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI'], isLoggedIn(),
$GLOBALS['config']['HIDE_PUBLIC_LINKS'] $GLOBALS['config']['HIDE_PUBLIC_LINKS']
); );
@ -1088,7 +1088,7 @@ function renderPage()
{ {
$LINKSDB = new LinkDB( $LINKSDB = new LinkDB(
$GLOBALS['config']['DATASTORE'], $GLOBALS['config']['DATASTORE'],
isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI'], isLoggedIn(),
$GLOBALS['config']['HIDE_PUBLIC_LINKS'] $GLOBALS['config']['HIDE_PUBLIC_LINKS']
); );
@ -1759,10 +1759,10 @@ function renderPage()
// Process the import file form. // Process the import file form.
function importFile() function importFile()
{ {
if (!(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI'])) { die('Not allowed.'); } if (!isLoggedIn()) { die('Not allowed.'); }
$LINKSDB = new LinkDB( $LINKSDB = new LinkDB(
$GLOBALS['config']['DATASTORE'], $GLOBALS['config']['DATASTORE'],
isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI'], isLoggedIn(),
$GLOBALS['config']['HIDE_PUBLIC_LINKS'] $GLOBALS['config']['HIDE_PUBLIC_LINKS']
); );
$filename=$_FILES['filetoupload']['name']; $filename=$_FILES['filetoupload']['name'];