X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=baae41793ed579f95b4b1a19b163d1e9fd7ecc04;hb=refs%2Fheads%2Fv0.7;hp=01c23195fbfe10d538b8738fabf889d1369422c6;hpb=03eb19ac60d54442332077fa35a9b0d4e33df365;p=github%2Fshaarli%2FShaarli.git diff --git a/index.php b/index.php index 01c23195..baae4179 100644 --- a/index.php +++ b/index.php @@ -1,6 +1,6 @@ /shaarli/ define('WEB_PATH', substr($_SERVER["REQUEST_URI"], 0, 1+strrpos($_SERVER["REQUEST_URI"], '/', 0))); @@ -496,9 +496,9 @@ if (isset($_POST['login'])) else { ban_loginFailed(); - $redir = ''; + $redir = '&username='. $_POST['login']; if (isset($_GET['post'])) { - $redir = '?post=' . urlencode($_GET['post']); + $redir .= '&post=' . urlencode($_GET['post']); foreach (array('description', 'source', 'title') as $param) { if (!empty($_GET[$param])) { $redir .= '&' . $param . '=' . urlencode($_GET[$param]); @@ -569,7 +569,7 @@ function tokenOk($token) // This RSS feed cannot be filtered. function showDailyRSS() { // Cache system - $query = $_SERVER["QUERY_STRING"]; + $query = $_SERVER['QUERY_STRING']; $cache = new CachedPage( $GLOBALS['config']['PAGECACHE'], page_url($_SERVER), @@ -736,7 +736,6 @@ function showDaily($pageBuilder, $LINKSDB) $dayDate = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $day.'_000000'); $data = array( 'linksToDisplay' => $linksToDisplay, - 'linkcount' => count($LINKSDB), 'cols' => $columns, 'day' => $dayDate->getTimestamp(), 'previousday' => $previousday, @@ -792,6 +791,8 @@ function renderPage() } $PAGE = new PageBuilder(); + $PAGE->assign('linkcount', count($LINKSDB)); + $PAGE->assign('privateLinkcount', count_private($LINKSDB)); // Determine which page will be rendered. $query = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : ''; @@ -822,12 +823,15 @@ function renderPage() if ($GLOBALS['config']['OPEN_SHAARLI']) { header('Location: ?'); exit; } // No need to login for open Shaarli $token=''; if (ban_canLogin()) $token=getToken(); // Do not waste token generation if not useful. $PAGE->assign('token',$token); + if (isset($_GET['username'])) { + $PAGE->assign('username', escape($_GET['username'])); + } $PAGE->assign('returnurl',(isset($_SERVER['HTTP_REFERER']) ? escape($_SERVER['HTTP_REFERER']):'')); $PAGE->renderPage('loginform'); exit; } // -------- 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($GLOBALS['config']['PAGECACHE']); logout(); @@ -855,7 +859,6 @@ function renderPage() } $data = array( - 'linkcount' => count($LINKSDB), 'linksToDisplay' => $linksToDisplay, ); $pluginManager->executeHooks('render_picwall', $data, array('loggedin' => isLoggedIn())); @@ -905,7 +908,6 @@ function renderPage() } $data = array( - 'linkcount' => count($LINKSDB), 'tags' => $tagList, ); $pluginManager->executeHooks('render_tagcloud', $data, array('loggedin' => isLoggedIn())); @@ -1078,12 +1080,6 @@ function renderPage() exit; } - // Same case as above except that user tried to access ?do=addlink without being logged in - // Note: passing empty parameters makes Shaarli generate default URLs and descriptions. - if (isset($_GET['do']) && $_GET['do'] === 'addlink') { - header('Location: ?do=login&post='); - exit; - } showLinkList($PAGE, $LINKSDB); if (isset($_GET['edit_link'])) { header('Location: ?do=login&edit_link='. escape($_GET['edit_link'])); @@ -1099,7 +1095,6 @@ function renderPage() if ($targetPage == Router::$PAGE_TOOLS) { $data = array( - 'linkcount' => count($LINKSDB), 'pageabsaddr' => index_url($_SERVER), ); $pluginManager->executeHooks('render_tools', $data); @@ -1144,7 +1139,6 @@ function renderPage() } else // show the change password form. { - $PAGE->assign('linkcount',count($LINKSDB)); $PAGE->assign('token',getToken()); $PAGE->renderPage('changepassword'); exit; @@ -1192,7 +1186,6 @@ function renderPage() } else // Show the configuration form. { - $PAGE->assign('linkcount',count($LINKSDB)); $PAGE->assign('token',getToken()); $PAGE->assign('title', empty($GLOBALS['title']) ? '' : $GLOBALS['title'] ); $PAGE->assign('redirector', empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector'] ); @@ -1208,7 +1201,6 @@ function renderPage() if ($targetPage == Router::$PAGE_CHANGETAG) { if (empty($_POST['fromtag']) || (empty($_POST['totag']) && isset($_POST['renametag']))) { - $PAGE->assign('linkcount', count($LINKSDB)); $PAGE->assign('token', getToken()); $PAGE->assign('tags', $LINKSDB->allTags()); $PAGE->renderPage('changetag'); @@ -1257,7 +1249,6 @@ function renderPage() // -------- User wants to add a link without using the bookmarklet: Show form. if ($targetPage == Router::$PAGE_ADDLINK) { - $PAGE->assign('linkcount',count($LINKSDB)); $PAGE->renderPage('addlink'); exit; } @@ -1383,7 +1374,6 @@ function renderPage() $link = $LINKSDB[$_GET['edit_link']]; // Read database if (!$link) { header('Location: ?'); exit; } // Link not found in database. $data = array( - 'linkcount' => count($LINKSDB), 'link' => $link, 'link_is_new' => false, 'token' => getToken(), @@ -1451,7 +1441,6 @@ function renderPage() } $data = array( - 'linkcount' => count($LINKSDB), 'link' => $link, 'link_is_new' => $link_is_new, 'token' => getToken(), // XSRF protection. @@ -1473,7 +1462,6 @@ function renderPage() // Export links as a Netscape Bookmarks file if (empty($_GET['selection'])) { - $PAGE->assign('linkcount',count($LINKSDB)); $PAGE->renderPage('export'); exit; } @@ -1515,7 +1503,7 @@ function renderPage() } // -------- User is uploading a file for import - if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=upload')) + if (isset($_SERVER['QUERY_STRING']) && startsWith($_SERVER['QUERY_STRING'], 'do=upload')) { // If file is too big, some form field may be missing. if (!isset($_POST['token']) || (!isset($_FILES)) || (isset($_FILES['filetoupload']['size']) && $_FILES['filetoupload']['size']==0)) @@ -1532,7 +1520,6 @@ function renderPage() // -------- Show upload/import dialog: if ($targetPage == Router::$PAGE_IMPORT) { - $PAGE->assign('linkcount',count($LINKSDB)); $PAGE->assign('token',getToken()); $PAGE->assign('maxfilesize',getMaxFileSize()); $PAGE->renderPage('import'); @@ -1618,7 +1605,7 @@ function importFile($LINKSDB) { $link = array('linkdate'=>'','title'=>'','url'=>'','description'=>'','tags'=>'','private'=>0); $d = explode('
',$html); - if (startswith($d[0],'(.*?)!i',$d[0],$matches); $link['title'] = (isset($matches[1]) ? trim($matches[1]) : ''); // Get title @@ -1764,7 +1751,6 @@ function buildLinkList($PAGE,$LINKSDB) // Fill all template fields. $data = array( - 'linkcount' => count($LINKSDB), 'previous_page_url' => $previous_page_url, 'next_page_url' => $next_page_url, 'page_current' => $page, @@ -2039,7 +2025,7 @@ function install() $timezone_html = 'Timezone:'.$timezone_form.''; } - $PAGE = new pageBuilder; + $PAGE = new PageBuilder(); $PAGE->assign('timezone_html',$timezone_html); $PAGE->assign('timezone_js',$timezone_js); $PAGE->renderPage('install'); @@ -2089,7 +2075,7 @@ function genThumbnail() // Is this a link to an image, or to a flickr page ? $imageurl=''; - if (endswith(parse_url($url,PHP_URL_PATH),'.jpg')) + 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'; @@ -2266,8 +2252,8 @@ function resizeImage($filepath) return true; } -if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=genthumbnail')) { genThumbnail(); exit; } // Thumbnail generation/cache does not need the link database. -if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=dailyrss')) { showDailyRSS(); exit; } +if (isset($_SERVER['QUERY_STRING']) && startsWith($_SERVER['QUERY_STRING'], 'do=genthumbnail')) { genThumbnail(); exit; } // Thumbnail generation/cache does not need the link database. +if (isset($_SERVER['QUERY_STRING']) && startsWith($_SERVER['QUERY_STRING'], 'do=dailyrss')) { showDailyRSS(); exit; } if (!isset($_SESSION['LINKS_PER_PAGE'])) $_SESSION['LINKS_PER_PAGE']=$GLOBALS['config']['LINKS_PER_PAGE']; renderPage(); ?>