X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=3b2ab74cca23de78349fb2654a48dafdfebc7372;hb=c4c9c4140d16e7e88ddc64c5c3b8fd6e17b74a05;hp=babce3dca8f6aa5b380b1c11775cec37883af557;hpb=9aadcdaefaceec86c0610499e48bc41273f5d26f;p=github%2Fshaarli%2FShaarli.git diff --git a/index.php b/index.php index babce3dc..3b2ab74c 100644 --- a/index.php +++ b/index.php @@ -1,24 +1,31 @@ =5 && $minor>=1) return; // 5.1.x or higher is ok. header('Content-Type: text/plain; charset=utf-8'); - echo 'Your server supports php '.$ver.'. Shaarli requires at last php 5.1, and thus cannot run. Sorry.'; + echo 'Your server supports php '.PHP_VERSION.'. Shaarli requires at last php 5.1.0, and thus cannot run. Sorry.'; exit; + } +} + +// Checks if an update is available for Shaarli. +// (at most once a day, and only for registered user.) +// Output: '' = no new version. +// other= the available version. +function checkUpdate() +{ + if (!isLoggedIn()) return ''; // Do not check versions for visitors. + + // Get latest version number at most once a day. + if (!is_file($GLOBALS['config']['UPDATECHECK_FILENAME']) || (filemtime($GLOBALS['config']['UPDATECHECK_FILENAME']) yZH23w + Small hashes: + - are unique (well, as unique as crc32, at last) + - are always 6 characters long. + - only use the following characters: a-z A-Z 0-9 - _ @ + - are NOT cryptographically secure (they CAN be forged) + In Shaarli, they are used as a tinyurl-like link to individual entries. +*/ +function smallHash($text) +{ + $t = rtrim(base64_encode(hash('crc32',$text,true)),'='); + $t = str_replace('+','-',$t); // Get rid of characters which need encoding in URLs. + $t = str_replace('/','_',$t); + $t = str_replace('=','@',$t); + return $t; } +// Function inspired from http://www.php.net/manual/en/function.preg-replace.php#85722 +function text2clickable($url) +{ + $redir = empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector']; + return preg_replace('!((?:https?|ftp)://\S+[[:alnum:]]/?)!si','$1',$url); +} // ------------------------------------------------------------------------------------------ // Sniff browser language to display dates in the right format automatically. // (Note that is may not work on your server if the corresponding local is not installed.) @@ -90,6 +150,23 @@ function autoLocale() setlocale(LC_TIME,$loc); // LC_TIME = Set local for date/time format only. } +// ------------------------------------------------------------------------------------------ +// PubSubHubbub protocol support (if enabled) [UNTESTED] +// (Source: http://aldarone.fr/les-flux-rss-shaarli-et-pubsubhubbub/ ) +if (!empty($GLOBALS['config']['PUBSUBHUB_URL'])) include './publisher.php'; +function pubsubhub() +{ + if (!empty($GLOBALS['config']['PUBSUBHUB_URL'])) + { + $p = new Publisher($GLOBALS['config']['PUBSUBHUB_URL']); + $topic_url = array ( + serverUrl().$_SERVER['SCRIPT_NAME'].'?do=atom', + serverUrl().$_SERVER['SCRIPT_NAME'].'?do=rss' + ); + $p->publish_update($topic_url); + } +} + // ------------------------------------------------------------------------------------------ // Session management define('INACTIVITY_TIMEOUT',3600); // (in seconds). If the user does not access any page within this time, his/her session is considered expired. @@ -129,7 +206,7 @@ function check_auth($login,$password) // Returns true if the user is logged in. function isLoggedIn() { - if (OPEN_SHAARLI) return true; + if ($GLOBALS['config']['OPEN_SHAARLI']) return true; // If session does not exist on server side, or IP address has changed, or session has expired, logout. if (empty($_SESSION['uid']) || $_SESSION['ip']!=allIPs() || time()>=$_SESSION['expires_on']) @@ -137,32 +214,34 @@ function isLoggedIn() logout(); return false; } - $_SESSION['expires_on']=time()+INACTIVITY_TIMEOUT; // User accessed a page : Update his/her session expiration date. + if (!empty($_SESSION['longlastingsession'])) $_SESSION['expires_on']=time()+$_SESSION['longlastingsession']; // In case of "Stay signed in" checked. + else $_SESSION['expires_on']=time()+INACTIVITY_TIMEOUT; // Standard session expiration date. + return true; } // Force logout. -function logout() { unset($_SESSION['uid']); unset($_SESSION['ip']); unset($_SESSION['username']);} +function logout() { if (isset($_SESSION)) { unset($_SESSION['uid']); unset($_SESSION['ip']); unset($_SESSION['username']);} } // ------------------------------------------------------------------------------------------ // Brute force protection system // Several consecutive failed logins will ban the IP address for 30 minutes. -if (!is_file(IPBANS_FILENAME)) file_put_contents(IPBANS_FILENAME, "array(),'BANS'=>array()),true).";\n?>"); -include IPBANS_FILENAME; +if (!is_file($GLOBALS['config']['IPBANS_FILENAME'])) file_put_contents($GLOBALS['config']['IPBANS_FILENAME'], "array(),'BANS'=>array()),true).";\n?>"); +include $GLOBALS['config']['IPBANS_FILENAME']; // Signal a failed login. Will ban the IP if too many failures: function ban_loginFailed() { $ip=$_SERVER["REMOTE_ADDR"]; $gb=$GLOBALS['IPBANS']; if (!isset($gb['FAILURES'][$ip])) $gb['FAILURES'][$ip]=0; $gb['FAILURES'][$ip]++; - if ($gb['FAILURES'][$ip]>(BAN_AFTER-1)) + if ($gb['FAILURES'][$ip]>($GLOBALS['config']['BAN_AFTER']-1)) { - $gb['BANS'][$ip]=time()+BAN_DURATION; + $gb['BANS'][$ip]=time()+$GLOBALS['config']['BAN_DURATION']; logm('IP address banned from login'); } $GLOBALS['IPBANS'] = $gb; - file_put_contents(IPBANS_FILENAME, ""); + file_put_contents($GLOBALS['config']['IPBANS_FILENAME'], ""); } // Signals a successful login. Resets failed login counter. @@ -171,7 +250,7 @@ function ban_loginOk() $ip=$_SERVER["REMOTE_ADDR"]; $gb=$GLOBALS['IPBANS']; unset($gb['FAILURES'][$ip]); unset($gb['BANS'][$ip]); $GLOBALS['IPBANS'] = $gb; - file_put_contents(IPBANS_FILENAME, ""); + file_put_contents($GLOBALS['config']['IPBANS_FILENAME'], ""); } // Checks if the user CAN login. If 'true', the user can try to login. @@ -185,7 +264,7 @@ function ban_canLogin() { // Ban expired, user can try to login again. logm('Ban lifted.'); unset($gb['FAILURES'][$ip]); unset($gb['BANS'][$ip]); - file_put_contents(IPBANS_FILENAME, ""); + file_put_contents($GLOBALS['config']['IPBANS_FILENAME'], ""); return true; // Ban has expired, user can login. } return false; // User is banned. @@ -200,9 +279,22 @@ if (isset($_POST['login'])) if (!ban_canLogin()) die('I said: NO. You are banned for the moment. Go away.'); if (isset($_POST['password']) && tokenOk($_POST['token']) && (check_auth($_POST['login'], $_POST['password']))) { // Login/password is ok. - ban_loginOk(); + ban_loginOk(); + // If user wants to keep the session cookie even after the browser closes: + if (!empty($_POST['longlastingsession'])) + { + $_SESSION['longlastingsession']=31536000; // (31536000 seconds = 1 year) + $_SESSION['expires_on']=time()+$_SESSION['longlastingsession']; // Set session expiration on server-side. + session_set_cookie_params($_SESSION['longlastingsession']); // Set session cookie expiration on client side + session_regenerate_id(true); // Send cookie with new expiration date to browser. + } + else // Standard session expiration (=when browser closes) + { + session_set_cookie_params(0); // 0 means "When browser closes" + session_regenerate_id(true); + } // Optional redirect after login: - if (isset($_GET['post'])) { header('Location: ?post='.urlencode($_GET['post']).(!empty($_GET['source'])?'&source='.urlencode($_GET['source']):'')); exit; } + if (isset($_GET['post'])) { header('Location: ?post='.urlencode($_GET['post']).(!empty($_GET['title'])?'&title='.urlencode($_GET['title']):'').(!empty($_GET['source'])?'&source='.urlencode($_GET['source']):'')); exit; } if (isset($_POST['returnurl'])) { if (endsWith($_POST['returnurl'],'?do=login')) { header('Location: ?'); exit; } // Prevent loops over login screen. @@ -286,9 +378,16 @@ function linkdate2rfc822($linkdate) return date('r',linkdate2timestamp($linkdate)); // 'r' is for RFC822 date format. } +/* Converts a linkdate time (YYYYMMDD_HHMMSS) of an article to a ISO 8601 date. + (used to build the updated tags in ATOM feed.) */ +function linkdate2iso8601($linkdate) +{ + return date('c',linkdate2timestamp($linkdate)); // 'c' is for ISO 8601 date format. +} + /* Converts a linkdate time (YYYYMMDD_HHMMSS) of an article to a localized date format. (used to display link date on screen) - The date format is automatically chose according to locale/languages sniffed from browser headers (see autoLocale()). */ + The date format is automatically chosen according to locale/languages sniffed from browser headers (see autoLocale()). */ function linkdate2locale($linkdate) { return utf8_encode(strftime('%c',linkdate2timestamp($linkdate))); // %c is for automatic date format according to locale. @@ -297,13 +396,13 @@ function linkdate2locale($linkdate) } // Parse HTTP response headers and return an associative array. -function http_parse_headers( $headers ) +function http_parse_headers_shaarli( $headers ) { $res=array(); foreach($headers as $header) { $i = strpos($header,': '); - if ($i) + if ($i!==false) { $key=substr($header,0,$i); $value=substr($header,$i+2,strlen($header)-$i-2); @@ -320,7 +419,7 @@ function http_parse_headers( $headers ) [1] = associative array containing HTTP response headers (eg. echo getHTTP($url)[1]['Content-Type']) [2] = data Example: list($httpstatus,$headers,$data) = getHTTP('http://sebauvage.net/'); - if (strpos($httpstatus,'200 OK')) + if (strpos($httpstatus,'200 OK')!==false) echo 'Data type: '.htmlspecialchars($headers['Content-Type']); else echo 'There was an error: '.htmlspecialchars($httpstatus) @@ -331,10 +430,10 @@ function getHTTP($url,$timeout=30) { $options = array('http'=>array('method'=>'GET','timeout' => $timeout)); // Force network timeout $context = stream_context_create($options); - $data=file_get_contents($url,false,$context,-1, 2000000); // We download at most 2 Mb from source. + $data=file_get_contents($url,false,$context,-1, 4000000); // We download at most 4 Mb from source. if (!$data) { $lasterror=error_get_last(); return array($lasterror['message'],array(),''); } $httpStatus=$http_response_header[0]; // eg. "HTTP/1.1 200 OK" - $responseHeaders=http_parse_headers($http_response_header); + $responseHeaders=http_parse_headers_shaarli($http_response_header); return array($httpStatus,$responseHeaders,$data); } catch (Exception $e) // getHTTP *can* fail silentely (we don't care if the title cannot be fetched) @@ -347,7 +446,7 @@ function getHTTP($url,$timeout=30) // (Returns an empty string if not found.) function html_extract_title($html) { - return preg_match('!(.*?)!i', $html, $matches) ? $matches[1] : ''; + return preg_match('!(.*?)!is', $html, $matches) ? trim(str_replace("\n",' ', $matches[1])) : '' ; } // ------------------------------------------------------------------------------------------ @@ -438,14 +537,14 @@ class linkdb implements Iterator, Countable, ArrayAccess // ---- Misc methods private function checkdb() // Check if db directory and file exists. { - if (!file_exists(DATASTORE)) // Create a dummy database for example. + if (!file_exists($GLOBALS['config']['DATASTORE'])) // Create a dummy database for example. { $this->links = array(); $link = array('title'=>'Shaarli - sebsauvage.net','url'=>'http://sebsauvage.net/wiki/doku.php?id=php:shaarli','description'=>'Welcome to Shaarli ! This is a bookmark. To edit or delete me, you must first login.','private'=>0,'linkdate'=>'20110914_190000','tags'=>'opensource software'); $this->links[$link['linkdate']] = $link; $link = array('title'=>'My secret stuff... - Pastebin.com','url'=>'http://pastebin.com/smCEEeSn','description'=>'SShhhh!! I\'m a private link only YOU can see. You can delete me too.','private'=>1,'linkdate'=>'20110914_074522','tags'=>'secretstuff'); $this->links[$link['linkdate']] = $link; - file_put_contents(DATASTORE, PHPPREFIX.base64_encode(gzdeflate(serialize($this->links))).PHPSUFFIX); // Write database to disk + file_put_contents($GLOBALS['config']['DATASTORE'], PHPPREFIX.base64_encode(gzdeflate(serialize($this->links))).PHPSUFFIX); // Write database to disk } } @@ -453,7 +552,8 @@ class linkdb implements Iterator, Countable, ArrayAccess private function readdb() { // Read data - $this->links=(file_exists(DATASTORE) ? unserialize(gzinflate(base64_decode(substr(file_get_contents(DATASTORE),strlen(PHPPREFIX),-strlen(PHPSUFFIX))))) : array() ); + $this->links=(file_exists($GLOBALS['config']['DATASTORE']) ? unserialize(gzinflate(base64_decode(substr(file_get_contents($GLOBALS['config']['DATASTORE']),strlen(PHPPREFIX),-strlen(PHPSUFFIX))))) : array() ); + // Note that gzinflate is faster than gzuncompress. See: http://www.php.net/manual/en/function.gzdeflate.php#96439 // If user is not logged in, filter private links. if (!$this->loggedin) @@ -472,7 +572,7 @@ class linkdb implements Iterator, Countable, ArrayAccess public function savedb() { if (!$this->loggedin) die('You are not authorized to change the database.'); - file_put_contents(DATASTORE, PHPPREFIX.base64_encode(gzdeflate(serialize($this->links))).PHPSUFFIX); + file_put_contents($GLOBALS['config']['DATASTORE'], PHPPREFIX.base64_encode(gzdeflate(serialize($this->links))).PHPSUFFIX); } // Returns the link for a given URL (if it exists). false it does not exist. @@ -483,7 +583,7 @@ class linkdb implements Iterator, Countable, ArrayAccess } // Case insentitive search among links (in url, title and description). Returns filtered list of links. - // eg. print_r($mydb->filterTags('hollandais')); + // eg. print_r($mydb->filterFulltext('hollandais')); public function filterFulltext($searchterms) { // FIXME: explode(' ',$searchterms) and perform a AND search. @@ -492,7 +592,10 @@ class linkdb implements Iterator, Countable, ArrayAccess $s = strtolower($searchterms); foreach($this->links as $l) { - $found=strpos(strtolower($l['title']),$s) || strpos(strtolower($l['description']),$s) || strpos(strtolower($l['url']),$s) || strpos(strtolower($l['tags']),$s); + $found= (strpos(strtolower($l['title']),$s)!==false) + || (strpos(strtolower($l['description']),$s)!==false) + || (strpos(strtolower($l['url']),$s)!==false) + || (strpos(strtolower($l['tags']),$s)!==false); if ($found) $filtered[$l['linkdate']] = $l; } krsort($filtered); @@ -502,20 +605,36 @@ class linkdb implements Iterator, Countable, ArrayAccess // Filter by tag. // You can specify one or more tags (tags can be separated by space or comma). // eg. print_r($mydb->filterTags('linux programming')); - public function filterTags($tags) + public function filterTags($tags,$casesensitive=false) { - $t = str_replace(',',' ',strtolower($tags)); + $t = str_replace(',',' ',($casesensitive?$tags:strtolower($tags))); $searchtags=explode(' ',$t); $filtered=array(); foreach($this->links as $l) { - $linktags = explode(' ',strtolower($l['tags'])); + $linktags = explode(' ',($casesensitive?$l['tags']:strtolower($l['tags']))); if (count(array_intersect($linktags,$searchtags)) == count($searchtags)) $filtered[$l['linkdate']] = $l; } krsort($filtered); return $filtered; } + + // Filter by smallHash. + // Only 1 article is returned. + public function filterSmallHash($smallHash) + { + $filtered=array(); + foreach($this->links as $l) + { + if ($smallHash==smallHash($l['linkdate'])) // Yes, this is ugly and slow + { + $filtered[$l['linkdate']] = $l; + return $filtered; + } + } + return $filtered; + } // Returns the list of all tags // Output: associative array key=tags, value=0 @@ -527,8 +646,7 @@ class linkdb implements Iterator, Countable, ArrayAccess if (!empty($tag)) $tags[$tag]=(empty($tags[$tag]) ? 1 : $tags[$tag]+1); arsort($tags); // Sort tags by usage (most used tag first) return $tags; - } - + } } // ------------------------------------------------------------------------------------------ @@ -540,28 +658,96 @@ function showRSS() // Optionnaly filter the results: $linksToDisplay=array(); if (!empty($_GET['searchterm'])) $linksToDisplay = $LINKSDB->filterFulltext($_GET['searchterm']); - elseif (!empty($_GET['searchtags'])) $linksToDisplay = $LINKSDB->filterTags($_GET['searchtags']); + elseif (!empty($_GET['searchtags'])) $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); else $linksToDisplay = $LINKSDB; - header('Content-Type: application/xhtml+xml; charset=utf-8'); + header('Content-Type: application/rss+xml; charset=utf-8'); $pageaddr=htmlspecialchars(serverUrl().$_SERVER["SCRIPT_NAME"]); echo ''; - echo 'Shared links on '.$pageaddr.''.$pageaddr.''; - echo 'Shared links'.$pageaddr.''."\n\n"; + echo ''.htmlspecialchars($GLOBALS['title']).''.$pageaddr.''; + echo 'Shared linksen-en'.$pageaddr.''."\n\n"; + if (!empty($GLOBALS['config']['PUBSUBHUB_URL'])) + { + echo ''; + echo ''; + echo ''; + echo ''; + } $i=0; $keys=array(); foreach($linksToDisplay as $key=>$value) { $keys[]=$key; } // No, I can't use array_keys(). while ($i<50 && $i'.htmlspecialchars($link['title']).''.htmlspecialchars($link['url']).''.htmlspecialchars($link['url']).''.htmlspecialchars($rfc822date).''; - echo ''."\n"; + $absurl = htmlspecialchars($link['url']); + if (startsWith($absurl,'?')) $absurl=$pageaddr.$absurl; // make permalink URL absolute + echo ''.htmlspecialchars($link['title']).''.$absurl.''.$absurl.''; + if (!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()) echo ''.htmlspecialchars($rfc822date)."\n"; + if ($link['tags']!='') // Adding tags to each RSS entry (as mentioned in RSS specification) + { + foreach(explode(' ',$link['tags']) as $tag) { echo ''.htmlspecialchars($tag).''."\n"; } + } + echo ''."\n\n"; $i++; } echo ''; exit; } +// ------------------------------------------------------------------------------------------ +// Ouput the last 50 links in ATOM format. +function showATOM() +{ + global $LINKSDB; + + // Optionnaly filter the results: + $linksToDisplay=array(); + if (!empty($_GET['searchterm'])) $linksToDisplay = $LINKSDB->filterFulltext($_GET['searchterm']); + elseif (!empty($_GET['searchtags'])) $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); + else $linksToDisplay = $LINKSDB; + + header('Content-Type: application/atom+xml; charset=utf-8'); + $pageaddr=htmlspecialchars(serverUrl().$_SERVER["SCRIPT_NAME"]); + $latestDate = ''; + $entries=''; + $i=0; + $keys=array(); foreach($linksToDisplay as $key=>$value) { $keys[]=$key; } // No, I can't use array_keys(). + while ($i<50 && $i'.$absurl.''; + if (!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()) $entries.=''.htmlspecialchars($iso8601date).''; + $entries.=''.nl2br(text2clickable(htmlspecialchars($link['description'])))."\n"; + if ($link['tags']!='') // Adding tags to each ATOM entry (as mentioned in ATOM specification) + { + foreach(explode(' ',$link['tags']) as $tag) + { $entries.=''."\n"; } + } + $entries.="\n"; + $i++; + } + $feed=''; + $feed.=''.htmlspecialchars($GLOBALS['title']).''; + if (!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()) $feed.=''.htmlspecialchars($latestDate).''; + $feed.=''; + if (!empty($GLOBALS['config']['PUBSUBHUB_URL'])) + { + $feed.=''; + $feed.=''; + $feed.=''; + } + $feed.=''.htmlspecialchars($pageaddr).''; + $feed.=''.htmlspecialchars($pageaddr).''."\n\n"; // Yes, I know I should use a real IRI (RFC3987), but the site URL will do. + $feed.=$entries; + $feed.=''; + echo $feed; + exit; +} + // ------------------------------------------------------------------------------------------ // Render HTML page: function renderPage() @@ -575,7 +761,7 @@ function renderPage() // -------- Display login form. if (startswith($_SERVER["QUERY_STRING"],'do=login')) { - if (OPEN_SHAARLI) { header('Location: ?'); exit; } // No need to login for open Shaarli + if ($GLOBALS['config']['OPEN_SHAARLI']) { header('Location: ?'); exit; } // No need to login for open Shaarli if (!ban_canLogin()) { $loginform='
You have been banned from login after too many failed attempts. Try later.
'; @@ -584,13 +770,13 @@ function renderPage() exit; } $returnurl_html = (isset($_SERVER['HTTP_REFERER']) ? '' : ''); - $loginform='
Login:    Password : '.$returnurl_html.'
'; + $loginform='
Login:    Password :
'; + $loginform.=''.$returnurl_html.'
'; $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')) { @@ -598,7 +784,56 @@ function renderPage() logout(); header('Location: ?'); exit; - } + } + + // -------- Picture wall + if (startswith($_SERVER["QUERY_STRING"],'do=picwall')) + { + // Optionnaly filter the results: + $linksToDisplay=array(); + if (!empty($_GET['searchterm'])) $linksToDisplay = $LINKSDB->filterFulltext($_GET['searchterm']); + elseif (!empty($_GET['searchtags'])) $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); + else $linksToDisplay = $LINKSDB; + $body=''; + + foreach($linksToDisplay as $link) + { + $href='?'.htmlspecialchars(smallhash($link['linkdate']),ENT_QUOTES); + $thumb=thumbnail($link['url'],$href); + if ($thumb!='') + { + $body.='
'.$thumb.''.htmlspecialchars($link['title']).'
'; + + } + } + $body = '
'.$body.'
'; + $data = array('pageheader'=>'
 ','body'=>$body,'onload'=>''); + templatePage($data); + exit; + + } + + // -------- Tag cloud + if (startswith($_SERVER["QUERY_STRING"],'do=tagcloud')) + { + $tags= $LINKSDB->allTags(); + // We sort tags alphabetically, then choose a font size according to count. + // First, find max value. + $maxcount=0; foreach($tags as $key=>$value) $maxcount=max($maxcount,$value); + ksort($tags); + $cloud=''; + foreach($tags as $key=>$value) + { + $size = max(40*$value/$maxcount,8); // Minimum size 8. + $colorvalue = 128-ceil(127*$value/$maxcount); + $color='rgb('.$colorvalue.','.$colorvalue.','.$colorvalue.')'; + $cloud.= ''.$value.''.htmlspecialchars($key).' '; + } + $cloud='
