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

lint: apply phpcbf to index.php

Browse source 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
This commit is contained in:
VirtualTam 2018-10-13 00:31:11 +02:00
parent a0ab3c3f68
commit 93bf0918fa
1 changed files with 115 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

181
index.php
View file

@ -223,7 +223,6 @@ function isLoggedIn()
$expirationTime, $expirationTime,
WEB_PATH WEB_PATH
); );
} else { } else {
// Standard session expiration (=when browser closes) // Standard session expiration (=when browser closes)
$expirationTime = 0; $expirationTime = 0;
@ -257,7 +256,8 @@ function isLoggedIn()
exit; exit;
} }
} }
header('Location: ?'); exit; header('Location: ?');
exit;
} else { } else {
$loginManager->handleFailedLogin($_SERVER); $loginManager->handleFailedLogin($_SERVER);
$redir = '&username='. urlencode($_POST['login']); $redir = '&username='. urlencode($_POST['login']);
@ -278,7 +278,9 @@ function isLoggedIn()
// ------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------
// Token management for XSRF protection // Token management for XSRF protection
// Token should be used in any form which acts on data (create,update,delete,import...). // Token should be used in any form which acts on data (create,update,delete,import...).
if (!isset($_SESSION['tokens'])) $_SESSION['tokens']=array(); // Token are attached to the session. if (!isset($_SESSION['tokens'])) {
$_SESSION['tokens']=array(); // Token are attached to the session.
}
/** /**
* Daily RSS feed: 1 RSS entry per day giving all the links on that day. * Daily RSS feed: 1 RSS entry per day giving all the links on that day.
@ -288,7 +290,8 @@ function isLoggedIn()
* @param ConfigManager $conf Configuration Manager instance * @param ConfigManager $conf Configuration Manager instance
* @param LoginManager $loginManager LoginManager instance * @param LoginManager $loginManager LoginManager instance
*/ */
function showDailyRSS($conf, $loginManager) { function showDailyRSS($conf, $loginManager)
{
// Cache system // Cache system
$query = $_SERVER['QUERY_STRING']; $query = $_SERVER['QUERY_STRING'];
$cache = new CachedPage( $cache = new CachedPage(
@ -492,7 +495,8 @@ function showDaily($pageBuilder, $LINKSDB, $conf, $pluginManager, $loginManager)
* @param ConfigManager $conf Configuration Manager instance. * @param ConfigManager $conf Configuration Manager instance.
* @param PluginManager $pluginManager Plugin Manager instance. * @param PluginManager $pluginManager Plugin Manager instance.
*/ */
function showLinkList($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager) { function showLinkList($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager)
{
buildLinkList($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager); buildLinkList($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager);
$PAGE->renderPage('linklist'); $PAGE->renderPage('linklist');
} }
@ -524,8 +528,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
$updater->getDoneUpdates() $updater->getDoneUpdates()
); );
} }
} } catch (Exception $e) {
catch(Exception $e) {
die($e->getMessage()); die($e->getMessage());
} }
@ -538,8 +541,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
$query = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : ''; $query = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : '';
$targetPage = Router::findPage($query, $_GET, $loginManager->isLoggedIn()); $targetPage = Router::findPage($query, $_GET, $loginManager->isLoggedIn());
if ( if (// if the user isn't logged in
// if the user isn't logged in
!$loginManager->isLoggedIn() && !$loginManager->isLoggedIn() &&
// and Shaarli doesn't have public content... // and Shaarli doesn't have public content...
$conf->get('privacy.hide_public_links') && $conf->get('privacy.hide_public_links') &&
@ -565,7 +567,9 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
foreach ($common_hooks as $name) { foreach ($common_hooks as $name) {
$plugin_data = array(); $plugin_data = array();
$pluginManager->executeHooks('render_' . $name, $plugin_data, $pluginManager->executeHooks(
'render_' . $name,
$plugin_data,
array( array(
'target' => $targetPage, 'target' => $targetPage,
'loggedin' => $loginManager->isLoggedIn() 'loggedin' => $loginManager->isLoggedIn()
@ -575,9 +579,11 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
// -------- Display login form. // -------- Display login form.
if ($targetPage == Router::$PAGE_LOGIN) if ($targetPage == Router::$PAGE_LOGIN) {
{ if ($conf->get('security.open_shaarli')) {
if ($conf->get('security.open_shaarli')) { header('Location: ?'); exit; } // No need to login for open Shaarli header('Location: ?');
exit;
} // No need to login for open Shaarli
if (isset($_GET['username'])) { if (isset($_GET['username'])) {
$PAGE->assign('username', escape($_GET['username'])); $PAGE->assign('username', escape($_GET['username']));
} }
@ -590,8 +596,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
exit; exit;
} }
// -------- User wants to logout. // -------- User wants to logout.
if (isset($_SERVER['QUERY_STRING']) && startsWith($_SERVER['QUERY_STRING'], 'do=logout')) if (isset($_SERVER['QUERY_STRING']) && startsWith($_SERVER['QUERY_STRING'], 'do=logout')) {
{
invalidateCaches($conf->get('resource.page_cache')); invalidateCaches($conf->get('resource.page_cache'));
$sessionManager->logout(); $sessionManager->logout();
setcookie(LoginManager::$STAY_SIGNED_IN_COOKIE, 'false', 0, WEB_PATH); setcookie(LoginManager::$STAY_SIGNED_IN_COOKIE, 'false', 0, WEB_PATH);
@ -600,8 +605,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
// -------- Picture wall // -------- Picture wall
if ($targetPage == Router::$PAGE_PICWALL) if ($targetPage == Router::$PAGE_PICWALL) {
{
$PAGE->assign('pagetitle', t('Picture wall') .' - '. $conf->get('general.title', 'Shaarli')); $PAGE->assign('pagetitle', t('Picture wall') .' - '. $conf->get('general.title', 'Shaarli'));
if (! $conf->get('thumbnails.mode', Thumbnailer::MODE_NONE) === Thumbnailer::MODE_NONE) { if (! $conf->get('thumbnails.mode', Thumbnailer::MODE_NONE) === Thumbnailer::MODE_NONE) {
$PAGE->assign('linksToDisplay', []); $PAGE->assign('linksToDisplay', []);
@ -615,8 +619,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
// Get only links which have a thumbnail. // Get only links which have a thumbnail.
// Note: we do not retrieve thumbnails here, the request is too heavy. // Note: we do not retrieve thumbnails here, the request is too heavy.
foreach($links as $key => $link) foreach ($links as $key => $link) {
{
if (isset($link['thumbnail']) && $link['thumbnail'] !== false) { if (isset($link['thumbnail']) && $link['thumbnail'] !== false) {
$linksToDisplay[] = $link; // Add to array. $linksToDisplay[] = $link; // Add to array.
} }
@ -637,8 +640,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
// -------- Tag cloud // -------- Tag cloud
if ($targetPage == Router::$PAGE_TAGCLOUD) if ($targetPage == Router::$PAGE_TAGCLOUD) {
{
$visibility = ! empty($_SESSION['visibility']) ? $_SESSION['visibility'] : ''; $visibility = ! empty($_SESSION['visibility']) ? $_SESSION['visibility'] : '';
$filteringTags = isset($_GET['searchtags']) ? explode(' ', $_GET['searchtags']) : []; $filteringTags = isset($_GET['searchtags']) ? explode(' ', $_GET['searchtags']) : [];
$tags = $LINKSDB->linksCountPerTag($filteringTags, $visibility); $tags = $LINKSDB->linksCountPerTag($filteringTags, $visibility);
@ -685,8 +687,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
// -------- Tag list // -------- Tag list
if ($targetPage == Router::$PAGE_TAGLIST) if ($targetPage == Router::$PAGE_TAGLIST) {
{
$visibility = ! empty($_SESSION['visibility']) ? $_SESSION['visibility'] : ''; $visibility = ! empty($_SESSION['visibility']) ? $_SESSION['visibility'] : '';
$filteringTags = isset($_GET['searchtags']) ? explode(' ', $_GET['searchtags']) : []; $filteringTags = isset($_GET['searchtags']) ? explode(' ', $_GET['searchtags']) : [];
$tags = $LINKSDB->linksCountPerTag($filteringTags, $visibility); $tags = $LINKSDB->linksCountPerTag($filteringTags, $visibility);
@ -770,10 +771,13 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
// -------- User clicks on a tag in a link: The tag is added to the list of searched tags (searchtags=...) // -------- User clicks on a tag in a link: The tag is added to the list of searched tags (searchtags=...)
if (isset($_GET['addtag'])) if (isset($_GET['addtag'])) {
{
// Get previous URL (http_referer) and add the tag to the searchtags parameters in query. // Get previous URL (http_referer) and add the tag to the searchtags parameters in query.
if (empty($_SERVER['HTTP_REFERER'])) { header('Location: ?searchtags='.urlencode($_GET['addtag'])); exit; } // In case browser does not send HTTP_REFERER if (empty($_SERVER['HTTP_REFERER'])) {
// In case browser does not send HTTP_REFERER
header('Location: ?searchtags='.urlencode($_GET['addtag']));
exit;
}
parse_str(parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY), $params); parse_str(parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY), $params);
// Prevent redirection loop // Prevent redirection loop
@ -798,8 +802,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
// Append the tag if necessary // Append the tag if necessary
if (empty($params['searchtags'])) { if (empty($params['searchtags'])) {
$params['searchtags'] = trim($_GET['addtag']); $params['searchtags'] = trim($_GET['addtag']);
} } elseif ($addtag) {
elseif ($addtag) {
$params['searchtags'] = trim($params['searchtags']).' '.trim($_GET['addtag']); $params['searchtags'] = trim($params['searchtags']).' '.trim($_GET['addtag']);
} }
@ -897,12 +900,10 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
// -------- Handle other actions allowed for non-logged in users: // -------- Handle other actions allowed for non-logged in users:
if (!$loginManager->isLoggedIn()) if (!$loginManager->isLoggedIn()) {
{
// User tries to post new link but is not logged in: // User tries to post new link but is not logged in:
// Show login screen, then redirect to ?post=... // Show login screen, then redirect to ?post=...
if (isset($_GET['post'])) if (isset($_GET['post'])) {
{
header( // Redirect to login page, then back to post link. header( // Redirect to login page, then back to post link.
'Location: ?do=login&post='.urlencode($_GET['post']). 'Location: ?do=login&post='.urlencode($_GET['post']).
(!empty($_GET['title'])?'&title='.urlencode($_GET['title']):''). (!empty($_GET['title'])?'&title='.urlencode($_GET['title']):'').
@ -925,8 +926,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
// -------- All other functions are reserved for the registered user: // -------- All other functions are reserved for the registered user:
// -------- Display the Tools menu if requested (import/export/bookmarklet...) // -------- Display the Tools menu if requested (import/export/bookmarklet...)
if ($targetPage == Router::$PAGE_TOOLS) if ($targetPage == Router::$PAGE_TOOLS) {
{
$data = [ $data = [
'pageabsaddr' => index_url($_SERVER), 'pageabsaddr' => index_url($_SERVER),
'sslenabled' => is_https($_SERVER), 'sslenabled' => is_https($_SERVER),
@ -943,15 +943,15 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
// -------- User wants to change his/her password. // -------- User wants to change his/her password.
if ($targetPage == Router::$PAGE_CHANGEPASSWORD) if ($targetPage == Router::$PAGE_CHANGEPASSWORD) {
{
if ($conf->get('security.open_shaarli')) { if ($conf->get('security.open_shaarli')) {
die(t('You are not supposed to change a password on an Open Shaarli.')); die(t('You are not supposed to change a password on an Open Shaarli.'));
} }
if (!empty($_POST['setpassword']) && !empty($_POST['oldpassword'])) if (!empty($_POST['setpassword']) && !empty($_POST['oldpassword'])) {
{ if (!$sessionManager->checkToken($_POST['token'])) {
if (!$sessionManager->checkToken($_POST['token'])) die(t('Wrong token.')); // Go away! die(t('Wrong token.')); // Go away!
}
// Make sure old password is correct. // Make sure old password is correct.
$oldhash = sha1($_POST['oldpassword'].$conf->get('credentials.login').$conf->get('credentials.salt')); $oldhash = sha1($_POST['oldpassword'].$conf->get('credentials.login').$conf->get('credentials.salt'));
@ -965,8 +965,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
$conf->set('credentials.hash', sha1($_POST['setpassword'] . $conf->get('credentials.login') . $conf->get('credentials.salt'))); $conf->set('credentials.hash', sha1($_POST['setpassword'] . $conf->get('credentials.login') . $conf->get('credentials.salt')));
try { try {
$conf->write($loginManager->isLoggedIn()); $conf->write($loginManager->isLoggedIn());
} } catch (Exception $e) {
catch(Exception $e) {
error_log( error_log(
'ERROR while writing config file after changing password.' . PHP_EOL . 'ERROR while writing config file after changing password.' . PHP_EOL .
$e->getMessage() $e->getMessage()
@ -978,9 +977,8 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
echo '<script>alert("'. t('Your password has been changed') .'");document.location=\'?do=tools\';</script>'; echo '<script>alert("'. t('Your password has been changed') .'");document.location=\'?do=tools\';</script>';
exit; exit;
} } else {
else // show the change password form. // show the change password form.
{
$PAGE->assign('pagetitle', t('Change password') .' - '. $conf->get('general.title', 'Shaarli')); $PAGE->assign('pagetitle', t('Change password') .' - '. $conf->get('general.title', 'Shaarli'));
$PAGE->renderPage('changepassword'); $PAGE->renderPage('changepassword');
exit; exit;
@ -988,10 +986,8 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
// -------- User wants to change configuration // -------- User wants to change configuration
if ($targetPage == Router::$PAGE_CONFIGURE) if ($targetPage == Router::$PAGE_CONFIGURE) {
{ if (!empty($_POST['title'])) {
if (!empty($_POST['title']) )
{
if (!$sessionManager->checkToken($_POST['token'])) { if (!$sessionManager->checkToken($_POST['token'])) {
die(t('Wrong token.')); // Go away! die(t('Wrong token.')); // Go away!
} }
@ -1028,8 +1024,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
$conf->write($loginManager->isLoggedIn()); $conf->write($loginManager->isLoggedIn());
$history->updateSettings(); $history->updateSettings();
invalidateCaches($conf->get('resource.page_cache')); invalidateCaches($conf->get('resource.page_cache'));
} } catch (Exception $e) {
catch(Exception $e) {
error_log( error_log(
'ERROR while writing config file after configuration update.' . PHP_EOL . 'ERROR while writing config file after configuration update.' . PHP_EOL .
$e->getMessage() $e->getMessage()
@ -1041,9 +1036,8 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
echo '<script>alert("'. t('Configuration was saved.') .'");document.location=\'?do=configure\';</script>'; echo '<script>alert("'. t('Configuration was saved.') .'");document.location=\'?do=configure\';</script>';
exit; exit;
} } else {
else // Show the configuration form. // Show the configuration form.
{
$PAGE->assign('title', $conf->get('general.title')); $PAGE->assign('title', $conf->get('general.title'));
$PAGE->assign('theme', $conf->get('resource.theme')); $PAGE->assign('theme', $conf->get('resource.theme'));
$PAGE->assign('theme_available', ThemeUtils::getThemes($conf->get('resource.raintpl_tpl'))); $PAGE->assign('theme_available', ThemeUtils::getThemes($conf->get('resource.raintpl_tpl')));
@ -1071,8 +1065,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
// -------- User wants to rename a tag or delete it // -------- User wants to rename a tag or delete it
if ($targetPage == Router::$PAGE_CHANGETAG) if ($targetPage == Router::$PAGE_CHANGETAG) {
{
if (empty($_POST['fromtag']) || (empty($_POST['totag']) && isset($_POST['renametag']))) { if (empty($_POST['fromtag']) || (empty($_POST['totag']) && isset($_POST['renametag']))) {
$PAGE->assign('fromtag', ! empty($_GET['fromtag']) ? escape($_GET['fromtag']) : ''); $PAGE->assign('fromtag', ! empty($_GET['fromtag']) ? escape($_GET['fromtag']) : '');
$PAGE->assign('pagetitle', t('Manage tags') .' - '. $conf->get('general.title', 'Shaarli')); $PAGE->assign('pagetitle', t('Manage tags') .' - '. $conf->get('general.title', 'Shaarli'));
@ -1101,16 +1094,14 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
// -------- User wants to add a link without using the bookmarklet: Show form. // -------- User wants to add a link without using the bookmarklet: Show form.
if ($targetPage == Router::$PAGE_ADDLINK) if ($targetPage == Router::$PAGE_ADDLINK) {
{
$PAGE->assign('pagetitle', t('Shaare a new link') .' - '. $conf->get('general.title', 'Shaarli')); $PAGE->assign('pagetitle', t('Shaare a new link') .' - '. $conf->get('general.title', 'Shaarli'));
$PAGE->renderPage('addlink'); $PAGE->renderPage('addlink');
exit; exit;
} }
// -------- User clicked the "Save" button when editing a link: Save link to database. // -------- User clicked the "Save" button when editing a link: Save link to database.
if (isset($_POST['save_edit'])) if (isset($_POST['save_edit'])) {
{
// Go away! // Go away!
if (! $sessionManager->checkToken($_POST['token'])) { if (! $sessionManager->checkToken($_POST['token'])) {
die(t('Wrong token.')); die(t('Wrong token.'));
@ -1197,14 +1188,16 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
// -------- User clicked the "Cancel" button when editing a link. // -------- User clicked the "Cancel" button when editing a link.
if (isset($_POST['cancel_edit'])) if (isset($_POST['cancel_edit'])) {
{
$id = isset($_POST['lf_id']) ? (int) escape($_POST['lf_id']) : false; $id = isset($_POST['lf_id']) ? (int) escape($_POST['lf_id']) : false;
if (! isset($LINKSDB[$id])) { if (! isset($LINKSDB[$id])) {
header('Location: ?'); header('Location: ?');
} }
// If we are called from the bookmarklet, we must close the popup: // If we are called from the bookmarklet, we must close the popup:
if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo '<script>self.close();</script>'; exit; } if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) {
echo '<script>self.close();</script>';
exit;
}
$link = $LINKSDB[$id]; $link = $LINKSDB[$id];
$returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' ); $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' );
// Scroll to the link which has been edited. // Scroll to the link which has been edited.
@ -1215,8 +1208,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
// -------- User clicked the "Delete" button when editing a link: Delete link from database. // -------- User clicked the "Delete" button when editing a link: Delete link from database.
if ($targetPage == Router::$PAGE_DELETELINK) if ($targetPage == Router::$PAGE_DELETELINK) {
{
if (! $sessionManager->checkToken($_GET['token'])) { if (! $sessionManager->checkToken($_GET['token'])) {
die(t('Wrong token.')); die(t('Wrong token.'));
} }
@ -1243,7 +1235,10 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
$LINKSDB->save($conf->get('resource.page_cache')); // save to disk $LINKSDB->save($conf->get('resource.page_cache')); // save to disk
// If we are called from the bookmarklet, we must close the popup: // If we are called from the bookmarklet, we must close the popup:
if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo '<script>self.close();</script>'; exit; } if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) {
echo '<script>self.close();</script>';
exit;
}
$location = '?'; $location = '?';
if (isset($_SERVER['HTTP_REFERER'])) { if (isset($_SERVER['HTTP_REFERER'])) {
@ -1260,11 +1255,13 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} }
// -------- User clicked the "EDIT" button on a link: Display link edit form. // -------- User clicked the "EDIT" button on a link: Display link edit form.
if (isset($_GET['edit_link'])) if (isset($_GET['edit_link'])) {
{
$id = (int) escape($_GET['edit_link']); $id = (int) escape($_GET['edit_link']);
$link = $LINKSDB[$id]; // Read database $link = $LINKSDB[$id]; // Read database
if (!$link) { header('Location: ?'); exit; } // Link not found in database. if (!$link) {
header('Location: ?');
exit;
} // Link not found in database.
$link['linkdate'] = $link['created']->format(LinkDB::LINK_DATE_FORMAT); $link['linkdate'] = $link['created']->format(LinkDB::LINK_DATE_FORMAT);
$data = array( $data = array(
'link' => $link, 'link' => $link,
@ -1290,8 +1287,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
$link_is_new = false; $link_is_new = false;
// Check if URL is not already in database (in this case, we will edit the existing link) // Check if URL is not already in database (in this case, we will edit the existing link)
$link = $LINKSDB->getLinkFromUrl($url); $link = $LINKSDB->getLinkFromUrl($url);
if (! $link) if (! $link) {
{
$link_is_new = true; $link_is_new = true;
$linkdate = strval(date(LinkDB::LINK_DATE_FORMAT)); $linkdate = strval(date(LinkDB::LINK_DATE_FORMAT));
// Get title if it was provided in URL (by the bookmarklet). // Get title if it was provided in URL (by the bookmarklet).
@ -1476,14 +1472,20 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
$pluginMeta = $pluginManager->getPluginsMeta(); $pluginMeta = $pluginManager->getPluginsMeta();
// Split plugins into 2 arrays: ordered enabled plugins and disabled. // Split plugins into 2 arrays: ordered enabled plugins and disabled.
$enabledPlugins = array_filter($pluginMeta, function($v) { return $v['order'] !== false; }); $enabledPlugins = array_filter($pluginMeta, function ($v) {
return $v['order'] !== false;
});
// Load parameters. // Load parameters.
$enabledPlugins = load_plugin_parameter_values($enabledPlugins, $conf->get('plugins', array())); $enabledPlugins = load_plugin_parameter_values($enabledPlugins, $conf->get('plugins', array()));
uasort( uasort(
$enabledPlugins, $enabledPlugins,
function($a, $b) { return $a['order'] - $b['order']; } function ($a, $b) {
return $a['order'] - $b['order'];
}
); );
$disabledPlugins = array_filter($pluginMeta, function($v) { return $v['order'] === false; }); $disabledPlugins = array_filter($pluginMeta, function ($v) {
return $v['order'] === false;
});
$PAGE->assign('enabledPlugins', $enabledPlugins); $PAGE->assign('enabledPlugins', $enabledPlugins);
$PAGE->assign('disabledPlugins', $disabledPlugins); $PAGE->assign('disabledPlugins', $disabledPlugins);
@ -1500,14 +1502,12 @@ function($a, $b) { return $a['order'] - $b['order']; }
foreach ($_POST as $param => $value) { foreach ($_POST as $param => $value) {
$conf->set('plugins.'. $param, escape($value)); $conf->set('plugins.'. $param, escape($value));
} }
} } else {
else {
$conf->set('general.enabled_plugins', save_plugin_config($_POST)); $conf->set('general.enabled_plugins', save_plugin_config($_POST));
} }
$conf->write($loginManager->isLoggedIn()); $conf->write($loginManager->isLoggedIn());
$history->updateSettings(); $history->updateSettings();
} } catch (Exception $e) {
catch (Exception $e) {
error_log( error_log(
'ERROR while saving plugin configuration:.' . PHP_EOL . 'ERROR while saving plugin configuration:.' . PHP_EOL .
$e->getMessage() $e->getMessage()
@ -1635,8 +1635,7 @@ function buildLinkList($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager)
} }
$linkDisp = array(); $linkDisp = array();
while ($i<$end && $i<count($keys)) while ($i<$end && $i<count($keys)) {
{
$link = $linksToDisplay[$keys[$i]]; $link = $linksToDisplay[$keys[$i]];
$link['description'] = format_description( $link['description'] = format_description(
$link['description'], $link['description'],
@ -1739,16 +1738,18 @@ function buildLinkList($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager)
* @param SessionManager $sessionManager SessionManager instance * @param SessionManager $sessionManager SessionManager instance
* @param LoginManager $loginManager LoginManager instance * @param LoginManager $loginManager LoginManager instance
*/ */
function install($conf, $sessionManager, $loginManager) { function install($conf, $sessionManager, $loginManager)
{
// On free.fr host, make sure the /sessions directory exists, otherwise login will not work. // On free.fr host, make sure the /sessions directory exists, otherwise login will not work.
if (endsWith($_SERVER['HTTP_HOST'],'.free.fr') && !is_dir($_SERVER['DOCUMENT_ROOT'].'/sessions')) mkdir($_SERVER['DOCUMENT_ROOT'].'/sessions',0705); if (endsWith($_SERVER['HTTP_HOST'], '.free.fr') && !is_dir($_SERVER['DOCUMENT_ROOT'].'/sessions')) {
mkdir($_SERVER['DOCUMENT_ROOT'].'/sessions', 0705);
}
// This part makes sure sessions works correctly. // This part makes sure sessions works correctly.
// (Because on some hosts, session.save_path may not be set correctly, // (Because on some hosts, session.save_path may not be set correctly,
// or we may not have write access to it.) // or we may not have write access to it.)
if (isset($_GET['test_session']) && ( !isset($_SESSION) || !isset($_SESSION['session_tested']) || $_SESSION['session_tested']!='Working')) if (isset($_GET['test_session']) && ( !isset($_SESSION) || !isset($_SESSION['session_tested']) || $_SESSION['session_tested']!='Working')) {
{
// Step 2: Check if data in session is correct. // Step 2: Check if data in session is correct.
$msg = t( $msg = t(
'<pre>Sessions do not seem to work correctly on your server.<br>'. '<pre>Sessions do not seem to work correctly on your server.<br>'.
@ -1764,19 +1765,18 @@ function install($conf, $sessionManager, $loginManager) {
echo '<br><a href="?">'. t('Click to try again.') .'</a></pre>'; echo '<br><a href="?">'. t('Click to try again.') .'</a></pre>';
die; die;
} }
if (!isset($_SESSION['session_tested'])) if (!isset($_SESSION['session_tested'])) {
{ // Step 1 : Try to store data in session and reload page. // Step 1 : Try to store data in session and reload page.
$_SESSION['session_tested'] = 'Working'; // Try to set a variable in session. $_SESSION['session_tested'] = 'Working'; // Try to set a variable in session.
header('Location: '.index_url($_SERVER).'?test_session'); // Redirect to check stored data. header('Location: '.index_url($_SERVER).'?test_session'); // Redirect to check stored data.
} }
if (isset($_GET['test_session'])) if (isset($_GET['test_session'])) {
{ // Step 3: Sessions are OK. Remove test parameter from URL. // Step 3: Sessions are OK. Remove test parameter from URL.
header('Location: '.index_url($_SERVER)); header('Location: '.index_url($_SERVER));
} }
if (!empty($_POST['setlogin']) && !empty($_POST['setpassword'])) if (!empty($_POST['setlogin']) && !empty($_POST['setpassword'])) {
{
$tz = 'UTC'; $tz = 'UTC';
if (!empty($_POST['continent']) && !empty($_POST['city']) if (!empty($_POST['continent']) && !empty($_POST['city'])
&& isTimeZoneValid($_POST['continent'], $_POST['city']) && isTimeZoneValid($_POST['continent'], $_POST['city'])
@ -1807,8 +1807,7 @@ function install($conf, $sessionManager, $loginManager) {
try { try {
// Everything is ok, let's create config file. // Everything is ok, let's create config file.
$conf->write($loginManager->isLoggedIn()); $conf->write($loginManager->isLoggedIn());
} } catch (Exception $e) {
catch(Exception $e) {
error_log( error_log(
'ERROR while writing config file after installation.' . PHP_EOL . 'ERROR while writing config file after installation.' . PHP_EOL .
$e->getMessage() $e->getMessage()