X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=735615ff7b084326aef7dc8dfee611021b73fe3a;hb=refs%2Fpull%2F527%2Fhead;hp=73b83533bf35be224b9a2a6e11e8697bb3a7afc5;hpb=bcd078bf0a5119fe0c8441b803b4fe05fdaa6d18;p=github%2Fshaarli%2FShaarli.git
diff --git a/index.php b/index.php
index 73b83533..735615ff 100644
--- a/index.php
+++ b/index.php
@@ -154,6 +154,7 @@ if (is_file($GLOBALS['config']['CONFIG_FILE'])) {
require_once 'application/ApplicationUtils.php';
require_once 'application/Cache.php';
require_once 'application/CachedPage.php';
+require_once 'application/FeedBuilder.php';
require_once 'application/FileUtils.php';
require_once 'application/HttpUtils.php';
require_once 'application/LinkDB.php';
@@ -483,7 +484,7 @@ if (isset($_POST['login']))
if (isset($_POST['returnurl'])) {
// Prevent loops over login screen.
if (strpos($_POST['returnurl'], 'do=login') === false) {
- header('Location: '. escape($_POST['returnurl']));
+ header('Location: '. generateLocation($_POST['returnurl'], $_SERVER['HTTP_HOST']));
exit;
}
}
@@ -681,237 +682,6 @@ class pageBuilder
}
}
-// ------------------------------------------------------------------------------------------
-// Output the last N links in RSS 2.0 format.
-function showRSS($pageBuilder, $linkDB)
-{
- header('Content-Type: application/rss+xml; charset=utf-8');
-
- // $usepermalink : If true, use permalink instead of final link.
- // User just has to add 'permalink' in URL parameters. e.g. http://mysite.com/shaarli/?do=rss&permalinks
- // Also enabled through a config option
- $usepermalinks = isset($_GET['permalinks']) || !$GLOBALS['config']['ENABLE_RSS_PERMALINKS'];
-
- // Cache system
- $query = $_SERVER['QUERY_STRING'];
- $cache = new CachedPage(
- $GLOBALS['config']['PAGECACHE'],
- page_url($_SERVER),
- startsWith($query, 'do=rss') && !isLoggedIn()
- );
- $cached = $cache->cachedVersion();
- if (! empty($cached)) {
- echo $cached;
- exit;
- }
-
- // Optionally filter the results:
- $searchtags = !empty($_GET['searchtags']) ? escape($_GET['searchtags']) : '';
- $searchterm = !empty($_GET['searchterm']) ? escape($_GET['searchterm']) : '';
- if (! empty($searchtags) && ! empty($searchterm)) {
- $linksToDisplay = $linkDB->filter(
- LinkFilter::$FILTER_TAG | LinkFilter::$FILTER_TEXT,
- array($searchtags, $searchterm)
- );
- }
- elseif ($searchtags) {
- $linksToDisplay = $linkDB->filter(LinkFilter::$FILTER_TAG, $searchtags);
- }
- elseif ($searchterm) {
- $linksToDisplay = $linkDB->filter(LinkFilter::$FILTER_TEXT, $searchterm);
- }
- else {
- $linksToDisplay = $linkDB;
- }
-
- $nblinksToDisplay = 50; // Number of links to display.
- // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.
- if (!empty($_GET['nb'])) {
- $nblinksToDisplay = $_GET['nb'] == 'all' ? count($linksToDisplay) : max(intval($_GET['nb']), 1);
- }
-
- $keys = array();
- foreach ($linksToDisplay as $key=>$value) {
- $keys[] = $key; // No, I can't use array_keys().
- }
-
- $pageaddr = escape(index_url($_SERVER));
- $latestDate = '';
- $i = 0;
- $linkDisp = array();
- while ($i < $nblinksToDisplay && $i < count($keys))
- {
- $link = $linksToDisplay[$keys[$i]];
- $link['guid'] = $pageaddr. '?' .smallHash($link['linkdate']);
- // Check for both signs of a note: starting with ? and 7 chars long.
- if ($link['url'][0] === '?' && strlen($link['url']) === 7) {
- $link['url'] = $pageaddr . $link['url'];
- }
- if ($usepermalinks) {
- $permalink = 'Direct link';
- } else {
- $permalink = 'Permalink';
- }
- $link['description'] = format_description($link['description']) . PHP_EOL .'
— '. $permalink;
-
- $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']);
- $link['iso_date'] = $date->format(DateTime::RSS);
- $latestDate = max($latestDate, $link['iso_date']);
- $taglist = array_filter(explode(' ', $link['tags']), 'strlen');
- uasort($taglist, 'strcasecmp');
- $link['taglist'] = $taglist;
-
- $linkDisp[$keys[$i]] = $link;
- $i++;
- }
-
- $data = array();
- if (!empty($GLOBALS['config']['PUBSUBHUB_URL'])) {
- $data['pubsubhub_url'] = escape($GLOBALS['config']['PUBSUBHUB_URL']);
- }
-
- // Use the locale do define the language, if available.
- $locale = strtolower(setlocale(LC_COLLATE, 0));
- if (! empty($locale) && preg_match('/^\w{2}[_\-]\w{2}/', $locale)) {
- $data['language'] = str_replace('_', '-', substr($locale, 0, 5));
- } else {
- $data['language'] = 'en-en';
- }
- $data['last_update'] = escape($latestDate);
- $data['show_dates'] = !$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn();
- // Remove starting slash from REQUEST_URI.
- $data['self_link'] = escape($pageaddr . substr($_SERVER['REQUEST_URI'], 1));
- $data['index_url'] = escape($pageaddr);
- $data['usepermalinks'] = $usepermalinks;
- $data['links'] = $linkDisp;
-
- $pluginManager = PluginManager::getInstance();
- $pluginManager->executeHooks('render_feed', $data, array(
- 'loggedin' => isLoggedIn(),
- 'target' => Router::$PAGE_RSS,
- ));
-
- $pageBuilder->assignAll($data);
- $pageBuilder->renderPage('feed.rss', false);
- $cache->cache(ob_get_contents());
- ob_end_flush();
- exit;
-}
-
-// ------------------------------------------------------------------------------------------
-// Output the last N links in ATOM format.
-function showATOM($pageBuilder, $linkDB)
-{
- header('Content-Type: application/atom+xml; charset=utf-8');
-
- // Cache system
- $query = $_SERVER["QUERY_STRING"];
- $cache = new CachedPage(
- $GLOBALS['config']['PAGECACHE'],
- page_url($_SERVER),
- startsWith($query,'do=atom') && !isLoggedIn()
- );
- $cached = $cache->cachedVersion();
- if (!empty($cached)) {
- echo $cached;
- exit;
- }
-
- // $usepermalink : If true, use permalink instead of final link.
- // User just has to add 'permalink' in URL parameters. e.g. http://mysite.com/shaarli/?do=atom&permalinks
- $usepermalinks = isset($_GET['permalinks']) || !$GLOBALS['config']['ENABLE_RSS_PERMALINKS'];
-
- // Optionally filter the results:
- $searchtags = !empty($_GET['searchtags']) ? escape($_GET['searchtags']) : '';
- $searchterm = !empty($_GET['searchterm']) ? escape($_GET['searchterm']) : '';
- if (! empty($searchtags) && ! empty($searchterm)) {
- $linksToDisplay = $linkDB->filter(
- LinkFilter::$FILTER_TAG | LinkFilter::$FILTER_TEXT,
- array($searchtags, $searchterm)
- );
- }
- elseif ($searchtags) {
- $linksToDisplay = $linkDB->filter(LinkFilter::$FILTER_TAG, $searchtags);
- }
- elseif ($searchterm) {
- $linksToDisplay = $linkDB->filter(LinkFilter::$FILTER_TEXT, $searchterm);
- }
- else {
- $linksToDisplay = $linkDB;
- }
-
- $nblinksToDisplay = 50; // Number of links to display.
- // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.
- if (!empty($_GET['nb'])) {
- $nblinksToDisplay = $_GET['nb'] == 'all' ? count($linksToDisplay) : max(intval($_GET['nb']), 1);
- }
-
- $keys = array();
- foreach ($linksToDisplay as $key=>$value) {
- $keys[] = $key; // No, I can't use array_keys().
- }
-
- $pageaddr = escape(index_url($_SERVER));
- $latestDate = '';
- $i = 0;
- $linkDisp = array();
- while ($i < $nblinksToDisplay && $i < count($keys))
- {
- $link = $linksToDisplay[$keys[$i]];
- $link['guid'] = $pageaddr. '?' .smallHash($link['linkdate']);
- // Check for both signs of a note: starting with ? and 7 chars long.
- if ($link['url'][0] === '?' && strlen($link['url']) === 7) {
- $link['url'] = $pageaddr . $link['url'];
- }
- if ($usepermalinks) {
- $permalink = 'Direct link';
- } else {
- $permalink = 'Permalink';
- }
- $link['description'] = format_description($link['description']) . PHP_EOL .'
— '. $permalink;
-
- $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']);
- $link['iso_date'] = $date->format(DateTime::ATOM);
- $latestDate = max($latestDate, $link['iso_date']);
- $taglist = array_filter(explode(' ', $link['tags']), 'strlen');
- uasort($taglist, 'strcasecmp');
- $link['taglist'] = $taglist;
-
- $linkDisp[$keys[$i]] = $link;
- $i++;
- }
-
- $data = array();
- if (!empty($GLOBALS['config']['PUBSUBHUB_URL'])) {
- $data['pubsubhub_url'] = escape($GLOBALS['config']['PUBSUBHUB_URL']);
- }
- // Use the locale do define the language, if available.
- $locale = strtolower(setlocale(LC_COLLATE, 0));
- if (! empty($locale) && preg_match('/^\w{2}[_\-]\w{2}/', $locale)) {
- $data['language'] = substr($locale, 0, 2);
- } else {
- $data['language'] = 'en';
- }
- $data['last_update'] = escape($latestDate);
- $data['show_dates'] = !$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn();
- $data['self_link'] = escape($pageaddr . $_SERVER['REQUEST_URI']);
- $data['index_url'] = escape($pageaddr);
- $data['usepermalinks'] = $usepermalinks;
- $data['links'] = $linkDisp;
-
- $pluginManager = PluginManager::getInstance();
- $pluginManager->executeHooks('render_feed', $data, array(
- 'loggedin' => isLoggedIn(),
- 'target' => Router::$PAGE_ATOM,
- ));
-
- $pageBuilder->assignAll($data);
- $pageBuilder->renderPage('feed.atom', false);
- $cache->cache(ob_get_contents());
- ob_end_flush();
- exit;
-}
-
// ------------------------------------------------------------------------------------------
// Daily RSS feed: 1 RSS entry per day giving all the links on that day.
// Gives the last 7 days (which have links).
@@ -1046,7 +816,7 @@ function showDaily($pageBuilder)
}
try {
- $linksToDisplay = $LINKSDB->filter(LinkFilter::$FILTER_DAY, $day);
+ $linksToDisplay = $LINKSDB->filterDay($day);
} catch (Exception $exc) {
error_log($exc);
$linksToDisplay = array();
@@ -1192,24 +962,7 @@ function renderPage()
if ($targetPage == Router::$PAGE_PICWALL)
{
// Optionally filter the results:
- $searchtags = !empty($_GET['searchtags']) ? escape($_GET['searchtags']) : '';
- $searchterm = !empty($_GET['searchterm']) ? escape($_GET['searchterm']) : '';
- if (! empty($searchtags) && ! empty($searchterm)) {
- $links = $LINKSDB->filter(
- LinkFilter::$FILTER_TAG | LinkFilter::$FILTER_TEXT,
- array($searchtags, $searchterm)
- );
- }
- elseif ($searchtags) {
- $links = $LINKSDB->filter(LinkFilter::$FILTER_TAG, $searchtags);
- }
- elseif ($searchterm) {
- $links = $LINKSDB->filter(LinkFilter::$FILTER_TEXT, $searchterm);
- }
- else {
- $links = $LINKSDB;
- }
-
+ $links = $LINKSDB->filterSearch($_GET);
$linksToDisplay = array();
// Get only links which have a thumbnail.
@@ -1262,11 +1015,16 @@ function renderPage()
return strcasecmp($a, $b);
});
- $tagList=array();
- foreach($tags as $key=>$value)
- // Tag font size scaling: default 15 and 30 logarithm bases affect scaling, 22 and 6 are arbitrary font sizes for max and min sizes.
- {
- $tagList[$key] = array('count'=>$value,'size'=>log($value, 15) / log($maxcount, 30) * (22-6) + 6);
+ $tagList = array();
+ foreach($tags as $key => $value) {
+ // Tag font size scaling:
+ // default 15 and 30 logarithm bases affect scaling,
+ // 22 and 6 are arbitrary font sizes for max and min sizes.
+ $size = log($value, 15) / log($maxcount, 30) * 2.2 + 0.8;
+ $tagList[$key] = array(
+ 'count' => $value,
+ 'size' => number_format($size, 2, '.', ''),
+ );
}
$data = array(
@@ -1288,14 +1046,47 @@ function renderPage()
showDaily($PAGE);
}
- // ATOM feed.
- if ($targetPage == Router::$PAGE_ATOM) {
- showATOM($PAGE, $LINKSDB);
- }
+ // ATOM and RSS feed.
+ if ($targetPage == Router::$PAGE_FEED_ATOM || $targetPage == Router::$PAGE_FEED_RSS) {
+ $feedType = $targetPage == Router::$PAGE_FEED_RSS ? FeedBuilder::$FEED_RSS : FeedBuilder::$FEED_ATOM;
+ header('Content-Type: application/'. $feedType .'+xml; charset=utf-8');
- // RSS feed.
- if ($targetPage == Router::$PAGE_RSS) {
- showRSS($PAGE, $LINKSDB);
+ // Cache system
+ $query = $_SERVER['QUERY_STRING'];
+ $cache = new CachedPage(
+ $GLOBALS['config']['PAGECACHE'],
+ page_url($_SERVER),
+ startsWith($query,'do='. $targetPage) && !isLoggedIn()
+ );
+ $cached = $cache->cachedVersion();
+ if (!empty($cached)) {
+ echo $cached;
+ exit;
+ }
+
+ // Generate data.
+ $feedGenerator = new FeedBuilder($LINKSDB, $feedType, $_SERVER, $_GET, isLoggedIn());
+ $feedGenerator->setLocale(strtolower(setlocale(LC_COLLATE, 0)));
+ $feedGenerator->setHideDates($GLOBALS['config']['HIDE_TIMESTAMPS'] && !isLoggedIn());
+ $feedGenerator->setUsePermalinks(isset($_GET['permalinks']) || !$GLOBALS['config']['ENABLE_RSS_PERMALINKS']);
+ if (!empty($GLOBALS['config']['PUBSUBHUB_URL'])) {
+ $feedGenerator->setPubsubhubUrl($GLOBALS['config']['PUBSUBHUB_URL']);
+ }
+ $data = $feedGenerator->buildData();
+
+ // Process plugin hook.
+ $pluginManager = PluginManager::getInstance();
+ $pluginManager->executeHooks('render_feed', $data, array(
+ 'loggedin' => isLoggedIn(),
+ 'target' => $targetPage,
+ ));
+
+ // Render the template.
+ $PAGE->assignAll($data);
+ $PAGE->renderPage('feed.'. $feedType);
+ $cache->cache(ob_get_contents());
+ ob_end_flush();
+ exit;
}
// Display openseach plugin (XML)
@@ -1549,9 +1340,9 @@ function renderPage()
// Delete a tag:
if (isset($_POST['deletetag']) && !empty($_POST['fromtag'])) {
- $needle=trim($_POST['fromtag']);
+ $needle = trim($_POST['fromtag']);
// True for case-sensitive tag search.
- $linksToAlter = $LINKSDB->filter(LinkFilter::$FILTER_TAG, $needle, true);
+ $linksToAlter = $LINKSDB->filterSearch(array('searchtags' => $needle), true);
foreach($linksToAlter as $key=>$value)
{
$tags = explode(' ',trim($value['tags']));
@@ -1566,9 +1357,9 @@ function renderPage()
// Rename a tag:
if (isset($_POST['renametag']) && !empty($_POST['fromtag']) && !empty($_POST['totag'])) {
- $needle=trim($_POST['fromtag']);
+ $needle = trim($_POST['fromtag']);
// True for case-sensitive tag search.
- $linksToAlter = $LINKSDB->filter(LinkFilter::$FILTER_TAG, $needle, true);
+ $linksToAlter = $LINKSDB->filterSearch(array('searchtags' => $needle), true);
foreach($linksToAlter as $key=>$value)
{
$tags = explode(' ',trim($value['tags']));
@@ -2004,60 +1795,32 @@ function importFile()
}
}
-// -----------------------------------------------------------------------------------------------
-// Template for the list of links (