'.$cloud.'
'; + $data = array('pageheader'=>'','body'=>$cloud,'onload'=>''); + templatePage($data); + exit; + } // -------- User clicks on a tag in a link: The tag is added to the list of searched tags (searchtags=...) if (isset($_GET['addtag'])) @@ -606,7 +841,7 @@ function renderPage() // 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 parse_str(parse_url($_SERVER['HTTP_REFERER'],PHP_URL_QUERY), $params); - $params['searchtags'] = (empty($params['searchtags']) ? trim($_GET['addtag']) : trim($params['searchtags'].' '.urlencode($_GET['addtag']))); + $params['searchtags'] = (empty($params['searchtags']) ? trim($_GET['addtag']) : trim($params['searchtags']).' '.urlencode(trim($_GET['addtag']))); unset($params['page']); // We also remove page (keeping the same page has no sense, since the results are different) header('Location: ?'.http_build_query($params)); exit; @@ -645,21 +880,20 @@ 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']).(!empty($_GET['title'])?'&title='.urlencode($_GET['title']):'').(!empty($_GET['source'])?'&source='.urlencode($_GET['source']):'')); // Redirect to login page, then back to post link. exit; } // Show search form and display list of links. $searchform=<< -
-
+
+
HTML; - $onload = 'document.searchform.searchterm.focus();'; - $data = array('pageheader'=>$searchform,'body'=>templateLinkList(),'onload'=>$onload); + $data = array('pageheader'=>$searchform,'body'=>templateLinkList(),'onload'=>''); templatePage($data); - exit; // Never remove this one ! + exit; // Never remove this one ! All operations below are reserved for logged in user. } // -------- All other functions are reserved for the registered user: @@ -669,23 +903,157 @@ HTML; { $pageabsaddr=serverUrl().$_SERVER["SCRIPT_NAME"]; // Why doesn't php have a built-in function for that ? // The javascript code for the bookmarklet: + $changepwd = ($GLOBALS['config']['OPEN_SHAARLI'] ? '' : 'Change password - Change your password.

