X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=4b86a3e2c17ece7338ad04646cedee6150bbbd47;hb=dd8de81ee397c26dc83654ced445ecedb810b37d;hp=c87ebf65ad390da04f4c25de3adecd1fe270f98a;hpb=89ccc83ba497fa91eaaf2a2a52d8549aea5e2aee;p=github%2Fshaarli%2FShaarli.git
diff --git a/index.php b/index.php
index c87ebf65..4b86a3e2 100644
--- a/index.php
+++ b/index.php
@@ -48,7 +48,7 @@ if (! file_exists(__DIR__ . '/vendor/autoload.php')) {
."If you installed Shaarli through Git or using the development branch,\n"
."please refer to the installation documentation to install PHP"
." dependencies using Composer:\n"
- ."- https://shaarli.readthedocs.io/en/master/Server-requirements/\n"
+ ."- https://shaarli.readthedocs.io/en/master/Server-configuration/\n"
."- https://shaarli.readthedocs.io/en/master/Download-and-Installation/";
exit;
}
@@ -75,11 +75,12 @@ require_once 'application/Utils.php';
require_once 'application/PluginManager.php';
require_once 'application/Router.php';
require_once 'application/Updater.php';
+use \Shaarli\Config\ConfigManager;
use \Shaarli\Languages;
+use \Shaarli\Security\LoginManager;
+use \Shaarli\Security\SessionManager;
use \Shaarli\ThemeUtils;
-use \Shaarli\Config\ConfigManager;
-use \Shaarli\LoginManager;
-use \Shaarli\SessionManager;
+use \Shaarli\Thumbnailer;
// Ensure the PHP version is supported
try {
@@ -123,6 +124,7 @@ if (isset($_COOKIE['shaarli']) && !SessionManager::checkId($_COOKIE['shaarli']))
$conf = new ConfigManager();
$sessionManager = new SessionManager($_SESSION, $conf);
$loginManager = new LoginManager($GLOBALS, $conf, $sessionManager);
+$loginManager->generateStaySignedInToken($_SERVER['REMOTE_ADDR']);
$clientIpId = client_ip_id($_SERVER);
// LC_MESSAGES isn't defined without php-intl, in this case use LC_COLLATE locale instead.
@@ -173,13 +175,10 @@ if (! is_file($conf->getConfigFileExt())) {
}
// Display the installation form if no existing config is found
- install($conf, $sessionManager);
+ install($conf, $sessionManager, $loginManager);
}
-// a token depending of deployment salt, user password, and the current ip
-define('STAY_SIGNED_IN_TOKEN', sha1($conf->get('credentials.hash') . $_SERVER['REMOTE_ADDR'] . $conf->get('credentials.salt')));
-
-$loginManager->checkLoginState($_SESSION, $_COOKIE, WEB_PATH, $clientIpId, STAY_SIGNED_IN_TOKEN);
+$loginManager->checkLoginState($_COOKIE, $clientIpId);
/**
* Adapter function to ensure compatibility with third-party templates
@@ -205,31 +204,35 @@ if (isset($_POST['login'])) {
&& $sessionManager->checkToken($_POST['token'])
&& $loginManager->checkCredentials($_SERVER['REMOTE_ADDR'], $clientIpId, $_POST['login'], $_POST['password'])
) {
- // Login/password is OK.
$loginManager->handleSuccessfulLogin($_SERVER);
- // If user wants to keep the session cookie even after the browser closes:
- if (!empty($_POST['longlastingsession'])) {
- $_SESSION['longlastingsession'] = 31536000; // (31536000 seconds = 1 year)
- $expiration = time() + $_SESSION['longlastingsession']; // calculate relative cookie expiration (1 year from now)
- setcookie($sessionManager::$LOGGED_IN_COOKIE, STAY_SIGNED_IN_TOKEN, $expiration, WEB_PATH);
- $_SESSION['expires_on'] = $expiration; // Set session expiration on server-side.
-
- $cookiedir = '';
- if (dirname($_SERVER['SCRIPT_NAME']) != '/') {
- $cookiedir = dirname($_SERVER["SCRIPT_NAME"]) . '/';
- }
- session_set_cookie_params($_SESSION['longlastingsession'],$cookiedir,$_SERVER['SERVER_NAME']); // Set session cookie expiration on client side
+ $cookiedir = '';
+ if (dirname($_SERVER['SCRIPT_NAME']) != '/') {
// Note: Never forget the trailing slash on the cookie path!
- session_regenerate_id(true); // Send cookie with new expiration date to browser.
+ $cookiedir = dirname($_SERVER["SCRIPT_NAME"]) . '/';
}
- else // Standard session expiration (=when browser closes)
- {
- $cookiedir = ''; if(dirname($_SERVER['SCRIPT_NAME'])!='/') $cookiedir=dirname($_SERVER["SCRIPT_NAME"]).'/';
- session_set_cookie_params(0,$cookiedir,$_SERVER['SERVER_NAME']); // 0 means "When browser closes"
- session_regenerate_id(true);
+
+ if (!empty($_POST['longlastingsession'])) {
+ // Keep the session cookie even after the browser closes
+ $sessionManager->setStaySignedIn(true);
+ $expirationTime = $sessionManager->extendSession();
+
+ setcookie(
+ $loginManager::$STAY_SIGNED_IN_COOKIE,
+ $loginManager->getStaySignedInToken(),
+ $expirationTime,
+ WEB_PATH
+ );
+
+ } else {
+ // Standard session expiration (=when browser closes)
+ $expirationTime = 0;
}
+ // Send cookie with the new expiration date to the browser
+ session_set_cookie_params($expirationTime, $cookiedir, $_SERVER['SERVER_NAME']);
+ session_regenerate_id(true);
+
// Optional redirect after login:
if (isset($_GET['post'])) {
$uri = '?post='. urlencode($_GET['post']);
@@ -353,7 +356,6 @@ function showDailyRSS($conf, $loginManager) {
$conf->get('redirector.url'),
$conf->get('redirector.encode_url')
);
- $link['thumbnail'] = thumbnail($conf, $link['url']);
$link['timestamp'] = $link['created']->getTimestamp();
if (startsWith($link['url'], '?')) {
$link['url'] = index_url($_SERVER) . $link['url']; // make permalink URL absolute
@@ -368,6 +370,7 @@ function showDailyRSS($conf, $loginManager) {
$tpl->assign('links', $links);
$tpl->assign('rssdate', escape($dayDate->format(DateTime::RSS)));
$tpl->assign('hide_timestamps', $conf->get('privacy.hide_timestamps', false));
+ $tpl->assign('index_url', $pageaddr);
$html = $tpl->draw('dailyrss', true);
echo $html . PHP_EOL;
@@ -430,7 +433,6 @@ function showDaily($pageBuilder, $LINKSDB, $conf, $pluginManager, $loginManager)
$conf->get('redirector.url'),
$conf->get('redirector.encode_url')
);
- $linksToDisplay[$key]['thumbnail'] = thumbnail($conf, $link['url']);
$linksToDisplay[$key]['timestamp'] = $link['created']->getTimestamp();
}
@@ -511,7 +513,8 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
read_updates_file($conf->get('resource.updates')),
$LINKSDB,
$conf,
- $loginManager->isLoggedIn()
+ $loginManager->isLoggedIn(),
+ $_SESSION
);
try {
$newUpdates = $updater->update();
@@ -526,7 +529,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
die($e->getMessage());
}
- $PAGE = new PageBuilder($conf, $LINKSDB, $sessionManager->generateToken(), $loginManager->isLoggedIn());
+ $PAGE = new PageBuilder($conf, $_SESSION, $LINKSDB, $sessionManager->generateToken(), $loginManager->isLoggedIn());
$PAGE->assign('linkcount', count($LINKSDB));
$PAGE->assign('privateLinkcount', count_private($LINKSDB));
$PAGE->assign('plugin_errors', $pluginManager->getErrors());
@@ -590,7 +593,8 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
if (isset($_SERVER['QUERY_STRING']) && startsWith($_SERVER['QUERY_STRING'], 'do=logout'))
{
invalidateCaches($conf->get('resource.page_cache'));
- $sessionManager->logout(WEB_PATH);
+ $sessionManager->logout();
+ setcookie(LoginManager::$STAY_SIGNED_IN_COOKIE, 'false', 0, WEB_PATH);
header('Location: ?');
exit;
}
@@ -598,19 +602,23 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
// -------- Picture wall
if ($targetPage == Router::$PAGE_PICWALL)
{
+ $PAGE->assign('pagetitle', t('Picture wall') .' - '. $conf->get('general.title', 'Shaarli'));
+ if (! $conf->get('thumbnails.mode', Thumbnailer::MODE_NONE) === Thumbnailer::MODE_NONE) {
+ $PAGE->assign('linksToDisplay', []);
+ $PAGE->renderPage('picwall');
+ exit;
+ }
+
// Optionally filter the results:
$links = $LINKSDB->filterSearch($_GET);
$linksToDisplay = array();
// Get only links which have a thumbnail.
- foreach($links as $link)
+ // Note: we do not retrieve thumbnails here, the request is too heavy.
+ foreach($links as $key => $link)
{
- $permalink='?'.$link['shorturl'];
- $thumb=lazyThumbnail($conf, $link['url'],$permalink);
- if ($thumb!='') // Only output links which have a thumbnail.
- {
- $link['thumbnail']=$thumb; // Thumbnail HTML code.
- $linksToDisplay[]=$link; // Add to array.
+ if (isset($link['thumbnail']) && $link['thumbnail'] !== false) {
+ $linksToDisplay[] = $link; // Add to array.
}
}
@@ -623,7 +631,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
$PAGE->assign($key, $value);
}
- $PAGE->assign('pagetitle', t('Picture wall') .' - '. $conf->get('general.title', 'Shaarli'));
+
$PAGE->renderPage('picwall');
exit;
}
@@ -1006,6 +1014,16 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
$conf->set('api.secret', escape($_POST['apiSecret']));
$conf->set('translation.language', escape($_POST['language']));
+ $thumbnailsMode = extension_loaded('gd') ? $_POST['enableThumbnails'] : Thumbnailer::MODE_NONE;
+ if ($thumbnailsMode !== Thumbnailer::MODE_NONE
+ && $thumbnailsMode !== $conf->get('thumbnails.mode', Thumbnailer::MODE_NONE)
+ ) {
+ $_SESSION['warnings'][] = t(
+ 'You have enabled or changed thumbnails mode. Please synchronize them.'
+ );
+ }
+ $conf->set('thumbnails.mode', $thumbnailsMode);
+
try {
$conf->write($loginManager->isLoggedIn());
$history->updateSettings();
@@ -1044,6 +1062,8 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
$PAGE->assign('api_secret', $conf->get('api.secret'));
$PAGE->assign('languages', Languages::getAvailableLanguages());
$PAGE->assign('language', $conf->get('translation.language'));
+ $PAGE->assign('gd_enabled', extension_loaded('gd'));
+ $PAGE->assign('thumbnails_mode', $conf->get('thumbnails.mode', Thumbnailer::MODE_NONE));
$PAGE->assign('pagetitle', t('Configure') .' - '. $conf->get('general.title', 'Shaarli'));
$PAGE->renderPage('configure');
exit;
@@ -1100,7 +1120,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
// Linkdate is kept here to:
// - use the same permalink for notes as they're displayed when creating them
// - let users hack creation date of their posts
- // See: https://shaarli.readthedocs.io/en/master/Various-hacks/#changing-the-timestamp-for-a-shaare
+ // See: https://shaarli.readthedocs.io/en/master/guides/various-hacks/#changing-the-timestamp-for-a-shaare
$linkdate = escape($_POST['lf_linkdate']);
if (isset($LINKSDB[$id])) {
// Edit
@@ -1145,6 +1165,11 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
$link['title'] = $link['url'];
}
+ if ($conf->get('thumbnails.mode', Thumbnailer::MODE_NONE) !== Thumbnailer::MODE_NONE) {
+ $thumbnailer = new Thumbnailer($conf);
+ $link['thumbnail'] = $thumbnailer->get($url);
+ }
+
$pluginManager->executeHooks('save_link', $link);
$LINKSDB[$id] = $link;
@@ -1483,6 +1508,43 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
exit;
}
+ // -------- Thumbnails Update
+ if ($targetPage == Router::$PAGE_THUMBS_UPDATE) {
+ $ids = [];
+ foreach ($LINKSDB as $link) {
+ // A note or not HTTP(S)
+ if ($link['url'][0] === '?' || ! startsWith(strtolower($link['url']), 'http')) {
+ continue;
+ }
+ $ids[] = $link['id'];
+ }
+ $PAGE->assign('ids', $ids);
+ $PAGE->assign('pagetitle', t('Thumbnails update') .' - '. $conf->get('general.title', 'Shaarli'));
+ $PAGE->renderPage('thumbnails');
+ exit;
+ }
+
+ // -------- Single Thumbnail Update
+ if ($targetPage == Router::$AJAX_THUMB_UPDATE) {
+ if (! isset($_POST['id']) || ! ctype_digit($_POST['id'])) {
+ http_response_code(400);
+ exit;
+ }
+ $id = (int) $_POST['id'];
+ if (empty($LINKSDB[$id])) {
+ http_response_code(404);
+ exit;
+ }
+ $thumbnailer = new Thumbnailer($conf);
+ $link = $LINKSDB[$id];
+ $link['thumbnail'] = $thumbnailer->get($link['url']);
+ $LINKSDB[$id] = $link;
+ $LINKSDB->save($conf->get('resource.page_cache'));
+
+ echo json_encode($link);
+ exit;
+ }
+
// -------- Otherwise, simply display search form and links:
showLinkList($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager);
exit;
@@ -1546,6 +1608,12 @@ function buildLinkList($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager)
// Start index.
$i = ($page-1) * $_SESSION['LINKS_PER_PAGE'];
$end = $i + $_SESSION['LINKS_PER_PAGE'];
+
+ $thumbnailsEnabled = $conf->get('thumbnails.mode', Thumbnailer::MODE_NONE) !== Thumbnailer::MODE_NONE;
+ if ($thumbnailsEnabled) {
+ $thumbnailer = new Thumbnailer($conf);
+ }
+
$linkDisp = array();
while ($i<$end && $iisLoggedIn() && $thumbnailsEnabled && $link['url'][0] != '?'
+ && (! isset($link['thumbnail']) || ($link['thumbnail'] !== false && ! is_file($link['thumbnail'])))
+ ) {
+ $elem = $LINKSDB[$keys[$i]];
+ $elem['thumbnail'] = $thumbnailer->get($link['url']);
+ $LINKSDB[$keys[$i]] = $elem;
+ $updateDB = true;
+ $link['thumbnail'] = $elem['thumbnail'];
+ }
+
// Check for both signs of a note: starting with ? and 7 chars long.
- if ($link['url'][0] === '?' &&
- strlen($link['url']) === 7) {
+ if ($link['url'][0] === '?' && strlen($link['url']) === 7) {
$link['url'] = index_url($_SERVER) . $link['url'];
}
@@ -1576,6 +1656,11 @@ function buildLinkList($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager)
$i++;
}
+ // If we retrieved new thumbnails, we update the database.
+ if (!empty($updateDB)) {
+ $LINKSDB->save($conf->get('resource.page_cache'));
+ }
+
// Compute paging navigation
$searchtagsUrl = $searchtags === '' ? '' : '&searchtags=' . urlencode($searchtags);
$searchtermUrl = empty($searchterm) ? '' : '&searchterm=' . urlencode($searchterm);
@@ -1626,202 +1711,15 @@ function buildLinkList($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager)
return;
}
-/**
- * Compute the thumbnail for a link.
- *
- * With a link to the original URL.
- * Understands various services (youtube.com...)
- * Input: $url = URL for which the thumbnail must be found.
- * $href = if provided, this URL will be followed instead of $url
- * Returns an associative array with thumbnail attributes (src,href,width,height,style,alt)
- * Some of them may be missing.
- * Return an empty array if no thumbnail available.
- *
- * @param ConfigManager $conf Configuration Manager instance.
- * @param string $url
- * @param string|bool $href
- *
- * @return array
- */
-function computeThumbnail($conf, $url, $href = false)
-{
- if (!$conf->get('thumbnail.enable_thumbnails')) return array();
- if ($href==false) $href=$url;
-
- // For most hosts, the URL of the thumbnail can be easily deduced from the URL of the link.
- // (e.g. http://www.youtube.com/watch?v=spVypYk4kto ---> http://img.youtube.com/vi/spVypYk4kto/default.jpg )
- // ^^^^^^^^^^^ ^^^^^^^^^^^
- $domain = parse_url($url,PHP_URL_HOST);
- if ($domain=='youtube.com' || $domain=='www.youtube.com')
- {
- parse_str(parse_url($url,PHP_URL_QUERY), $params); // Extract video ID and get thumbnail
- if (!empty($params['v'])) return array('src'=>'https://img.youtube.com/vi/'.$params['v'].'/default.jpg',
- 'href'=>$href,'width'=>'120','height'=>'90','alt'=>'YouTube thumbnail');
- }
- if ($domain=='youtu.be') // Youtube short links
- {
- $path = parse_url($url,PHP_URL_PATH);
- return array('src'=>'https://img.youtube.com/vi'.$path.'/default.jpg',
- 'href'=>$href,'width'=>'120','height'=>'90','alt'=>'YouTube thumbnail');
- }
- if ($domain=='pix.toile-libre.org') // pix.toile-libre.org image hosting
- {
- parse_str(parse_url($url,PHP_URL_QUERY), $params); // Extract image filename.
- if (!empty($params) && !empty($params['img'])) return array('src'=>'http://pix.toile-libre.org/upload/thumb/'.urlencode($params['img']),
- 'href'=>$href,'style'=>'max-width:120px; max-height:150px','alt'=>'pix.toile-libre.org thumbnail');
- }
-
- if ($domain=='imgur.com')
- {
- $path = parse_url($url,PHP_URL_PATH);
- if (startsWith($path,'/a/')) return array(); // Thumbnails for albums are not available.
- if (startsWith($path,'/r/')) return array('src'=>'https://i.imgur.com/'.basename($path).'s.jpg',
- 'href'=>$href,'width'=>'90','height'=>'90','alt'=>'imgur.com thumbnail');
- if (startsWith($path,'/gallery/')) return array('src'=>'https://i.imgur.com'.substr($path,8).'s.jpg',
- 'href'=>$href,'width'=>'90','height'=>'90','alt'=>'imgur.com thumbnail');
-
- if (substr_count($path,'/')==1) return array('src'=>'https://i.imgur.com/'.substr($path,1).'s.jpg',
- 'href'=>$href,'width'=>'90','height'=>'90','alt'=>'imgur.com thumbnail');
- }
- if ($domain=='i.imgur.com')
- {
- $pi = pathinfo(parse_url($url,PHP_URL_PATH));
- if (!empty($pi['filename'])) return array('src'=>'https://i.imgur.com/'.$pi['filename'].'s.jpg',
- 'href'=>$href,'width'=>'90','height'=>'90','alt'=>'imgur.com thumbnail');
- }
- if ($domain=='dailymotion.com' || $domain=='www.dailymotion.com')
- {
- if (strpos($url,'dailymotion.com/video/')!==false)
- {
- $thumburl=str_replace('dailymotion.com/video/','dailymotion.com/thumbnail/video/',$url);
- return array('src'=>$thumburl,
- 'href'=>$href,'width'=>'120','style'=>'height:auto;','alt'=>'DailyMotion thumbnail');
- }
- }
- if (endsWith($domain,'.imageshack.us'))
- {
- $ext=strtolower(pathinfo($url,PATHINFO_EXTENSION));
- if ($ext=='jpg' || $ext=='jpeg' || $ext=='png' || $ext=='gif')
- {
- $thumburl = substr($url,0,strlen($url)-strlen($ext)).'th.'.$ext;
- return array('src'=>$thumburl,
- 'href'=>$href,'width'=>'120','style'=>'height:auto;','alt'=>'imageshack.us thumbnail');
- }
- }
-
- // Some other hosts are SLOW AS HELL and usually require an extra HTTP request to get the thumbnail URL.
- // So we deport the thumbnail generation in order not to slow down page generation
- // (and we also cache the thumbnail)
-
- if (! $conf->get('thumbnail.enable_localcache')) return array(); // If local cache is disabled, no thumbnails for services which require the use a local cache.
-
- if ($domain=='flickr.com' || endsWith($domain,'.flickr.com')
- || $domain=='vimeo.com'
- || $domain=='ted.com' || endsWith($domain,'.ted.com')
- || $domain=='xkcd.com' || endsWith($domain,'.xkcd.com')
- )
- {
- if ($domain=='vimeo.com')
- { // Make sure this vimeo URL points to a video (/xxx... where xxx is numeric)
- $path = parse_url($url,PHP_URL_PATH);
- if (!preg_match('!/\d+.+?!',$path)) return array(); // This is not a single video URL.
- }
- if ($domain=='xkcd.com' || endsWith($domain,'.xkcd.com'))
- { // Make sure this URL points to a single comic (/xxx... where xxx is numeric)
- $path = parse_url($url,PHP_URL_PATH);
- if (!preg_match('!/\d+.+?!',$path)) return array();
- }
- if ($domain=='ted.com' || endsWith($domain,'.ted.com'))
- { // Make sure this TED URL points to a video (/talks/...)
- $path = parse_url($url,PHP_URL_PATH);
- if ("/talks/" !== substr($path,0,7)) return array(); // This is not a single video URL.
- }
- $sign = hash_hmac('sha256', $url, $conf->get('credentials.salt')); // We use the salt to sign data (it's random, secret, and specific to each installation)
- return array('src'=>index_url($_SERVER).'?do=genthumbnail&hmac='.$sign.'&url='.urlencode($url),
- 'href'=>$href,'width'=>'120','style'=>'height:auto;','alt'=>'thumbnail');
- }
-
- // For all other, we try to make a thumbnail of links ending with .jpg/jpeg/png/gif
- // Technically speaking, we should download ALL links and check their Content-Type to see if they are images.
- // But using the extension will do.
- $ext=strtolower(pathinfo($url,PATHINFO_EXTENSION));
- if ($ext=='jpg' || $ext=='jpeg' || $ext=='png' || $ext=='gif')
- {
- $sign = hash_hmac('sha256', $url, $conf->get('credentials.salt')); // We use the salt to sign data (it's random, secret, and specific to each installation)
- return array('src'=>index_url($_SERVER).'?do=genthumbnail&hmac='.$sign.'&url='.urlencode($url),
- 'href'=>$href,'width'=>'120','style'=>'height:auto;','alt'=>'thumbnail');
- }
- return array(); // No thumbnail.
-
-}
-
-
-// Returns the HTML code to display a thumbnail for a link
-// with a link to the original URL.
-// Understands various services (youtube.com...)
-// Input: $url = URL for which the thumbnail must be found.
-// $href = if provided, this URL will be followed instead of $url
-// Returns '' if no thumbnail available.
-function thumbnail($url,$href=false)
-{
- // FIXME!
- global $conf;
- $t = computeThumbnail($conf, $url,$href);
- if (count($t)==0) return ''; // Empty array = no thumbnail for this URL.
-
- $html='';
- return $html;
-}
-
-// Returns the HTML code to display a thumbnail for a link
-// for the picture wall (using lazy image loading)
-// Understands various services (youtube.com...)
-// Input: $url = URL for which the thumbnail must be found.
-// $href = if provided, this URL will be followed instead of $url
-// Returns '' if no thumbnail available.
-function lazyThumbnail($conf, $url,$href=false)
-{
- // FIXME!
- global $conf;
- $t = computeThumbnail($conf, $url,$href);
- if (count($t)==0) return ''; // Empty array = no thumbnail for this URL.
-
- $html='';
-
- // Lazy image
- $html.='';
-
- // No-JavaScript fallback.
- $html.='';
-
- return $html;
-}
-
-
/**
* Installation
* This function should NEVER be called if the file data/config.php exists.
*
* @param ConfigManager $conf Configuration Manager instance.
* @param SessionManager $sessionManager SessionManager instance
+ * @param LoginManager $loginManager LoginManager instance
*/
-function install($conf, $sessionManager) {
+function install($conf, $sessionManager, $loginManager) {
// 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);
@@ -1904,7 +1802,7 @@ function install($conf, $sessionManager) {
exit;
}
- $PAGE = new PageBuilder($conf, null, $sessionManager->generateToken());
+ $PAGE = new PageBuilder($conf, $_SESSION, null, $sessionManager->generateToken());
list($continents, $cities) = generateTimeZoneData(timezone_identifiers_list(), date_default_timezone_get());
$PAGE->assign('continents', $continents);
$PAGE->assign('cities', $cities);
@@ -1913,233 +1811,11 @@ function install($conf, $sessionManager) {
exit;
}
-/**
- * Because some f*cking services like flickr require an extra HTTP request to get the thumbnail URL,
- * I have deported the thumbnail URL code generation here, otherwise this would slow down page generation.
- * The following function takes the URL a link (e.g. a flickr page) and return the proper thumbnail.
- * This function is called by passing the URL:
- * http://mywebsite.com/shaarli/?do=genthumbnail&hmac=[HMAC]&url=[URL]
- * [URL] is the URL of the link (e.g. a flickr page)
- * [HMAC] is the signature for the [URL] (so that these URL cannot be forged).
- * The function below will fetch the image from the webservice and store it in the cache.
- *
- * @param ConfigManager $conf Configuration Manager instance,
- */
-function genThumbnail($conf)
-{
- // Make sure the parameters in the URL were generated by us.
- $sign = hash_hmac('sha256', $_GET['url'], $conf->get('credentials.salt'));
- if ($sign!=$_GET['hmac']) die('Naughty boy!');
-
- $cacheDir = $conf->get('resource.thumbnails_cache', 'cache');
- // Let's see if we don't already have the image for this URL in the cache.
- $thumbname=hash('sha1',$_GET['url']).'.jpg';
- if (is_file($cacheDir .'/'. $thumbname))
- { // We have the thumbnail, just serve it:
- header('Content-Type: image/jpeg');
- echo file_get_contents($cacheDir .'/'. $thumbname);
- return;
- }
- // We may also serve a blank image (if service did not respond)
- $blankname=hash('sha1',$_GET['url']).'.gif';
- if (is_file($cacheDir .'/'. $blankname))
- {
- header('Content-Type: image/gif');
- echo file_get_contents($cacheDir .'/'. $blankname);
- return;
- }
-
- // Otherwise, generate the thumbnail.
- $url = $_GET['url'];
- $domain = parse_url($url,PHP_URL_HOST);
-
- if ($domain=='flickr.com' || endsWith($domain,'.flickr.com'))
- {
- // Crude replacement to handle new flickr domain policy (They prefer www. now)
- $url = str_replace('http://flickr.com/','http://www.flickr.com/',$url);
-
- // Is this a link to an image, or to a flickr page ?
- $imageurl='';
- if (endsWith(parse_url($url, PHP_URL_PATH), '.jpg'))
- { // This is a direct link to an image. e.g. http://farm1.staticflickr.com/5/5921913_ac83ed27bd_o.jpg
- preg_match('!(http://farm\d+\.staticflickr\.com/\d+/\d+_\w+_)\w.jpg!',$url,$matches);
- if (!empty($matches[1])) $imageurl=$matches[1].'m.jpg';
- }
- else // This is a flickr page (html)
- {
- // Get the flickr html page.
- list($headers, $content) = get_http_response($url, 20);
- if (strpos($headers[0], '200 OK') !== false)
- {
- // flickr now nicely provides the URL of the thumbnail in each flickr page.
- preg_match('!
- if ($imageurl=='')
- {
- preg_match('! tag on that page
- // http://www.ted.com/talks/mikko_hypponen_fighting_viruses_defending_the_net.html
- //
- list($headers, $content) = get_http_response($url, 5);
- if (strpos($headers[0], '200 OK') !== false) {
- // Extract the link to the thumbnail
- preg_match('!link rel="image_src" href="(http://images.ted.com/images/ted/.+_\d+x\d+\.jpg)"!', $content, $matches);
- if (!empty($matches[1]))
- { // Let's download the image.
- $imageurl=$matches[1];
- // No control on image size, so wait long enough
- list($headers, $content) = get_http_response($imageurl, 20);
- if (strpos($headers[0], '200 OK') !== false) {
- $filepath = $cacheDir .'/'. $thumbname;
- file_put_contents($filepath, $content); // Save image to cache.
- if (resizeImage($filepath))
- {
- header('Content-Type: image/jpeg');
- echo file_get_contents($filepath);
- return;
- }
- }
- }
- }
- }
-
- elseif ($domain=='xkcd.com' || endsWith($domain,'.xkcd.com'))
- {
- // There is no thumbnail available for xkcd comics, so download the whole image and resize it.
- // http://xkcd.com/327/
- //
- list($headers, $content) = get_http_response($url, 5);
- if (strpos($headers[0], '200 OK') !== false) {
- // Extract the link to the thumbnail
- preg_match('!