X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=a9491ed365366f15550ab0ef0b3976a57fb56f71;hb=dcd653d10e168e655ce080da6886ef9fc2c1d3e1;hp=57a64004b594b28e546464d4e737dc04e0a9e008;hpb=0adcceeea91382dedecc7dbc3531b2a754142f2a;p=github%2Fshaarli%2FShaarli.git
diff --git a/index.php b/index.php
index 57a64004..a9491ed3 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
' : '');
- $loginform='';
+ $loginform='';
$onload = 'onload="document.loginform.login.focus();"';
$data = array('pageheader'=>$loginform,'body'=>'','onload'=>$onload);
templatePage($data);
exit;
}
-
// -------- User wants to logout.
if (startswith($_SERVER["QUERY_STRING"],'do=logout'))
{
@@ -740,7 +758,7 @@ function renderPage()
// Show login screen, then redirect to ?post=...
if (isset($_GET['post']))
{
- header('Location: ?do=login&post='.urlencode($_GET['post']).(isset($_GET['source'])?'&source='.urlencode($_GET['source']):'')); // Redirect to login page, then back to post link.
+ header('Location: ?do=login&post='.urlencode($_GET['post']).(isset($_GET['title'])?'&title='.urlencode($_GET['title']):'').(isset($_GET['source'])?'&source='.urlencode($_GET['source']):'')); // Redirect to login page, then back to post link.
exit;
}
@@ -923,7 +941,7 @@ HTML;
$tags = trim(preg_replace('/\s\s+/',' ', $_POST['lf_tags'])); // Remove multiple spaces.
$linkdate=$_POST['lf_linkdate'];
$link = array('title'=>trim($_POST['lf_title']),'url'=>trim($_POST['lf_url']),'description'=>trim($_POST['lf_description']),'private'=>(isset($_POST['lf_private']) ? 1 : 0),
- 'linkdate'=>$linkdate,'tags'=>$tags);
+ 'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags));
if ($link['title']=='') $link['title']=$link['url']; // If title is empty, use the URL as title.
$LINKSDB[$linkdate] = $link;
$LINKSDB->savedb(); // save to disk
@@ -1291,6 +1309,10 @@ HTML;
function thumbnail($url)
{
if (!ENABLE_THUMBNAILS) return '';
+
+ // For most hosts, the URL of the thumbnail can be easily deduced from the URL of the link.
+ // (eg. http://www.youtube.com/watch?v=spVypYk4kto ---> http://img.youtube.com/vi/spVypYk4kto/2.jpg )
+ // ^^^^^^^^^^^ ^^^^^^^^^^^
$domain = parse_url($url,PHP_URL_HOST);
if ($domain=='youtube.com' || $domain=='www.youtube.com')
{
@@ -1315,20 +1337,25 @@ function thumbnail($url)
return '';
}
}
- if ($domain=='vimeo.com')
+ if (endsWith($domain,'.imageshack.us'))
{
- // This is more complex: we have to perform a HTTP request, then parse the result.
- // This slows down page generation :-(
- // Maybe we should deport this to javascript ? Example: http://stackoverflow.com/questions/1361149/get-img-thumbnails-from-vimeo/4285098#4285098
- $vid = substr(parse_url($url,PHP_URL_PATH),1);
- // We allow 2 seconds for Vimeo servers to respond.
- list($httpstatus,$headers,$data) = getHTTP('http://vimeo.com/api/v2/video/'.htmlspecialchars($vid).'.php',2);
- if (strpos($httpstatus,'200 OK'))
+ $ext=strtolower(pathinfo($url,PATHINFO_EXTENSION));
+ if ($ext=='jpg' || $ext=='jpeg' || $ext=='png' || $ext=='gif')
{
- $t = unserialize($data);
- if (!empty($t[0]['thumbnail_medium'])) return '';
+ $thumburl = substr($url,0,strlen($url)-strlen($ext)).'th.'.$ext;
+ return '';
}
}
+
+ // 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 ($domain=='flickr.com' || endsWith($domain,'.flickr.com') || $domain=='vimeo.com')
+ {
+ $sign = hash_hmac('sha256', $url, $GLOBALS['salt']); // We use the salt to sign data (it's random, secret, and specific to each installation)
+ return '';
+ }
+
return ''; // No thumbnail.
}
@@ -1526,14 +1553,14 @@ function processWS()
// Search in tags (case insentitive, cumulative search)
if ($_GET['ws']=='tags')
{
- $tags=explode(' ',$term); $last = array_pop($tags); // Get the last term ("a b c d" ==> "a b c", "d")
+ $tags=explode(' ',str_replace(',',' ',$term)); $last = array_pop($tags); // Get the last term ("a b c d" ==> "a b c", "d")
$addtags=''; if ($tags) $addtags=implode(' ',$tags).' '; // We will pre-pend previous tags
$suggested=array();
/* To speed up things, we store list of tags in session */
if (empty($_SESSION['tags'])) $_SESSION['tags'] = $LINKSDB->allTags();
foreach($_SESSION['tags'] as $key=>$value)
{
- if (startsWith($key,$last,$case=false)) $suggested[$addtags.$key.' ']=0;
+ if (startsWith($key,$last,$case=false) && !in_array($key,$tags)) $suggested[$addtags.$key.' ']=0;//FIXME
}
echo json_encode(array_keys($suggested));
exit;
@@ -1569,6 +1596,113 @@ function writeConfig()
}
}
+/* 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 (eg. 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 (eg. 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.
+*/
+function genThumbnail()
+{
+ // Make sure the parameters in the URL were generated by us.
+ $sign = hash_hmac('sha256', $_GET['url'], $GLOBALS['salt']);
+ if ($sign!=$_GET['hmac']) die('Naughty boy !');
+
+ // 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'))
+ {
+ // WTF ? I need a flickr API key to get a fucking thumbnail ? No way.
+ // I'll extract the thumbnail URL myself. First, we have to get the flickr HTML page.
+ // All images in Flickr are in the form:
+ // http://farm[farm].static.flickr.com/[server]/[id]_[secret]_[size].jpg
+ // Example: http://farm7.static.flickr.com/6205/6088513739_fc158467fe_z.jpg
+ // We want the 240x120 format, which is _m.jpg.
+ // We search for the first image in the page which does not have the _s size,
+ // when use the _m to get the thumbnail.
+
+ // Is this a link to an image, or to a flickr page ?
+ $imageurl='';
+ logm('url: '.$url);
+ if (endswith(parse_url($url,PHP_URL_PATH),'.jpg'))
+ { // This is a direct link to an image. eg. http://farm1.static.flickr.com/5/5921913_ac83ed27bd_o.jpg
+ preg_match('!(http://farm\d+.static.flickr.com/\d+/\d+_\w+_)\w.jpg!',$url,$matches);
+ if (!empty($matches[1])) $imageurl=$matches[1].'m.jpg';
+ }
+ else // this is a flickr page (html)
+ {
+ list($httpstatus,$headers,$data) = getHTTP($url,20); // Get the flickr html page.
+ if (strpos($httpstatus,'200 OK'))
+ {
+ preg_match('!(http://farm\d+.static.flickr.com/\d+/\d+_\w+_)[^s].jpg!',$data,$matches);
+ if (!empty($matches[1])) $imageurl=$matches[1].'m.jpg';
+ }
+ }
+ if ($imageurl!='')
+ { // Let's download the image.
+ list($httpstatus,$headers,$data) = getHTTP($imageurl,10); // Image is 240x120, so 10 seconds to download should be enough.
+ if (strpos($httpstatus,'200 OK'))
+ {
+ file_put_contents(CACHEDIR.'/'.$thumbname,$data); // Save image to cache.
+ header('Content-Type: image/jpeg');
+ echo $data;
+ return;
+ }
+ }
+ else logm('unkown flickr url: '.$url);
+ }
+
+ if ($domain=='vimeo.com' )
+ {
+ // This is more complex: we have to perform a HTTP request, then parse the result.
+ // Maybe we should deport this to javascript ? Example: http://stackoverflow.com/questions/1361149/get-img-thumbnails-from-vimeo/4285098#4285098
+ $vid = substr(parse_url($url,PHP_URL_PATH),1);
+ list($httpstatus,$headers,$data) = getHTTP('http://vimeo.com/api/v2/video/'.htmlspecialchars($vid).'.php',5);
+ if (strpos($httpstatus,'200 OK'))
+ {
+ $t = unserialize($data);
+ $imageurl = $t[0]['thumbnail_medium'];
+ // Then we download the image and serve it to our client.
+ list($httpstatus,$headers,$data) = getHTTP($imageurl,10);
+ if (strpos($httpstatus,'200 OK'))
+ {
+ file_put_contents(CACHEDIR.'/'.$thumbname,$data); // Save image to cache.
+ header('Content-Type: image/jpeg');
+ echo $data;
+ return;
+ }
+ }
+ }
+
+ // Otherwise, return an empty image (8x8 transparent gif)
+ $blankgif = base64_decode('R0lGODlhCAAIAIAAAP///////yH5BAEKAAEALAAAAAAIAAgAAAIHjI+py+1dAAA7');
+ file_put_contents(CACHEDIR.'/'.$blankname,$blankgif); // Also put something in cache so that this URL is not requested twice.
+ header('Content-Type: image/gif');
+ echo $blankgif;
+}
+
// Invalidate caches when the database is changed or the user logs out.
// (eg. tags cache).
function invalidateCaches()
@@ -1576,6 +1710,7 @@ function invalidateCaches()
unset($_SESSION['tags']);
}
+if (startswith($_SERVER["QUERY_STRING"],'do=genthumbnail')) { genThumbnail(); exit; } // Thumbnail generation/cache does not need the link database.
$LINKSDB=new linkdb(isLoggedIn() || OPEN_SHAARLI); // Read links from database (and filter private links if used it not logged in).
if (startswith($_SERVER["QUERY_STRING"],'ws=')) { processWS(); exit; } // Webservices (for jQuery/jQueryUI)
if (!isset($_SESSION['LINKS_PER_PAGE'])) $_SESSION['LINKS_PER_PAGE']=LINKS_PER_PAGE;