' ); $toolbar= <<
+

+ {$changepwd} + Configure your Shaarli - Change Title, timezone...

+ Rename/delete tags - Rename or delete a tag in all links.

Import - Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)

Export - Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)

- Shaare link - Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....). Then click "Shaare link" button in any page you want to share.

+ Shaare link - Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....). Then click "Shaare link" button in any page you want to share.

HTML; $data = array('pageheader'=>$toolbar,'body'=>'','onload'=>''); templatePage($data); exit; } + + // -------- User wants to change his/her password. + if (startswith($_SERVER["QUERY_STRING"],'do=changepasswd')) + { + if ($GLOBALS['config']['OPEN_SHAARLI']) die('You are not supposed to change a password on an Open Shaarli.'); + if (!empty($_POST['setpassword']) && !empty($_POST['oldpassword'])) + { + if (!tokenOk($_POST['token'])) die('Wrong token.'); // Go away ! + + // Make sure old password is correct. + $oldhash = sha1($_POST['oldpassword'].$GLOBALS['login'].$GLOBALS['salt']); + if ($oldhash!=$GLOBALS['hash']) { echo ''; exit; } + // Save new password + $GLOBALS['salt'] = sha1(uniqid('',true).'_'.mt_rand()); // Salt renders rainbow-tables attacks useless. + $GLOBALS['hash'] = sha1($_POST['setpassword'].$GLOBALS['login'].$GLOBALS['salt']); + writeConfig(); + echo ''; + exit; + } + else + { + $token = getToken(); + $changepwdform= << +Old password:     +New password: + + +HTML; + $data = array('pageheader'=>$changepwdform,'body'=>'','onload'=>'onload="document.changepasswordform.oldpassword.focus();"'); + templatePage($data); + exit; + } + } + + // -------- User wants to change configuration + if (startswith($_SERVER["QUERY_STRING"],'do=configure')) + { + if (!empty($_POST['title']) ) + { + if (!tokenOk($_POST['token'])) die('Wrong token.'); // Go away ! + $tz = 'UTC'; + if (!empty($_POST['continent']) && !empty($_POST['city'])) + if (isTZvalid($_POST['continent'],$_POST['city'])) + $tz = $_POST['continent'].'/'.$_POST['city']; + $GLOBALS['timezone'] = $tz; + $GLOBALS['title']=$_POST['title']; + $GLOBALS['redirector']=$_POST['redirector']; + writeConfig(); + echo ''; + exit; + } + else + { + $token = getToken(); + $title = htmlspecialchars( empty($GLOBALS['title']) ? '' : $GLOBALS['title'] , ENT_QUOTES); + $redirector = htmlspecialchars( empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector'] , ENT_QUOTES); + list($timezone_form,$timezone_js) = templateTZform($GLOBALS['timezone']); + $timezone_html=''; if ($timezone_form!='') $timezone_html='Timezone:'.$timezone_form.''; + $changepwdform= << + + +{$timezone_html} + + +
Page title:
Redirector
(e.g. http://anonym.to/? will mask the HTTP_REFERER)
+ +HTML; + $data = array('pageheader'=>$changepwdform,'body'=>'','onload'=>'onload="document.configform.title.focus();"'); + templatePage($data); + exit; + } + } + + // -------- User wants to rename a tag or delete it + if (startswith($_SERVER["QUERY_STRING"],'do=changetag')) + { + if (empty($_POST['fromtag'])) + { + $token = getToken(); + $changetagform = << + +Tag: + +  or 
(Case sensitive) + +HTML; + $data = array('pageheader'=>$changetagform,'body'=>'','onload'=>'onload="document.changetag.fromtag.focus();"'); + templatePage($data); + exit; + } + if (!tokenOk($_POST['token'])) die('Wrong token.'); + + if (!empty($_POST['deletetag']) && !empty($_POST['fromtag'])) + { + $needle=trim($_POST['fromtag']); + $linksToAlter = $LINKSDB->filterTags($needle,true); // true for case-sensitive tag search. + foreach($linksToAlter as $key=>$value) + { + $tags = explode(' ',trim($value['tags'])); + unset($tags[array_search($needle,$tags)]); // Remove tag. + $value['tags']=trim(implode(' ',$tags)); + $LINKSDB[$key]=$value; + } + $LINKSDB->savedb(); // save to disk + invalidateCaches(); + echo ''; + exit; + } + + // Rename a tag: + if (!empty($_POST['renametag']) && !empty($_POST['fromtag']) && !empty($_POST['totag'])) + { + $needle=trim($_POST['fromtag']); + $linksToAlter = $LINKSDB->filterTags($needle,true); // true for case-sensitive tag search. + foreach($linksToAlter as $key=>$value) + { + $tags = explode(' ',trim($value['tags'])); + $tags[array_search($needle,$tags)] = trim($_POST['totag']); // Remplace tags value. + $value['tags']=trim(implode(' ',$tags)); + $LINKSDB[$key]=$value; + } + $LINKSDB->savedb(); // save to disk + invalidateCaches(); + echo ''; + exit; + } + } // -------- User wants to add a link without using the bookmarklet: show form. if (startswith($_SERVER["QUERY_STRING"],'do=addlink')) { - $onload = 'document.addform.post.focus();'; - $addform= '
'; + $onload = 'onload="document.addform.post.focus();"'; + $addform= '
'; $data = array('pageheader'=>$addform,'body'=>'','onload'=>$onload); templatePage($data); exit; @@ -695,12 +1063,14 @@ HTML; if (isset($_POST['save_edit'])) { if (!tokenOk($_POST['token'])) die('Wrong token.'); // Go away ! + $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'=>trim($_POST['lf_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 + pubsubhub(); invalidateCaches(); // If we are called from the bookmarklet, we must close the popup: @@ -755,9 +1125,9 @@ HTML; $url=$_GET['post']; // We remove the annoying parameters added by FeedBurner and GoogleFeedProxy (?utm_source=...) - $i=strpos($url,'&utm_source='); if ($i) $url=substr($url,0,$i); - $i=strpos($url,'?utm_source='); if ($i) $url=substr($url,0,$i); - $i=strpos($url,'#xtor=RSS-'); if ($i) $url=substr($url,0,$i); + $i=strpos($url,'&utm_source='); if ($i!==false) $url=substr($url,0,$i); + $i=strpos($url,'?utm_source='); if ($i!==false) $url=substr($url,0,$i); + $i=strpos($url,'#xtor=RSS-'); if ($i!==false) $url=substr($url,0,$i); $link_is_new = false; $link = $LINKSDB->getLinkFromUrl($url); // Check if URL is not already in database (in this case, we will edit the existing link) @@ -767,14 +1137,15 @@ HTML; $linkdate = strval(date('Ymd_His')); $title = (empty($_GET['title']) ? '' : $_GET['title'] ); // Get title if it was provided in URL (by the bookmarklet). $description=''; $tags=''; $private=0; - if (parse_url($url,PHP_URL_SCHEME)=='') $url = 'http://'.$url; + if (($url!='') && parse_url($url,PHP_URL_SCHEME)=='') $url = 'http://'.$url; // If this is an HTTP link, we try go get the page to extact the title (otherwise we will to straight to the edit form.) if (empty($title) && parse_url($url,PHP_URL_SCHEME)=='http') { list($status,$headers,$data) = getHTTP($url,4); // Short timeout to keep the application responsive. // FIXME: Decode charset according to specified in either 1) HTTP response headers or 2) in html - if (strpos($status,'200 OK')) $title=html_entity_decode(html_extract_title($data),ENT_QUOTES,'UTF-8'); + if (strpos($status,'200 OK')!==false) $title=html_entity_decode(html_extract_title($data),ENT_QUOTES,'UTF-8'); } + if ($url=='') $url='?'.smallHash($linkdate); // In case of empty URL, this is just a text (with a link that point to itself) $link = array('linkdate'=>$linkdate,'title'=>$title,'url'=>$url,'description'=>$description,'tags'=>$tags,'private'=>0); } list($editform,$onload)=templateEditForm($link,$link_is_new); @@ -789,7 +1160,7 @@ HTML; if (empty($_GET['what'])) { $toolbar= <<
+
Export all - Export all links

Export public - Export public links only

Export private - Export private links only

@@ -851,15 +1222,15 @@ HTML; $maxfilesize=getMaxFileSize(); $onload = 'onload="document.uploadform.filetoupload.focus();"'; $uploadform=<< +
Import Netscape html bookmarks (as exported from Firefox/Chrome/Opera/delicious/diigo...) (Max: {$maxfilesize} bytes). - - + +
-  Import all links as private
-  Overwrite existing links +  Import all links as private
+  Overwrite existing links
HTML; @@ -871,12 +1242,11 @@ HTML; // -------- Otherwise, simply display search form and links: $searchform=<< -
-
+
+
HTML; - $onload = 'document.searchform.searchterm.focus();'; - $data = array('pageheader'=>$searchform,'body'=>templateLinkList(),'onload'=>$onload); + $data = array('pageheader'=>$searchform,'body'=>templateLinkList(),'onload'=>''); templatePage($data); exit; } @@ -993,24 +1363,28 @@ HTML; function templateLinkList() { global $LINKSDB; - + // Search according to entered search terms: $linksToDisplay=array(); $searched=''; if (!empty($_GET['searchterm'])) // Fulltext search { - $linksToDisplay = $LINKSDB->filterFulltext($_GET['searchterm']); - $searched=' '.count($linksToDisplay).' results for '.htmlspecialchars($_GET['searchterm']).':'; + $linksToDisplay = $LINKSDB->filterFulltext(trim($_GET['searchterm'])); + $searched=count($linksToDisplay).' results for '.htmlspecialchars(trim($_GET['searchterm'])).':'; } elseif (!empty($_GET['searchtags'])) // Search by tag { - $linksToDisplay = $LINKSDB->filterTags($_GET['searchtags']); - $tagshtml=''; foreach(explode(' ',$_GET['searchtags']) as $tag) $tagshtml.=''.htmlspecialchars($tag).' x '; - $searched=' '.count($linksToDisplay).' results for tags '.$tagshtml.':'; + $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); + $tagshtml=''; foreach(explode(' ',trim($_GET['searchtags'])) as $tag) $tagshtml.=''.htmlspecialchars($tag).' x '; + $searched=''.count($linksToDisplay).' results for tags '.$tagshtml.':'; + } + elseif (preg_match('/[a-zA-Z0-9-_@]{6}/',$_SERVER["QUERY_STRING"])) // Detect smallHashes in URL + { + $linksToDisplay = $LINKSDB->filterSmallHash($_SERVER["QUERY_STRING"]); } else $linksToDisplay = $LINKSDB; // otherwise, display without filtering. - + if ($searched!='') $searched='
'.$searched.'
'; $linklist=''; $actions=''; @@ -1020,25 +1394,45 @@ function templateLinkList() If my class implements ArrayAccess, why won't array_keys() accept it ? ( $keys=array_keys($linksToDisplay); ) */ $keys=array(); foreach($linksToDisplay as $key=>$value) { $keys[]=$key; } // Stupid and ugly. Thanks php. + + // If there is only a single link, we change on-the-fly the title of the page. + if (count($linksToDisplay)==1) $GLOBALS['pagetitle'] = $linksToDisplay[$keys[0]]['title'].' - '.$GLOBALS['title']; + $pagecount = ceil(count($keys)/$_SESSION['LINKS_PER_PAGE']); $pagecount = ($pagecount==0 ? 1 : $pagecount); $page=( empty($_GET['page']) ? 1 : intval($_GET['page'])); $page = ( $page<1 ? 1 : $page ); $page = ( $page>$pagecount ? $pagecount : $page ); $i = ($page-1)*$_SESSION['LINKS_PER_PAGE']; // Start index. - $end = $i+$_SESSION['LINKS_PER_PAGE']; + $end = $i+$_SESSION['LINKS_PER_PAGE']; + $redir = empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector']; // optional redirector URL + $token = ''; if (isLoggedIn()) $token=getToken(); + while ($i<$end && $i'; + $classLi = $i%2!=0 ? '' : 'class="publicLinkHightLight"'; + $classprivate = ($link['private']==0 ? $classLi : 'class="private"'); + if (isLoggedIn()) + { + $actions='
'; + $actions.='
'; + $actions.='
'; + } $tags=''; - if ($link['tags']!='') foreach(explode(' ',$link['tags']) as $tag) { $tags.=''.htmlspecialchars($tag).' '; } - $linklist.='
  • '.htmlspecialchars($title).''.$actions.'
    '; - if ($description!='') $linklist.='
    '.nl2br(htmlspecialchars($description)).'

    '; - $linklist.=''.htmlspecialchars(linkdate2locale($link['linkdate'])).' - '.htmlspecialchars($link['url']).'
    '.$tags."
    • \n"; + if ($link['tags']!='') + { + foreach(explode(' ',$link['tags']) as $tag) { $tags.=''.htmlspecialchars($tag).' '; } + $tags='
    '.$tags.'
    '; + } + $linklist.='
  • '.thumbnail($link['url']).'
    '; + $linklist.='
    '.htmlspecialchars($title).''.$actions.'
    '; + if ($description!='') $linklist.='
    '.nl2br($description).'

    '; + if (!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()) $linklist.=''.htmlspecialchars(linkdate2locale($link['linkdate'])).' - permalink - '; + else $linklist.='permalink - '; + $linklist.=''.htmlspecialchars($link['url']).'
    '.$tags."
    • \n"; $i++; } @@ -1052,13 +1446,107 @@ function templateLinkList() $linksperpage = << Links per page: 20 50 100 -
    +
    HTML; $paging = '
    '.$linksperpage.$paging.'
    '; $linklist=''; return $linklist; } +// 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 +function thumbnail($url,$href=false) +{ + if (!$GLOBALS['config']['ENABLE_THUMBNAILS']) return ''; + + if ($href==false) $href=$url; + + // 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/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 ''; + } + if ($domain=='youtu.be') // Youtube short links + { + $path = parse_url($url,PHP_URL_PATH); + return ''; + } + if ($domain=='imgur.com') + { + $path = parse_url($url,PHP_URL_PATH); + if (startsWith($path,'/a/')) return ''; // Thumbnails for albums are not available. + if (startsWith($path,'/r/')) return ''; + if (startsWith($path,'/gallery/')) return ''; + if (substr_count($path,'/')==1) return ''; + } + if ($domain=='i.imgur.com') + { + $pi = pathinfo(parse_url($url,PHP_URL_PATH)); + if (!empty($pi['filename'])) return ''; + } + 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 ''; + } + } + 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 ''; + } + } + + // 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 (!$GLOBALS['config']['ENABLE_LOCALCACHE']) return ''; // 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') + ) + { + 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 ''; // This is not a single video URL. + } + 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 ''; // This is not a single video URL. + } + $sign = hash_hmac('sha256', $url, $GLOBALS['salt']); // We use the salt to sign data (it's random, secret, and specific to each installation) + return ''; + } + + // 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, $GLOBALS['salt']); // We use the salt to sign data (it's random, secret, and specific to each installation) + return ''; + } + return ''; // No thumbnail. + +} + // ----------------------------------------------------------------------------------------------- // Template for the whole page. /* Input: $data (associative array). @@ -1071,52 +1559,69 @@ function templatePage($data) global $STARTTIME; global $LINKSDB; $shaarli_version = shaarli_version; + + $newversion=checkUpdate(); + if ($newversion!='') $newversion='
    ● Shaarli '.htmlspecialchars($newversion).' is available.
    '; $linkcount = count($LINKSDB); $open=''; - if (OPEN_SHAARLI) + if ($GLOBALS['config']['OPEN_SHAARLI']) { $menu=' Tools  Add link'; $open='Open '; } else - $menu=(isLoggedIn() ? ' Logout  Tools  Add link' : ' Login'); + $menu=(isLoggedIn() ? ' Logout  Tools  Add link' : ' Login'); + foreach(array('pageheader','body','onload') as $k) // make sure all required fields exist (put an empty string if not). { if (!array_key_exists($k,$data)) $data[$k]=''; } $jsincludes=''; $jsincludes_bottom = ''; - if (OPEN_SHAARLI || isLoggedIn()) + if ($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) { + $source = serverUrl().$_SERVER['SCRIPT_NAME']; $jsincludes=''; - $source = serverUrl().$_SERVER['SCRIPT_NAME'].'?ws=tags'; $jsincludes_bottom = << + + $('#lf_tags').autocomplete({source:'{$source}?ws=tags',minLength:1}); + $('#searchtags').autocomplete({source:'{$source}?ws=tags',minLength:1}); + $('#fromtag').autocomplete({source:'{$source}?ws=singletag',minLength:1}); +}); + JS; } - $feedurl=htmlspecialchars(serverUrl().$_SERVER['SCRIPT_NAME'].'?do=rss'); + $feedurl=htmlspecialchars(serverUrl().$_SERVER['SCRIPT_NAME']); + $searchcrits=''; // Search criteria + if (!empty($_GET['searchtags'])) $searchcrits.='&searchtags='.$_GET['searchtags']; + elseif (!empty($_GET['searchterm'])) $searchcrits.='&searchterm='.$_GET['searchterm']; + $filtered_feed= ($searchcrits=='' ? '' : 'Filtered '); + $version=shaarli_version; + + $title = htmlspecialchars( $GLOBALS['title'] ); + $pagetitle = htmlspecialchars( empty($GLOBALS['pagetitle']) ? $title : $GLOBALS['pagetitle'] ); echo << -{$open}Shaarli - Let's shaare your links... - - +{$pagetitle} + + + + {$jsincludes} - -