From ae22a12b8adcc5788406b8637ab4db48085681fe Mon Sep 17 00:00:00 2001 From: TsT Date: Wed, 23 Oct 2013 23:21:36 +0200 Subject: [PATCH 001/658] uniform if syntax --- tpl/editlink.html | 12 ++++++------ tpl/includes.html | 2 +- tpl/linklist.html | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tpl/editlink.html b/tpl/editlink.html index 4a2c30c..48945a3 100644 --- a/tpl/editlink.html +++ b/tpl/editlink.html @@ -4,8 +4,8 @@ {if="empty($GLOBALS['disablejquery'])"}{/if} @@ -41,4 +41,4 @@ $(document).ready(function() {/if} - \ No newline at end of file + diff --git a/tpl/includes.html b/tpl/includes.html index 2b61f1e..cc57380 100644 --- a/tpl/includes.html +++ b/tpl/includes.html @@ -6,4 +6,4 @@ -{if condition="is_file('inc/user.css')"}{/if} +{if="is_file('inc/user.css')"}{/if} diff --git a/tpl/linklist.html b/tpl/linklist.html index ddc38cb..5a74273 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html @@ -42,7 +42,7 @@ {/if} {$value.title|htmlspecialchars}
- {if="$value.description"}
{$value.description}
{/if} + {if="$value.description"}
{$value.description}
{/if} {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"} {$value.localdate|htmlspecialchars} - permalink - {else} From 4ade7393a33e0ae3b40bb6a4dc8e051b0ed04169 Mon Sep 17 00:00:00 2001 From: Emilien Klein Date: Sun, 27 Jul 2014 22:57:30 +0200 Subject: [PATCH 002/658] Release version 0.0.42 beta --- index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index c102e42..fdc4fba 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,5 @@ '); // Suffix to encapsulate data in php code. // http://server.com/x/shaarli --> /shaarli/ From ebb2880dfcfd16b07744c6a2f98edb82133bfb04 Mon Sep 17 00:00:00 2001 From: Christophe HENRY Date: Wed, 13 Mar 2013 21:27:03 +0100 Subject: [PATCH 003/658] Adds a configuration variable "titleLink" which allows to customize the link on the title. --- index.php | 4 ++++ tpl/configure.html | 3 ++- tpl/page.header.html | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index fdc4fba..5dd0353 100644 --- a/index.php +++ b/index.php @@ -105,6 +105,7 @@ if (empty($GLOBALS['redirector'])) $GLOBALS['redirector']=''; if (empty($GLOBALS['disablesessionprotection'])) $GLOBALS['disablesessionprotection']=false; if (empty($GLOBALS['disablejquery'])) $GLOBALS['disablejquery']=false; if (empty($GLOBALS['privateLinkByDefault'])) $GLOBALS['privateLinkByDefault']=false; +if (empty($GLOBALS['titleLink'])) $GLOBALS['titleLink']='?'; // I really need to rewrite Shaarli with a proper configuation manager. // Run config screen if first run: @@ -657,6 +658,7 @@ class pageBuilder $this->tpl->assign('pagetitle','Shaarli'); $this->tpl->assign('privateonly',!empty($_SESSION['privateonly'])); // Show only private links ? if (!empty($GLOBALS['title'])) $this->tpl->assign('pagetitle',$GLOBALS['title']); + if (!empty($GLOBALS['titleLink'])) $this->tpl->assign('titleLink',$GLOBALS['titleLink']); if (!empty($GLOBALS['pagetitle'])) $this->tpl->assign('pagetitle',$GLOBALS['pagetitle']); $this->tpl->assign('shaarlititle',empty($GLOBALS['title']) ? 'Shaarli': $GLOBALS['title'] ); return; @@ -1395,6 +1397,7 @@ function renderPage() $tz = $_POST['continent'].'/'.$_POST['city']; $GLOBALS['timezone'] = $tz; $GLOBALS['title']=$_POST['title']; + $GLOBALS['titleLink']=$_POST['titleLink']; $GLOBALS['redirector']=$_POST['redirector']; $GLOBALS['disablesessionprotection']=!empty($_POST['disablesessionprotection']); $GLOBALS['disablejquery']=!empty($_POST['disablejquery']); @@ -2257,6 +2260,7 @@ function writeConfig() if (is_file($GLOBALS['config']['CONFIG_FILE']) && !isLoggedIn()) die('You are not authorized to alter config.'); // Only logged in user can alter config. $config='Page title: + Title link: Timezone:{$timezone_form} Redirector
(e.g. http://anonym.to/? will mask the HTTP_REFERER) @@ -29,4 +30,4 @@ {include="page.footer"} - \ No newline at end of file + diff --git a/tpl/page.header.html b/tpl/page.header.html index 125b365..37a18f7 100644 --- a/tpl/page.header.html +++ b/tpl/page.header.html @@ -2,7 +2,7 @@
Shaare your links...
{if="!empty($linkcount)"}{$linkcount} links{/if}
- {$shaarlititle|htmlspecialchars} + {$shaarlititle|htmlspecialchars} {if="!empty($_GET['source']) && $_GET['source']=='bookmarklet'"} {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore} From e411f7f9d7682256fdba017d409e8356c4644ab9 Mon Sep 17 00:00:00 2001 From: Christophe HENRY Date: Sun, 27 Jul 2014 16:30:03 +0200 Subject: [PATCH 004/658] Adds the tip for the title link in the configuration page --- tpl/configure.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpl/configure.html b/tpl/configure.html index 2a433ad..ef20e94 100644 --- a/tpl/configure.html +++ b/tpl/configure.html @@ -11,7 +11,7 @@ Page title: - Title link: + Title link:
Timezone:{$timezone_form} Redirector
(e.g. http://anonym.to/? will mask the HTTP_REFERER) From 25f5c59db6ac482ae2dd7996c9dd6794680c2a5b Mon Sep 17 00:00:00 2001 From: Christophe HENRY Date: Thu, 31 Jul 2014 23:12:29 +0200 Subject: [PATCH 005/658] Adds configuration variables, TPL and TMP, for RainTPL The path for templates and temporary files are now part of the configuration. For a custom install, it's possible to put these writable directories elsewhere than in the read-only source code. --- index.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index 5dd0353..fedad2b 100644 --- a/index.php +++ b/index.php @@ -26,6 +26,8 @@ $GLOBALS['config']['CACHEDIR'] = 'cache'; // Cache directory for thumbnails for $GLOBALS['config']['PAGECACHE'] = 'pagecache'; // Page cache directory. $GLOBALS['config']['ENABLE_LOCALCACHE'] = true; // Enable Shaarli to store thumbnail in a local cache. Disable to reduce webspace usage. $GLOBALS['config']['PUBSUBHUB_URL'] = ''; // PubSubHubbub support. Put an empty string to disable, or put your hub url here to enable. +$GLOBALS['config']['RAINTPL_TMP'] = 'tmp' ; // Raintpl cache directory +$GLOBALS['config']['RAINTPL_TPL'] = 'tpl/' ; // Raintpl template directory (keep the trailling slash!) $GLOBALS['config']['UPDATECHECK_FILENAME'] = $GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt'; // For updates check of Shaarli. $GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400 ; // Updates check frequency for Shaarli. 86400 seconds=24 hours // Note: You must have publisher.php in the same directory as Shaarli index.php @@ -63,9 +65,9 @@ error_reporting(E_ALL^E_WARNING); // See all error except warnings. //error_reporting(-1); // See all errors (for debugging only) include "inc/rain.tpl.class.php"; //include Rain TPL -raintpl::$tpl_dir = "tpl/"; // template directory -if (!is_dir('tmp')) { mkdir('tmp',0705); chmod('tmp',0705); } -raintpl::$cache_dir = "tmp/"; // cache directory +raintpl::$tpl_dir = $GLOBALS['config']['RAINTPL_TPL']; // template directory +if (!is_dir($GLOBALS['config']['RAINTPL_TMP'])) { mkdir($GLOBALS['config']['RAINTPL_TMP'],0705); chmod($GLOBALS['config']['RAINTPL_TMP'],0705); } +raintpl::$cache_dir = $GLOBALS['config']['RAINTPL_TMP']; // cache directory ob_start(); // Output buffering for the page cache. @@ -88,7 +90,7 @@ header("Pragma: no-cache"); // Directories creations (Note that your web host may require differents rights than 705.) if (!is_writable(realpath(dirname(__FILE__)))) die('
ERROR: Shaarli does not have the right to write in its own directory ('.realpath(dirname(__FILE__)).').
'); if (!is_dir($GLOBALS['config']['DATADIR'])) { mkdir($GLOBALS['config']['DATADIR'],0705); chmod($GLOBALS['config']['DATADIR'],0705); } -if (!is_dir('tmp')) { mkdir('tmp',0705); chmod('tmp',0705); } // For RainTPL temporary files. +if (!is_dir($GLOBALS['config']['RAINTPL_TMP'])) { mkdir($GLOBALS['config']['RAINTPL_TMP'],0705);chmod($GLOBALS['config']['RAINTPL_TMP'],0705); } // For RainTPL temporary files. if (!is_file($GLOBALS['config']['DATADIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['DATADIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files. // Second check to see if Shaarli can write in its directory, because on some hosts is_writable() is not reliable. if (!is_file($GLOBALS['config']['DATADIR'].'/.htaccess')) die('
ERROR: Shaarli does not have the right to write in its data directory ('.realpath($GLOBALS['config']['DATADIR']).').
'); From c614a35db8c49bc953c6fcd83161def61a76d945 Mon Sep 17 00:00:00 2001 From: Christophe HENRY Date: Thu, 31 Jul 2014 23:17:30 +0200 Subject: [PATCH 006/658] Removed redundant check on RAINTPL_TMP directory The same test is already on line 93 --- index.php | 1 - 1 file changed, 1 deletion(-) diff --git a/index.php b/index.php index fedad2b..3301b13 100644 --- a/index.php +++ b/index.php @@ -66,7 +66,6 @@ error_reporting(E_ALL^E_WARNING); // See all error except warnings. include "inc/rain.tpl.class.php"; //include Rain TPL raintpl::$tpl_dir = $GLOBALS['config']['RAINTPL_TPL']; // template directory -if (!is_dir($GLOBALS['config']['RAINTPL_TMP'])) { mkdir($GLOBALS['config']['RAINTPL_TMP'],0705); chmod($GLOBALS['config']['RAINTPL_TMP'],0705); } raintpl::$cache_dir = $GLOBALS['config']['RAINTPL_TMP']; // cache directory ob_start(); // Output buffering for the page cache. From e7416aba2c7a06fc96e37700f555c2b70a5ac859 Mon Sep 17 00:00:00 2001 From: Christophe HENRY Date: Mon, 4 Aug 2014 00:13:30 +0200 Subject: [PATCH 007/658] Adds empty directories: cache, data, pagecache and tmp. Removes mkdirs. They are still in .gitignore because their future content will still be ignored. --- cache/.placeholder | 0 data/.placeholder | 0 index.php | 4 ---- pagecache/.placeholder | 0 tmp/.placeholder | 0 5 files changed, 4 deletions(-) create mode 100644 cache/.placeholder create mode 100644 data/.placeholder create mode 100644 pagecache/.placeholder create mode 100644 tmp/.placeholder diff --git a/cache/.placeholder b/cache/.placeholder new file mode 100644 index 0000000..e69de29 diff --git a/data/.placeholder b/data/.placeholder new file mode 100644 index 0000000..e69de29 diff --git a/index.php b/index.php index 3301b13..747f113 100644 --- a/index.php +++ b/index.php @@ -88,14 +88,11 @@ header("Pragma: no-cache"); // Directories creations (Note that your web host may require differents rights than 705.) if (!is_writable(realpath(dirname(__FILE__)))) die('
ERROR: Shaarli does not have the right to write in its own directory ('.realpath(dirname(__FILE__)).').
'); -if (!is_dir($GLOBALS['config']['DATADIR'])) { mkdir($GLOBALS['config']['DATADIR'],0705); chmod($GLOBALS['config']['DATADIR'],0705); } -if (!is_dir($GLOBALS['config']['RAINTPL_TMP'])) { mkdir($GLOBALS['config']['RAINTPL_TMP'],0705);chmod($GLOBALS['config']['RAINTPL_TMP'],0705); } // For RainTPL temporary files. if (!is_file($GLOBALS['config']['DATADIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['DATADIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files. // Second check to see if Shaarli can write in its directory, because on some hosts is_writable() is not reliable. if (!is_file($GLOBALS['config']['DATADIR'].'/.htaccess')) die('
ERROR: Shaarli does not have the right to write in its data directory ('.realpath($GLOBALS['config']['DATADIR']).').
'); if ($GLOBALS['config']['ENABLE_LOCALCACHE']) { - if (!is_dir($GLOBALS['config']['CACHEDIR'])) { mkdir($GLOBALS['config']['CACHEDIR'],0705); chmod($GLOBALS['config']['CACHEDIR'],0705); } if (!is_file($GLOBALS['config']['CACHEDIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['CACHEDIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files. } @@ -188,7 +185,6 @@ class pageCache public function cache($page) { if (!$this->shouldBeCached) return; - if (!is_dir($GLOBALS['config']['PAGECACHE'])) { mkdir($GLOBALS['config']['PAGECACHE'],0705); chmod($GLOBALS['config']['PAGECACHE'],0705); } file_put_contents($this->filename,$page); } diff --git a/pagecache/.placeholder b/pagecache/.placeholder new file mode 100644 index 0000000..e69de29 diff --git a/tmp/.placeholder b/tmp/.placeholder new file mode 100644 index 0000000..e69de29 From 3bb684f59f04511ed157833d3d9552ee0e65d980 Mon Sep 17 00:00:00 2001 From: Christophe HENRY Date: Mon, 4 Aug 2014 00:38:37 +0200 Subject: [PATCH 008/658] Removes htaccess file creation and adds them in the repository I also removed the previously created placeholders, which after all, have no more utility. --- cache/.htaccess | 2 ++ cache/.placeholder | 0 data/.htaccess | 2 ++ data/.placeholder | 0 index.php | 7 ------- pagecache/.htaccess | 2 ++ pagecache/.placeholder | 0 tmp/.htaccess | 2 ++ tmp/.placeholder | 0 9 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 cache/.htaccess delete mode 100644 cache/.placeholder create mode 100644 data/.htaccess delete mode 100644 data/.placeholder create mode 100644 pagecache/.htaccess delete mode 100644 pagecache/.placeholder create mode 100644 tmp/.htaccess delete mode 100644 tmp/.placeholder diff --git a/cache/.htaccess b/cache/.htaccess new file mode 100644 index 0000000..b584d98 --- /dev/null +++ b/cache/.htaccess @@ -0,0 +1,2 @@ +Allow from none +Deny from all diff --git a/cache/.placeholder b/cache/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/data/.htaccess b/data/.htaccess new file mode 100644 index 0000000..b584d98 --- /dev/null +++ b/data/.htaccess @@ -0,0 +1,2 @@ +Allow from none +Deny from all diff --git a/data/.placeholder b/data/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/index.php b/index.php index 747f113..3136193 100644 --- a/index.php +++ b/index.php @@ -88,13 +88,6 @@ header("Pragma: no-cache"); // Directories creations (Note that your web host may require differents rights than 705.) if (!is_writable(realpath(dirname(__FILE__)))) die('
ERROR: Shaarli does not have the right to write in its own directory ('.realpath(dirname(__FILE__)).').
'); -if (!is_file($GLOBALS['config']['DATADIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['DATADIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files. -// Second check to see if Shaarli can write in its directory, because on some hosts is_writable() is not reliable. -if (!is_file($GLOBALS['config']['DATADIR'].'/.htaccess')) die('
ERROR: Shaarli does not have the right to write in its data directory ('.realpath($GLOBALS['config']['DATADIR']).').
'); -if ($GLOBALS['config']['ENABLE_LOCALCACHE']) -{ - if (!is_file($GLOBALS['config']['CACHEDIR'].'/.htaccess')) { file_put_contents($GLOBALS['config']['CACHEDIR'].'/.htaccess',"Allow from none\nDeny from all\n"); } // Protect data files. -} // Handling of old config file which do not have the new parameters. if (empty($GLOBALS['title'])) $GLOBALS['title']='Shared links on '.htmlspecialchars(indexUrl()); diff --git a/pagecache/.htaccess b/pagecache/.htaccess new file mode 100644 index 0000000..b584d98 --- /dev/null +++ b/pagecache/.htaccess @@ -0,0 +1,2 @@ +Allow from none +Deny from all diff --git a/pagecache/.placeholder b/pagecache/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/tmp/.htaccess b/tmp/.htaccess new file mode 100644 index 0000000..b584d98 --- /dev/null +++ b/tmp/.htaccess @@ -0,0 +1,2 @@ +Allow from none +Deny from all diff --git a/tmp/.placeholder b/tmp/.placeholder deleted file mode 100644 index e69de29..0000000 From a1795ddcf3d1dcef0ca213a5bfb75b8237dfb646 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Mon, 11 Aug 2014 00:04:51 +0200 Subject: [PATCH 009/658] bookmarklet: use selected text as description when adding a new link * Based on romnGit's work at https://github.com/sebsauvage/Shaarli/pull/104 * Fixes https://github.com/shaarli/Shaarli/issues/18 * Closes https://github.com/sebsauvage/Shaarli/pull/104 * Fixes https://github.com/sebsauvage/Shaarli/issues/53 * Fixes https://github.com/sebsauvage/Shaarli/issues/129 * Fixes https://github.com/sebsauvage/Shaarli/issues/33 --- index.php | 6 +++--- tpl/tools.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index 5dd0353..24b93fa 100644 --- a/index.php +++ b/index.php @@ -425,7 +425,7 @@ if (isset($_POST['login'])) session_regenerate_id(true); } // Optional redirect after login: - 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($_GET['post'])) { header('Location: ?post='.urlencode($_GET['post']).(!empty($_GET['title'])?'&title='.urlencode($_GET['title']):'').(!empty($_GET['description'])?'&description='.urlencode($_GET['description']):'').(!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. @@ -437,7 +437,7 @@ if (isset($_POST['login'])) { ban_loginFailed(); $redir = ''; - if (isset($_GET['post'])) { $redir = '&post='.urlencode($_GET['post']).(!empty($_GET['title'])?'&title='.urlencode($_GET['title']):'').(!empty($_GET['source'])?'&source='.urlencode($_GET['source']):''); } + if (isset($_GET['post'])) { $redir = '&post='.urlencode($_GET['post']).(!empty($_GET['title'])?'&title='.urlencode($_GET['title']):'').(!empty($_GET['description'])?'&description='.urlencode($_GET['description']):'').(!empty($_GET['source'])?'&source='.urlencode($_GET['source']):''); } echo ''; // Redirect to login screen. exit; } @@ -1336,7 +1336,7 @@ function renderPage() // Show login screen, then redirect to ?post=... if (isset($_GET['post'])) { - 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. + header('Location: ?do=login&post='.urlencode($_GET['post']).(!empty($_GET['title'])?'&title='.urlencode($_GET['title']):'').(!empty($_GET['description'])?'&description='.urlencode($_GET['description']):'').(!empty($_GET['source'])?'&source='.urlencode($_GET['source']):'')); // Redirect to login page, then back to post link. exit; } $PAGE = new pageBuilder; diff --git a/tpl/tools.html b/tpl/tools.html index 48ecc97..ba1c1e8 100644 --- a/tpl/tools.html +++ b/tpl/tools.html @@ -10,7 +10,7 @@ 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.

From ad6c27b7b858dfa29e65f14ef444fad318d5895b Mon Sep 17 00:00:00 2001 From: nodiscc Date: Mon, 11 Aug 2014 20:41:50 +0200 Subject: [PATCH 010/658] Fix grammar, punctuation, spelling, trailing whitepaces and newlines; Fix typo in css Based on respencer's work at https://github.com/respencer/Shaarli/ Closes https://github.com/sebsauvage/Shaarli/pull/103 --- README.md | 4 +- inc/shaarli.css | 10 +- index.php | 254 ++++++++++++++++++++++----------------------- tpl/configure.html | 4 +- tpl/import.html | 2 +- 5 files changed, 137 insertions(+), 137 deletions(-) diff --git a/README.md b/README.md index cff718c..a89d577 100644 --- a/README.md +++ b/README.md @@ -12,12 +12,12 @@ Features: * **FAST** * Dead-simple installation: Drop the files, open the page. No database required. * Easy to use: Single button in your browser to bookmark a page - * Save url, title, description (unlimited size). Classify links with tags (with autocomplete) + * Save URL, title, description (unlimited size). Classify links with tags (with autocomplete) * Tag renaming, merging and deletion. * Automatic thumbnails for various services (imgur, imageshack.us, flickr, youtube, vimeo, dailymotion…) * Automatic conversion of URLs to clickable links in descriptions. Support for http/ftp/file/apt/magnet protocols. * Save links as public or private - * 1-clic access to your private links/notes + * 1-click access to your private links/notes * Browse links by page, filter by tag or use the full text search engine * Permalinks (with QR-Code) for easy reference * RSS and ATOM feeds (which can be filtered by tag or text search) diff --git a/inc/shaarli.css b/inc/shaarli.css index cdc0579..13e6ab3 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -1,4 +1,4 @@ -/* CSS Stylsheet for Shaarli - http://sebsauvage.net/wiki/doku.php?id=php:shaarli */ +/* Cascading Stylesheet for Shaarli - http://sebsauvage.net/wiki/doku.php?id=php:shaarli */ /* CSS Reset from Yahoo to cope with browsers CSS inconsistencies. */ /* @@ -408,13 +408,13 @@ div.dailyEntryDescription overflow:auto; } -/* Common css screwdriver */ +/* Common CSS screwdriver */ .clear{ clear:both; } /* For lazy images loading in picture wall. - using http://www.appelsiini.net/projects/lazyload + Using http://www.appelsiini.net/projects/lazyload */ .lazyimage { display:none; } @@ -451,7 +451,7 @@ a {color:#000!important;text-decoration:none!important;} #searchform_value { width:70% !important; } #tagfilter_value { width:70% !important; } div.qrcode { position:relative; float:left; top:-10px; left:0px; } -#paging_privatelinks { float;none; } +#paging_privatelinks { float:none; } #paging_linksperpage { float:none; margin-bottom:10px; font-size:smaller;} #paging_older,#paging_newer,#paging_linksperpage a { border: 1px solid black; padding:3px 5px 3px 5px; background-color:#666; color:#fff; border-radius: 5px 5px 5px 5px;} .thumbnail { float:none; height:auto; margin: 0px; text-align:center;} @@ -466,4 +466,4 @@ div.dailyEntryDescription { font-size:10pt; } } /* Highlight search results */ -.highlight { background-color: #FFFF33; } +.highlight { background-color: #FFFF33; } \ No newline at end of file diff --git a/index.php b/index.php index 5dd0353..07f877d 100644 --- a/index.php +++ b/index.php @@ -1,9 +1,9 @@ '); // Suffix to encapsulate data in php code. +define('PHPPREFIX',''); // Suffix to encapsulate data in PHP code. // http://server.com/x/shaarli --> /shaarli/ define('WEB_PATH', substr($_SERVER["REQUEST_URI"], 0, 1+strrpos($_SERVER["REQUEST_URI"], '/', 0))); @@ -48,8 +48,8 @@ session_set_cookie_params($cookie['lifetime'],$cookiedir,$_SERVER['HTTP_HOST']); // Set session parameters on server side. define('INACTIVITY_TIMEOUT',3600); // (in seconds). If the user does not access any page within this time, his/her session is considered expired. ini_set('session.use_cookies', 1); // Use cookies to store session. -ini_set('session.use_only_cookies', 1); // Force cookies for session (phpsessionID forbidden in URL) -ini_set('session.use_trans_sid', false); // Prevent php to use sessionID in URL if cookies are disabled. +ini_set('session.use_only_cookies', 1); // Force cookies for session (phpsessionID forbidden in URL). +ini_set('session.use_trans_sid', false); // Prevent PHP form using sessionID in URL if cookies are disabled. session_name('shaarli'); if (session_id() == '') session_start(); // Start session if needed (Some server auto-start sessions). @@ -85,7 +85,7 @@ header("Cache-Control: no-store, no-cache, must-revalidate"); header("Cache-Control: post-check=0, pre-check=0", false); header("Pragma: no-cache"); -// Directories creations (Note that your web host may require differents rights than 705.) +// Directories creations (Note that your web host may require different rights than 705.) if (!is_writable(realpath(dirname(__FILE__)))) die('
ERROR: Shaarli does not have the right to write in its own directory ('.realpath(dirname(__FILE__)).').
'); if (!is_dir($GLOBALS['config']['DATADIR'])) { mkdir($GLOBALS['config']['DATADIR'],0705); chmod($GLOBALS['config']['DATADIR'],0705); } if (!is_dir('tmp')) { mkdir('tmp',0705); chmod('tmp',0705); } // For RainTPL temporary files. @@ -119,13 +119,13 @@ define('STAY_SIGNED_IN_TOKEN', sha1($GLOBALS['hash'].$_SERVER["REMOTE_ADDR"].$GL autoLocale(); // Sniff browser language and set date format accordingly. header('Content-Type: text/html; charset=utf-8'); // We use UTF-8 for proper international characters handling. -// Check php version +// Check PHP version function checkphpversion() { if (version_compare(PHP_VERSION, '5.1.0') < 0) { header('Content-Type: text/plain; charset=utf-8'); - echo 'Your server supports php '.PHP_VERSION.'. Shaarli requires at least php 5.1.0, and thus cannot run. Sorry.'; + echo 'Your server supports PHP '.PHP_VERSION.'. Shaarli requires at least php 5.1.0, and thus cannot run. Sorry.'; exit; } } @@ -144,7 +144,7 @@ function checkUpdate() $version=shaarli_version; list($httpstatus,$headers,$data) = getHTTP('http://sebsauvage.net/files/shaarli_version.txt',2); if (strpos($httpstatus,'200 OK')!==false) $version=$data; - // If failed, nevermind. We don't want to bother the user with that. + // If failed, never mind. We don't want to bother the user with that. file_put_contents($GLOBALS['config']['UPDATECHECK_FILENAME'],$version); // touch file date } // Compare versions: @@ -160,11 +160,11 @@ function checkUpdate() class pageCache { private $url; // Full URL of the page to cache (typically the value returned by pageUrl()) - private $shouldBeCached; // boolean: Should this url be cached ? - private $filename; // Name of the cache file for this url + private $shouldBeCached; // boolean: Should this url be cached? + private $filename; // Name of the cache file for this url. /* - $url = url (typically the value returned by pageUrl()) + $url = URL (typically the value returned by pageUrl()) $shouldBeCached = boolean. If false, the cache will be disabled. */ public function __construct($url,$shouldBeCached) @@ -227,7 +227,7 @@ function nl2br_escaped($html) } /* Returns the small hash of a string, using RFC 4648 base64url format - eg. smallHash('20111006_131924') --> yZH23w + e.g. smallHash('20111006_131924') --> yZH23w Small hashes: - are unique (well, as unique as crc32, at last) - are always 6 characters long. @@ -241,7 +241,7 @@ function smallHash($text) return strtr($t, '+/', '-_'); } -// In a string, converts urls to clickable links. +// In a string, converts URLs to clickable links. // Function inspired from http://www.php.net/manual/en/function.preg-replace.php#85722 function text2clickable($url) { @@ -262,8 +262,8 @@ function keepMultipleSpaces($text) function autoLocale() { $loc='en_US'; // Default if browser does not send HTTP_ACCEPT_LANGUAGE - if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) // eg. "fr,fr-fr;q=0.8,en;q=0.5,en-us;q=0.3" - { // (It's a bit crude, but it works very well. Prefered language is always presented first.) + if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) // e.g. "fr,fr-fr;q=0.8,en;q=0.5,en-us;q=0.3" + { // (It's a bit crude, but it works very well. Preferred language is always presented first.) if (preg_match('/([a-z]{2}(-[a-z]{2})?)/i',$_SERVER['HTTP_ACCEPT_LANGUAGE'],$matches)) $loc=$matches[1]; } setlocale(LC_TIME,$loc); // LC_TIME = Set local for date/time format only. @@ -300,7 +300,7 @@ function allIPs() } function fillSessionInfo() { - $_SESSION['uid'] = sha1(uniqid('',true).'_'.mt_rand()); // generate unique random number (different than phpsessionid) + $_SESSION['uid'] = sha1(uniqid('',true).'_'.mt_rand()); // Generate unique random number (different than phpsessionid) $_SESSION['ip']=allIPs(); // We store IP address(es) of the client to make sure session is not hijacked. $_SESSION['username']=$GLOBALS['login']; $_SESSION['expires_on']=time()+INACTIVITY_TIMEOUT; // Set session expiration. @@ -404,7 +404,7 @@ 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. + { // Login/password is OK. ban_loginOk(); // If user wants to keep the session cookie even after the browser closes: if (!empty($_POST['longlastingsession'])) @@ -415,7 +415,7 @@ if (isset($_POST['login'])) $cookiedir = ''; if(dirname($_SERVER['SCRIPT_NAME'])!='/') $cookiedir=dirname($_SERVER["SCRIPT_NAME"]).'/'; session_set_cookie_params($_SESSION['longlastingsession'],$cookiedir,$_SERVER['HTTP_HOST']); // Set session cookie expiration on client side - // Note: Never forget the trailing slash on the cookie path ! + // Note: Never forget the trailing slash on the cookie path! session_regenerate_id(true); // Send cookie with new expiration date to browser. } else // Standard session expiration (=when browser closes) @@ -447,7 +447,7 @@ if (isset($_POST['login'])) // Misc utility functions: // Returns the server URL (including port and http/https), without path. -// eg. "http://myserver.com:8080" +// e.g. "http://myserver.com:8080" // You can append $_SERVER['SCRIPT_NAME'] to get the current script URL. function serverUrl() { @@ -457,24 +457,24 @@ function serverUrl() } // Returns the absolute URL of current script, without the query. -// (eg. http://sebsauvage.net/links/) +// (e.g. http://sebsauvage.net/links/) function indexUrl() { $scriptname = $_SERVER["SCRIPT_NAME"]; // If the script is named 'index.php', we remove it (for better looking URLs, - // eg. http://mysite.com/shaarli/?abcde instead of http://mysite.com/shaarli/index.php?abcde) + // e.g. http://mysite.com/shaarli/?abcde instead of http://mysite.com/shaarli/index.php?abcde) if (endswith($scriptname,'index.php')) $scriptname = substr($scriptname,0,strlen($scriptname)-9); return serverUrl() . $scriptname; } // Returns the absolute URL of current script, WITH the query. -// (eg. http://sebsauvage.net/links/?toto=titi&spamspamspam=humbug) +// (e.g. http://sebsauvage.net/links/?toto=titi&spamspamspam=humbug) function pageUrl() { return indexUrl().(!empty($_SERVER["QUERY_STRING"]) ? '?'.$_SERVER["QUERY_STRING"] : ''); } -// Convert post_max_size/upload_max_filesize (eg.'16M') parameters to bytes. +// Convert post_max_size/upload_max_filesize (e.g. '16M') parameters to bytes. function return_bytes($val) { $val = trim($val); $last=strtolower($val[strlen($val)-1]); @@ -495,7 +495,7 @@ function getMaxFileSize() $size2 = return_bytes(ini_get('upload_max_filesize')); // Return the smaller of two: $maxsize = min($size1,$size2); - // FIXME: Then convert back to readable notations ? (eg. 2M instead of 2000000) + // FIXME: Then convert back to readable notations ? (e.g. 2M instead of 2000000) return $maxsize; } @@ -543,7 +543,7 @@ function linkdate2iso8601($linkdate) function linkdate2locale($linkdate) { return utf8_encode(strftime('%c',linkdate2timestamp($linkdate))); // %c is for automatic date format according to locale. - // Note that if you use a local which is not installed on your webserver, + // Note that if you use a locale which is not installed on your webserver, // the date will not be displayed in the chosen locale, but probably in US notation. } @@ -565,10 +565,10 @@ function http_parse_headers_shaarli( $headers ) } /* GET an URL. - Input: $url : url to get (http://...) + Input: $url : URL to get (http://...) $timeout : Network timeout (will wait this many seconds for an anwser before giving up). - Output: An array. [0] = HTTP status message (eg. "HTTP/1.1 200 OK") or error message - [1] = associative array containing HTTP response headers (eg. echo getHTTP($url)[1]['Content-Type']) + Output: An array. [0] = HTTP status message (e.g. "HTTP/1.1 200 OK") or error message + [1] = associative array containing HTTP response headers (e.g. echo getHTTP($url)[1]['Content-Type']) [2] = data Example: list($httpstatus,$headers,$data) = getHTTP('http://sebauvage.net/'); if (strpos($httpstatus,'200 OK')!==false) @@ -584,11 +584,11 @@ function getHTTP($url,$timeout=30) $context = stream_context_create($options); $data=file_get_contents($url,false,$context,-1, 4000000); // We download at most 4 Mb from source. if (!$data) { return array('HTTP Error',array(),''); } - $httpStatus=$http_response_header[0]; // eg. "HTTP/1.1 200 OK" + $httpStatus=$http_response_header[0]; // e.g. "HTTP/1.1 200 OK" $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) + catch (Exception $e) // getHTTP *can* fail silently (we don't care if the title cannot be fetched) { return array($e->getMessage(),'',''); } @@ -614,14 +614,14 @@ function getToken() return $rnd; } -// Tells if a token is ok. Using this function will destroy the token. -// true=token is ok. +// Tells if a token is OK. Using this function will destroy the token. +// true=token is OK. function tokenOk($token) { if (isset($_SESSION['tokens'][$token])) { unset($_SESSION['tokens'][$token]); // Token is used: destroy it. - return true; // Token is ok. + return true; // Token is OK. } return false; // Wrong token, or already used. } @@ -656,7 +656,7 @@ class pageBuilder $this->tpl->assign('version',shaarli_version); $this->tpl->assign('scripturl',indexUrl()); $this->tpl->assign('pagetitle','Shaarli'); - $this->tpl->assign('privateonly',!empty($_SESSION['privateonly'])); // Show only private links ? + $this->tpl->assign('privateonly',!empty($_SESSION['privateonly'])); // Show only private links? if (!empty($GLOBALS['title'])) $this->tpl->assign('pagetitle',$GLOBALS['title']); if (!empty($GLOBALS['titleLink'])) $this->tpl->assign('titleLink',$GLOBALS['titleLink']); if (!empty($GLOBALS['pagetitle'])) $this->tpl->assign('pagetitle',$GLOBALS['pagetitle']); @@ -672,7 +672,7 @@ class pageBuilder } // Render a specific page (using a template). - // eg. pb.renderPage('picwall') + // e.g. pb.renderPage('picwall') public function renderPage($page) { if ($this->tpl===false) $this->initialize(); // Lazy initialization @@ -691,10 +691,10 @@ class pageBuilder Available keys: title : Title of the link - url : URL of the link. Can be absolute or relative. Relative URLs are permalinks (eg.'?m-ukcw') + url : URL of the link. Can be absolute or relative. Relative URLs are permalinks (e.g.'?m-ukcw') description : description of the entry - private : Is this link private ? 0=no, other value=yes - linkdate : date of the creation of this entry, in the form YYYYMMDD_HHMMSS (eg.'20110914_192317') + private : Is this link private? 0=no, other value=yes + linkdate : date of the creation of this entry, in the form YYYYMMDD_HHMMSS (e.g.'20110914_192317') tags : tags attached to this entry (separated by spaces) We implement 3 interfaces: @@ -704,15 +704,15 @@ class pageBuilder */ class linkdb implements Iterator, Countable, ArrayAccess { - private $links; // List of links (associative array. Key=linkdate (eg. "20110823_124546"), value= associative array (keys:title,description...) + private $links; // List of links (associative array. Key=linkdate (e.g. "20110823_124546"), value= associative array (keys:title,description...) private $urls; // List of all recorded URLs (key=url, value=linkdate) for fast reserve search (url-->linkdate) private $keys; // List of linkdate keys (for the Iterator interface implementation) private $position; // Position in the $this->keys array. (for the Iterator interface implementation.) - private $loggedin; // Is the used logged in ? (used to filter private links) + private $loggedin; // Is the user logged in? (used to filter private links) // Constructor: function __construct($isLoggedIn) - // Input : $isLoggedIn : is the used logged in ? + // Input : $isLoggedIn : is the user logged in? { $this->loggedin = $isLoggedIn; $this->checkdb(); // Make sure data file exists. @@ -726,7 +726,7 @@ class linkdb implements Iterator, Countable, ArrayAccess public function offsetSet($offset, $value) { if (!$this->loggedin) die('You are not authorized to add a link.'); - if (empty($value['linkdate']) || empty($value['url'])) die('Internal Error: A link should always have a linkdate and url.'); + if (empty($value['linkdate']) || empty($value['url'])) die('Internal Error: A link should always have a linkdate and URL.'); if (empty($offset)) die('You must specify a key.'); $this->links[$offset] = $value; $this->urls[$value['url']]=$offset; @@ -789,19 +789,19 @@ class linkdb implements Iterator, Countable, ArrayAccess invalidateCaches(); } - // Returns the link for a given URL (if it exists). false it does not exist. + // Returns the link for a given URL (if it exists). False if it does not exist. public function getLinkFromUrl($url) { if (isset($this->urls[$url])) return $this->links[$this->urls[$url]]; return false; } - // Case insentitive search among links (in url, title and description). Returns filtered list of links. - // eg. print_r($mydb->filterFulltext('hollandais')); + // Case insensitive search among links (in the URLs, title and description). Returns filtered list of links. + // e.g. print_r($mydb->filterFulltext('hollandais')); public function filterFulltext($searchterms) { // FIXME: explode(' ',$searchterms) and perform a AND search. - // FIXME: accept double-quotes to search for a string "as is" ? + // FIXME: accept double-quotes to search for a string "as is"? $filtered=array(); $s = strtolower($searchterms); foreach($this->links as $l) @@ -818,7 +818,7 @@ 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')); + // e.g. print_r($mydb->filterTags('linux programming')); public function filterTags($tags,$casesensitive=false) { $t = str_replace(',',' ',($casesensitive?$tags:strtolower($tags))); @@ -834,9 +834,9 @@ class linkdb implements Iterator, Countable, ArrayAccess return $filtered; } - // Filter by day. Day must be in the form 'YYYYMMDD' (eg. '20120125') + // Filter by day. Day must be in the form 'YYYYMMDD' (e.g. '20120125') // Sort order is: older articles first. - // eg. print_r($mydb->filterDay('20120125')); + // e.g. print_r($mydb->filterDay('20120125')); public function filterDay($day) { $filtered=array(); @@ -891,13 +891,13 @@ class linkdb implements Iterator, Countable, ArrayAccess } // ------------------------------------------------------------------------------------------ -// Ouput the last N links in RSS 2.0 format. +// Output the last N links in RSS 2.0 format. function showRSS() { 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. eg. http://mysite.com/shaarli/?do=rss&permalinks + // User just has to add 'permalink' in URL parameters. e.g. http://mysite.com/shaarli/?do=rss&permalinks $usepermalinks = isset($_GET['permalinks']); // Cache system @@ -906,9 +906,9 @@ function showRSS() $cached = $cache->cachedVersion(); if (!empty($cached)) { echo $cached; exit; } // If cached was not found (or not usable), then read the database and build the response: - $LINKSDB=new linkdb(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); // Read links from database (and filter private links if used it not logged in). + $LINKSDB=new linkdb(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); // Read links from database (and filter private links if user it not logged in). - // Optionnaly filter the results: + // Optionally filter the results: $linksToDisplay=array(); if (!empty($_GET['searchterm'])) $linksToDisplay = $LINKSDB->filterFulltext($_GET['searchterm']); elseif (!empty($_GET['searchtags'])) $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); @@ -965,13 +965,13 @@ function showRSS() } // ------------------------------------------------------------------------------------------ -// Ouput the last N links in ATOM format. +// Output the last N links in ATOM format. function showATOM() { header('Content-Type: application/atom+xml; charset=utf-8'); // $usepermalink : If true, use permalink instead of final link. - // User just has to add 'permalink' in URL parameters. eg. http://mysite.com/shaarli/?do=atom&permalinks + // User just has to add 'permalink' in URL parameters. e.g. http://mysite.com/shaarli/?do=atom&permalinks $usepermalinks = isset($_GET['permalinks']); // Cache system @@ -983,7 +983,7 @@ function showATOM() $LINKSDB=new linkdb(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); // Read links from database (and filter private links if used it not logged in). - // Optionnaly filter the results: + // Optionally filter the results: $linksToDisplay=array(); if (!empty($_GET['searchterm'])) $linksToDisplay = $LINKSDB->filterFulltext($_GET['searchterm']); elseif (!empty($_GET['searchtags'])) $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); @@ -1079,7 +1079,7 @@ function showDailyRSS() if (empty($days[$day])) $days[$day]=array(); $days[$day][]=$linkdate; } - if (count($days)>$nb_of_days) break; // Have we collected enough days ? + if (count($days)>$nb_of_days) break; // Have we collected enough days? } // Build the RSS feed. @@ -1158,7 +1158,7 @@ function showDaily() } /* We need to spread the articles on 3 columns. - I did not want to use a javascript lib like http://masonry.desandro.com/ + I did not want to use a JavaScript lib like http://masonry.desandro.com/ so I manually spread entries with a simple method: I roughly evaluate the height of a div according to title and description length. */ @@ -1169,7 +1169,7 @@ function showDaily() // Roughly estimate length of entry (by counting characters) // Title: 30 chars = 1 line. 1 line is 30 pixels height. // Description: 836 characters gives roughly 342 pixel height. - // This is not perfect, but it's usually ok. + // This is not perfect, but it's usually OK. $length=strlen($link['title'])+(342*strlen($link['description']))/836; if ($link['thumbnail']) $length +=100; // 1 thumbnails roughly takes 100 pixels height. // Then put in column which is the less filled: @@ -1222,7 +1222,7 @@ function renderPage() // -------- Picture wall if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=picwall')) { - // Optionnaly filter the results: + // Optionally filter the results: $links=array(); if (!empty($_GET['searchterm'])) $links = $LINKSDB->filterFulltext($_GET['searchterm']); elseif (!empty($_GET['searchtags'])) $links = $LINKSDB->filterTags(trim($_GET['searchtags'])); @@ -1302,7 +1302,7 @@ function renderPage() if (isset($_GET['linksperpage'])) { if (is_numeric($_GET['linksperpage'])) { $_SESSION['LINKS_PER_PAGE']=abs(intval($_GET['linksperpage'])); } - // Make sure the referer is from Shaarli itself. + // Make sure the referrer is Shaarli itself. $referer = '?'; if (!empty($_SERVER['HTTP_REFERER']) && strcmp(parse_url($_SERVER['HTTP_REFERER'],PHP_URL_HOST),$_SERVER['HTTP_HOST'])==0) $referer = $_SERVER['HTTP_REFERER']; @@ -1321,7 +1321,7 @@ function renderPage() { unset($_SESSION['privateonly']); // See all links } - // Make sure the referer is from Shaarli itself. + // Make sure the referrer is Shaarli itself. $referer = '?'; if (!empty($_SERVER['HTTP_REFERER']) && strcmp(parse_url($_SERVER['HTTP_REFERER'],PHP_URL_HOST),$_SERVER['HTTP_HOST'])==0) $referer = $_SERVER['HTTP_REFERER']; @@ -1332,7 +1332,7 @@ function renderPage() // -------- Handle other actions allowed for non-logged in users: if (!isLoggedIn()) { - // User tries to post new link but is not loggedin: + // User tries to post new link but is not logged in: // Show login screen, then redirect to ?post=... if (isset($_GET['post'])) { @@ -1342,7 +1342,7 @@ function renderPage() $PAGE = new pageBuilder; buildLinkList($PAGE,$LINKSDB); // Compute list of links to display $PAGE->renderPage('linklist'); - exit; // Never remove this one ! All operations below are reserved for logged in user. + exit; // Never remove this one! All operations below are reserved for logged in user. } // -------- All other functions are reserved for the registered user: @@ -1363,7 +1363,7 @@ function renderPage() 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 ! + if (!tokenOk($_POST['token'])) die('Wrong token.'); // Go away! // Make sure old password is correct. $oldhash = sha1($_POST['oldpassword'].$GLOBALS['login'].$GLOBALS['salt']); @@ -1390,7 +1390,7 @@ function renderPage() { if (!empty($_POST['title']) ) { - if (!tokenOk($_POST['token'])) die('Wrong token.'); // Go away ! + if (!tokenOk($_POST['token'])) die('Wrong token.'); // Go away! $tz = 'UTC'; if (!empty($_POST['continent']) && !empty($_POST['city'])) if (isTZvalid($_POST['continent'],$_POST['city'])) @@ -1414,7 +1414,7 @@ function renderPage() $PAGE->assign('title',htmlspecialchars( empty($GLOBALS['title']) ? '' : $GLOBALS['title'] , ENT_QUOTES)); $PAGE->assign('redirector',htmlspecialchars( empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector'] , ENT_QUOTES)); list($timezone_form,$timezone_js) = templateTZform($GLOBALS['timezone']); - $PAGE->assign('timezone_form',$timezone_form); // FIXME: put entire tz form generation in template ? + $PAGE->assign('timezone_form',$timezone_form); // FIXME: Put entire tz form generation in template? $PAGE->assign('timezone_js',$timezone_js); $PAGE->renderPage('configure'); exit; @@ -1438,7 +1438,7 @@ function renderPage() if (!empty($_POST['deletetag']) && !empty($_POST['fromtag'])) { $needle=trim($_POST['fromtag']); - $linksToAlter = $LINKSDB->filterTags($needle,true); // true for case-sensitive tag search. + $linksToAlter = $LINKSDB->filterTags($needle,true); // True for case-sensitive tag search. foreach($linksToAlter as $key=>$value) { $tags = explode(' ',trim($value['tags'])); @@ -1446,7 +1446,7 @@ function renderPage() $value['tags']=trim(implode(' ',$tags)); $LINKSDB[$key]=$value; } - $LINKSDB->savedb(); // save to disk + $LINKSDB->savedb(); // Save to disk. echo ''; exit; } @@ -1459,17 +1459,17 @@ function renderPage() foreach($linksToAlter as $key=>$value) { $tags = explode(' ',trim($value['tags'])); - $tags[array_search($needle,$tags)] = trim($_POST['totag']); // Remplace tags value. + $tags[array_search($needle,$tags)] = trim($_POST['totag']); // Replace tags value. $value['tags']=trim(implode(' ',$tags)); $LINKSDB[$key]=$value; } - $LINKSDB->savedb(); // save to disk + $LINKSDB->savedb(); // Save to disk. echo ''; exit; } } - // -------- User wants to add a link without using the bookmarklet: show form. + // -------- User wants to add a link without using the bookmarklet: Show form. if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=addlink')) { $PAGE = new pageBuilder; @@ -1481,7 +1481,7 @@ function renderPage() // -------- User clicked the "Save" button when editing a link: Save link to database. if (isset($_POST['save_edit'])) { - if (!tokenOk($_POST['token'])) die('Wrong token.'); // Go away ! + 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']; $url = trim($_POST['lf_url']); @@ -1491,7 +1491,7 @@ function renderPage() '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 + $LINKSDB->savedb(); // Save to disk. pubsubhub(); // If we are called from the bookmarklet, we must close the popup: @@ -1505,7 +1505,7 @@ function renderPage() // -------- User clicked the "Cancel" button when editing a link. if (isset($_POST['cancel_edit'])) { - // If we are called from the bookmarklet, we must close the popup; + // If we are called from the bookmarklet, we must close the popup: if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo ''; exit; } $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' ); $returnurl .= '#'.smallHash($_POST['lf_linkdate']); // Scroll to the link which has been edited. @@ -1513,12 +1513,12 @@ function renderPage() exit; } - // -------- User clicked the "Delete" button when editing a link : Delete link from database. + // -------- User clicked the "Delete" button when editing a link: Delete link from database. if (isset($_POST['delete_link'])) { if (!tokenOk($_POST['token'])) die('Wrong token.'); // We do not need to ask for confirmation: - // - confirmation is handled by javascript + // - confirmation is handled by JavaScript // - we are protected from XSRF by the token. $linkdate=$_POST['lf_linkdate']; unset($LINKSDB[$linkdate]); @@ -1568,7 +1568,7 @@ function renderPage() $tags = (empty($_GET['tags']) ? '' : $_GET['tags'] ); // Get tags if it was provided in URL $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); // Get private if it was provided in 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 this is an HTTP link, we try go get the page to extract 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. @@ -1622,7 +1622,7 @@ function renderPage() exit; } $exportWhat=$_GET['what']; - if (!array_intersect(array('all','public','private'),array($exportWhat))) die('What are you trying to export ???'); + if (!array_intersect(array('all','public','private'),array($exportWhat))) die('What are you trying to export???'); header('Content-Type: text/html; charset=utf-8'); header('Content-disposition: attachment; filename=bookmarks_'.$exportWhat.'_'.strval(date('Ymd_His')).'.html'); @@ -1695,8 +1695,8 @@ function importFile() $filename=$_FILES['filetoupload']['name']; $filesize=$_FILES['filetoupload']['size']; $data=file_get_contents($_FILES['filetoupload']['tmp_name']); - $private = (empty($_POST['private']) ? 0 : 1); // Should the links be imported as private ? - $overwrite = !empty($_POST['overwrite']) ; // Should the imported links overwrite existing ones ? + $private = (empty($_POST['private']) ? 0 : 1); // Should the links be imported as private? + $overwrite = !empty($_POST['overwrite']) ; // Should the imported links overwrite existing ones? $import_count=0; // Sniff file type: @@ -1707,7 +1707,7 @@ function importFile() if ($type=='netscape') { // This is a standard Netscape-style bookmark file. - // This format is supported by all browsers (except IE, of course), also delicious, diigo and others. + // This format is supported by all browsers (except IE, of course), also Delicious, Diigo and others. foreach(explode('
',$data) as $html) // explode is very fast { $link = array('linkdate'=>'','title'=>'','url'=>'','description'=>'','tags'=>'','private'=>0); @@ -1741,14 +1741,14 @@ function importFile() // Make sure date/time is not already used by another link. // (Some bookmark files have several different links with the same ADD_DATE) - // We increment date by 1 second until we find a date which is not used in db. + // We increment date by 1 second until we find a date which is not used in DB. // (so that links that have the same date/time are more or less kept grouped by date, but do not conflict.) while (!empty($LINKSDB[date('Ymd_His',$raw_add_date)])) { $raw_add_date++; }// Yes, I know it's ugly. $link['linkdate']=date('Ymd_His',$raw_add_date); $LINKSDB[$link['linkdate']] = $link; $import_count++; } - else // link already present in database. + else // Link already present in database. { if ($overwrite) { // If overwrite is required, we import link data, except date/time. @@ -1799,13 +1799,13 @@ function buildLinkList($PAGE,$LINKSDB) { header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found"); echo '

404 Not found.

Oh crap. The link you are trying to reach does not exist or has been deleted.'; - echo '
You would mind clicking here ?'; + echo '
You would mind clicking here?'; exit; } $search_type='permalink'; } else - $linksToDisplay = $LINKSDB; // otherwise, display without filtering. + $linksToDisplay = $LINKSDB; // Otherwise, display without filtering. // Option: Show only private links if (!empty($_SESSION['privateonly'])) @@ -1819,11 +1819,11 @@ function buildLinkList($PAGE,$LINKSDB) } // ---- Handle paging. - /* Can someone explain to me why you get the following error when using array_keys() on an object which implements the interface ArrayAccess ??? + /* Can someone explain to me why you get the following error when using array_keys() on an object which implements the interface ArrayAccess??? "Warning: array_keys() expects parameter 1 to be array, object given in ... " 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. + $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']; @@ -1870,7 +1870,7 @@ function buildLinkList($PAGE,$LINKSDB) $PAGE->assign('result_count',count($linksToDisplay)); $PAGE->assign('search_type',$search_type); $PAGE->assign('search_crits',$search_crits); - $PAGE->assign('redirector',empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector']); // optional redirector URL + $PAGE->assign('redirector',empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector']); // Optional redirector URL. $PAGE->assign('token',$token); $PAGE->assign('links',$linkDisp); return; @@ -1878,9 +1878,9 @@ function buildLinkList($PAGE,$LINKSDB) // Compute the thumbnail for a link. // -// with a link to the original URL. +// With a link to the original URL. // Understands various services (youtube.com...) -// Input: $url = url for which the thumbnail must be found. +// 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. @@ -1891,7 +1891,7 @@ function computeThumbnail($url,$href=false) 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 ) + // (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') @@ -1964,17 +1964,17 @@ function computeThumbnail($url,$href=false) ) { if ($domain=='vimeo.com') - { // Make sure this vimeo url points to a video (/xxx... where xxx is numeric) + { // 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) + { // 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/...) + { // 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. } @@ -2001,7 +2001,7 @@ function computeThumbnail($url,$href=false) // 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. +// 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) @@ -2022,7 +2022,7 @@ function thumbnail($url,$href=false) // 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. +// 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($url,$href=false) @@ -2032,7 +2032,7 @@ function lazyThumbnail($url,$href=false) $html=''; - // Lazy image (only loaded by javascript when in the viewport). + // Lazy image (only loaded by JavaScript when in the viewport). if (!empty($GLOBALS['disablejquery'])) // (except if jQuery is disabled) $html.='alert("Shaarli is now configured. Please enter your login/password and start shaaring your links !");document.location=\'?do=login\';'; + echo ''; exit; } @@ -2114,14 +2114,14 @@ function install() exit; } -// Generates the timezone selection form and javascript. +// Generates the timezone selection form and JavaScript. // Input: (optional) current timezone (can be 'UTC/UTC'). It will be pre-selected. // Output: array(html,js) // Example: list($htmlform,$js) = templateTZform('Europe/Paris'); // Europe/Paris pre-selected. -// Returns array('','') if server does not support timezones list. (eg. php 5.1 on free.fr) +// Returns array('','') if server does not support timezones list. (e.g. PHP 5.1 on free.fr) function templateTZform($ptz=false) { - if (function_exists('timezone_identifiers_list')) // because of old php version (5.1) which can be found on free.fr + if (function_exists('timezone_identifiers_list')) // because of old PHP version (5.1) which can be found on free.fr { // Try to split the provided timezone. if ($ptz==false) { $l=timezone_identifiers_list(); $ptz=$l[0]; } @@ -2130,7 +2130,7 @@ function templateTZform($ptz=false) // Display config form: $timezone_form = ''; $timezone_js = ''; - // The list is in the forme "Europe/Paris", "America/Argentina/Buenos_Aires"... + // The list is in the form "Europe/Paris", "America/Argentina/Buenos_Aires"... // We split the list in continents/cities. $continents = array(); $cities = array(); @@ -2168,9 +2168,9 @@ function templateTZform($ptz=false) function isTZvalid($continent,$city) { $tz = $continent.'/'.$city; - if (function_exists('timezone_identifiers_list')) // because of old php version (5.1) which can be found on free.fr + if (function_exists('timezone_identifiers_list')) // because of old PHP version (5.1) which can be found on free.fr { - if (in_array($tz, timezone_identifiers_list())) // it's a valid timezone ? + if (in_array($tz, timezone_identifiers_list())) // it's a valid timezone? return true; } return false; @@ -2213,7 +2213,7 @@ if (!function_exists('json_encode')) { } // Webservices (for use with jQuery/jQueryUI) -// eg. index.php?ws=tags&term=minecr +// e.g. index.php?ws=tags&term=minecr function processWS() { if (empty($_GET['ws']) || empty($_GET['term'])) return; @@ -2221,7 +2221,7 @@ function processWS() $LINKSDB=new linkdb(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); // Read links from database (and filter private links if used it not logged in). header('Content-Type: application/json; charset=utf-8'); - // Search in tags (case insentitive, cumulative search) + // Search in tags (case insensitive, cumulative search) if ($_GET['ws']=='tags') { $tags=explode(' ',str_replace(',',' ',$term)); $last = array_pop($tags); // Get the last term ("a b c d" ==> "a b c", "d") @@ -2237,7 +2237,7 @@ function processWS() exit; } - // Search a single tag (case sentitive, single tag search) + // Search a single tag (case sensitive, single tag search) if ($_GET['ws']=='singletag') { /* To speed up things, we store list of tags in session */ @@ -2253,7 +2253,7 @@ function processWS() // Re-write configuration file according to globals. // Requires some $GLOBALS to be set (login,hash,salt,title). -// If the config file cannot be saved, an error message is dislayed and the user is redirected to "Tools" menu. +// If the config file cannot be saved, an error message is displayed and the user is redirected to "Tools" menu. // (otherwise, the function simply returns.) function writeConfig() { @@ -2273,12 +2273,12 @@ function writeConfig() } } -/* Because some f*cking services like Flickr require an extra HTTP request to get the thumbnail URL, +/* 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: + 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 (eg. a flickr page) + [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. */ @@ -2286,7 +2286,7 @@ 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 !'); + 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'; @@ -2311,22 +2311,22 @@ function genThumbnail() if ($domain=='flickr.com' || endsWith($domain,'.flickr.com')) { - // Crude replacement to handle new Flickr domain policy (They prefer www. now) + // 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. eg. http://farm1.staticflickr.com/5/5921913_ac83ed27bd_o.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) + else // This is a flickr page (html) { list($httpstatus,$headers,$data) = getHTTP($url,20); // Get the flickr html page. if (strpos($httpstatus,'200 OK')!==false) { - // Flickr now nicely provides the URL of the thumbnail in each flickr page. + // flickr now nicely provides the URL of the thumbnail in each flickr page. preg_match('!Security: Features: - + New link: @@ -30,4 +30,4 @@ {include="page.footer"} - + \ No newline at end of file diff --git a/tpl/import.html b/tpl/import.html index 9e581fc..259e56e 100644 --- a/tpl/import.html +++ b/tpl/import.html @@ -5,7 +5,7 @@
The Daily Shaarli
——————————— {$day} ———————————
-
+
{if="$linksToDisplay"}
{loop="col1"}
-
permalink
+
permalink
{if="$value.tags"}
{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}
{/if}
{$value.title|htmlspecialchars}
{if="$value.thumbnail"}
{$value.thumbnail}
{/if} @@ -32,7 +32,7 @@
{loop="col2"}
-
permalink
+
permalink
{if="$value.tags"}
{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}
{/if}
{$value.title|htmlspecialchars}
{if="$value.thumbnail"}
{$value.thumbnail}
{/if} @@ -44,7 +44,7 @@
{loop="col3"}
-
permalink
+
permalink
{if="$value.tags"}
{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}
{/if}
{$value.title|htmlspecialchars}
{if="$value.thumbnail"}
{$value.thumbnail}
{/if} @@ -53,11 +53,10 @@ {/loop}
{else} -
No articles on this day.
+
No articles on this day.
{/if} -
-
-
+
-
{include="page.footer"} - \ No newline at end of file + diff --git a/tpl/editlink.html b/tpl/editlink.html index 48945a3..454dfff 100644 --- a/tpl/editlink.html +++ b/tpl/editlink.html @@ -12,10 +12,10 @@
- URL

- Title

- Description

- Tags

+ URL

+ Title

+ Description

+ Tags

{if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}  
@@ -23,9 +23,9 @@  
{/if} - - - {if="!$link_is_new"}{/if} + + + {if="!$link_is_new"}{/if} {if="$http_referer"}{/if} diff --git a/tpl/export.html b/tpl/export.html index 938cbe6..911b02c 100644 --- a/tpl/export.html +++ b/tpl/export.html @@ -7,9 +7,10 @@
{include="page.footer"} - \ No newline at end of file + diff --git a/tpl/install.html b/tpl/install.html index 4034ef1..32b8811 100644 --- a/tpl/install.html +++ b/tpl/install.html @@ -2,20 +2,19 @@ {include="includes"}{$timezone_js} -
+

Shaarli

It looks like it's the first time you run Shaarli. Please configure it:
-
-
- + +
{$timezone_html} - +
Login:
Password:
Page title:
{include="page.footer"} - \ No newline at end of file + diff --git a/tpl/linklist.html b/tpl/linklist.html index d33fc3c..eadbc4c 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html @@ -4,9 +4,9 @@ diff --git a/tpl/loginform.html b/tpl/loginform.html index 805a014..954f6f1 100644 --- a/tpl/loginform.html +++ b/tpl/loginform.html @@ -13,7 +13,7 @@ Login:     Password :
- + {if="$returnurl"}{/if} @@ -23,4 +23,4 @@ {include="page.footer"} - \ No newline at end of file + diff --git a/tpl/page.footer.html b/tpl/page.footer.html index 8e5869c..b494bf7 100644 --- a/tpl/page.footer.html +++ b/tpl/page.footer.html @@ -2,7 +2,7 @@ Shaarli {$version|htmlspecialchars} - The personal, minimalist, super-fast, no-database delicious clone. By sebsauvage.net. Theme by idleman.fr.
{if="$newversion"} -
● Shaarli {$newversion|htmlspecialchars} is available.
+
● Shaarli {$newversion|htmlspecialchars} is available.
{/if} {if="isLoggedIn()"} diff --git a/tpl/page.header.html b/tpl/page.header.html index 654a551..17c0c75 100644 --- a/tpl/page.header.html +++ b/tpl/page.header.html @@ -1,6 +1,6 @@ -
Shaare your links...
+
Shaare your links...
{if="!empty($linkcount)"}{$linkcount} links{/if}
{$shaarlititle|htmlspecialchars} @@ -17,7 +17,7 @@ {/if} RSS Feed {if="$GLOBALS['config']['SHOW_ATOM']"} - ATOM Feed + ATOM Feed {/if} Tag cloud Picture wall diff --git a/tpl/tagcloud.html b/tpl/tagcloud.html index 0dd2c0d..9418e24 100644 --- a/tpl/tagcloud.html +++ b/tpl/tagcloud.html @@ -6,10 +6,10 @@
{loop="tags"} - {$value.count}{$key|htmlspecialchars} + {$value.count}{$key|htmlspecialchars} {/loop}
{include="page.footer"} - \ No newline at end of file + diff --git a/tpl/tools.html b/tpl/tools.html index ba1c1e8..ae31902 100644 --- a/tpl/tools.html +++ b/tpl/tools.html @@ -10,10 +10,10 @@ 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.

{include="page.footer"} - \ No newline at end of file + From e0a9e1470497c61c93b9f493fe502168cd69634b Mon Sep 17 00:00:00 2001 From: nodiscc Date: Fri, 5 Dec 2014 01:05:23 +0100 Subject: [PATCH 035/658] =?UTF-8?q?bookmarklet:=20add=20=E2=9C=9A=20sign?= =?UTF-8?q?=20to=20make=20it=20more=20recognizable=20in=20toolbars?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tpl/tools.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpl/tools.html b/tpl/tools.html index ae31902..c2520fd 100644 --- a/tpl/tools.html +++ b/tpl/tools.html @@ -10,7 +10,7 @@ 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.

From 569be2e8d5b64f57bf6f0daf329f33deea69eda6 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 16 Dec 2014 19:21:58 +0100 Subject: [PATCH 036/658] prevent disclosing full path when raising "Shaarli directory not writeable" error * work on https://github.com/shaarli/Shaarli/issues/78 --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 38958a7..d30cb05 100644 --- a/index.php +++ b/index.php @@ -89,7 +89,7 @@ header("Cache-Control: post-check=0, pre-check=0", false); header("Pragma: no-cache"); // Directories creations (Note that your web host may require different rights than 705.) -if (!is_writable(realpath(dirname(__FILE__)))) die('
ERROR: Shaarli does not have the right to write in its own directory ('.realpath(dirname(__FILE__)).').
'); +if (!is_writable(realpath(dirname(__FILE__)))) die('
ERROR: Shaarli does not have the right to write in its own directory.').
'); // Handling of old config file which do not have the new parameters. if (empty($GLOBALS['title'])) $GLOBALS['title']='Shared links on '.htmlspecialchars(indexUrl()); From 509762236b4074bc7f1d344c5436fe8983db60dc Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 16 Dec 2014 19:24:37 +0100 Subject: [PATCH 037/658] prevent disclosing PHP version on PHP version check error * fixes https://github.com/shaarli/Shaarli/issues/78 * fixes https://github.com/sebsauvage/Shaarli/issues/214 --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index d30cb05..4bbd902 100644 --- a/index.php +++ b/index.php @@ -118,7 +118,7 @@ function checkphpversion() if (version_compare(PHP_VERSION, '5.1.0') < 0) { header('Content-Type: text/plain; charset=utf-8'); - echo 'Your server supports PHP '.PHP_VERSION.'. Shaarli requires at least php 5.1.0, and thus cannot run. Sorry.'; + echo 'Your PHP version is obsolete! Shaarli requires at least php 5.1.0, and thus cannot run. Sorry. Your PHP version has known security vulnerabilities and should be updated as soon as possible.'; exit; } } From 60b83e7cf763be3a68529f1d945710edaeb87967 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 16 Dec 2014 19:52:06 +0100 Subject: [PATCH 038/658] fix quoting error introduced in 712501812b6f927b048b9d7f767cb15a370b3c81 --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 4bbd902..02a6725 100644 --- a/index.php +++ b/index.php @@ -89,7 +89,7 @@ header("Cache-Control: post-check=0, pre-check=0", false); header("Pragma: no-cache"); // Directories creations (Note that your web host may require different rights than 705.) -if (!is_writable(realpath(dirname(__FILE__)))) die('
ERROR: Shaarli does not have the right to write in its own directory.').
'); +if (!is_writable(realpath(dirname(__FILE__)))) die('
ERROR: Shaarli does not have the right to write in its own directory.
'); // Handling of old config file which do not have the new parameters. if (empty($GLOBALS['title'])) $GLOBALS['title']='Shared links on '.htmlspecialchars(indexUrl()); From 2e45fdd8ff84678215ac838133f89c57580b59af Mon Sep 17 00:00:00 2001 From: Florian Eula Date: Mon, 22 Dec 2014 16:43:37 +0100 Subject: [PATCH 039/658] Made tag/title search unicode aware, fixes #75 --- index.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/index.php b/index.php index 35e83eb..e2c6886 100644 --- a/index.php +++ b/index.php @@ -794,14 +794,16 @@ class linkdb implements Iterator, Countable, ArrayAccess { // FIXME: explode(' ',$searchterms) and perform a AND search. // FIXME: accept double-quotes to search for a string "as is"? + // Using mb_convert_case($val, MB_CASE_LOWER, 'UTF-8') allows us to perform searches on + // Unicode text. See https://github.com/shaarli/Shaarli/issues/75 for examples. $filtered=array(); - $s = strtolower($searchterms); + $s = mb_convert_case($searchterms, MB_CASE_LOWER, 'UTF-8'); foreach($this->links as $l) { - $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); + $found= (strpos(mb_convert_case($l['title'], MB_CASE_LOWER, 'UTF-8'),$s) !== false) + || (strpos(mb_convert_case($l['description'], MB_CASE_LOWER, 'UTF-8'),$s) !== false) + || (strpos(mb_convert_case($l['url'], MB_CASE_LOWER, 'UTF-8'),$s) !== false) + || (strpos(mb_convert_case($l['tags'], MB_CASE_LOWER, 'UTF-8'),$s) !== false); if ($found) $filtered[$l['linkdate']] = $l; } krsort($filtered); @@ -813,12 +815,14 @@ class linkdb implements Iterator, Countable, ArrayAccess // e.g. print_r($mydb->filterTags('linux programming')); public function filterTags($tags,$casesensitive=false) { - $t = str_replace(',',' ',($casesensitive?$tags:strtolower($tags))); + // Same as above, we use UTF-8 conversion to handle various graphemes (i.e. cyrillic, or greek) + // TODO: is $casesensitive ever true ? + $t = str_replace(',',' ',($casesensitive?$tags:mb_convert_case($tags, MB_CASE_LOWER, 'UTF-8'))); $searchtags=explode(' ',$t); $filtered=array(); foreach($this->links as $l) { - $linktags = explode(' ',($casesensitive?$l['tags']:strtolower($l['tags']))); + $linktags = explode(' ',($casesensitive?$l['tags']:mb_convert_case($l['tags'], MB_CASE_LOWER, 'UTF-8'))); if (count(array_intersect($linktags,$searchtags)) == count($searchtags)) $filtered[$l['linkdate']] = $l; } From cae64e52e47811a3fbef534f296b8952680d0d8f Mon Sep 17 00:00:00 2001 From: Florian Eula Date: Mon, 22 Dec 2014 17:11:53 +0100 Subject: [PATCH 040/658] Refactored the daily column generation (only one loop) --- index.php | 5 +--- tpl/daily.html | 67 +++++++++++++++++++++++--------------------------- 2 files changed, 32 insertions(+), 40 deletions(-) diff --git a/index.php b/index.php index 02a6725..b280ee9 100644 --- a/index.php +++ b/index.php @@ -1173,10 +1173,7 @@ function showDaily() $PAGE = new pageBuilder; $PAGE->assign('linksToDisplay',$linksToDisplay); $PAGE->assign('linkcount',count($LINKSDB)); - $PAGE->assign('col1',$columns[0]); - $PAGE->assign('col1',$columns[0]); - $PAGE->assign('col2',$columns[1]); - $PAGE->assign('col3',$columns[2]); + $PAGE->assign('cols', $columns); $PAGE->assign('day',utf8_encode(strftime('%A %d, %B %Y',linkdate2timestamp($day.'_000000')))); $PAGE->assign('previousday',$previousday); $PAGE->assign('nextday',$nextday); diff --git a/tpl/daily.html b/tpl/daily.html index c15a706..b92425b 100644 --- a/tpl/daily.html +++ b/tpl/daily.html @@ -7,7 +7,7 @@
All links of one day
in a single page.
{if="$previousday"} <Previous day{else}<Previous day{/if} - - + - {if="$nextday"}Next day>{else}Next day>{/if}

Daily RSS Feed @@ -15,43 +15,38 @@
The Daily Shaarli
——————————— {$day} ———————————
- + {if="$linksToDisplay"} -
- {loop="col1"} -
-
permalink
- {if="$value.tags"}
{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}
{/if} -
{$value.title|htmlspecialchars}
- {if="$value.thumbnail"}
{$value.thumbnail}
{/if} -
{$value.formatedDescription}
-
+ {loop="cols"} + {if="isset($value[0])"} +
+ {loop="value"} + {$link=$value} +
+
+ + permalink + +
+ {if="$link.tags"} +
+ {loop="link.taglist"} + {$value|htmlspecialchars} - + {/loop} +
+ {/if} +
+ {$link.title|htmlspecialchars} +
+ {if="$link.thumbnail"} +
{$link.thumbnail}
+ {/if} +
{$link.formatedDescription}
+
+ {/loop} +
+ {/if} {/loop} -
- -
- {loop="col2"} -
-
permalink
- {if="$value.tags"}
{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}
{/if} -
{$value.title|htmlspecialchars}
- {if="$value.thumbnail"}
{$value.thumbnail}
{/if} -
{$value.formatedDescription}
-
- {/loop} -
- -
- {loop="col3"} -
-
permalink
- {if="$value.tags"}
{loop="value.taglist"}{$value|htmlspecialchars} - {/loop}
{/if} -
{$value.title|htmlspecialchars}
- {if="$value.thumbnail"}
{$value.thumbnail}
{/if} -
{$value.formatedDescription}
-
- {/loop} -
{else}
No articles on this day.
{/if} From 1e3b2740e522a8fde6bfef1030cd9b4a5eae0304 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 24 Dec 2014 20:00:17 +0100 Subject: [PATCH 041/658] improve tag cloud font size scaling * use logarithmic scales * remove bold style --- inc/shaarli.css | 1 - index.php | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/shaarli.css b/inc/shaarli.css index e7396cc..d52de92 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -562,7 +562,6 @@ a.qrcode img { } #cloudtag a { - font-weight:bold; color: black; text-decoration: none; } diff --git a/index.php b/index.php index 02a6725..7843f2b 100644 --- a/index.php +++ b/index.php @@ -1251,8 +1251,9 @@ function renderPage() ksort($tags); $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'=>max(40*$value/$maxcount,8)); + $tagList[$key] = array('count'=>$value,'size'=>log($value, 15) / log($maxcount, 30) * (22-6) + 6); } $PAGE = new pageBuilder; $PAGE->assign('linkcount',count($LINKSDB)); From 657837af111387c93b3a75149d93856df12c00d9 Mon Sep 17 00:00:00 2001 From: Emilien Klein Date: Sun, 4 Jan 2015 15:19:14 -0500 Subject: [PATCH 042/658] Redirect to home page after deleting a link Fixes issue 87 --- index.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/index.php b/index.php index c4c45e5..e50c018 100644 --- a/index.php +++ b/index.php @@ -1546,9 +1546,7 @@ function renderPage() // If we are called from the bookmarklet, we must close the popup: if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo ''; exit; } - $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' ); - if ($returnurl=='?') { $returnurl = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '?'); } - header('Location: '.$returnurl); // After deleting the link, redirect to the page the user was on. + header('Location: ?'); // After deleting the link, redirect to the home page. exit; } From 8079dfd1cdec41a0bb3ee7ec2b974e8e64376d83 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 12 Dec 2014 17:01:02 +0100 Subject: [PATCH 043/658] W3C compliance (work on issue #64 - https://github.com/shaarli/Shaarli/issues/64): * fix duplicate IDs - #paging_older, #paging_newer become classes as the paging is displayed twice (top, bottom) in the linklist * fix duplicate IDs - #paging_privatelinks and #paging_linksperpage become classes * daily links are now valid (use &) * name attribute is not used anymore on a tag in link list * center tag is replaced by CSS in picwall and tag cloud * action in form tag can't be empty, use # instead * fixed configure table with CSS instead of cellpadding, border, and valign * export links are now valid * remove "size" in input tag * Fix missing alt attributes for img elements * tpl/daily: Use HTML entities instead of char escape codes * tpl/export: fix missing closing tag * Remove obsolete language attribute on + {/if} diff --git a/tpl/picwall.html b/tpl/picwall.html index b78e260..bfaabf7 100644 --- a/tpl/picwall.html +++ b/tpl/picwall.html @@ -9,15 +9,15 @@ -
-
- {loop="linksToDisplay"} -
- {$value.thumbnail}{$value.title|htmlspecialchars} -
- {/loop} +
+
+ {loop="linksToDisplay"} +
+ {$value.thumbnail}{$value.title|htmlspecialchars} +
+ {/loop} +
-
{include="page.footer"} {if="empty($GLOBALS['disablejquery'])"} diff --git a/tpl/tagcloud.html b/tpl/tagcloud.html index 9418e24..97205e2 100644 --- a/tpl/tagcloud.html +++ b/tpl/tagcloud.html @@ -3,13 +3,13 @@ {include="includes"} -
-
- {loop="tags"} - {$value.count}{$key|htmlspecialchars} - {/loop} +
+
+ {loop="tags"} + {$value.count}{$key|htmlspecialchars} + {/loop} +
-
{include="page.footer"} From fe16b01edb80ac2f2212125fadba8358dff91b95 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 8 Jan 2015 15:09:46 +0100 Subject: [PATCH 044/658] * removed the language attribute on the script element since it is obsolete and we can safely omit it. * make QRCode JS works with IE : * behave as a normal link if canvas aren't supported (<=IE8) * default parameter values in JS aren't widely supported (see: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Default_parameters ), use this method instead: http://stackoverflow.com/a/148918/1484919 * dataset isn't supported in IE9 use getAttribute instead * addEventListener works with IE9+ and other browsers --- index.php | 30 +++++++++++++++--------------- tpl/changetag.html | 4 ++-- tpl/editlink.html | 2 +- tpl/linklist.html | 20 ++++++++++++++------ 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/index.php b/index.php index e50c018..4cb25ab 100644 --- a/index.php +++ b/index.php @@ -430,7 +430,7 @@ if (isset($_POST['login'])) ban_loginFailed(); $redir = ''; if (isset($_GET['post'])) { $redir = '&post='.urlencode($_GET['post']).(!empty($_GET['title'])?'&title='.urlencode($_GET['title']):'').(!empty($_GET['description'])?'&description='.urlencode($_GET['description']):'').(!empty($_GET['source'])?'&source='.urlencode($_GET['source']):''); } - echo ''; // Redirect to login screen. + echo ''; // Redirect to login screen. exit; } } @@ -1387,12 +1387,12 @@ function renderPage() // Make sure old password is correct. $oldhash = sha1($_POST['oldpassword'].$GLOBALS['login'].$GLOBALS['salt']); - if ($oldhash!=$GLOBALS['hash']) { echo ''; exit; } + 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 ''; + echo ''; exit; } else // show the change password form. @@ -1423,7 +1423,7 @@ function renderPage() $GLOBALS['disablejquery']=!empty($_POST['disablejquery']); $GLOBALS['privateLinkByDefault']=!empty($_POST['privateLinkByDefault']); writeConfig(); - echo ''; + echo ''; exit; } else // Show the configuration form. @@ -1467,7 +1467,7 @@ function renderPage() $LINKSDB[$key]=$value; } $LINKSDB->savedb(); // Save to disk. - echo ''; + echo ''; exit; } @@ -1484,7 +1484,7 @@ function renderPage() $LINKSDB[$key]=$value; } $LINKSDB->savedb(); // Save to disk. - echo ''; + echo ''; exit; } } @@ -1515,7 +1515,7 @@ function renderPage() pubsubhub(); // If we are called from the bookmarklet, we must close the popup: - if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo ''; exit; } + if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo ''; exit; } $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' ); $returnurl .= '#'.smallHash($linkdate); // Scroll to the link which has been edited. header('Location: '.$returnurl); // After saving the link, redirect to the page the user was on. @@ -1526,7 +1526,7 @@ function renderPage() if (isset($_POST['cancel_edit'])) { // If we are called from the bookmarklet, we must close the popup: - if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo ''; exit; } + if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo ''; exit; } $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' ); $returnurl .= '#'.smallHash($_POST['lf_linkdate']); // Scroll to the link which has been edited. header('Location: '.$returnurl); // After canceling, redirect to the page the user was on. @@ -1545,7 +1545,7 @@ function renderPage() $LINKSDB->savedb(); // save to disk // If we are called from the bookmarklet, we must close the popup: - if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo ''; exit; } + if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo ''; exit; } header('Location: ?'); // After deleting the link, redirect to the home page. exit; } @@ -1681,7 +1681,7 @@ HTML; if (!isset($_POST['token']) || (!isset($_FILES)) || (isset($_FILES['filetoupload']['size']) && $_FILES['filetoupload']['size']==0)) { $returnurl = ( empty($_SERVER['HTTP_REFERER']) ? '?' : $_SERVER['HTTP_REFERER'] ); - echo ''; + echo ''; exit; } if (!tokenOk($_POST['token'])) die('Wrong token.'); @@ -1785,11 +1785,11 @@ function importFile() } $LINKSDB->savedb(); - echo ''; + echo ''; } else { - echo ''; + echo ''; } } @@ -2123,7 +2123,7 @@ function install() $GLOBALS['hash'] = sha1($_POST['setpassword'].$GLOBALS['login'].$GLOBALS['salt']); $GLOBALS['title'] = (empty($_POST['title']) ? 'Shared links on '.htmlspecialchars(indexUrl()) : $_POST['title'] ); writeConfig(); - echo ''; + echo ''; exit; } @@ -2177,7 +2177,7 @@ function templateTZform($ptz=false) $cities_html = $cities[$pcontinent]; $timezone_form = "Continent: "; $timezone_form .= "    City:
"; - $timezone_js = "" ; @@ -2292,7 +2292,7 @@ function writeConfig() $config .= ' ?>'; if (!file_put_contents($GLOBALS['config']['CONFIG_FILE'],$config) || strcmp(file_get_contents($GLOBALS['config']['CONFIG_FILE']),$config)!=0) { - echo ''; + echo ''; exit; } } diff --git a/tpl/changetag.html b/tpl/changetag.html index 79fea9a..fdfb0b3 100644 --- a/tpl/changetag.html +++ b/tpl/changetag.html @@ -12,11 +12,11 @@   or 
(Case sensitive) - +
{include="page.footer"} {if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"} -{/if} +{if="empty($GLOBALS['disablejquery'])"}{/if} {include="includes"} {if="empty($GLOBALS['disablejquery'])"} - - - + + + {/if} From 5a2cbde945e5729bef59c0c45a0da22fbbd092b3 Mon Sep 17 00:00:00 2001 From: Florian Eula Date: Tue, 27 Jan 2015 12:17:56 +0100 Subject: [PATCH 049/658] Fixed license info, reverted qr.js to GPL Added full GPLv3 and CC-BY license I also accidentally declared qr.js as MIT and CC-BY, when it was GPLv3. I don't even. --- COPYING | 522 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 510 insertions(+), 12 deletions(-) diff --git a/COPYING b/COPYING index ea6ed40..b39cd64 100644 --- a/COPYING +++ b/COPYING @@ -49,7 +49,7 @@ License: MIT License (http://opensource.org/licenses/MIT) Copyright: (C) Mika Tuupola, https://github.com/tuupola Files: inc/qr.js -License: MIT License (http://opensource.org/licenses/MIT), Creative Commons +License: GPLv3 License (http://opensource.org/licenses/gpl-3.0) Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com, https://github.com/neocotic/qr.js ---------------------------------------------------- @@ -76,18 +76,193 @@ freely, subject to the following restrictions: ---------------------------------------------------- GPLv3 LICENSE -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +GNU GENERAL PUBLIC LICENSE -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Version 3, 29 June 2007 -You should have received a copy of the GNU General Public License -along with this program. If not, see . +Copyright (C) 2007 Free Software Foundation, Inc. + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. +Preamble + +The GNU General Public License is a free, copyleft license for software and other kinds of works. + +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. + +To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. + +Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. + +Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. + +The precise terms and conditions for copying, distribution and modification follow. +TERMS AND CONDITIONS +0. Definitions. + +“This License” refers to version 3 of the GNU General Public License. + +“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. + +“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. + +To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. + +A “covered work” means either the unmodified Program or a work based on the Program. + +To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. + +To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. + +An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. +1. Source Code. + +The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. + +A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. + +The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. + +The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same work. +2. Basic Permissions. + +All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. +3. Protecting Users' Legal Rights From Anti-Circumvention Law. + +No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. + +When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. +4. Conveying Verbatim Copies. + +You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. +5. Conveying Modified Source Versions. + +You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified it, and giving a relevant date. + b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. + c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. + d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. + +A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. +6. Conveying Non-Source Forms. + +You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: + + a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. + b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. + c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. + d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. + e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. + +A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. + +“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. + +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). + +The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. + +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. +7. Additional Terms. + +“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or + b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or + c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or + d) Limiting the use for publicity purposes of names of licensors or authors of the material; or + e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or + f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. + +All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. +8. Termination. + +You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). + +However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. + +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. + +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. +9. Acceptance Not Required for Having Copies. + +You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. +10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. + +An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. +11. Patents. + +A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. + +A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. + +In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. + +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. + +A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. +12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. +13. Use with the GNU Affero General Public License. + +Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. +14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. + +Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. +15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. ---------------------------------------------------- MIT LICENSE @@ -108,4 +283,327 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file +THE SOFTWARE. + +---------------------------------------------------- +Creative Commons License (CC-BY 3.0) +Creative Commons Legal Code + +Attribution 3.0 Unported + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR + DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE +COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY +COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE +TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY +BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS +CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND +CONDITIONS. + +1. Definitions + + a. "Adaptation" means a work based upon the Work, or upon the Work and + other pre-existing works, such as a translation, adaptation, + derivative work, arrangement of music or other alterations of a + literary or artistic work, or phonogram or performance and includes + cinematographic adaptations or any other form in which the Work may be + recast, transformed, or adapted including in any form recognizably + derived from the original, except that a work that constitutes a + Collection will not be considered an Adaptation for the purpose of + this License. For the avoidance of doubt, where the Work is a musical + work, performance or phonogram, the synchronization of the Work in + timed-relation with a moving image ("synching") will be considered an + Adaptation for the purpose of this License. + b. "Collection" means a collection of literary or artistic works, such as + encyclopedias and anthologies, or performances, phonograms or + broadcasts, or other works or subject matter other than works listed + in Section 1(f) below, which, by reason of the selection and + arrangement of their contents, constitute intellectual creations, in + which the Work is included in its entirety in unmodified form along + with one or more other contributions, each constituting separate and + independent works in themselves, which together are assembled into a + collective whole. A work that constitutes a Collection will not be + considered an Adaptation (as defined above) for the purposes of this + License. + c. "Distribute" means to make available to the public the original and + copies of the Work or Adaptation, as appropriate, through sale or + other transfer of ownership. + d. "Licensor" means the individual, individuals, entity or entities that + offer(s) the Work under the terms of this License. + e. "Original Author" means, in the case of a literary or artistic work, + the individual, individuals, entity or entities who created the Work + or if no individual or entity can be identified, the publisher; and in + addition (i) in the case of a performance the actors, singers, + musicians, dancers, and other persons who act, sing, deliver, declaim, + play in, interpret or otherwise perform literary or artistic works or + expressions of folklore; (ii) in the case of a phonogram the producer + being the person or legal entity who first fixes the sounds of a + performance or other sounds; and, (iii) in the case of broadcasts, the + organization that transmits the broadcast. + f. "Work" means the literary and/or artistic work offered under the terms + of this License including without limitation any production in the + literary, scientific and artistic domain, whatever may be the mode or + form of its expression including digital form, such as a book, + pamphlet and other writing; a lecture, address, sermon or other work + of the same nature; a dramatic or dramatico-musical work; a + choreographic work or entertainment in dumb show; a musical + composition with or without words; a cinematographic work to which are + assimilated works expressed by a process analogous to cinematography; + a work of drawing, painting, architecture, sculpture, engraving or + lithography; a photographic work to which are assimilated works + expressed by a process analogous to photography; a work of applied + art; an illustration, map, plan, sketch or three-dimensional work + relative to geography, topography, architecture or science; a + performance; a broadcast; a phonogram; a compilation of data to the + extent it is protected as a copyrightable work; or a work performed by + a variety or circus performer to the extent it is not otherwise + considered a literary or artistic work. + g. "You" means an individual or entity exercising rights under this + License who has not previously violated the terms of this License with + respect to the Work, or who has received express permission from the + Licensor to exercise rights under this License despite a previous + violation. + h. "Publicly Perform" means to perform public recitations of the Work and + to communicate to the public those public recitations, by any means or + process, including by wire or wireless means or public digital + performances; to make available to the public Works in such a way that + members of the public may access these Works from a place and at a + place individually chosen by them; to perform the Work to the public + by any means or process and the communication to the public of the + performances of the Work, including by public digital performance; to + broadcast and rebroadcast the Work by any means including signs, + sounds or images. + i. "Reproduce" means to make copies of the Work by any means including + without limitation by sound or visual recordings and the right of + fixation and reproducing fixations of the Work, including storage of a + protected performance or phonogram in digital form or other electronic + medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, +limit, or restrict any uses free from copyright or rights arising from +limitations or exceptions that are provided for in connection with the +copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, +Licensor hereby grants You a worldwide, royalty-free, non-exclusive, +perpetual (for the duration of the applicable copyright) license to +exercise the rights in the Work as stated below: + + a. to Reproduce the Work, to incorporate the Work into one or more + Collections, and to Reproduce the Work as incorporated in the + Collections; + b. to create and Reproduce Adaptations provided that any such Adaptation, + including any translation in any medium, takes reasonable steps to + clearly label, demarcate or otherwise identify that changes were made + to the original Work. For example, a translation could be marked "The + original work was translated from English to Spanish," or a + modification could indicate "The original work has been modified."; + c. to Distribute and Publicly Perform the Work including as incorporated + in Collections; and, + d. to Distribute and Publicly Perform Adaptations. + e. For the avoidance of doubt: + + i. Non-waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme cannot be waived, the Licensor + reserves the exclusive right to collect such royalties for any + exercise by You of the rights granted under this License; + ii. Waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme can be waived, the Licensor waives the + exclusive right to collect such royalties for any exercise by You + of the rights granted under this License; and, + iii. Voluntary License Schemes. The Licensor waives the right to + collect royalties, whether individually or, in the event that the + Licensor is a member of a collecting society that administers + voluntary licensing schemes, via that society, from any exercise + by You of the rights granted under this License. + +The above rights may be exercised in all media and formats whether now +known or hereafter devised. The above rights include the right to make +such modifications as are technically necessary to exercise the rights in +other media and formats. Subject to Section 8(f), all rights not expressly +granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made +subject to and limited by the following restrictions: + + a. You may Distribute or Publicly Perform the Work only under the terms + of this License. You must include a copy of, or the Uniform Resource + Identifier (URI) for, this License with every copy of the Work You + Distribute or Publicly Perform. You may not offer or impose any terms + on the Work that restrict the terms of this License or the ability of + the recipient of the Work to exercise the rights granted to that + recipient under the terms of the License. You may not sublicense the + Work. You must keep intact all notices that refer to this License and + to the disclaimer of warranties with every copy of the Work You + Distribute or Publicly Perform. When You Distribute or Publicly + Perform the Work, You may not impose any effective technological + measures on the Work that restrict the ability of a recipient of the + Work from You to exercise the rights granted to that recipient under + the terms of the License. This Section 4(a) applies to the Work as + incorporated in a Collection, but this does not require the Collection + apart from the Work itself to be made subject to the terms of this + License. If You create a Collection, upon notice from any Licensor You + must, to the extent practicable, remove from the Collection any credit + as required by Section 4(b), as requested. If You create an + Adaptation, upon notice from any Licensor You must, to the extent + practicable, remove from the Adaptation any credit as required by + Section 4(b), as requested. + b. If You Distribute, or Publicly Perform the Work or any Adaptations or + Collections, You must, unless a request has been made pursuant to + Section 4(a), keep intact all copyright notices for the Work and + provide, reasonable to the medium or means You are utilizing: (i) the + name of the Original Author (or pseudonym, if applicable) if supplied, + and/or if the Original Author and/or Licensor designate another party + or parties (e.g., a sponsor institute, publishing entity, journal) for + attribution ("Attribution Parties") in Licensor's copyright notice, + terms of service or by other reasonable means, the name of such party + or parties; (ii) the title of the Work if supplied; (iii) to the + extent reasonably practicable, the URI, if any, that Licensor + specifies to be associated with the Work, unless such URI does not + refer to the copyright notice or licensing information for the Work; + and (iv) , consistent with Section 3(b), in the case of an Adaptation, + a credit identifying the use of the Work in the Adaptation (e.g., + "French translation of the Work by Original Author," or "Screenplay + based on original Work by Original Author"). The credit required by + this Section 4 (b) may be implemented in any reasonable manner; + provided, however, that in the case of a Adaptation or Collection, at + a minimum such credit will appear, if a credit for all contributing + authors of the Adaptation or Collection appears, then as part of these + credits and in a manner at least as prominent as the credits for the + other contributing authors. For the avoidance of doubt, You may only + use the credit required by this Section for the purpose of attribution + in the manner set out above and, by exercising Your rights under this + License, You may not implicitly or explicitly assert or imply any + connection with, sponsorship or endorsement by the Original Author, + Licensor and/or Attribution Parties, as appropriate, of You or Your + use of the Work, without the separate, express prior written + permission of the Original Author, Licensor and/or Attribution + Parties. + c. Except as otherwise agreed in writing by the Licensor or as may be + otherwise permitted by applicable law, if You Reproduce, Distribute or + Publicly Perform the Work either by itself or as part of any + Adaptations or Collections, You must not distort, mutilate, modify or + take other derogatory action in relation to the Work which would be + prejudicial to the Original Author's honor or reputation. Licensor + agrees that in those jurisdictions (e.g. Japan), in which any exercise + of the right granted in Section 3(b) of this License (the right to + make Adaptations) would be deemed to be a distortion, mutilation, + modification or other derogatory action prejudicial to the Original + Author's honor and reputation, the Licensor will waive or not assert, + as appropriate, this Section, to the fullest extent permitted by the + applicable national law, to enable You to reasonably exercise Your + right under Section 3(b) of this License (right to make Adaptations) + but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR +OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY +KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, +INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF +LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, +WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION +OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE +LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR +ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES +ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + a. This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this License. + Individuals or entities who have received Adaptations or Collections + from You under this License, however, will not have their licenses + terminated provided such individuals or entities remain in full + compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will + survive any termination of this License. + b. Subject to the above terms and conditions, the license granted here is + perpetual (for the duration of the applicable copyright in the Work). + Notwithstanding the above, Licensor reserves the right to release the + Work under different license terms or to stop distributing the Work at + any time; provided, however that any such election will not serve to + withdraw this License (or any other license that has been, or is + required to be, granted under the terms of this License), and this + License will continue in full force and effect unless terminated as + stated above. + +8. Miscellaneous + + a. Each time You Distribute or Publicly Perform the Work or a Collection, + the Licensor offers to the recipient a license to the Work on the same + terms and conditions as the license granted to You under this License. + b. Each time You Distribute or Publicly Perform an Adaptation, Licensor + offers to the recipient a license to the original Work on the same + terms and conditions as the license granted to You under this License. + c. If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this License, and without further action + by the parties to this agreement, such provision shall be reformed to + the minimum extent necessary to make such provision valid and + enforceable. + d. No term or provision of this License shall be deemed waived and no + breach consented to unless such waiver or consent shall be in writing + and signed by the party to be charged with such waiver or consent. + e. This License constitutes the entire agreement between the parties with + respect to the Work licensed here. There are no understandings, + agreements or representations with respect to the Work not specified + here. Licensor shall not be bound by any additional provisions that + may appear in any communication from You. This License may not be + modified without the mutual written agreement of the Licensor and You. + f. The rights granted under, and the subject matter referenced, in this + License were drafted utilizing the terminology of the Berne Convention + for the Protection of Literary and Artistic Works (as amended on + September 28, 1979), the Rome Convention of 1961, the WIPO Copyright + Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 + and the Universal Copyright Convention (as revised on July 24, 1971). + These rights and subject matter take effect in the relevant + jurisdiction in which the License terms are sought to be enforced + according to the corresponding provisions of the implementation of + those treaty provisions in the applicable national law. If the + standard suite of rights granted under applicable copyright law + includes additional rights not granted under this License, such + additional rights are deemed to be included in the License; this + License is not intended to restrict the license of any rights under + applicable law. + + +Creative Commons Notice + + Creative Commons is not a party to this License, and makes no warranty + whatsoever in connection with the Work. Creative Commons will not be + liable to You or any party on any legal theory for any damages + whatsoever, including without limitation any general, special, + incidental or consequential damages arising in connection to this + license. Notwithstanding the foregoing two (2) sentences, if Creative + Commons has expressly identified itself as the Licensor hereunder, it + shall have all rights and obligations of Licensor. + + Except for the limited purpose of indicating to the public that the + Work is licensed under the CCPL, Creative Commons does not authorize + the use by either party of the trademark "Creative Commons" or any + related trademark or logo of Creative Commons without the prior + written consent of Creative Commons. Any permitted use will be in + compliance with Creative Commons' then-current trademark usage + guidelines, as may be published on its website or otherwise made + available upon request from time to time. For the avoidance of doubt, + this trademark restriction does not form part of this License. + + Creative Commons may be contacted at https://creativecommons.org/. + From ed5b38ddd249c0e50eec7e06e74c9d1c2e864dab Mon Sep 17 00:00:00 2001 From: Florian Eula Date: Fri, 21 Nov 2014 21:31:21 +0100 Subject: [PATCH 050/658] Feature: enable/disable permalinks for RSS The option to see the shortlinks or permalinks has been added to the configuration panel. It is a simple checkbox This option is disabled by default (meaning that shortlinks are the default) Updated writeConfig() to save this option Also fixed a slight typo in config.html. Removed useless CSS & fixed a comment Enabled permalinks for the ATOM feed and fixed the isPermaLink attribute for the tag Reverted to default behavior and clarified its meaning EnableRssPermalinks is an oddly behaving option: when enabled, it shows a permalink in the description and a full link in the element title, and swaps it around when disabled. This clarifies the option for end-users Also, moved enable_rss_permalinks to $GLOBALS['config'] because it is a config option. fix indent --- inc/shaarli.css | 4 ++++ index.php | 12 ++++++++---- tpl/configure.html | 12 +++++++++--- tpl/tools.html | 12 ++++++------ 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/inc/shaarli.css b/inc/shaarli.css index 325515e..f6e580b 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -1039,6 +1039,10 @@ div.dailyNoEntry { } } +#toolsdiv a.button-description { + clear: none; +} + /* Highlight search results */ .highlight { background-color: #FFFF33; diff --git a/index.php b/index.php index d48e388..818fa68 100644 --- a/index.php +++ b/index.php @@ -11,7 +11,7 @@ date_default_timezone_set('UTC'); // ----------------------------------------------------------------------------------------------- -// Hardcoded parameter (These parameters can be overwritten by creating the file /config/options.php) +// Hardcoded parameter (These parameters can be overwritten by creating the file /data/options.php) $GLOBALS['config']['DATADIR'] = 'data'; // Data subdirectory $GLOBALS['config']['CONFIG_FILE'] = $GLOBALS['config']['DATADIR'].'/config.php'; // Configuration file (user login/password) $GLOBALS['config']['DATASTORE'] = $GLOBALS['config']['DATADIR'].'/datastore.php'; // Data storage file. @@ -33,6 +33,7 @@ $GLOBALS['config']['UPDATECHECK_FILENAME'] = $GLOBALS['config']['DATADIR'].'/las $GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400 ; // Updates check frequency for Shaarli. 86400 seconds=24 hours // Note: You must have publisher.php in the same directory as Shaarli index.php $GLOBALS['config']['ARCHIVE_ORG'] = false; // For each link, add a link to an archived version on archive.org +$GLOBALS['config']['ENABLE_RSS_PERMALINKS'] = true; // Enable RSS permalinks by default. This corresponds to the default behavior of shaarli before this was added as an option. // ----------------------------------------------------------------------------------------------- // You should not touch below (or at your own risks!) // Optional config file. @@ -894,7 +895,8 @@ function showRSS() // $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 - $usepermalinks = isset($_GET['permalinks']); + // Also enabled through a config option + $usepermalinks = isset($_GET['permalinks']) || !$GLOBALS['config']['ENABLE_RSS_PERMALINKS']; // Cache system $query = $_SERVER["QUERY_STRING"]; @@ -936,7 +938,7 @@ function showRSS() $absurl = htmlspecialchars($link['url']); if (startsWith($absurl,'?')) $absurl=$pageaddr.$absurl; // make permalink URL absolute if ($usepermalinks===true) - echo ''.htmlspecialchars($link['title']).''.$guid.''.$guid.''; + echo ''.htmlspecialchars($link['title']).''.$guid.''.$guid.''; else echo ''.htmlspecialchars($link['title']).''.$guid.''.$absurl.''; if (!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()) echo ''.htmlspecialchars($rfc822date)."\n"; @@ -968,7 +970,7 @@ function showATOM() // $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']); + $usepermalinks = isset($_GET['permalinks']) || !$GLOBALS['config']['ENABLE_RSS_PERMALINKS']; // Cache system $query = $_SERVER["QUERY_STRING"]; @@ -1423,6 +1425,7 @@ function renderPage() $GLOBALS['disablesessionprotection']=!empty($_POST['disablesessionprotection']); $GLOBALS['disablejquery']=!empty($_POST['disablejquery']); $GLOBALS['privateLinkByDefault']=!empty($_POST['privateLinkByDefault']); + $GLOBALS['config']['ENABLE_RSS_PERMALINKS']= !empty($_POST['enableRssPermalinks']); writeConfig(); echo ''; exit; @@ -2290,6 +2293,7 @@ function writeConfig() $config .= '$GLOBALS[\'disablesessionprotection\']='.var_export($GLOBALS['disablesessionprotection'],true).'; '; $config .= '$GLOBALS[\'disablejquery\']='.var_export($GLOBALS['disablejquery'],true).'; '; $config .= '$GLOBALS[\'privateLinkByDefault\']='.var_export($GLOBALS['privateLinkByDefault'],true).'; '; + $config .= '$GLOBALS[\'config\'][\'ENABLE_RSS_PERMALINKS\']='.var_export($GLOBALS['config']['ENABLE_RSS_PERMALINKS'], true).'; '; $config .= ' ?>'; if (!file_put_contents($GLOBALS['config']['CONFIG_FILE'],$config) || strcmp(file_get_contents($GLOBALS['config']['CONFIG_FILE']),$config)!=0) { diff --git a/tpl/configure.html b/tpl/configure.html index 89e48bd..c096018 100644 --- a/tpl/configure.html +++ b/tpl/configure.html @@ -21,8 +21,14 @@ Features: - New link: - + New link: + + + + Enable RSS Permalinks + + + @@ -30,4 +36,4 @@
{include="page.footer"} - \ No newline at end of file + diff --git a/tpl/tools.html b/tpl/tools.html index c2520fd..bf0539b 100644 --- a/tpl/tools.html +++ b/tpl/tools.html @@ -6,12 +6,12 @@ {include="page.header"}
{include="page.footer"} From e6ea0f9653937bcac38b6ae5b834c93e1e0fafe4 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 17 Dec 2014 07:47:43 +0100 Subject: [PATCH 051/658] Update README and Shaarli's footer * remove version number display from main page * update project URL in footer, fixes https://github.com/shaarli/Shaarli/issues/89 * update copyright notice in the footer * mention origins of the fork in README, fixes https://github.com/shaarli/Shaarli/issues/105 * update License section in the README * remove screenshots as mediacru.sh is down --- README.md | 20 ++++++++++++-------- tpl/page.footer.html | 4 ++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d074378..6b5086f 100644 --- a/README.md +++ b/README.md @@ -41,12 +41,15 @@ It is designed to be personal (single-user), fast and handy. * You will be automatically notified by a discreet popup if a new version is available * **Shaarli is a bookmarking application, but you can use it for micro-blogging (like Twitter), a pastebin, an online notepad, a snippet repository, etc. See [Usage examples](https://github.com/shaarli/Shaarli/wiki#usage-examples)** + ## Links + * **[Wiki/documentation](https://github.com/shaarli/Shaarli/wiki)** * [Bugs/Feature requests/Discussion](https://github.com/shaarli/Shaarli/issues/) ## Installing + Shaarli requires php 5.1 * Download the latest stable release from https://github.com/shaarli/Shaarli/releases @@ -56,21 +59,22 @@ Shaarli requires php 5.1 _To get the development version, download https://github.com/shaarli/Shaarli/archive/master.zip or `git clone https://github.com/shaarli/Shaarli`_ + ## Upgrading + Delete all files and directories except the `data` directory, then unzip the new version of Shaarli. You will not lose your links and you will not have to reconfigure it. -## Screenshots - -[![](https://cdn.mediacru.sh/AjZc6-emICeO.png)](https://cdn.mediacru.sh/kE8SyD-PvGuC.png) [![](https://cdn.mediacru.sh/MfC-DzklMYs2.png)](https://cdn.mediacru.sh/iqTvO1-yP9pU.png) [![](https://cdn.mediacru.sh/dxmXskaubYcg.png)](https://cdn.mediacru.sh/mMoi31f94wdL.png) [![](https://cdn.mediacru.sh/-ptB2veFivBp.png)](https://cdn.mediacru.sh/GcoZPZmCZ-DR.png) [![](https://cdn.mediacru.sh/QmRdTAr8x427.png)](https://cdn.mediacru.sh/TDDujpMWT31q.png) ## About -Original Project page: http://sebsauvage.net/wiki/doku.php?id=php:shaarli -Shaarli is developed by [Sébastien SAUVAGE](http://sebsauvage.net) and [contributors](COPYING). - -Shaarli is [Free Software](https://en.wikipedia.org/wiki/Free_software) distributed under the [zlib/libpng License](http://www.gzip.org/zlib/zlib_license.html) - This friendly fork is maintained by the community at https://github.com/shaarli/Shaarli +This is a community fork of the original [Shaarli](https://github.com/sebsauvage/Shaarli/) project by [sebsauvage](http://sebsauvage.net/). The original project is currently unmaintained, and the developer [has informed us](https://github.com/sebsauvage/Shaarli/issues/191) that he would have no time to work on Shaarli in the near future. The Shaarli community has carried on the work to provide [many patches](https://github.com/shaarli/Shaarli/compare/sebsauvage:master...master) for [bug fixes and enhancements](https://github.com/shaarli/Shaarli/issues?q=is%3Aclosed+) in this repository, and will keep maintaining the project for the foreseeable future, while keeping Shaarli simple and efficient. If you'd like to help, have a look at the current [issues](https://github.com/shaarli/Shaarli/issues) and [pull requests](https://github.com/shaarli/Shaarli/pulls) and feel free to report bugs and feature requests, propose solutions to existing problems and send us pull requests. + + +## License + +Shaarli is [Free Software](http://en.wikipedia.org/wiki/Free_software). See [COPYING](COPYING) for a detail of the contributors and licenses for each individual component. + diff --git a/tpl/page.footer.html b/tpl/page.footer.html index e55a3cb..448e9f8 100644 --- a/tpl/page.footer.html +++ b/tpl/page.footer.html @@ -1,8 +1,8 @@ {if="$newversion"} -
● Shaarli {$newversion|htmlspecialchars} is available.
+
● Shaarli {$newversion|htmlspecialchars} is available.
{/if} {if="isLoggedIn()"} From a6e0134d07f7a77f1da97d9d563e339057ff8d54 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sat, 7 Feb 2015 20:19:27 +0100 Subject: [PATCH 052/658] Fix missing authors and licenses in COPYING * add idleman for original CSS * add yahoo inc. for CSS reset * split the main css code and the yahoo reset CSS in 2 files * add copyright information for RainTPL, add LGPL license --- COPYING | 198 +++++++++++++++++++++++++++++++++++++++++++++- inc/reset.css | 6 ++ inc/shaarli.css | 9 +-- tpl/includes.html | 1 + 4 files changed, 204 insertions(+), 10 deletions(-) create mode 100644 inc/reset.css diff --git a/COPYING b/COPYING index b39cd64..715ba35 100644 --- a/COPYING +++ b/COPYING @@ -15,8 +15,14 @@ Copyright: (c) 2011-2015 Sébastien SAUVAGE (c) 2011-2015 nodiscc (c) 2011-2015 Florian Eula (c) 2011-2015 Arthur Hoaro - (c) 2011-2015 virtualtam - (c) 2011-2015 qwertygc + (c) 2011-2015 virtualtam + (c) 2011-2015 qwertygc + (c) 2011-2015 idleman + + +Files: inc/reset.css +License: BSD (http://opensource.org/licenses/BSD-3-Clause) +Copyright: (c) 2010, Yahoo! Inc. Files: images/calendar.png, images/edit_icon.png, images/feed-icon-14x14.png, images/private.png, images/private_16x16.png, images/private_16x16_active.png, images/qrcode.png, images/tag_blue.png License: CC-BY (http://creativecommons.org/licenses/by/3.0/) @@ -52,6 +58,11 @@ Files: inc/qr.js License: GPLv3 License (http://opensource.org/licenses/gpl-3.0) Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com, https://github.com/neocotic/qr.js +Files: inc/rain.tpl.class.php +Copyright: 2011-2012, Federico Ulfo + 2011-2012, The Rain Team +License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt) + ---------------------------------------------------- ZLIB/LIBPNG LICENSE @@ -607,3 +618,186 @@ Creative Commons Notice Creative Commons may be contacted at https://creativecommons.org/. + + +---------------------------------------------------- +BSD License + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------ +LGPL License + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/inc/reset.css b/inc/reset.css new file mode 100644 index 0000000..e29699e --- /dev/null +++ b/inc/reset.css @@ -0,0 +1,6 @@ +/* CSS Reset from Yahoo to cope with browsers CSS inconsistencies. */ +/* + Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html + version: 2.8.2r1 + */ +html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;} \ No newline at end of file diff --git a/inc/shaarli.css b/inc/shaarli.css index f6e580b..bb564e9 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -1,11 +1,4 @@ -/* Cascading Stylesheet for Shaarli - http://sebsauvage.net/wiki/doku.php?id=php:shaarli */ - -/* CSS Reset from Yahoo to cope with browsers CSS inconsistencies. */ -/* - Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html - version: 2.8.2r1 - */ -html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;} +/* Cascading Stylesheet for Shaarli - https://github.com/shaarli/Shaarli */ body { font-family: "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif; diff --git a/tpl/includes.html b/tpl/includes.html index efc658e..53996fb 100644 --- a/tpl/includes.html +++ b/tpl/includes.html @@ -5,5 +5,6 @@ + {if="is_file('inc/user.css')"}{/if} From 225eff62a1f665ecdfdfc145bd81fc671d0961bb Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 17 Feb 2015 20:58:11 +0100 Subject: [PATCH 053/658] fix broken reset.css URL introduced in a6e0134 --- tpl/includes.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpl/includes.html b/tpl/includes.html index 53996fb..93cdfd5 100644 --- a/tpl/includes.html +++ b/tpl/includes.html @@ -5,6 +5,6 @@ - + {if="is_file('inc/user.css')"}{/if} From d528433d73bd0ad3eb3d7a9c26a40d68aca84aeb Mon Sep 17 00:00:00 2001 From: feula Date: Sun, 15 Feb 2015 02:24:26 +0100 Subject: [PATCH 054/658] redirect to previous search (if any) when deleting a link * Fixes https://github.com/shaarli/Shaarli/issues/110 --- index.php | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index 818fa68..3af3869 100644 --- a/index.php +++ b/index.php @@ -1550,7 +1550,37 @@ function renderPage() // If we are called from the bookmarklet, we must close the popup: if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo ''; exit; } - header('Location: ?'); // After deleting the link, redirect to the home page. + // Pick where we're going to redirect + // ============================================================= + // Basically, we can't redirect to where we were previously if it was a permalink + // or an edit_link, because it would 404. + // Cases: + // - / : nothing in $_GET, redirect to self + // - /?page : redirect to self + // - /?searchterm : redirect to self (there might be other links) + // - /?searchtags : redirect to self + // - /permalink : redirect to / (the link does not exist anymore) + // - /?edit_link : redirect to / (the link does not exist anymore) + // PHP treats the permalink as a $_GET variable, so we need to check if every condition for self + // redirect is not satisfied, and only then redirect to / + $location = "?"; + // Self redirection + if (count($_GET) == 0 || + isset($_GET['page']) || + isset($_GET['searchterm']) || + isset($_GET['searchtags'])) { + + if (isset($_POST['returnurl'])) { + $location = $_POST['returnurl']; // Handle redirects given by the form + } + + if ($location === "?" && + isset($_SERVER['HTTP_REFERER'])) { // Handle HTTP_REFERER in case we're not coming from the same place. + $location = $_SERVER['HTTP_REFERER']; + } + } + + header('Location: ' . $location); // After deleting the link, redirect to appropriate location exit; } From ff69d87ed95747beae3fc60d450fe79ddc21398e Mon Sep 17 00:00:00 2001 From: Florian Eula Date: Thu, 25 Dec 2014 14:00:50 +0100 Subject: [PATCH 055/658] Only verify login state at the beginning of the request. Moved login check into a function --- index.php | 79 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 22 deletions(-) diff --git a/index.php b/index.php index 3af3869..fdd9aec 100644 --- a/index.php +++ b/index.php @@ -113,6 +113,53 @@ define('STAY_SIGNED_IN_TOKEN', sha1($GLOBALS['hash'].$_SERVER["REMOTE_ADDR"].$GL autoLocale(); // Sniff browser language and set date format accordingly. header('Content-Type: text/html; charset=utf-8'); // We use UTF-8 for proper international characters handling. +//================================================================================================== +// Checking session state (i.e. is the user still logged in) +//================================================================================================== + +function setup_login_state() { + $userIsLoggedIn = false; // By default, we do not consider the user as logged in; + $loginFailure = false; // If set to true, every attempt to authenticate the user will fail. This indicates that an important condition isn't met. + if ($GLOBALS['config']['OPEN_SHAARLI']) { + $userIsLoggedIn = true; + } + if (!isset($GLOBALS['login'])) { + $userIsLoggedIn = false; // Shaarli is not configured yet. + $loginFailure = true; + } + if (isset($_COOKIE['shaarli_staySignedIn']) && + $_COOKIE['shaarli_staySignedIn']===STAY_SIGNED_IN_TOKEN && + !$loginFailure) + { + fillSessionInfo(); + $userIsLoggedIn = true; + } + // If session does not exist on server side, or IP address has changed, or session has expired, logout. + if (empty($_SESSION['uid']) || + ($GLOBALS['disablesessionprotection']==false && $_SESSION['ip']!=allIPs()) || + time() >= $_SESSION['expires_on']) + { + logout(); + $userIsLoggedIn = false; + $loginFailure = true; + } + 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. + } + if (!$loginFailure) { + $userIsLoggedIn = true; + } + + return $userIsLoggedIn; +} +//================================================================================================== +$userIsLoggedIn = setup_login_state(); +//================================================================================================== +//================================================================================================== + // Check PHP version function checkphpversion() { @@ -316,30 +363,19 @@ function check_auth($login,$password) // Returns true if the user is logged in. function isLoggedIn() { - if ($GLOBALS['config']['OPEN_SHAARLI']) return true; - - if (!isset($GLOBALS['login'])) return false; // Shaarli is not configured yet. - - if (@$_COOKIE['shaarli_staySignedIn']===STAY_SIGNED_IN_TOKEN) - { - fillSessionInfo(); - return true; - } - // If session does not exist on server side, or IP address has changed, or session has expired, logout. - if (empty($_SESSION['uid']) || ($GLOBALS['disablesessionprotection']==false && $_SESSION['ip']!=allIPs()) || time()>=$_SESSION['expires_on']) - { - logout(); - return false; - } - 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; + global $userIsLoggedIn; + return $userIsLoggedIn; } // Force logout. -function logout() { if (isset($_SESSION)) { unset($_SESSION['uid']); unset($_SESSION['ip']); unset($_SESSION['username']); unset($_SESSION['privateonly']); } -setcookie('shaarli_staySignedIn', FALSE, 0, WEB_PATH); +function logout() { + if (isset($_SESSION)) { + unset($_SESSION['uid']); + unset($_SESSION['ip']); + unset($_SESSION['username']); + unset($_SESSION['privateonly']); + } + setcookie('shaarli_staySignedIn', FALSE, 0, WEB_PATH); } @@ -2074,7 +2110,6 @@ function thumbnail($url,$href=false) 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...) From 6e838176a1413ce09a4d6630f8438072af9f8fce Mon Sep 17 00:00:00 2001 From: Emilien Klein Date: Thu, 19 Feb 2015 12:05:18 +0100 Subject: [PATCH 056/658] Added Gitter badge (Fixes #116) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6b5086f..0397621 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ Shaarli, the personal, minimalist, super-fast, no-database delicious clone. You want to share the links you discover ? Shaarli is a minimalist delicious clone you can install on your own website. It is designed to be personal (single-user), fast and handy. +[![Join the chat at https://gitter.im/shaarli/Shaarli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/shaarli/Shaarli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ## Features: From be3f0b4ec361f63a6fa4ed8291c912c9a426cd16 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Fri, 20 Feb 2015 19:41:53 +0100 Subject: [PATCH 057/658] bump version to 0.0.43beta --- index.php | 4 ++-- shaarli_version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index fdd9aec..dfebdca 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,5 @@ '); // Suffix to encapsulate data in PHP code. // http://server.com/x/shaarli --> /shaarli/ diff --git a/shaarli_version.txt b/shaarli_version.txt index 5404909..b6cffb3 100644 --- a/shaarli_version.txt +++ b/shaarli_version.txt @@ -1 +1 @@ -0.0.42 beta +0.0.43beta From f81139c9b22acb10be803165604a58f821be8f76 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 20 Feb 2015 21:46:21 +0100 Subject: [PATCH 058/658] Fixes shaarli/Shaarli#46: allow 'javascript:' links sharing --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index dfebdca..c87b944 100644 --- a/index.php +++ b/index.php @@ -1545,7 +1545,7 @@ function renderPage() $tags = trim(preg_replace('/\s\s+/',' ', $_POST['lf_tags'])); // Remove multiple spaces. $linkdate=$_POST['lf_linkdate']; $url = trim($_POST['lf_url']); - if (!startsWith($url,'http:') && !startsWith($url,'https:') && !startsWith($url,'ftp:') && !startsWith($url,'magnet:') && !startsWith($url,'?')) + if (!startsWith($url,'http:') && !startsWith($url,'https:') && !startsWith($url,'ftp:') && !startsWith($url,'magnet:') && !startsWith($url,'?') && !startsWith($url,'javascript:')) $url = 'http://'.$url; $link = array('title'=>trim($_POST['lf_title']),'url'=>$url,'description'=>trim($_POST['lf_description']),'private'=>(isset($_POST['lf_private']) ? 1 : 0), 'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags)); From 329e0768792b4fd22e548c0e1c4153aec3d6bcd1 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 20 Feb 2015 22:28:10 +0100 Subject: [PATCH 059/658] shaarli/Shaarli#34: Make update check optional * Add a check box at installation (checked by default) * Add a check box in configuration page --- index.php | 4 ++++ tpl/configure.html | 4 ++++ tpl/install.html | 25 ++++++++++++++----------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/index.php b/index.php index dfebdca..9d4ce15 100644 --- a/index.php +++ b/index.php @@ -178,6 +178,7 @@ function checkphpversion() function checkUpdate() { if (!isLoggedIn()) return ''; // Do not check versions for visitors. + if (empty($GLOBALS['config']['ENABLE_UPDATECHECK'])) return ''; // Do not check if the user doesn't want to. // Get latest version number at most once a day. if (!is_file($GLOBALS['config']['UPDATECHECK_FILENAME']) || (filemtime($GLOBALS['config']['UPDATECHECK_FILENAME'])alert("Configuration was saved.");document.location=\'?do=tools\';'; exit; @@ -2191,6 +2193,7 @@ function install() $GLOBALS['salt'] = sha1(uniqid('',true).'_'.mt_rand()); // Salt renders rainbow-tables attacks useless. $GLOBALS['hash'] = sha1($_POST['setpassword'].$GLOBALS['login'].$GLOBALS['salt']); $GLOBALS['title'] = (empty($_POST['title']) ? 'Shared links on '.htmlspecialchars(indexUrl()) : $_POST['title'] ); + $GLOBALS['config']['ENABLE_UPDATECHECK'] = !empty($_POST['updateCheck']); writeConfig(); echo ''; exit; @@ -2359,6 +2362,7 @@ function writeConfig() $config .= '$GLOBALS[\'disablejquery\']='.var_export($GLOBALS['disablejquery'],true).'; '; $config .= '$GLOBALS[\'privateLinkByDefault\']='.var_export($GLOBALS['privateLinkByDefault'],true).'; '; $config .= '$GLOBALS[\'config\'][\'ENABLE_RSS_PERMALINKS\']='.var_export($GLOBALS['config']['ENABLE_RSS_PERMALINKS'], true).'; '; + $config .= '$GLOBALS[\'config\'][\'ENABLE_UPDATECHECK\']='.var_export($GLOBALS['config']['ENABLE_UPDATECHECK'], true).'; '; $config .= ' ?>'; if (!file_put_contents($GLOBALS['config']['CONFIG_FILE'],$config) || strcmp(file_get_contents($GLOBALS['config']['CONFIG_FILE']),$config)!=0) { diff --git a/tpl/configure.html b/tpl/configure.html index c096018..887be32 100644 --- a/tpl/configure.html +++ b/tpl/configure.html @@ -29,6 +29,10 @@ + + Update: + + diff --git a/tpl/install.html b/tpl/install.html index df42bf6..88eb540 100644 --- a/tpl/install.html +++ b/tpl/install.html @@ -3,17 +3,20 @@ {include="includes"}{$timezone_js}
-

Shaarli

-It looks like it's the first time you run Shaarli. Please configure it:
-
- - - -{$timezone_html} - - -
Login:
Password:
Page title:
-
+

Shaarli

+ It looks like it's the first time you run Shaarli. Please configure it:
+
+ + + + {$timezone_html} + + + + +
Login:
Password:
Page title:
Update: +
+
{include="page.footer"} From dbcad7406eedaeba259a6e1584ba3b0823115c8d Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 25 Feb 2015 13:25:45 +0100 Subject: [PATCH 060/658] Prevent visitors from reading shaarli version * fixes https://github.com/shaarli/Shaarli/issues/122 * the shaarli version is now in a php comment block, which prevents visitors from reading it when it is place on a PHP-enabled server, but still allows the update mechanism to read it from the source on github. --- index.php | 4 ++-- shaarli_version.php | 1 + shaarli_version.txt | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 shaarli_version.php delete mode 100644 shaarli_version.txt diff --git a/index.php b/index.php index 9d4ce15..99c3765 100644 --- a/index.php +++ b/index.php @@ -184,8 +184,8 @@ function checkUpdate() if (!is_file($GLOBALS['config']['UPDATECHECK_FILENAME']) || (filemtime($GLOBALS['config']['UPDATECHECK_FILENAME'])','',str_replace(' diff --git a/shaarli_version.txt b/shaarli_version.txt deleted file mode 100644 index b6cffb3..0000000 --- a/shaarli_version.txt +++ /dev/null @@ -1 +0,0 @@ -0.0.43beta From 34047d23fb5e09b6bc2728f0f8827eaa038f02ea Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 1 Mar 2015 10:47:01 +0100 Subject: [PATCH 061/658] Lazy load images with the light lib bLazy.js instead of jQuery: * Remove jquery.lazyload lib * Add blazy lib * Add a bit of CSS animation * Delete unused picwall2 template --- COPYING | 4 +- inc/blazy-1.3.1.js | 232 +++++++++++++++++++++++++++++ inc/blazy-1.3.1.min.js | 6 + inc/jquery.lazyload-1.9.3.js | 242 ------------------------------- inc/jquery.lazyload-1.9.3.min.js | 2 - inc/shaarli.css | 12 ++ index.php | 7 +- tpl/picwall.html | 12 +- tpl/picwall2.html | 19 --- 9 files changed, 256 insertions(+), 280 deletions(-) create mode 100644 inc/blazy-1.3.1.js create mode 100644 inc/blazy-1.3.1.min.js delete mode 100644 inc/jquery.lazyload-1.9.3.js delete mode 100644 inc/jquery.lazyload-1.9.3.min.js delete mode 100644 tpl/picwall2.html diff --git a/COPYING b/COPYING index 715ba35..ec4f768 100644 --- a/COPYING +++ b/COPYING @@ -50,9 +50,9 @@ Files: Files: inc/jquery*.js, inc/jquery-ui*.js License: MIT License (http://opensource.org/licenses/MIT) Copyright: (C) jQuery Foundation and other contributors,https://jquery.com/download/ -Files: inc/jquery-lazyload*.js +Files: inc/blazy*.js License: MIT License (http://opensource.org/licenses/MIT) -Copyright: (C) Mika Tuupola, https://github.com/tuupola +Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy Files: inc/qr.js License: GPLv3 License (http://opensource.org/licenses/gpl-3.0) diff --git a/inc/blazy-1.3.1.js b/inc/blazy-1.3.1.js new file mode 100644 index 0000000..cfc2dbd --- /dev/null +++ b/inc/blazy-1.3.1.js @@ -0,0 +1,232 @@ +/*! + hey, [be]Lazy.js - v1.3.1 - 2015.02.01 + A lazy loading and multi-serving image script + (c) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy +*/ +;(function(root, blazy) { + if (typeof define === 'function' && define.amd) { + // AMD. Register bLazy as an anonymous module + define(blazy); + } else if (typeof exports === 'object') { + // Node. Does not work with strict CommonJS, but + // only CommonJS-like environments that support module.exports, + // like Node. + module.exports = blazy(); + } else { + // Browser globals. Register bLazy on window + root.Blazy = blazy(); + } +})(this, function () { + 'use strict'; + + //vars + var source, options, viewport, images, count, isRetina, destroyed; + //throttle vars + var validateT, saveViewportOffsetT; + + // constructor + function Blazy(settings) { + //IE7- fallback for missing querySelectorAll support + if (!document.querySelectorAll) { + var s=document.createStyleSheet(); + document.querySelectorAll = function(r, c, i, j, a) { + a=document.all, c=[], r = r.replace(/\[for\b/gi, '[htmlFor').split(','); + for (i=r.length; i--;) { + s.addRule(r[i], 'k:v'); + for (j=a.length; j--;) a[j].currentStyle.k && c.push(a[j]); + s.removeRule(0); + } + return c; + }; + } + //init vars + destroyed = true; + images = []; + viewport = {}; + //options + options = settings || {}; + options.error = options.error || false; + options.offset = options.offset || 100; + options.success = options.success || false; + options.selector = options.selector || '.b-lazy'; + options.separator = options.separator || '|'; + options.container = options.container ? document.querySelectorAll(options.container) : false; + options.errorClass = options.errorClass || 'b-error'; + options.breakpoints = options.breakpoints || false; + options.successClass = options.successClass || 'b-loaded'; + options.src = source = options.src || 'data-src'; + isRetina = window.devicePixelRatio > 1; + viewport.top = 0 - options.offset; + viewport.left = 0 - options.offset; + //throttle, ensures that we don't call the functions too often + validateT = throttle(validate, 25); + saveViewportOffsetT = throttle(saveViewportOffset, 50); + + saveViewportOffset(); + + //handle multi-served image src + each(options.breakpoints, function(object){ + if(object.width >= window.screen.width) { + source = object.src; + return false; + } + }); + + // start lazy load + initialize(); + } + + /* public functions + ************************************/ + Blazy.prototype.revalidate = function() { + initialize(); + }; + Blazy.prototype.load = function(element, force){ + if(!isElementLoaded(element)) loadImage(element, force); + }; + Blazy.prototype.destroy = function(){ + if(options.container){ + each(options.container, function(object){ + unbindEvent(object, 'scroll', validateT); + }); + } + unbindEvent(window, 'scroll', validateT); + unbindEvent(window, 'resize', validateT); + unbindEvent(window, 'resize', saveViewportOffsetT); + count = 0; + images.length = 0; + destroyed = true; + }; + + /* private helper functions + ************************************/ + function initialize(){ + // First we create an array of images to lazy load + createImageArray(options.selector); + // Then we bind resize and scroll events if not already binded + if(destroyed) { + destroyed = false; + if(options.container) { + each(options.container, function(object){ + bindEvent(object, 'scroll', validateT); + }); + } + bindEvent(window, 'resize', saveViewportOffsetT); + bindEvent(window, 'resize', validateT); + bindEvent(window, 'scroll', validateT); + } + // And finally, we start to lazy load. Should bLazy ensure domready? + validate(); + } + + function validate() { + for(var i = 0; i 0 && ele.offsetHeight > 0)) { + var dataSrc = ele.getAttribute(source) || ele.getAttribute(options.src); // fallback to default data-src + if(dataSrc) { + var dataSrcSplitted = dataSrc.split(options.separator); + var src = dataSrcSplitted[isRetina && dataSrcSplitted.length > 1 ? 1 : 0]; + var img = new Image(); + // cleanup markup, remove data source attributes + each(options.breakpoints, function(object){ + ele.removeAttribute(object.src); + }); + ele.removeAttribute(options.src); + img.onerror = function() { + if(options.error) options.error(ele, "invalid"); + ele.className = ele.className + ' ' + options.errorClass; + }; + img.onload = function() { + // Is element an image or should we add the src as a background image? + ele.nodeName.toLowerCase() === 'img' ? ele.src = src : ele.style.backgroundImage = 'url("' + src + '")'; + ele.className = ele.className + ' ' + options.successClass; + if(options.success) options.success(ele); + }; + img.src = src; //preload image + } else { + if(options.error) options.error(ele, "missing"); + ele.className = ele.className + ' ' + options.errorClass; + } + } + } + + function elementInView(ele) { + var rect = ele.getBoundingClientRect(); + + return ( + // Intersection + rect.right >= viewport.left + && rect.bottom >= viewport.top + && rect.left <= viewport.right + && rect.top <= viewport.bottom + ); + } + + function isElementLoaded(ele) { + return (' ' + ele.className + ' ').indexOf(' ' + options.successClass + ' ') !== -1; + } + + function createImageArray(selector) { + var nodelist = document.querySelectorAll(selector); + count = nodelist.length; + //converting nodelist to array + for(var i = count; i--; images.unshift(nodelist[i])){} + } + + function saveViewportOffset(){ + viewport.bottom = (window.innerHeight || document.documentElement.clientHeight) + options.offset; + viewport.right = (window.innerWidth || document.documentElement.clientWidth) + options.offset; + } + + function bindEvent(ele, type, fn) { + if (ele.attachEvent) { + ele.attachEvent && ele.attachEvent('on' + type, fn); + } else { + ele.addEventListener(type, fn, false); + } + } + + function unbindEvent(ele, type, fn) { + if (ele.detachEvent) { + ele.detachEvent && ele.detachEvent('on' + type, fn); + } else { + ele.removeEventListener(type, fn, false); + } + } + + function each(object, fn){ + if(object && fn) { + var l = object.length; + for(var i = 0; i=window.screen.width)return r=b.src,!1});h()}function h(){y(a.selector);m&&(m=!1,a.container&&n(a.container,function(b){p(b,"scroll",f)}),p(window,"resize",t),p(window,"resize",f),p(window,"scroll",f));w()}function w(){for(var b=0;b=e.left&&c.bottom>=e.top&&c.left<=e.right&&c.top<=e.bottom||-1!==(" "+g.className+" ").indexOf(" "+a.successClass+" "))d.prototype.load(g),k.splice(b,1),l--,b--}0===l&&d.prototype.destroy()}function z(b,g){if(g||0 settings.failure_limit) { - return false; - } - } - }); - - } - - if(options) { - /* Maintain BC for a couple of versions. */ - if (undefined !== options.failurelimit) { - options.failure_limit = options.failurelimit; - delete options.failurelimit; - } - if (undefined !== options.effectspeed) { - options.effect_speed = options.effectspeed; - delete options.effectspeed; - } - - $.extend(settings, options); - } - - /* Cache container as jQuery as object. */ - $container = (settings.container === undefined || - settings.container === window) ? $window : $(settings.container); - - /* Fire one scroll event per scroll. Not one scroll event per image. */ - if (0 === settings.event.indexOf("scroll")) { - $container.bind(settings.event, function() { - return update(); - }); - } - - this.each(function() { - var self = this; - var $self = $(self); - - self.loaded = false; - - /* If no src attribute given use data:uri. */ - if ($self.attr("src") === undefined || $self.attr("src") === false) { - if ($self.is("img")) { - $self.attr("src", settings.placeholder); - } - } - - /* When appear is triggered load original image. */ - $self.one("appear", function() { - if (!this.loaded) { - if (settings.appear) { - var elements_left = elements.length; - settings.appear.call(self, elements_left, settings); - } - $("") - .bind("load", function() { - - var original = $self.attr("data-" + settings.data_attribute); - $self.hide(); - if ($self.is("img")) { - $self.attr("src", original); - } else { - $self.css("background-image", "url('" + original + "')"); - } - $self[settings.effect](settings.effect_speed); - - self.loaded = true; - - /* Remove image from array so it is not looped next time. */ - var temp = $.grep(elements, function(element) { - return !element.loaded; - }); - elements = $(temp); - - if (settings.load) { - var elements_left = elements.length; - settings.load.call(self, elements_left, settings); - } - }) - .attr("src", $self.attr("data-" + settings.data_attribute)); - } - }); - - /* When wanted event is triggered load original image */ - /* by triggering appear. */ - if (0 !== settings.event.indexOf("scroll")) { - $self.bind(settings.event, function() { - if (!self.loaded) { - $self.trigger("appear"); - } - }); - } - }); - - /* Check if something appears when window is resized. */ - $window.bind("resize", function() { - update(); - }); - - /* With IOS5 force loading images when navigating with back button. */ - /* Non optimal workaround. */ - if ((/(?:iphone|ipod|ipad).*os 5/gi).test(navigator.appVersion)) { - $window.bind("pageshow", function(event) { - if (event.originalEvent && event.originalEvent.persisted) { - elements.each(function() { - $(this).trigger("appear"); - }); - } - }); - } - - /* Force initial check if images should appear. */ - $(document).ready(function() { - update(); - }); - - return this; - }; - - /* Convenience methods in jQuery namespace. */ - /* Use as $.belowthefold(element, {threshold : 100, container : window}) */ - - $.belowthefold = function(element, settings) { - var fold; - - if (settings.container === undefined || settings.container === window) { - fold = (window.innerHeight ? window.innerHeight : $window.height()) + $window.scrollTop(); - } else { - fold = $(settings.container).offset().top + $(settings.container).height(); - } - - return fold <= $(element).offset().top - settings.threshold; - }; - - $.rightoffold = function(element, settings) { - var fold; - - if (settings.container === undefined || settings.container === window) { - fold = $window.width() + $window.scrollLeft(); - } else { - fold = $(settings.container).offset().left + $(settings.container).width(); - } - - return fold <= $(element).offset().left - settings.threshold; - }; - - $.abovethetop = function(element, settings) { - var fold; - - if (settings.container === undefined || settings.container === window) { - fold = $window.scrollTop(); - } else { - fold = $(settings.container).offset().top; - } - - return fold >= $(element).offset().top + settings.threshold + $(element).height(); - }; - - $.leftofbegin = function(element, settings) { - var fold; - - if (settings.container === undefined || settings.container === window) { - fold = $window.scrollLeft(); - } else { - fold = $(settings.container).offset().left; - } - - return fold >= $(element).offset().left + settings.threshold + $(element).width(); - }; - - $.inviewport = function(element, settings) { - return !$.rightoffold(element, settings) && !$.leftofbegin(element, settings) && - !$.belowthefold(element, settings) && !$.abovethetop(element, settings); - }; - - /* Custom selectors for your convenience. */ - /* Use as $("img:below-the-fold").something() or */ - /* $("img").filter(":below-the-fold").something() which is faster */ - - $.extend($.expr[":"], { - "below-the-fold" : function(a) { return $.belowthefold(a, {threshold : 0}); }, - "above-the-top" : function(a) { return !$.belowthefold(a, {threshold : 0}); }, - "right-of-screen": function(a) { return $.rightoffold(a, {threshold : 0}); }, - "left-of-screen" : function(a) { return !$.rightoffold(a, {threshold : 0}); }, - "in-viewport" : function(a) { return $.inviewport(a, {threshold : 0}); }, - /* Maintain BC for couple of versions. */ - "above-the-fold" : function(a) { return !$.belowthefold(a, {threshold : 0}); }, - "right-of-fold" : function(a) { return $.rightoffold(a, {threshold : 0}); }, - "left-of-fold" : function(a) { return !$.rightoffold(a, {threshold : 0}); } - }); - -})(jQuery, window, document); diff --git a/inc/jquery.lazyload-1.9.3.min.js b/inc/jquery.lazyload-1.9.3.min.js deleted file mode 100644 index 615b90e..0000000 --- a/inc/jquery.lazyload-1.9.3.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! Lazy Load 1.9.3 - MIT license - Copyright 2010-2013 Mika Tuupola */ -!function(a,b,c,d){var e=a(b);a.fn.lazyload=function(f){function g(){var b=0;i.each(function(){var c=a(this);if(!j.skip_invisible||c.is(":visible"))if(a.abovethetop(this,j)||a.leftofbegin(this,j));else if(a.belowthefold(this,j)||a.rightoffold(this,j)){if(++b>j.failure_limit)return!1}else c.trigger("appear"),b=0})}var h,i=this,j={threshold:0,failure_limit:0,event:"scroll",effect:"show",container:b,data_attribute:"original",skip_invisible:!0,appear:null,load:null,placeholder:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB/AAffA0nNPuCLAAAAAElFTkSuQmCC"};return f&&(d!==f.failurelimit&&(f.failure_limit=f.failurelimit,delete f.failurelimit),d!==f.effectspeed&&(f.effect_speed=f.effectspeed,delete f.effectspeed),a.extend(j,f)),h=j.container===d||j.container===b?e:a(j.container),0===j.event.indexOf("scroll")&&h.bind(j.event,function(){return g()}),this.each(function(){var b=this,c=a(b);b.loaded=!1,(c.attr("src")===d||c.attr("src")===!1)&&c.is("img")&&c.attr("src",j.placeholder),c.one("appear",function(){if(!this.loaded){if(j.appear){var d=i.length;j.appear.call(b,d,j)}a("").bind("load",function(){var d=c.attr("data-"+j.data_attribute);c.hide(),c.is("img")?c.attr("src",d):c.css("background-image","url('"+d+"')"),c[j.effect](j.effect_speed),b.loaded=!0;var e=a.grep(i,function(a){return!a.loaded});if(i=a(e),j.load){var f=i.length;j.load.call(b,f,j)}}).attr("src",c.attr("data-"+j.data_attribute))}}),0!==j.event.indexOf("scroll")&&c.bind(j.event,function(){b.loaded||c.trigger("appear")})}),e.bind("resize",function(){g()}),/(?:iphone|ipod|ipad).*os 5/gi.test(navigator.appVersion)&&e.bind("pageshow",function(b){b.originalEvent&&b.originalEvent.persisted&&i.each(function(){a(this).trigger("appear")})}),a(c).ready(function(){g()}),this},a.belowthefold=function(c,f){var g;return g=f.container===d||f.container===b?(b.innerHeight?b.innerHeight:e.height())+e.scrollTop():a(f.container).offset().top+a(f.container).height(),g<=a(c).offset().top-f.threshold},a.rightoffold=function(c,f){var g;return g=f.container===d||f.container===b?e.width()+e.scrollLeft():a(f.container).offset().left+a(f.container).width(),g<=a(c).offset().left-f.threshold},a.abovethetop=function(c,f){var g;return g=f.container===d||f.container===b?e.scrollTop():a(f.container).offset().top,g>=a(c).offset().top+f.threshold+a(c).height()},a.leftofbegin=function(c,f){var g;return g=f.container===d||f.container===b?e.scrollLeft():a(f.container).offset().left,g>=a(c).offset().left+f.threshold+a(c).width()},a.inviewport=function(b,c){return!(a.rightoffold(b,c)||a.leftofbegin(b,c)||a.belowthefold(b,c)||a.abovethetop(b,c))},a.extend(a.expr[":"],{"below-the-fold":function(b){return a.belowthefold(b,{threshold:0})},"above-the-top":function(b){return!a.belowthefold(b,{threshold:0})},"right-of-screen":function(b){return a.rightoffold(b,{threshold:0})},"left-of-screen":function(b){return!a.rightoffold(b,{threshold:0})},"in-viewport":function(b){return a.inviewport(b,{threshold:0})},"above-the-fold":function(b){return!a.belowthefold(b,{threshold:0})},"right-of-fold":function(b){return a.rightoffold(b,{threshold:0})},"left-of-fold":function(b){return!a.rightoffold(b,{threshold:0})}})}(jQuery,window,document); \ No newline at end of file diff --git a/inc/shaarli.css b/inc/shaarli.css index bb564e9..a88143c 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -647,9 +647,21 @@ a.qrcode img { float: left; } +.b-lazy { + -webkit-transition: opacity 500ms ease-in-out; + -moz-transition: opacity 500ms ease-in-out; + -o-transition: opacity 500ms ease-in-out; + transition: opacity 500ms ease-in-out; + opacity: 0; +} +.b-lazy.b-loaded { + opacity: 1; +} + .picwall_pictureframe img { max-width: 100%; height: auto; + color: transparent; } /* Adapt the width of the image */ .picwall_pictureframe a { diff --git a/index.php b/index.php index 99c3765..890eb58 100644 --- a/index.php +++ b/index.php @@ -2125,11 +2125,8 @@ function lazyThumbnail($url,$href=false) $html=''; - // Lazy image (only loaded by JavaScript when in the viewport). - if (!empty($GLOBALS['disablejquery'])) // (except if jQuery is disabled) - $html.=' {include="includes"} -{if="empty($GLOBALS['disablejquery'])"} - - - -{/if} + @@ -20,12 +16,8 @@ {include="page.footer"} -{if="empty($GLOBALS['disablejquery'])"} -{/if} \ No newline at end of file diff --git a/tpl/picwall2.html b/tpl/picwall2.html deleted file mode 100644 index 44d08b0..0000000 --- a/tpl/picwall2.html +++ /dev/null @@ -1,19 +0,0 @@ - - -{include="includes"} - - - - -{include="page.footer"} - - \ No newline at end of file From bc1ef5b94a711a0db249f1773db9b3ca1da31c6c Mon Sep 17 00:00:00 2001 From: Alexis J Date: Wed, 4 Mar 2015 18:02:47 +0100 Subject: [PATCH 062/658] Add some filters to clean URLs --- index.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/index.php b/index.php index 99c3765..d714040 100644 --- a/index.php +++ b/index.php @@ -1646,6 +1646,11 @@ function renderPage() $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); + $i=strpos($url,'?fb_'); if ($i!==false) $url=substr($url,0,$i); + $i=strpos($url,'?__scoop'); if ($i!==false) $url=substr($url,0,$i); + $i=strpos($url,'#tk.rss_all?'); if ($i!==false) $url=substr($url,0,$i); + $i=strpos($url,'?utm_campaign='); if ($i!==false) $url=substr($url,0,$i); + $i=strpos($url,'?utm_medium='); 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) From ad2a397c66a3da8061564602b43db6f2002f0064 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 4 Mar 2015 19:52:24 +0100 Subject: [PATCH 063/658] cleanup: refactor annoying URL patterns in a single loop * fixes https://github.com/shaarli/Shaarli/issues/133 --- index.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/index.php b/index.php index d714040..cc3d736 100644 --- a/index.php +++ b/index.php @@ -1642,15 +1642,12 @@ function renderPage() { $url=$_GET['post']; - // We remove the annoying parameters added by FeedBurner and GoogleFeedProxy (?utm_source=...) - $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); - $i=strpos($url,'?fb_'); if ($i!==false) $url=substr($url,0,$i); - $i=strpos($url,'?__scoop'); if ($i!==false) $url=substr($url,0,$i); - $i=strpos($url,'#tk.rss_all?'); if ($i!==false) $url=substr($url,0,$i); - $i=strpos($url,'?utm_campaign='); if ($i!==false) $url=substr($url,0,$i); - $i=strpos($url,'?utm_medium='); if ($i!==false) $url=substr($url,0,$i); + // We remove the annoying parameters added by FeedBurner, GoogleFeedProxy, Facebook... + $annoyingpatterns = array('&utm_source=', '?utm_source=', '#xtor=RSS-', '?fb_', '?__scoop', '#tk.rss_all?', '?utm_campaign=', '?utm_medium='); + foreach($annoyingpatterns as $pattern) + { + $i=strpos($url,$pattern); 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) From 403a19940961eaf3edae84c7e9c4fa0bd074e940 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Thu, 5 Mar 2015 13:33:30 +0100 Subject: [PATCH 064/658] Improve annoying URL parameters cleaning: * Use regular expressions to avoid suplicating params depending on their position in the URL (¶m=,?param=) * Only remove the relevant URL pattern and don't remove following params, fixes https://github.com/shaarli/Shaarli/issues/136 * Credits to Marcus Rohrmoser (https://github.com/mro) --- index.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index cc3d736..0b507b4 100644 --- a/index.php +++ b/index.php @@ -1642,11 +1642,12 @@ function renderPage() { $url=$_GET['post']; + // We remove the annoying parameters added by FeedBurner, GoogleFeedProxy, Facebook... - $annoyingpatterns = array('&utm_source=', '?utm_source=', '#xtor=RSS-', '?fb_', '?__scoop', '#tk.rss_all?', '?utm_campaign=', '?utm_medium='); + $annoyingpatterns = array('/[\?&]utm_source=[^&]*/', '/[\?&]utm_campaign=[^&]*/', '/[\?&]utm_medium=[^&]*/', '/#xtor=RSS-[^&]*/', '/[\?&]fb_[^&]*/', '/[\?&]__scoop[^&]*/', '/#tk\.rss_all\?/'); foreach($annoyingpatterns as $pattern) { - $i=strpos($url,$pattern); if ($i!==false) $url=substr($url,0,$i); + $url = preg_replace($pattern, "", $url); } $link_is_new = false; From baf5cbf27d18467d838a24b6f451036cebaa27bf Mon Sep 17 00:00:00 2001 From: nodiscc Date: Thu, 5 Mar 2015 13:40:43 +0100 Subject: [PATCH 065/658] Improve URL cleaning: * also remove action_type_map, action_ref_map and action_object maps params used by facebook --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 0b507b4..bc4fa1e 100644 --- a/index.php +++ b/index.php @@ -1644,7 +1644,7 @@ function renderPage() // We remove the annoying parameters added by FeedBurner, GoogleFeedProxy, Facebook... - $annoyingpatterns = array('/[\?&]utm_source=[^&]*/', '/[\?&]utm_campaign=[^&]*/', '/[\?&]utm_medium=[^&]*/', '/#xtor=RSS-[^&]*/', '/[\?&]fb_[^&]*/', '/[\?&]__scoop[^&]*/', '/#tk\.rss_all\?/'); + $annoyingpatterns = array('/[\?&]utm_source=[^&]*/', '/[\?&]utm_campaign=[^&]*/', '/[\?&]utm_medium=[^&]*/', '/#xtor=RSS-[^&]*/', '/[\?&]fb_[^&]*/', '/[\?&]__scoop[^&]*/', '/#tk\.rss_all\?/', '/[\?&]action_ref_map=[^&]*/', '/[\?&]action_type_map=[^&]*/', '/[\?&]action_object_map=[^&]*/'); foreach($annoyingpatterns as $pattern) { $url = preg_replace($pattern, "", $url); From 1f7f8ce067b278a4837364191513d04f7548cef9 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 3 Mar 2015 23:09:13 +0100 Subject: [PATCH 066/658] cleanup: remove version number from CSS links * fixes https://github.com/shaarli/Shaarli/issues/134 --- tpl/includes.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tpl/includes.html b/tpl/includes.html index 93cdfd5..5e298fa 100644 --- a/tpl/includes.html +++ b/tpl/includes.html @@ -6,5 +6,5 @@ - -{if="is_file('inc/user.css')"}{/if} + +{if="is_file('inc/user.css')"}{/if} From 572fbafe5b66a22beab381bc705b96e486026340 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 4 Mar 2015 08:39:22 +0100 Subject: [PATCH 067/658] remove duplicate license information, fixes https://github.com/shaarli/Shaarli/issues/135 --- inc/LICENSE | 120 ---------------------------------------------------- 1 file changed, 120 deletions(-) delete mode 100644 inc/LICENSE diff --git a/inc/LICENSE b/inc/LICENSE deleted file mode 100644 index 8711a29..0000000 --- a/inc/LICENSE +++ /dev/null @@ -1,120 +0,0 @@ -JQuery 1.11.2 -=============================================================================== -Copyright jQuery Foundation and other contributors, https://jquery.org/ - -This software consists of voluntary contributions made by many -individuals. For exact contribution history, see the revision history -available at https://github.com/jquery/jquery - -The following license applies to all parts of this software except as -documented below: - -==== - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -==== - -All files located in the node_modules and external directories are -externally maintained libraries used by this software which have their -own licenses; we recommend you read them, as their terms may differ from -the terms above. - - - -JQuery UI 1.11.2 -=============================================================================== -Copyright jQuery Foundation and other contributors, https://jquery.org/ - -This software consists of voluntary contributions made by many -individuals. For exact contribution history, see the revision history -available at https://github.com/jquery/jquery-ui - -The following license applies to all parts of this software except as -documented below: - -==== - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -==== - -Copyright and related rights for sample code are waived via CC0. Sample -code is defined as all source code contained within the demos directory. - -CC0: http://creativecommons.org/publicdomain/zero/1.0/ - -==== - -All files located in the node_modules and external directories are -externally maintained libraries used by this software which have their -own licenses; we recommend you read them, as their terms may differ from -the terms above. - - - -QR.js 1.1.3 -=============================================================================== -Copyright (C) 2014 Alasdair Mercer, http://neocotic.com - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - - - - -JQuery Lazyload 1.9.3 -=============================================================================== -By Mika Tuupola (https://github.com/tuupola) - -All code licensed under the MIT License[1]. All images licensed under -Creative Commons Attribution 3.0 Unported License[2]. In other words you are -basically free to do whatever you want. Just don’t remove my name from the -source. - -[1]: http://opensource.org/licenses/mit-license.php -[2]: http://creativecommons.org/licenses/by/3.0/deed.en_US \ No newline at end of file From 473f37a2eea01af869f87c843217d216994346e3 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 4 Mar 2015 19:08:02 +0100 Subject: [PATCH 068/658] update README: add note about php-gd and git-based upgrade --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0397621..d1aa03d 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ It is designed to be personal (single-user), fast and handy. ## Installing -Shaarli requires php 5.1 +Shaarli requires php 5.1. `php-gd` is optional and provides thumbnail resizing. * Download the latest stable release from https://github.com/shaarli/Shaarli/releases * Unpack the archive in a directory on your web server @@ -63,9 +63,8 @@ _To get the development version, download https://github.com/shaarli/Shaarli/arc ## Upgrading -Delete all files and directories except the `data` directory, then unzip the new version of Shaarli. -You will not lose your links and you will not have to reconfigure it. - + * **If you installed from the zip:** Delete all files and directories except the `data` directory, then unzip the new version of Shaarli. You will not lose your links and you will not have to reconfigure it. + * **If you installed using `git clone`**: run `git pull` in your Shaarli directory. ## About From 35c2c4db5b5179e571023ab7fa7d3ecc03c85391 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 4 Mar 2015 19:09:01 +0100 Subject: [PATCH 069/658] Redirect to homepage after adding a link via "Add Link" dialog * Fixes https://github.com/shaarli/Shaarli/issues/115 --- index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/index.php b/index.php index a8326a2..cda918d 100644 --- a/index.php +++ b/index.php @@ -1560,6 +1560,7 @@ function renderPage() if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo ''; exit; } $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' ); $returnurl .= '#'.smallHash($linkdate); // Scroll to the link which has been edited. + if (strstr($returnurl, "do=addlink")) { $returnurl = '?'; } //if we come from ?do=addlink, set returnurl to homepage instead header('Location: '.$returnurl); // After saving the link, redirect to the page the user was on. exit; } From 9811b3efbca58bf464752e401d278fe677089a9c Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 4 Mar 2015 22:46:57 +0100 Subject: [PATCH 070/658] add bountysource.com badge * Bountysource is the funding platform for open-source software. Users can improve the open-source projects they love by creating/collecting bounties and pledging to fundraisers. * https://github.com/bountysource/frontend/wiki/Frequently-Asked-Questions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1aa03d..7f0b7d5 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Shaarli, the personal, minimalist, super-fast, no-database delicious clone. You want to share the links you discover ? Shaarli is a minimalist delicious clone you can install on your own website. It is designed to be personal (single-user), fast and handy. -[![Join the chat at https://gitter.im/shaarli/Shaarli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/shaarli/Shaarli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Join the chat at https://gitter.im/shaarli/Shaarli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/shaarli/Shaarli) [![Bountysource](https://www.bountysource.com/badge/team?team_id=19583&style=bounties_received)](https://www.bountysource.com/teams/shaarli/issues) ## Features: From a056d988e7c4e6610fbfc0d6207d2809998574af Mon Sep 17 00:00:00 2001 From: nodiscc Date: Thu, 5 Mar 2015 13:54:00 +0100 Subject: [PATCH 071/658] fix broken CSS file URL introduced in 1f7f8ce067b278a4837364191513d04f7548cef9 --- tpl/includes.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpl/includes.html b/tpl/includes.html index 5e298fa..26f2e2b 100644 --- a/tpl/includes.html +++ b/tpl/includes.html @@ -6,5 +6,5 @@ - + {if="is_file('inc/user.css')"}{/if} From 3a10fa0e3f0d0978dc359d1407b93fe425f44b25 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Thu, 5 Mar 2015 18:14:25 +0100 Subject: [PATCH 072/658] fix broken URL for user.css --- tpl/includes.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpl/includes.html b/tpl/includes.html index 26f2e2b..623e19e 100644 --- a/tpl/includes.html +++ b/tpl/includes.html @@ -7,4 +7,4 @@ -{if="is_file('inc/user.css')"}{/if} +{if="is_file('inc/user.css')"}{/if} From 00f98bdacaba026e3d16aed36605bc21b72903ab Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Wed, 25 Feb 2015 22:08:50 +0100 Subject: [PATCH 073/658] Code quality: Makefile to run static code checkers Relates to #71 Relates to #95 Additions: - Makefile for easy usage, - Composer file to declare dev & test dependencies. Features: - PHP Copy/Paste Detect: detect duplicate code; - PHP Code Sniffer: static analysis, syntax checking, - PHP Mess Detector: static analysis, syntax checking. Signed-off-by: VirtualTam --- .gitignore | 9 ++++- Makefile | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++ composer.json | 14 ++++++++ 3 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 Makefile create mode 100644 composer.json diff --git a/.gitignore b/.gitignore index 6452c2c..33d8a48 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,11 @@ pagecache .project # Ignore raintpl generated pages -*.rtpl.php \ No newline at end of file +*.rtpl.php + +# Ignore test dependencies +composer.lock +/vendor/ + +# Ignore test output +phpmd.html diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e17c862 --- /dev/null +++ b/Makefile @@ -0,0 +1,94 @@ +# Shaarli, the personal, minimalist, super-fast, no-database delicious clone. +# +# Makefile for PHP code analysis & testing +# +# Prerequisites: +# - install Composer, either: +# - from your distro's package manager; +# - from the official website (https://getcomposer.org/download/); +# - install/update test dependencies: +# $ composer install # 1st setup +# $ composer update +BIN = vendor/bin +PHP_SOURCE = index.php +MESS_DETECTOR_RULES = cleancode,codesize,controversial,design,naming,unusedcode + +all: static_analysis_summary + +## +# Concise status of the project +# +# These targets are non-blocking: || exit 0 +## +static_analysis_summary: code_sniffer_source copy_paste mess_detector_summary + +## +# PHP_CodeSniffer +# +# Detects PHP syntax errors +# +# Documentation (usage, output formatting): +# - http://pear.php.net/manual/en/package.php.php-codesniffer.usage.php +# - http://pear.php.net/manual/en/package.php.php-codesniffer.reporting.php +## +code_sniffer: code_sniffer_full + +# - errors by Git author +code_sniffer_blame: + @$(BIN)/phpcs $(PHP_SOURCE) --report-gitblame + +# - all errors/warnings +code_sniffer_full: + @$(BIN)/phpcs $(PHP_SOURCE) --report-full --report-width=200 + +# - errors grouped by kind +code_sniffer_source: + @$(BIN)/phpcs $(PHP_SOURCE) --report-source || exit 0 + +## +# PHP Copy/Paste Detector +# +# Detects code redundancy +# +# Documentation: https://github.com/sebastianbergmann/phpcpd +## +copy_paste: + @echo "-----------------------" + @echo "PHP COPY/PASTE DETECTOR" + @echo "-----------------------" + @$(BIN)/phpcpd $(PHP_SOURCE) || exit 0 + @echo + +## +# PHP Mess Detector +# +# Detects PHP syntax errors, sorted by category +# +# Rules documentation: http://phpmd.org/rules/index.html +# +mess_title: + @echo "-----------------" + @echo "PHP MESS DETECTOR" + @echo "-----------------" + +# - all warnings +mess_detector: mess_title + @$(BIN)/phpmd $(PHP_SOURCE) text $(MESS_DETECTOR_RULES) | sed 's_.*\/__' + +# - all warnings +# the generated HTML contains links to PHPMD's documentation +mess_detector_html: + @$(BIN)/phpmd $(PHP_SOURCE) html $(MESS_DETECTOR_RULES) \ + --reportfile phpmd.html || exit 0 + +# - warnings grouped by message, sorted by descending frequency order +mess_detector_grouped: mess_title + @$(BIN)/phpmd $(PHP_SOURCE) text $(MESS_DETECTOR_RULES) \ + | cut -f 2 | sort | uniq -c | sort -nr + +# - summary: number of warnings by rule set +mess_detector_summary: mess_title + @for rule in $$(echo $(MESS_DETECTOR_RULES) | tr ',' ' '); do \ + warnings=$$($(BIN)/phpmd $(PHP_SOURCE) text $$rule | wc -l); \ + printf "$$warnings\t$$rule\n"; \ + done; diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..d1f613c --- /dev/null +++ b/composer.json @@ -0,0 +1,14 @@ +{ + "name": "shaarli/shaarli", + "description": "The personal, minimalist, super-fast, no-database delicious clone", + "license": "MIT", + "support": { + "issues": "https://github.com/shaarli/Shaarli/issues" + }, + "require": {}, + "require-dev": { + "phpmd/phpmd" : "@stable", + "sebastian/phpcpd": "*", + "squizlabs/php_codesniffer": "2.*" + } +} From 1b434b5270312dfc96d30ccce091b9dda611ee45 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Fri, 6 Mar 2015 22:50:30 +0100 Subject: [PATCH 074/658] tools dialog: add a 'Add Note' bookmarklet to immediatly open a note (text post) compose window * Fixes https://github.com/shaarli/Shaarli/issues/142 * Fixes https://github.com/sebsauvage/Shaarli/issues/59 --- tpl/tools.html | 1 + 1 file changed, 1 insertion(+) diff --git a/tpl/tools.html b/tpl/tools.html index bf0539b..e912f61 100644 --- a/tpl/tools.html +++ b/tpl/tools.html @@ -11,6 +11,7 @@ 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.

+ ✚Add Note ⇐ Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).
    Then click "✚Add Note" button anytime to start composing a (default private) Note (text post) to your Shaarli.

From 610bf4186a1406e7aa852681b09c8cb788443e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Jovanovi=C4=87?= Date: Tue, 10 Mar 2015 14:44:51 -0500 Subject: [PATCH 075/658] Fix menu dynamic resize, padding, private icon pixelation --- images/private.png | Bin 2636 -> 813 bytes inc/shaarli.css | 95 ++++++++++++++++++++++++++++----------------- 2 files changed, 59 insertions(+), 36 deletions(-) diff --git a/images/private.png b/images/private.png index 1364b355f3f32832a0a6a02b026cf2ebb453f36f..8919d658c305ba29310253bfc6efd1ac4ee05f4b 100644 GIT binary patch delta 779 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 b(_aB%byD%m51{~I00000NkvXXu0mjfVmBnV diff --git a/inc/shaarli.css b/inc/shaarli.css index a88143c..56e2d8b 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -84,21 +84,14 @@ h1 { .linkeditbuttons { position: absolute; - left: -1px; + left: 2px; padding: 4px 2px 2px 2px; - background-color: #f0f0f0; -webkit-border-radius: 0px 6px 6px 0px; -moz-border-radius: 0px 6px 6px 0px; -o-border-radius: 0px 6px 6px 0px; -ms-border-radius: 0px 6px 6px 0px; border-radius: 0px 6px 6px 0px; - - -webkit-box-shadow: 0px 0px 3px 0px #333333; - -moz-box-shadow: 0px 0px 3px 0px #333333; - -o-box-shadow: 0px 0px 3px 0px #333333; - -ms-box-shadow: 0px 0px 3px 0px #333333; - box-shadow: 0px 0px 3px 0px #333333; } #pageheader #logo { @@ -111,26 +104,21 @@ h1 { cursor: pointer; } -#pageheader #linkcount { - float: right; - font-style: italic; - color: #bbb; - text-align: right; - padding-right: 5px; +#pageheader #menu { + width: 100%; } -#pageheader { - background-color: #333333; - background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#111111)); - background: -webkit-linear-gradient(#333333, #111111); - background: -moz-linear-gradient(#333333, #111111); - background: -ms-linear-gradient(#333333, #111111); - background: -o-linear-gradient(#333333, #111111); - background: linear-gradient(#333333, #111111); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); - width: auto; - padding: 0 10px 5px 10px; +#pageheader #menu ul { margin: auto; + padding: 7px 0px 0px 0px; + float: none; +} + +#pageheader #menu ul li { + list-style: none; + display: inline; + position: relative; + box-sizing: border-box; } #pageheader a { @@ -146,8 +134,32 @@ h1 { border-radius: 5px 5px 5px 5px; margin: 10px 3px 3px 3px; color: #A2DD42; - float: left; text-decoration: none; + line-height: 2.5; + white-space: nowrap; +} + +#pageheader #linkcount { + float: right; + font-style: italic; + color: #bbb; + text-align: right; + padding-right: 5px; + margin: 3px 3px 0px 0px; +} + +#pageheader { + background-color: #333333; + background: -webkit-gradient(linear, 0 0, 0 bottom, from(#333333), to(#111111)); + background: -webkit-linear-gradient(#333333, #111111); + background: -moz-linear-gradient(#333333, #111111); + background: -ms-linear-gradient(#333333, #111111); + background: -o-linear-gradient(#333333, #111111); + background: linear-gradient(#333333, #111111); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); + width: auto; + padding: 0 10px 5px 10px; + margin: auto; } #pageheader .search { @@ -291,6 +303,7 @@ h1 { .paging_linksperpage { float: right; padding-right: 5px; + margin: 0px 10px 2px 0px; } .paging_linksperpage form.linksperpage { @@ -388,12 +401,12 @@ a.qrcode img { } #linklist li.private { - background: url('../images/private.png') no-repeat 10px center; - padding-left: 60px; + background: url('../images/private.png') no-repeat 4px center; + padding-left: 30px; } #linklist li { - padding-left: 26px; + padding-left: 30px; } .private .linktitle a { @@ -468,9 +481,9 @@ a.qrcode img { background: -o-linear-gradient(#F2F2F2, #ffffff); background: linear-gradient(#F2F2F2, #ffffff); box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); - padding: 3px 3px 3px 20px; + padding: 3px 5px 3px 20px; height: 20px; - border-radius: 3px 3px 3px 3px; + border-radius: 5px; cursor: pointer; background-image: url('../images/tag_blue.png'); background-repeat: no-repeat; @@ -515,9 +528,10 @@ a.qrcode img { #footer { font-size: 8pt; text-align: center; - border-top: 1px solid #ddd; color: #888; clear: both; + max-width: 30em; + margin: 15px auto 15px auto; } #footer a { @@ -613,7 +627,12 @@ a.qrcode img { .thumbnail { float: right; - margin-left: 10px; + margin: 0px 10px 0px 10px; +} + +.thumbnail img { + border-radius: 5px; + box-shadow: 0.5px 0.5px 0.5px 1px #dde4e6; } /* If you want thumbnails on the left: @@ -938,7 +957,11 @@ div.dailyNoEntry { display: none; } - #pageheader a { + #pageheader #menu ul { + text-align: center; + } + + #pageheader #menu a { padding: 5px; border-radius: 5px 5px 5px 5px; margin: 3px; @@ -946,9 +969,9 @@ div.dailyNoEntry { .searchform, .tagfilter { display: block !important; - margin: 0px !important; + margin: 0px 3px 7px 0px !important; padding: 0px !important; - width: 100% !important; + width: 97% !important; } .searchform input, .tagfilter input { From 4aca798e47fcaa6daf90c43714111dc4d15e1f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Jovanovi=C4=87?= Date: Tue, 10 Mar 2015 18:13:23 -0500 Subject: [PATCH 076/658] added menu div and cleaned up code --- tpl/page.header.html | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/tpl/page.header.html b/tpl/page.header.html index 17c0c75..0fd65e4 100644 --- a/tpl/page.header.html +++ b/tpl/page.header.html @@ -1,28 +1,43 @@ - -
Shaare your links...
- {if="!empty($linkcount)"}{$linkcount} links{/if}
- {$shaarlititle|htmlspecialchars} + + +
+ {if="!empty($linkcount)"}{$linkcount} links{/if} +
+ + + + +
From 4a1a1190a6c9f72f72bce7e8989541e58f366a90 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sun, 8 Mar 2015 00:53:05 +0100 Subject: [PATCH 077/658] picwall: link directly to the target URL (not the permalink) --- index.php | 1 - tpl/picwall.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/index.php b/index.php index 066058e..6189e0b 100644 --- a/index.php +++ b/index.php @@ -1271,7 +1271,6 @@ function renderPage() if ($thumb!='') // Only output links which have a thumbnail. { $link['thumbnail']=$thumb; // Thumbnail HTML code. - $link['permalink']=$permalink; $linksToDisplay[]=$link; // Add to array. } } diff --git a/tpl/picwall.html b/tpl/picwall.html index ea1ef42..e686afe 100644 --- a/tpl/picwall.html +++ b/tpl/picwall.html @@ -9,7 +9,7 @@
{loop="linksToDisplay"}
- {$value.thumbnail}{$value.title|htmlspecialchars} + {$value.thumbnail}{$value.title|htmlspecialchars}
{/loop}
From 736a73a96d3deaf239f83f0c56dde2e4127a6e5a Mon Sep 17 00:00:00 2001 From: nodiscc Date: Thu, 12 Mar 2015 13:19:03 +0100 Subject: [PATCH 078/658] update COPYING --- COPYING | 1 + 1 file changed, 1 insertion(+) diff --git a/COPYING b/COPYING index ec4f768..7312abd 100644 --- a/COPYING +++ b/COPYING @@ -18,6 +18,7 @@ Copyright: (c) 2011-2015 Sébastien SAUVAGE (c) 2011-2015 virtualtam (c) 2011-2015 qwertygc (c) 2011-2015 idleman + (c) 2015 Miloš Jovanović Files: inc/reset.css From 4f8063b6394351749dee7fa3f5ab23cacbbd19a8 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Thu, 12 Mar 2015 14:38:08 +0100 Subject: [PATCH 079/658] theme: decrease border-radius to 3px everywhere --- inc/shaarli.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/inc/shaarli.css b/inc/shaarli.css index 56e2d8b..34c3222 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -17,7 +17,7 @@ input, textarea { background: linear-gradient(#dedede, #ffffff); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); padding: 5px; - border-radius: 5px 5px 5px 5px; + border-radius: 3px 3px 3px 3px; border: none; color: #000; } @@ -131,7 +131,7 @@ h1 { background: linear-gradient(#333333, #000000); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); padding: 5px; - border-radius: 5px 5px 5px 5px; + border-radius: 3px 3px 3px 3px; margin: 10px 3px 3px 3px; color: #A2DD42; text-decoration: none; @@ -191,7 +191,7 @@ h1 { box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5); padding: 5px; border: none; - border-radius: 5px 5px 5px 5px; + border-radius: 3px 3px 3px 3px; margin: 10px 3px 3px 3px; color: #cecece; } @@ -237,7 +237,7 @@ h1 { padding: 0 5px 0 5px; margin: 5px 0 5px 0; height: 20px; - border-radius: 5px 5px 5px 5px; + border-radius: 3px 3px 3px 3px; cursor: pointer; } @@ -483,7 +483,7 @@ a.qrcode img { box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); padding: 3px 5px 3px 20px; height: 20px; - border-radius: 5px; + border-radius: 3px; cursor: pointer; background-image: url('../images/tag_blue.png'); background-repeat: no-repeat; @@ -631,7 +631,7 @@ a.qrcode img { } .thumbnail img { - border-radius: 5px; + border-radius: 3px; box-shadow: 0.5px 0.5px 0.5px 1px #dde4e6; } @@ -963,7 +963,7 @@ div.dailyNoEntry { #pageheader #menu a { padding: 5px; - border-radius: 5px 5px 5px 5px; + border-radius: 3px 3px 3px 3px; margin: 3px; } @@ -1015,7 +1015,7 @@ div.dailyNoEntry { padding: 3px 5px 3px 5px; background-color: #666; color: #fff; - border-radius: 5px 5px 5px 5px; + border-radius: 3px 3px 3px 3px; } .thumbnail { From bdd1715b249561ed919e4f03a06aec1f4c327335 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 6 Mar 2015 21:29:56 +0100 Subject: [PATCH 080/658] Use awesomplete as autocomplete lib and remove jQuery - shaarli/Shaarli#148 * Add awesomplete dependancy (source + min + CSS) * Remove jQuery and jQuery-UI dependancy * Few CSS ajustements * Use tags complete list as RainTPL var (and display it as HTML) * Remove "disable jQuery" feature * Remove tag list web service --- COPYING | 8 +- inc/awesomplete.css | 97 + inc/awesomplete.js | 388 + inc/awesomplete.min.js | 10 + inc/jquery-1.11.2.js | 10346 --------------------- inc/jquery-1.11.2.min.js | 4 - inc/jquery-ui-1.11.2.js | 16582 ---------------------------------- inc/jquery-ui-1.11.2.min.js | 13 - inc/shaarli.css | 31 +- index.php | 43 +- tpl/changetag.html | 35 +- tpl/configure.html | 3 - tpl/editlink.html | 30 +- 13 files changed, 562 insertions(+), 27028 deletions(-) create mode 100644 inc/awesomplete.css create mode 100644 inc/awesomplete.js create mode 100644 inc/awesomplete.min.js delete mode 100644 inc/jquery-1.11.2.js delete mode 100644 inc/jquery-1.11.2.min.js delete mode 100644 inc/jquery-ui-1.11.2.js delete mode 100644 inc/jquery-ui-1.11.2.min.js diff --git a/COPYING b/COPYING index ec4f768..720cf64 100644 --- a/COPYING +++ b/COPYING @@ -46,10 +46,6 @@ Files: images/logo.png License: zlib/libpng Copyright: (c) 2011-2014 idleman idleman@idleman.fr -Files: Files: inc/jquery*.js, inc/jquery-ui*.js -License: MIT License (http://opensource.org/licenses/MIT) -Copyright: (C) jQuery Foundation and other contributors,https://jquery.com/download/ - Files: inc/blazy*.js License: MIT License (http://opensource.org/licenses/MIT) Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy @@ -63,6 +59,10 @@ Copyright: 2011-2012, Federico Ulfo 2011-2012, The Rain Team License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt) +Files: inc/awesomplete* +License: MIT License (http://opensource.org/licenses/MIT) +Copyright: (C) 2015 Lea Verou - https://github.com/LeaVerou/awesomplete + ---------------------------------------------------- ZLIB/LIBPNG LICENSE diff --git a/inc/awesomplete.css b/inc/awesomplete.css new file mode 100644 index 0000000..76f903f --- /dev/null +++ b/inc/awesomplete.css @@ -0,0 +1,97 @@ +[hidden] { display: none; } + +.visually-hidden { + position: absolute; + clip: rect(0, 0, 0, 0); +} + +div.awesomplete { + display: inline-block; + position: relative; + width: 100%; +} + +div.awesomplete > input { + display: block; +} + +div.awesomplete > ul { + position: absolute; + left: 0; + z-index: 1; + min-width: 100%; + box-sizing: border-box; + list-style: none; + padding: 0; + border-radius: .3em; + margin: .2em 0 0; + background: #FFF; + border: 1px solid rgba(0,0,0,.3); + box-shadow: .05em .2em .6em rgba(0,0,0,.2); + text-shadow: none; +} + +div.awesomplete > ul[hidden], +div.awesomplete > ul:empty { + display: none; +} + +@supports (transform: scale(0)) { + div.awesomplete > ul { + transition: .3s cubic-bezier(.4,.2,.5,1.4); + transform-origin: 1.43em -.43em; + } + + div.awesomplete > ul[hidden], + div.awesomplete > ul:empty { + opacity: 0; + transform: scale(0); + display: block; + transition-timing-function: ease; + } +} + +/* Pointer */ +div.awesomplete > ul:before { + content: ""; + position: absolute; + top: -.43em; + left: 1em; + width: 0; height: 0; + padding: .4em; + background: white; + border: inherit; + border-right: 0; + border-bottom: 0; + -webkit-transform: rotate(45deg); + transform: rotate(45deg); +} + +div.awesomplete > ul > li { + position: relative; + padding: .2em .5em; + cursor: pointer; +} + +div.awesomplete > ul > li:hover { + background: hsl(200, 40%, 80%); + color: black; +} + +div.awesomplete > ul > li[aria-selected="true"] { + background: hsl(205, 40%, 40%); + color: white; +} + +div.awesomplete mark { + background: hsl(65, 100%, 50%); +} + +div.awesomplete li:hover mark { + background: hsl(68, 101%, 41%); +} + +div.awesomplete li[aria-selected="true"] mark { + background: hsl(86, 102%, 21%); + color: inherit; +} \ No newline at end of file diff --git a/inc/awesomplete.js b/inc/awesomplete.js new file mode 100644 index 0000000..fae550e --- /dev/null +++ b/inc/awesomplete.js @@ -0,0 +1,388 @@ +/** + * Simple, lightweight, usable local autocomplete library for modern browsers + * Because there weren’t enough autocomplete scripts in the world? Because I’m completely insane and have NIH syndrome? Probably both. :P + * @author Lea Verou http://leaverou.github.io/awesomplete + * MIT license + */ + +(function () { + + var _ = function (input, o) { + var me = this; + + // Setup + + this.input = $(input); + this.input.setAttribute("aria-autocomplete", "list"); + + o = o || {}; + + configure.call(this, { + minChars: 2, + maxItems: 10, + autoFirst: false, + filter: _.FILTER_CONTAINS, + sort: _.SORT_BYLENGTH, + item: function (text, input) { + return $.create("li", { + innerHTML: text.replace(RegExp($.regExpEscape(input.trim()), "gi"), "$&"), + "aria-selected": "false" + }); + }, + replace: function (text) { + this.input.value = text; + } + }, o); + + this.index = -1; + + // Create necessary elements + + this.container = $.create("div", { + className: "awesomplete", + around: input + }); + + this.ul = $.create("ul", { + hidden: "", + inside: this.container + }); + + this.status = $.create("span", { + className: "visually-hidden", + role: "status", + "aria-live": "assertive", + "aria-relevant": "additions", + inside: this.container + }); + + // Bind events + + $.bind(this.input, { + "input": this.evaluate.bind(this), + "blur": this.close.bind(this), + "keydown": function(evt) { + var c = evt.keyCode; + + // If the dropdown `ul` is in view, then act on keydown for the following keys: + // Enter / Esc / Up / Down + if(me.opened) { + if (c === 13 && me.selected) { // Enter + evt.preventDefault(); + me.select(); + } + else if (c === 27) { // Esc + me.close(); + } + else if (c === 38 || c === 40) { // Down/Up arrow + evt.preventDefault(); + me[c === 38? "previous" : "next"](); + } + } + } + }); + + $.bind(this.input.form, {"submit": this.close.bind(this)}); + + $.bind(this.ul, {"mousedown": function(evt) { + var li = evt.target; + + if (li !== this) { + + while (li && !/li/i.test(li.nodeName)) { + li = li.parentNode; + } + + if (li) { + me.select(li); + } + } + }}); + + if (this.input.hasAttribute("list")) { + this.list = "#" + input.getAttribute("list"); + input.removeAttribute("list"); + } + else { + this.list = this.input.getAttribute("data-list") || o.list || []; + } + + _.all.push(this); + }; + + _.prototype = { + set list(list) { + if (Array.isArray(list)) { + this._list = list; + } + else if (typeof list === "string" && list.indexOf(",") > -1) { + this._list = list.split(/\s*,\s*/); + } + else { // Element or CSS selector + list = $(list); + + if (list && list.children) { + this._list = slice.apply(list.children).map(function (el) { + return el.innerHTML.trim(); + }); + } + } + + if (document.activeElement === this.input) { + this.evaluate(); + } + }, + + get selected() { + return this.index > -1; + }, + + get opened() { + return this.ul && this.ul.getAttribute("hidden") == null; + }, + + close: function () { + this.ul.setAttribute("hidden", ""); + this.index = -1; + + $.fire(this.input, "awesomplete-close"); + }, + + open: function () { + this.ul.removeAttribute("hidden"); + + if (this.autoFirst && this.index === -1) { + this.goto(0); + } + + $.fire(this.input, "awesomplete-open"); + }, + + next: function () { + var count = this.ul.children.length; + + this.goto(this.index < count - 1? this.index + 1 : -1); + }, + + previous: function () { + var count = this.ul.children.length; + + this.goto(this.selected? this.index - 1 : count - 1); + }, + + // Should not be used, highlights specific item without any checks! + goto: function (i) { + var lis = this.ul.children; + + if (this.selected) { + lis[this.index].setAttribute("aria-selected", "false"); + } + + this.index = i; + + if (i > -1 && lis.length > 0) { + lis[i].setAttribute("aria-selected", "true"); + this.status.textContent = lis[i].textContent; + } + + $.fire(this.input, "awesomplete-highlight"); + }, + + select: function (selected) { + selected = selected || this.ul.children[this.index]; + + if (selected) { + var prevented; + + $.fire(this.input, "awesomplete-select", { + text: selected.textContent, + preventDefault: function () { + prevented = true; + } + }); + + if (!prevented) { + this.replace(selected.textContent); + this.close(); + $.fire(this.input, "awesomplete-selectcomplete"); + } + } + }, + + evaluate: function() { + var me = this; + var value = this.input.value; + + if (value.length >= this.minChars && this._list.length > 0) { + this.index = -1; + // Populate list with options that match + this.ul.innerHTML = ""; + + this._list + .filter(function(item) { + return me.filter(item, value); + }) + .sort(this.sort) + .every(function(text, i) { + me.ul.appendChild(me.item(text, value)); + + return i < me.maxItems - 1; + }); + + if (this.ul.children.length === 0) { + this.close(); + } else { + this.open(); + } + } + else { + this.close(); + } + } + }; + +// Static methods/properties + + _.all = []; + + _.FILTER_CONTAINS = function (text, input) { + return RegExp($.regExpEscape(input.trim()), "i").test(text); + }; + + _.FILTER_STARTSWITH = function (text, input) { + return RegExp("^" + $.regExpEscape(input.trim()), "i").test(text); + }; + + _.SORT_BYLENGTH = function (a, b) { + if (a.length !== b.length) { + return a.length - b.length; + } + + return a < b? -1 : 1; + }; + +// Private functions + + function configure(properties, o) { + for (var i in properties) { + var initial = properties[i], + attrValue = this.input.getAttribute("data-" + i.toLowerCase()); + + if (typeof initial === "number") { + this[i] = +attrValue; + } + else if (initial === false) { // Boolean options must be false by default anyway + this[i] = attrValue !== null; + } + else if (initial instanceof Function) { + this[i] = null; + } + else { + this[i] = attrValue; + } + + this[i] = this[i] || o[i] || initial; + } + } + +// Helpers + + var slice = Array.prototype.slice; + + function $(expr, con) { + return typeof expr === "string"? (con || document).querySelector(expr) : expr || null; + } + + function $$(expr, con) { + return slice.call((con || document).querySelectorAll(expr)); + } + + $.create = function(tag, o) { + var element = document.createElement(tag); + + for (var i in o) { + var val = o[i]; + + if (i === "inside") { + $(val).appendChild(element); + } + else if (i === "around") { + var ref = $(val); + ref.parentNode.insertBefore(element, ref); + element.appendChild(ref); + } + else if (i in element) { + element[i] = val; + } + else { + element.setAttribute(i, val); + } + } + + return element; + }; + + $.bind = function(element, o) { + if (element) { + for (var event in o) { + var callback = o[event]; + + event.split(/\s+/).forEach(function (event) { + element.addEventListener(event, callback); + }); + } + } + }; + + $.fire = function(target, type, properties) { + var evt = document.createEvent("HTMLEvents"); + + evt.initEvent(type, true, true ); + + for (var j in properties) { + evt[j] = properties[j]; + } + + target.dispatchEvent(evt); + }; + + $.regExpEscape = function (s) { + return s.replace(/[-\\^$*+?.()|[\]{}]/g, "\\$&"); + } + +// Initialization + + function init() { + $$("input.awesomplete").forEach(function (input) { + new Awesomplete(input); + }); + } + +// Are we in a browser? Check for Document constructor + if (typeof Document !== 'undefined') { + // DOM already loaded? + if (document.readyState !== "loading") { + init(); + } + else { + // Wait for it + document.addEventListener("DOMContentLoaded", init); + } + } + + _.$ = $; + _.$$ = $$; + +// Make sure to export Awesomplete on self when in a browser + if (typeof self !== 'undefined') { + self.Awesomplete = _; + } + +// Expose Awesomplete as a CJS module + if (typeof exports === 'object') { + module.exports = _; + } + + return _; + +}()); diff --git a/inc/awesomplete.min.js b/inc/awesomplete.min.js new file mode 100644 index 0000000..3bfb05e --- /dev/null +++ b/inc/awesomplete.min.js @@ -0,0 +1,10 @@ +// Awesomplete - Lea Verou - MIT license +(function(){function m(a,b){for(var c in a){var f=a[c],e=this.input.getAttribute("data-"+c.toLowerCase());this[c]="number"===typeof f?+e:!1===f?null!==e:f instanceof Function?null:e;this[c]=this[c]||b[c]||f}}function d(a,b){return"string"===typeof a?(b||document).querySelector(a):a||null}function h(a,b){return k.call((b||document).querySelectorAll(a))}function l(){h("input.awesomplete").forEach(function(a){new Awesomplete(a)})}var g=self.Awesomplete=function(a,b){var c=this;this.input=d(a);this.input.setAttribute("aria-autocomplete", + "list");b=b||{};m.call(this,{minChars:2,maxItems:10,autoFirst:!1,filter:g.FILTER_CONTAINS,sort:g.SORT_BYLENGTH,item:function(a,b){return d.create("li",{innerHTML:a.replace(RegExp(d.regExpEscape(b.trim()),"gi"),"$&"),"aria-selected":"false"})},replace:function(a){this.input.value=a}},b);this.index=-1;this.container=d.create("div",{className:"awesomplete",around:a});this.ul=d.create("ul",{hidden:"",inside:this.container});this.status=d.create("span",{className:"visually-hidden",role:"status", + "aria-live":"assertive","aria-relevant":"additions",inside:this.container});d.bind(this.input,{input:this.evaluate.bind(this),blur:this.close.bind(this),keydown:function(a){var b=a.keyCode;if(c.opened)if(13===b&&c.selected)a.preventDefault(),c.select();else if(27===b)c.close();else if(38===b||40===b)a.preventDefault(),c[38===b?"previous":"next"]()}});d.bind(this.input.form,{submit:this.close.bind(this)});d.bind(this.ul,{mousedown:function(a){a=a.target;if(a!==this){for(;a&&!/li/i.test(a.nodeName);)a= + a.parentNode;a&&c.select(a)}}});this.input.hasAttribute("list")?(this.list="#"+a.getAttribute("list"),a.removeAttribute("list")):this.list=this.input.getAttribute("data-list")||b.list||[];g.all.push(this)};g.prototype={set list(a){Array.isArray(a)?this._list=a:"string"===typeof a&&-1=this.minChars&&0= 0 && j < len ? [ this[j] ] : [] ); - }, - - end: function() { - return this.prevObject || this.constructor(null); - }, - - // For internal use only. - // Behaves like an Array's method, not like a jQuery method. - push: push, - sort: deletedIds.sort, - splice: deletedIds.splice -}; - -jQuery.extend = jQuery.fn.extend = function() { - var src, copyIsArray, copy, name, options, clone, - target = arguments[0] || {}, - i = 1, - length = arguments.length, - deep = false; - - // Handle a deep copy situation - if ( typeof target === "boolean" ) { - deep = target; - - // skip the boolean and the target - target = arguments[ i ] || {}; - i++; - } - - // Handle case when target is a string or something (possible in deep copy) - if ( typeof target !== "object" && !jQuery.isFunction(target) ) { - target = {}; - } - - // extend jQuery itself if only one argument is passed - if ( i === length ) { - target = this; - i--; - } - - for ( ; i < length; i++ ) { - // Only deal with non-null/undefined values - if ( (options = arguments[ i ]) != null ) { - // Extend the base object - for ( name in options ) { - src = target[ name ]; - copy = options[ name ]; - - // Prevent never-ending loop - if ( target === copy ) { - continue; - } - - // Recurse if we're merging plain objects or arrays - if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { - if ( copyIsArray ) { - copyIsArray = false; - clone = src && jQuery.isArray(src) ? src : []; - - } else { - clone = src && jQuery.isPlainObject(src) ? src : {}; - } - - // Never move original objects, clone them - target[ name ] = jQuery.extend( deep, clone, copy ); - - // Don't bring in undefined values - } else if ( copy !== undefined ) { - target[ name ] = copy; - } - } - } - } - - // Return the modified object - return target; -}; - -jQuery.extend({ - // Unique for each copy of jQuery on the page - expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), - - // Assume jQuery is ready without the ready module - isReady: true, - - error: function( msg ) { - throw new Error( msg ); - }, - - noop: function() {}, - - // See test/unit/core.js for details concerning isFunction. - // Since version 1.3, DOM methods and functions like alert - // aren't supported. They return false on IE (#2968). - isFunction: function( obj ) { - return jQuery.type(obj) === "function"; - }, - - isArray: Array.isArray || function( obj ) { - return jQuery.type(obj) === "array"; - }, - - isWindow: function( obj ) { - /* jshint eqeqeq: false */ - return obj != null && obj == obj.window; - }, - - isNumeric: function( obj ) { - // parseFloat NaNs numeric-cast false positives (null|true|false|"") - // ...but misinterprets leading-number strings, particularly hex literals ("0x...") - // subtraction forces infinities to NaN - // adding 1 corrects loss of precision from parseFloat (#15100) - return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0; - }, - - isEmptyObject: function( obj ) { - var name; - for ( name in obj ) { - return false; - } - return true; - }, - - isPlainObject: function( obj ) { - var key; - - // Must be an Object. - // Because of IE, we also have to check the presence of the constructor property. - // Make sure that DOM nodes and window objects don't pass through, as well - if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { - return false; - } - - try { - // Not own constructor property must be Object - if ( obj.constructor && - !hasOwn.call(obj, "constructor") && - !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { - return false; - } - } catch ( e ) { - // IE8,9 Will throw exceptions on certain host objects #9897 - return false; - } - - // Support: IE<9 - // Handle iteration over inherited properties before own properties. - if ( support.ownLast ) { - for ( key in obj ) { - return hasOwn.call( obj, key ); - } - } - - // Own properties are enumerated firstly, so to speed up, - // if last one is own, then all properties are own. - for ( key in obj ) {} - - return key === undefined || hasOwn.call( obj, key ); - }, - - type: function( obj ) { - if ( obj == null ) { - return obj + ""; - } - return typeof obj === "object" || typeof obj === "function" ? - class2type[ toString.call(obj) ] || "object" : - typeof obj; - }, - - // Evaluates a script in a global context - // Workarounds based on findings by Jim Driscoll - // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context - globalEval: function( data ) { - if ( data && jQuery.trim( data ) ) { - // We use execScript on Internet Explorer - // We use an anonymous function so that context is window - // rather than jQuery in Firefox - ( window.execScript || function( data ) { - window[ "eval" ].call( window, data ); - } )( data ); - } - }, - - // Convert dashed to camelCase; used by the css and data modules - // Microsoft forgot to hump their vendor prefix (#9572) - camelCase: function( string ) { - return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); - }, - - nodeName: function( elem, name ) { - return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); - }, - - // args is for internal usage only - each: function( obj, callback, args ) { - var value, - i = 0, - length = obj.length, - isArray = isArraylike( obj ); - - if ( args ) { - if ( isArray ) { - for ( ; i < length; i++ ) { - value = callback.apply( obj[ i ], args ); - - if ( value === false ) { - break; - } - } - } else { - for ( i in obj ) { - value = callback.apply( obj[ i ], args ); - - if ( value === false ) { - break; - } - } - } - - // A special, fast, case for the most common use of each - } else { - if ( isArray ) { - for ( ; i < length; i++ ) { - value = callback.call( obj[ i ], i, obj[ i ] ); - - if ( value === false ) { - break; - } - } - } else { - for ( i in obj ) { - value = callback.call( obj[ i ], i, obj[ i ] ); - - if ( value === false ) { - break; - } - } - } - } - - return obj; - }, - - // Support: Android<4.1, IE<9 - trim: function( text ) { - return text == null ? - "" : - ( text + "" ).replace( rtrim, "" ); - }, - - // results is for internal usage only - makeArray: function( arr, results ) { - var ret = results || []; - - if ( arr != null ) { - if ( isArraylike( Object(arr) ) ) { - jQuery.merge( ret, - typeof arr === "string" ? - [ arr ] : arr - ); - } else { - push.call( ret, arr ); - } - } - - return ret; - }, - - inArray: function( elem, arr, i ) { - var len; - - if ( arr ) { - if ( indexOf ) { - return indexOf.call( arr, elem, i ); - } - - len = arr.length; - i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0; - - for ( ; i < len; i++ ) { - // Skip accessing in sparse arrays - if ( i in arr && arr[ i ] === elem ) { - return i; - } - } - } - - return -1; - }, - - merge: function( first, second ) { - var len = +second.length, - j = 0, - i = first.length; - - while ( j < len ) { - first[ i++ ] = second[ j++ ]; - } - - // Support: IE<9 - // Workaround casting of .length to NaN on otherwise arraylike objects (e.g., NodeLists) - if ( len !== len ) { - while ( second[j] !== undefined ) { - first[ i++ ] = second[ j++ ]; - } - } - - first.length = i; - - return first; - }, - - grep: function( elems, callback, invert ) { - var callbackInverse, - matches = [], - i = 0, - length = elems.length, - callbackExpect = !invert; - - // Go through the array, only saving the items - // that pass the validator function - for ( ; i < length; i++ ) { - callbackInverse = !callback( elems[ i ], i ); - if ( callbackInverse !== callbackExpect ) { - matches.push( elems[ i ] ); - } - } - - return matches; - }, - - // arg is for internal usage only - map: function( elems, callback, arg ) { - var value, - i = 0, - length = elems.length, - isArray = isArraylike( elems ), - ret = []; - - // Go through the array, translating each of the items to their new values - if ( isArray ) { - for ( ; i < length; i++ ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret.push( value ); - } - } - - // Go through every key on the object, - } else { - for ( i in elems ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret.push( value ); - } - } - } - - // Flatten any nested arrays - return concat.apply( [], ret ); - }, - - // A global GUID counter for objects - guid: 1, - - // Bind a function to a context, optionally partially applying any - // arguments. - proxy: function( fn, context ) { - var args, proxy, tmp; - - if ( typeof context === "string" ) { - tmp = fn[ context ]; - context = fn; - fn = tmp; - } - - // Quick check to determine if target is callable, in the spec - // this throws a TypeError, but we will just return undefined. - if ( !jQuery.isFunction( fn ) ) { - return undefined; - } - - // Simulated bind - args = slice.call( arguments, 2 ); - proxy = function() { - return fn.apply( context || this, args.concat( slice.call( arguments ) ) ); - }; - - // Set the guid of unique handler to the same of original handler, so it can be removed - proxy.guid = fn.guid = fn.guid || jQuery.guid++; - - return proxy; - }, - - now: function() { - return +( new Date() ); - }, - - // jQuery.support is not used in Core but other projects attach their - // properties to it so it needs to exist. - support: support -}); - -// Populate the class2type map -jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) { - class2type[ "[object " + name + "]" ] = name.toLowerCase(); -}); - -function isArraylike( obj ) { - var length = obj.length, - type = jQuery.type( obj ); - - if ( type === "function" || jQuery.isWindow( obj ) ) { - return false; - } - - if ( obj.nodeType === 1 && length ) { - return true; - } - - return type === "array" || length === 0 || - typeof length === "number" && length > 0 && ( length - 1 ) in obj; -} -var Sizzle = -/*! - * Sizzle CSS Selector Engine v2.2.0-pre - * http://sizzlejs.com/ - * - * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors - * Released under the MIT license - * http://jquery.org/license - * - * Date: 2014-12-16 - */ -(function( window ) { - -var i, - support, - Expr, - getText, - isXML, - tokenize, - compile, - select, - outermostContext, - sortInput, - hasDuplicate, - - // Local document vars - setDocument, - document, - docElem, - documentIsHTML, - rbuggyQSA, - rbuggyMatches, - matches, - contains, - - // Instance-specific data - expando = "sizzle" + 1 * new Date(), - preferredDoc = window.document, - dirruns = 0, - done = 0, - classCache = createCache(), - tokenCache = createCache(), - compilerCache = createCache(), - sortOrder = function( a, b ) { - if ( a === b ) { - hasDuplicate = true; - } - return 0; - }, - - // General-purpose constants - MAX_NEGATIVE = 1 << 31, - - // Instance methods - hasOwn = ({}).hasOwnProperty, - arr = [], - pop = arr.pop, - push_native = arr.push, - push = arr.push, - slice = arr.slice, - // Use a stripped-down indexOf as it's faster than native - // http://jsperf.com/thor-indexof-vs-for/5 - indexOf = function( list, elem ) { - var i = 0, - len = list.length; - for ( ; i < len; i++ ) { - if ( list[i] === elem ) { - return i; - } - } - return -1; - }, - - booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", - - // Regular expressions - - // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace - whitespace = "[\\x20\\t\\r\\n\\f]", - // http://www.w3.org/TR/css3-syntax/#characters - characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", - - // Loosely modeled on CSS identifier characters - // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors - // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier - identifier = characterEncoding.replace( "w", "w#" ), - - // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors - attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace + - // Operator (capture 2) - "*([*^$|!~]?=)" + whitespace + - // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]" - "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace + - "*\\]", - - pseudos = ":(" + characterEncoding + ")(?:\\((" + - // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments: - // 1. quoted (capture 3; capture 4 or capture 5) - "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" + - // 2. simple (capture 6) - "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" + - // 3. anything else (capture 2) - ".*" + - ")\\)|)", - - // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter - rwhitespace = new RegExp( whitespace + "+", "g" ), - rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), - - rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), - rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ), - - rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ), - - rpseudo = new RegExp( pseudos ), - ridentifier = new RegExp( "^" + identifier + "$" ), - - matchExpr = { - "ID": new RegExp( "^#(" + characterEncoding + ")" ), - "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ), - "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ), - "ATTR": new RegExp( "^" + attributes ), - "PSEUDO": new RegExp( "^" + pseudos ), - "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + - "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + - "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), - "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), - // For use in libraries implementing .is() - // We use this for POS matching in `select` - "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + - whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) - }, - - rinputs = /^(?:input|select|textarea|button)$/i, - rheader = /^h\d$/i, - - rnative = /^[^{]+\{\s*\[native \w/, - - // Easily-parseable/retrievable ID or TAG or CLASS selectors - rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, - - rsibling = /[+~]/, - rescape = /'|\\/g, - - // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters - runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), - funescape = function( _, escaped, escapedWhitespace ) { - var high = "0x" + escaped - 0x10000; - // NaN means non-codepoint - // Support: Firefox<24 - // Workaround erroneous numeric interpretation of +"0x" - return high !== high || escapedWhitespace ? - escaped : - high < 0 ? - // BMP codepoint - String.fromCharCode( high + 0x10000 ) : - // Supplemental Plane codepoint (surrogate pair) - String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); - }, - - // Used for iframes - // See setDocument() - // Removing the function wrapper causes a "Permission Denied" - // error in IE - unloadHandler = function() { - setDocument(); - }; - -// Optimize for push.apply( _, NodeList ) -try { - push.apply( - (arr = slice.call( preferredDoc.childNodes )), - preferredDoc.childNodes - ); - // Support: Android<4.0 - // Detect silently failing push.apply - arr[ preferredDoc.childNodes.length ].nodeType; -} catch ( e ) { - push = { apply: arr.length ? - - // Leverage slice if possible - function( target, els ) { - push_native.apply( target, slice.call(els) ); - } : - - // Support: IE<9 - // Otherwise append directly - function( target, els ) { - var j = target.length, - i = 0; - // Can't trust NodeList.length - while ( (target[j++] = els[i++]) ) {} - target.length = j - 1; - } - }; -} - -function Sizzle( selector, context, results, seed ) { - var match, elem, m, nodeType, - // QSA vars - i, groups, old, nid, newContext, newSelector; - - if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { - setDocument( context ); - } - - context = context || document; - results = results || []; - nodeType = context.nodeType; - - if ( typeof selector !== "string" || !selector || - nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) { - - return results; - } - - if ( !seed && documentIsHTML ) { - - // Try to shortcut find operations when possible (e.g., not under DocumentFragment) - if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) { - // Speed-up: Sizzle("#ID") - if ( (m = match[1]) ) { - if ( nodeType === 9 ) { - elem = context.getElementById( m ); - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document (jQuery #6963) - if ( elem && elem.parentNode ) { - // Handle the case where IE, Opera, and Webkit return items - // by name instead of ID - if ( elem.id === m ) { - results.push( elem ); - return results; - } - } else { - return results; - } - } else { - // Context is not a document - if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) && - contains( context, elem ) && elem.id === m ) { - results.push( elem ); - return results; - } - } - - // Speed-up: Sizzle("TAG") - } else if ( match[2] ) { - push.apply( results, context.getElementsByTagName( selector ) ); - return results; - - // Speed-up: Sizzle(".CLASS") - } else if ( (m = match[3]) && support.getElementsByClassName ) { - push.apply( results, context.getElementsByClassName( m ) ); - return results; - } - } - - // QSA path - if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { - nid = old = expando; - newContext = context; - newSelector = nodeType !== 1 && selector; - - // qSA works strangely on Element-rooted queries - // We can work around this by specifying an extra ID on the root - // and working up from there (Thanks to Andrew Dupont for the technique) - // IE 8 doesn't work on object elements - if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { - groups = tokenize( selector ); - - if ( (old = context.getAttribute("id")) ) { - nid = old.replace( rescape, "\\$&" ); - } else { - context.setAttribute( "id", nid ); - } - nid = "[id='" + nid + "'] "; - - i = groups.length; - while ( i-- ) { - groups[i] = nid + toSelector( groups[i] ); - } - newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context; - newSelector = groups.join(","); - } - - if ( newSelector ) { - try { - push.apply( results, - newContext.querySelectorAll( newSelector ) - ); - return results; - } catch(qsaError) { - } finally { - if ( !old ) { - context.removeAttribute("id"); - } - } - } - } - } - - // All others - return select( selector.replace( rtrim, "$1" ), context, results, seed ); -} - -/** - * Create key-value caches of limited size - * @returns {Function(string, Object)} Returns the Object data after storing it on itself with - * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) - * deleting the oldest entry - */ -function createCache() { - var keys = []; - - function cache( key, value ) { - // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) - if ( keys.push( key + " " ) > Expr.cacheLength ) { - // Only keep the most recent entries - delete cache[ keys.shift() ]; - } - return (cache[ key + " " ] = value); - } - return cache; -} - -/** - * Mark a function for special use by Sizzle - * @param {Function} fn The function to mark - */ -function markFunction( fn ) { - fn[ expando ] = true; - return fn; -} - -/** - * Support testing using an element - * @param {Function} fn Passed the created div and expects a boolean result - */ -function assert( fn ) { - var div = document.createElement("div"); - - try { - return !!fn( div ); - } catch (e) { - return false; - } finally { - // Remove from its parent by default - if ( div.parentNode ) { - div.parentNode.removeChild( div ); - } - // release memory in IE - div = null; - } -} - -/** - * Adds the same handler for all of the specified attrs - * @param {String} attrs Pipe-separated list of attributes - * @param {Function} handler The method that will be applied - */ -function addHandle( attrs, handler ) { - var arr = attrs.split("|"), - i = attrs.length; - - while ( i-- ) { - Expr.attrHandle[ arr[i] ] = handler; - } -} - -/** - * Checks document order of two siblings - * @param {Element} a - * @param {Element} b - * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b - */ -function siblingCheck( a, b ) { - var cur = b && a, - diff = cur && a.nodeType === 1 && b.nodeType === 1 && - ( ~b.sourceIndex || MAX_NEGATIVE ) - - ( ~a.sourceIndex || MAX_NEGATIVE ); - - // Use IE sourceIndex if available on both nodes - if ( diff ) { - return diff; - } - - // Check if b follows a - if ( cur ) { - while ( (cur = cur.nextSibling) ) { - if ( cur === b ) { - return -1; - } - } - } - - return a ? 1 : -1; -} - -/** - * Returns a function to use in pseudos for input types - * @param {String} type - */ -function createInputPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === type; - }; -} - -/** - * Returns a function to use in pseudos for buttons - * @param {String} type - */ -function createButtonPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return (name === "input" || name === "button") && elem.type === type; - }; -} - -/** - * Returns a function to use in pseudos for positionals - * @param {Function} fn - */ -function createPositionalPseudo( fn ) { - return markFunction(function( argument ) { - argument = +argument; - return markFunction(function( seed, matches ) { - var j, - matchIndexes = fn( [], seed.length, argument ), - i = matchIndexes.length; - - // Match elements found at the specified indexes - while ( i-- ) { - if ( seed[ (j = matchIndexes[i]) ] ) { - seed[j] = !(matches[j] = seed[j]); - } - } - }); - }); -} - -/** - * Checks a node for validity as a Sizzle context - * @param {Element|Object=} context - * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value - */ -function testContext( context ) { - return context && typeof context.getElementsByTagName !== "undefined" && context; -} - -// Expose support vars for convenience -support = Sizzle.support = {}; - -/** - * Detects XML nodes - * @param {Element|Object} elem An element or a document - * @returns {Boolean} True iff elem is a non-HTML XML node - */ -isXML = Sizzle.isXML = function( elem ) { - // documentElement is verified for cases where it doesn't yet exist - // (such as loading iframes in IE - #4833) - var documentElement = elem && (elem.ownerDocument || elem).documentElement; - return documentElement ? documentElement.nodeName !== "HTML" : false; -}; - -/** - * Sets document-related variables once based on the current document - * @param {Element|Object} [doc] An element or document object to use to set the document - * @returns {Object} Returns the current document - */ -setDocument = Sizzle.setDocument = function( node ) { - var hasCompare, parent, - doc = node ? node.ownerDocument || node : preferredDoc; - - // If no document and documentElement is available, return - if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { - return document; - } - - // Set our document - document = doc; - docElem = doc.documentElement; - parent = doc.defaultView; - - // Support: IE>8 - // If iframe document is assigned to "document" variable and if iframe has been reloaded, - // IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936 - // IE6-8 do not support the defaultView property so parent will be undefined - if ( parent && parent !== parent.top ) { - // IE11 does not have attachEvent, so all must suffer - if ( parent.addEventListener ) { - parent.addEventListener( "unload", unloadHandler, false ); - } else if ( parent.attachEvent ) { - parent.attachEvent( "onunload", unloadHandler ); - } - } - - /* Support tests - ---------------------------------------------------------------------- */ - documentIsHTML = !isXML( doc ); - - /* Attributes - ---------------------------------------------------------------------- */ - - // Support: IE<8 - // Verify that getAttribute really returns attributes and not properties - // (excepting IE8 booleans) - support.attributes = assert(function( div ) { - div.className = "i"; - return !div.getAttribute("className"); - }); - - /* getElement(s)By* - ---------------------------------------------------------------------- */ - - // Check if getElementsByTagName("*") returns only elements - support.getElementsByTagName = assert(function( div ) { - div.appendChild( doc.createComment("") ); - return !div.getElementsByTagName("*").length; - }); - - // Support: IE<9 - support.getElementsByClassName = rnative.test( doc.getElementsByClassName ); - - // Support: IE<10 - // Check if getElementById returns elements by name - // The broken getElementById methods don't pick up programatically-set names, - // so use a roundabout getElementsByName test - support.getById = assert(function( div ) { - docElem.appendChild( div ).id = expando; - return !doc.getElementsByName || !doc.getElementsByName( expando ).length; - }); - - // ID find and filter - if ( support.getById ) { - Expr.find["ID"] = function( id, context ) { - if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { - var m = context.getElementById( id ); - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - return m && m.parentNode ? [ m ] : []; - } - }; - Expr.filter["ID"] = function( id ) { - var attrId = id.replace( runescape, funescape ); - return function( elem ) { - return elem.getAttribute("id") === attrId; - }; - }; - } else { - // Support: IE6/7 - // getElementById is not reliable as a find shortcut - delete Expr.find["ID"]; - - Expr.filter["ID"] = function( id ) { - var attrId = id.replace( runescape, funescape ); - return function( elem ) { - var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); - return node && node.value === attrId; - }; - }; - } - - // Tag - Expr.find["TAG"] = support.getElementsByTagName ? - function( tag, context ) { - if ( typeof context.getElementsByTagName !== "undefined" ) { - return context.getElementsByTagName( tag ); - - // DocumentFragment nodes don't have gEBTN - } else if ( support.qsa ) { - return context.querySelectorAll( tag ); - } - } : - - function( tag, context ) { - var elem, - tmp = [], - i = 0, - // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too - results = context.getElementsByTagName( tag ); - - // Filter out possible comments - if ( tag === "*" ) { - while ( (elem = results[i++]) ) { - if ( elem.nodeType === 1 ) { - tmp.push( elem ); - } - } - - return tmp; - } - return results; - }; - - // Class - Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { - if ( documentIsHTML ) { - return context.getElementsByClassName( className ); - } - }; - - /* QSA/matchesSelector - ---------------------------------------------------------------------- */ - - // QSA and matchesSelector support - - // matchesSelector(:active) reports false when true (IE9/Opera 11.5) - rbuggyMatches = []; - - // qSa(:focus) reports false when true (Chrome 21) - // We allow this because of a bug in IE8/9 that throws an error - // whenever `document.activeElement` is accessed on an iframe - // So, we allow :focus to pass through QSA all the time to avoid the IE error - // See http://bugs.jquery.com/ticket/13378 - rbuggyQSA = []; - - if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) { - // Build QSA regex - // Regex strategy adopted from Diego Perini - assert(function( div ) { - // Select is set to empty string on purpose - // This is to test IE's treatment of not explicitly - // setting a boolean content attribute, - // since its presence should be enough - // http://bugs.jquery.com/ticket/12359 - docElem.appendChild( div ).innerHTML = "" + - ""; - - // Support: IE8, Opera 11-12.16 - // Nothing should be selected when empty strings follow ^= or $= or *= - // The test attribute must be unknown in Opera but "safe" for WinRT - // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section - if ( div.querySelectorAll("[msallowcapture^='']").length ) { - rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); - } - - // Support: IE8 - // Boolean attributes and "value" are not treated correctly - if ( !div.querySelectorAll("[selected]").length ) { - rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); - } - - // Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+ - if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) { - rbuggyQSA.push("~="); - } - - // Webkit/Opera - :checked should return selected option elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - // IE8 throws error here and will not see later tests - if ( !div.querySelectorAll(":checked").length ) { - rbuggyQSA.push(":checked"); - } - - // Support: Safari 8+, iOS 8+ - // https://bugs.webkit.org/show_bug.cgi?id=136851 - // In-page `selector#id sibing-combinator selector` fails - if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) { - rbuggyQSA.push(".#.+[+~]"); - } - }); - - assert(function( div ) { - // Support: Windows 8 Native Apps - // The type and name attributes are restricted during .innerHTML assignment - var input = doc.createElement("input"); - input.setAttribute( "type", "hidden" ); - div.appendChild( input ).setAttribute( "name", "D" ); - - // Support: IE8 - // Enforce case-sensitivity of name attribute - if ( div.querySelectorAll("[name=d]").length ) { - rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" ); - } - - // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) - // IE8 throws error here and will not see later tests - if ( !div.querySelectorAll(":enabled").length ) { - rbuggyQSA.push( ":enabled", ":disabled" ); - } - - // Opera 10-11 does not throw on post-comma invalid pseudos - div.querySelectorAll("*,:x"); - rbuggyQSA.push(",.*:"); - }); - } - - if ( (support.matchesSelector = rnative.test( (matches = docElem.matches || - docElem.webkitMatchesSelector || - docElem.mozMatchesSelector || - docElem.oMatchesSelector || - docElem.msMatchesSelector) )) ) { - - assert(function( div ) { - // Check to see if it's possible to do matchesSelector - // on a disconnected node (IE 9) - support.disconnectedMatch = matches.call( div, "div" ); - - // This should fail with an exception - // Gecko does not error, returns false instead - matches.call( div, "[s!='']:x" ); - rbuggyMatches.push( "!=", pseudos ); - }); - } - - rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); - rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); - - /* Contains - ---------------------------------------------------------------------- */ - hasCompare = rnative.test( docElem.compareDocumentPosition ); - - // Element contains another - // Purposefully does not implement inclusive descendent - // As in, an element does not contain itself - contains = hasCompare || rnative.test( docElem.contains ) ? - function( a, b ) { - var adown = a.nodeType === 9 ? a.documentElement : a, - bup = b && b.parentNode; - return a === bup || !!( bup && bup.nodeType === 1 && ( - adown.contains ? - adown.contains( bup ) : - a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 - )); - } : - function( a, b ) { - if ( b ) { - while ( (b = b.parentNode) ) { - if ( b === a ) { - return true; - } - } - } - return false; - }; - - /* Sorting - ---------------------------------------------------------------------- */ - - // Document order sorting - sortOrder = hasCompare ? - function( a, b ) { - - // Flag for duplicate removal - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - // Sort on method existence if only one input has compareDocumentPosition - var compare = !a.compareDocumentPosition - !b.compareDocumentPosition; - if ( compare ) { - return compare; - } - - // Calculate position if both inputs belong to the same document - compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ? - a.compareDocumentPosition( b ) : - - // Otherwise we know they are disconnected - 1; - - // Disconnected nodes - if ( compare & 1 || - (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { - - // Choose the first element that is related to our preferred document - if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) { - return -1; - } - if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) { - return 1; - } - - // Maintain original order - return sortInput ? - ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : - 0; - } - - return compare & 4 ? -1 : 1; - } : - function( a, b ) { - // Exit early if the nodes are identical - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - var cur, - i = 0, - aup = a.parentNode, - bup = b.parentNode, - ap = [ a ], - bp = [ b ]; - - // Parentless nodes are either documents or disconnected - if ( !aup || !bup ) { - return a === doc ? -1 : - b === doc ? 1 : - aup ? -1 : - bup ? 1 : - sortInput ? - ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : - 0; - - // If the nodes are siblings, we can do a quick check - } else if ( aup === bup ) { - return siblingCheck( a, b ); - } - - // Otherwise we need full lists of their ancestors for comparison - cur = a; - while ( (cur = cur.parentNode) ) { - ap.unshift( cur ); - } - cur = b; - while ( (cur = cur.parentNode) ) { - bp.unshift( cur ); - } - - // Walk down the tree looking for a discrepancy - while ( ap[i] === bp[i] ) { - i++; - } - - return i ? - // Do a sibling check if the nodes have a common ancestor - siblingCheck( ap[i], bp[i] ) : - - // Otherwise nodes in our document sort first - ap[i] === preferredDoc ? -1 : - bp[i] === preferredDoc ? 1 : - 0; - }; - - return doc; -}; - -Sizzle.matches = function( expr, elements ) { - return Sizzle( expr, null, null, elements ); -}; - -Sizzle.matchesSelector = function( elem, expr ) { - // Set document vars if needed - if ( ( elem.ownerDocument || elem ) !== document ) { - setDocument( elem ); - } - - // Make sure that attribute selectors are quoted - expr = expr.replace( rattributeQuotes, "='$1']" ); - - if ( support.matchesSelector && documentIsHTML && - ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && - ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { - - try { - var ret = matches.call( elem, expr ); - - // IE 9's matchesSelector returns false on disconnected nodes - if ( ret || support.disconnectedMatch || - // As well, disconnected nodes are said to be in a document - // fragment in IE 9 - elem.document && elem.document.nodeType !== 11 ) { - return ret; - } - } catch (e) {} - } - - return Sizzle( expr, document, null, [ elem ] ).length > 0; -}; - -Sizzle.contains = function( context, elem ) { - // Set document vars if needed - if ( ( context.ownerDocument || context ) !== document ) { - setDocument( context ); - } - return contains( context, elem ); -}; - -Sizzle.attr = function( elem, name ) { - // Set document vars if needed - if ( ( elem.ownerDocument || elem ) !== document ) { - setDocument( elem ); - } - - var fn = Expr.attrHandle[ name.toLowerCase() ], - // Don't get fooled by Object.prototype properties (jQuery #13807) - val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? - fn( elem, name, !documentIsHTML ) : - undefined; - - return val !== undefined ? - val : - support.attributes || !documentIsHTML ? - elem.getAttribute( name ) : - (val = elem.getAttributeNode(name)) && val.specified ? - val.value : - null; -}; - -Sizzle.error = function( msg ) { - throw new Error( "Syntax error, unrecognized expression: " + msg ); -}; - -/** - * Document sorting and removing duplicates - * @param {ArrayLike} results - */ -Sizzle.uniqueSort = function( results ) { - var elem, - duplicates = [], - j = 0, - i = 0; - - // Unless we *know* we can detect duplicates, assume their presence - hasDuplicate = !support.detectDuplicates; - sortInput = !support.sortStable && results.slice( 0 ); - results.sort( sortOrder ); - - if ( hasDuplicate ) { - while ( (elem = results[i++]) ) { - if ( elem === results[ i ] ) { - j = duplicates.push( i ); - } - } - while ( j-- ) { - results.splice( duplicates[ j ], 1 ); - } - } - - // Clear input after sorting to release objects - // See https://github.com/jquery/sizzle/pull/225 - sortInput = null; - - return results; -}; - -/** - * Utility function for retrieving the text value of an array of DOM nodes - * @param {Array|Element} elem - */ -getText = Sizzle.getText = function( elem ) { - var node, - ret = "", - i = 0, - nodeType = elem.nodeType; - - if ( !nodeType ) { - // If no nodeType, this is expected to be an array - while ( (node = elem[i++]) ) { - // Do not traverse comment nodes - ret += getText( node ); - } - } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { - // Use textContent for elements - // innerText usage removed for consistency of new lines (jQuery #11153) - if ( typeof elem.textContent === "string" ) { - return elem.textContent; - } else { - // Traverse its children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - ret += getText( elem ); - } - } - } else if ( nodeType === 3 || nodeType === 4 ) { - return elem.nodeValue; - } - // Do not include comment or processing instruction nodes - - return ret; -}; - -Expr = Sizzle.selectors = { - - // Can be adjusted by the user - cacheLength: 50, - - createPseudo: markFunction, - - match: matchExpr, - - attrHandle: {}, - - find: {}, - - relative: { - ">": { dir: "parentNode", first: true }, - " ": { dir: "parentNode" }, - "+": { dir: "previousSibling", first: true }, - "~": { dir: "previousSibling" } - }, - - preFilter: { - "ATTR": function( match ) { - match[1] = match[1].replace( runescape, funescape ); - - // Move the given value to match[3] whether quoted or unquoted - match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape ); - - if ( match[2] === "~=" ) { - match[3] = " " + match[3] + " "; - } - - return match.slice( 0, 4 ); - }, - - "CHILD": function( match ) { - /* matches from matchExpr["CHILD"] - 1 type (only|nth|...) - 2 what (child|of-type) - 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) - 4 xn-component of xn+y argument ([+-]?\d*n|) - 5 sign of xn-component - 6 x of xn-component - 7 sign of y-component - 8 y of y-component - */ - match[1] = match[1].toLowerCase(); - - if ( match[1].slice( 0, 3 ) === "nth" ) { - // nth-* requires argument - if ( !match[3] ) { - Sizzle.error( match[0] ); - } - - // numeric x and y parameters for Expr.filter.CHILD - // remember that false/true cast respectively to 0/1 - match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); - match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); - - // other types prohibit arguments - } else if ( match[3] ) { - Sizzle.error( match[0] ); - } - - return match; - }, - - "PSEUDO": function( match ) { - var excess, - unquoted = !match[6] && match[2]; - - if ( matchExpr["CHILD"].test( match[0] ) ) { - return null; - } - - // Accept quoted arguments as-is - if ( match[3] ) { - match[2] = match[4] || match[5] || ""; - - // Strip excess characters from unquoted arguments - } else if ( unquoted && rpseudo.test( unquoted ) && - // Get excess from tokenize (recursively) - (excess = tokenize( unquoted, true )) && - // advance to the next closing parenthesis - (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { - - // excess is a negative index - match[0] = match[0].slice( 0, excess ); - match[2] = unquoted.slice( 0, excess ); - } - - // Return only captures needed by the pseudo filter method (type and argument) - return match.slice( 0, 3 ); - } - }, - - filter: { - - "TAG": function( nodeNameSelector ) { - var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); - return nodeNameSelector === "*" ? - function() { return true; } : - function( elem ) { - return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; - }; - }, - - "CLASS": function( className ) { - var pattern = classCache[ className + " " ]; - - return pattern || - (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && - classCache( className, function( elem ) { - return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" ); - }); - }, - - "ATTR": function( name, operator, check ) { - return function( elem ) { - var result = Sizzle.attr( elem, name ); - - if ( result == null ) { - return operator === "!="; - } - if ( !operator ) { - return true; - } - - result += ""; - - return operator === "=" ? result === check : - operator === "!=" ? result !== check : - operator === "^=" ? check && result.indexOf( check ) === 0 : - operator === "*=" ? check && result.indexOf( check ) > -1 : - operator === "$=" ? check && result.slice( -check.length ) === check : - operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 : - operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : - false; - }; - }, - - "CHILD": function( type, what, argument, first, last ) { - var simple = type.slice( 0, 3 ) !== "nth", - forward = type.slice( -4 ) !== "last", - ofType = what === "of-type"; - - return first === 1 && last === 0 ? - - // Shortcut for :nth-*(n) - function( elem ) { - return !!elem.parentNode; - } : - - function( elem, context, xml ) { - var cache, outerCache, node, diff, nodeIndex, start, - dir = simple !== forward ? "nextSibling" : "previousSibling", - parent = elem.parentNode, - name = ofType && elem.nodeName.toLowerCase(), - useCache = !xml && !ofType; - - if ( parent ) { - - // :(first|last|only)-(child|of-type) - if ( simple ) { - while ( dir ) { - node = elem; - while ( (node = node[ dir ]) ) { - if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) { - return false; - } - } - // Reverse direction for :only-* (if we haven't yet done so) - start = dir = type === "only" && !start && "nextSibling"; - } - return true; - } - - start = [ forward ? parent.firstChild : parent.lastChild ]; - - // non-xml :nth-child(...) stores cache data on `parent` - if ( forward && useCache ) { - // Seek `elem` from a previously-cached index - outerCache = parent[ expando ] || (parent[ expando ] = {}); - cache = outerCache[ type ] || []; - nodeIndex = cache[0] === dirruns && cache[1]; - diff = cache[0] === dirruns && cache[2]; - node = nodeIndex && parent.childNodes[ nodeIndex ]; - - while ( (node = ++nodeIndex && node && node[ dir ] || - - // Fallback to seeking `elem` from the start - (diff = nodeIndex = 0) || start.pop()) ) { - - // When found, cache indexes on `parent` and break - if ( node.nodeType === 1 && ++diff && node === elem ) { - outerCache[ type ] = [ dirruns, nodeIndex, diff ]; - break; - } - } - - // Use previously-cached element index if available - } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) { - diff = cache[1]; - - // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...) - } else { - // Use the same loop as above to seek `elem` from the start - while ( (node = ++nodeIndex && node && node[ dir ] || - (diff = nodeIndex = 0) || start.pop()) ) { - - if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) { - // Cache the index of each encountered element - if ( useCache ) { - (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ]; - } - - if ( node === elem ) { - break; - } - } - } - } - - // Incorporate the offset, then check against cycle size - diff -= last; - return diff === first || ( diff % first === 0 && diff / first >= 0 ); - } - }; - }, - - "PSEUDO": function( pseudo, argument ) { - // pseudo-class names are case-insensitive - // http://www.w3.org/TR/selectors/#pseudo-classes - // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters - // Remember that setFilters inherits from pseudos - var args, - fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || - Sizzle.error( "unsupported pseudo: " + pseudo ); - - // The user may use createPseudo to indicate that - // arguments are needed to create the filter function - // just as Sizzle does - if ( fn[ expando ] ) { - return fn( argument ); - } - - // But maintain support for old signatures - if ( fn.length > 1 ) { - args = [ pseudo, pseudo, "", argument ]; - return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? - markFunction(function( seed, matches ) { - var idx, - matched = fn( seed, argument ), - i = matched.length; - while ( i-- ) { - idx = indexOf( seed, matched[i] ); - seed[ idx ] = !( matches[ idx ] = matched[i] ); - } - }) : - function( elem ) { - return fn( elem, 0, args ); - }; - } - - return fn; - } - }, - - pseudos: { - // Potentially complex pseudos - "not": markFunction(function( selector ) { - // Trim the selector passed to compile - // to avoid treating leading and trailing - // spaces as combinators - var input = [], - results = [], - matcher = compile( selector.replace( rtrim, "$1" ) ); - - return matcher[ expando ] ? - markFunction(function( seed, matches, context, xml ) { - var elem, - unmatched = matcher( seed, null, xml, [] ), - i = seed.length; - - // Match elements unmatched by `matcher` - while ( i-- ) { - if ( (elem = unmatched[i]) ) { - seed[i] = !(matches[i] = elem); - } - } - }) : - function( elem, context, xml ) { - input[0] = elem; - matcher( input, null, xml, results ); - // Don't keep the element (issue #299) - input[0] = null; - return !results.pop(); - }; - }), - - "has": markFunction(function( selector ) { - return function( elem ) { - return Sizzle( selector, elem ).length > 0; - }; - }), - - "contains": markFunction(function( text ) { - text = text.replace( runescape, funescape ); - return function( elem ) { - return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; - }; - }), - - // "Whether an element is represented by a :lang() selector - // is based solely on the element's language value - // being equal to the identifier C, - // or beginning with the identifier C immediately followed by "-". - // The matching of C against the element's language value is performed case-insensitively. - // The identifier C does not have to be a valid language name." - // http://www.w3.org/TR/selectors/#lang-pseudo - "lang": markFunction( function( lang ) { - // lang value must be a valid identifier - if ( !ridentifier.test(lang || "") ) { - Sizzle.error( "unsupported lang: " + lang ); - } - lang = lang.replace( runescape, funescape ).toLowerCase(); - return function( elem ) { - var elemLang; - do { - if ( (elemLang = documentIsHTML ? - elem.lang : - elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { - - elemLang = elemLang.toLowerCase(); - return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; - } - } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); - return false; - }; - }), - - // Miscellaneous - "target": function( elem ) { - var hash = window.location && window.location.hash; - return hash && hash.slice( 1 ) === elem.id; - }, - - "root": function( elem ) { - return elem === docElem; - }, - - "focus": function( elem ) { - return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); - }, - - // Boolean properties - "enabled": function( elem ) { - return elem.disabled === false; - }, - - "disabled": function( elem ) { - return elem.disabled === true; - }, - - "checked": function( elem ) { - // In CSS3, :checked should return both checked and selected elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - var nodeName = elem.nodeName.toLowerCase(); - return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); - }, - - "selected": function( elem ) { - // Accessing this property makes selected-by-default - // options in Safari work properly - if ( elem.parentNode ) { - elem.parentNode.selectedIndex; - } - - return elem.selected === true; - }, - - // Contents - "empty": function( elem ) { - // http://www.w3.org/TR/selectors/#empty-pseudo - // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5), - // but not by others (comment: 8; processing instruction: 7; etc.) - // nodeType < 6 works because attributes (2) do not appear as children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - if ( elem.nodeType < 6 ) { - return false; - } - } - return true; - }, - - "parent": function( elem ) { - return !Expr.pseudos["empty"]( elem ); - }, - - // Element/input types - "header": function( elem ) { - return rheader.test( elem.nodeName ); - }, - - "input": function( elem ) { - return rinputs.test( elem.nodeName ); - }, - - "button": function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === "button" || name === "button"; - }, - - "text": function( elem ) { - var attr; - return elem.nodeName.toLowerCase() === "input" && - elem.type === "text" && - - // Support: IE<8 - // New HTML5 attribute values (e.g., "search") appear with elem.type === "text" - ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" ); - }, - - // Position-in-collection - "first": createPositionalPseudo(function() { - return [ 0 ]; - }), - - "last": createPositionalPseudo(function( matchIndexes, length ) { - return [ length - 1 ]; - }), - - "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { - return [ argument < 0 ? argument + length : argument ]; - }), - - "even": createPositionalPseudo(function( matchIndexes, length ) { - var i = 0; - for ( ; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "odd": createPositionalPseudo(function( matchIndexes, length ) { - var i = 1; - for ( ; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { - var i = argument < 0 ? argument + length : argument; - for ( ; --i >= 0; ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { - var i = argument < 0 ? argument + length : argument; - for ( ; ++i < length; ) { - matchIndexes.push( i ); - } - return matchIndexes; - }) - } -}; - -Expr.pseudos["nth"] = Expr.pseudos["eq"]; - -// Add button/input type pseudos -for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { - Expr.pseudos[ i ] = createInputPseudo( i ); -} -for ( i in { submit: true, reset: true } ) { - Expr.pseudos[ i ] = createButtonPseudo( i ); -} - -// Easy API for creating new setFilters -function setFilters() {} -setFilters.prototype = Expr.filters = Expr.pseudos; -Expr.setFilters = new setFilters(); - -tokenize = Sizzle.tokenize = function( selector, parseOnly ) { - var matched, match, tokens, type, - soFar, groups, preFilters, - cached = tokenCache[ selector + " " ]; - - if ( cached ) { - return parseOnly ? 0 : cached.slice( 0 ); - } - - soFar = selector; - groups = []; - preFilters = Expr.preFilter; - - while ( soFar ) { - - // Comma and first run - if ( !matched || (match = rcomma.exec( soFar )) ) { - if ( match ) { - // Don't consume trailing commas as valid - soFar = soFar.slice( match[0].length ) || soFar; - } - groups.push( (tokens = []) ); - } - - matched = false; - - // Combinators - if ( (match = rcombinators.exec( soFar )) ) { - matched = match.shift(); - tokens.push({ - value: matched, - // Cast descendant combinators to space - type: match[0].replace( rtrim, " " ) - }); - soFar = soFar.slice( matched.length ); - } - - // Filters - for ( type in Expr.filter ) { - if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || - (match = preFilters[ type ]( match ))) ) { - matched = match.shift(); - tokens.push({ - value: matched, - type: type, - matches: match - }); - soFar = soFar.slice( matched.length ); - } - } - - if ( !matched ) { - break; - } - } - - // Return the length of the invalid excess - // if we're just parsing - // Otherwise, throw an error or return tokens - return parseOnly ? - soFar.length : - soFar ? - Sizzle.error( selector ) : - // Cache the tokens - tokenCache( selector, groups ).slice( 0 ); -}; - -function toSelector( tokens ) { - var i = 0, - len = tokens.length, - selector = ""; - for ( ; i < len; i++ ) { - selector += tokens[i].value; - } - return selector; -} - -function addCombinator( matcher, combinator, base ) { - var dir = combinator.dir, - checkNonElements = base && dir === "parentNode", - doneName = done++; - - return combinator.first ? - // Check against closest ancestor/preceding element - function( elem, context, xml ) { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - return matcher( elem, context, xml ); - } - } - } : - - // Check against all ancestor/preceding elements - function( elem, context, xml ) { - var oldCache, outerCache, - newCache = [ dirruns, doneName ]; - - // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching - if ( xml ) { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - if ( matcher( elem, context, xml ) ) { - return true; - } - } - } - } else { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - outerCache = elem[ expando ] || (elem[ expando ] = {}); - if ( (oldCache = outerCache[ dir ]) && - oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) { - - // Assign to newCache so results back-propagate to previous elements - return (newCache[ 2 ] = oldCache[ 2 ]); - } else { - // Reuse newcache so results back-propagate to previous elements - outerCache[ dir ] = newCache; - - // A match means we're done; a fail means we have to keep checking - if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) { - return true; - } - } - } - } - } - }; -} - -function elementMatcher( matchers ) { - return matchers.length > 1 ? - function( elem, context, xml ) { - var i = matchers.length; - while ( i-- ) { - if ( !matchers[i]( elem, context, xml ) ) { - return false; - } - } - return true; - } : - matchers[0]; -} - -function multipleContexts( selector, contexts, results ) { - var i = 0, - len = contexts.length; - for ( ; i < len; i++ ) { - Sizzle( selector, contexts[i], results ); - } - return results; -} - -function condense( unmatched, map, filter, context, xml ) { - var elem, - newUnmatched = [], - i = 0, - len = unmatched.length, - mapped = map != null; - - for ( ; i < len; i++ ) { - if ( (elem = unmatched[i]) ) { - if ( !filter || filter( elem, context, xml ) ) { - newUnmatched.push( elem ); - if ( mapped ) { - map.push( i ); - } - } - } - } - - return newUnmatched; -} - -function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { - if ( postFilter && !postFilter[ expando ] ) { - postFilter = setMatcher( postFilter ); - } - if ( postFinder && !postFinder[ expando ] ) { - postFinder = setMatcher( postFinder, postSelector ); - } - return markFunction(function( seed, results, context, xml ) { - var temp, i, elem, - preMap = [], - postMap = [], - preexisting = results.length, - - // Get initial elements from seed or context - elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), - - // Prefilter to get matcher input, preserving a map for seed-results synchronization - matcherIn = preFilter && ( seed || !selector ) ? - condense( elems, preMap, preFilter, context, xml ) : - elems, - - matcherOut = matcher ? - // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, - postFinder || ( seed ? preFilter : preexisting || postFilter ) ? - - // ...intermediate processing is necessary - [] : - - // ...otherwise use results directly - results : - matcherIn; - - // Find primary matches - if ( matcher ) { - matcher( matcherIn, matcherOut, context, xml ); - } - - // Apply postFilter - if ( postFilter ) { - temp = condense( matcherOut, postMap ); - postFilter( temp, [], context, xml ); - - // Un-match failing elements by moving them back to matcherIn - i = temp.length; - while ( i-- ) { - if ( (elem = temp[i]) ) { - matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); - } - } - } - - if ( seed ) { - if ( postFinder || preFilter ) { - if ( postFinder ) { - // Get the final matcherOut by condensing this intermediate into postFinder contexts - temp = []; - i = matcherOut.length; - while ( i-- ) { - if ( (elem = matcherOut[i]) ) { - // Restore matcherIn since elem is not yet a final match - temp.push( (matcherIn[i] = elem) ); - } - } - postFinder( null, (matcherOut = []), temp, xml ); - } - - // Move matched elements from seed to results to keep them synchronized - i = matcherOut.length; - while ( i-- ) { - if ( (elem = matcherOut[i]) && - (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) { - - seed[temp] = !(results[temp] = elem); - } - } - } - - // Add elements to results, through postFinder if defined - } else { - matcherOut = condense( - matcherOut === results ? - matcherOut.splice( preexisting, matcherOut.length ) : - matcherOut - ); - if ( postFinder ) { - postFinder( null, results, matcherOut, xml ); - } else { - push.apply( results, matcherOut ); - } - } - }); -} - -function matcherFromTokens( tokens ) { - var checkContext, matcher, j, - len = tokens.length, - leadingRelative = Expr.relative[ tokens[0].type ], - implicitRelative = leadingRelative || Expr.relative[" "], - i = leadingRelative ? 1 : 0, - - // The foundational matcher ensures that elements are reachable from top-level context(s) - matchContext = addCombinator( function( elem ) { - return elem === checkContext; - }, implicitRelative, true ), - matchAnyContext = addCombinator( function( elem ) { - return indexOf( checkContext, elem ) > -1; - }, implicitRelative, true ), - matchers = [ function( elem, context, xml ) { - var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( - (checkContext = context).nodeType ? - matchContext( elem, context, xml ) : - matchAnyContext( elem, context, xml ) ); - // Avoid hanging onto element (issue #299) - checkContext = null; - return ret; - } ]; - - for ( ; i < len; i++ ) { - if ( (matcher = Expr.relative[ tokens[i].type ]) ) { - matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; - } else { - matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); - - // Return special upon seeing a positional matcher - if ( matcher[ expando ] ) { - // Find the next relative operator (if any) for proper handling - j = ++i; - for ( ; j < len; j++ ) { - if ( Expr.relative[ tokens[j].type ] ) { - break; - } - } - return setMatcher( - i > 1 && elementMatcher( matchers ), - i > 1 && toSelector( - // If the preceding token was a descendant combinator, insert an implicit any-element `*` - tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) - ).replace( rtrim, "$1" ), - matcher, - i < j && matcherFromTokens( tokens.slice( i, j ) ), - j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), - j < len && toSelector( tokens ) - ); - } - matchers.push( matcher ); - } - } - - return elementMatcher( matchers ); -} - -function matcherFromGroupMatchers( elementMatchers, setMatchers ) { - var bySet = setMatchers.length > 0, - byElement = elementMatchers.length > 0, - superMatcher = function( seed, context, xml, results, outermost ) { - var elem, j, matcher, - matchedCount = 0, - i = "0", - unmatched = seed && [], - setMatched = [], - contextBackup = outermostContext, - // We must always have either seed elements or outermost context - elems = seed || byElement && Expr.find["TAG"]( "*", outermost ), - // Use integer dirruns iff this is the outermost matcher - dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1), - len = elems.length; - - if ( outermost ) { - outermostContext = context !== document && context; - } - - // Add elements passing elementMatchers directly to results - // Keep `i` a string if there are no elements so `matchedCount` will be "00" below - // Support: IE<9, Safari - // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id - for ( ; i !== len && (elem = elems[i]) != null; i++ ) { - if ( byElement && elem ) { - j = 0; - while ( (matcher = elementMatchers[j++]) ) { - if ( matcher( elem, context, xml ) ) { - results.push( elem ); - break; - } - } - if ( outermost ) { - dirruns = dirrunsUnique; - } - } - - // Track unmatched elements for set filters - if ( bySet ) { - // They will have gone through all possible matchers - if ( (elem = !matcher && elem) ) { - matchedCount--; - } - - // Lengthen the array for every element, matched or not - if ( seed ) { - unmatched.push( elem ); - } - } - } - - // Apply set filters to unmatched elements - matchedCount += i; - if ( bySet && i !== matchedCount ) { - j = 0; - while ( (matcher = setMatchers[j++]) ) { - matcher( unmatched, setMatched, context, xml ); - } - - if ( seed ) { - // Reintegrate element matches to eliminate the need for sorting - if ( matchedCount > 0 ) { - while ( i-- ) { - if ( !(unmatched[i] || setMatched[i]) ) { - setMatched[i] = pop.call( results ); - } - } - } - - // Discard index placeholder values to get only actual matches - setMatched = condense( setMatched ); - } - - // Add matches to results - push.apply( results, setMatched ); - - // Seedless set matches succeeding multiple successful matchers stipulate sorting - if ( outermost && !seed && setMatched.length > 0 && - ( matchedCount + setMatchers.length ) > 1 ) { - - Sizzle.uniqueSort( results ); - } - } - - // Override manipulation of globals by nested matchers - if ( outermost ) { - dirruns = dirrunsUnique; - outermostContext = contextBackup; - } - - return unmatched; - }; - - return bySet ? - markFunction( superMatcher ) : - superMatcher; -} - -compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) { - var i, - setMatchers = [], - elementMatchers = [], - cached = compilerCache[ selector + " " ]; - - if ( !cached ) { - // Generate a function of recursive functions that can be used to check each element - if ( !match ) { - match = tokenize( selector ); - } - i = match.length; - while ( i-- ) { - cached = matcherFromTokens( match[i] ); - if ( cached[ expando ] ) { - setMatchers.push( cached ); - } else { - elementMatchers.push( cached ); - } - } - - // Cache the compiled function - cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); - - // Save selector and tokenization - cached.selector = selector; - } - return cached; -}; - -/** - * A low-level selection function that works with Sizzle's compiled - * selector functions - * @param {String|Function} selector A selector or a pre-compiled - * selector function built with Sizzle.compile - * @param {Element} context - * @param {Array} [results] - * @param {Array} [seed] A set of elements to match against - */ -select = Sizzle.select = function( selector, context, results, seed ) { - var i, tokens, token, type, find, - compiled = typeof selector === "function" && selector, - match = !seed && tokenize( (selector = compiled.selector || selector) ); - - results = results || []; - - // Try to minimize operations if there is no seed and only one group - if ( match.length === 1 ) { - - // Take a shortcut and set the context if the root selector is an ID - tokens = match[0] = match[0].slice( 0 ); - if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && - support.getById && context.nodeType === 9 && documentIsHTML && - Expr.relative[ tokens[1].type ] ) { - - context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; - if ( !context ) { - return results; - - // Precompiled matchers will still verify ancestry, so step up a level - } else if ( compiled ) { - context = context.parentNode; - } - - selector = selector.slice( tokens.shift().value.length ); - } - - // Fetch a seed set for right-to-left matching - i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; - while ( i-- ) { - token = tokens[i]; - - // Abort if we hit a combinator - if ( Expr.relative[ (type = token.type) ] ) { - break; - } - if ( (find = Expr.find[ type ]) ) { - // Search, expanding context for leading sibling combinators - if ( (seed = find( - token.matches[0].replace( runescape, funescape ), - rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context - )) ) { - - // If seed is empty or no tokens remain, we can return early - tokens.splice( i, 1 ); - selector = seed.length && toSelector( tokens ); - if ( !selector ) { - push.apply( results, seed ); - return results; - } - - break; - } - } - } - } - - // Compile and execute a filtering function if one is not provided - // Provide `match` to avoid retokenization if we modified the selector above - ( compiled || compile( selector, match ) )( - seed, - context, - !documentIsHTML, - results, - rsibling.test( selector ) && testContext( context.parentNode ) || context - ); - return results; -}; - -// One-time assignments - -// Sort stability -support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; - -// Support: Chrome 14-35+ -// Always assume duplicates if they aren't passed to the comparison function -support.detectDuplicates = !!hasDuplicate; - -// Initialize against the default document -setDocument(); - -// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) -// Detached nodes confoundingly follow *each other* -support.sortDetached = assert(function( div1 ) { - // Should return 1, but returns 4 (following) - return div1.compareDocumentPosition( document.createElement("div") ) & 1; -}); - -// Support: IE<8 -// Prevent attribute/property "interpolation" -// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx -if ( !assert(function( div ) { - div.innerHTML = ""; - return div.firstChild.getAttribute("href") === "#" ; -}) ) { - addHandle( "type|href|height|width", function( elem, name, isXML ) { - if ( !isXML ) { - return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); - } - }); -} - -// Support: IE<9 -// Use defaultValue in place of getAttribute("value") -if ( !support.attributes || !assert(function( div ) { - div.innerHTML = ""; - div.firstChild.setAttribute( "value", "" ); - return div.firstChild.getAttribute( "value" ) === ""; -}) ) { - addHandle( "value", function( elem, name, isXML ) { - if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { - return elem.defaultValue; - } - }); -} - -// Support: IE<9 -// Use getAttributeNode to fetch booleans when getAttribute lies -if ( !assert(function( div ) { - return div.getAttribute("disabled") == null; -}) ) { - addHandle( booleans, function( elem, name, isXML ) { - var val; - if ( !isXML ) { - return elem[ name ] === true ? name.toLowerCase() : - (val = elem.getAttributeNode( name )) && val.specified ? - val.value : - null; - } - }); -} - -return Sizzle; - -})( window ); - - - -jQuery.find = Sizzle; -jQuery.expr = Sizzle.selectors; -jQuery.expr[":"] = jQuery.expr.pseudos; -jQuery.unique = Sizzle.uniqueSort; -jQuery.text = Sizzle.getText; -jQuery.isXMLDoc = Sizzle.isXML; -jQuery.contains = Sizzle.contains; - - - -var rneedsContext = jQuery.expr.match.needsContext; - -var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/); - - - -var risSimple = /^.[^:#\[\.,]*$/; - -// Implement the identical functionality for filter and not -function winnow( elements, qualifier, not ) { - if ( jQuery.isFunction( qualifier ) ) { - return jQuery.grep( elements, function( elem, i ) { - /* jshint -W018 */ - return !!qualifier.call( elem, i, elem ) !== not; - }); - - } - - if ( qualifier.nodeType ) { - return jQuery.grep( elements, function( elem ) { - return ( elem === qualifier ) !== not; - }); - - } - - if ( typeof qualifier === "string" ) { - if ( risSimple.test( qualifier ) ) { - return jQuery.filter( qualifier, elements, not ); - } - - qualifier = jQuery.filter( qualifier, elements ); - } - - return jQuery.grep( elements, function( elem ) { - return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not; - }); -} - -jQuery.filter = function( expr, elems, not ) { - var elem = elems[ 0 ]; - - if ( not ) { - expr = ":not(" + expr + ")"; - } - - return elems.length === 1 && elem.nodeType === 1 ? - jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : - jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { - return elem.nodeType === 1; - })); -}; - -jQuery.fn.extend({ - find: function( selector ) { - var i, - ret = [], - self = this, - len = self.length; - - if ( typeof selector !== "string" ) { - return this.pushStack( jQuery( selector ).filter(function() { - for ( i = 0; i < len; i++ ) { - if ( jQuery.contains( self[ i ], this ) ) { - return true; - } - } - }) ); - } - - for ( i = 0; i < len; i++ ) { - jQuery.find( selector, self[ i ], ret ); - } - - // Needed because $( selector, context ) becomes $( context ).find( selector ) - ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret ); - ret.selector = this.selector ? this.selector + " " + selector : selector; - return ret; - }, - filter: function( selector ) { - return this.pushStack( winnow(this, selector || [], false) ); - }, - not: function( selector ) { - return this.pushStack( winnow(this, selector || [], true) ); - }, - is: function( selector ) { - return !!winnow( - this, - - // If this is a positional/relative selector, check membership in the returned set - // so $("p:first").is("p:last") won't return true for a doc with two "p". - typeof selector === "string" && rneedsContext.test( selector ) ? - jQuery( selector ) : - selector || [], - false - ).length; - } -}); - - -// Initialize a jQuery object - - -// A central reference to the root jQuery(document) -var rootjQuery, - - // Use the correct document accordingly with window argument (sandbox) - document = window.document, - - // A simple way to check for HTML strings - // Prioritize #id over to avoid XSS via location.hash (#9521) - // Strict HTML recognition (#11290: must start with <) - rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, - - init = jQuery.fn.init = function( selector, context ) { - var match, elem; - - // HANDLE: $(""), $(null), $(undefined), $(false) - if ( !selector ) { - return this; - } - - // Handle HTML strings - if ( typeof selector === "string" ) { - if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) { - // Assume that strings that start and end with <> are HTML and skip the regex check - match = [ null, selector, null ]; - - } else { - match = rquickExpr.exec( selector ); - } - - // Match html or make sure no context is specified for #id - if ( match && (match[1] || !context) ) { - - // HANDLE: $(html) -> $(array) - if ( match[1] ) { - context = context instanceof jQuery ? context[0] : context; - - // scripts is true for back-compat - // Intentionally let the error be thrown if parseHTML is not present - jQuery.merge( this, jQuery.parseHTML( - match[1], - context && context.nodeType ? context.ownerDocument || context : document, - true - ) ); - - // HANDLE: $(html, props) - if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) { - for ( match in context ) { - // Properties of context are called as methods if possible - if ( jQuery.isFunction( this[ match ] ) ) { - this[ match ]( context[ match ] ); - - // ...and otherwise set as attributes - } else { - this.attr( match, context[ match ] ); - } - } - } - - return this; - - // HANDLE: $(#id) - } else { - elem = document.getElementById( match[2] ); - - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - if ( elem && elem.parentNode ) { - // Handle the case where IE and Opera return items - // by name instead of ID - if ( elem.id !== match[2] ) { - return rootjQuery.find( selector ); - } - - // Otherwise, we inject the element directly into the jQuery object - this.length = 1; - this[0] = elem; - } - - this.context = document; - this.selector = selector; - return this; - } - - // HANDLE: $(expr, $(...)) - } else if ( !context || context.jquery ) { - return ( context || rootjQuery ).find( selector ); - - // HANDLE: $(expr, context) - // (which is just equivalent to: $(context).find(expr) - } else { - return this.constructor( context ).find( selector ); - } - - // HANDLE: $(DOMElement) - } else if ( selector.nodeType ) { - this.context = this[0] = selector; - this.length = 1; - return this; - - // HANDLE: $(function) - // Shortcut for document ready - } else if ( jQuery.isFunction( selector ) ) { - return typeof rootjQuery.ready !== "undefined" ? - rootjQuery.ready( selector ) : - // Execute immediately if ready is not present - selector( jQuery ); - } - - if ( selector.selector !== undefined ) { - this.selector = selector.selector; - this.context = selector.context; - } - - return jQuery.makeArray( selector, this ); - }; - -// Give the init function the jQuery prototype for later instantiation -init.prototype = jQuery.fn; - -// Initialize central reference -rootjQuery = jQuery( document ); - - -var rparentsprev = /^(?:parents|prev(?:Until|All))/, - // methods guaranteed to produce a unique set when starting from a unique set - guaranteedUnique = { - children: true, - contents: true, - next: true, - prev: true - }; - -jQuery.extend({ - dir: function( elem, dir, until ) { - var matched = [], - cur = elem[ dir ]; - - while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { - if ( cur.nodeType === 1 ) { - matched.push( cur ); - } - cur = cur[dir]; - } - return matched; - }, - - sibling: function( n, elem ) { - var r = []; - - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType === 1 && n !== elem ) { - r.push( n ); - } - } - - return r; - } -}); - -jQuery.fn.extend({ - has: function( target ) { - var i, - targets = jQuery( target, this ), - len = targets.length; - - return this.filter(function() { - for ( i = 0; i < len; i++ ) { - if ( jQuery.contains( this, targets[i] ) ) { - return true; - } - } - }); - }, - - closest: function( selectors, context ) { - var cur, - i = 0, - l = this.length, - matched = [], - pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ? - jQuery( selectors, context || this.context ) : - 0; - - for ( ; i < l; i++ ) { - for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) { - // Always skip document fragments - if ( cur.nodeType < 11 && (pos ? - pos.index(cur) > -1 : - - // Don't pass non-elements to Sizzle - cur.nodeType === 1 && - jQuery.find.matchesSelector(cur, selectors)) ) { - - matched.push( cur ); - break; - } - } - } - - return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched ); - }, - - // Determine the position of an element within - // the matched set of elements - index: function( elem ) { - - // No argument, return index in parent - if ( !elem ) { - return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1; - } - - // index in selector - if ( typeof elem === "string" ) { - return jQuery.inArray( this[0], jQuery( elem ) ); - } - - // Locate the position of the desired element - return jQuery.inArray( - // If it receives a jQuery object, the first element is used - elem.jquery ? elem[0] : elem, this ); - }, - - add: function( selector, context ) { - return this.pushStack( - jQuery.unique( - jQuery.merge( this.get(), jQuery( selector, context ) ) - ) - ); - }, - - addBack: function( selector ) { - return this.add( selector == null ? - this.prevObject : this.prevObject.filter(selector) - ); - } -}); - -function sibling( cur, dir ) { - do { - cur = cur[ dir ]; - } while ( cur && cur.nodeType !== 1 ); - - return cur; -} - -jQuery.each({ - parent: function( elem ) { - var parent = elem.parentNode; - return parent && parent.nodeType !== 11 ? parent : null; - }, - parents: function( elem ) { - return jQuery.dir( elem, "parentNode" ); - }, - parentsUntil: function( elem, i, until ) { - return jQuery.dir( elem, "parentNode", until ); - }, - next: function( elem ) { - return sibling( elem, "nextSibling" ); - }, - prev: function( elem ) { - return sibling( elem, "previousSibling" ); - }, - nextAll: function( elem ) { - return jQuery.dir( elem, "nextSibling" ); - }, - prevAll: function( elem ) { - return jQuery.dir( elem, "previousSibling" ); - }, - nextUntil: function( elem, i, until ) { - return jQuery.dir( elem, "nextSibling", until ); - }, - prevUntil: function( elem, i, until ) { - return jQuery.dir( elem, "previousSibling", until ); - }, - siblings: function( elem ) { - return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem ); - }, - children: function( elem ) { - return jQuery.sibling( elem.firstChild ); - }, - contents: function( elem ) { - return jQuery.nodeName( elem, "iframe" ) ? - elem.contentDocument || elem.contentWindow.document : - jQuery.merge( [], elem.childNodes ); - } -}, function( name, fn ) { - jQuery.fn[ name ] = function( until, selector ) { - var ret = jQuery.map( this, fn, until ); - - if ( name.slice( -5 ) !== "Until" ) { - selector = until; - } - - if ( selector && typeof selector === "string" ) { - ret = jQuery.filter( selector, ret ); - } - - if ( this.length > 1 ) { - // Remove duplicates - if ( !guaranteedUnique[ name ] ) { - ret = jQuery.unique( ret ); - } - - // Reverse order for parents* and prev-derivatives - if ( rparentsprev.test( name ) ) { - ret = ret.reverse(); - } - } - - return this.pushStack( ret ); - }; -}); -var rnotwhite = (/\S+/g); - - - -// String to Object options format cache -var optionsCache = {}; - -// Convert String-formatted options into Object-formatted ones and store in cache -function createOptions( options ) { - var object = optionsCache[ options ] = {}; - jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) { - object[ flag ] = true; - }); - return object; -} - -/* - * Create a callback list using the following parameters: - * - * options: an optional list of space-separated options that will change how - * the callback list behaves or a more traditional option object - * - * By default a callback list will act like an event callback list and can be - * "fired" multiple times. - * - * Possible options: - * - * once: will ensure the callback list can only be fired once (like a Deferred) - * - * memory: will keep track of previous values and will call any callback added - * after the list has been fired right away with the latest "memorized" - * values (like a Deferred) - * - * unique: will ensure a callback can only be added once (no duplicate in the list) - * - * stopOnFalse: interrupt callings when a callback returns false - * - */ -jQuery.Callbacks = function( options ) { - - // Convert options from String-formatted to Object-formatted if needed - // (we check in cache first) - options = typeof options === "string" ? - ( optionsCache[ options ] || createOptions( options ) ) : - jQuery.extend( {}, options ); - - var // Flag to know if list is currently firing - firing, - // Last fire value (for non-forgettable lists) - memory, - // Flag to know if list was already fired - fired, - // End of the loop when firing - firingLength, - // Index of currently firing callback (modified by remove if needed) - firingIndex, - // First callback to fire (used internally by add and fireWith) - firingStart, - // Actual callback list - list = [], - // Stack of fire calls for repeatable lists - stack = !options.once && [], - // Fire callbacks - fire = function( data ) { - memory = options.memory && data; - fired = true; - firingIndex = firingStart || 0; - firingStart = 0; - firingLength = list.length; - firing = true; - for ( ; list && firingIndex < firingLength; firingIndex++ ) { - if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) { - memory = false; // To prevent further calls using add - break; - } - } - firing = false; - if ( list ) { - if ( stack ) { - if ( stack.length ) { - fire( stack.shift() ); - } - } else if ( memory ) { - list = []; - } else { - self.disable(); - } - } - }, - // Actual Callbacks object - self = { - // Add a callback or a collection of callbacks to the list - add: function() { - if ( list ) { - // First, we save the current length - var start = list.length; - (function add( args ) { - jQuery.each( args, function( _, arg ) { - var type = jQuery.type( arg ); - if ( type === "function" ) { - if ( !options.unique || !self.has( arg ) ) { - list.push( arg ); - } - } else if ( arg && arg.length && type !== "string" ) { - // Inspect recursively - add( arg ); - } - }); - })( arguments ); - // Do we need to add the callbacks to the - // current firing batch? - if ( firing ) { - firingLength = list.length; - // With memory, if we're not firing then - // we should call right away - } else if ( memory ) { - firingStart = start; - fire( memory ); - } - } - return this; - }, - // Remove a callback from the list - remove: function() { - if ( list ) { - jQuery.each( arguments, function( _, arg ) { - var index; - while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { - list.splice( index, 1 ); - // Handle firing indexes - if ( firing ) { - if ( index <= firingLength ) { - firingLength--; - } - if ( index <= firingIndex ) { - firingIndex--; - } - } - } - }); - } - return this; - }, - // Check if a given callback is in the list. - // If no argument is given, return whether or not list has callbacks attached. - has: function( fn ) { - return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length ); - }, - // Remove all callbacks from the list - empty: function() { - list = []; - firingLength = 0; - return this; - }, - // Have the list do nothing anymore - disable: function() { - list = stack = memory = undefined; - return this; - }, - // Is it disabled? - disabled: function() { - return !list; - }, - // Lock the list in its current state - lock: function() { - stack = undefined; - if ( !memory ) { - self.disable(); - } - return this; - }, - // Is it locked? - locked: function() { - return !stack; - }, - // Call all callbacks with the given context and arguments - fireWith: function( context, args ) { - if ( list && ( !fired || stack ) ) { - args = args || []; - args = [ context, args.slice ? args.slice() : args ]; - if ( firing ) { - stack.push( args ); - } else { - fire( args ); - } - } - return this; - }, - // Call all the callbacks with the given arguments - fire: function() { - self.fireWith( this, arguments ); - return this; - }, - // To know if the callbacks have already been called at least once - fired: function() { - return !!fired; - } - }; - - return self; -}; - - -jQuery.extend({ - - Deferred: function( func ) { - var tuples = [ - // action, add listener, listener list, final state - [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ], - [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ], - [ "notify", "progress", jQuery.Callbacks("memory") ] - ], - state = "pending", - promise = { - state: function() { - return state; - }, - always: function() { - deferred.done( arguments ).fail( arguments ); - return this; - }, - then: function( /* fnDone, fnFail, fnProgress */ ) { - var fns = arguments; - return jQuery.Deferred(function( newDefer ) { - jQuery.each( tuples, function( i, tuple ) { - var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; - // deferred[ done | fail | progress ] for forwarding actions to newDefer - deferred[ tuple[1] ](function() { - var returned = fn && fn.apply( this, arguments ); - if ( returned && jQuery.isFunction( returned.promise ) ) { - returned.promise() - .done( newDefer.resolve ) - .fail( newDefer.reject ) - .progress( newDefer.notify ); - } else { - newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments ); - } - }); - }); - fns = null; - }).promise(); - }, - // Get a promise for this deferred - // If obj is provided, the promise aspect is added to the object - promise: function( obj ) { - return obj != null ? jQuery.extend( obj, promise ) : promise; - } - }, - deferred = {}; - - // Keep pipe for back-compat - promise.pipe = promise.then; - - // Add list-specific methods - jQuery.each( tuples, function( i, tuple ) { - var list = tuple[ 2 ], - stateString = tuple[ 3 ]; - - // promise[ done | fail | progress ] = list.add - promise[ tuple[1] ] = list.add; - - // Handle state - if ( stateString ) { - list.add(function() { - // state = [ resolved | rejected ] - state = stateString; - - // [ reject_list | resolve_list ].disable; progress_list.lock - }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); - } - - // deferred[ resolve | reject | notify ] - deferred[ tuple[0] ] = function() { - deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments ); - return this; - }; - deferred[ tuple[0] + "With" ] = list.fireWith; - }); - - // Make the deferred a promise - promise.promise( deferred ); - - // Call given func if any - if ( func ) { - func.call( deferred, deferred ); - } - - // All done! - return deferred; - }, - - // Deferred helper - when: function( subordinate /* , ..., subordinateN */ ) { - var i = 0, - resolveValues = slice.call( arguments ), - length = resolveValues.length, - - // the count of uncompleted subordinates - remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, - - // the master Deferred. If resolveValues consist of only a single Deferred, just use that. - deferred = remaining === 1 ? subordinate : jQuery.Deferred(), - - // Update function for both resolve and progress values - updateFunc = function( i, contexts, values ) { - return function( value ) { - contexts[ i ] = this; - values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value; - if ( values === progressValues ) { - deferred.notifyWith( contexts, values ); - - } else if ( !(--remaining) ) { - deferred.resolveWith( contexts, values ); - } - }; - }, - - progressValues, progressContexts, resolveContexts; - - // add listeners to Deferred subordinates; treat others as resolved - if ( length > 1 ) { - progressValues = new Array( length ); - progressContexts = new Array( length ); - resolveContexts = new Array( length ); - for ( ; i < length; i++ ) { - if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) { - resolveValues[ i ].promise() - .done( updateFunc( i, resolveContexts, resolveValues ) ) - .fail( deferred.reject ) - .progress( updateFunc( i, progressContexts, progressValues ) ); - } else { - --remaining; - } - } - } - - // if we're not waiting on anything, resolve the master - if ( !remaining ) { - deferred.resolveWith( resolveContexts, resolveValues ); - } - - return deferred.promise(); - } -}); - - -// The deferred used on DOM ready -var readyList; - -jQuery.fn.ready = function( fn ) { - // Add the callback - jQuery.ready.promise().done( fn ); - - return this; -}; - -jQuery.extend({ - // Is the DOM ready to be used? Set to true once it occurs. - isReady: false, - - // A counter to track how many items to wait for before - // the ready event fires. See #6781 - readyWait: 1, - - // Hold (or release) the ready event - holdReady: function( hold ) { - if ( hold ) { - jQuery.readyWait++; - } else { - jQuery.ready( true ); - } - }, - - // Handle when the DOM is ready - ready: function( wait ) { - - // Abort if there are pending holds or we're already ready - if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { - return; - } - - // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). - if ( !document.body ) { - return setTimeout( jQuery.ready ); - } - - // Remember that the DOM is ready - jQuery.isReady = true; - - // If a normal DOM Ready event fired, decrement, and wait if need be - if ( wait !== true && --jQuery.readyWait > 0 ) { - return; - } - - // If there are functions bound, to execute - readyList.resolveWith( document, [ jQuery ] ); - - // Trigger any bound ready events - if ( jQuery.fn.triggerHandler ) { - jQuery( document ).triggerHandler( "ready" ); - jQuery( document ).off( "ready" ); - } - } -}); - -/** - * Clean-up method for dom ready events - */ -function detach() { - if ( document.addEventListener ) { - document.removeEventListener( "DOMContentLoaded", completed, false ); - window.removeEventListener( "load", completed, false ); - - } else { - document.detachEvent( "onreadystatechange", completed ); - window.detachEvent( "onload", completed ); - } -} - -/** - * The ready event handler and self cleanup method - */ -function completed() { - // readyState === "complete" is good enough for us to call the dom ready in oldIE - if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) { - detach(); - jQuery.ready(); - } -} - -jQuery.ready.promise = function( obj ) { - if ( !readyList ) { - - readyList = jQuery.Deferred(); - - // Catch cases where $(document).ready() is called after the browser event has already occurred. - // we once tried to use readyState "interactive" here, but it caused issues like the one - // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15 - if ( document.readyState === "complete" ) { - // Handle it asynchronously to allow scripts the opportunity to delay ready - setTimeout( jQuery.ready ); - - // Standards-based browsers support DOMContentLoaded - } else if ( document.addEventListener ) { - // Use the handy event callback - document.addEventListener( "DOMContentLoaded", completed, false ); - - // A fallback to window.onload, that will always work - window.addEventListener( "load", completed, false ); - - // If IE event model is used - } else { - // Ensure firing before onload, maybe late but safe also for iframes - document.attachEvent( "onreadystatechange", completed ); - - // A fallback to window.onload, that will always work - window.attachEvent( "onload", completed ); - - // If IE and not a frame - // continually check to see if the document is ready - var top = false; - - try { - top = window.frameElement == null && document.documentElement; - } catch(e) {} - - if ( top && top.doScroll ) { - (function doScrollCheck() { - if ( !jQuery.isReady ) { - - try { - // Use the trick by Diego Perini - // http://javascript.nwbox.com/IEContentLoaded/ - top.doScroll("left"); - } catch(e) { - return setTimeout( doScrollCheck, 50 ); - } - - // detach all dom ready events - detach(); - - // and execute any waiting functions - jQuery.ready(); - } - })(); - } - } - } - return readyList.promise( obj ); -}; - - -var strundefined = typeof undefined; - - - -// Support: IE<9 -// Iteration over object's inherited properties before its own -var i; -for ( i in jQuery( support ) ) { - break; -} -support.ownLast = i !== "0"; - -// Note: most support tests are defined in their respective modules. -// false until the test is run -support.inlineBlockNeedsLayout = false; - -// Execute ASAP in case we need to set body.style.zoom -jQuery(function() { - // Minified: var a,b,c,d - var val, div, body, container; - - body = document.getElementsByTagName( "body" )[ 0 ]; - if ( !body || !body.style ) { - // Return for frameset docs that don't have a body - return; - } - - // Setup - div = document.createElement( "div" ); - container = document.createElement( "div" ); - container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px"; - body.appendChild( container ).appendChild( div ); - - if ( typeof div.style.zoom !== strundefined ) { - // Support: IE<8 - // Check if natively block-level elements act like inline-block - // elements when setting their display to 'inline' and giving - // them layout - div.style.cssText = "display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1"; - - support.inlineBlockNeedsLayout = val = div.offsetWidth === 3; - if ( val ) { - // Prevent IE 6 from affecting layout for positioned elements #11048 - // Prevent IE from shrinking the body in IE 7 mode #12869 - // Support: IE<8 - body.style.zoom = 1; - } - } - - body.removeChild( container ); -}); - - - - -(function() { - var div = document.createElement( "div" ); - - // Execute the test only if not already executed in another module. - if (support.deleteExpando == null) { - // Support: IE<9 - support.deleteExpando = true; - try { - delete div.test; - } catch( e ) { - support.deleteExpando = false; - } - } - - // Null elements to avoid leaks in IE. - div = null; -})(); - - -/** - * Determines whether an object can have data - */ -jQuery.acceptData = function( elem ) { - var noData = jQuery.noData[ (elem.nodeName + " ").toLowerCase() ], - nodeType = +elem.nodeType || 1; - - // Do not set data on non-element DOM nodes because it will not be cleared (#8335). - return nodeType !== 1 && nodeType !== 9 ? - false : - - // Nodes accept data unless otherwise specified; rejection can be conditional - !noData || noData !== true && elem.getAttribute("classid") === noData; -}; - - -var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, - rmultiDash = /([A-Z])/g; - -function dataAttr( elem, key, data ) { - // If nothing was found internally, try to fetch any - // data from the HTML5 data-* attribute - if ( data === undefined && elem.nodeType === 1 ) { - - var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); - - data = elem.getAttribute( name ); - - if ( typeof data === "string" ) { - try { - data = data === "true" ? true : - data === "false" ? false : - data === "null" ? null : - // Only convert to a number if it doesn't change the string - +data + "" === data ? +data : - rbrace.test( data ) ? jQuery.parseJSON( data ) : - data; - } catch( e ) {} - - // Make sure we set the data so it isn't changed later - jQuery.data( elem, key, data ); - - } else { - data = undefined; - } - } - - return data; -} - -// checks a cache object for emptiness -function isEmptyDataObject( obj ) { - var name; - for ( name in obj ) { - - // if the public data object is empty, the private is still empty - if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) { - continue; - } - if ( name !== "toJSON" ) { - return false; - } - } - - return true; -} - -function internalData( elem, name, data, pvt /* Internal Use Only */ ) { - if ( !jQuery.acceptData( elem ) ) { - return; - } - - var ret, thisCache, - internalKey = jQuery.expando, - - // We have to handle DOM nodes and JS objects differently because IE6-7 - // can't GC object references properly across the DOM-JS boundary - isNode = elem.nodeType, - - // Only DOM nodes need the global jQuery cache; JS object data is - // attached directly to the object so GC can occur automatically - cache = isNode ? jQuery.cache : elem, - - // Only defining an ID for JS objects if its cache already exists allows - // the code to shortcut on the same path as a DOM node with no cache - id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey; - - // Avoid doing any more work than we need to when trying to get data on an - // object that has no data at all - if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) { - return; - } - - if ( !id ) { - // Only DOM nodes need a new unique ID for each element since their data - // ends up in the global cache - if ( isNode ) { - id = elem[ internalKey ] = deletedIds.pop() || jQuery.guid++; - } else { - id = internalKey; - } - } - - if ( !cache[ id ] ) { - // Avoid exposing jQuery metadata on plain JS objects when the object - // is serialized using JSON.stringify - cache[ id ] = isNode ? {} : { toJSON: jQuery.noop }; - } - - // An object can be passed to jQuery.data instead of a key/value pair; this gets - // shallow copied over onto the existing cache - if ( typeof name === "object" || typeof name === "function" ) { - if ( pvt ) { - cache[ id ] = jQuery.extend( cache[ id ], name ); - } else { - cache[ id ].data = jQuery.extend( cache[ id ].data, name ); - } - } - - thisCache = cache[ id ]; - - // jQuery data() is stored in a separate object inside the object's internal data - // cache in order to avoid key collisions between internal data and user-defined - // data. - if ( !pvt ) { - if ( !thisCache.data ) { - thisCache.data = {}; - } - - thisCache = thisCache.data; - } - - if ( data !== undefined ) { - thisCache[ jQuery.camelCase( name ) ] = data; - } - - // Check for both converted-to-camel and non-converted data property names - // If a data property was specified - if ( typeof name === "string" ) { - - // First Try to find as-is property data - ret = thisCache[ name ]; - - // Test for null|undefined property data - if ( ret == null ) { - - // Try to find the camelCased property - ret = thisCache[ jQuery.camelCase( name ) ]; - } - } else { - ret = thisCache; - } - - return ret; -} - -function internalRemoveData( elem, name, pvt ) { - if ( !jQuery.acceptData( elem ) ) { - return; - } - - var thisCache, i, - isNode = elem.nodeType, - - // See jQuery.data for more information - cache = isNode ? jQuery.cache : elem, - id = isNode ? elem[ jQuery.expando ] : jQuery.expando; - - // If there is already no cache entry for this object, there is no - // purpose in continuing - if ( !cache[ id ] ) { - return; - } - - if ( name ) { - - thisCache = pvt ? cache[ id ] : cache[ id ].data; - - if ( thisCache ) { - - // Support array or space separated string names for data keys - if ( !jQuery.isArray( name ) ) { - - // try the string as a key before any manipulation - if ( name in thisCache ) { - name = [ name ]; - } else { - - // split the camel cased version by spaces unless a key with the spaces exists - name = jQuery.camelCase( name ); - if ( name in thisCache ) { - name = [ name ]; - } else { - name = name.split(" "); - } - } - } else { - // If "name" is an array of keys... - // When data is initially created, via ("key", "val") signature, - // keys will be converted to camelCase. - // Since there is no way to tell _how_ a key was added, remove - // both plain key and camelCase key. #12786 - // This will only penalize the array argument path. - name = name.concat( jQuery.map( name, jQuery.camelCase ) ); - } - - i = name.length; - while ( i-- ) { - delete thisCache[ name[i] ]; - } - - // If there is no data left in the cache, we want to continue - // and let the cache object itself get destroyed - if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) { - return; - } - } - } - - // See jQuery.data for more information - if ( !pvt ) { - delete cache[ id ].data; - - // Don't destroy the parent cache unless the internal data object - // had been the only thing left in it - if ( !isEmptyDataObject( cache[ id ] ) ) { - return; - } - } - - // Destroy the cache - if ( isNode ) { - jQuery.cleanData( [ elem ], true ); - - // Use delete when supported for expandos or `cache` is not a window per isWindow (#10080) - /* jshint eqeqeq: false */ - } else if ( support.deleteExpando || cache != cache.window ) { - /* jshint eqeqeq: true */ - delete cache[ id ]; - - // When all else fails, null - } else { - cache[ id ] = null; - } -} - -jQuery.extend({ - cache: {}, - - // The following elements (space-suffixed to avoid Object.prototype collisions) - // throw uncatchable exceptions if you attempt to set expando properties - noData: { - "applet ": true, - "embed ": true, - // ...but Flash objects (which have this classid) *can* handle expandos - "object ": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" - }, - - hasData: function( elem ) { - elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ]; - return !!elem && !isEmptyDataObject( elem ); - }, - - data: function( elem, name, data ) { - return internalData( elem, name, data ); - }, - - removeData: function( elem, name ) { - return internalRemoveData( elem, name ); - }, - - // For internal use only. - _data: function( elem, name, data ) { - return internalData( elem, name, data, true ); - }, - - _removeData: function( elem, name ) { - return internalRemoveData( elem, name, true ); - } -}); - -jQuery.fn.extend({ - data: function( key, value ) { - var i, name, data, - elem = this[0], - attrs = elem && elem.attributes; - - // Special expections of .data basically thwart jQuery.access, - // so implement the relevant behavior ourselves - - // Gets all values - if ( key === undefined ) { - if ( this.length ) { - data = jQuery.data( elem ); - - if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) { - i = attrs.length; - while ( i-- ) { - - // Support: IE11+ - // The attrs elements can be null (#14894) - if ( attrs[ i ] ) { - name = attrs[ i ].name; - if ( name.indexOf( "data-" ) === 0 ) { - name = jQuery.camelCase( name.slice(5) ); - dataAttr( elem, name, data[ name ] ); - } - } - } - jQuery._data( elem, "parsedAttrs", true ); - } - } - - return data; - } - - // Sets multiple values - if ( typeof key === "object" ) { - return this.each(function() { - jQuery.data( this, key ); - }); - } - - return arguments.length > 1 ? - - // Sets one value - this.each(function() { - jQuery.data( this, key, value ); - }) : - - // Gets one value - // Try to fetch any internally stored data first - elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : undefined; - }, - - removeData: function( key ) { - return this.each(function() { - jQuery.removeData( this, key ); - }); - } -}); - - -jQuery.extend({ - queue: function( elem, type, data ) { - var queue; - - if ( elem ) { - type = ( type || "fx" ) + "queue"; - queue = jQuery._data( elem, type ); - - // Speed up dequeue by getting out quickly if this is just a lookup - if ( data ) { - if ( !queue || jQuery.isArray(data) ) { - queue = jQuery._data( elem, type, jQuery.makeArray(data) ); - } else { - queue.push( data ); - } - } - return queue || []; - } - }, - - dequeue: function( elem, type ) { - type = type || "fx"; - - var queue = jQuery.queue( elem, type ), - startLength = queue.length, - fn = queue.shift(), - hooks = jQuery._queueHooks( elem, type ), - next = function() { - jQuery.dequeue( elem, type ); - }; - - // If the fx queue is dequeued, always remove the progress sentinel - if ( fn === "inprogress" ) { - fn = queue.shift(); - startLength--; - } - - if ( fn ) { - - // Add a progress sentinel to prevent the fx queue from being - // automatically dequeued - if ( type === "fx" ) { - queue.unshift( "inprogress" ); - } - - // clear up the last queue stop function - delete hooks.stop; - fn.call( elem, next, hooks ); - } - - if ( !startLength && hooks ) { - hooks.empty.fire(); - } - }, - - // not intended for public consumption - generates a queueHooks object, or returns the current one - _queueHooks: function( elem, type ) { - var key = type + "queueHooks"; - return jQuery._data( elem, key ) || jQuery._data( elem, key, { - empty: jQuery.Callbacks("once memory").add(function() { - jQuery._removeData( elem, type + "queue" ); - jQuery._removeData( elem, key ); - }) - }); - } -}); - -jQuery.fn.extend({ - queue: function( type, data ) { - var setter = 2; - - if ( typeof type !== "string" ) { - data = type; - type = "fx"; - setter--; - } - - if ( arguments.length < setter ) { - return jQuery.queue( this[0], type ); - } - - return data === undefined ? - this : - this.each(function() { - var queue = jQuery.queue( this, type, data ); - - // ensure a hooks for this queue - jQuery._queueHooks( this, type ); - - if ( type === "fx" && queue[0] !== "inprogress" ) { - jQuery.dequeue( this, type ); - } - }); - }, - dequeue: function( type ) { - return this.each(function() { - jQuery.dequeue( this, type ); - }); - }, - clearQueue: function( type ) { - return this.queue( type || "fx", [] ); - }, - // Get a promise resolved when queues of a certain type - // are emptied (fx is the type by default) - promise: function( type, obj ) { - var tmp, - count = 1, - defer = jQuery.Deferred(), - elements = this, - i = this.length, - resolve = function() { - if ( !( --count ) ) { - defer.resolveWith( elements, [ elements ] ); - } - }; - - if ( typeof type !== "string" ) { - obj = type; - type = undefined; - } - type = type || "fx"; - - while ( i-- ) { - tmp = jQuery._data( elements[ i ], type + "queueHooks" ); - if ( tmp && tmp.empty ) { - count++; - tmp.empty.add( resolve ); - } - } - resolve(); - return defer.promise( obj ); - } -}); -var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source; - -var cssExpand = [ "Top", "Right", "Bottom", "Left" ]; - -var isHidden = function( elem, el ) { - // isHidden might be called from jQuery#filter function; - // in that case, element will be second argument - elem = el || elem; - return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem ); - }; - - - -// Multifunctional method to get and set values of a collection -// The value/s can optionally be executed if it's a function -var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) { - var i = 0, - length = elems.length, - bulk = key == null; - - // Sets many values - if ( jQuery.type( key ) === "object" ) { - chainable = true; - for ( i in key ) { - jQuery.access( elems, fn, i, key[i], true, emptyGet, raw ); - } - - // Sets one value - } else if ( value !== undefined ) { - chainable = true; - - if ( !jQuery.isFunction( value ) ) { - raw = true; - } - - if ( bulk ) { - // Bulk operations run against the entire set - if ( raw ) { - fn.call( elems, value ); - fn = null; - - // ...except when executing function values - } else { - bulk = fn; - fn = function( elem, key, value ) { - return bulk.call( jQuery( elem ), value ); - }; - } - } - - if ( fn ) { - for ( ; i < length; i++ ) { - fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) ); - } - } - } - - return chainable ? - elems : - - // Gets - bulk ? - fn.call( elems ) : - length ? fn( elems[0], key ) : emptyGet; -}; -var rcheckableType = (/^(?:checkbox|radio)$/i); - - - -(function() { - // Minified: var a,b,c - var input = document.createElement( "input" ), - div = document.createElement( "div" ), - fragment = document.createDocumentFragment(); - - // Setup - div.innerHTML = "
a"; - - // IE strips leading whitespace when .innerHTML is used - support.leadingWhitespace = div.firstChild.nodeType === 3; - - // Make sure that tbody elements aren't automatically inserted - // IE will insert them into empty tables - support.tbody = !div.getElementsByTagName( "tbody" ).length; - - // Make sure that link elements get serialized correctly by innerHTML - // This requires a wrapper element in IE - support.htmlSerialize = !!div.getElementsByTagName( "link" ).length; - - // Makes sure cloning an html5 element does not cause problems - // Where outerHTML is undefined, this still works - support.html5Clone = - document.createElement( "nav" ).cloneNode( true ).outerHTML !== "<:nav>"; - - // Check if a disconnected checkbox will retain its checked - // value of true after appended to the DOM (IE6/7) - input.type = "checkbox"; - input.checked = true; - fragment.appendChild( input ); - support.appendChecked = input.checked; - - // Make sure textarea (and checkbox) defaultValue is properly cloned - // Support: IE6-IE11+ - div.innerHTML = ""; - support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; - - // #11217 - WebKit loses check when the name is after the checked attribute - fragment.appendChild( div ); - div.innerHTML = ""; - - // Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3 - // old WebKit doesn't clone checked state correctly in fragments - support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked; - - // Support: IE<9 - // Opera does not clone events (and typeof div.attachEvent === undefined). - // IE9-10 clones events bound via attachEvent, but they don't trigger with .click() - support.noCloneEvent = true; - if ( div.attachEvent ) { - div.attachEvent( "onclick", function() { - support.noCloneEvent = false; - }); - - div.cloneNode( true ).click(); - } - - // Execute the test only if not already executed in another module. - if (support.deleteExpando == null) { - // Support: IE<9 - support.deleteExpando = true; - try { - delete div.test; - } catch( e ) { - support.deleteExpando = false; - } - } -})(); - - -(function() { - var i, eventName, - div = document.createElement( "div" ); - - // Support: IE<9 (lack submit/change bubble), Firefox 23+ (lack focusin event) - for ( i in { submit: true, change: true, focusin: true }) { - eventName = "on" + i; - - if ( !(support[ i + "Bubbles" ] = eventName in window) ) { - // Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP) - div.setAttribute( eventName, "t" ); - support[ i + "Bubbles" ] = div.attributes[ eventName ].expando === false; - } - } - - // Null elements to avoid leaks in IE. - div = null; -})(); - - -var rformElems = /^(?:input|select|textarea)$/i, - rkeyEvent = /^key/, - rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/, - rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, - rtypenamespace = /^([^.]*)(?:\.(.+)|)$/; - -function returnTrue() { - return true; -} - -function returnFalse() { - return false; -} - -function safeActiveElement() { - try { - return document.activeElement; - } catch ( err ) { } -} - -/* - * Helper functions for managing events -- not part of the public interface. - * Props to Dean Edwards' addEvent library for many of the ideas. - */ -jQuery.event = { - - global: {}, - - add: function( elem, types, handler, data, selector ) { - var tmp, events, t, handleObjIn, - special, eventHandle, handleObj, - handlers, type, namespaces, origType, - elemData = jQuery._data( elem ); - - // Don't attach events to noData or text/comment nodes (but allow plain objects) - if ( !elemData ) { - return; - } - - // Caller can pass in an object of custom data in lieu of the handler - if ( handler.handler ) { - handleObjIn = handler; - handler = handleObjIn.handler; - selector = handleObjIn.selector; - } - - // Make sure that the handler has a unique ID, used to find/remove it later - if ( !handler.guid ) { - handler.guid = jQuery.guid++; - } - - // Init the element's event structure and main handler, if this is the first - if ( !(events = elemData.events) ) { - events = elemData.events = {}; - } - if ( !(eventHandle = elemData.handle) ) { - eventHandle = elemData.handle = function( e ) { - // Discard the second event of a jQuery.event.trigger() and - // when an event is called after a page has unloaded - return typeof jQuery !== strundefined && (!e || jQuery.event.triggered !== e.type) ? - jQuery.event.dispatch.apply( eventHandle.elem, arguments ) : - undefined; - }; - // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events - eventHandle.elem = elem; - } - - // Handle multiple events separated by a space - types = ( types || "" ).match( rnotwhite ) || [ "" ]; - t = types.length; - while ( t-- ) { - tmp = rtypenamespace.exec( types[t] ) || []; - type = origType = tmp[1]; - namespaces = ( tmp[2] || "" ).split( "." ).sort(); - - // There *must* be a type, no attaching namespace-only handlers - if ( !type ) { - continue; - } - - // If event changes its type, use the special event handlers for the changed type - special = jQuery.event.special[ type ] || {}; - - // If selector defined, determine special event api type, otherwise given type - type = ( selector ? special.delegateType : special.bindType ) || type; - - // Update special based on newly reset type - special = jQuery.event.special[ type ] || {}; - - // handleObj is passed to all event handlers - handleObj = jQuery.extend({ - type: type, - origType: origType, - data: data, - handler: handler, - guid: handler.guid, - selector: selector, - needsContext: selector && jQuery.expr.match.needsContext.test( selector ), - namespace: namespaces.join(".") - }, handleObjIn ); - - // Init the event handler queue if we're the first - if ( !(handlers = events[ type ]) ) { - handlers = events[ type ] = []; - handlers.delegateCount = 0; - - // Only use addEventListener/attachEvent if the special events handler returns false - if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { - // Bind the global event handler to the element - if ( elem.addEventListener ) { - elem.addEventListener( type, eventHandle, false ); - - } else if ( elem.attachEvent ) { - elem.attachEvent( "on" + type, eventHandle ); - } - } - } - - if ( special.add ) { - special.add.call( elem, handleObj ); - - if ( !handleObj.handler.guid ) { - handleObj.handler.guid = handler.guid; - } - } - - // Add to the element's handler list, delegates in front - if ( selector ) { - handlers.splice( handlers.delegateCount++, 0, handleObj ); - } else { - handlers.push( handleObj ); - } - - // Keep track of which events have ever been used, for event optimization - jQuery.event.global[ type ] = true; - } - - // Nullify elem to prevent memory leaks in IE - elem = null; - }, - - // Detach an event or set of events from an element - remove: function( elem, types, handler, selector, mappedTypes ) { - var j, handleObj, tmp, - origCount, t, events, - special, handlers, type, - namespaces, origType, - elemData = jQuery.hasData( elem ) && jQuery._data( elem ); - - if ( !elemData || !(events = elemData.events) ) { - return; - } - - // Once for each type.namespace in types; type may be omitted - types = ( types || "" ).match( rnotwhite ) || [ "" ]; - t = types.length; - while ( t-- ) { - tmp = rtypenamespace.exec( types[t] ) || []; - type = origType = tmp[1]; - namespaces = ( tmp[2] || "" ).split( "." ).sort(); - - // Unbind all events (on this namespace, if provided) for the element - if ( !type ) { - for ( type in events ) { - jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); - } - continue; - } - - special = jQuery.event.special[ type ] || {}; - type = ( selector ? special.delegateType : special.bindType ) || type; - handlers = events[ type ] || []; - tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ); - - // Remove matching events - origCount = j = handlers.length; - while ( j-- ) { - handleObj = handlers[ j ]; - - if ( ( mappedTypes || origType === handleObj.origType ) && - ( !handler || handler.guid === handleObj.guid ) && - ( !tmp || tmp.test( handleObj.namespace ) ) && - ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { - handlers.splice( j, 1 ); - - if ( handleObj.selector ) { - handlers.delegateCount--; - } - if ( special.remove ) { - special.remove.call( elem, handleObj ); - } - } - } - - // Remove generic event handler if we removed something and no more handlers exist - // (avoids potential for endless recursion during removal of special event handlers) - if ( origCount && !handlers.length ) { - if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) { - jQuery.removeEvent( elem, type, elemData.handle ); - } - - delete events[ type ]; - } - } - - // Remove the expando if it's no longer used - if ( jQuery.isEmptyObject( events ) ) { - delete elemData.handle; - - // removeData also checks for emptiness and clears the expando if empty - // so use it instead of delete - jQuery._removeData( elem, "events" ); - } - }, - - trigger: function( event, data, elem, onlyHandlers ) { - var handle, ontype, cur, - bubbleType, special, tmp, i, - eventPath = [ elem || document ], - type = hasOwn.call( event, "type" ) ? event.type : event, - namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : []; - - cur = tmp = elem = elem || document; - - // Don't do events on text and comment nodes - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { - return; - } - - // focus/blur morphs to focusin/out; ensure we're not firing them right now - if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { - return; - } - - if ( type.indexOf(".") >= 0 ) { - // Namespaced trigger; create a regexp to match event type in handle() - namespaces = type.split("."); - type = namespaces.shift(); - namespaces.sort(); - } - ontype = type.indexOf(":") < 0 && "on" + type; - - // Caller can pass in a jQuery.Event object, Object, or just an event type string - event = event[ jQuery.expando ] ? - event : - new jQuery.Event( type, typeof event === "object" && event ); - - // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) - event.isTrigger = onlyHandlers ? 2 : 3; - event.namespace = namespaces.join("."); - event.namespace_re = event.namespace ? - new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) : - null; - - // Clean up the event in case it is being reused - event.result = undefined; - if ( !event.target ) { - event.target = elem; - } - - // Clone any incoming data and prepend the event, creating the handler arg list - data = data == null ? - [ event ] : - jQuery.makeArray( data, [ event ] ); - - // Allow special events to draw outside the lines - special = jQuery.event.special[ type ] || {}; - if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { - return; - } - - // Determine event propagation path in advance, per W3C events spec (#9951) - // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) - if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { - - bubbleType = special.delegateType || type; - if ( !rfocusMorph.test( bubbleType + type ) ) { - cur = cur.parentNode; - } - for ( ; cur; cur = cur.parentNode ) { - eventPath.push( cur ); - tmp = cur; - } - - // Only add window if we got to document (e.g., not plain obj or detached DOM) - if ( tmp === (elem.ownerDocument || document) ) { - eventPath.push( tmp.defaultView || tmp.parentWindow || window ); - } - } - - // Fire handlers on the event path - i = 0; - while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) { - - event.type = i > 1 ? - bubbleType : - special.bindType || type; - - // jQuery handler - handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" ); - if ( handle ) { - handle.apply( cur, data ); - } - - // Native handler - handle = ontype && cur[ ontype ]; - if ( handle && handle.apply && jQuery.acceptData( cur ) ) { - event.result = handle.apply( cur, data ); - if ( event.result === false ) { - event.preventDefault(); - } - } - } - event.type = type; - - // If nobody prevented the default action, do it now - if ( !onlyHandlers && !event.isDefaultPrevented() ) { - - if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) && - jQuery.acceptData( elem ) ) { - - // Call a native DOM method on the target with the same name name as the event. - // Can't use an .isFunction() check here because IE6/7 fails that test. - // Don't do default actions on window, that's where global variables be (#6170) - if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) { - - // Don't re-trigger an onFOO event when we call its FOO() method - tmp = elem[ ontype ]; - - if ( tmp ) { - elem[ ontype ] = null; - } - - // Prevent re-triggering of the same event, since we already bubbled it above - jQuery.event.triggered = type; - try { - elem[ type ](); - } catch ( e ) { - // IE<9 dies on focus/blur to hidden element (#1486,#12518) - // only reproducible on winXP IE8 native, not IE9 in IE8 mode - } - jQuery.event.triggered = undefined; - - if ( tmp ) { - elem[ ontype ] = tmp; - } - } - } - } - - return event.result; - }, - - dispatch: function( event ) { - - // Make a writable jQuery.Event from the native event object - event = jQuery.event.fix( event ); - - var i, ret, handleObj, matched, j, - handlerQueue = [], - args = slice.call( arguments ), - handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [], - special = jQuery.event.special[ event.type ] || {}; - - // Use the fix-ed jQuery.Event rather than the (read-only) native event - args[0] = event; - event.delegateTarget = this; - - // Call the preDispatch hook for the mapped type, and let it bail if desired - if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { - return; - } - - // Determine handlers - handlerQueue = jQuery.event.handlers.call( this, event, handlers ); - - // Run delegates first; they may want to stop propagation beneath us - i = 0; - while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) { - event.currentTarget = matched.elem; - - j = 0; - while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) { - - // Triggered event must either 1) have no namespace, or - // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace). - if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) { - - event.handleObj = handleObj; - event.data = handleObj.data; - - ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) - .apply( matched.elem, args ); - - if ( ret !== undefined ) { - if ( (event.result = ret) === false ) { - event.preventDefault(); - event.stopPropagation(); - } - } - } - } - } - - // Call the postDispatch hook for the mapped type - if ( special.postDispatch ) { - special.postDispatch.call( this, event ); - } - - return event.result; - }, - - handlers: function( event, handlers ) { - var sel, handleObj, matches, i, - handlerQueue = [], - delegateCount = handlers.delegateCount, - cur = event.target; - - // Find delegate handlers - // Black-hole SVG instance trees (#13180) - // Avoid non-left-click bubbling in Firefox (#3861) - if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) { - - /* jshint eqeqeq: false */ - for ( ; cur != this; cur = cur.parentNode || this ) { - /* jshint eqeqeq: true */ - - // Don't check non-elements (#13208) - // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) - if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) { - matches = []; - for ( i = 0; i < delegateCount; i++ ) { - handleObj = handlers[ i ]; - - // Don't conflict with Object.prototype properties (#13203) - sel = handleObj.selector + " "; - - if ( matches[ sel ] === undefined ) { - matches[ sel ] = handleObj.needsContext ? - jQuery( sel, this ).index( cur ) >= 0 : - jQuery.find( sel, this, null, [ cur ] ).length; - } - if ( matches[ sel ] ) { - matches.push( handleObj ); - } - } - if ( matches.length ) { - handlerQueue.push({ elem: cur, handlers: matches }); - } - } - } - } - - // Add the remaining (directly-bound) handlers - if ( delegateCount < handlers.length ) { - handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) }); - } - - return handlerQueue; - }, - - fix: function( event ) { - if ( event[ jQuery.expando ] ) { - return event; - } - - // Create a writable copy of the event object and normalize some properties - var i, prop, copy, - type = event.type, - originalEvent = event, - fixHook = this.fixHooks[ type ]; - - if ( !fixHook ) { - this.fixHooks[ type ] = fixHook = - rmouseEvent.test( type ) ? this.mouseHooks : - rkeyEvent.test( type ) ? this.keyHooks : - {}; - } - copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; - - event = new jQuery.Event( originalEvent ); - - i = copy.length; - while ( i-- ) { - prop = copy[ i ]; - event[ prop ] = originalEvent[ prop ]; - } - - // Support: IE<9 - // Fix target property (#1925) - if ( !event.target ) { - event.target = originalEvent.srcElement || document; - } - - // Support: Chrome 23+, Safari? - // Target should not be a text node (#504, #13143) - if ( event.target.nodeType === 3 ) { - event.target = event.target.parentNode; - } - - // Support: IE<9 - // For mouse/key events, metaKey==false if it's undefined (#3368, #11328) - event.metaKey = !!event.metaKey; - - return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; - }, - - // Includes some event props shared by KeyEvent and MouseEvent - props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), - - fixHooks: {}, - - keyHooks: { - props: "char charCode key keyCode".split(" "), - filter: function( event, original ) { - - // Add which for key events - if ( event.which == null ) { - event.which = original.charCode != null ? original.charCode : original.keyCode; - } - - return event; - } - }, - - mouseHooks: { - props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), - filter: function( event, original ) { - var body, eventDoc, doc, - button = original.button, - fromElement = original.fromElement; - - // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && original.clientX != null ) { - eventDoc = event.target.ownerDocument || document; - doc = eventDoc.documentElement; - body = eventDoc.body; - - event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); - event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); - } - - // Add relatedTarget, if necessary - if ( !event.relatedTarget && fromElement ) { - event.relatedTarget = fromElement === event.target ? original.toElement : fromElement; - } - - // Add which for click: 1 === left; 2 === middle; 3 === right - // Note: button is not normalized, so don't use it - if ( !event.which && button !== undefined ) { - event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); - } - - return event; - } - }, - - special: { - load: { - // Prevent triggered image.load events from bubbling to window.load - noBubble: true - }, - focus: { - // Fire native event if possible so blur/focus sequence is correct - trigger: function() { - if ( this !== safeActiveElement() && this.focus ) { - try { - this.focus(); - return false; - } catch ( e ) { - // Support: IE<9 - // If we error on focus to hidden element (#1486, #12518), - // let .trigger() run the handlers - } - } - }, - delegateType: "focusin" - }, - blur: { - trigger: function() { - if ( this === safeActiveElement() && this.blur ) { - this.blur(); - return false; - } - }, - delegateType: "focusout" - }, - click: { - // For checkbox, fire native event so checked state will be right - trigger: function() { - if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) { - this.click(); - return false; - } - }, - - // For cross-browser consistency, don't fire native .click() on links - _default: function( event ) { - return jQuery.nodeName( event.target, "a" ); - } - }, - - beforeunload: { - postDispatch: function( event ) { - - // Support: Firefox 20+ - // Firefox doesn't alert if the returnValue field is not set. - if ( event.result !== undefined && event.originalEvent ) { - event.originalEvent.returnValue = event.result; - } - } - } - }, - - simulate: function( type, elem, event, bubble ) { - // Piggyback on a donor event to simulate a different one. - // Fake originalEvent to avoid donor's stopPropagation, but if the - // simulated event prevents default then we do the same on the donor. - var e = jQuery.extend( - new jQuery.Event(), - event, - { - type: type, - isSimulated: true, - originalEvent: {} - } - ); - if ( bubble ) { - jQuery.event.trigger( e, null, elem ); - } else { - jQuery.event.dispatch.call( elem, e ); - } - if ( e.isDefaultPrevented() ) { - event.preventDefault(); - } - } -}; - -jQuery.removeEvent = document.removeEventListener ? - function( elem, type, handle ) { - if ( elem.removeEventListener ) { - elem.removeEventListener( type, handle, false ); - } - } : - function( elem, type, handle ) { - var name = "on" + type; - - if ( elem.detachEvent ) { - - // #8545, #7054, preventing memory leaks for custom events in IE6-8 - // detachEvent needed property on element, by name of that event, to properly expose it to GC - if ( typeof elem[ name ] === strundefined ) { - elem[ name ] = null; - } - - elem.detachEvent( name, handle ); - } - }; - -jQuery.Event = function( src, props ) { - // Allow instantiation without the 'new' keyword - if ( !(this instanceof jQuery.Event) ) { - return new jQuery.Event( src, props ); - } - - // Event object - if ( src && src.type ) { - this.originalEvent = src; - this.type = src.type; - - // Events bubbling up the document may have been marked as prevented - // by a handler lower down the tree; reflect the correct value. - this.isDefaultPrevented = src.defaultPrevented || - src.defaultPrevented === undefined && - // Support: IE < 9, Android < 4.0 - src.returnValue === false ? - returnTrue : - returnFalse; - - // Event type - } else { - this.type = src; - } - - // Put explicitly provided properties onto the event object - if ( props ) { - jQuery.extend( this, props ); - } - - // Create a timestamp if incoming event doesn't have one - this.timeStamp = src && src.timeStamp || jQuery.now(); - - // Mark it as fixed - this[ jQuery.expando ] = true; -}; - -// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html -jQuery.Event.prototype = { - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse, - - preventDefault: function() { - var e = this.originalEvent; - - this.isDefaultPrevented = returnTrue; - if ( !e ) { - return; - } - - // If preventDefault exists, run it on the original event - if ( e.preventDefault ) { - e.preventDefault(); - - // Support: IE - // Otherwise set the returnValue property of the original event to false - } else { - e.returnValue = false; - } - }, - stopPropagation: function() { - var e = this.originalEvent; - - this.isPropagationStopped = returnTrue; - if ( !e ) { - return; - } - // If stopPropagation exists, run it on the original event - if ( e.stopPropagation ) { - e.stopPropagation(); - } - - // Support: IE - // Set the cancelBubble property of the original event to true - e.cancelBubble = true; - }, - stopImmediatePropagation: function() { - var e = this.originalEvent; - - this.isImmediatePropagationStopped = returnTrue; - - if ( e && e.stopImmediatePropagation ) { - e.stopImmediatePropagation(); - } - - this.stopPropagation(); - } -}; - -// Create mouseenter/leave events using mouseover/out and event-time checks -jQuery.each({ - mouseenter: "mouseover", - mouseleave: "mouseout", - pointerenter: "pointerover", - pointerleave: "pointerout" -}, function( orig, fix ) { - jQuery.event.special[ orig ] = { - delegateType: fix, - bindType: fix, - - handle: function( event ) { - var ret, - target = this, - related = event.relatedTarget, - handleObj = event.handleObj; - - // For mousenter/leave call the handler if related is outside the target. - // NB: No relatedTarget if the mouse left/entered the browser window - if ( !related || (related !== target && !jQuery.contains( target, related )) ) { - event.type = handleObj.origType; - ret = handleObj.handler.apply( this, arguments ); - event.type = fix; - } - return ret; - } - }; -}); - -// IE submit delegation -if ( !support.submitBubbles ) { - - jQuery.event.special.submit = { - setup: function() { - // Only need this for delegated form submit events - if ( jQuery.nodeName( this, "form" ) ) { - return false; - } - - // Lazy-add a submit handler when a descendant form may potentially be submitted - jQuery.event.add( this, "click._submit keypress._submit", function( e ) { - // Node name check avoids a VML-related crash in IE (#9807) - var elem = e.target, - form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined; - if ( form && !jQuery._data( form, "submitBubbles" ) ) { - jQuery.event.add( form, "submit._submit", function( event ) { - event._submit_bubble = true; - }); - jQuery._data( form, "submitBubbles", true ); - } - }); - // return undefined since we don't need an event listener - }, - - postDispatch: function( event ) { - // If form was submitted by the user, bubble the event up the tree - if ( event._submit_bubble ) { - delete event._submit_bubble; - if ( this.parentNode && !event.isTrigger ) { - jQuery.event.simulate( "submit", this.parentNode, event, true ); - } - } - }, - - teardown: function() { - // Only need this for delegated form submit events - if ( jQuery.nodeName( this, "form" ) ) { - return false; - } - - // Remove delegated handlers; cleanData eventually reaps submit handlers attached above - jQuery.event.remove( this, "._submit" ); - } - }; -} - -// IE change delegation and checkbox/radio fix -if ( !support.changeBubbles ) { - - jQuery.event.special.change = { - - setup: function() { - - if ( rformElems.test( this.nodeName ) ) { - // IE doesn't fire change on a check/radio until blur; trigger it on click - // after a propertychange. Eat the blur-change in special.change.handle. - // This still fires onchange a second time for check/radio after blur. - if ( this.type === "checkbox" || this.type === "radio" ) { - jQuery.event.add( this, "propertychange._change", function( event ) { - if ( event.originalEvent.propertyName === "checked" ) { - this._just_changed = true; - } - }); - jQuery.event.add( this, "click._change", function( event ) { - if ( this._just_changed && !event.isTrigger ) { - this._just_changed = false; - } - // Allow triggered, simulated change events (#11500) - jQuery.event.simulate( "change", this, event, true ); - }); - } - return false; - } - // Delegated event; lazy-add a change handler on descendant inputs - jQuery.event.add( this, "beforeactivate._change", function( e ) { - var elem = e.target; - - if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) { - jQuery.event.add( elem, "change._change", function( event ) { - if ( this.parentNode && !event.isSimulated && !event.isTrigger ) { - jQuery.event.simulate( "change", this.parentNode, event, true ); - } - }); - jQuery._data( elem, "changeBubbles", true ); - } - }); - }, - - handle: function( event ) { - var elem = event.target; - - // Swallow native change events from checkbox/radio, we already triggered them above - if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) { - return event.handleObj.handler.apply( this, arguments ); - } - }, - - teardown: function() { - jQuery.event.remove( this, "._change" ); - - return !rformElems.test( this.nodeName ); - } - }; -} - -// Create "bubbling" focus and blur events -if ( !support.focusinBubbles ) { - jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { - - // Attach a single capturing handler on the document while someone wants focusin/focusout - var handler = function( event ) { - jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); - }; - - jQuery.event.special[ fix ] = { - setup: function() { - var doc = this.ownerDocument || this, - attaches = jQuery._data( doc, fix ); - - if ( !attaches ) { - doc.addEventListener( orig, handler, true ); - } - jQuery._data( doc, fix, ( attaches || 0 ) + 1 ); - }, - teardown: function() { - var doc = this.ownerDocument || this, - attaches = jQuery._data( doc, fix ) - 1; - - if ( !attaches ) { - doc.removeEventListener( orig, handler, true ); - jQuery._removeData( doc, fix ); - } else { - jQuery._data( doc, fix, attaches ); - } - } - }; - }); -} - -jQuery.fn.extend({ - - on: function( types, selector, data, fn, /*INTERNAL*/ one ) { - var type, origFn; - - // Types can be a map of types/handlers - if ( typeof types === "object" ) { - // ( types-Object, selector, data ) - if ( typeof selector !== "string" ) { - // ( types-Object, data ) - data = data || selector; - selector = undefined; - } - for ( type in types ) { - this.on( type, selector, data, types[ type ], one ); - } - return this; - } - - if ( data == null && fn == null ) { - // ( types, fn ) - fn = selector; - data = selector = undefined; - } else if ( fn == null ) { - if ( typeof selector === "string" ) { - // ( types, selector, fn ) - fn = data; - data = undefined; - } else { - // ( types, data, fn ) - fn = data; - data = selector; - selector = undefined; - } - } - if ( fn === false ) { - fn = returnFalse; - } else if ( !fn ) { - return this; - } - - if ( one === 1 ) { - origFn = fn; - fn = function( event ) { - // Can use an empty set, since event contains the info - jQuery().off( event ); - return origFn.apply( this, arguments ); - }; - // Use same guid so caller can remove using origFn - fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); - } - return this.each( function() { - jQuery.event.add( this, types, fn, data, selector ); - }); - }, - one: function( types, selector, data, fn ) { - return this.on( types, selector, data, fn, 1 ); - }, - off: function( types, selector, fn ) { - var handleObj, type; - if ( types && types.preventDefault && types.handleObj ) { - // ( event ) dispatched jQuery.Event - handleObj = types.handleObj; - jQuery( types.delegateTarget ).off( - handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType, - handleObj.selector, - handleObj.handler - ); - return this; - } - if ( typeof types === "object" ) { - // ( types-object [, selector] ) - for ( type in types ) { - this.off( type, selector, types[ type ] ); - } - return this; - } - if ( selector === false || typeof selector === "function" ) { - // ( types [, fn] ) - fn = selector; - selector = undefined; - } - if ( fn === false ) { - fn = returnFalse; - } - return this.each(function() { - jQuery.event.remove( this, types, fn, selector ); - }); - }, - - trigger: function( type, data ) { - return this.each(function() { - jQuery.event.trigger( type, data, this ); - }); - }, - triggerHandler: function( type, data ) { - var elem = this[0]; - if ( elem ) { - return jQuery.event.trigger( type, data, elem, true ); - } - } -}); - - -function createSafeFragment( document ) { - var list = nodeNames.split( "|" ), - safeFrag = document.createDocumentFragment(); - - if ( safeFrag.createElement ) { - while ( list.length ) { - safeFrag.createElement( - list.pop() - ); - } - } - return safeFrag; -} - -var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" + - "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video", - rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g, - rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"), - rleadingWhitespace = /^\s+/, - rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, - rtagName = /<([\w:]+)/, - rtbody = /\s*$/g, - - // We have to close these tags to support XHTML (#13200) - wrapMap = { - option: [ 1, "" ], - legend: [ 1, "
", "
" ], - area: [ 1, "", "" ], - param: [ 1, "", "" ], - thead: [ 1, "", "
" ], - tr: [ 2, "", "
" ], - col: [ 2, "", "
" ], - td: [ 3, "", "
" ], - - // IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags, - // unless wrapped in a div with non-breaking characters in front of it. - _default: support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X
", "
" ] - }, - safeFragment = createSafeFragment( document ), - fragmentDiv = safeFragment.appendChild( document.createElement("div") ); - -wrapMap.optgroup = wrapMap.option; -wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; -wrapMap.th = wrapMap.td; - -function getAll( context, tag ) { - var elems, elem, - i = 0, - found = typeof context.getElementsByTagName !== strundefined ? context.getElementsByTagName( tag || "*" ) : - typeof context.querySelectorAll !== strundefined ? context.querySelectorAll( tag || "*" ) : - undefined; - - if ( !found ) { - for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) { - if ( !tag || jQuery.nodeName( elem, tag ) ) { - found.push( elem ); - } else { - jQuery.merge( found, getAll( elem, tag ) ); - } - } - } - - return tag === undefined || tag && jQuery.nodeName( context, tag ) ? - jQuery.merge( [ context ], found ) : - found; -} - -// Used in buildFragment, fixes the defaultChecked property -function fixDefaultChecked( elem ) { - if ( rcheckableType.test( elem.type ) ) { - elem.defaultChecked = elem.checked; - } -} - -// Support: IE<8 -// Manipulating tables requires a tbody -function manipulationTarget( elem, content ) { - return jQuery.nodeName( elem, "table" ) && - jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ? - - elem.getElementsByTagName("tbody")[0] || - elem.appendChild( elem.ownerDocument.createElement("tbody") ) : - elem; -} - -// Replace/restore the type attribute of script elements for safe DOM manipulation -function disableScript( elem ) { - elem.type = (jQuery.find.attr( elem, "type" ) !== null) + "/" + elem.type; - return elem; -} -function restoreScript( elem ) { - var match = rscriptTypeMasked.exec( elem.type ); - if ( match ) { - elem.type = match[1]; - } else { - elem.removeAttribute("type"); - } - return elem; -} - -// Mark scripts as having already been evaluated -function setGlobalEval( elems, refElements ) { - var elem, - i = 0; - for ( ; (elem = elems[i]) != null; i++ ) { - jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) ); - } -} - -function cloneCopyEvent( src, dest ) { - - if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) { - return; - } - - var type, i, l, - oldData = jQuery._data( src ), - curData = jQuery._data( dest, oldData ), - events = oldData.events; - - if ( events ) { - delete curData.handle; - curData.events = {}; - - for ( type in events ) { - for ( i = 0, l = events[ type ].length; i < l; i++ ) { - jQuery.event.add( dest, type, events[ type ][ i ] ); - } - } - } - - // make the cloned public data object a copy from the original - if ( curData.data ) { - curData.data = jQuery.extend( {}, curData.data ); - } -} - -function fixCloneNodeIssues( src, dest ) { - var nodeName, e, data; - - // We do not need to do anything for non-Elements - if ( dest.nodeType !== 1 ) { - return; - } - - nodeName = dest.nodeName.toLowerCase(); - - // IE6-8 copies events bound via attachEvent when using cloneNode. - if ( !support.noCloneEvent && dest[ jQuery.expando ] ) { - data = jQuery._data( dest ); - - for ( e in data.events ) { - jQuery.removeEvent( dest, e, data.handle ); - } - - // Event data gets referenced instead of copied if the expando gets copied too - dest.removeAttribute( jQuery.expando ); - } - - // IE blanks contents when cloning scripts, and tries to evaluate newly-set text - if ( nodeName === "script" && dest.text !== src.text ) { - disableScript( dest ).text = src.text; - restoreScript( dest ); - - // IE6-10 improperly clones children of object elements using classid. - // IE10 throws NoModificationAllowedError if parent is null, #12132. - } else if ( nodeName === "object" ) { - if ( dest.parentNode ) { - dest.outerHTML = src.outerHTML; - } - - // This path appears unavoidable for IE9. When cloning an object - // element in IE9, the outerHTML strategy above is not sufficient. - // If the src has innerHTML and the destination does not, - // copy the src.innerHTML into the dest.innerHTML. #10324 - if ( support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) { - dest.innerHTML = src.innerHTML; - } - - } else if ( nodeName === "input" && rcheckableType.test( src.type ) ) { - // IE6-8 fails to persist the checked state of a cloned checkbox - // or radio button. Worse, IE6-7 fail to give the cloned element - // a checked appearance if the defaultChecked value isn't also set - - dest.defaultChecked = dest.checked = src.checked; - - // IE6-7 get confused and end up setting the value of a cloned - // checkbox/radio button to an empty string instead of "on" - if ( dest.value !== src.value ) { - dest.value = src.value; - } - - // IE6-8 fails to return the selected option to the default selected - // state when cloning options - } else if ( nodeName === "option" ) { - dest.defaultSelected = dest.selected = src.defaultSelected; - - // IE6-8 fails to set the defaultValue to the correct value when - // cloning other types of input fields - } else if ( nodeName === "input" || nodeName === "textarea" ) { - dest.defaultValue = src.defaultValue; - } -} - -jQuery.extend({ - clone: function( elem, dataAndEvents, deepDataAndEvents ) { - var destElements, node, clone, i, srcElements, - inPage = jQuery.contains( elem.ownerDocument, elem ); - - if ( support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) { - clone = elem.cloneNode( true ); - - // IE<=8 does not properly clone detached, unknown element nodes - } else { - fragmentDiv.innerHTML = elem.outerHTML; - fragmentDiv.removeChild( clone = fragmentDiv.firstChild ); - } - - if ( (!support.noCloneEvent || !support.noCloneChecked) && - (elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) { - - // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 - destElements = getAll( clone ); - srcElements = getAll( elem ); - - // Fix all IE cloning issues - for ( i = 0; (node = srcElements[i]) != null; ++i ) { - // Ensure that the destination node is not null; Fixes #9587 - if ( destElements[i] ) { - fixCloneNodeIssues( node, destElements[i] ); - } - } - } - - // Copy the events from the original to the clone - if ( dataAndEvents ) { - if ( deepDataAndEvents ) { - srcElements = srcElements || getAll( elem ); - destElements = destElements || getAll( clone ); - - for ( i = 0; (node = srcElements[i]) != null; i++ ) { - cloneCopyEvent( node, destElements[i] ); - } - } else { - cloneCopyEvent( elem, clone ); - } - } - - // Preserve script evaluation history - destElements = getAll( clone, "script" ); - if ( destElements.length > 0 ) { - setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); - } - - destElements = srcElements = node = null; - - // Return the cloned set - return clone; - }, - - buildFragment: function( elems, context, scripts, selection ) { - var j, elem, contains, - tmp, tag, tbody, wrap, - l = elems.length, - - // Ensure a safe fragment - safe = createSafeFragment( context ), - - nodes = [], - i = 0; - - for ( ; i < l; i++ ) { - elem = elems[ i ]; - - if ( elem || elem === 0 ) { - - // Add nodes directly - if ( jQuery.type( elem ) === "object" ) { - jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); - - // Convert non-html into a text node - } else if ( !rhtml.test( elem ) ) { - nodes.push( context.createTextNode( elem ) ); - - // Convert html into DOM nodes - } else { - tmp = tmp || safe.appendChild( context.createElement("div") ); - - // Deserialize a standard representation - tag = (rtagName.exec( elem ) || [ "", "" ])[ 1 ].toLowerCase(); - wrap = wrapMap[ tag ] || wrapMap._default; - - tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[2]; - - // Descend through wrappers to the right content - j = wrap[0]; - while ( j-- ) { - tmp = tmp.lastChild; - } - - // Manually add leading whitespace removed by IE - if ( !support.leadingWhitespace && rleadingWhitespace.test( elem ) ) { - nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) ); - } - - // Remove IE's autoinserted from table fragments - if ( !support.tbody ) { - - // String was a , *may* have spurious - elem = tag === "table" && !rtbody.test( elem ) ? - tmp.firstChild : - - // String was a bare or - wrap[1] === "
" && !rtbody.test( elem ) ? - tmp : - 0; - - j = elem && elem.childNodes.length; - while ( j-- ) { - if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) { - elem.removeChild( tbody ); - } - } - } - - jQuery.merge( nodes, tmp.childNodes ); - - // Fix #12392 for WebKit and IE > 9 - tmp.textContent = ""; - - // Fix #12392 for oldIE - while ( tmp.firstChild ) { - tmp.removeChild( tmp.firstChild ); - } - - // Remember the top-level container for proper cleanup - tmp = safe.lastChild; - } - } - } - - // Fix #11356: Clear elements from fragment - if ( tmp ) { - safe.removeChild( tmp ); - } - - // Reset defaultChecked for any radios and checkboxes - // about to be appended to the DOM in IE 6/7 (#8060) - if ( !support.appendChecked ) { - jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked ); - } - - i = 0; - while ( (elem = nodes[ i++ ]) ) { - - // #4087 - If origin and destination elements are the same, and this is - // that element, do not do anything - if ( selection && jQuery.inArray( elem, selection ) !== -1 ) { - continue; - } - - contains = jQuery.contains( elem.ownerDocument, elem ); - - // Append to fragment - tmp = getAll( safe.appendChild( elem ), "script" ); - - // Preserve script evaluation history - if ( contains ) { - setGlobalEval( tmp ); - } - - // Capture executables - if ( scripts ) { - j = 0; - while ( (elem = tmp[ j++ ]) ) { - if ( rscriptType.test( elem.type || "" ) ) { - scripts.push( elem ); - } - } - } - } - - tmp = null; - - return safe; - }, - - cleanData: function( elems, /* internal */ acceptData ) { - var elem, type, id, data, - i = 0, - internalKey = jQuery.expando, - cache = jQuery.cache, - deleteExpando = support.deleteExpando, - special = jQuery.event.special; - - for ( ; (elem = elems[i]) != null; i++ ) { - if ( acceptData || jQuery.acceptData( elem ) ) { - - id = elem[ internalKey ]; - data = id && cache[ id ]; - - if ( data ) { - if ( data.events ) { - for ( type in data.events ) { - if ( special[ type ] ) { - jQuery.event.remove( elem, type ); - - // This is a shortcut to avoid jQuery.event.remove's overhead - } else { - jQuery.removeEvent( elem, type, data.handle ); - } - } - } - - // Remove cache only if it was not already removed by jQuery.event.remove - if ( cache[ id ] ) { - - delete cache[ id ]; - - // IE does not allow us to delete expando properties from nodes, - // nor does it have a removeAttribute function on Document nodes; - // we must handle all of these cases - if ( deleteExpando ) { - delete elem[ internalKey ]; - - } else if ( typeof elem.removeAttribute !== strundefined ) { - elem.removeAttribute( internalKey ); - - } else { - elem[ internalKey ] = null; - } - - deletedIds.push( id ); - } - } - } - } - } -}); - -jQuery.fn.extend({ - text: function( value ) { - return access( this, function( value ) { - return value === undefined ? - jQuery.text( this ) : - this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) ); - }, null, value, arguments.length ); - }, - - append: function() { - return this.domManip( arguments, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - var target = manipulationTarget( this, elem ); - target.appendChild( elem ); - } - }); - }, - - prepend: function() { - return this.domManip( arguments, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - var target = manipulationTarget( this, elem ); - target.insertBefore( elem, target.firstChild ); - } - }); - }, - - before: function() { - return this.domManip( arguments, function( elem ) { - if ( this.parentNode ) { - this.parentNode.insertBefore( elem, this ); - } - }); - }, - - after: function() { - return this.domManip( arguments, function( elem ) { - if ( this.parentNode ) { - this.parentNode.insertBefore( elem, this.nextSibling ); - } - }); - }, - - remove: function( selector, keepData /* Internal Use Only */ ) { - var elem, - elems = selector ? jQuery.filter( selector, this ) : this, - i = 0; - - for ( ; (elem = elems[i]) != null; i++ ) { - - if ( !keepData && elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem ) ); - } - - if ( elem.parentNode ) { - if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) { - setGlobalEval( getAll( elem, "script" ) ); - } - elem.parentNode.removeChild( elem ); - } - } - - return this; - }, - - empty: function() { - var elem, - i = 0; - - for ( ; (elem = this[i]) != null; i++ ) { - // Remove element nodes and prevent memory leaks - if ( elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem, false ) ); - } - - // Remove any remaining nodes - while ( elem.firstChild ) { - elem.removeChild( elem.firstChild ); - } - - // If this is a select, ensure that it displays empty (#12336) - // Support: IE<9 - if ( elem.options && jQuery.nodeName( elem, "select" ) ) { - elem.options.length = 0; - } - } - - return this; - }, - - clone: function( dataAndEvents, deepDataAndEvents ) { - dataAndEvents = dataAndEvents == null ? false : dataAndEvents; - deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; - - return this.map(function() { - return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); - }); - }, - - html: function( value ) { - return access( this, function( value ) { - var elem = this[ 0 ] || {}, - i = 0, - l = this.length; - - if ( value === undefined ) { - return elem.nodeType === 1 ? - elem.innerHTML.replace( rinlinejQuery, "" ) : - undefined; - } - - // See if we can take a shortcut and just use innerHTML - if ( typeof value === "string" && !rnoInnerhtml.test( value ) && - ( support.htmlSerialize || !rnoshimcache.test( value ) ) && - ( support.leadingWhitespace || !rleadingWhitespace.test( value ) ) && - !wrapMap[ (rtagName.exec( value ) || [ "", "" ])[ 1 ].toLowerCase() ] ) { - - value = value.replace( rxhtmlTag, "<$1>" ); - - try { - for (; i < l; i++ ) { - // Remove element nodes and prevent memory leaks - elem = this[i] || {}; - if ( elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem, false ) ); - elem.innerHTML = value; - } - } - - elem = 0; - - // If using innerHTML throws an exception, use the fallback method - } catch(e) {} - } - - if ( elem ) { - this.empty().append( value ); - } - }, null, value, arguments.length ); - }, - - replaceWith: function() { - var arg = arguments[ 0 ]; - - // Make the changes, replacing each context element with the new content - this.domManip( arguments, function( elem ) { - arg = this.parentNode; - - jQuery.cleanData( getAll( this ) ); - - if ( arg ) { - arg.replaceChild( elem, this ); - } - }); - - // Force removal if there was no new content (e.g., from empty arguments) - return arg && (arg.length || arg.nodeType) ? this : this.remove(); - }, - - detach: function( selector ) { - return this.remove( selector, true ); - }, - - domManip: function( args, callback ) { - - // Flatten any nested arrays - args = concat.apply( [], args ); - - var first, node, hasScripts, - scripts, doc, fragment, - i = 0, - l = this.length, - set = this, - iNoClone = l - 1, - value = args[0], - isFunction = jQuery.isFunction( value ); - - // We can't cloneNode fragments that contain checked, in WebKit - if ( isFunction || - ( l > 1 && typeof value === "string" && - !support.checkClone && rchecked.test( value ) ) ) { - return this.each(function( index ) { - var self = set.eq( index ); - if ( isFunction ) { - args[0] = value.call( this, index, self.html() ); - } - self.domManip( args, callback ); - }); - } - - if ( l ) { - fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this ); - first = fragment.firstChild; - - if ( fragment.childNodes.length === 1 ) { - fragment = first; - } - - if ( first ) { - scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); - hasScripts = scripts.length; - - // Use the original fragment for the last item instead of the first because it can end up - // being emptied incorrectly in certain situations (#8070). - for ( ; i < l; i++ ) { - node = fragment; - - if ( i !== iNoClone ) { - node = jQuery.clone( node, true, true ); - - // Keep references to cloned scripts for later restoration - if ( hasScripts ) { - jQuery.merge( scripts, getAll( node, "script" ) ); - } - } - - callback.call( this[i], node, i ); - } - - if ( hasScripts ) { - doc = scripts[ scripts.length - 1 ].ownerDocument; - - // Reenable scripts - jQuery.map( scripts, restoreScript ); - - // Evaluate executable scripts on first document insertion - for ( i = 0; i < hasScripts; i++ ) { - node = scripts[ i ]; - if ( rscriptType.test( node.type || "" ) && - !jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) { - - if ( node.src ) { - // Optional AJAX dependency, but won't run scripts if not present - if ( jQuery._evalUrl ) { - jQuery._evalUrl( node.src ); - } - } else { - jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) ); - } - } - } - } - - // Fix #11809: Avoid leaking memory - fragment = first = null; - } - } - - return this; - } -}); - -jQuery.each({ - appendTo: "append", - prependTo: "prepend", - insertBefore: "before", - insertAfter: "after", - replaceAll: "replaceWith" -}, function( name, original ) { - jQuery.fn[ name ] = function( selector ) { - var elems, - i = 0, - ret = [], - insert = jQuery( selector ), - last = insert.length - 1; - - for ( ; i <= last; i++ ) { - elems = i === last ? this : this.clone(true); - jQuery( insert[i] )[ original ]( elems ); - - // Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get() - push.apply( ret, elems.get() ); - } - - return this.pushStack( ret ); - }; -}); - - -var iframe, - elemdisplay = {}; - -/** - * Retrieve the actual display of a element - * @param {String} name nodeName of the element - * @param {Object} doc Document object - */ -// Called only from within defaultDisplay -function actualDisplay( name, doc ) { - var style, - elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ), - - // getDefaultComputedStyle might be reliably used only on attached element - display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ? - - // Use of this method is a temporary fix (more like optmization) until something better comes along, - // since it was removed from specification and supported only in FF - style.display : jQuery.css( elem[ 0 ], "display" ); - - // We don't have any data stored on the element, - // so use "detach" method as fast way to get rid of the element - elem.detach(); - - return display; -} - -/** - * Try to determine the default display value of an element - * @param {String} nodeName - */ -function defaultDisplay( nodeName ) { - var doc = document, - display = elemdisplay[ nodeName ]; - - if ( !display ) { - display = actualDisplay( nodeName, doc ); - - // If the simple way fails, read from inside an iframe - if ( display === "none" || !display ) { - - // Use the already-created iframe if possible - iframe = (iframe || jQuery( "');if(g.attr("src",f),e.replaceWith(g),c.width&&g.css("width",c.width),c.height)g.css("height",c.height);else{var h=function(){var b=g.offset(),c=a(window).height(),d=c-b.top-5;g.height(d)};g.load(function(){h()}),a(window).resize(function(){h()})}})}var c={name:"iframe",version:a.md.version,once:function(){a.md.linkGimmick(this,"iframe",b)}};a.md.registerGimmick(c)}(jQuery),function(a){function b(b){b.remove();var c=document.createElement("script");c.type="text/javascript",c.src=a.md.prepareLink("cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML",{forceHTTP:!0}),document.getElementsByTagName("head")[0].appendChild(c)}var c={name:"math",once:function(){a.md.linkGimmick(this,"math",b)}};a.md.registerGimmick(c)}(jQuery),function(a){"use strict";var b=[{name:"bootstrap",url:"netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css"},{name:"amelia",url:"netdna.bootstrapcdn.com/bootswatch/3.0.0/amelia/bootstrap.min.css"},{name:"cerulean",url:"netdna.bootstrapcdn.com/bootswatch/3.0.0/cerulean/bootstrap.min.css"},{name:"cosmo",url:"netdna.bootstrapcdn.com/bootswatch/3.0.0/cosmo/bootstrap.min.css"},{name:"cyborg",url:"netdna.bootstrapcdn.com/bootswatch/3.0.0/cyborg/bootstrap.min.css"},{name:"flatly",url:"netdna.bootstrapcdn.com/bootswatch/3.0.0/flatly/bootstrap.min.css"},{name:"journal",url:"netdna.bootstrapcdn.com/bootswatch/3.0.0/journal/bootstrap.min.css"},{name:"readable",url:"netdna.bootstrapcdn.com/bootswatch/3.0.0/readable/bootstrap.min.css"},{name:"simplex",url:"netdna.bootstrapcdn.com/bootswatch/3.0.0/simplex/bootstrap.min.css"},{name:"slate",url:"netdna.bootstrapcdn.com/bootswatch/3.0.0/slate/bootstrap.min.css"},{name:"spacelab",url:"netdna.bootstrapcdn.com/bootswatch/3.0.0/spacelab/bootstrap.min.css"},{name:"united",url:"netdna.bootstrapcdn.com/bootswatch/3.0.0/united/bootstrap.min.css"},{name:"yeti",url:"netdna.bootstrapcdn.com/bootswatch/3.0.2/yeti/bootstrap.min.css"}],c=!1,d={name:"Themes",version:a.md.version,once:function(){a.md.linkGimmick(this,"themechooser",h,"skel_ready"),a.md.linkGimmick(this,"theme",g)}};a.md.registerGimmick(d);var e=a.md.getLogger(),f=function(c){if(c.inverse=c.inverse||!1,void 0===c.url){if(!c.name)return void e.error("Theme name must be given!");var d=b.filter(function(a){return a.name===c.name})[0];if(!d)return void e.error("Theme "+name+" not found, removing link");c=a.extend(c,d)}a('link[rel=stylesheet][href*="netdna.bootstrapcdn.com"]').remove();var f=a("style[id*=bootstrap]").length>0;"bootstrap"===c.name&&f||(a("style[id*=bootstrap]").remove(),a('').attr("href",a.md.prepareLink(c.url)).appendTo("head")),c.inverse===!0?(a("#md-main-navbar").removeClass("navbar-default"),a("#md-main-navbar").addClass("navbar-inverse")):(a("#md-main-navbar").addClass("navbar-default"),a("#md-main-navbar").removeClass("navbar-inverse"))},g=function(b,d,e){d.name=d.name||e,b.each(function(b,e){a.md.stage("postgimmick").subscribe(function(b){a(e);void 0!==window.localStorage.theme&&c||f(d),b()})}),b.remove()},h=function(d,e,f){return c=!0,a.md.stage("bootstrap").subscribe(function(a){i(e),a()}),d.each(function(c,d){var e=a(d),g=a('
    ');g.eq(0).text(f),a.each(b,function(b,c){var d=a("
  • ");g.eq(1).append(d);a("").text(c.name).attr("href","").click(function(a){a.preventDefault(),window.localStorage.theme=c.name,window.location.reload()}).appendTo(d)}),g.eq(1).append('
  • ');var h=a("
  • "),i=a("Use default");i.click(function(a){a.preventDefault(),window.localStorage.removeItem("theme"),window.location.reload()}),h.append(i),g.eq(1).append(h),g.eq(1).append('
  • '),g.eq(1).append('
  • Powered by Bootswatch
    • '),e.replaceWith(g)})},i=function(b){window.localStorage.theme&&(b=a.extend({name:window.localStorage.theme},b),f(b))}}(jQuery),function(a){var b=a.md.prepareLink("platform.twitter.com/widgets.js"),c='!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="'+b+'";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");',d={name:"TwitterGimmick",version:a.md.version,once:function(){a.md.linkGimmick(this,"twitterfollow",e),a.md.registerScript(this,c,{license:"EXCEPTION",loadstage:"postgimmick",finishstage:"all_ready"})}};a.md.registerGimmick(d);var e=function(b){return b.each(function(b,c){var d,e=a(c),f=e.attr("href");if(f.indexOf("twitter.com")<=0){d=e.attr("href"),f=a.md.prepareLink("twitter.com/"+d),"@"===d[0]&&(d=d.substring(1));var g=a('");e.replaceWith(g)}})}}(jQuery),function(a){function b(){var b=a("a[href*=youtube\\.com]:empty, a[href*=youtu\\.be]:empty");b.each(function(){var b=a(this),c=b.attr("href");if(void 0!==c){var d=/.*(?:youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=)([^#\&\?]*).*/,e=c.match(d);if(e&&11===e[1].length){var f=e[1],g=a('');g.attr("src","http://youtube.com/embed/"+f),b.replaceWith(g)}}})}var c={name:"youtube",load:function(){a.md.stage("gimmick").subscribe(function(a){b(),a()})}};a.md.registerGimmick(c)}(jQuery),function(a){"use strict";function b(b,c){var d={type:"class",style:"plain",direction:"LR",scale:"100"},e=a.extend({},d,c);return b.each(function(b,c){var d=a(c),f="http://yuml.me/diagram/",g=d.attr("href"),h=d.attr("title");h=h?h:"",g=g.replace(new RegExp("`","g"),"(").replace(new RegExp("´","g"),")"),f+=e.style+";dir:"+e.direction+";scale:"+e.scale+"/"+e.type+"/"+g;var i=a(''+h+'');d.replaceWith(i)})}var c={name:"yuml",version:a.md.version,once:function(){a.md.linkGimmick(this,"yuml",b),a.md.registerScript(this,"",{license:"LGPL",loadstage:"postgimmick",finishstage:"all_ready"})}};a.md.registerGimmick(c)}(jQuery); + + + + + + +
    +
    + + diff --git a/tpl/page.footer.html b/tpl/page.footer.html index 448e9f8..b2a2fcb 100644 --- a/tpl/page.footer.html +++ b/tpl/page.footer.html @@ -1,5 +1,5 @@ {if="$newversion"}
    ● Shaarli {$newversion|htmlspecialchars} is available.
    From aa222440275f1cd7fb369ea1dd64a015a5b6d684 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sun, 15 Mar 2015 14:23:25 +0100 Subject: [PATCH 083/658] bump version to 0.0.44beta --- index.php | 4 ++-- shaarli_version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index a82c440..11f944e 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,5 @@ '); // Suffix to encapsulate data in PHP code. // http://server.com/x/shaarli --> /shaarli/ diff --git a/shaarli_version.php b/shaarli_version.php index d266380..e333d4e 100644 --- a/shaarli_version.php +++ b/shaarli_version.php @@ -1 +1 @@ - + From 5b2a7cfe0f12b373fc0bf55c1e22413632f57b4d Mon Sep 17 00:00:00 2001 From: nodiscc Date: Mon, 16 Mar 2015 16:13:04 +0100 Subject: [PATCH 084/658] Revert to non-unicode characters for search buttons * Fixes #172 --- tpl/linklist.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tpl/linklist.html b/tpl/linklist.html index 0b328af..353eca5 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html @@ -5,8 +5,8 @@ From c981b4d19cea6ee8001ba80e1d7e47cd3d2f7ff6 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Mon, 16 Mar 2015 16:16:03 +0100 Subject: [PATCH 085/658] restore normal font size for the "Add link" input field * Fixes second part of #172 --- inc/shaarli.css | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/shaarli.css b/inc/shaarli.css index 7bfdc42..c4348c7 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -336,6 +336,7 @@ h1 { #headerform input.linkurl { width: 50%; + font-size: inherit; } #toolsdiv { From 129ff3c2e50154d563de12c85ec7597df5bded5a Mon Sep 17 00:00:00 2001 From: nodiscc Date: Mon, 16 Mar 2015 16:17:31 +0100 Subject: [PATCH 086/658] bump version to 0.0.45beta --- index.php | 4 ++-- shaarli_version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index 1ab3419..0d3c330 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,5 @@ '); // Suffix to encapsulate data in PHP code. // http://server.com/x/shaarli --> /shaarli/ diff --git a/shaarli_version.php b/shaarli_version.php index e333d4e..d225487 100644 --- a/shaarli_version.php +++ b/shaarli_version.php @@ -1 +1 @@ - + From 3ea318dad05954e2043d5bb2f8572b103d7c3930 Mon Sep 17 00:00:00 2001 From: feula Date: Sun, 29 Mar 2015 17:31:34 +0200 Subject: [PATCH 087/658] Display notes as absolute urls. The deletion is related to Windows not handling quotes in filenames, see #179. It shouldn't delete the real file. Probably. Check it out. --- "doc/Mentions-of-Shaarli-in-\"the-press\".md" | 3 --- index.php | 24 +++++++++++++------ 2 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 "doc/Mentions-of-Shaarli-in-\"the-press\".md" diff --git "a/doc/Mentions-of-Shaarli-in-\"the-press\".md" "b/doc/Mentions-of-Shaarli-in-\"the-press\".md" deleted file mode 100644 index 60c22cf..0000000 --- "a/doc/Mentions-of-Shaarli-in-\"the-press\".md" +++ /dev/null @@ -1,3 +0,0 @@ -This page lists the publications (physical or on the Internet) that mention Shaarli. It is by no means a complete list, and you are invited to add to it, should you spot a Shaarli mentioned in the wild. - -* http://www.linuxjournal.com/content/youre-boss-ubos \ No newline at end of file diff --git a/index.php b/index.php index 0d3c330..eb7fd10 100644 --- a/index.php +++ b/index.php @@ -1940,15 +1940,25 @@ function buildLinkList($PAGE,$LINKSDB) while ($i<$end && $i Date: Thu, 12 Mar 2015 21:57:19 +0100 Subject: [PATCH 088/658] Define date format in templates instead of index.php. --- index.php | 16 +++------------- tpl/daily.html | 2 +- tpl/dailyrss.html | 2 +- tpl/linklist.html | 4 ++-- 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/index.php b/index.php index 0d3c330..9ab70f6 100644 --- a/index.php +++ b/index.php @@ -567,16 +567,6 @@ 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 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. - // Note that if you use a locale which is not installed on your webserver, - // the date will not be displayed in the chosen locale, but probably in US notation. -} - // Parse HTTP response headers and return an associative array. function http_parse_headers_shaarli( $headers ) { @@ -1142,7 +1132,7 @@ function showDailyRSS() $l = $LINKSDB[$linkdate]; $l['formatedDescription']=nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($l['description'])))); $l['thumbnail'] = thumbnail($l['url']); - $l['localdate']=linkdate2locale($l['linkdate']); + $l['timestamp'] = linkdate2timestamp($l['linkdate']); if (startsWith($l['url'],'?')) $l['url']=indexUrl().$l['url']; // make permalink URL absolute $links[$linkdate]=$l; } @@ -1190,7 +1180,7 @@ function showDaily() $linksToDisplay[$key]['taglist']=$taglist; $linksToDisplay[$key]['formatedDescription']=nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description'])))); $linksToDisplay[$key]['thumbnail'] = thumbnail($link['url']); - $linksToDisplay[$key]['localdate'] = linkdate2locale($link['linkdate']); + $linksToDisplay[$key]['timestamp'] = linkdate2timestamp($link['linkdate']); } /* We need to spread the articles on 3 columns. @@ -1944,7 +1934,7 @@ function buildLinkList($PAGE,$LINKSDB) $title=$link['title']; $classLi = $i%2!=0 ? '' : 'publicLinkHightLight'; $link['class'] = ($link['private']==0 ? $classLi : 'private'); - $link['localdate']=linkdate2locale($link['linkdate']); + $link['timestamp']=linkdate2timestamp($link['linkdate']); $taglist = explode(' ',$link['tags']); uasort($taglist, 'strcasecmp'); $link['taglist']=$taglist; diff --git a/tpl/daily.html b/tpl/daily.html index c53e6f7..919795b 100644 --- a/tpl/daily.html +++ b/tpl/daily.html @@ -30,7 +30,7 @@ {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
    - {$link.localdate} + {function="strftime('%c', $link.timestamp)"}
    {/if} {if="$link.tags"} diff --git a/tpl/dailyrss.html b/tpl/dailyrss.html index 436e1cd..926704f 100644 --- a/tpl/dailyrss.html +++ b/tpl/dailyrss.html @@ -1,6 +1,6 @@ {loop="links"}

    {$value.title|htmlspecialchars}

    - {if="!$GLOBALS['config']['HIDE_TIMESTAMPS']"}{$value.localdate|htmlspecialchars} - {/if}{if="$value.tags"}{$value.tags|htmlspecialchars}{/if}
    + {if="!$GLOBALS['config']['HIDE_TIMESTAMPS']"}{function="strftime('%c', $value.timestamp|htmlspecialchars)"} - {/if}{if="$value.tags"}{$value.tags|htmlspecialchars}{/if}
    {$value.url|htmlspecialchars}
    {if="$value.thumbnail"}{$value.thumbnail}{/if}
    {if="$value.description"}{$value.formatedDescription}{/if} diff --git a/tpl/linklist.html b/tpl/linklist.html index 353eca5..766a80c 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html @@ -44,7 +44,7 @@
    {if="$value.description"}
    {$value.description}
    {/if} {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"} - {$value.localdate|htmlspecialchars} - permalink - + {function="strftime('%c', $value.timestamp)"} - permalink - {else} permalink - {/if} @@ -53,7 +53,7 @@ {/if}
    - QR-Code
    - + QR-Code - {$value.url|htmlspecialchars}
    {if="$value.tags"}
    From 880cbf92ca0ee87a4b10a0621e44aa70d019aff7 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 12 Mar 2015 21:43:21 +0100 Subject: [PATCH 089/658] Fixes autoLocale function by trying several way to find a correct one. --- index.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index 9ab70f6..7795a59 100644 --- a/index.php +++ b/index.php @@ -302,12 +302,17 @@ function keepMultipleSpaces($text) // (Note that is may not work on your server if the corresponding local is not installed.) function autoLocale() { - $loc='en_US'; // Default if browser does not send HTTP_ACCEPT_LANGUAGE + $attempts = array('en_US'); // Default if browser does not send HTTP_ACCEPT_LANGUAGE if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) // e.g. "fr,fr-fr;q=0.8,en;q=0.5,en-us;q=0.3" { // (It's a bit crude, but it works very well. Preferred language is always presented first.) - if (preg_match('/([a-z]{2}(-[a-z]{2})?)/i',$_SERVER['HTTP_ACCEPT_LANGUAGE'],$matches)) $loc=$matches[1]; + if (preg_match('/([a-z]{2})-?([a-z]{2})?/i',$_SERVER['HTTP_ACCEPT_LANGUAGE'],$matches)) { + $loc = $matches[1] . (!empty($matches[2]) ? '_' . strtoupper($matches[2]) : ''); + $attempts = array($loc, str_replace('_', '-', $loc), + $loc . '_' . strtoupper($loc), $loc . '_' . $loc, + $loc . '-' . strtoupper($loc), $loc . '-' . $loc); + } } - setlocale(LC_TIME,$loc); // LC_TIME = Set local for date/time format only. + setlocale(LC_TIME, $attempts); // LC_TIME = Set local for date/time format only. } // ------------------------------------------------------------------------------------------ @@ -549,7 +554,7 @@ function endsWith($haystack,$needle,$case=true) function linkdate2timestamp($linkdate) { $Y=$M=$D=$h=$m=$s=0; - $r = sscanf($linkdate,'%4d%2d%2d_%2d%2d%2d',$Y,$M,$D,$h,$m,$s); + sscanf($linkdate,'%4d%2d%2d_%2d%2d%2d',$Y,$M,$D,$h,$m,$s); return mktime($h,$m,$s,$M,$D,$Y); } From 3139a6cf8ddb9fd50e84e33d35739c9fb4a1914c Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 31 Mar 2015 20:02:50 +0200 Subject: [PATCH 090/658] Fix php error in daily RSS Use of undefined constant htmlspecialchars - assumed 'htmlspecialchars' in /var/www/links/tmp/dailyrss.* Thanks @alexisju in https://github.com/shaarli/Shaarli/commit/bec18701801cc140d760c261dd115fda1507a0dd --- tpl/dailyrss.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpl/dailyrss.html b/tpl/dailyrss.html index 926704f..a9b11e1 100644 --- a/tpl/dailyrss.html +++ b/tpl/dailyrss.html @@ -1,6 +1,6 @@ {loop="links"}

    {$value.title|htmlspecialchars}

    - {if="!$GLOBALS['config']['HIDE_TIMESTAMPS']"}{function="strftime('%c', $value.timestamp|htmlspecialchars)"} - {/if}{if="$value.tags"}{$value.tags|htmlspecialchars}{/if}
    + {if="!$GLOBALS['config']['HIDE_TIMESTAMPS']"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags|htmlspecialchars}{/if}
    {$value.url|htmlspecialchars}
    {if="$value.thumbnail"}{$value.thumbnail}{/if}
    {if="$value.description"}{$value.formatedDescription}{/if} From 2f4ab7cae2d3b1f13641a61c03d3b159b2c77379 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 31 Mar 2015 20:21:21 +0200 Subject: [PATCH 091/658] update doc --- doc/Home.md | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/doc/Home.md b/doc/Home.md index d68656e..c80b8c9 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -84,7 +84,8 @@ To change the configuration, create the file `data/options.php`, example: $GLOBALS['config']['ENABLE_THUMBNAILS'] = false; ?> ``` - The following parameters are available (parameters (default value)): + +**Do not edit config options in index.php! Your changes would be lost when you upgrade.** The following parameters are available (parameters (default value)): * `DATADIR ('data')` : This is the name of the subdirectory where Shaarli stores is data file. You can change it for better security. * `CONFIG_FILE ($GLOBALS['config']['DATADIR'].'/config.php')` : Name of file which is used to store login/password. @@ -96,6 +97,8 @@ To change the configuration, create the file `data/options.php`, example: * `OPEN_SHAARLI (false)` : If you set this option to true, anyone will be able to add/modify/delete/import/exports links without having to login. * `HIDE_TIMESTAMPS (false)` : If you set this option to true, the date/time of each link will not be displayed (including in RSS Feed). * `ENABLE_THUMBNAILS (true)` : Enable/disable thumbnails. + * `RAINTPL_TMP (tmp/)` : Raintpl cache directory (keep the trailing slash!) + * `RAINTPL_TPL (tpl/) : Raintpl template directory (keep the trailing slash!). Edit this option if you want to change the rendering template (page structure) used by Shaarli. See [Changing template](#changing-template) * `CACHEDIR ('cache')` : Directory where the thumbnails are stored. * `ENABLE_LOCALCACHE (true)` : If you have a limited quota on your webspace, you can set this option to false: Shaarli will not generate thumbnails which need to be cached locally (vimeo, flickr, etc.). Thumbnails will still be visible for the services which do not use the local cache (youtube.com, imgur.com, dailymotion.com, imageshack.us) * `UPDATECHECK_FILENAME ($GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt')` : name of the file used to store available shaarli version. @@ -114,6 +117,18 @@ To change the configuration, create the file `data/options.php`, example: See also: * [Download CSS styles for shaarlis listed in an opml file](https://github.com/shaarli/Shaarli/wiki/Download-CSS-styles-for-shaarlis-listed-in-an-opml-file) +### Changing template + +| 💥 | This feature is currently being worked on and will be improved in the next releases. Experimental. | +|---------|---------| + + * Find the template you'd like to install. See the list of available templates (TODO). Find it's git clone URL or download the zip archive for the template. + * In your Shaarli `tpl/` directory, run `git clone https://url/of/my-template/` or unpack the zip archive. There should now be a `my-template/` directory under the `tpl/` dir, containing directly all the template files. + * Edit `data/options.php` to have Shaarli use this template. Eg. + +`$GLOBALS['config']['RAINTPL_TPL'] = 'tpl/my-template/' ;` + +You can find a list of compatible templates in [Related Software](#Related-software) # Backup @@ -205,7 +220,7 @@ Download [publisher.php](https://pubsubhubbub.googlecode.com/git/publisher_clien * [Example patch: add a new "via" field for links](Example-patch---add-new-via-field-for-links) * [Copy a Shaarli installation over SSH SCP, serve it locally with php cli](Copy-a-Shaarli-installation-over-SSH-SCP,-serve-it-locally-with-php-cli) - * To display the array representing the data saved in datastore.php, use the following snippet + * To display the array representing the data saved in datastore.php, use the following snippet (TODO where is it gone?) ### Changing timestamp for a link * Look for `` in `tpl/editlink.tpl` (line 14) @@ -228,20 +243,24 @@ Unofficial but relatedd work on Shaarli. If you maintain one of these, please ge * [shaarchiver](https://github.com/nodiscc/shaarchiver) - Archive your Shaarli bookmarks and their content * [Shaarli for Android](http://sebsauvage.net/links/?ZAyDzg) - Android application that adds Shaarli as a sharing provider + * [Shaarlier for Android](https://play.google.com/store/apps/details?id=com.dimtion.shaarlier) - Android application to simply add links directly into your Shaarli * [shaarli-river](https://github.com/mknexen/shaarli-river) - an aggregator for shaarlis with many features * [Shaarlo](https://github.com/DMeloni/shaarlo) - an aggregator for shaarlis with many features ([Demo](http://shaarli.fr/)) * [kalvn/shaarli-blocks](https://github.com/kalvn/shaarli-blocks) - A template/theme for Shaarli - * [Vinm/Blue-theme-for Shaarli](https://github.com/Vinm/Blue-theme-for-Shaarli) - A template/theme for Shaarli + * [kalvn/Shaarli-Material](https://github.com/kalvn/Shaarli-Material) - +A theme (template) based on Google's Material Design for Shaarli, the superfast delicious clone. + * [Vinm/Blue-theme-for Shaarli](https://github.com/Vinm/Blue-theme-for-Shaarli) - A template/theme for Shaarli ([unmaintained](https://github.com/Vinm/Blue-theme-for-Shaarli/issues/2), compatibility unknown) * [vivienhaese/shaarlitheme](https://github.com/vivienhaese/shaarlitheme) - A Shaarli fork meant to be run in an openshift instance * [tt-rss-shaarli](https://github.com/jcsaaddupuy/tt-rss-shaarli) - [TinyTiny RSS](http://tt-rss.org/) plugin that adds support for sharing articles with Shaarli * [dhoko/ShaarliTemplate](https://github.com/dhoko/ShaarliTemplate) - A template/theme for Shaarli * [mknexen/shaarli-api](https://github.com/mknexen/shaarli-api) - a REST API for Shaarli - * [Shaarli-Albinomouse](https://github.com/alexisju/Shaarli-AlbinoMouse) - A fork of Shaarli with a different template + * [Albinomouse](https://github.com/alexisju/albinomouse-template) - A full template for Shaarli * [Shaarlimages](https://github.com/BoboTiG/shaarlimages) - An image-oriented aggregator for Shaarlis * [Shaarli Superhero Theme](https://github.com/AkibaTech/Shaarli---SuperHero-Theme) - A template/theme for Shaarli * [Limonade](https://github.com/misterair/limonade) - A fork of Shaarli with a new template * [octopress-shaarli](https://github.com/ahmet2mir/octopress-shaarli) - octoprress plugin to retrieve SHaarli links on the sidebara * [Bookie](https://github.com/bookieio/bookie) - Another self-hostable, Free bookmark sharing software, written in Python + * [Unmark](https://github.com/plainmade/unmark) - An open source to do app for bookmarks ([Homepage](https://unmark.it/)) @@ -251,7 +270,6 @@ Unofficial but relatedd work on Shaarli. If you maintain one of these, please ge * [A list of working Shaarli aggregators](https://raw.githubusercontent.com/Oros42/find_shaarlis/master/annuaires.json) * [A list of some known Shaarlis](https://github.com/Oros42/shaarlis_list) * [Adieu Delicious, Diigo et StumbleUpon. Salut Shaarli ! - sebsauvage.net](http://sebsauvage.net/rhaa/index.php?2011/09/16/09/29/58-adieu-delicious-diigo-et-stumbleupon-salut-shaarli-) (fr) _16/09/2011 - the original post about Shaarli_ - * [Mentions of Shaarli in the press](Mentions-of-Shaarli-in-%22the-press%22) * [Original ideas/fixme/TODO page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:ideas) * [Original discussion page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:discussion) (fr) * [Original revisions history](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) From a5752e776c9ee5ee5a711a76e8c8066ee88f7192 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 12 Mar 2015 21:57:19 +0100 Subject: [PATCH 092/658] Fix bad merge commit Define date format in templates instead of index.php. Conflicts: index.php tpl/dailyrss.html --- index.php | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/index.php b/index.php index 83c507b..9ab70f6 100644 --- a/index.php +++ b/index.php @@ -567,16 +567,6 @@ 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 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. - // Note that if you use a locale which is not installed on your webserver, - // the date will not be displayed in the chosen locale, but probably in US notation. -} - // Parse HTTP response headers and return an associative array. function http_parse_headers_shaarli( $headers ) { @@ -1142,7 +1132,7 @@ function showDailyRSS() $l = $LINKSDB[$linkdate]; $l['formatedDescription']=nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($l['description'])))); $l['thumbnail'] = thumbnail($l['url']); - $l['localdate']=linkdate2locale($l['linkdate']); + $l['timestamp'] = linkdate2timestamp($l['linkdate']); if (startsWith($l['url'],'?')) $l['url']=indexUrl().$l['url']; // make permalink URL absolute $links[$linkdate]=$l; } @@ -1190,7 +1180,7 @@ function showDaily() $linksToDisplay[$key]['taglist']=$taglist; $linksToDisplay[$key]['formatedDescription']=nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description'])))); $linksToDisplay[$key]['thumbnail'] = thumbnail($link['url']); - $linksToDisplay[$key]['localdate'] = linkdate2locale($link['linkdate']); + $linksToDisplay[$key]['timestamp'] = linkdate2timestamp($link['linkdate']); } /* We need to spread the articles on 3 columns. @@ -1940,21 +1930,14 @@ function buildLinkList($PAGE,$LINKSDB) while ($i<$end && $i Date: Wed, 1 Apr 2015 11:47:04 +0200 Subject: [PATCH 093/658] Display notes as absolute URLs --- index.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/index.php b/index.php index 9ab70f6..765416e 100644 --- a/index.php +++ b/index.php @@ -1938,6 +1938,12 @@ function buildLinkList($PAGE,$LINKSDB) $taglist = explode(' ',$link['tags']); uasort($taglist, 'strcasecmp'); $link['taglist']=$taglist; + + if ($link["url"][0] === '?' && // Check for both signs of a note: starting with ? and 7 chars long. I doubt that you'll post any links that look like this. + strlen($link["url"]) === 7) { + $link["url"] = indexUrl() . $link["url"]; + } + $linkDisp[$keys[$i]] = $link; $i++; } From 326ae54d08b787d61e2807ea3ff5dc3171a695de Mon Sep 17 00:00:00 2001 From: dimtion Date: Sun, 5 Apr 2015 18:18:15 +0200 Subject: [PATCH 094/658] Fix missing permalink title when logged in --- index.php | 1 - 1 file changed, 1 deletion(-) diff --git a/index.php b/index.php index 765416e..7d84aa0 100644 --- a/index.php +++ b/index.php @@ -1770,7 +1770,6 @@ HTML; // -------- Otherwise, simply display search form and links: $PAGE = new pageBuilder; - $PAGE->assign('linkcount',count($LINKSDB)); buildLinkList($PAGE,$LINKSDB); // Compute list of links to display $PAGE->renderPage('linklist'); exit; From 8438a2e5d0cb90a869d67516c6e6cf756f77a588 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 12 Mar 2015 21:43:21 +0100 Subject: [PATCH 095/658] Fixes autoLocale function by trying several way to find a correct one. Fix https://github.com/shaarli/Shaarli/issues/184 --- index.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index 765416e..3192029 100644 --- a/index.php +++ b/index.php @@ -302,12 +302,17 @@ function keepMultipleSpaces($text) // (Note that is may not work on your server if the corresponding local is not installed.) function autoLocale() { - $loc='en_US'; // Default if browser does not send HTTP_ACCEPT_LANGUAGE + $attempts = array('en_US'); // Default if browser does not send HTTP_ACCEPT_LANGUAGE if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) // e.g. "fr,fr-fr;q=0.8,en;q=0.5,en-us;q=0.3" { // (It's a bit crude, but it works very well. Preferred language is always presented first.) - if (preg_match('/([a-z]{2}(-[a-z]{2})?)/i',$_SERVER['HTTP_ACCEPT_LANGUAGE'],$matches)) $loc=$matches[1]; + if (preg_match('/([a-z]{2})-?([a-z]{2})?/i',$_SERVER['HTTP_ACCEPT_LANGUAGE'],$matches)) { + $loc = $matches[1] . (!empty($matches[2]) ? '_' . strtoupper($matches[2]) : ''); + $attempts = array($loc, str_replace('_', '-', $loc), + $loc . '_' . strtoupper($loc), $loc . '_' . $loc, + $loc . '-' . strtoupper($loc), $loc . '-' . $loc); + } } - setlocale(LC_TIME,$loc); // LC_TIME = Set local for date/time format only. + setlocale(LC_TIME, $attempts); // LC_TIME = Set local for date/time format only. } // ------------------------------------------------------------------------------------------ @@ -549,7 +554,7 @@ function endsWith($haystack,$needle,$case=true) function linkdate2timestamp($linkdate) { $Y=$M=$D=$h=$m=$s=0; - $r = sscanf($linkdate,'%4d%2d%2d_%2d%2d%2d',$Y,$M,$D,$h,$m,$s); + sscanf($linkdate,'%4d%2d%2d_%2d%2d%2d',$Y,$M,$D,$h,$m,$s); return mktime($h,$m,$s,$M,$D,$Y); } From f3e89f50ecae76ddd6bf77e23b4a84bec998bd69 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sun, 5 Apr 2015 22:16:17 +0200 Subject: [PATCH 096/658] cleanup: makefile comments --- Makefile | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 8f9ab9e..9635e53 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ # Shaarli, the personal, minimalist, super-fast, no-database delicious clone. -# # Makefile for PHP code analysis & testing -# + # Prerequisites: # - install Composer, either: # - from your distro's package manager; @@ -9,6 +8,7 @@ # - install/update test dependencies: # $ composer install # 1st setup # $ composer update + BIN = vendor/bin PHP_SOURCE = index.php MESS_DETECTOR_RULES = cleancode,codesize,controversial,design,naming,unusedcode @@ -17,41 +17,39 @@ all: static_analysis_summary ## # Concise status of the project -# # These targets are non-blocking: || exit 0 ## + static_analysis_summary: code_sniffer_source copy_paste mess_detector_summary ## # PHP_CodeSniffer -# # Detects PHP syntax errors -# # Documentation (usage, output formatting): # - http://pear.php.net/manual/en/package.php.php-codesniffer.usage.php # - http://pear.php.net/manual/en/package.php.php-codesniffer.reporting.php ## + code_sniffer: code_sniffer_full -# - errors by Git author +### - errors by Git author code_sniffer_blame: @$(BIN)/phpcs $(PHP_SOURCE) --report-gitblame -# - all errors/warnings +### - all errors/warnings code_sniffer_full: @$(BIN)/phpcs $(PHP_SOURCE) --report-full --report-width=200 -# - errors grouped by kind +### - errors grouped by kind code_sniffer_source: @$(BIN)/phpcs $(PHP_SOURCE) --report-source || exit 0 ## # PHP Copy/Paste Detector -# # Detects code redundancy -# # Documentation: https://github.com/sebastianbergmann/phpcpd ## + copy_paste: @echo "-----------------------" @echo "PHP COPY/PASTE DETECTOR" @@ -61,32 +59,30 @@ copy_paste: ## # PHP Mess Detector -# # Detects PHP syntax errors, sorted by category -# # Rules documentation: http://phpmd.org/rules/index.html -# +## + mess_title: @echo "-----------------" @echo "PHP MESS DETECTOR" @echo "-----------------" -# - all warnings +### - all warnings mess_detector: mess_title @$(BIN)/phpmd $(PHP_SOURCE) text $(MESS_DETECTOR_RULES) | sed 's_.*\/__' -# - all warnings -# the generated HTML contains links to PHPMD's documentation +### - all warnings + HTML output contains links to PHPMD's documentation mess_detector_html: @$(BIN)/phpmd $(PHP_SOURCE) html $(MESS_DETECTOR_RULES) \ --reportfile phpmd.html || exit 0 -# - warnings grouped by message, sorted by descending frequency order +### - warnings grouped by message, sorted by descending frequency order mess_detector_grouped: mess_title @$(BIN)/phpmd $(PHP_SOURCE) text $(MESS_DETECTOR_RULES) \ | cut -f 2 | sort | uniq -c | sort -nr -# - summary: number of warnings by rule set +### - summary: number of warnings by rule set mess_detector_summary: mess_title @for rule in $$(echo $(MESS_DETECTOR_RULES) | tr ',' ' '); do \ warnings=$$($(BIN)/phpmd $(PHP_SOURCE) text $$rule | wc -l); \ @@ -95,12 +91,13 @@ mess_detector_summary: mess_title ## # Targets for repository and documentation maintenance -# -# remove all unversioned files +## + +### remove all unversioned files clean: @git clean -df -# update the local copy of the documentation +### update the local copy of the documentation doc: clean @rm -rf doc @git clone https://github.com/shaarli/Shaarli.wiki.git doc From 10070c3700aba137aab7b341d6116584f22715a3 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sun, 5 Apr 2015 22:18:04 +0200 Subject: [PATCH 097/658] doc: update documentation (sync from wiki) --- doc/Home.md | 69 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 11 deletions(-) diff --git a/doc/Home.md b/doc/Home.md index c80b8c9..bbece98 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -8,6 +8,52 @@ If you'd like a feature added, see if it fits in the list of [Ideas for Plugins] _Note: This documentation is available online at https://github.com/shaarli/Shaarli/wiki, and locally in the `doc/` directory of your Shaarli installation._ +---------------------------------------------------------------------------------- + + + +- [Basic Usage](#basic-usage) + - [Add the sharing button (_bookmarklet_) to your browser](#add-the-sharing-button-_bookmarklet_-to-your-browser) + - [Share links using the _bookmarklet_](#share-links-using-the-_bookmarklet_) +- [Other usage examples](#other-usage-examples) + - [Using Shaarli as a blog, notepad, pastebin...](#using-shaarli-as-a-blog-notepad-pastebin) + - [RSS Feeds or Picture Wall for a specific search/tag](#rss-feeds-or-picture-wall-for-a-specific-searchtag) +- [Configuration](#configuration) + - [Main data/options.php file](#main-dataoptionsphp-file) + - [Changing theme](#changing-theme) + - [Changing template](#changing-template) +- [Backup](#backup) +- [Troubleshooting](#troubleshooting) + - [I forgot my password !](#i-forgot-my-password-) + - [I'm locked out - Login bruteforce protection](#im-locked-out---login-bruteforce-protection) + - [List of all login attempts](#list-of-all-login-attempts) + - [Exporting from Diigo](#exporting-from-diigo) + - [Importing from SemanticScuttle](#importing-from-semanticscuttle) + - [Importing from Mister Wong](#importing-from-mister-wong) + - [Hosting problems](#hosting-problems) + - [Dates are not properly formatted](#dates-are-not-properly-formatted) + - [Problems on CentOS servers](#problems-on-centos-servers) + - [My session expires ! I can't stay logged in](#my-session-expires--i-cant-stay-logged-in) + - [`Sessions do not seem to work correctly on your server`](#sessions-do-not-seem-to-work-correctly-on-your-server) + - [pubsubhubbub support](#pubsubhubbub-support) +- [Notes](#notes) + - [Various hacks](#various-hacks) + - [Changing timestamp for a link](#changing-timestamp-for-a-link) +- [Related software](#related-software) +- [Other links](#other-links) +- [FAQ](#faq) + - [Why did you create Shaarli ?](#why-did-you-create-shaarli-) + - [Why use Shaarli and not Delicious/Diigo ?](#why-use-shaarli-and-not-deliciousdiigo-) + - [What does Shaarli mean ?](#what-does-shaarli-mean-) +- [Technical details](#technical-details) + - [Directory structure](#directory-structure) + - [Why not use a real database ? Files are slow !](#why-not-use-a-real-database--files-are-slow-) +- [Wiki - TODO](#wiki---todo) + + + + + ------------------------------------------------------------------ # Basic Usage @@ -139,17 +185,6 @@ You have two ways of backing up your database: * This can be done using the [shaarchiver](https://github.com/nodiscc/shaarchiver) tool. Example command: `./export-bookmarks.py --url=https://my.server.com/shaarli --username=myusername --password=mysupersecretpassword --download-dir=./ --type=all` - -# Login bruteforce protection -Login form is protected against brute force attacks: 4 failed logins will ban the IP address from login for 30 minutes. Banned IPs can still browse links. - -To remove the current IP bans, delete the file `data/ipbans.php` - -## List of all login attempts - -The file `data/log.txt` shows all logins (successful or failed) and bans/lifted bans. -Search for `failed` in this file to look for unauthorized login attempts. - # Troubleshooting ### I forgot my password ! @@ -157,6 +192,18 @@ Search for `failed` in this file to look for unauthorized login attempts. Delete the file data/config.php and display the page again. You will be asked for a new login/password. + +### I'm locked out - Login bruteforce protection +Login form is protected against brute force attacks: 4 failed logins will ban the IP address from login for 30 minutes. Banned IPs can still browse links. + +To remove the current IP bans, delete the file `data/ipbans.php` + +### List of all login attempts + +The file `data/log.txt` shows all logins (successful or failed) and bans/lifted bans. +Search for `failed` in this file to look for unauthorized login attempts. + + ### Exporting from Diigo If you export your bookmark from Diigo, make sure you use the Delicious export, not the Netscape export. (Their Netscape export is broken, and they don't seem to be interested in fixing it.) From 82af78b272ab0036eec289eb338934736aabbdc2 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sun, 5 Apr 2015 22:35:01 +0200 Subject: [PATCH 098/658] use pandoc to generate local HTML documentation fixes https://github.com/shaarli/Shaarli/issues/178 run 'make htmldoc' --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 9635e53..e6f4285 100644 --- a/Makefile +++ b/Makefile @@ -102,3 +102,9 @@ doc: clean @rm -rf doc @git clone https://github.com/shaarli/Shaarli.wiki.git doc @rm -rf doc/.git + +### Convert local markdown documentation to HTML +htmldoc: + for file in `find doc/ -maxdepth 1 -name "*.md"`; do \ + pandoc -f markdown_github -t html5 -s -c "github-markdown.css" -o doc/`basename $$file .md`.html "$$file"; \ + done; \ No newline at end of file From 7a32b172b82c2571d39d0b239e06d6be73b174f3 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sun, 5 Apr 2015 22:37:15 +0200 Subject: [PATCH 099/658] add local HTML documentation generated with 'make htmldoc' --- ...SH-SCP,-serve-it-locally-with-php-cli.html | 75 ++++ ...s-for-shaarlis-listed-in-an-opml-file.html | 167 ++++++++ ...e-patch---add-new-via-field-for-links.html | 201 ++++++++++ doc/Home.html | 368 ++++++++++++++++++ doc/Ideas-for-plugins.html | 26 ++ doc/_Sidebar.html | 70 ++++ 6 files changed, 907 insertions(+) create mode 100644 doc/Copy-a-Shaarli-installation-over-SSH-SCP,-serve-it-locally-with-php-cli.html create mode 100644 doc/Download-CSS-styles-for-shaarlis-listed-in-an-opml-file.html create mode 100644 doc/Example-patch---add-new-via-field-for-links.html create mode 100644 doc/Home.html create mode 100644 doc/Ideas-for-plugins.html create mode 100644 doc/_Sidebar.html diff --git a/doc/Copy-a-Shaarli-installation-over-SSH-SCP,-serve-it-locally-with-php-cli.html b/doc/Copy-a-Shaarli-installation-over-SSH-SCP,-serve-it-locally-with-php-cli.html new file mode 100644 index 0000000..25e4bc6 --- /dev/null +++ b/doc/Copy-a-Shaarli-installation-over-SSH-SCP,-serve-it-locally-with-php-cli.html @@ -0,0 +1,75 @@ + + + + + + + + + + + + +

    Example bash script:

    +
    #!/bin/bash
+#Description: Copy a Shaarli installation over SSH/SCP, serve it locally with php-cli
+#Will create a local-shaarli/ directory when you run it, backup your Shaarli there, and serve it locally.
+#Will NOT download linked pages. It's just a directly usable backup/copy/mirror of your Shaarli
+#Requires: ssh, scp and a working SSH access to the server where your Shaarli is installed
+#Usage: ./local-shaarli.sh
+#Author: nodiscc (nodiscc@gmail.com)
+#License: MIT (http://opensource.org/licenses/MIT)
+set -o errexit
+set -o nounset
+
+##### CONFIG #################
+#The port used by php's local server
+php_local_port=7431
+
+#Name of the SSH server and path where Shaarli is installed
+#TODO: pass these as command-line arguments
+remotehost="my.ssh.server"
+remote_shaarli_dir="/var/www/shaarli"
+
+
+###### FUNCTIONS #############
+_main() {
+    _CBSyncShaarli
+    _CBServeShaarli
+}
+
+_CBSyncShaarli() {
+    remote_temp_dir=$(ssh $remotehost mktemp -d)
+    remote_ssh_user=$(ssh $remotehost whoami)
+    ssh -t "$remotehost" sudo cp -r "$remote_shaarli_dir" "$remote_temp_dir"
+    ssh -t "$remotehost" sudo chown -R "$remote_ssh_user":"$remote_ssh_user" "$remote_temp_dir"
+    scp -rq "$remotehost":"$remote_temp_dir" local-shaarli
+    ssh "$remotehost" rm -r "$remote_temp_dir"
+}
+
+_CBServeShaarli() {
+    #TODO: allow serving a previously downloaded Shaarli
+    #TODO: ask before overwriting local copy, if it exists
+    cd local-shaarli/
+    php -S localhost:${php_local_port}
+    echo "Please go to http://localhost:${php_local_port}"
+}
+
+
+##### MAIN #################
+
+_main
    +

    This outputs:

    +
    $ ./local-shaarli.sh
+PHP 5.6.0RC4 Development Server started at Mon Sep  1 21:56:19 2014
+Listening on http://localhost:7431
+Document root is /home/user/local-shaarli/shaarli
+Press Ctrl-C to quit.
+
+[Mon Sep  1 21:56:27 2014] ::1:57868 [200]: /
+[Mon Sep  1 21:56:27 2014] ::1:57869 [200]: /index.html
+[Mon Sep  1 21:56:37 2014] ::1:57881 [200]: /...
    + + diff --git a/doc/Download-CSS-styles-for-shaarlis-listed-in-an-opml-file.html b/doc/Download-CSS-styles-for-shaarlis-listed-in-an-opml-file.html new file mode 100644 index 0000000..0f32fb8 --- /dev/null +++ b/doc/Download-CSS-styles-for-shaarlis-listed-in-an-opml-file.html @@ -0,0 +1,167 @@ + + + + + + + + + + + + +

    Download CSS styles for shaarlis listed in an opml file

    +

    Example php script:

    +
    <!---- ?php -->
+<!---- Copyright (c) 2014 Nicolas Delsaux (https://github.com/Riduidel) -->
+<!---- License: zlib (http://www.gzip.org/zlib/zlib_license.html) -->
+
+/**
+ * Source: https://github.com/Riduidel
+ * Download css styles for shaarlis listed in an opml file
+ */
+define("SHAARLI_RSS_OPML", "https://www.ecirtam.net/shaarlirss/custom/people.opml");
+
+define("THEMES_TEMP_FOLDER", "new_themes");
+
+if(!file_exists(THEMES_TEMP_FOLDER)) {
+    mkdir(THEMES_TEMP_FOLDER);
+}
+
+function siteUrl($pathInSite) {
+    $indexPos = strpos($pathInSite, "index.php");
+    if(!$indexPos) {
+        return $pathInSite;
+    } else {
+        return substr($pathInSite, 0, $indexPos);
+    }
+}
+
+function createShaarliHashFromOPMLL($opmlFile) {
+    $result = array();
+    $opml = file_get_contents($opmlFile);
+    $opmlXml = simplexml_load_string($opml);
+    $outlineElements = $opmlXml->xpath("body/outline");
+    foreach($outlineElements as $site) {
+        $siteUrl = siteUrl((string) $site['htmlUrl']);
+        $result[$siteUrl]=((string) $site['text']);
+    }
+    return $result;
+}
+
+function getSiteFolder($url) {
+    $domain = parse_url($url,  PHP_URL_HOST);
+    return THEMES_TEMP_FOLDER."/".str_replace(".", "_", $domain);
+}
+
+function get_http_response_code($theURL) {
+     $headers = get_headers($theURL);
+     return substr($headers[0], 9, 3);
+}
+
+/**
+ * This makes the code PHP-5 only (particularly the call to "get_headers")
+ */
+function copyUserStyleFrom($url, $name, $knownStyles) {
+    $userStyle = $url."inc/user.css";
+    if(in_array($url, $knownStyles)) {
+        // TODO add log message
+    } else {
+        $statusCode = get_http_response_code($userStyle);
+        if(intval($statusCode)<300) {
+            $styleSheet = file_get_contents($userStyle);
+            $siteFolder = getSiteFolder($url);
+            if(!file_exists($siteFolder)) {
+                mkdir($siteFolder);
+            }
+            if(!file_exists($siteFolder.'/user.css')) {
+                // Copy stylesheet
+                file_put_contents($siteFolder.'/user.css', $styleSheet);
+            }
+            if(!file_exists($siteFolder.'/README.md')) {
+                // Then write a readme.md file
+                file_put_contents($siteFolder.'/README.md', 
+                    "User style from ".$name."\n"
+                    ."============================="
+                    ."\n\n"
+                    ."This stylesheet was downloaded from ".$userStyle." on ".date(DATE_RFC822)
+                    );
+            }
+            if(!file_exists($siteFolder.'/config.ini')) {
+                // Write a config file containing useful informations
+                file_put_contents($siteFolder.'/config.ini', 
+                    "site_url=".$url."\n"
+                    ."site_name=".$name."\n"
+                    );
+            }
+            if(!file_exists($siteFolder.'/home.png')) {
+                // And finally copy generated thumbnail
+                $homeThumb = $siteFolder.'/home.png';
+                file_put_contents($siteFolder.'/home.png', file_get_contents(getThumbnailUrl($url)));
+            }
+            echo 'Theme have been downloaded from  <a href="'.$url.'">'.$url.'</a> into '.$siteFolder
+                .'. It looks like <img src="'.$homeThumb.'"><br/>';
+        }
+    }
+}
+
+function getThumbnailUrl($url) {
+    return 'http://api.webthumbnail.org/?url='.$url;
+}
+
+function copyUserStylesFrom($urlToNames, $knownStyles) {
+    foreach($urlToNames as $url => $name) {
+        copyUserStyleFrom($url, $name, $knownStyles);
+    }
+}
+
+/**
+ * Reading directory list, courtesy of http://www.laughing-buddha.net/php/dirlist/
+ * @param directory the directory we want to list files of
+ * @return a simple array containing the list of absolute file paths. Notice that current file (".") and parent one("..")
+ * are not listed here
+ */
+function getDirectoryList ($directory)  {
+    $realPath = realpath($directory);
+    // create an array to hold directory list
+    $results = array();
+    // create a handler for the directory
+    $handler = opendir($directory);
+    // open directory and walk through the filenames
+    while ($file = readdir($handler)) {
+        // if file isn't this directory or its parent, add it to the results
+        if ($file != "." && $file != "..") {
+            $results[] = realpath($realPath . "/" . $file);
+        }
+    }
+    // tidy up: close the handler
+    closedir($handler);
+    // done!
+    return $results;
+}
+
+/**
+ * Start in themes folder and look in all subfolders for config.ini files. 
+ * These config.ini files allow us not to download styles again and again
+ */
+function findKnownStyles() {
+    $result = array();
+    $subFolders = getDirectoryList("themes");
+    foreach($subFolders as $folder) {
+        $configFile = $folder."/config.ini";
+        if(file_exists($configFile)) {
+            $iniParameters = parse_ini_file($configFile);
+            array_push($result, $iniParameters['site_url']);
+        }
+    }
+    return $result;
+}
+
+$knownStyles = findKnownStyles();
+copyUserStylesFrom(createShaarliHashFromOPMLL(SHAARLI_RSS_OPML), $knownStyles);
+
+<!--- ? ---->
    + + diff --git a/doc/Example-patch---add-new-via-field-for-links.html b/doc/Example-patch---add-new-via-field-for-links.html new file mode 100644 index 0000000..7df9d25 --- /dev/null +++ b/doc/Example-patch---add-new-via-field-for-links.html @@ -0,0 +1,201 @@ + + + + + + + + + + + + +

    Example patch to add a new field ("via") for links, an input field to set the "via" property from the "edit link" dialog, and display the "via" field in the link list display. Untested, use at your own risk

    +

    Thanks to @Knah-Tsaeb in https://github.com/sebsauvage/Shaarli/pull/158

    +
    From e0f363c18e8fe67990ed2bb1a08652e24e70bbcb Mon Sep 17 00:00:00 2001
+From: Knah Tsaeb <knah-tsaeb@knah-tsaeb.org>
+Date: Fri, 11 Oct 2013 15:18:37 +0200
+Subject: [PATCH] Add a "via"/origin property for links, add new input in "edit link" dialog
+Thanks to:
+* https://github.com/Knah-Tsaeb/Shaarli/commit/040eb18ec8cdabd5ea855e108f81f97fbf0478c4
+* https://github.com/Knah-Tsaeb/Shaarli/commit/4123658eae44d7564d1128ce52ddd5689efee813
+* https://github.com/Knah-Tsaeb/Shaarli/commit/f1a8ca9cc8fe49b119d51b2d8382cc1a34542f96
+
+---
+ index.php         | 43 ++++++++++++++++++++++++++++++++-----------
+ tpl/editlink.html |  1 +
+ tpl/linklist.html |  1 +
+ 3 files changed, 34 insertions(+), 11 deletions(-)
+
+diff --git a/index.php b/index.php
+index 6fae2f8..53f798e 100644
+--- a/index.php
++++ b/index.php
+@@ -436,6 +436,12 @@ if (isset($_POST['login']))
+ // ------------------------------------------------------------------------------------------
+ // Misc utility functions:
+ 
++// Try to get just domain for @via
++function getJustDomain($url){
++    $parts = parse_url($url);   
++    return trim($parts['host']);
++    }
++
+ // Returns the server URL (including port and http/https), without path.
+ // e.g. "http://myserver.com:8080"
+ // You can append $_SERVER['SCRIPT_NAME'] to get the current script URL.
+@@ -799,7 +805,8 @@ class linkdb implements Iterator, Countable, ArrayAccess
+             $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);
++                   || (strpos(strtolower($l['tags']),$s)!==false)
++                   || (!empty($l['via']) && (strpos(strtolower($l['via']),$s)!==false));
+             if ($found) $filtered[$l['linkdate']] = $l;
+         }
+         krsort($filtered);
+@@ -814,7 +821,7 @@ class linkdb implements Iterator, Countable, ArrayAccess
+         $t = str_replace(',',' ',($casesensitive?$tags:strtolower($tags)));
+         $searchtags=explode(' ',$t);
+         $filtered=array();
+-        foreach($this->links as $l)
++        foreach($this-> links as $l)
+         {
+             $linktags = explode(' ',($casesensitive?$l['tags']:strtolower($l['tags'])));
+             if (count(array_intersect($linktags,$searchtags)) == count($searchtags))
+@@ -905,7 +912,7 @@ function showRSS()
+     else $linksToDisplay = $LINKSDB;
+     $nblinksToDisplay = 50;  // Number of links to display.
+     if (!empty($_GET['nb']))  // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.
+-    { 
++    {
+         $nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ;
+     }
+ 
+@@ -944,7 +951,12 @@ function showRSS()
+         // If user wants permalinks first, put the final link in description
+         if ($usepermalinks===true) $descriptionlink = '(<a href="'.$absurl.'">Link</a>)';
+         if (strlen($link['description'])>0) $descriptionlink = '<br>'.$descriptionlink;
+-        echo '<description><![CDATA['.nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description'])))).$descriptionlink.']]></description>'."\n</item>\n";
++        if(!empty($link['via'])){
++          $via = '<br>Origine => <a href="'.htmlspecialchars($link['via']).'">'.htmlspecialchars(getJustDomain($link['via'])).'</a>';
++        } else {
++         $via = '';
++        }
++        echo '<description><![CDATA['.nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description'])))).$via.$descriptionlink.']]></description>'."\n</item>\n";
+         $i++;
+     }
+     echo '</channel></rss><!-- Cached version of '.htmlspecialchars(pageUrl()).' -->';
+@@ -980,7 +992,7 @@ function showATOM()
+     else $linksToDisplay = $LINKSDB;
+     $nblinksToDisplay = 50;  // Number of links to display.
+     if (!empty($_GET['nb']))  // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.
+-    { 
++    {
+         $nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ;
+     }
+ 
+@@ -1006,11 +1018,16 @@ function showATOM()
+ 
+         // Add permalink in description
+         $descriptionlink = htmlspecialchars('(<a href="'.$guid.'">Permalink</a>)');
++        if(isset($link['via']) && !empty($link['via'])){
++          $via = htmlspecialchars('</br> Origine => <a href="'.$link['via'].'">'.getJustDomain($link['via']).'</a>');
++        } else {
++          $via = '';
++        }
+         // If user wants permalinks first, put the final link in description
+         if ($usepermalinks===true) $descriptionlink = htmlspecialchars('(<a href="'.$absurl.'">Link</a>)');
+         if (strlen($link['description'])>0) $descriptionlink = '&lt;br&gt;'.$descriptionlink;
+ 
+-        $entries.='<content type="html">'.htmlspecialchars(nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))))).$descriptionlink."</content>\n";
++        $entries.='<content type="html">'.htmlspecialchars(nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))))).$descriptionlink.$via."</content>\n";
+         if ($link['tags']!='') // Adding tags to each ATOM entry (as mentioned in ATOM specification)
+         {
+             foreach(explode(' ',$link['tags']) as $tag)
+@@ -1478,7 +1495,7 @@ function renderPage()
+         if (!startsWith($url,'http:') && !startsWith($url,'https:') && !startsWith($url,'ftp:') && !startsWith($url,'magnet:') && !startsWith($url,'?'))
+             $url = 'http://'.$url;
+         $link = array('title'=>trim($_POST['lf_title']),'url'=>$url,'description'=>trim($_POST['lf_description']),'private'=>(isset($_POST['lf_private']) ? 1 : 0),
+-                      'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags));
++                      'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags), 'via'=>trim($_POST['lf_via']));
+         if ($link['title']=='') $link['title']=$link['url']; // If title is empty, use the URL as title.
+         $LINKSDB[$linkdate] = $link;
+         $LINKSDB->savedb(); // Save to disk.
+@@ -1556,7 +1573,8 @@ function renderPage()
+             $title = (empty($_GET['title']) ? '' : $_GET['title'] ); // Get title if it was provided in URL (by the bookmarklet).
+             $description = (empty($_GET['description']) ? '' : $_GET['description']); // Get description if it was provided in URL (by the bookmarklet). [Bronco added that]
+             $tags = (empty($_GET['tags']) ? '' : $_GET['tags'] ); // Get tags if it was provided in URL
+-            $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); // Get private if it was provided in URL 
++            $via = (empty($_GET['via']) ? '' : $_GET['via'] );
++            $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); // Get private if it was provided in 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 extract the title (otherwise we will to straight to the edit form.)
+             if (empty($title) && parse_url($url,PHP_URL_SCHEME)=='http')
+@@ -1567,7 +1585,7 @@ function renderPage()
+                     {
+                         // Look for charset in html header.
+                        preg_match('#<meta .*charset=.*>#Usi', $data, $meta);
+- 
++
+                        // If found, extract encoding.
+                        if (!empty($meta[0]))
+                        {
+@@ -1577,7 +1595,7 @@ function renderPage()
+                            $html_charset = (!empty($enc[1])) ? strtolower($enc[1]) : 'utf-8';
+                        }
+                        else { $html_charset = 'utf-8'; }
+- 
++
+                        // Extract title
+                        $title = html_extract_title($data);
+                        if (!empty($title))
+@@ -1592,7 +1610,7 @@ function renderPage()
+                 $url='?'.smallHash($linkdate);
+                 $title='Note: ';
+             }
+-            $link = array('linkdate'=>$linkdate,'title'=>$title,'url'=>$url,'description'=>$description,'tags'=>$tags,'private'=>$private);
++            $link = array('linkdate'=>$linkdate,'title'=>$title,'url'=>$url,'description'=>$description,'tags'=>$tags,'via' => $via,'private'=>$private);
+         }
+ 
+         $PAGE = new pageBuilder;
+@@ -1842,6 +1860,9 @@ function buildLinkList($PAGE,$LINKSDB)
+         $taglist = explode(' ',$link['tags']);
+         uasort($taglist, 'strcasecmp');
+         $link['taglist']=$taglist;
++        if(!empty($link['via'])){
++          $link['via']=htmlspecialchars($link['via']);
++        }
+         $linkDisp[$keys[$i]] = $link;
+         $i++;
+     }
+diff --git a/tpl/editlink.html b/tpl/editlink.html
+index 4a2c30c..14d4f9c 100644
+--- a/tpl/editlink.html
++++ b/tpl/editlink.html
+@@ -16,6 +16,7 @@
+            <i>Title</i><br><input type="text" name="lf_title" value="{$link.title|htmlspecialchars}" style="width:100%"><br>
+            <i>Description</i><br><textarea name="lf_description" rows="4" cols="25" style="width:100%">{$link.description|htmlspecialchars}</textarea><br>
+            <i>Tags</i><br><input type="text" id="lf_tags" name="lf_tags" value="{$link.tags|htmlspecialchars}" style="width:100%"><br>
++           <i>Origine</i><br><input type="text" name="lf_via" value="{$link.via|htmlspecialchars}" style="width:100%"><br>
+            {if condition="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}
+             <input type="checkbox" checked="checked" name="lf_private" id="lf_private">
+             &nbsp;<label for="lf_private"><i>Private</i></label><br>
+diff --git a/tpl/linklist.html b/tpl/linklist.html
+index ddc38cb..0a8475f 100644
+--- a/tpl/linklist.html
++++ b/tpl/linklist.html
+@@ -43,6 +43,7 @@
+                 <span class="linktitle"><a href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a></span>
+                 <br>
+                 {if="$value.description"}<div class="linkdescription"{if condition="$search_type=='permalink'"} style="max-height:none !important;"{/if}>{$value.description}</div>{/if}
++                {if condition="isset($value.via) && !empty($value.via)"}<div><a href="{$value.via}">Origine => {$value.via|getJustDomain}</a></div>{/if}
+                 {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
+                     <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{$value.localdate|htmlspecialchars} - permalink</a> - </span>
+                 {else}
+-- 
+2.1.1
    + + diff --git a/doc/Home.html b/doc/Home.html new file mode 100644 index 0000000..e4d117f --- /dev/null +++ b/doc/Home.html @@ -0,0 +1,368 @@ + + + + + + + + + + + + +

    Shaarli wiki

    +

    Welcome to the Shaarli wiki! Here you can find some info on how to use, configure, tweak and solve problems with your Shaarli. For general info, read the README.

    +

    If you have any questions or ideas, please join the chat (also reachable via IRC), post them in our general discussion or read the current issues. If you've found a bug, please create a new issue.

    +

    If you'd like a feature added, see if it fits in the list of Ideas for Plugins and update the corresponding bug report.

    +

    Note: This documentation is available online at https://github.com/shaarli/Shaarli/wiki, and locally in the doc/ directory of your Shaarli installation.

    +
    + + + + + + + + + +
    +

    Basic Usage

    +

    Add the sharing button (bookmarklet) to your browser

    +
      +
    • Open your Shaarli and Login
      • +
    • Click the Tools button in the top bar
      • +
    • Drag the ✚Shaare link button, and drop it to your browser's bookmarks bar.
      • +
    +

    This bookmarklet button in compatible with Firefox, Opera, Chrome and Safari. Under Opera, you can't drag'n drop the button: You have to right-click on it and add a bookmark to your personal toolbar.

    +

    + +
      +
    • When you are visiting a webpage you would like to share with Shaarli, click the bookmarklet you just added.
      • +
    • A window opens.
      • +
    • You can freely edit title, description, tags... to find it later using the text search or tag filtering.
      • +
    • You will be able to edit this link later using the edit button.
      • +
    • You can also check the “Private” box so that the link is saved but only visible to you.
      • +
    • Click Save.Voila! Your link is now shared.
      • +
    +

    Other usage examples

    +

    Shaarli can be used:

    +
      +
    • to share, comment and save interesting links and news
      • +
    • to bookmark useful/frequent personal links (as private links) and share them between computers
      • +
    • as a minimal blog/microblog/writing platform (no character limit)
      • +
    • as a read-it-later list (for example items tagged readlater)
      • +
    • to draft and save articles/ideas
      • +
    • to keep code snippets
      • +
    • to keep notes and documentation
      • +
    • as a shared clipboard between machines
      • +
    • as a todo list
      • +
    • to store playlists (e.g. with the music or video tags)
      • +
    • to keep extracts/comments from webpages that may disappear
      • +
    • to keep track of ongoing discussions (for example items tagged discussion)
      • +
    • to feed RSS aggregators (planets) with specific tags
      • +
    • to feed other social networks, blogs... using RSS feeds and external services (dlvr.it, ifttt.com ...)
      • +
    +

    Using Shaarli as a blog, notepad, pastebin...

    +
      +
    • Go to your Shaarli setup and log in
      • +
    • Click the Add Link button
      • +
    • To share text only, do not enter any URL in the corresponding input field and click Add Link
      • +
    • Pick a title and enter your article, or note, in the description field; add a few tags; optionally check Private then click Save
      • +
    • Voilà! Your article is now published (privately if you selected that option) and accessible using its permalink.
      • +
    +

    RSS Feeds or Picture Wall for a specific search/tag

    +

    It is possible to filter RSS/ATOM feeds and Picture Wall on a Shaarli to only display results of a specific search, or for a specific tag. For example, if you want to subscribe only to links tagged photography:

    +
      +
    • Go to the desired Shaarli instance.
      • +
    • Search for the photography tag in the Filter by tag box. Links tagged photography are displayed.
      • +
    • Click on the RSS Feed button.
      • +
    • You are presented with an RSS feed showing only these links. Subscribe to it to receive only updates with this tag.
      • +
    • The same method also works for a full-text search (Search box) and for the Picture Wall (want to only see pictures about nature?)
      • +
    • You can also build the URL manually: https://my.shaarli.domain/?do=rss&searchtags=nature, https://my.shaarli.domain/links/?do=picwall&searchterm=poney
      • +
    +

    +

    Configuration

    +

    Main data/options.php file

    +

    To change the configuration, create the file data/options.php, example:

    +
        <?php
+    $GLOBALS['config']['LINKS_PER_PAGE'] = 30;
+    $GLOBALS['config']['HIDE_TIMESTAMPS'] = true;
+    $GLOBALS['config']['ENABLE_THUMBNAILS'] = false;  
+    ?>
    +

    Do not edit config options in index.php! Your changes would be lost when you upgrade. The following parameters are available (parameters (default value)):

    +
      +
    • DATADIR ('data') : This is the name of the subdirectory where Shaarli stores is data file. You can change it for better security.
      • +
    • CONFIG_FILE ($GLOBALS['config']['DATADIR'].'/config.php') : Name of file which is used to store login/password.
      • +
    • DATASTORE ($GLOBALS['config']['DATADIR'].'/datastore.php') : Name of file which contains the link database.
      • +
    • LINKS_PER_PAGE (20) : Default number of links per page displayed.
      • +
    • IPBANS_FILENAME ($GLOBALS['config']['DATADIR'].'/ipbans.php') : Name of file which records login attempts and IP bans.
      • +
    • BAN_AFTER (4) : An IP address will be banned after this many failed login attempts.
      • +
    • BAN_DURATION (1800) : Duration of ban (in seconds). (1800 seconds = 30 minutes)
      • +
    • OPEN_SHAARLI (false) : If you set this option to true, anyone will be able to add/modify/delete/import/exports links without having to login.
      • +
    • HIDE_TIMESTAMPS (false) : If you set this option to true, the date/time of each link will not be displayed (including in RSS Feed).
      • +
    • ENABLE_THUMBNAILS (true) : Enable/disable thumbnails.
      • +
    • RAINTPL_TMP (tmp/) : Raintpl cache directory (keep the trailing slash!)
      • +
    • `RAINTPL_TPL (tpl/) : Raintpl template directory (keep the trailing slash!). Edit this option if you want to change the rendering template (page structure) used by Shaarli. See Changing template
      • +
    • CACHEDIR ('cache') : Directory where the thumbnails are stored.
      • +
    • ENABLE_LOCALCACHE (true) : If you have a limited quota on your webspace, you can set this option to false: Shaarli will not generate thumbnails which need to be cached locally (vimeo, flickr, etc.). Thumbnails will still be visible for the services which do not use the local cache (youtube.com, imgur.com, dailymotion.com, imageshack.us)
      • +
    • UPDATECHECK_FILENAME ($GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt') : name of the file used to store available shaarli version.
      • +
    • UPDATECHECK_INTERVAL (86400) : Delay between new Shaarli version check. 86400 seconds = 24 hours. Note that if you do not login for a week, Shaarli will not check for new version for a week.
      • +
    • ENABLE_UPDATECHECK: Determines whether Shaarli check for new releases at https://github.com/shaarli/Shaarli
      • +
    • SHOW_ATOM (false) : Show an ATOM Feed button next to the Subscribe (RSS) button. ATOM feeds are available at the address ?do=atom regardless of this option.
      • +
    • ARCHIVE_ORG (false) : For each link, display a link to an archived version on archive.org
      • +
    • ENABLE_RSS_PERMALINKS (true): choose whether the RSS item title link points directly to the link, or to the entry on Shaarli (permalink). true is the original Shaarli bahevior (point directly to the link)
      • +
    +

    Changing theme

    +
      +
    • Shaarli's apparence can be modified by editing CSS rules in inc/user.css. This file allows to override rules defined in the main inc/shaarli.css (only add changed rules), or define a whole new theme.
      • +
    • Do not edit inc/shaarli.css! Your changes would be overriden when updating Shaarli.
      • +
    • Some themes are available at https://github.com/shaarli/shaarli-themes.
      • +
    +

    See also:

    + +

    Changing template

    +

    | 💥 | This feature is currently being worked on and will be improved in the next releases. Experimental. |
    |---------|---------|

    +
      +
    • Find the template you'd like to install. See the list of available templates (TODO). Find it's git clone URL or download the zip archive for the template.
      • +
    • In your Shaarli tpl/ directory, run git clone https://url/of/my-template/ or unpack the zip archive. There should now be a my-template/ directory under the tpl/ dir, containing directly all the template files.
      • +
    • Edit data/options.php to have Shaarli use this template. Eg.
      • +
    +

    $GLOBALS['config']['RAINTPL_TPL'] = 'tpl/my-template/' ;

    +

    You can find a list of compatible templates in Related Software

    +

    Backup

    +

    You have two ways of backing up your database:

    +
      +
    • Backup the file data/datastore.php (by FTP or SSH). Restore by putting the file back in place.
      • +
    • Example command: rsync -avzP my.server.com:/var/www/shaarli/data/datastore.php datastore-$(date +%Y-%m-%d_%H%M).php
      • +
    • Export your links as HTML (Menu Tools > Export). Restore by using the Import feature.
      • +
    • This can be done using the shaarchiver tool. Example command: ./export-bookmarks.py --url=https://my.server.com/shaarli --username=myusername --password=mysupersecretpassword --download-dir=./ --type=all
      • +
    +

    Troubleshooting

    +

    I forgot my password !

    +

    Delete the file data/config.php and display the page again. You will be asked for a new login/password.

    +

    I'm locked out - Login bruteforce protection

    +

    Login form is protected against brute force attacks: 4 failed logins will ban the IP address from login for 30 minutes. Banned IPs can still browse links.

    +

    To remove the current IP bans, delete the file data/ipbans.php

    +

    List of all login attempts

    +

    The file data/log.txt shows all logins (successful or failed) and bans/lifted bans.
    Search for failed in this file to look for unauthorized login attempts.

    +

    Exporting from Diigo

    +

    If you export your bookmark from Diigo, make sure you use the Delicious export, not the Netscape export. (Their Netscape export is broken, and they don't seem to be interested in fixing it.)

    +

    Importing from SemanticScuttle

    +

    To correctly import the tags from a SemanticScuttle HTML export, edit the HTML file before importing and replace all occurences of tags= (lowercase) to TAGS= (uppercase).

    +

    Importing from Mister Wong

    +

    See this issue for import tweaks.

    +

    Hosting problems

    +
      +
    • On free.fr : Please note that free uses php 5.1 and thus you will not have autocomplete in tag editing. Don't forget to create a sessions directory at the root of your webspace. Change the file extension to .php5 or create a .htaccess file in the directory where Shaarli is located containing:
      • +
    +
    php 1
+SetEnv PHP_VER 5
    +
      +
    • If you have an error such as: Parse error: syntax error, unexpected '=', expecting '(' in /links/index.php on line xxx, it means that your host is using php4, not php5. Shaarli requires php 5.1. Try changing the file extension to .php5
      • +
    • On 1and1 : If you add the link from the page (and not from the bookmarklet), Shaarli will no be able to get the title of the page. You will have to enter it manually. (Because they have disabled the ability to download a file through HTTP).
      • +
    • If you have the error Warning: file_get_contents() [function.file-get-contents]: URL file-access is disabled in the server configuration in /…/index.php on line xxx, it means that your host has disabled the ability to fetch a file by HTTP in the php config (Typically in 1and1 hosting). Bad host. Change host. Or comment the following lines:
      • +
    +
    //list($status,$headers,$data) = getHTTP($url,4); // Short timeout to keep the application responsive.
+// FIXME: Decode charset according to charset specified in either 1) HTTP response headers or 2) <head> in html 
+//if (strpos($status,'200 OK')) $title=html_extract_title($data);
    +
      +
    • On hosts which forbid outgoing HTTP requests (such as free.fr), some thumbnails will not work.
      • +
    • On lost-oasis, RSS doesn't work correctly, because of this message at the begining of the RSS/ATOM feed : <? // tout ce qui est charge ici (generalement des includes et require) est charge en permanence. ?>. To fix this, remove this message from php-include/prepend.php
      • +
    +

    Dates are not properly formatted

    +

    Shaarli tries to sniff the language of the browser (using HTTP_ACCEPT_LANGUAGE headers) and choose a date format accordingly. But Shaarli can only use the date formats (and more generaly speaking, the locales) provided by the webserver. So even if you have a browser in French, you may end up with dates in US format (it's the case on sebsauvage.net :-( )

    +

    Problems on CentOS servers

    +

    On CentOS/RedHat derivatives, you may need to install the php-mbstring package.

    +

    My session expires ! I can't stay logged in

    +

    This can be caused by several things:

    +
      +
    • Your php installation may not have a proper directory setup for session files. (eg. on Free.fr you need to create a session directory on the root of your website.) You may need to create the session directory of set it up.
      • +
    • Most hosts regularly clean the temporary and session directories. Your host may be cleaning those directories too aggressively (eg.OVH hosts), forcing an expire of the session. You may want to set the session directory in your web root. (eg. Create the sessions subdirectory and add ini_set('session.save_path', $_SERVER['DOCUMENT_ROOT'].'/../sessions');. Make sure this directory is not browsable !)
      • +
    • If your IP address changes during surfing, Shaarli will force expire your session for security reasons (to prevent session cookie hijacking). This can happen when surfing from WiFi or 3G (you may have switched WiFi/3G access point), or in some corporate/university proxies which use load balancing (and may have proxies with several external IP addresses).
      • +
    • Some browser addons may interfer with HTTP headers (ipfuck/ipflood/GreaseMonkey…). Try disabling those.
      • +
    • You may be using OperaTurbo or OperaMini, which use their own proxies which may change from time to time.
      • +
    • If you have another application on the same webserver where Shaarli is installed, these application may forcefully expire php sessions.
      • +
    +

    Sessions do not seem to work correctly on your server

    +

    Follow the instructions in the error message. Make sure you are accessing shaarli via a direct IP address or a proper hostname. If you have no dots in the hostname (e.g. localhost or http://my-webserver/shaarli/), some browsers will not store cookies at all (this respects the HTTP cookie specification).

    +

    pubsubhubbub support

    +

    Download publisher.php at the root of your Shaarli installation and set $GLOBALS['config']['PUBSUBHUB_URL'] in your config.php

    +

    Notes

    +

    Various hacks

    + + +
      +
    • Look for <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> in tpl/editlink.tpl (line 14)
      • +
    • Remove type="hidden" from this line
      • +
    • A new date/time field becomes available in the edit/new link dialog. You can set the timestamp manually by entering it in the format YYYMMDD_HHMMS.
      • +
    +
    $data = "tZNdb9MwFIb... <Commented content inside datastore.php>";
+$out = unserialize(gzinflate(base64_decode($data)));
+echo "<pre>"; // Pretty printing is love, pretty printing is life
+print_r($out);
+echo "</pre>";
+exit;
    +

    This will output the internal representation of the datastore, "unobfuscated" (if this can really be considered obfuscation)

    +

    Related software

    +

    Unofficial but relatedd work on Shaarli. If you maintain one of these, please get in touch with us to help us find a way to adapt your work to our fork. TODO contact repos owners to see if they'd like to standardize their work for the community fork.

    + +

    Other links

    + +

    FAQ

    +

    Why did you create Shaarli ?

    +

    I was a StumbleUpon user. Then I got fed up with they big toolbar. I switched to delicious, which was lighter, faster and more beautiful. Until Yahoo bought it. Then the export API broke all the time, delicious became slow and was ditched by Yahoo. I switched to Diigo, which is not bad, but does too much. And Diigo is sslllooooowww and their Firefox extension a bit buggy. And… oh… their Firefox addon sends to Diigo every single URL you visit (Don't believe me ? Use Tamper Data and open any page).

    +

    Enough is enough. Saving simple links should not be a complicated heavy thing. I ditched them all and wrote my own: Shaarli. It's simple, but it does the job and does it well. And my data is not hosted on a foreign server, but on my server.

    +

    Why use Shaarli and not Delicious/Diigo ?

    +

    With Shaarli:

    +
      +
    • The data is yours: It's hosted on your server.
      • +
    • Never fear of having your data locked-in.
      • +
    • Never fear to have your data sold to third party.
      • +
    • Your private links are not hosted on a third party server.
      • +
    • You are not tracked by browser addons (like Diigo does)
      • +
    • You can change the look and feel of the pages if you want.
      • +
    • You can change the behaviour of the program.
      • +
    • It's magnitude faster than most bookmarking services.
      • +
    +

    What does Shaarli mean ?

    +

    Shaarli is for shaaring your links.

    +

    Technical details

    +
      +
    • Application is protected against XSRF (Cross-site requests forgery): Forms which act on data (save,delete…) contain a token generated by the server. Any posted form which does not contain a valid token is rejected. Any token can only be used once. Token are attached to the session and cannot be reused in another session.
      • +
    • Sessions automatically expires after 60 minutes. Sessions are protected against highjacking: The sessionID cannot be used from a different IP address.
      • +
    • An .htaccess file protects the data file.
      • +

    • Link database is an associative array which is serialized, compressed (with deflate), base64-encoded and saved as a comment in a .php file. Thus even if the server does not support htaccess files, the data file will still not be readable by URL. The database looks like this:

      +
      <?php /* zP1ZjxxJtiYIvvevEPJ2lDOaLrZv7o...
+...ka7gaco/Z+TFXM2i7BlfMf8qxpaSSYfKlvqv/x8= */ ?>
      • +
    • The password is salted, hashed and stored in the data subdirectory, in a php file, and protected by htaccess. Even if the webserver does not support htaccess, the hash is not readable by URL. Even if the .php file is stolen, the password cannot deduced from the hash. The salt prevents rainbow-tables attacks.
      • +
    • Shaarli relies on HTTP_REFERER for some functions (like redirects and clicking on tags). If you have disabled or masqueraded HTTP_REFERER in your browser, some features of Shaarli may not work
      • +
    • magic_quotes is a horrible option of php which is often activated on servers. No serious developer should rely on this horror to secure their code against SQL injections. You should disable it (and Shaarli expects this option to be disabled). Nevertheless, I have added code to cope with magic_quotes on, so you should not be bothered even on crappy hosts.
      • +

    • Small hashes are used to make a link to an entry in Shaarli. They are unique. In fact, the date of the items (eg.20110923_150523) is hashed with CRC32, then converted to base64 and some characters are replaced. They are always 6 characters longs and use only A-Z a-z 0-9 - _ and @.

      • +
    +

    Directory structure

    +

    Here is the directory structure of Shaarli and the purpose of the different files:

    +
        index.php : Main program.
+    COPYING : Shaarli license.
+    inc/ : Includes (libraries, CSS…)
+        shaarli.css : Shaarli stylesheet.
+        jquery.min.js : jQuery javascript library.
+        jquery-ui.min.js : jQuery-UI javascript library.
+        jquery-MIT-LICENSE.txt: jQuery license.
+        jquery.lazyload.min.js: LazyLoad javascript library.
+        rain.tpl.class.php : RainTPL templating library.
+    tpl/ : RainTPL templates for Shaarli. They are used to build the pages.
+    images/ : Images and icons used in Shaarli.
+    data/ : Directory where data is stored (bookmark database, configuration, logs, banlist…)
+        config.php : Shaarli configuration (login, password, timezone, title…)
+        datastore.php : Your link database (compressed).
+        ipban.php : IP address ban system data.
+        lastupdatecheck.txt : Update check timestamp file (used to check every 24 hours if a new version of Shaarli is available).
+        log.txt : login/IPban log.
+    cache/ : Directory containing the thumbnails cache. This directory is automatically created. You can erase it anytime you want.
+    tmp/ : Temporary directory for compiled RainTPL templates. This directory is automatically created. You can erase it anytime you want.
    +

    Why not use a real database ? Files are slow !

    +

    Does browsing this page feel slow ? Try browsing older pages, too.

    +

    It's not slow at all, is it ? And don't forget the database contains more than 16000 links, and it's on a shared host, with 32000 visitors/day for my website alone. And it's still damn fast. Why ?

    +

    The data file is only 3.7 Mb. It's read 99% of the time, and is probably already in the operation system disk cache. So generating a page involves no I/O at all most of the time.

    +

    Wiki - TODO

    +
      +
    • Translate (new page can be called Home.fr, Home.es ...) and linked from Home
      • +
    • add more screenshots
      • +
    • add developer documentation (storage architecture, classes and functions, security handling, ...)
      • +
    • Contact related projects
      • +
    • Add a Table of Contents to the wiki (can be added to the sidebar)
      • +
    +

    ...

    + + diff --git a/doc/Ideas-for-plugins.html b/doc/Ideas-for-plugins.html new file mode 100644 index 0000000..8ca3572 --- /dev/null +++ b/doc/Ideas-for-plugins.html @@ -0,0 +1,26 @@ + + + + + + + + + + + + +

    Please list here ideas for potential plugins. Do not include lengthy discussion about why/how the plugin should work, but link instead to an issue where this would have been discussed.
    By listing these ideas here, we can keep the issues list a bit more clean, and have a centralized place where people wanting to contribute can find potential enhancement ideas.
    Also have a look at https://github.com/shaarli/Shaarli/issues/14 for other suggestions.

    + + + diff --git a/doc/_Sidebar.html b/doc/_Sidebar.html new file mode 100644 index 0000000..b9e2ed3 --- /dev/null +++ b/doc/_Sidebar.html @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + From a57a12ef3ce95a8a100cd63436f0976721d83601 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sun, 5 Apr 2015 22:38:57 +0200 Subject: [PATCH 100/658] doc: sync doc/github-markdown.css from wiki --- doc/github-markdown.css | 277 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) create mode 100644 doc/github-markdown.css diff --git a/doc/github-markdown.css b/doc/github-markdown.css new file mode 100644 index 0000000..2b853b3 --- /dev/null +++ b/doc/github-markdown.css @@ -0,0 +1,277 @@ +body { + font-family: Helvetica, arial, sans-serif; + font-size: 14px; + line-height: 1.6; + padding-top: 10px; + padding-bottom: 10px; + background-color: white; + padding: 10px 20%; } + +body > *:first-child { + margin-top: 0 !important; } +body > *:last-child { + margin-bottom: 0 !important; } + +a { + color: #4183C4; } +a.absent { + color: #cc0000; } +a.anchor { + display: block; + padding-left: 30px; + margin-left: -30px; + cursor: pointer; + position: absolute; + top: 0; + left: 0; + bottom: 0; } + +h1, h2, h3, h4, h5, h6 { + margin: 20px 0 10px; + padding: 0; + font-weight: bold; + -webkit-font-smoothing: antialiased; + cursor: text; + position: relative; } + +h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor, h5:hover a.anchor, h6:hover a.anchor { + background: url("../../images/modules/styleguide/para.png") no-repeat 10px center; + text-decoration: none; } + +h1 tt, h1 code { + font-size: inherit; } + +h2 tt, h2 code { + font-size: inherit; } + +h3 tt, h3 code { + font-size: inherit; } + +h4 tt, h4 code { + font-size: inherit; } + +h5 tt, h5 code { + font-size: inherit; } + +h6 tt, h6 code { + font-size: inherit; } + +h1 { + font-size: 28px; + color: black; } + +h2 { + font-size: 24px; + border-bottom: 1px solid #cccccc; + color: black; } + +h3 { + font-size: 18px; } + +h4 { + font-size: 16px; } + +h5 { + font-size: 14px; } + +h6 { + color: #777777; + font-size: 14px; } + +p, blockquote, ol, dl, table, pre { + margin: 15px 0; } + +hr { + background: transparent url("../../images/modules/pulls/dirty-shade.png") repeat-x 0 0; + border: 0 none; + color: #cccccc; + height: 4px; + padding: 0; } + +body > h2:first-child { + margin-top: 0; + padding-top: 0; } +body > h1:first-child { + margin-top: 0; + padding-top: 0; } + body > h1:first-child + h2 { + margin-top: 0; + padding-top: 0; } +body > h3:first-child, body > h4:first-child, body > h5:first-child, body > h6:first-child { + margin-top: 0; + padding-top: 0; } + +a:first-child h1, a:first-child h2, a:first-child h3, a:first-child h4, a:first-child h5, a:first-child h6 { + margin-top: 0; + padding-top: 0; } + +h1 p, h2 p, h3 p, h4 p, h5 p, h6 p { + margin-top: 0; } + +li p.first { + display: inline-block; } + +ul, ol { + padding-left: 30px; } + +ul :first-child, ol :first-child { + margin-top: 0; } + +ul :last-child, ol :last-child { + margin-bottom: 0; } + +dl { + padding: 0; } + dl dt { + font-size: 14px; + font-weight: bold; + font-style: italic; + padding: 0; + margin: 15px 0 5px; } + dl dt:first-child { + padding: 0; } + dl dt > :first-child { + margin-top: 0; } + dl dt > :last-child { + margin-bottom: 0; } + dl dd { + margin: 0 0 15px; + padding: 0 15px; } + dl dd > :first-child { + margin-top: 0; } + dl dd > :last-child { + margin-bottom: 0; } + +blockquote { + border-left: 4px solid #dddddd; + padding: 0 15px; + color: #777777; } + blockquote > :first-child { + margin-top: 0; } + blockquote > :last-child { + margin-bottom: 0; } + +table { + padding: 0; } + table tr { + border-top: 1px solid #cccccc; + background-color: white; + margin: 0; + padding: 0; } + table tr:nth-child(2n) { + background-color: #f8f8f8; } + table tr th { + font-weight: bold; + border: 1px solid #cccccc; + text-align: left; + margin: 0; + padding: 6px 13px; } + table tr td { + border: 1px solid #cccccc; + text-align: left; + margin: 0; + padding: 6px 13px; } + table tr th :first-child, table tr td :first-child { + margin-top: 0; } + table tr th :last-child, table tr td :last-child { + margin-bottom: 0; } + +img { + max-width: 100%; } + +span.frame { + display: block; + overflow: hidden; } + span.frame > span { + border: 1px solid #dddddd; + display: block; + float: left; + overflow: hidden; + margin: 13px 0 0; + padding: 7px; + width: auto; } + span.frame span img { + display: block; + float: left; } + span.frame span span { + clear: both; + color: #333333; + display: block; + padding: 5px 0 0; } +span.align-center { + display: block; + overflow: hidden; + clear: both; } + span.align-center > span { + display: block; + overflow: hidden; + margin: 13px auto 0; + text-align: center; } + span.align-center span img { + margin: 0 auto; + text-align: center; } +span.align-right { + display: block; + overflow: hidden; + clear: both; } + span.align-right > span { + display: block; + overflow: hidden; + margin: 13px 0 0; + text-align: right; } + span.align-right span img { + margin: 0; + text-align: right; } +span.float-left { + display: block; + margin-right: 13px; + overflow: hidden; + float: left; } + span.float-left span { + margin: 13px 0 0; } +span.float-right { + display: block; + margin-left: 13px; + overflow: hidden; + float: right; } + span.float-right > span { + display: block; + overflow: hidden; + margin: 13px auto 0; + text-align: right; } + +code, tt { + margin: 0 2px; + padding: 0 5px; + white-space: nowrap; + border: 1px solid #eaeaea; + background-color: #f8f8f8; + border-radius: 3px; } + +pre code { + margin: 0; + padding: 0; + white-space: pre; + border: none; + background: transparent; } + +.highlight pre { + background-color: #f8f8f8; + border: 1px solid #cccccc; + font-size: 13px; + line-height: 19px; + overflow: auto; + padding: 6px 10px; + border-radius: 3px; } + +pre { + background-color: #f8f8f8; + border: 1px solid #cccccc; + font-size: 13px; + line-height: 19px; + overflow: auto; + padding: 6px 10px; + border-radius: 3px; } + pre code, pre tt { + background-color: transparent; + border: none; } From b84c913f7f18d431b07f40049c46acb4138cce8f Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sun, 5 Apr 2015 22:39:34 +0200 Subject: [PATCH 101/658] doc: point footer link to local html documentation --- tpl/page.footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpl/page.footer.html b/tpl/page.footer.html index b2a2fcb..42c621b 100644 --- a/tpl/page.footer.html +++ b/tpl/page.footer.html @@ -1,5 +1,5 @@ {if="$newversion"}
    ● Shaarli {$newversion|htmlspecialchars} is available.
    From 6811469e75e35bbf488fe5f7fc5501f483c4a37f Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sun, 5 Apr 2015 22:41:40 +0200 Subject: [PATCH 102/658] doc: remove old mdwiki index.html --- doc/index.html | 212 ------------------------------------------------- 1 file changed, 212 deletions(-) delete mode 100644 doc/index.html diff --git a/doc/index.html b/doc/index.html deleted file mode 100644 index 78e2814..0000000 --- a/doc/index.html +++ /dev/null @@ -1,212 +0,0 @@ - - - - - MDwiki - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - From da49603b86966ea9b915174c629b6329a2502473 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 8 Apr 2015 06:53:34 +0200 Subject: [PATCH 103/658] #193 add UTF8 by default to autoLocale --- index.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index 3192029..174f520 100644 --- a/index.php +++ b/index.php @@ -307,9 +307,10 @@ function autoLocale() { // (It's a bit crude, but it works very well. Preferred language is always presented first.) if (preg_match('/([a-z]{2})-?([a-z]{2})?/i',$_SERVER['HTTP_ACCEPT_LANGUAGE'],$matches)) { $loc = $matches[1] . (!empty($matches[2]) ? '_' . strtoupper($matches[2]) : ''); - $attempts = array($loc, str_replace('_', '-', $loc), - $loc . '_' . strtoupper($loc), $loc . '_' . $loc, - $loc . '-' . strtoupper($loc), $loc . '-' . $loc); + $attempts = array($loc.'.UTF-8', $loc, str_replace('_', '-', $loc).'.UTF-8', str_replace('_', '-', $loc), + $loc . '_' . strtoupper($loc).'.UTF-8', $loc . '_' . strtoupper($loc), + $loc . '_' . $loc.'.UTF-8', $loc . '_' . $loc, $loc . '-' . strtoupper($loc).'.UTF-8', + $loc . '-' . strtoupper($loc), $loc . '-' . $loc.'.UTF-8', $loc . '-' . $loc); } } setlocale(LC_TIME, $attempts); // LC_TIME = Set local for date/time format only. From 8fa1ebd6059050566bd685c23d88ff4f60a20c55 Mon Sep 17 00:00:00 2001 From: feula Date: Thu, 9 Apr 2015 18:13:11 +0200 Subject: [PATCH 104/658] Allow disabling all public links, fixes #188 --- index.php | 7 +++++++ tpl/configure.html | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/index.php b/index.php index 3192029..0f39cdc 100644 --- a/index.php +++ b/index.php @@ -34,6 +34,7 @@ $GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400 ; // Updates check frequency // Note: You must have publisher.php in the same directory as Shaarli index.php $GLOBALS['config']['ARCHIVE_ORG'] = false; // For each link, add a link to an archived version on archive.org $GLOBALS['config']['ENABLE_RSS_PERMALINKS'] = true; // Enable RSS permalinks by default. This corresponds to the default behavior of shaarli before this was added as an option. +$GLOBALS['config']['DISABLE_PUBLIC_LINKS'] = false; // ----------------------------------------------------------------------------------------------- // You should not touch below (or at your own risks!) // Optional config file. @@ -1458,6 +1459,7 @@ function renderPage() $GLOBALS['privateLinkByDefault']=!empty($_POST['privateLinkByDefault']); $GLOBALS['config']['ENABLE_RSS_PERMALINKS']= !empty($_POST['enableRssPermalinks']); $GLOBALS['config']['ENABLE_UPDATECHECK'] = !empty($_POST['updateCheck']); + $GLOBALS['config']['DISABLE_PUBLIC_LINKS'] = !empty($_POST['disablePublicLinks']); writeConfig(); echo ''; exit; @@ -1899,9 +1901,13 @@ function buildLinkList($PAGE,$LINKSDB) } $search_type='permalink'; } + // We chose to disable all private links and the user isn't logged in, do not return any link. + else if ($GLOBALS['config']['DISABLE_PUBLIC_LINKS'] && !isLoggedIn()) + $linksToDisplay = array(); else $linksToDisplay = $LINKSDB; // Otherwise, display without filtering. + // Option: Show only private links if (!empty($_SESSION['privateonly'])) { @@ -2328,6 +2334,7 @@ function writeConfig() $config .= '$GLOBALS[\'privateLinkByDefault\']='.var_export($GLOBALS['privateLinkByDefault'],true).'; '; $config .= '$GLOBALS[\'config\'][\'ENABLE_RSS_PERMALINKS\']='.var_export($GLOBALS['config']['ENABLE_RSS_PERMALINKS'], true).'; '; $config .= '$GLOBALS[\'config\'][\'ENABLE_UPDATECHECK\']='.var_export($GLOBALS['config']['ENABLE_UPDATECHECK'], true).'; '; + $config .= '$GLOBALS[\'config\'][\'DISABLE_PUBLIC_LINKS\']='.var_export($GLOBALS['config']['DISABLE_PUBLIC_LINKS'], true).'; '; $config .= ' ?>'; if (!file_put_contents($GLOBALS['config']['CONFIG_FILE'],$config) || strcmp(file_get_contents($GLOBALS['config']['CONFIG_FILE']),$config)!=0) { diff --git a/tpl/configure.html b/tpl/configure.html index 373d069..01f846c 100644 --- a/tpl/configure.html +++ b/tpl/configure.html @@ -27,6 +27,13 @@ +
    + + + From caee7ff9ccc302f85bd08714636e0be08fbd7cc4 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Fri, 10 Apr 2015 20:52:12 +0200 Subject: [PATCH 105/658] change wording and variable names for "Hide public links" feature --- index.php | 8 ++++---- tpl/configure.html | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/index.php b/index.php index 2014bce..07aeaa5 100644 --- a/index.php +++ b/index.php @@ -34,7 +34,7 @@ $GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400 ; // Updates check frequency // Note: You must have publisher.php in the same directory as Shaarli index.php $GLOBALS['config']['ARCHIVE_ORG'] = false; // For each link, add a link to an archived version on archive.org $GLOBALS['config']['ENABLE_RSS_PERMALINKS'] = true; // Enable RSS permalinks by default. This corresponds to the default behavior of shaarli before this was added as an option. -$GLOBALS['config']['DISABLE_PUBLIC_LINKS'] = false; +$GLOBALS['config']['HIDE_PUBLIC_LINKS'] = false; // ----------------------------------------------------------------------------------------------- // You should not touch below (or at your own risks!) // Optional config file. @@ -1460,7 +1460,7 @@ function renderPage() $GLOBALS['privateLinkByDefault']=!empty($_POST['privateLinkByDefault']); $GLOBALS['config']['ENABLE_RSS_PERMALINKS']= !empty($_POST['enableRssPermalinks']); $GLOBALS['config']['ENABLE_UPDATECHECK'] = !empty($_POST['updateCheck']); - $GLOBALS['config']['DISABLE_PUBLIC_LINKS'] = !empty($_POST['disablePublicLinks']); + $GLOBALS['config']['HIDE_PUBLIC_LINKS'] = !empty($_POST['hidePublicLinks']); writeConfig(); echo ''; exit; @@ -1902,7 +1902,7 @@ function buildLinkList($PAGE,$LINKSDB) $search_type='permalink'; } // We chose to disable all private links and the user isn't logged in, do not return any link. - else if ($GLOBALS['config']['DISABLE_PUBLIC_LINKS'] && !isLoggedIn()) + else if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) $linksToDisplay = array(); else $linksToDisplay = $LINKSDB; // Otherwise, display without filtering. @@ -2334,7 +2334,7 @@ function writeConfig() $config .= '$GLOBALS[\'privateLinkByDefault\']='.var_export($GLOBALS['privateLinkByDefault'],true).'; '; $config .= '$GLOBALS[\'config\'][\'ENABLE_RSS_PERMALINKS\']='.var_export($GLOBALS['config']['ENABLE_RSS_PERMALINKS'], true).'; '; $config .= '$GLOBALS[\'config\'][\'ENABLE_UPDATECHECK\']='.var_export($GLOBALS['config']['ENABLE_UPDATECHECK'], true).'; '; - $config .= '$GLOBALS[\'config\'][\'DISABLE_PUBLIC_LINKS\']='.var_export($GLOBALS['config']['DISABLE_PUBLIC_LINKS'], true).'; '; + $config .= '$GLOBALS[\'config\'][\'HIDE_PUBLIC_LINKS\']='.var_export($GLOBALS['config']['HIDE_PUBLIC_LINKS'], true).'; '; $config .= ' ?>'; if (!file_put_contents($GLOBALS['config']['CONFIG_FILE'],$config) || strcmp(file_get_contents($GLOBALS['config']['CONFIG_FILE']),$config)!=0) { diff --git a/tpl/configure.html b/tpl/configure.html index 01f846c..e4bd076 100644 --- a/tpl/configure.html +++ b/tpl/configure.html @@ -28,9 +28,9 @@ - + From 569ffb59d4f7c41e5deabd8b2a163a952acb1957 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Mon, 20 Apr 2015 14:36:25 +0200 Subject: [PATCH 106/658] doc: add demo to README fixes https://github.com/shaarli/Shaarli/issues/198 --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 218475a..aef3f44 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,12 @@ It is designed to be personal (single-user), fast and handy. * You will be automatically notified by a discreet popup if a new version is available * **Shaarli is a bookmarking application, but you can use it for micro-blogging (like Twitter), a pastebin, an online notepad, a snippet repository, etc. See [Usage examples](https://github.com/shaarli/Shaarli/wiki#usage-examples)** +## Demo +You can use this [public demo instance of Shaarli](http://shaarlidemo.tuxfamily.org/Shaarli). This demo runs the latest _development version_ of Shaarli and is updated/reset every day. + +Login: `demo` +Password: `demo` + ## Links From f5b059254f1bc0311a4a2912502353e77dbad1dc Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 8 May 2015 11:38:01 +0100 Subject: [PATCH 107/658] Display date as today if no articles published On "The Daily Shaarli" page (index.php?do=daily), the date is "Tuesday 30, November 1999" if no articles have been published/shared. This patch checks the parameter ($linkdate) before the mktime call to prevent and generate the "day 0" string. mktime(0,0,0,0,0,0) returns 943916400 (hum?) --- index.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index 07aeaa5..69a8a19 100644 --- a/index.php +++ b/index.php @@ -555,9 +555,12 @@ function endsWith($haystack,$needle,$case=true) PS: I could have used strptime(), but it does not exist on Windows. I'm too kind. */ function linkdate2timestamp($linkdate) { - $Y=$M=$D=$h=$m=$s=0; - sscanf($linkdate,'%4d%2d%2d_%2d%2d%2d',$Y,$M,$D,$h,$m,$s); - return mktime($h,$m,$s,$M,$D,$Y); + if(strcmp($linkdate, '_000000') !== 0 || !$linkdate){ + $Y=$M=$D=$h=$m=$s=0; + $r = sscanf($linkdate,'%4d%2d%2d_%2d%2d%2d',$Y,$M,$D,$h,$m,$s); + return mktime($h,$m,$s,$M,$D,$Y); + } + return time(); } /* Converts a linkdate time (YYYYMMDD_HHMMSS) of an article to a RFC822 date. From 59c90f58086f6f1deab8d7a47296392d809652d2 Mon Sep 17 00:00:00 2001 From: feula Date: Mon, 11 May 2015 19:55:59 +0200 Subject: [PATCH 108/658] Properly hide all links >searchtags --- index.php | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 07aeaa5..3cbea36 100644 --- a/index.php +++ b/index.php @@ -943,8 +943,12 @@ function showRSS() // Optionally 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 if (!empty($_GET['searchtags'])) $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); else $linksToDisplay = $LINKSDB; + + if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) + $linksToDisplay = array(); + $nblinksToDisplay = 50; // Number of links to display. if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links. { @@ -1018,8 +1022,12 @@ function showATOM() // Optionally 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 if (!empty($_GET['searchtags'])) $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); else $linksToDisplay = $LINKSDB; + + if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) + $linksToDisplay = array(); + $nblinksToDisplay = 50; // Number of links to display. if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links. { @@ -1179,6 +1187,8 @@ function showDaily() } $linksToDisplay=$LINKSDB->filterDay($day); + if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) + $linksToDisplay = array(); // We pre-format some fields for proper output. foreach($linksToDisplay as $key=>$link) { @@ -1257,6 +1267,10 @@ function renderPage() if (!empty($_GET['searchterm'])) $links = $LINKSDB->filterFulltext($_GET['searchterm']); elseif (!empty($_GET['searchtags'])) $links = $LINKSDB->filterTags(trim($_GET['searchtags'])); else $links = $LINKSDB; + + if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) + $links = array(); + $body=''; $linksToDisplay=array(); @@ -1271,6 +1285,7 @@ function renderPage() $linksToDisplay[]=$link; // Add to array. } } + $PAGE = new pageBuilder; $PAGE->assign('linkcount',count($LINKSDB)); $PAGE->assign('linksToDisplay',$linksToDisplay); @@ -1282,6 +1297,8 @@ function renderPage() if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=tagcloud')) { $tags= $LINKSDB->allTags(); + if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) + $tags = array(); // 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); @@ -1880,12 +1897,16 @@ function buildLinkList($PAGE,$LINKSDB) if (isset($_GET['searchterm'])) // Fulltext search { $linksToDisplay = $LINKSDB->filterFulltext(trim($_GET['searchterm'])); + if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) + $linksToDisplay = array(); $search_crits=htmlspecialchars(trim($_GET['searchterm'])); $search_type='fulltext'; } elseif (isset($_GET['searchtags'])) // Search by tag { $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); + if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) + $linksToDisplay = array(); $search_crits=explode(' ',trim($_GET['searchtags'])); $search_type='tags'; } From d33c5d4c3b9c70441391a08e8bcb2a8c639a4635 Mon Sep 17 00:00:00 2001 From: Marsup Date: Mon, 11 May 2015 16:42:54 +0000 Subject: [PATCH 109/658] Add Firefox Social API to the tools. Fixes #101. --- index.php | 15 ++++++++------- tpl/editlink.html | 4 ++++ tpl/tools.html | 27 +++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/index.php b/index.php index 07aeaa5..fad0340 100644 --- a/index.php +++ b/index.php @@ -309,8 +309,8 @@ function autoLocale() if (preg_match('/([a-z]{2})-?([a-z]{2})?/i',$_SERVER['HTTP_ACCEPT_LANGUAGE'],$matches)) { $loc = $matches[1] . (!empty($matches[2]) ? '_' . strtoupper($matches[2]) : ''); $attempts = array($loc.'.UTF-8', $loc, str_replace('_', '-', $loc).'.UTF-8', str_replace('_', '-', $loc), - $loc . '_' . strtoupper($loc).'.UTF-8', $loc . '_' . strtoupper($loc), - $loc . '_' . $loc.'.UTF-8', $loc . '_' . $loc, $loc . '-' . strtoupper($loc).'.UTF-8', + $loc . '_' . strtoupper($loc).'.UTF-8', $loc . '_' . strtoupper($loc), + $loc . '_' . $loc.'.UTF-8', $loc . '_' . $loc, $loc . '-' . strtoupper($loc).'.UTF-8', $loc . '-' . strtoupper($loc), $loc . '-' . $loc.'.UTF-8', $loc . '-' . $loc); } } @@ -1555,7 +1555,7 @@ function renderPage() pubsubhub(); // If we are called from the bookmarklet, we must close the popup: - if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo ''; exit; } + if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo ''; exit; } $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' ); $returnurl .= '#'.smallHash($linkdate); // Scroll to the link which has been edited. if (strstr($returnurl, "do=addlink")) { $returnurl = '?'; } //if we come from ?do=addlink, set returnurl to homepage instead @@ -1567,7 +1567,7 @@ function renderPage() if (isset($_POST['cancel_edit'])) { // If we are called from the bookmarklet, we must close the popup: - if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo ''; exit; } + if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo ''; exit; } $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' ); $returnurl .= '#'.smallHash($_POST['lf_linkdate']); // Scroll to the link which has been edited. header('Location: '.$returnurl); // After canceling, redirect to the page the user was on. @@ -1586,7 +1586,7 @@ function renderPage() $LINKSDB->savedb(); // save to disk // If we are called from the bookmarklet, we must close the popup: - if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo ''; exit; } + if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo ''; exit; } // Pick where we're going to redirect // ============================================================= // Basically, we can't redirect to where we were previously if it was a permalink @@ -1594,7 +1594,7 @@ function renderPage() // Cases: // - / : nothing in $_GET, redirect to self // - /?page : redirect to self - // - /?searchterm : redirect to self (there might be other links) + // - /?searchterm : redirect to self (there might be other links) // - /?searchtags : redirect to self // - /permalink : redirect to / (the link does not exist anymore) // - /?edit_link : redirect to / (the link does not exist anymore) @@ -1704,6 +1704,7 @@ function renderPage() $PAGE->assign('link_is_new',$link_is_new); $PAGE->assign('token',getToken()); // XSRF protection. $PAGE->assign('http_referer',(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '')); + $PAGE->assign('source',(isset($_GET['source']) ? $_GET['source'] : '')); $PAGE->assign('tags', $LINKSDB->allTags()); $PAGE->renderPage('editlink'); exit; @@ -1954,7 +1955,7 @@ function buildLinkList($PAGE,$LINKSDB) strlen($link["url"]) === 7) { $link["url"] = indexUrl() . $link["url"]; } - + $linkDisp[$keys[$i]] = $link; $i++; } diff --git a/tpl/editlink.html b/tpl/editlink.html index b737b99..0276f08 100644 --- a/tpl/editlink.html +++ b/tpl/editlink.html @@ -9,7 +9,9 @@ {elseif="$link.description==''"}onload="document.linkform.lf_description.focus();" {else}onload="document.linkform.lf_tags.focus();"{/if} > +{if="$source !== 'firefoxsocialapi'"} {include="page.footer"} +{/if} {if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn())"} {include="page.footer"} From cbecab773526b0c39f3cffa1d4595b5caa781bda Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 3 Jun 2015 15:54:30 +0200 Subject: [PATCH 110/658] split annoyingpatterns list on multpile lines, add new patterns for removal: * utm_content= * fb= * xtor= closes https://github.com/shaarli/Shaarli/issues/136 --- index.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index a547fbe..9561f63 100644 --- a/index.php +++ b/index.php @@ -1664,7 +1664,20 @@ function renderPage() // We remove the annoying parameters added by FeedBurner, GoogleFeedProxy, Facebook... - $annoyingpatterns = array('/[\?&]utm_source=[^&]*/', '/[\?&]utm_campaign=[^&]*/', '/[\?&]utm_medium=[^&]*/', '/#xtor=RSS-[^&]*/', '/[\?&]fb_[^&]*/', '/[\?&]__scoop[^&]*/', '/#tk\.rss_all\?/', '/[\?&]action_ref_map=[^&]*/', '/[\?&]action_type_map=[^&]*/', '/[\?&]action_object_map=[^&]*/'); + $annoyingpatterns = array('/[\?&]utm_source=[^&]*/', + '/[\?&]utm_campaign=[^&]*/', + '/[\?&]utm_medium=[^&]*/', + '/#xtor=RSS-[^&]*/', + '/[\?&]fb_[^&]*/', + '/[\?&]__scoop[^&]*/', + '/#tk\.rss_all\?/', + '/[\?&]action_ref_map=[^&]*/', + '/[\?&]action_type_map=[^&]*/', + '/[\?&]action_object_map=[^&]*/', + '/[\?&]utm_content=[^&]*/', + '/[\?&]fb=[^&]*/', + '/[\?&]xtor=[^&]*/' + ); foreach($annoyingpatterns as $pattern) { $url = preg_replace($pattern, "", $url); From 13d07f969914fa06d8648ef606962121d32c4be3 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Fri, 5 Jun 2015 00:46:05 +0200 Subject: [PATCH 111/658] Add Travis CI config Relates to #71 Signed-off-by: VirtualTam --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..bcaf682 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,10 @@ +language: php +php: + - 5.6 + - 5.5 + - 5.4 +install: + - composer self-update + - composer install +script: + - make test From 65d62517443b67fc4a180c43b50fe62f11b9e3b6 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 9 Jun 2015 14:23:28 +0200 Subject: [PATCH 112/658] Add awesomplete to tag search shaarli/Shaarli#49 --- inc/shaarli.css | 11 ++++++++++- index.php | 1 + tpl/linklist.html | 14 ++++++++++++-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/inc/shaarli.css b/inc/shaarli.css index c4348c7..f541352 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -221,8 +221,17 @@ h1 { margin-left:24px; } +.tagfilter div.awesomplete { + width: inherit; +} + .tagfilter #tagfilter_value { - width: 10%; + width: 100%; + display: inline; +} + +.tagfilter li { + color: black; } .tagfilter input.bigbutton, .searchform input.bigbutton, .addform input.bigbutton { diff --git a/index.php b/index.php index 9561f63..021d93f 100644 --- a/index.php +++ b/index.php @@ -2018,6 +2018,7 @@ function buildLinkList($PAGE,$LINKSDB) $PAGE->assign('redirector',empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector']); // Optional redirector URL. $PAGE->assign('token',$token); $PAGE->assign('links',$linkDisp); + $PAGE->assign('tags', $LINKSDB->allTags()); return; } diff --git a/tpl/linklist.html b/tpl/linklist.html index 766a80c..47e67e7 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html @@ -1,12 +1,21 @@ -{include="includes"} + + + {include="includes"} + @@ -129,5 +138,6 @@ function showQrCode(caller,loading) return false; } + From a037ac6963f111d0c9d5e4faa55f805edd93d91b Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 9 Jun 2015 14:58:54 +0200 Subject: [PATCH 113/658] Do not load links if they're hidden (also fix shaarli/Shaarli#202) --- index.php | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/index.php b/index.php index 9561f63..1d63efc 100644 --- a/index.php +++ b/index.php @@ -794,6 +794,12 @@ class linkdb implements Iterator, Countable, ArrayAccess // Read database from disk to memory private function readdb() { + // Public links are hidden and user not logged in => nothing to show + if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) { + $this->links = array(); + return; + } + // Read data $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 @@ -948,9 +954,6 @@ function showRSS() if (!empty($_GET['searchterm'])) $linksToDisplay = $LINKSDB->filterFulltext($_GET['searchterm']); else if (!empty($_GET['searchtags'])) $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); else $linksToDisplay = $LINKSDB; - - if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) - $linksToDisplay = array(); $nblinksToDisplay = 50; // Number of links to display. if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links. @@ -1027,9 +1030,6 @@ function showATOM() if (!empty($_GET['searchterm'])) $linksToDisplay = $LINKSDB->filterFulltext($_GET['searchterm']); else if (!empty($_GET['searchtags'])) $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); else $linksToDisplay = $LINKSDB; - - if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) - $linksToDisplay = array(); $nblinksToDisplay = 50; // Number of links to display. if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links. @@ -1190,8 +1190,7 @@ function showDaily() } $linksToDisplay=$LINKSDB->filterDay($day); - if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) - $linksToDisplay = array(); + // We pre-format some fields for proper output. foreach($linksToDisplay as $key=>$link) { @@ -1270,9 +1269,6 @@ function renderPage() if (!empty($_GET['searchterm'])) $links = $LINKSDB->filterFulltext($_GET['searchterm']); elseif (!empty($_GET['searchtags'])) $links = $LINKSDB->filterTags(trim($_GET['searchtags'])); else $links = $LINKSDB; - - if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) - $links = array(); $body=''; $linksToDisplay=array(); @@ -1300,8 +1296,7 @@ function renderPage() if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=tagcloud')) { $tags= $LINKSDB->allTags(); - if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) - $tags = array(); + // 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); @@ -1914,16 +1909,12 @@ function buildLinkList($PAGE,$LINKSDB) if (isset($_GET['searchterm'])) // Fulltext search { $linksToDisplay = $LINKSDB->filterFulltext(trim($_GET['searchterm'])); - if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) - $linksToDisplay = array(); $search_crits=htmlspecialchars(trim($_GET['searchterm'])); $search_type='fulltext'; } elseif (isset($_GET['searchtags'])) // Search by tag { $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags'])); - if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) - $linksToDisplay = array(); $search_crits=explode(' ',trim($_GET['searchtags'])); $search_type='tags'; } @@ -1939,9 +1930,6 @@ function buildLinkList($PAGE,$LINKSDB) } $search_type='permalink'; } - // We chose to disable all private links and the user isn't logged in, do not return any link. - else if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) - $linksToDisplay = array(); else $linksToDisplay = $LINKSDB; // Otherwise, display without filtering. From 3821b1ee88b2c99e59acda9b10437c76c76b19bf Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 10 Jun 2015 00:26:00 +0200 Subject: [PATCH 114/658] Create CONTIBUTING.md Contributing guidelines, fixes https://github.com/shaarli/Shaarli/issues/154 --- CONTRIBUTING.md | 80 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..b819e0b --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,80 @@ +## Contributing to Shaarli (community repository) + +### Bugs and feature requests +**Reporting bugs, feature requests: issues management** + +You can look through existing bugs/requests and help reporting them [here](https://github.com/shaarli/Shaarli/issues). + +Constructive input/experience reports/helping other users is welcome. + +The general guideline of the fork is to keep Shaarli simple (project and code maintenance, and features-wise), while providing customization capabilities (plugin system, making more settings configurable). + +Check the [milestones](https://github.com/shaarli/Shaarli/milestones) to see what issues have priority. + + * The issues list should preferably contain **only tasks that can be actioned immediately**. Anyone should be able to open the issues list, pick one and start working on it immediately. + * If you have a clear idea of a **feature you expect, or have a specific bug/defect to report**, [search the issues list, both open and closed](https://github.com/shaarli/Shaarli/issues?q=is%3Aissue) to check if it has been discussed, and comment on the appropriate issue. If you can't find one, please open a [new issue](https://github.com/shaarli/Shaarli/issues/new) + * **General discussions** fit in #44 so that we don't follow a slope where users and contributors have to track 90 "maybe" items in the bug tracker. Separate issues about clear, separate steps can be opened after discussion. + * You can also join instant discussion at https://gitter.im/shaarli/Shaarli, or via IRC as described [here](https://github.com/shaarli/Shaarli/issues/44#issuecomment-77745105) + +### Documentation +**the [wiki](https://github.com/shaarli/Shaarli/wiki) is world-writable** - anyone can edit or add chapters and pages. + + * Large changes should preferably be discussed in [General discussion](https://github.com/shaarli/Shaarli/issues/44) beforehand (you can post a draft there and edit it). + * If you create a new page, please link it from the new page (eg from the [Other links](https://github.com/shaarli/Shaarli/wiki#other-links) section. + * The wiki is a general documentation about Shaarli: usage, development, hacks, usage tricks, related links, projects. Try to keep it organized. + * The wiki will be synced to Shaarli's `doc/` directory on each release. Keep that in mind when reviewing the quality of your edits. + +You can make the project known by publishing blog posts/articles/videos about it and adding them to the links section in the wiki. + +### Translations +Currently Shaarli has no translation/internationalization/localization system available and is single-language. You can help by proposing an i18n system (issue https://github.com/shaarli/Shaarli/issues/121) + +### Beta testing +You can help testing Shaarli releases by immediately upgrading your installation after a [new version has been releases](https://github.com/shaarli/Shaarli/releases). + +All current development happens in [Pull Requests](https://github.com/shaarli/Shaarli/pulls). You can test proposed patches by cloning the Shaarli repo, adding the Pull Request branch and `git checkout` to it. You can also merge multiple Pull Requests to a testing branch. + +```bash +git clone https://github.com/shaarli/Shaarli +git remote add pull-request-25 owner/cool-new-feature +git remote add pull-request-26 anotherowner/bugfix +git remote update +git checkout -b testing +git merge cool-new-feature +git merge bugfix +``` + +Please report any problem you might find. + + +### Contributing code + +#### Adding your own changes + + * Pick or open an issue + * Fork the Shaarli repository on github + * `git clone` your fork + * starting from branch ` master`, switch to a new branch (eg. `git checkout -b my-awesome-feature`) + * edit the required files (from the Github web interface or your text editor) + * add and commit your changes with a meaningful commit message (eg `Cool new feature, fixes issue #1001`) + * Open your fork in the Github web interface and click the "Compare and Pull Request" button, enter required info and submit your Pull Request. + +All changes you will do on the `my-awesome-feature` in the future will be added to your Pull Request. Don't work directly on the master branch, don't do unrelated work on your `my-awesome-feature` branch. + +#### Contributing to an existing Pull Request + +TODO + +#### Useful links +If you are not familiar with Git or Github, here are a few links to set you on track: + + * https://try.github.io/ - 10 minutes Github workflow interactive tutorial + * http://ndpsoftware.com/git-cheatsheet.html - A Git cheatsheet + * http://www.wei-wang.com/ExplainGitWithD3 - Helps you understand some basic Git concepts visually + * https://www.atlassian.com/git/tutorial - Git tutorials + * https://www.atlassian.com/git/workflows - Git workflows + * http://git-scm.com/book - The official Git book, multiple languages + * http://www.vogella.com/tutorials/Git/article.html - Git tutorials + * http://think-like-a-git.net/resources.html - Guide to Git + * http://gitready.com/ - medium to advanced Git docs/tips/blog/articles + * https://github.com/btford/participating-in-open-source - Participating in Open Source From ca74886f30da323f42aa4bd70461003f46ef299b Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Thu, 12 Mar 2015 00:43:02 +0100 Subject: [PATCH 115/658] LinkDB: move to a proper file, add test coverage Relates to #71 LinkDB - move to application/LinkDB.php - code cleanup - indentation - whitespaces - formatting - comment cleanup - add missing documentation - unify formatting Test coverage for LinkDB - constructor - public / private access - link-related methods Shaarli utilities (LinkDB dependencies) - move startsWith() and endsWith() functions to application/Utils.php - add test coverage Dev utilities - Composer: add PHPUnit to dev dependencies - Makefile: - update lint targets - add test targets - generate coverage reports Signed-off-by: VirtualTam --- .gitignore | 4 +- Makefile | 33 ++- application/.htaccess | 2 + application/LinkDB.php | 412 ++++++++++++++++++++++++++ application/Utils.php | 45 +++ composer.json | 1 + index.php | 259 +--------------- phpunit.xml | 15 + tests/.htaccess | 2 + tests/LinkDBTest.php | 509 ++++++++++++++++++++++++++++++++ tests/UtilsTest.php | 78 +++++ tests/utils/ReferenceLinkDB.php | 128 ++++++++ 12 files changed, 1231 insertions(+), 257 deletions(-) create mode 100644 application/.htaccess create mode 100644 application/LinkDB.php create mode 100644 application/Utils.php create mode 100644 phpunit.xml create mode 100644 tests/.htaccess create mode 100644 tests/LinkDBTest.php create mode 100644 tests/UtilsTest.php create mode 100644 tests/utils/ReferenceLinkDB.php diff --git a/.gitignore b/.gitignore index 33d8a48..6fd0ccd 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,7 @@ pagecache composer.lock /vendor/ -# Ignore test output +# Ignore test data & output +coverage +tests/datastore.php phpmd.html diff --git a/Makefile b/Makefile index e6f4285..80efcfa 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,15 @@ # - install/update test dependencies: # $ composer install # 1st setup # $ composer update +# - install Xdebug for PHPUnit code coverage reports: +# - see http://xdebug.org/docs/install +# - enable in php.ini BIN = vendor/bin -PHP_SOURCE = index.php -MESS_DETECTOR_RULES = cleancode,codesize,controversial,design,naming,unusedcode +PHP_SOURCE = index.php application tests +PHP_COMMA_SOURCE = index.php,application,tests -all: static_analysis_summary +all: static_analysis_summary test ## # Concise status of the project @@ -21,6 +24,7 @@ all: static_analysis_summary ## static_analysis_summary: code_sniffer_source copy_paste mess_detector_summary + @echo ## # PHP_CodeSniffer @@ -62,6 +66,7 @@ copy_paste: # Detects PHP syntax errors, sorted by category # Rules documentation: http://phpmd.org/rules/index.html ## +MESS_DETECTOR_RULES = cleancode,codesize,controversial,design,naming,unusedcode mess_title: @echo "-----------------" @@ -70,11 +75,11 @@ mess_title: ### - all warnings mess_detector: mess_title - @$(BIN)/phpmd $(PHP_SOURCE) text $(MESS_DETECTOR_RULES) | sed 's_.*\/__' + @$(BIN)/phpmd $(PHP_COMMA_SOURCE) text $(MESS_DETECTOR_RULES) | sed 's_.*\/__' ### - all warnings + HTML output contains links to PHPMD's documentation mess_detector_html: - @$(BIN)/phpmd $(PHP_SOURCE) html $(MESS_DETECTOR_RULES) \ + @$(BIN)/phpmd $(PHP_COMMA_SOURCE) html $(MESS_DETECTOR_RULES) \ --reportfile phpmd.html || exit 0 ### - warnings grouped by message, sorted by descending frequency order @@ -85,10 +90,24 @@ mess_detector_grouped: mess_title ### - summary: number of warnings by rule set mess_detector_summary: mess_title @for rule in $$(echo $(MESS_DETECTOR_RULES) | tr ',' ' '); do \ - warnings=$$($(BIN)/phpmd $(PHP_SOURCE) text $$rule | wc -l); \ + warnings=$$($(BIN)/phpmd $(PHP_COMMA_SOURCE) text $$rule | wc -l); \ printf "$$warnings\t$$rule\n"; \ done; +## +# PHPUnit +# Runs unitary and functional tests +# Generates an HTML coverage report if Xdebug is enabled +# +# See phpunit.xml for configuration +# https://phpunit.de/manual/current/en/appendixes.configuration.html +## +test: clean + @echo "-------" + @echo "PHPUNIT" + @echo "-------" + @$(BIN)/phpunit tests + ## # Targets for repository and documentation maintenance ## @@ -107,4 +126,4 @@ doc: clean htmldoc: for file in `find doc/ -maxdepth 1 -name "*.md"`; do \ pandoc -f markdown_github -t html5 -s -c "github-markdown.css" -o doc/`basename $$file .md`.html "$$file"; \ - done; \ No newline at end of file + done; diff --git a/application/.htaccess b/application/.htaccess new file mode 100644 index 0000000..b584d98 --- /dev/null +++ b/application/.htaccess @@ -0,0 +1,2 @@ +Allow from none +Deny from all diff --git a/application/LinkDB.php b/application/LinkDB.php new file mode 100644 index 0000000..388002f --- /dev/null +++ b/application/LinkDB.php @@ -0,0 +1,412 @@ +linkdate) + private $urls; + + // List of linkdate keys (for the Iterator interface implementation) + private $keys; + + // Position in the $this->keys array (for the Iterator interface) + private $position; + + // Is the user logged in? (used to filter private links) + private $loggedIn; + + /** + * Creates a new LinkDB + * + * Checks if the datastore exists; else, attempts to create a dummy one. + * + * @param $isLoggedIn is the user logged in? + */ + function __construct($isLoggedIn) + { + // FIXME: do not access $GLOBALS, pass the datastore instead + $this->loggedIn = $isLoggedIn; + $this->checkDB(); + $this->readdb(); + } + + /** + * Countable - Counts elements of an object + */ + public function count() + { + return count($this->links); + } + + /** + * ArrayAccess - Assigns a value to the specified offset + */ + public function offsetSet($offset, $value) + { + // TODO: use exceptions instead of "die" + if (!$this->loggedIn) { + die('You are not authorized to add a link.'); + } + if (empty($value['linkdate']) || empty($value['url'])) { + die('Internal Error: A link should always have a linkdate and URL.'); + } + if (empty($offset)) { + die('You must specify a key.'); + } + $this->links[$offset] = $value; + $this->urls[$value['url']]=$offset; + } + + /** + * ArrayAccess - Whether or not an offset exists + */ + public function offsetExists($offset) + { + return array_key_exists($offset, $this->links); + } + + /** + * ArrayAccess - Unsets an offset + */ + public function offsetUnset($offset) + { + if (!$this->loggedIn) { + // TODO: raise an exception + die('You are not authorized to delete a link.'); + } + $url = $this->links[$offset]['url']; + unset($this->urls[$url]); + unset($this->links[$offset]); + } + + /** + * ArrayAccess - Returns the value at specified offset + */ + public function offsetGet($offset) + { + return isset($this->links[$offset]) ? $this->links[$offset] : null; + } + + /** + * Iterator - Returns the current element + */ + function current() + { + return $this->links[$this->keys[$this->position]]; + } + + /** + * Iterator - Returns the key of the current element + */ + function key() + { + return $this->keys[$this->position]; + } + + /** + * Iterator - Moves forward to next element + */ + function next() + { + ++$this->position; + } + + /** + * Iterator - Rewinds the Iterator to the first element + * + * Entries are sorted by date (latest first) + */ + function rewind() + { + $this->keys = array_keys($this->links); + rsort($this->keys); + $this->position = 0; + } + + /** + * Iterator - Checks if current position is valid + */ + function valid() + { + return isset($this->keys[$this->position]); + } + + /** + * Checks if the DB directory and file exist + * + * If no DB file is found, creates a dummy DB. + */ + private function checkDB() + { + if (file_exists($GLOBALS['config']['DATASTORE'])) { + return; + } + + // 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://sebsauvage.net/paste/?8434b27936c09649#bR7XsXhoTiLcqCpQbmOpBi3rq2zzQUC5hBI7ZT1O3x8=', + '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; + + // Write database to disk + // TODO: raise an exception if the file is not write-able + file_put_contents( + // FIXME: do not use $GLOBALS + $GLOBALS['config']['DATASTORE'], + PHPPREFIX.base64_encode(gzdeflate(serialize($this->links))).PHPSUFFIX + ); + } + + /** + * Reads database from disk to memory + */ + private function readdb() + { + // Read data + // Note that gzinflate is faster than gzuncompress. + // See: http://www.php.net/manual/en/function.gzdeflate.php#96439 + // FIXME: do not use $GLOBALS + $this->links = array(); + + if (file_exists($GLOBALS['config']['DATASTORE'])) { + $this->links = unserialize(gzinflate(base64_decode( + substr(file_get_contents($GLOBALS['config']['DATASTORE']), + strlen(PHPPREFIX), -strlen(PHPSUFFIX))))); + } + + // If user is not logged in, filter private links. + if (!$this->loggedIn) { + $toremove = array(); + foreach ($this->links as $link) { + if ($link['private'] != 0) { + $toremove[] = $link['linkdate']; + } + } + foreach ($toremove as $linkdate) { + unset($this->links[$linkdate]); + } + } + + // Keep the list of the mapping URLs-->linkdate up-to-date. + $this->urls = array(); + foreach ($this->links as $link) { + $this->urls[$link['url']] = $link['linkdate']; + } + } + + /** + * Saves the database from memory to disk + */ + public function savedb() + { + if (!$this->loggedIn) { + // TODO: raise an Exception instead + die('You are not authorized to change the database.'); + } + file_put_contents( + $GLOBALS['config']['DATASTORE'], + PHPPREFIX.base64_encode(gzdeflate(serialize($this->links))).PHPSUFFIX + ); + invalidateCaches(); + } + + /** + * Returns the link for a given URL, or False if it does not exist. + */ + public function getLinkFromUrl($url) + { + if (isset($this->urls[$url])) { + return $this->links[$this->urls[$url]]; + } + return false; + } + + /** + * Returns the list of links corresponding to a full-text search + * + * Searches: + * - in the URLs, title and description; + * - are case-insensitive. + * + * Example: + * print_r($mydb->filterFulltext('hollandais')); + * + * mb_convert_case($val, MB_CASE_LOWER, 'UTF-8') + * - allows to perform searches on Unicode text + * - see https://github.com/shaarli/Shaarli/issues/75 for examples + */ + public function filterFulltext($searchterms) + { + // FIXME: explode(' ',$searchterms) and perform a AND search. + // FIXME: accept double-quotes to search for a string "as is"? + $filtered = array(); + $search = mb_convert_case($searchterms, MB_CASE_LOWER, 'UTF-8'); + $keys = ['title', 'description', 'url', 'tags']; + + foreach ($this->links as $link) { + $found = false; + + foreach ($keys as $key) { + if (strpos(mb_convert_case($link[$key], MB_CASE_LOWER, 'UTF-8'), + $search) !== false) { + $found = true; + } + } + + if ($found) { + $filtered[$link['linkdate']] = $link; + } + } + krsort($filtered); + return $filtered; + } + + /** + * Returns the list of links associated with a given list of tags + * + * You can specify one or more tags, separated by space or a comma, e.g. + * print_r($mydb->filterTags('linux programming')); + */ + public function filterTags($tags, $casesensitive=false) + { + // Same as above, we use UTF-8 conversion to handle various graphemes (i.e. cyrillic, or greek) + // FIXME: is $casesensitive ever true? + $t = str_replace( + ',', ' ', + ($casesensitive ? $tags : mb_convert_case($tags, MB_CASE_LOWER, 'UTF-8')) + ); + + $searchtags = explode(' ', $t); + $filtered = array(); + + foreach ($this->links as $l) { + $linktags = explode( + ' ', + ($casesensitive ? $l['tags']:mb_convert_case($l['tags'], MB_CASE_LOWER, 'UTF-8')) + ); + + if (count(array_intersect($linktags, $searchtags)) == count($searchtags)) { + $filtered[$l['linkdate']] = $l; + } + } + krsort($filtered); + return $filtered; + } + + + /** + * Returns the list of articles for a given day, chronologically sorted + * + * Day must be in the form 'YYYYMMDD' (e.g. '20120125'), e.g. + * print_r($mydb->filterDay('20120125')); + */ + public function filterDay($day) + { + // TODO: check input format + $filtered = array(); + foreach ($this->links as $l) { + if (startsWith($l['linkdate'], $day)) { + $filtered[$l['linkdate']] = $l; + } + } + ksort($filtered); + return $filtered; + } + + /** + * Returns the article corresponding to a smallHash + */ + 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 + */ + public function allTags() + { + $tags = array(); + foreach ($this->links as $link) { + foreach (explode(' ', $link['tags']) as $tag) { + if (!empty($tag)) { + $tags[$tag] = (empty($tags[$tag]) ? 1 : $tags[$tag] + 1); + } + } + } + // Sort tags by usage (most used tag first) + arsort($tags); + return $tags; + } + + /** + * Returns the list of days containing articles (oldest first) + * Output: An array containing days (in format YYYYMMDD). + */ + public function days() + { + $linkDays = array(); + foreach (array_keys($this->links) as $day) { + $linkDays[substr($day, 0, 8)] = 0; + } + $linkDays = array_keys($linkDays); + sort($linkDays); + return $linkDays; + } +} +?> diff --git a/application/Utils.php b/application/Utils.php new file mode 100644 index 0000000..737f150 --- /dev/null +++ b/application/Utils.php @@ -0,0 +1,45 @@ + yZH23w + */ +function smallHash($text) +{ + $t = rtrim(base64_encode(hash('crc32', $text, true)), '='); + return strtr($t, '+/', '-_'); +} + +/** + * Tells if a string start with a substring + */ +function startsWith($haystack, $needle, $case=true) +{ + if ($case) { + return (strcmp(substr($haystack, 0, strlen($needle)), $needle) === 0); + } + return (strcasecmp(substr($haystack, 0, strlen($needle)), $needle) === 0); +} + +/** + * Tells if a string ends with a substring + */ +function endsWith($haystack, $needle, $case=true) +{ + if ($case) { + return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)), $needle) === 0); + } + return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)), $needle) === 0); +} +?> diff --git a/composer.json b/composer.json index d1f613c..f6d92c9 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ "require": {}, "require-dev": { "phpmd/phpmd" : "@stable", + "phpunit/phpunit": "4.6.*", "sebastian/phpcpd": "*", "squizlabs/php_codesniffer": "2.*" } diff --git a/index.php b/index.php index 9561f63..ed18c7f 100644 --- a/index.php +++ b/index.php @@ -68,6 +68,10 @@ checkphpversion(); error_reporting(E_ALL^E_WARNING); // See all error except warnings. //error_reporting(-1); // See all errors (for debugging only) +// Shaarli library +require_once 'application/LinkDB.php'; +require_once 'application/Utils.php'; + include "inc/rain.tpl.class.php"; //include Rain TPL raintpl::$tpl_dir = $GLOBALS['config']['RAINTPL_TPL']; // template directory raintpl::$cache_dir = $GLOBALS['config']['RAINTPL_TMP']; // cache directory @@ -268,21 +272,6 @@ function nl2br_escaped($html) return str_replace('>','>',str_replace('<','<',nl2br($html))); } -/* Returns the small hash of a string, using RFC 4648 base64url format - e.g. smallHash('20111006_131924') --> 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)),'='); - return strtr($t, '+/', '-_'); -} - // In a string, converts URLs to clickable links. // Function inspired from http://www.php.net/manual/en/function.preg-replace.php#85722 function text2clickable($url) @@ -536,20 +525,6 @@ function getMaxFileSize() return $maxsize; } -// Tells if a string start with a substring or not. -function startsWith($haystack,$needle,$case=true) -{ - if($case){return (strcmp(substr($haystack, 0, strlen($needle)),$needle)===0);} - return (strcasecmp(substr($haystack, 0, strlen($needle)),$needle)===0); -} - -// Tells if a string ends with a substring or not. -function endsWith($haystack,$needle,$case=true) -{ - if($case){return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)),$needle)===0);} - return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)),$needle)===0); -} - /* Converts a linkdate time (YYYYMMDD_HHMMSS) of an article to a timestamp (Unix epoch) (used to build the ADD_DATE attribute in Netscape-bookmarks file) PS: I could have used strptime(), but it does not exist on Windows. I'm too kind. */ @@ -710,220 +685,6 @@ class pageBuilder } } -// ------------------------------------------------------------------------------------------ -/* Data storage for links. - This object behaves like an associative array. - Example: - $mylinks = new linkdb(); - echo $mylinks['20110826_161819']['title']; - foreach($mylinks as $link) - echo $link['title'].' at url '.$link['url'].' ; description:'.$link['description']; - - Available keys: - title : Title of the link - url : URL of the link. Can be absolute or relative. Relative URLs are permalinks (e.g.'?m-ukcw') - description : description of the entry - private : Is this link private? 0=no, other value=yes - linkdate : date of the creation of this entry, in the form YYYYMMDD_HHMMSS (e.g.'20110914_192317') - tags : tags attached to this entry (separated by spaces) - - We implement 3 interfaces: - - ArrayAccess so that this object behaves like an associative array. - - Iterator so that this object can be used in foreach() loops. - - Countable interface so that we can do a count() on this object. -*/ -class linkdb implements Iterator, Countable, ArrayAccess -{ - private $links; // List of links (associative array. Key=linkdate (e.g. "20110823_124546"), value= associative array (keys:title,description...) - private $urls; // List of all recorded URLs (key=url, value=linkdate) for fast reserve search (url-->linkdate) - private $keys; // List of linkdate keys (for the Iterator interface implementation) - private $position; // Position in the $this->keys array. (for the Iterator interface implementation.) - private $loggedin; // Is the user logged in? (used to filter private links) - - // Constructor: - function __construct($isLoggedIn) - // Input : $isLoggedIn : is the user logged in? - { - $this->loggedin = $isLoggedIn; - $this->checkdb(); // Make sure data file exists. - $this->readdb(); // Then read it. - } - - // ---- Countable interface implementation - public function count() { return count($this->links); } - - // ---- ArrayAccess interface implementation - public function offsetSet($offset, $value) - { - if (!$this->loggedin) die('You are not authorized to add a link.'); - if (empty($value['linkdate']) || empty($value['url'])) die('Internal Error: A link should always have a linkdate and URL.'); - if (empty($offset)) die('You must specify a key.'); - $this->links[$offset] = $value; - $this->urls[$value['url']]=$offset; - } - public function offsetExists($offset) { return array_key_exists($offset,$this->links); } - public function offsetUnset($offset) - { - if (!$this->loggedin) die('You are not authorized to delete a link.'); - $url = $this->links[$offset]['url']; unset($this->urls[$url]); - unset($this->links[$offset]); - } - public function offsetGet($offset) { return isset($this->links[$offset]) ? $this->links[$offset] : null; } - - // ---- Iterator interface implementation - function rewind() { $this->keys=array_keys($this->links); rsort($this->keys); $this->position=0; } // Start over for iteration, ordered by date (latest first). - function key() { return $this->keys[$this->position]; } // current key - function current() { return $this->links[$this->keys[$this->position]]; } // current value - function next() { ++$this->position; } // go to next item - function valid() { return isset($this->keys[$this->position]); } // Check if current position is valid. - - // ---- Misc methods - private function checkdb() // Check if db directory and file exists. - { - 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://sebsauvage.net/paste/?8434b27936c09649#bR7XsXhoTiLcqCpQbmOpBi3rq2zzQUC5hBI7ZT1O3x8=','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($GLOBALS['config']['DATASTORE'], PHPPREFIX.base64_encode(gzdeflate(serialize($this->links))).PHPSUFFIX); // Write database to disk - } - } - - // Read database from disk to memory - private function readdb() - { - // Read data - $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) - { - $toremove=array(); - foreach($this->links as $link) { if ($link['private']!=0) $toremove[]=$link['linkdate']; } - foreach($toremove as $linkdate) { unset($this->links[$linkdate]); } - } - - // Keep the list of the mapping URLs-->linkdate up-to-date. - $this->urls=array(); - foreach($this->links as $link) { $this->urls[$link['url']]=$link['linkdate']; } - } - - // Save database from memory to disk. - public function savedb() - { - if (!$this->loggedin) die('You are not authorized to change the database.'); - file_put_contents($GLOBALS['config']['DATASTORE'], PHPPREFIX.base64_encode(gzdeflate(serialize($this->links))).PHPSUFFIX); - invalidateCaches(); - } - - // Returns the link for a given URL (if it exists). False if it does not exist. - public function getLinkFromUrl($url) - { - if (isset($this->urls[$url])) return $this->links[$this->urls[$url]]; - return false; - } - - // Case insensitive search among links (in the URLs, title and description). Returns filtered list of links. - // e.g. print_r($mydb->filterFulltext('hollandais')); - public function filterFulltext($searchterms) - { - // FIXME: explode(' ',$searchterms) and perform a AND search. - // FIXME: accept double-quotes to search for a string "as is"? - // Using mb_convert_case($val, MB_CASE_LOWER, 'UTF-8') allows us to perform searches on - // Unicode text. See https://github.com/shaarli/Shaarli/issues/75 for examples. - $filtered=array(); - $s = mb_convert_case($searchterms, MB_CASE_LOWER, 'UTF-8'); - foreach($this->links as $l) - { - $found= (strpos(mb_convert_case($l['title'], MB_CASE_LOWER, 'UTF-8'),$s) !== false) - || (strpos(mb_convert_case($l['description'], MB_CASE_LOWER, 'UTF-8'),$s) !== false) - || (strpos(mb_convert_case($l['url'], MB_CASE_LOWER, 'UTF-8'),$s) !== false) - || (strpos(mb_convert_case($l['tags'], MB_CASE_LOWER, 'UTF-8'),$s) !== false); - if ($found) $filtered[$l['linkdate']] = $l; - } - krsort($filtered); - return $filtered; - } - - // Filter by tag. - // You can specify one or more tags (tags can be separated by space or comma). - // e.g. print_r($mydb->filterTags('linux programming')); - public function filterTags($tags,$casesensitive=false) - { - // Same as above, we use UTF-8 conversion to handle various graphemes (i.e. cyrillic, or greek) - // TODO: is $casesensitive ever true ? - $t = str_replace(',',' ',($casesensitive?$tags:mb_convert_case($tags, MB_CASE_LOWER, 'UTF-8'))); - $searchtags=explode(' ',$t); - $filtered=array(); - foreach($this->links as $l) - { - $linktags = explode(' ',($casesensitive?$l['tags']:mb_convert_case($l['tags'], MB_CASE_LOWER, 'UTF-8'))); - if (count(array_intersect($linktags,$searchtags)) == count($searchtags)) - $filtered[$l['linkdate']] = $l; - } - krsort($filtered); - return $filtered; - } - - // Filter by day. Day must be in the form 'YYYYMMDD' (e.g. '20120125') - // Sort order is: older articles first. - // e.g. print_r($mydb->filterDay('20120125')); - public function filterDay($day) - { - $filtered=array(); - foreach($this->links as $l) - { - if (startsWith($l['linkdate'],$day)) $filtered[$l['linkdate']] = $l; - } - ksort($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 - public function allTags() - { - $tags=array(); - foreach($this->links as $link) - foreach(explode(' ',$link['tags']) as $tag) - if (!empty($tag)) $tags[$tag]=(empty($tags[$tag]) ? 1 : $tags[$tag]+1); - arsort($tags); // Sort tags by usage (most used tag first) - return $tags; - } - - // Returns the list of days containing articles (oldest first) - // Output: An array containing days (in format YYYYMMDD). - public function days() - { - $linkdays=array(); - foreach(array_keys($this->links) as $day) - { - $linkdays[substr($day,0,8)]=0; - } - $linkdays=array_keys($linkdays); - sort($linkdays); - return $linkdays; - } -} - // ------------------------------------------------------------------------------------------ // Output the last N links in RSS 2.0 format. function showRSS() @@ -941,7 +702,7 @@ function showRSS() $cached = $cache->cachedVersion(); if (!empty($cached)) { echo $cached; exit; } // If cached was not found (or not usable), then read the database and build the response: - $LINKSDB=new linkdb(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); // Read links from database (and filter private links if user it not logged in). + $LINKSDB = new LinkDB(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); // Optionally filter the results: $linksToDisplay=array(); @@ -1019,7 +780,7 @@ function showATOM() $cached = $cache->cachedVersion(); if (!empty($cached)) { echo $cached; exit; } // If cached was not found (or not usable), then read the database and build the response: - $LINKSDB=new linkdb(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); // Read links from database (and filter private links if used it not logged in). + $LINKSDB = new LinkDB(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); // Optionally filter the results: @@ -1104,7 +865,7 @@ function showDailyRSS() $cache = new pageCache(pageUrl(),startsWith($query,'do=dailyrss') && !isLoggedIn()); $cached = $cache->cachedVersion(); if (!empty($cached)) { echo $cached; exit; } // If cached was not found (or not usable), then read the database and build the response: - $LINKSDB=new linkdb(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); // Read links from database (and filter private links if used it not logged in). + $LINKSDB = new LinkDB(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); /* Some Shaarlies may have very few links, so we need to look back in time (rsort()) until we have enough days ($nb_of_days). @@ -1172,7 +933,7 @@ function showDailyRSS() // "Daily" page. function showDaily() { - $LINKSDB=new linkdb(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); // Read links from database (and filter private links if used it not logged in). + $LINKSDB = new LinkDB(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); $day=Date('Ymd',strtotime('-1 day')); // Yesterday, in format YYYYMMDD. @@ -1240,7 +1001,7 @@ function showDaily() // Render HTML page (according to URL parameters and user rights) function renderPage() { - $LINKSDB=new linkdb(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); // Read links from database (and filter private links if used it not logged in). + $LINKSDB = new LinkDB(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); // -------- Display login form. if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=login')) @@ -1822,7 +1583,7 @@ HTML; function importFile() { if (!(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI'])) { die('Not allowed.'); } - $LINKSDB=new linkdb(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); // Read links from database (and filter private links if used it not logged in). + $LINKSDB = new LinkDB(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']); $filename=$_FILES['filetoupload']['name']; $filesize=$_FILES['filetoupload']['size']; $data=file_get_contents($_FILES['filetoupload']['tmp_name']); diff --git a/phpunit.xml b/phpunit.xml new file mode 100644 index 0000000..d6e01c3 --- /dev/null +++ b/phpunit.xml @@ -0,0 +1,15 @@ + + + + + application + + + + + + + diff --git a/tests/.htaccess b/tests/.htaccess new file mode 100644 index 0000000..b584d98 --- /dev/null +++ b/tests/.htaccess @@ -0,0 +1,2 @@ +Allow from none +Deny from all diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php new file mode 100644 index 0000000..bbe4e02 --- /dev/null +++ b/tests/LinkDBTest.php @@ -0,0 +1,509 @@ +'); + + +/** + * Unitary tests for LinkDB + */ +class LinkDBTest extends PHPUnit_Framework_TestCase +{ + // datastore to test write operations + protected static $testDatastore = 'tests/datastore.php'; + protected static $dummyDatastoreSHA1 = 'e3edea8ea7bb50be4bcb404df53fbb4546a7156e'; + protected static $refDB = null; + protected static $publicLinkDB = null; + protected static $privateLinkDB = null; + + /** + * Instantiates public and private LinkDBs with test data + * + * The reference datastore contains public and private links that + * will be used to test LinkDB's methods: + * - access filtering (public/private), + * - link searches: + * - by day, + * - by tag, + * - by text, + * - etc. + */ + public static function setUpBeforeClass() + { + self::$refDB = new ReferenceLinkDB(); + self::$refDB->write(self::$testDatastore, PHPPREFIX, PHPSUFFIX); + + $GLOBALS['config']['DATASTORE'] = self::$testDatastore; + self::$publicLinkDB = new LinkDB(false); + self::$privateLinkDB = new LinkDB(true); + } + + /** + * Resets test data for each test + */ + protected function setUp() + { + $GLOBALS['config']['DATASTORE'] = self::$testDatastore; + if (file_exists(self::$testDatastore)) { + unlink(self::$testDatastore); + } + } + + /** + * Allows to test LinkDB's private methods + * + * @see + * https://sebastian-bergmann.de/archives/881-Testing-Your-Privates.html + * http://stackoverflow.com/a/2798203 + */ + protected static function getMethod($name) + { + $class = new ReflectionClass('LinkDB'); + $method = $class->getMethod($name); + $method->setAccessible(true); + return $method; + } + + /** + * Instantiate LinkDB objects - logged in user + */ + public function testConstructLoggedIn() + { + new LinkDB(true); + $this->assertFileExists(self::$testDatastore); + } + + /** + * Instantiate LinkDB objects - logged out or public instance + */ + public function testConstructLoggedOut() + { + new LinkDB(false); + $this->assertFileExists(self::$testDatastore); + } + + /** + * Attempt to instantiate a LinkDB whereas the datastore is not writable + * + * @expectedException PHPUnit_Framework_Error_Warning + * @expectedExceptionMessageRegExp /failed to open stream: No such file or directory/ + */ + public function testConstructDatastoreNotWriteable() + { + $GLOBALS['config']['DATASTORE'] = 'null/store.db'; + new LinkDB(false); + } + + /** + * The DB doesn't exist, ensure it is created with dummy content + */ + public function testCheckDBNew() + { + $linkDB = new LinkDB(false); + unlink(self::$testDatastore); + $this->assertFileNotExists(self::$testDatastore); + + $checkDB = self::getMethod('checkDB'); + $checkDB->invokeArgs($linkDB, array()); + $this->assertFileExists(self::$testDatastore); + + // ensure the correct data has been written + $this->assertEquals( + self::$dummyDatastoreSHA1, + sha1_file(self::$testDatastore) + ); + } + + /** + * The DB exists, don't do anything + */ + public function testCheckDBLoad() + { + $linkDB = new LinkDB(false); + $this->assertEquals( + self::$dummyDatastoreSHA1, + sha1_file(self::$testDatastore) + ); + + $checkDB = self::getMethod('checkDB'); + $checkDB->invokeArgs($linkDB, array()); + + // ensure the datastore is left unmodified + $this->assertEquals( + self::$dummyDatastoreSHA1, + sha1_file(self::$testDatastore) + ); + } + + /** + * Load an empty DB + */ + public function testReadEmptyDB() + { + file_put_contents(self::$testDatastore, PHPPREFIX.'S7QysKquBQA='.PHPSUFFIX); + $emptyDB = new LinkDB(false); + $this->assertEquals(0, sizeof($emptyDB)); + $this->assertEquals(0, count($emptyDB)); + } + + /** + * Load public links from the DB + */ + public function testReadPublicDB() + { + $this->assertEquals( + self::$refDB->countPublicLinks(), + sizeof(self::$publicLinkDB) + ); + } + + /** + * Load public and private links from the DB + */ + public function testReadPrivateDB() + { + $this->assertEquals( + self::$refDB->countLinks(), + sizeof(self::$privateLinkDB) + ); + } + + /** + * Save the links to the DB + */ + public function testSaveDB() + { + $testDB = new LinkDB(true); + $dbSize = sizeof($testDB); + + $link = array( + 'title'=>'an additional link', + 'url'=>'http://dum.my', + 'description'=>'One more', + 'private'=>0, + 'linkdate'=>'20150518_190000', + 'tags'=>'unit test' + ); + $testDB[$link['linkdate']] = $link; + + // TODO: move PageCache to a proper class/file + function invalidateCaches() {} + + $testDB->savedb(); + + $testDB = new LinkDB(true); + $this->assertEquals($dbSize + 1, sizeof($testDB)); + } + + /** + * Count existing links + */ + public function testCount() + { + $this->assertEquals( + self::$refDB->countPublicLinks(), + self::$publicLinkDB->count() + ); + $this->assertEquals( + self::$refDB->countLinks(), + self::$privateLinkDB->count() + ); + } + + /** + * List the days for which links have been posted + */ + public function testDays() + { + $this->assertEquals( + ['20121206', '20130614', '20150310'], + self::$publicLinkDB->days() + ); + + $this->assertEquals( + ['20121206', '20130614', '20141125', '20150310'], + self::$privateLinkDB->days() + ); + } + + /** + * The URL corresponds to an existing entry in the DB + */ + public function testGetKnownLinkFromURL() + { + $link = self::$publicLinkDB->getLinkFromUrl('http://mediagoblin.org/'); + + $this->assertNotEquals(false, $link); + $this->assertEquals( + 'A free software media publishing platform', + $link['description'] + ); + } + + /** + * The URL is not in the DB + */ + public function testGetUnknownLinkFromURL() + { + $this->assertEquals( + false, + self::$publicLinkDB->getLinkFromUrl('http://dev.null') + ); + } + + /** + * Lists all tags + */ + public function testAllTags() + { + $this->assertEquals( + [ + 'web' => 3, + 'cartoon' => 2, + 'gnu' => 2, + 'dev' => 1, + 'samba' => 1, + 'media' => 1, + 'software' => 1, + 'stallman' => 1, + 'free' => 1 + ], + self::$publicLinkDB->allTags() + ); + + $this->assertEquals( + [ + 'web' => 4, + 'cartoon' => 3, + 'gnu' => 2, + 'dev' => 2, + 'samba' => 1, + 'media' => 1, + 'software' => 1, + 'stallman' => 1, + 'free' => 1, + 'html' => 1, + 'w3c' => 1, + 'css' => 1, + 'Mercurial' => 1 + ], + self::$privateLinkDB->allTags() + ); + } + + /** + * Filter links using a tag + */ + public function testFilterOneTag() + { + $this->assertEquals( + 3, + sizeof(self::$publicLinkDB->filterTags('web', false)) + ); + + $this->assertEquals( + 4, + sizeof(self::$privateLinkDB->filterTags('web', false)) + ); + } + + /** + * Filter links using a tag - case-sensitive + */ + public function testFilterCaseSensitiveTag() + { + $this->assertEquals( + 0, + sizeof(self::$privateLinkDB->filterTags('mercurial', true)) + ); + + $this->assertEquals( + 1, + sizeof(self::$privateLinkDB->filterTags('Mercurial', true)) + ); + } + + /** + * Filter links using a tag combination + */ + public function testFilterMultipleTags() + { + $this->assertEquals( + 1, + sizeof(self::$publicLinkDB->filterTags('dev cartoon', false)) + ); + + $this->assertEquals( + 2, + sizeof(self::$privateLinkDB->filterTags('dev cartoon', false)) + ); + } + + /** + * Filter links using a non-existent tag + */ + public function testFilterUnknownTag() + { + $this->assertEquals( + 0, + sizeof(self::$publicLinkDB->filterTags('null', false)) + ); + } + + /** + * Return links for a given day + */ + public function testFilterDay() + { + $this->assertEquals( + 2, + sizeof(self::$publicLinkDB->filterDay('20121206')) + ); + + $this->assertEquals( + 3, + sizeof(self::$privateLinkDB->filterDay('20121206')) + ); + } + + /** + * 404 - day not found + */ + public function testFilterUnknownDay() + { + $this->assertEquals( + 0, + sizeof(self::$publicLinkDB->filterDay('19700101')) + ); + + $this->assertEquals( + 0, + sizeof(self::$privateLinkDB->filterDay('19700101')) + ); + } + + /** + * Use an invalid date format + */ + public function testFilterInvalidDay() + { + $this->assertEquals( + 0, + sizeof(self::$privateLinkDB->filterDay('Rainy day, dream away')) + ); + + // TODO: check input format + $this->assertEquals( + 6, + sizeof(self::$privateLinkDB->filterDay('20')) + ); + } + + /** + * Retrieve a link entry with its hash + */ + public function testFilterSmallHash() + { + $links = self::$privateLinkDB->filterSmallHash('IuWvgA'); + + $this->assertEquals( + 1, + sizeof($links) + ); + + $this->assertEquals( + 'MediaGoblin', + $links['20130614_184135']['title'] + ); + + } + + /** + * No link for this hash + */ + public function testFilterUnknownSmallHash() + { + $this->assertEquals( + 0, + sizeof(self::$privateLinkDB->filterSmallHash('Iblaah')) + ); + } + + /** + * Full-text search - result from a link's URL + */ + public function testFilterFullTextURL() + { + $this->assertEquals( + 2, + sizeof(self::$publicLinkDB->filterFullText('ars.userfriendly.org')) + ); + } + + /** + * Full-text search - result from a link's title only + */ + public function testFilterFullTextTitle() + { + // use miscellaneous cases + $this->assertEquals( + 2, + sizeof(self::$publicLinkDB->filterFullText('userfriendly -')) + ); + $this->assertEquals( + 2, + sizeof(self::$publicLinkDB->filterFullText('UserFriendly -')) + ); + $this->assertEquals( + 2, + sizeof(self::$publicLinkDB->filterFullText('uSeRFrIendlY -')) + ); + + // use miscellaneous case and offset + $this->assertEquals( + 2, + sizeof(self::$publicLinkDB->filterFullText('RFrIendL')) + ); + } + + /** + * Full-text search - result from the link's description only + */ + public function testFilterFullTextDescription() + { + $this->assertEquals( + 1, + sizeof(self::$publicLinkDB->filterFullText('media publishing')) + ); + } + + /** + * Full-text search - result from the link's tags only + */ + public function testFilterFullTextTags() + { + $this->assertEquals( + 2, + sizeof(self::$publicLinkDB->filterFullText('gnu')) + ); + } + + /** + * Full-text search - result set from mixed sources + */ + public function testFilterFullTextMixed() + { + $this->assertEquals( + 2, + sizeof(self::$publicLinkDB->filterFullText('free software')) + ); + } +} +?> diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php new file mode 100644 index 0000000..bbba99f --- /dev/null +++ b/tests/UtilsTest.php @@ -0,0 +1,78 @@ +assertEquals('CyAAJw', smallHash('http://test.io')); + $this->assertEquals(6, strlen(smallHash('https://github.com'))); + } + + /** + * Look for a substring at the beginning of a string + */ + public function testStartsWithCaseInsensitive() + { + $this->assertTrue(startsWith('Lorem ipsum', 'lorem', false)); + $this->assertTrue(startsWith('Lorem ipsum', 'LoReM i', false)); + } + + /** + * Look for a substring at the beginning of a string (case-sensitive) + */ + public function testStartsWithCaseSensitive() + { + $this->assertTrue(startsWith('Lorem ipsum', 'Lorem', true)); + $this->assertFalse(startsWith('Lorem ipsum', 'lorem', true)); + $this->assertFalse(startsWith('Lorem ipsum', 'LoReM i', true)); + } + + /** + * Look for a substring at the beginning of a string (Unicode) + */ + public function testStartsWithSpecialChars() + { + $this->assertTrue(startsWith('å!ùµ', 'å!', false)); + $this->assertTrue(startsWith('µ$åù', 'µ$', true)); + } + + /** + * Look for a substring at the end of a string + */ + public function testEndsWithCaseInsensitive() + { + $this->assertTrue(endsWith('Lorem ipsum', 'ipsum', false)); + $this->assertTrue(endsWith('Lorem ipsum', 'm IpsUM', false)); + } + + /** + * Look for a substring at the end of a string (case-sensitive) + */ + public function testEndsWithCaseSensitive() + { + $this->assertTrue(endsWith('lorem Ipsum', 'Ipsum', true)); + $this->assertFalse(endsWith('lorem Ipsum', 'ipsum', true)); + $this->assertFalse(endsWith('lorem Ipsum', 'M IPsuM', true)); + } + + /** + * Look for a substring at the end of a string (Unicode) + */ + public function testEndsWithSpecialChars() + { + $this->assertTrue(endsWith('å!ùµ', 'ùµ', false)); + $this->assertTrue(endsWith('µ$åù', 'åù', true)); + } +} +?> diff --git a/tests/utils/ReferenceLinkDB.php b/tests/utils/ReferenceLinkDB.php new file mode 100644 index 0000000..2cb05ba --- /dev/null +++ b/tests/utils/ReferenceLinkDB.php @@ -0,0 +1,128 @@ +addLink( + 'Free as in Freedom 2.0', + 'https://static.fsf.org/nosvn/faif-2.0.pdf', + 'Richard Stallman and the Free Software Revolution', + 0, + '20150310_114633', + 'free gnu software stallman' + ); + + $this->addLink( + 'MediaGoblin', + 'http://mediagoblin.org/', + 'A free software media publishing platform', + 0, + '20130614_184135', + 'gnu media web' + ); + + $this->addLink( + 'w3c-markup-validator', + 'https://dvcs.w3.org/hg/markup-validator/summary', + 'Mercurial repository for the W3C Validator', + 1, + '20141125_084734', + 'css html w3c web Mercurial' + ); + + $this->addLink( + 'UserFriendly - Web Designer', + 'http://ars.userfriendly.org/cartoons/?id=20121206', + 'Naming conventions...', + 0, + '20121206_142300', + 'dev cartoon web' + ); + + $this->addLink( + 'UserFriendly - Samba', + 'http://ars.userfriendly.org/cartoons/?id=20010306', + 'Tropical printing', + 0, + '20121206_172539', + 'samba cartoon web' + ); + + $this->addLink( + 'Geek and Poke', + 'http://geek-and-poke.com/', + '', + 1, + '20121206_182539', + 'dev cartoon' + ); + } + + /** + * Adds a new link + */ + protected function addLink($title, $url, $description, $private, $date, $tags) + { + $link = array( + 'title' => $title, + 'url' => $url, + 'description' => $description, + 'private' => $private, + 'linkdate' => $date, + 'tags' => $tags, + ); + $this->links[$date] = $link; + + if ($private) { + $this->privateCount++; + return; + } + $this->publicCount++; + } + + /** + * Writes data to the datastore + */ + public function write($filename, $prefix, $suffix) + { + file_put_contents( + $filename, + $prefix.base64_encode(gzdeflate(serialize($this->links))).$suffix + ); + } + + /** + * Returns the number of links in the reference data + */ + public function countLinks() + { + return $this->publicCount + $this->privateCount; + } + + /** + * Returns the number of public links in the reference data + */ + public function countPublicLinks() + { + return $this->publicCount; + } + + /** + * Returns the number of private links in the reference data + */ + public function countPrivateLinks() + { + return $this->privateCount; + } +} +?> From 4de71445d3d174b5ef3462a1c4470a95cc00017e Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 19 Jun 2015 20:13:31 +0200 Subject: [PATCH 116/658] Daily page: date format in template It only concerns the date of the day in the main title. Fixes #182 Note that daily RSS feed is not generated through templates. Date are still hard formatted in that case. --- index.php | 2 +- tpl/daily.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 9561f63..7e94fd2 100644 --- a/index.php +++ b/index.php @@ -1228,7 +1228,7 @@ function showDaily() $PAGE->assign('linksToDisplay',$linksToDisplay); $PAGE->assign('linkcount',count($LINKSDB)); $PAGE->assign('cols', $columns); - $PAGE->assign('day',utf8_encode(strftime('%A %d, %B %Y',linkdate2timestamp($day.'_000000')))); + $PAGE->assign('day',linkdate2timestamp($day.'_000000')); $PAGE->assign('previousday',$previousday); $PAGE->assign('nextday',$nextday); $PAGE->renderPage('daily'); diff --git a/tpl/daily.html b/tpl/daily.html index 919795b..0f76249 100644 --- a/tpl/daily.html +++ b/tpl/daily.html @@ -13,7 +13,7 @@ rss_feedDaily RSS Feed
    floral_left The Daily Shaarli floral_right
    -
    ——————————— {$day} ———————————
    +
    ——————————— {function="strftime('%A %d, %B %Y', $day)"} ———————————
    {if="$linksToDisplay"} From f30aa976e1c56b33687c59d3de8b3481f58a374d Mon Sep 17 00:00:00 2001 From: nda Date: Fri, 19 Jun 2015 17:37:38 -0300 Subject: [PATCH 117/658] login enhance for mobile --- inc/shaarli.css | 14 ++++++++++++++ tpl/loginform.html | 10 ++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/inc/shaarli.css b/inc/shaarli.css index c4348c7..c979ff5 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -975,6 +975,20 @@ div.dailyNoEntry { margin: 3px; } + #headerform label { + width: 100%; + display: block; + height: auto; + line-height: 25px; + padding-bottom: 10px; + } + + #headerform label input[type=text], + #headerform label input[type=password]{ + float: right; + width: 70%; + } + .searchform, .tagfilter { display: block !important; margin: 0px 3px 7px 0px !important; diff --git a/tpl/loginform.html b/tpl/loginform.html index 954f6f1..91b948d 100644 --- a/tpl/loginform.html +++ b/tpl/loginform.html @@ -10,10 +10,12 @@ You have been banned from login after too many failed attempts. Try later. {else}
    - Login:     - Password : -
    - + + + + {if="$returnurl"}{/if} From 25c46408a3d5101801574703775cdfd2a0df8d4f Mon Sep 17 00:00:00 2001 From: nda Date: Fri, 19 Jun 2015 17:42:16 -0300 Subject: [PATCH 118/658] fix login desktop --- inc/shaarli.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/inc/shaarli.css b/inc/shaarli.css index c979ff5..da0c359 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -339,6 +339,16 @@ h1 { font-size: inherit; } +#headerform label { + margin-right: 10px; +} + +#headerform label[for=longlastingsession] { + display: block; + width: 100%; + margin-top: 5px; +} + #toolsdiv { color: #ffffff; padding: 5px 5px 5px 5px; From 578a84bda0679720f21271ef34de58106c0646fe Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 23 Jun 2015 14:57:54 +0200 Subject: [PATCH 119/658] re-add readDb() missing from previous merge --- application/LinkDB.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/application/LinkDB.php b/application/LinkDB.php index 388002f..137f42e 100644 --- a/application/LinkDB.php +++ b/application/LinkDB.php @@ -208,6 +208,13 @@ class LinkDB implements Iterator, Countable, ArrayAccess */ private function readdb() { + + // Public links are hidden and user not logged in => nothing to show + if ($GLOBALS['config']['HIDE_PUBLIC_LINKS'] && !isLoggedIn()) { + $this->links = array(); + return; + } + // Read data // Note that gzinflate is faster than gzuncompress. // See: http://www.php.net/manual/en/function.gzdeflate.php#96439 From 0923a2bc1b097bf1def882722db489d83d95c423 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Tue, 23 Jun 2015 15:32:45 +0200 Subject: [PATCH 120/658] add tabindex 1/2 to search and tags fields --- tpl/linklist.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tpl/linklist.html b/tpl/linklist.html index 47e67e7..a59a9e5 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html @@ -8,9 +8,10 @@ diff --git a/tpl/page.footer.html b/tpl/page.footer.html index 42c621b..8143669 100644 --- a/tpl/page.footer.html +++ b/tpl/page.footer.html @@ -2,7 +2,7 @@ Shaarli - The personal, minimalist, super-fast, no-database delicious clone by the Shaarli community - Help/documentation {if="$newversion"} -
    ● Shaarli {$newversion|htmlspecialchars} is available.
    +
    ● Shaarli {$newversion} is available.
    {/if} {if="isLoggedIn()"} diff --git a/tpl/page.header.html b/tpl/page.header.html index 0fd65e4..2d186aa 100644 --- a/tpl/page.header.html +++ b/tpl/page.header.html @@ -8,7 +8,7 @@     '; + list($timezone_form, $timezone_js) = generateTimeZoneForm(); + $timezone_html = ''; + if ($timezone_form != '') { + $timezone_html = ''; + } $PAGE = new pageBuilder; $PAGE->assign('timezone_html',$timezone_html); @@ -2097,67 +2097,6 @@ function install() exit; } -// Generates the timezone selection form and JavaScript. -// Input: (optional) current timezone (can be 'UTC/UTC'). It will be pre-selected. -// Output: array(html,js) -// Example: list($htmlform,$js) = templateTZform('Europe/Paris'); // Europe/Paris pre-selected. -// Returns array('','') if server does not support timezones list. (e.g. PHP 5.1 on free.fr) -function templateTZform($ptz=false) -{ - if (function_exists('timezone_identifiers_list')) // because of old PHP version (5.1) which can be found on free.fr - { - // Try to split the provided timezone. - if ($ptz==false) { $l=timezone_identifiers_list(); $ptz=$l[0]; } - $spos=strpos($ptz,'/'); $pcontinent=substr($ptz,0,$spos); $pcity=substr($ptz,$spos+1); - - // Display config form: - $timezone_form = ''; - $timezone_js = ''; - // The list is in the form "Europe/Paris", "America/Argentina/Buenos_Aires"... - // We split the list in continents/cities. - $continents = array(); - $cities = array(); - foreach(timezone_identifiers_list() as $tz) - { - if ($tz=='UTC') $tz='UTC/UTC'; - $spos = strpos($tz,'/'); - if ($spos!==false) - { - $continent=substr($tz,0,$spos); $city=substr($tz,$spos+1); - $continents[$continent]=1; - if (!isset($cities[$continent])) $cities[$continent]=''; - $cities[$continent].=''; - } - } - $continents_html = ''; - $continents = array_keys($continents); - foreach($continents as $continent) - $continents_html.=''; - $cities_html = $cities[$pcontinent]; - $timezone_form = "Continent: "; - $timezone_form .= "    City:
    "; - $timezone_js = "" ; - return array($timezone_form,$timezone_js); - } - return array('',''); -} - -// Tells if a timezone is valid or not. -// If not valid, returns false. -// If system does not support timezone list, returns false. -function isTZvalid($continent,$city) -{ - $tz = $continent.'/'.$city; - if (function_exists('timezone_identifiers_list')) // because of old PHP version (5.1) which can be found on free.fr - { - if (in_array($tz, timezone_identifiers_list())) // it's a valid timezone? - return true; - } - return false; -} if (!function_exists('json_encode')) { function json_encode($data) { switch ($type = gettype($data)) { diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php index 4279c57..a239d8b 100755 --- a/tests/ConfigTest.php +++ b/tests/ConfigTest.php @@ -18,7 +18,7 @@ class ConfigTest extends PHPUnit_Framework_TestCase */ public function setUp() { - self::$_configFields = [ + self::$_configFields = array( 'login' => 'login', 'hash' => 'hash', 'salt' => 'salt', @@ -28,13 +28,13 @@ class ConfigTest extends PHPUnit_Framework_TestCase 'redirector' => '', 'disablesessionprotection' => false, 'privateLinkByDefault' => false, - 'config' => [ + 'config' => array( 'CONFIG_FILE' => 'tests/config.php', 'DATADIR' => 'tests', 'config1' => 'config1data', 'config2' => 'config2data', - ] - ]; + ) + ); } /** @@ -174,4 +174,4 @@ class ConfigTest extends PHPUnit_Framework_TestCase include self::$_configFields['config']['CONFIG_FILE']; $this->assertEquals(self::$_configFields['login'], $GLOBALS['login']); } -} \ No newline at end of file +} diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php index d34ea4f..504c819 100644 --- a/tests/LinkDBTest.php +++ b/tests/LinkDBTest.php @@ -228,12 +228,12 @@ class LinkDBTest extends PHPUnit_Framework_TestCase public function testDays() { $this->assertEquals( - ['20121206', '20130614', '20150310'], + array('20121206', '20130614', '20150310'), self::$publicLinkDB->days() ); $this->assertEquals( - ['20121206', '20130614', '20141125', '20150310'], + array('20121206', '20130614', '20141125', '20150310'), self::$privateLinkDB->days() ); } @@ -269,7 +269,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase public function testAllTags() { $this->assertEquals( - [ + array( 'web' => 3, 'cartoon' => 2, 'gnu' => 2, @@ -279,12 +279,12 @@ class LinkDBTest extends PHPUnit_Framework_TestCase 'software' => 1, 'stallman' => 1, 'free' => 1 - ], + ), self::$publicLinkDB->allTags() ); $this->assertEquals( - [ + array( 'web' => 4, 'cartoon' => 3, 'gnu' => 2, @@ -298,7 +298,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase 'w3c' => 1, 'css' => 1, 'Mercurial' => 1 - ], + ), self::$privateLinkDB->allTags() ); } diff --git a/tests/TimeZoneTest.php b/tests/TimeZoneTest.php new file mode 100644 index 0000000..f3de391 --- /dev/null +++ b/tests/TimeZoneTest.php @@ -0,0 +1,83 @@ +assertStringStartsWith('Continent:assertContains('selected="selected"', $generated[0]); + $this->assertStringEndsWith('
    ', $generated[0]); + + // Javascript handler + $this->assertStringStartsWith('', $generated[1]); + } + + /** + * Generate a timezone selection form, with a preselected timezone + */ + public function testGenerateTimeZoneFormPreselected() + { + $generated = generateTimeZoneForm('Antarctica/Syowa'); + + // HTML form + $this->assertStringStartsWith('Continent:assertContains( + 'value="Antarctica" selected="selected"', + $generated[0] + ); + $this->assertContains( + 'value="Syowa" selected="selected"', + $generated[0] + ); + $this->assertStringEndsWith('
    ', $generated[0]); + + + // Javascript handler + $this->assertStringStartsWith('', $generated[1]); + } + + /** + * Check valid timezones + */ + public function testValidTimeZone() + { + $this->assertTrue(isTimeZoneValid('America', 'Argentina/Ushuaia')); + $this->assertTrue(isTimeZoneValid('Europe', 'Oslo')); + $this->assertTrue(isTimeZoneValid('UTC', 'UTC')); + } + + /** + * Check invalid timezones + */ + public function testInvalidTimeZone() + { + $this->assertFalse(isTimeZoneValid('CEST', 'CEST')); + $this->assertFalse(isTimeZoneValid('Europe', 'Atlantis')); + $this->assertFalse(isTimeZoneValid('Middle_Earth', 'Moria')); + } +} +?> diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php index 8355c7f..28e15f5 100644 --- a/tests/UtilsTest.php +++ b/tests/UtilsTest.php @@ -109,7 +109,7 @@ class UtilsTest extends PHPUnit_Framework_TestCase */ public function testGenerateLocationLoop() { $ref = 'http://localhost/?test'; - $this->assertEquals('?', generateLocation($ref, 'localhost', ['test'])); + $this->assertEquals('?', generateLocation($ref, 'localhost', array('test'))); } /** @@ -119,4 +119,36 @@ class UtilsTest extends PHPUnit_Framework_TestCase $ref = 'http://somewebsite.com/?test'; $this->assertEquals('?', generateLocation($ref, 'localhost')); } + + /** + * Check supported PHP versions + */ + public function testCheckSupportedPHPVersion() + { + $minVersion = '5.3'; + checkPHPVersion($minVersion, '5.4.32'); + checkPHPVersion($minVersion, '5.5'); + checkPHPVersion($minVersion, '5.6.10'); + } + + /** + * Check a unsupported PHP version + * @expectedException Exception + * @expectedExceptionMessageRegExp /Your PHP version is obsolete/ + */ + public function testCheckSupportedPHPVersion51() + { + checkPHPVersion('5.3', '5.1.0'); + } + + /** + * Check another unsupported PHP version + * @expectedException Exception + * @expectedExceptionMessageRegExp /Your PHP version is obsolete/ + */ + public function testCheckSupportedPHPVersion52() + { + checkPHPVersion('5.3', '5.2'); + } } +?> From 39d06fa545d356aac8a3a8b47d8cddf5ebab617c Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sat, 18 Jul 2015 13:23:00 +0200 Subject: [PATCH 153/658] Travis: use the container-based infrastructure See http://docs.travis-ci.com/user/migrating-from-legacy/ Signed-off-by: VirtualTam --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d1c7017..d10311c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: false language: php php: - 5.6 From d0ce99e59ecc8d62eefbf1322736880159a7e9e7 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sat, 18 Jul 2015 11:56:41 +0200 Subject: [PATCH 154/658] Makefile: do not call `clean` before `test` Fixes #288 Modifications: - call `make clean` explicitely to clean the workspace - add `make clean` to Travis instructions Signed-off-by: VirtualTam --- .travis.yml | 1 + Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d10311c..80db650 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,4 +9,5 @@ install: - composer self-update - composer install script: + - make clean - make test diff --git a/Makefile b/Makefile index 80efcfa..2835358 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ mess_detector_summary: mess_title # See phpunit.xml for configuration # https://phpunit.de/manual/current/en/appendixes.configuration.html ## -test: clean +test: @echo "-------" @echo "PHPUNIT" @echo "-------" @@ -114,13 +114,13 @@ test: clean ### remove all unversioned files clean: - @git clean -df + @git clean -df ### update the local copy of the documentation doc: clean - @rm -rf doc - @git clone https://github.com/shaarli/Shaarli.wiki.git doc - @rm -rf doc/.git + @rm -rf doc + @git clone https://github.com/shaarli/Shaarli.wiki.git doc + @rm -rf doc/.git ### Convert local markdown documentation to HTML htmldoc: From bb2948c52a93129af7fd71fde87edb3c1191dbc4 Mon Sep 17 00:00:00 2001 From: Knah Tsaeb Date: Wed, 22 Jul 2015 10:39:23 +0200 Subject: [PATCH 155/658] [fix] #293 Black thumbnails on picture wall after upgrade #293 --- tpl/picwall.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tpl/picwall.html b/tpl/picwall.html index 9a2a471..f59685c 100644 --- a/tpl/picwall.html +++ b/tpl/picwall.html @@ -17,7 +17,9 @@ {include="page.footer"} - \ No newline at end of file + From 462bfb13128becd16be8f10d86728528ad69dd62 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 24 Jul 2015 11:13:04 +0200 Subject: [PATCH 156/658] Add Requirements section in README (link to wiki). Fixes #297 --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) mode change 100644 => 100755 README.md diff --git a/README.md b/README.md old mode 100644 new mode 100755 index b3dbaf5..5743ec4 --- a/README.md +++ b/README.md @@ -55,9 +55,11 @@ Password: `demo` * [Bugs/Feature requests/Discussion](https://github.com/shaarli/Shaarli/issues/) -## Installing +## Requirements -Shaarli requires PHP 5.3. `php-gd` is optional and provides thumbnail resizing. +Check the [Server requirements](https://github.com/shaarli/Shaarli/wiki/Server-requirements) wiki page. + +## Installing * Download the latest stable release from https://github.com/shaarli/Shaarli/releases * Unpack the archive in a directory on your web server From 7d4263e11aebb698fd9dcdf56eab0238d72801d5 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Thu, 30 Jul 2015 11:20:51 +0200 Subject: [PATCH 157/658] Bump version to 0.5.0 Major changes - fix locale handling - fix note URLs - fix page redirections - fix daily RSS browsing - fix title display - fix links not being hidden when `HIDE_PUBLIC_LINKS` is set - restore compatibility with PHP 5.3 - remove duplicate tags in links - remove annoying URL patterns - add Firefox Social API - Search/Filter by tag fieds can now be accessed quickly with the `Tab` key - update documentation - start code refactoring - move all settings to `data/config.php` - refactor Config, LinkDB, TimeZone, Utils - add unit test coverage - add Travis integration Signed-off-by: VirtualTam --- index.php | 4 ++-- shaarli_version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index 6d3fbd3..1439ec2 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,5 @@ /shaarli/ define('WEB_PATH', substr($_SERVER["REQUEST_URI"], 0, 1+strrpos($_SERVER["REQUEST_URI"], '/', 0))); diff --git a/shaarli_version.php b/shaarli_version.php index d225487..a2045a7 100644 --- a/shaarli_version.php +++ b/shaarli_version.php @@ -1 +1 @@ - + From 992af0b9d77cb4fbac2c37ef8d5896042d67a2a3 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Wed, 22 Jul 2015 05:02:10 +0200 Subject: [PATCH 158/658] Doc: sync from Wiki, generate HTML Closes #291 Fixes #227 Modifications - HTML content: match the new Wiki structure - Makefile - generate a custom HTML sidebar - include the sidebar on all pages - infer and prepend page titles - handle relative links - add title metadata, e.g. Shaarli - Signed-off-by: VirtualTam --- Makefile | 36 +- doc/3rd-party-libraries.html | 77 +++ doc/3rd-party-libraries.md | 13 + doc/Backup,-restore,-import-and-export.html | 102 +++ doc/Backup,-restore,-import-and-export.md | 35 ++ doc/Coding-guidelines.html | 65 ++ doc/Coding-guidelines.md | 5 + doc/Community-&-Related-software.html | 101 +++ doc/Community-&-Related-software.md | 40 ++ ...SH-SCP,-serve-it-locally-with-php-cli.html | 75 --- ...llation-over-SSH-and-serve-it-locally.html | 137 ++++ ...allation-over-SSH-and-serve-it-locally.md} | 13 +- doc/Datastore-hacks.html | 94 +++ doc/Datastore-hacks.md | 19 + doc/Development.html | 102 +++ doc/Development.md | 35 ++ doc/Directory-structure.html | 107 ++++ doc/Directory-structure.md | 33 + ...s-for-shaarlis-listed-in-an-opml-file.html | 167 ----- ...Download-CSS-styles-from-an-OPML-list.html | 229 +++++++ ... Download-CSS-styles-from-an-OPML-list.md} | 13 +- ...e-patch---add-new-via-field-for-links.html | 141 +++-- ...ple-patch---add-new-via-field-for-links.md | 97 +-- doc/FAQ.html | 97 +++ doc/FAQ.md | 44 ++ doc/Firefox-share.html | 72 +++ doc/Firefox-share.md | 16 + doc/GnuPG-signature.html | 199 ++++++ doc/GnuPG-signature.md | 141 +++++ doc/Home.html | 449 ++----------- doc/Home.md | 453 +------------- doc/Plugin-System.html | 499 +++++++++++++++ doc/Plugin-System.md | 590 ++++++++++++++++++ doc/RSS-feeds.html | 75 +++ doc/RSS-feeds.md | 15 + doc/Security.html | 107 ++++ doc/Security.md | 28 + doc/Server-configuration.html | 371 +++++++++++ doc/Server-configuration.md | 321 ++++++++++ doc/Server-requirements.html | 132 ++++ doc/Server-requirements.md | 30 + doc/Shaarli-configuration.html | 221 +++++++ doc/Shaarli-configuration.md | 137 ++++ doc/Sharing-button.html | 76 +++ doc/Sharing-button.md | 19 + doc/Static-analysis.html | 72 +++ doc/Static-analysis.md | 12 + doc/TODO.html | 64 ++ doc/TODO.md | 4 + doc/Theming.html | 138 ++++ doc/Theming.md | 63 ++ doc/Troubleshooting.html | 122 ++++ doc/Troubleshooting.md | 60 ++ ...unning-unit-tests.html => Unit-tests.html} | 69 +- doc/{Running-unit-tests.md => Unit-tests.md} | 7 +- doc/Usage.html | 85 +++ doc/Usage.md | 25 + doc/_Sidebar.html | 99 +++ doc/_Sidebar.md | 29 + doc/github-markdown.css | 10 + doc/sidebar.html | 42 ++ 61 files changed, 5516 insertions(+), 1213 deletions(-) create mode 100644 doc/3rd-party-libraries.html create mode 100644 doc/3rd-party-libraries.md create mode 100644 doc/Backup,-restore,-import-and-export.html create mode 100644 doc/Backup,-restore,-import-and-export.md create mode 100644 doc/Coding-guidelines.html create mode 100644 doc/Coding-guidelines.md create mode 100644 doc/Community-&-Related-software.html create mode 100644 doc/Community-&-Related-software.md delete mode 100644 doc/Copy-a-Shaarli-installation-over-SSH-SCP,-serve-it-locally-with-php-cli.html create mode 100644 doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html rename doc/{Copy-a-Shaarli-installation-over-SSH-SCP,-serve-it-locally-with-php-cli.md => Copy-an-existing-installation-over-SSH-and-serve-it-locally.md} (87%) create mode 100644 doc/Datastore-hacks.html create mode 100644 doc/Datastore-hacks.md create mode 100644 doc/Development.html create mode 100644 doc/Development.md create mode 100644 doc/Directory-structure.html create mode 100644 doc/Directory-structure.md delete mode 100644 doc/Download-CSS-styles-for-shaarlis-listed-in-an-opml-file.html create mode 100644 doc/Download-CSS-styles-from-an-OPML-list.html rename doc/{Download-CSS-styles-for-shaarlis-listed-in-an-opml-file.md => Download-CSS-styles-from-an-OPML-list.md} (92%) create mode 100644 doc/FAQ.html create mode 100644 doc/FAQ.md create mode 100644 doc/Firefox-share.html create mode 100644 doc/Firefox-share.md create mode 100644 doc/GnuPG-signature.html create mode 100644 doc/GnuPG-signature.md create mode 100644 doc/Plugin-System.html create mode 100644 doc/Plugin-System.md create mode 100644 doc/RSS-feeds.html create mode 100644 doc/RSS-feeds.md create mode 100644 doc/Security.html create mode 100644 doc/Security.md create mode 100644 doc/Server-configuration.html create mode 100644 doc/Server-configuration.md create mode 100644 doc/Server-requirements.html create mode 100644 doc/Server-requirements.md create mode 100644 doc/Shaarli-configuration.html create mode 100644 doc/Shaarli-configuration.md create mode 100644 doc/Sharing-button.html create mode 100644 doc/Sharing-button.md create mode 100644 doc/Static-analysis.html create mode 100644 doc/Static-analysis.md create mode 100644 doc/TODO.html create mode 100644 doc/TODO.md create mode 100644 doc/Theming.html create mode 100644 doc/Theming.md create mode 100644 doc/Troubleshooting.html create mode 100644 doc/Troubleshooting.md rename doc/{Running-unit-tests.html => Unit-tests.html} (74%) rename doc/{Running-unit-tests.md => Unit-tests.md} (95%) create mode 100644 doc/Usage.html create mode 100644 doc/Usage.md create mode 100644 doc/_Sidebar.html create mode 100644 doc/_Sidebar.md create mode 100644 doc/sidebar.html diff --git a/Makefile b/Makefile index d69fac4..0557852 100644 --- a/Makefile +++ b/Makefile @@ -126,8 +126,38 @@ doc: clean @git clone https://github.com/shaarli/Shaarli.wiki.git doc @rm -rf doc/.git +### Generate a custom sidebar +# +# Sidebar content: +# - convert GitHub-flavoured relative links to standard Markdown +# - trim HTML, only keep the list (
      [...]
    ) part +htmlsidebar: + @echo '
    ' > doc/sidebar.html + @awk 'BEGIN { FS = "[\\[\\]]{2}" }'\ + 'm = /\[/ { t=$$2; gsub(/ /, "-", $$2); print $$1"["t"]("$$2".html)"$$3 }'\ + '!m { print $$0 }' doc/_Sidebar.md > doc/tmp.md + @pandoc -f markdown -t html5 -s doc/tmp.md | awk '/(ul>|li>)/' >> doc/sidebar.html + @echo '
    ' >> doc/sidebar.html + @rm doc/tmp.md + ### Convert local markdown documentation to HTML -htmldoc: - for file in `find doc/ -maxdepth 1 -name "*.md"`; do \ - pandoc -f markdown_github -t html5 -s -c "github-markdown.css" -o doc/`basename $$file .md`.html "$$file"; \ +# +# For all pages: +# - infer title from the file name +# - convert GitHub-flavoured relative links to standard Markdown +# - insert the sidebar menu +htmlpages: + @for file in `find doc/ -maxdepth 1 -name "*.md"`; do \ + base=`basename $$file .md`; \ + sed -i "1i #$${base//-/ }" $$file; \ + awk 'BEGIN { FS = "[\\[\\]]{2}" }'\ + 'm = /\[/ { t=$$2; gsub(/ /, "-", $$2); print $$1"["t"]("$$2".html)"$$3 }'\ + '!m { print $$0 }' $$file > doc/tmp.md; \ + mv doc/tmp.md $$file; \ + pandoc -f markdown_github -t html5 -s \ + -c "github-markdown.css" \ + -T Shaarli -M pagetitle:"$${base//-/ }" -B doc/sidebar.html \ + -o doc/$$base.html $$file; \ done; + +htmldoc: doc htmlsidebar htmlpages diff --git a/doc/3rd-party-libraries.html b/doc/3rd-party-libraries.html new file mode 100644 index 0000000..a9c3a88 --- /dev/null +++ b/doc/3rd-party-libraries.html @@ -0,0 +1,77 @@ + + + + + + + Shaarli - 3rd party libraries + + + + + + +

    3rd party libraries

    +

    CSS

    +
      +
    • Yahoo UI CSS Reset +
        +
      • resets default CSS properties for all HTML elements (overriding browsers' default values)
        • +
      • ensures custom CSS stylessheets will provide the same results on all browsers
        • +
      • +
    +

    Javascript

    + +

    PHP

    +
      +
    • RainTPL - HTML templating for PHP
      • +
    + + diff --git a/doc/3rd-party-libraries.md b/doc/3rd-party-libraries.md new file mode 100644 index 0000000..3101c90 --- /dev/null +++ b/doc/3rd-party-libraries.md @@ -0,0 +1,13 @@ +#3rd party libraries +## CSS +- Yahoo UI [CSS Reset](http://yuilibrary.com/yui/docs/cssreset/)[](.html) + - resets default CSS properties for all HTML elements (overriding browsers' default values) + - ensures custom CSS stylessheets will provide the same results on all browsers + +## Javascript +- [Awesomeplete](https://leaverou.github.io/awesomplete/) ([GitHub](https://github.com/LeaVerou/awesomplete)) - autocompletion in input forms[](.html) +- [bLazy](http://dinbror.dk/blazy/) ([GitHub](https://github.com/dinbror/blazy)) - lazy loading for thumbnails[](.html) +- [qr.js](http://neocotic.com/qr.js/) ([GitHub](https://github.com/neocotic/qr.js)) - QR code generation[](.html) + +## PHP +- [RainTPL](https://github.com/rainphp/raintpl) - HTML templating for PHP[](.html) diff --git a/doc/Backup,-restore,-import-and-export.html b/doc/Backup,-restore,-import-and-export.html new file mode 100644 index 0000000..183a5ed --- /dev/null +++ b/doc/Backup,-restore,-import-and-export.html @@ -0,0 +1,102 @@ + + + + + + + Shaarli - Backup, restore, import and export + + + + + + + +

    Backup, restore, import and export

    +

    Backup and restore the datastore file

    +

    Backup the file data/datastore.php (by FTP or SSH). Restore by putting the file back in place.

    +

    Example command:

    +
    rsync -avzP my.server.com:/var/www/shaarli/data/datastore.php datastore-$(date +%Y-%m-%d_%H%M).php
    + +

    To export links as an HTML file, under Tools > Export, choose:

    +
      +
    • Export all to export both public and private links
      • +
    • Export public to export public links only
      • +
    • Export private to export private links only
      • +
    +

    Restore by using the Import feature.

    + +

    Example command:

    +
    ./export-bookmarks.py --url=https://my.server.com/shaarli --username=myusername --password=mysupersecretpassword --download-dir=./ --type=all
    + +

    Diigo

    +

    If you export your bookmark from Diigo, make sure you use the Delicious export, not the Netscape export. (Their Netscape export is broken, and they don't seem to be interested in fixing it.)

    +

    Mister Wong

    +

    See this issue for import tweaks.

    +

    SemanticScuttle

    +

    To correctly import the tags from a SemanticScuttle HTML export, edit the HTML file before importing and replace all occurences of tags= (lowercase) to TAGS= (uppercase).

    + + diff --git a/doc/Backup,-restore,-import-and-export.md b/doc/Backup,-restore,-import-and-export.md new file mode 100644 index 0000000..cf6b9f4 --- /dev/null +++ b/doc/Backup,-restore,-import-and-export.md @@ -0,0 +1,35 @@ +#Backup, restore, import and export +## Backup and restore the datastore file + +Backup the file `data/datastore.php` (by FTP or SSH). Restore by putting the file back in place. + +Example command: +```bash +rsync -avzP my.server.com:/var/www/shaarli/data/datastore.php datastore-$(date +%Y-%m-%d_%H%M).php +``` + +## Export links as... +To export links as an HTML file, under _Tools > Export_, choose: +- _Export all_ to export both public and private links +- _Export public_ to export public links only +- _Export private_ to export private links only + +Restore by using the `Import` feature. +* This can be done using the [shaarchiver](https://github.com/nodiscc/shaarchiver) tool.[](.html) + +Example command: +```bash +./export-bookmarks.py --url=https://my.server.com/shaarli --username=myusername --password=mysupersecretpassword --download-dir=./ --type=all +``` + +## Import links from... +### Diigo + +If you export your bookmark from Diigo, make sure you use the Delicious export, not the Netscape export. (Their Netscape export is broken, and they don't seem to be interested in fixing it.) + +### Mister Wong +See [this issue](https://github.com/sebsauvage/Shaarli/issues/146) for import tweaks.[](.html) + +### SemanticScuttle + +To correctly import the tags from a [SemanticScuttle](http://semanticscuttle.sourceforge.net/) HTML export, edit the HTML file before importing and replace all occurences of `tags=` (lowercase) to `TAGS=` (uppercase).[](.html) diff --git a/doc/Coding-guidelines.html b/doc/Coding-guidelines.html new file mode 100644 index 0000000..0f071a5 --- /dev/null +++ b/doc/Coding-guidelines.html @@ -0,0 +1,65 @@ + + + + + + + Shaarli - Coding guidelines + + + + + + +

    Coding guidelines

    +

    WIP

    +

    This topic is currently being discussed here:

    + + + diff --git a/doc/Coding-guidelines.md b/doc/Coding-guidelines.md new file mode 100644 index 0000000..1fb28a5 --- /dev/null +++ b/doc/Coding-guidelines.md @@ -0,0 +1,5 @@ +#Coding guidelines +## WIP +This topic is currently being discussed here: +- [Fix coding style (static analysis)](https://github.com/shaarli/Shaarli/issues/95) (#95)[](.html) +- [Continuous Integration tools & features](https://github.com/shaarli/Shaarli/issues/130) (#130)[](.html) diff --git a/doc/Community-&-Related-software.html b/doc/Community-&-Related-software.html new file mode 100644 index 0000000..5468379 --- /dev/null +++ b/doc/Community-&-Related-software.html @@ -0,0 +1,101 @@ + + + + + + + Shaarli - Community & Related software + + + + + + +

    Community & Related software

    +

    Unofficial but related work on Shaarli. If you maintain one of these, please get in touch with us to help us find a way to adapt your work to our fork.

    +

    TODO: contact repos owners to see if they'd like to standardize their work with the community fork.

    +

    Community

    + +

    Themes

    +

    See Theming for the list of community-contributed themes, and an installation guide.

    +

    Server apps

    +
      +
    • shaarchiver - Archive your Shaarli bookmarks and their content
      • +
    • shaarli-river - An aggregator for shaarlis with many features
      • +
    • Shaarlo - An aggregator for shaarlis with many features (a very popular running instance among french shaarliers: shaarli.fr)
      • +
    • Shaarlimages - An image-oriented aggregator for Shaarlis
      • +
    • mknexen/shaarli-api - A REST API for Shaarli
      • +
    • Self dead link - Detect dead links on shaarli. This version use the database of shaarli. An another version, can be used for others shaarli (but use most ressources).
      • +
    +

    Android apps

    + +

    Integration with other platforms

    + +

    Alternatives to Shaarli

    + + + diff --git a/doc/Community-&-Related-software.md b/doc/Community-&-Related-software.md new file mode 100644 index 0000000..9cf4793 --- /dev/null +++ b/doc/Community-&-Related-software.md @@ -0,0 +1,40 @@ +#Community & Related software +*Unofficial but related work on Shaarli. If you maintain one of these, please get in touch with us to help us find a way to adapt your work to our fork.* + +*TODO: contact repos owners to see if they'd like to standardize their work with the community fork.* + +## Community +* [Liens en vrac de sebsauvage](http://sebsauvage.net/links/) - the original Shaarli[](.html) +* [A large list of Shaarlis](http://porneia.free.fr/pub/links/ou-est-shaarli.html)[](.html) +* [A list of working Shaarli aggregators](https://raw.githubusercontent.com/Oros42/find_shaarlis/master/annuaires.json)[](.html) +* [A list of some known Shaarlis](https://github.com/Oros42/shaarlis_list)[](.html) +* [Adieu Delicious, Diigo et StumbleUpon. Salut Shaarli ! - sebsauvage.net](http://sebsauvage.net/rhaa/index.php?2011/09/16/09/29/58-adieu-delicious-diigo-et-stumbleupon-salut-shaarli-) (fr) _16/09/2011 - the original post about Shaarli_[](.html) +* [Original ideas/fixme/TODO page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:ideas)[](.html) +* [Original discussion page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:discussion) (fr)[](.html) +* [Original revisions history](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)[](.html) +* [Shaarli.fr/my](https://www.shaarli.fr/my.php) - Unofficial, unsupported (old fork) hosted Shaarlis provider, courtesy of [DMeloni](https://github.com/DMeloni)[](.html) +* [Shaarli Community](http://shaarferme.etudiant-libre.fr.nf/index.php) - Unknown Shaarli hoster (unsupported, old fork)[](.html) + +### Themes +See [Theming](Theming.html) for the list of community-contributed themes, and an installation guide. + +### Server apps + * [shaarchiver](https://github.com/nodiscc/shaarchiver) - Archive your Shaarli bookmarks and their content[](.html) + * [shaarli-river](https://github.com/mknexen/shaarli-river) - An aggregator for shaarlis with many features [](.html) + * [Shaarlo](https://github.com/DMeloni/shaarlo) - An aggregator for shaarlis with many features (a very popular running instance among french shaarliers: [shaarli.fr](http://shaarli.fr/))[](.html) + * [Shaarlimages](https://github.com/BoboTiG/shaarlimages) - An image-oriented aggregator for Shaarlis[](.html) + * [mknexen/shaarli-api](https://github.com/mknexen/shaarli-api) - A REST API for Shaarli[](.html) + * [Self dead link](https://github.com/qwertygc/shaarli-dev-code/blob/master/self-dead-link.php) - Detect dead links on shaarli. This version use the database of shaarli. An [another version](https://github.com/qwertygc/shaarli-dev-code/blob/master/dead-link.php), can be used for others shaarli (but use most ressources).[](.html) + +### Android apps + * [Shaarli for Android](http://sebsauvage.net/links/?ZAyDzg) - Android application that adds Shaarli as a sharing provider[](.html) + * [Shaarlier for Android](https://github.com/dimtion/Shaarlier) - Android application to simply add links directly into your Shaarli[](.html) + +## Integration with other platforms + * [tt-rss-shaarli](https://github.com/jcsaaddupuy/tt-rss-shaarli) - [TinyTiny RSS](http://tt-rss.org/) plugin that adds support for sharing articles with Shaarli[](.html) + * [octopress-shaarli](https://github.com/ahmet2mir/octopress-shaarli) - Octopress plugin to retrieve Shaarli links on the sidebara[](.html) + +## Alternatives to Shaarli +* [Shaarli alternatives](http://alternativeto.net/software/shaarli/) (alternativeto.net)[](.html) +* [Bookie](https://github.com/bookieio/bookie) - Another self-hostable, free bookmark sharing software, written in Python[](.html) +* [Unmark](https://github.com/plainmade/unmark) - An open source todo app for bookmarks ([Homepage](https://unmark.it/))[](.html) diff --git a/doc/Copy-a-Shaarli-installation-over-SSH-SCP,-serve-it-locally-with-php-cli.html b/doc/Copy-a-Shaarli-installation-over-SSH-SCP,-serve-it-locally-with-php-cli.html deleted file mode 100644 index 25e4bc6..0000000 --- a/doc/Copy-a-Shaarli-installation-over-SSH-SCP,-serve-it-locally-with-php-cli.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - -

    Example bash script:

    -
    #!/bin/bash
-#Description: Copy a Shaarli installation over SSH/SCP, serve it locally with php-cli
-#Will create a local-shaarli/ directory when you run it, backup your Shaarli there, and serve it locally.
-#Will NOT download linked pages. It's just a directly usable backup/copy/mirror of your Shaarli
-#Requires: ssh, scp and a working SSH access to the server where your Shaarli is installed
-#Usage: ./local-shaarli.sh
-#Author: nodiscc (nodiscc@gmail.com)
-#License: MIT (http://opensource.org/licenses/MIT)
-set -o errexit
-set -o nounset
-
-##### CONFIG #################
-#The port used by php's local server
-php_local_port=7431
-
-#Name of the SSH server and path where Shaarli is installed
-#TODO: pass these as command-line arguments
-remotehost="my.ssh.server"
-remote_shaarli_dir="/var/www/shaarli"
-
-
-###### FUNCTIONS #############
-_main() {
-    _CBSyncShaarli
-    _CBServeShaarli
-}
-
-_CBSyncShaarli() {
-    remote_temp_dir=$(ssh $remotehost mktemp -d)
-    remote_ssh_user=$(ssh $remotehost whoami)
-    ssh -t "$remotehost" sudo cp -r "$remote_shaarli_dir" "$remote_temp_dir"
-    ssh -t "$remotehost" sudo chown -R "$remote_ssh_user":"$remote_ssh_user" "$remote_temp_dir"
-    scp -rq "$remotehost":"$remote_temp_dir" local-shaarli
-    ssh "$remotehost" rm -r "$remote_temp_dir"
-}
-
-_CBServeShaarli() {
-    #TODO: allow serving a previously downloaded Shaarli
-    #TODO: ask before overwriting local copy, if it exists
-    cd local-shaarli/
-    php -S localhost:${php_local_port}
-    echo "Please go to http://localhost:${php_local_port}"
-}
-
-
-##### MAIN #################
-
-_main
    -

    This outputs:

    -
    $ ./local-shaarli.sh
-PHP 5.6.0RC4 Development Server started at Mon Sep  1 21:56:19 2014
-Listening on http://localhost:7431
-Document root is /home/user/local-shaarli/shaarli
-Press Ctrl-C to quit.
-
-[Mon Sep  1 21:56:27 2014] ::1:57868 [200]: /
-[Mon Sep  1 21:56:27 2014] ::1:57869 [200]: /index.html
-[Mon Sep  1 21:56:37 2014] ::1:57881 [200]: /...
    - - diff --git a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html new file mode 100644 index 0000000..9e930e5 --- /dev/null +++ b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html @@ -0,0 +1,137 @@ + + + + + + + Shaarli - Copy an existing installation over SSH and serve it locally + + + + + + + +

    Copy an existing installation over SSH and serve it locally

    +

    Example bash script:

    +
    #!/bin/bash
+#Description: Copy a Shaarli installation over SSH/SCP, serve it locally with php-cli
+#Will create a local-shaarli/ directory when you run it, backup your Shaarli there, and serve it locally.
+#Will NOT download linked pages. It's just a directly usable backup/copy/mirror of your Shaarli
+#Requires: ssh, scp and a working SSH access to the server where your Shaarli is installed
+#Usage: ./local-shaarli.sh
+#Author: nodiscc (nodiscc@gmail.com)
+#License: MIT (http://opensource.org/licenses/MIT)
+set -o errexit
+set -o nounset
+
+##### CONFIG #################
+#The port used by php's local server
+php_local_port=7431
+
+#Name of the SSH server and path where Shaarli is installed
+#TODO: pass these as command-line arguments
+remotehost="my.ssh.server"
+remote_shaarli_dir="/var/www/shaarli"
+
+
+###### FUNCTIONS #############
+_main() {
+    _CBSyncShaarli
+    _CBServeShaarli
+}
+
+_CBSyncShaarli() {
+    remote_temp_dir=$(ssh $remotehost mktemp -d)
+    remote_ssh_user=$(ssh $remotehost whoami)
+    ssh -t "$remotehost" sudo cp -r "$remote_shaarli_dir" "$remote_temp_dir"
+    ssh -t "$remotehost" sudo chown -R "$remote_ssh_user":"$remote_ssh_user" "$remote_temp_dir"
+    scp -rq "$remotehost":"$remote_temp_dir" local-shaarli
+    ssh "$remotehost" rm -r "$remote_temp_dir"
+}
+
+_CBServeShaarli() {
+    #TODO: allow serving a previously downloaded Shaarli
+    #TODO: ask before overwriting local copy, if it exists
+    cd local-shaarli/
+    php -S localhost:${php_local_port}
+    echo "Please go to http://localhost:${php_local_port}"
+}
+
+
+##### MAIN #################
+
+_main
    +

    This outputs:

    +
    $ ./local-shaarli.sh
+PHP 5.6.0RC4 Development Server started at Mon Sep  1 21:56:19 2014
+Listening on http://localhost:7431
+Document root is /home/user/local-shaarli/shaarli
+Press Ctrl-C to quit.
+
+[Mon Sep  1 21:56:27 2014] ::1:57868 [200]: /[](.html)
+[Mon Sep  1 21:56:27 2014] ::1:57869 [200]: /index.html[](.html)
+[Mon Sep  1 21:56:37 2014] ::1:57881 [200]: /...[](.html)
    + + diff --git a/doc/Copy-a-Shaarli-installation-over-SSH-SCP,-serve-it-locally-with-php-cli.md b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.md similarity index 87% rename from doc/Copy-a-Shaarli-installation-over-SSH-SCP,-serve-it-locally-with-php-cli.md rename to doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.md index 5b0aec6..88d191d 100644 --- a/doc/Copy-a-Shaarli-installation-over-SSH-SCP,-serve-it-locally-with-php-cli.md +++ b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.md @@ -1,6 +1,7 @@ +#Copy an existing installation over SSH and serve it locally Example bash script: -``` +```bash #!/bin/bash #Description: Copy a Shaarli installation over SSH/SCP, serve it locally with php-cli #Will create a local-shaarli/ directory when you run it, backup your Shaarli there, and serve it locally. @@ -53,14 +54,14 @@ _main This outputs: -``` +```bash $ ./local-shaarli.sh PHP 5.6.0RC4 Development Server started at Mon Sep 1 21:56:19 2014 Listening on http://localhost:7431 Document root is /home/user/local-shaarli/shaarli Press Ctrl-C to quit. -[Mon Sep 1 21:56:27 2014] ::1:57868 [200]: / -[Mon Sep 1 21:56:27 2014] ::1:57869 [200]: /index.html -[Mon Sep 1 21:56:37 2014] ::1:57881 [200]: /... -``` \ No newline at end of file +[Mon Sep 1 21:56:27 2014] ::1:57868 [200]: /[](.html) +[Mon Sep 1 21:56:27 2014] ::1:57869 [200]: /index.html[](.html) +[Mon Sep 1 21:56:37 2014] ::1:57881 [200]: /...[](.html) +``` diff --git a/doc/Datastore-hacks.html b/doc/Datastore-hacks.html new file mode 100644 index 0000000..4677ae9 --- /dev/null +++ b/doc/Datastore-hacks.html @@ -0,0 +1,94 @@ + + + + + + + Shaarli - Datastore hacks + + + + + + + +

    Datastore hacks

    +

    Decode datastore content

    +

    To display the array representing the data saved in data/datastore.php, use the following snippet:

    +
    $data = "tZNdb9MwFIb... <Commented content inside datastore.php>";
+$out = unserialize(gzinflate(base64_decode($data)));
+echo "<pre>"; // Pretty printing is love, pretty printing is life
+print_r($out);
+echo "</pre>";
+exit;
    +

    This will output the internal representation of the datastore, "unobfuscated" (if this can really be considered obfuscation).

    + +
      +
    • Look for <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> in tpl/editlink.tpl (line 14)
      • +
    • Remove type="hidden" from this line
      • +
    • A new date/time field becomes available in the edit/new link dialog.
      • +
    • You can set the timestamp manually by entering it in the format YYYMMDD_HHMMS.
      • +
    + + diff --git a/doc/Datastore-hacks.md b/doc/Datastore-hacks.md new file mode 100644 index 0000000..33aa222 --- /dev/null +++ b/doc/Datastore-hacks.md @@ -0,0 +1,19 @@ +#Datastore hacks +### Decode datastore content +To display the array representing the data saved in `data/datastore.php`, use the following snippet: + +```php +$data = "tZNdb9MwFIb... "; +$out = unserialize(gzinflate(base64_decode($data))); +echo "
    "; // Pretty printing is love, pretty printing is life
+print_r($out);
+echo "
    "; +exit; +``` +This will output the internal representation of the datastore, "unobfuscated" (if this can really be considered obfuscation). + +### Changing the timestamp for a link +* Look for `` in `tpl/editlink.tpl` (line 14) +* Remove `type="hidden"` from this line +* A new date/time field becomes available in the edit/new link dialog. +* You can set the timestamp manually by entering it in the format `YYYMMDD_HHMMS`. diff --git a/doc/Development.html b/doc/Development.html new file mode 100644 index 0000000..1e33eff --- /dev/null +++ b/doc/Development.html @@ -0,0 +1,102 @@ + + + + + + + Shaarli - Development + + + + + + +

    Development

    +

    Guidelines

    +

    Please have a look at the following pages:

    + +

    Continuous integration tools

    +

    Local development

    +

    A Makefile is available to perform project-related operations:

    +
      +
    • Documentation - generate a local HTML copy of the GitHub wiki
      • +
    • Static analysis - check that the code is compliant to PHP conventions
      • +
    • Unit tests - ensure there are no regressions introduced by new commits
      • +
    +

    Automatic builds

    +

    Travis CI is a Continuous Integration build server, that runs a build:

    +
      +
    • each time a commit is merged to the mainline (master branch)
      • +
    • each time a Pull Request is submitted or updated
      • +
    +

    A build is composed of several jobs: one for each supported PHP version (see Server requirements).

    +

    Each build job:

    +
      +
    • updates Composer
      • +
    • installs 3rd-party test dependencies with Composer
      • +
    • runs Unit tests
      • +
    +

    After all jobs have finished, Travis returns the results to GitHub:

    +
      +
    • a status icon represents the result for the master branch: (https://api.travis-ci.org/shaarli/Shaarli.svg)
      • +
    • Pull Requests are updated with the Travis result +
        +
      • Green: all tests have passed
        • +
      • Red: some tests failed
        • +
      • Orange: tests are pending
        • +
      • +
    + + diff --git a/doc/Development.md b/doc/Development.md new file mode 100644 index 0000000..6cfcb68 --- /dev/null +++ b/doc/Development.md @@ -0,0 +1,35 @@ +#Development +## Guidelines +Please have a look at the following pages: +- [Contributing to Shaarli](https://github.com/shaarli/Shaarli/tree/master/CONTRIBUTING.md)[](.html) +- [Static analysis](Static-analysis.html) - patches should try to stick to the [PHP Standard Recommendations](http://www.php-fig.org/psr/) (PSR), especially: + - [PSR-1](http://www.php-fig.org/psr/psr-1/) - Basic Coding Standard[](.html) + - [PSR-2](http://www.php-fig.org/psr/psr-2/) - Coding Style Guide[](.html) +- [Unit tests](Unit-tests.html) +- [GnuPG signature](GnuPG-signature.html) for tags/releases + +## Continuous integration tools +### Local development +A [`Makefile`](https://github.com/shaarli/Shaarli/blob/master/Makefile) is available to perform project-related operations:[](.html) +- Documentation - generate a local HTML copy of the GitHub wiki +- [Static analysis](Static-analysis.html) - check that the code is compliant to PHP conventions +- [Unit tests](Unit-tests.html) - ensure there are no regressions introduced by new commits + +### Automatic builds +[Travis CI](http://docs.travis-ci.com/) is a Continuous Integration build server, that runs a build:[](.html) +- each time a commit is merged to the mainline (`master` branch) +- each time a Pull Request is submitted or updated + +A build is composed of several jobs: one for each supported PHP version (see [Server requirements](Server-requirements.html)). + +Each build job: +- updates Composer +- installs 3rd-party test dependencies with Composer +- runs [Unit tests](Unit-tests.html) + +After all jobs have finished, Travis returns the results to GitHub: +- a status icon represents the result for the `master` branch: [![(https://api.travis-ci.org/shaarli/Shaarli.svg)](https://travis-ci.org/shaarli/Shaarli)]((https://api.travis-ci.org/shaarli/Shaarli.svg)](https://travis-ci.org/shaarli/Shaarli).html) +- Pull Requests are updated with the Travis result + - Green: all tests have passed + - Red: some tests failed + - Orange: tests are pending diff --git a/doc/Directory-structure.html b/doc/Directory-structure.html new file mode 100644 index 0000000..4ea5e24 --- /dev/null +++ b/doc/Directory-structure.html @@ -0,0 +1,107 @@ + + + + + + + Shaarli - Directory structure + + + + + + + +

    Directory structure

    +

    Here is the directory structure of Shaarli and the purpose of the different files:

    +
        index.php        # Main program
+    application/     # Shaarli classes
+        ├── LinkDB.php
+        └── Utils.php
+    tests/       # Shaarli unitary & functional tests
+        ├── LinkDBTest.php
+        ├── utils  # utilities to ease testing
+        │   └── ReferenceLinkDB.php
+        └── UtilsTest.php
+    COPYING          # Shaarli license
+    inc/             # static assets and 3rd party libraries
+        ├── awesomplete.*          # tags autocompletion library
+        ├── blazy.*                # picture wall lazy image loading library
+        ├── shaarli.css, reset.css # Shaarli stylesheet.
+        ├── qr.*                   # qr code generation library
+        └──rain.tpl.class.php      # RainTPL templating library
+    tpl/             # RainTPL templates for Shaarli. They are used to build the pages.
+    images/          # Images and icons used in Shaarli
+    data/            # data storage: bookmark database, configuration, logs, banlist…
+        ├── config.php             # Shaarli configuration (login, password, timezone, title…)
+        ├── datastore.php          # Your link database (compressed).
+        ├── ipban.php              # IP address ban system data
+        ├── lastupdatecheck.txt    # Update check timestamp file
+        └──log.txt                 # login/IPban log.
+    cache/           # thumbnails cache
+                     # This directory is automatically created. You can erase it anytime you want.
+    tmp/             # Temporary directory for compiled RainTPL templates.
+                     # This directory is automatically created. You can erase it anytime you want.
    + + diff --git a/doc/Directory-structure.md b/doc/Directory-structure.md new file mode 100644 index 0000000..3a1c430 --- /dev/null +++ b/doc/Directory-structure.md @@ -0,0 +1,33 @@ +#Directory structure +Here is the directory structure of Shaarli and the purpose of the different files: + +```bash + index.php # Main program + application/ # Shaarli classes + ├── LinkDB.php + └── Utils.php + tests/ # Shaarli unitary & functional tests + ├── LinkDBTest.php + ├── utils # utilities to ease testing + │ └── ReferenceLinkDB.php + └── UtilsTest.php + COPYING # Shaarli license + inc/ # static assets and 3rd party libraries + ├── awesomplete.* # tags autocompletion library + ├── blazy.* # picture wall lazy image loading library + ├── shaarli.css, reset.css # Shaarli stylesheet. + ├── qr.* # qr code generation library + └──rain.tpl.class.php # RainTPL templating library + tpl/ # RainTPL templates for Shaarli. They are used to build the pages. + images/ # Images and icons used in Shaarli + data/ # data storage: bookmark database, configuration, logs, banlist… + ├── config.php # Shaarli configuration (login, password, timezone, title…) + ├── datastore.php # Your link database (compressed). + ├── ipban.php # IP address ban system data + ├── lastupdatecheck.txt # Update check timestamp file + └──log.txt # login/IPban log. + cache/ # thumbnails cache + # This directory is automatically created. You can erase it anytime you want. + tmp/ # Temporary directory for compiled RainTPL templates. + # This directory is automatically created. You can erase it anytime you want. +``` diff --git a/doc/Download-CSS-styles-for-shaarlis-listed-in-an-opml-file.html b/doc/Download-CSS-styles-for-shaarlis-listed-in-an-opml-file.html deleted file mode 100644 index 0f32fb8..0000000 --- a/doc/Download-CSS-styles-for-shaarlis-listed-in-an-opml-file.html +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - -

    Download CSS styles for shaarlis listed in an opml file

    -

    Example php script:

    -
    <!---- ?php -->
-<!---- Copyright (c) 2014 Nicolas Delsaux (https://github.com/Riduidel) -->
-<!---- License: zlib (http://www.gzip.org/zlib/zlib_license.html) -->
-
-/**
- * Source: https://github.com/Riduidel
- * Download css styles for shaarlis listed in an opml file
- */
-define("SHAARLI_RSS_OPML", "https://www.ecirtam.net/shaarlirss/custom/people.opml");
-
-define("THEMES_TEMP_FOLDER", "new_themes");
-
-if(!file_exists(THEMES_TEMP_FOLDER)) {
-    mkdir(THEMES_TEMP_FOLDER);
-}
-
-function siteUrl($pathInSite) {
-    $indexPos = strpos($pathInSite, "index.php");
-    if(!$indexPos) {
-        return $pathInSite;
-    } else {
-        return substr($pathInSite, 0, $indexPos);
-    }
-}
-
-function createShaarliHashFromOPMLL($opmlFile) {
-    $result = array();
-    $opml = file_get_contents($opmlFile);
-    $opmlXml = simplexml_load_string($opml);
-    $outlineElements = $opmlXml->xpath("body/outline");
-    foreach($outlineElements as $site) {
-        $siteUrl = siteUrl((string) $site['htmlUrl']);
-        $result[$siteUrl]=((string) $site['text']);
-    }
-    return $result;
-}
-
-function getSiteFolder($url) {
-    $domain = parse_url($url,  PHP_URL_HOST);
-    return THEMES_TEMP_FOLDER."/".str_replace(".", "_", $domain);
-}
-
-function get_http_response_code($theURL) {
-     $headers = get_headers($theURL);
-     return substr($headers[0], 9, 3);
-}
-
-/**
- * This makes the code PHP-5 only (particularly the call to "get_headers")
- */
-function copyUserStyleFrom($url, $name, $knownStyles) {
-    $userStyle = $url."inc/user.css";
-    if(in_array($url, $knownStyles)) {
-        // TODO add log message
-    } else {
-        $statusCode = get_http_response_code($userStyle);
-        if(intval($statusCode)<300) {
-            $styleSheet = file_get_contents($userStyle);
-            $siteFolder = getSiteFolder($url);
-            if(!file_exists($siteFolder)) {
-                mkdir($siteFolder);
-            }
-            if(!file_exists($siteFolder.'/user.css')) {
-                // Copy stylesheet
-                file_put_contents($siteFolder.'/user.css', $styleSheet);
-            }
-            if(!file_exists($siteFolder.'/README.md')) {
-                // Then write a readme.md file
-                file_put_contents($siteFolder.'/README.md', 
-                    "User style from ".$name."\n"
-                    ."============================="
-                    ."\n\n"
-                    ."This stylesheet was downloaded from ".$userStyle." on ".date(DATE_RFC822)
-                    );
-            }
-            if(!file_exists($siteFolder.'/config.ini')) {
-                // Write a config file containing useful informations
-                file_put_contents($siteFolder.'/config.ini', 
-                    "site_url=".$url."\n"
-                    ."site_name=".$name."\n"
-                    );
-            }
-            if(!file_exists($siteFolder.'/home.png')) {
-                // And finally copy generated thumbnail
-                $homeThumb = $siteFolder.'/home.png';
-                file_put_contents($siteFolder.'/home.png', file_get_contents(getThumbnailUrl($url)));
-            }
-            echo 'Theme have been downloaded from  <a href="'.$url.'">'.$url.'</a> into '.$siteFolder
-                .'. It looks like <img src="'.$homeThumb.'"><br/>';
-        }
-    }
-}
-
-function getThumbnailUrl($url) {
-    return 'http://api.webthumbnail.org/?url='.$url;
-}
-
-function copyUserStylesFrom($urlToNames, $knownStyles) {
-    foreach($urlToNames as $url => $name) {
-        copyUserStyleFrom($url, $name, $knownStyles);
-    }
-}
-
-/**
- * Reading directory list, courtesy of http://www.laughing-buddha.net/php/dirlist/
- * @param directory the directory we want to list files of
- * @return a simple array containing the list of absolute file paths. Notice that current file (".") and parent one("..")
- * are not listed here
- */
-function getDirectoryList ($directory)  {
-    $realPath = realpath($directory);
-    // create an array to hold directory list
-    $results = array();
-    // create a handler for the directory
-    $handler = opendir($directory);
-    // open directory and walk through the filenames
-    while ($file = readdir($handler)) {
-        // if file isn't this directory or its parent, add it to the results
-        if ($file != "." && $file != "..") {
-            $results[] = realpath($realPath . "/" . $file);
-        }
-    }
-    // tidy up: close the handler
-    closedir($handler);
-    // done!
-    return $results;
-}
-
-/**
- * Start in themes folder and look in all subfolders for config.ini files. 
- * These config.ini files allow us not to download styles again and again
- */
-function findKnownStyles() {
-    $result = array();
-    $subFolders = getDirectoryList("themes");
-    foreach($subFolders as $folder) {
-        $configFile = $folder."/config.ini";
-        if(file_exists($configFile)) {
-            $iniParameters = parse_ini_file($configFile);
-            array_push($result, $iniParameters['site_url']);
-        }
-    }
-    return $result;
-}
-
-$knownStyles = findKnownStyles();
-copyUserStylesFrom(createShaarliHashFromOPMLL(SHAARLI_RSS_OPML), $knownStyles);
-
-<!--- ? ---->
    - - diff --git a/doc/Download-CSS-styles-from-an-OPML-list.html b/doc/Download-CSS-styles-from-an-OPML-list.html new file mode 100644 index 0000000..b21a54b --- /dev/null +++ b/doc/Download-CSS-styles-from-an-OPML-list.html @@ -0,0 +1,229 @@ + + + + + + + Shaarli - Download CSS styles from an OPML list + + + + + + + +

    Download CSS styles from an OPML list

    +

    Download CSS styles for shaarlis listed in an opml file

    +

    Example php script:

    +
    <!---- ?php -->
+<!---- Copyright (c) 2014 Nicolas Delsaux (https://github.com/Riduidel) -->
+<!---- License: zlib (http://www.gzip.org/zlib/zlib_license.html) -->
+
+/**
+ * Source: https://github.com/Riduidel
+ * Download css styles for shaarlis listed in an opml file
+ */
+define("SHAARLI_RSS_OPML", "https://www.ecirtam.net/shaarlirss/custom/people.opml");
+
+define("THEMES_TEMP_FOLDER", "new_themes");
+
+if(!file_exists(THEMES_TEMP_FOLDER)) {
+    mkdir(THEMES_TEMP_FOLDER);
+}
+
+function siteUrl($pathInSite) {
+    $indexPos = strpos($pathInSite, "index.php");
+    if(!$indexPos) {
+        return $pathInSite;
+    } else {
+        return substr($pathInSite, 0, $indexPos);
+    }
+}
+
+function createShaarliHashFromOPMLL($opmlFile) {
+    $result = array();
+    $opml = file_get_contents($opmlFile);
+    $opmlXml = simplexml_load_string($opml);
+    $outlineElements = $opmlXml->xpath("body/outline");
+    foreach($outlineElements as $site) {
+        $siteUrl = siteUrl((string) $site['htmlUrl']);[](.html)
+        $result[$siteUrl]=((string) $site['text']);[](.html)
+    }
+    return $result;
+}
+
+function getSiteFolder($url) {
+    $domain = parse_url($url,  PHP_URL_HOST);
+    return THEMES_TEMP_FOLDER."/".str_replace(".", "_", $domain);
+}
+
+function get_http_response_code($theURL) {
+     $headers = get_headers($theURL);
+     return substr($headers[0], 9, 3);[](.html)
+}
+
+/**
+ * This makes the code PHP-5 only (particularly the call to "get_headers")
+ */
+function copyUserStyleFrom($url, $name, $knownStyles) {
+    $userStyle = $url."inc/user.css";
+    if(in_array($url, $knownStyles)) {
+        // TODO add log message
+    } else {
+        $statusCode = get_http_response_code($userStyle);
+        if(intval($statusCode)<300) {
+            $styleSheet = file_get_contents($userStyle);
+            $siteFolder = getSiteFolder($url);
+            if(!file_exists($siteFolder)) {
+                mkdir($siteFolder);
+            }
+            if(!file_exists($siteFolder.'/user.css')) {
+                // Copy stylesheet
+                file_put_contents($siteFolder.'/user.css', $styleSheet);
+            }
+            if(!file_exists($siteFolder.'/README.md')) {
+                // Then write a readme.md file
+                file_put_contents($siteFolder.'/README.md', 
+                    "User style from ".$name."\n"
+                    ."============================="
+                    ."\n\n"
+                    ."This stylesheet was downloaded from ".$userStyle." on ".date(DATE_RFC822)
+                    );
+            }
+            if(!file_exists($siteFolder.'/config.ini')) {
+                // Write a config file containing useful informations
+                file_put_contents($siteFolder.'/config.ini', 
+                    "site_url=".$url."\n"
+                    ."site_name=".$name."\n"
+                    );
+            }
+            if(!file_exists($siteFolder.'/home.png')) {
+                // And finally copy generated thumbnail
+                $homeThumb = $siteFolder.'/home.png';
+                file_put_contents($siteFolder.'/home.png', file_get_contents(getThumbnailUrl($url)));
+            }
+            echo 'Theme have been downloaded from  <a href="'.$url.'">'.$url.'</a> into '.$siteFolder
+                .'. It looks like <img src="'.$homeThumb.'"><br/>';
+        }
+    }
+}
+
+function getThumbnailUrl($url) {
+    return 'http://api.webthumbnail.org/?url='.$url;
+}
+
+function copyUserStylesFrom($urlToNames, $knownStyles) {
+    foreach($urlToNames as $url => $name) {
+        copyUserStyleFrom($url, $name, $knownStyles);
+    }
+}
+
+/**
+ * Reading directory list, courtesy of http://www.laughing-buddha.net/php/dirlist/
+ * @param directory the directory we want to list files of
+ * @return a simple array containing the list of absolute file paths. Notice that current file (".") and parent one("..")
+ * are not listed here
+ */
+function getDirectoryList ($directory)  {
+    $realPath = realpath($directory);
+    // create an array to hold directory list
+    $results = array();
+    // create a handler for the directory
+    $handler = opendir($directory);
+    // open directory and walk through the filenames
+    while ($file = readdir($handler)) {
+        // if file isn't this directory or its parent, add it to the results
+        if ($file != "." && $file != "..") {
+            $results[ = realpath($realPath . "/" . $file);](-=-realpath($realPath-.-"/"-.-$file);.html)
+        }
+    }
+    // tidy up: close the handler
+    closedir($handler);
+    // done!
+    return $results;
+}
+
+/**
+ * Start in themes folder and look in all subfolders for config.ini files. 
+ * These config.ini files allow us not to download styles again and again
+ */
+function findKnownStyles() {
+    $result = array();
+    $subFolders = getDirectoryList("themes");
+    foreach($subFolders as $folder) {
+        $configFile = $folder."/config.ini";
+        if(file_exists($configFile)) {
+            $iniParameters = parse_ini_file($configFile);
+            array_push($result, $iniParameters['site_url']);[](.html)
+        }
+    }
+    return $result;
+}
+
+$knownStyles = findKnownStyles();
+copyUserStylesFrom(createShaarliHashFromOPMLL(SHAARLI_RSS_OPML), $knownStyles);
+
+<!--- ? ---->
    + + diff --git a/doc/Download-CSS-styles-for-shaarlis-listed-in-an-opml-file.md b/doc/Download-CSS-styles-from-an-OPML-list.md similarity index 92% rename from doc/Download-CSS-styles-for-shaarlis-listed-in-an-opml-file.md rename to doc/Download-CSS-styles-from-an-OPML-list.md index 8645b10..eb66f95 100644 --- a/doc/Download-CSS-styles-for-shaarlis-listed-in-an-opml-file.md +++ b/doc/Download-CSS-styles-from-an-OPML-list.md @@ -1,7 +1,8 @@ +#Download CSS styles from an OPML list ###Download CSS styles for shaarlis listed in an opml file Example php script: -``` +```php @@ -33,8 +34,8 @@ function createShaarliHashFromOPMLL($opmlFile) { $opmlXml = simplexml_load_string($opml); $outlineElements = $opmlXml->xpath("body/outline"); foreach($outlineElements as $site) { - $siteUrl = siteUrl((string) $site['htmlUrl']); - $result[$siteUrl]=((string) $site['text']); + $siteUrl = siteUrl((string) $site['htmlUrl']);[](.html) + $result[$siteUrl]=((string) $site['text']);[](.html) } return $result; } @@ -46,7 +47,7 @@ function getSiteFolder($url) { function get_http_response_code($theURL) { $headers = get_headers($theURL); - return substr($headers[0], 9, 3); + return substr($headers[0], 9, 3);[](.html) } /** @@ -121,7 +122,7 @@ function getDirectoryList ($directory) { while ($file = readdir($handler)) { // if file isn't this directory or its parent, add it to the results if ($file != "." && $file != "..") { - $results[] = realpath($realPath . "/" . $file); + $results[ = realpath($realPath . "/" . $file);](-=-realpath($realPath-.-"/"-.-$file);.html) } } // tidy up: close the handler @@ -141,7 +142,7 @@ function findKnownStyles() { $configFile = $folder."/config.ini"; if(file_exists($configFile)) { $iniParameters = parse_ini_file($configFile); - array_push($result, $iniParameters['site_url']); + array_push($result, $iniParameters['site_url']);[](.html) } } return $result; diff --git a/doc/Example-patch---add-new-via-field-for-links.html b/doc/Example-patch---add-new-via-field-for-links.html index 7df9d25..44352d3 100644 --- a/doc/Example-patch---add-new-via-field-for-links.html +++ b/doc/Example-patch---add-new-via-field-for-links.html @@ -4,7 +4,7 @@ - + Shaarli - Example patch add new via field for links '; @@ -980,7 +992,7 @@ function showATOM() else $linksToDisplay = $LINKSDB; $nblinksToDisplay = 50; // Number of links to display. - if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links. + if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.[](.html) - { + { - $nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ; + $nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ;[](.html) } @@ -1006,11 +1018,16 @@ function showATOM() // Add permalink in description $descriptionlink = htmlspecialchars('(Permalink)'); -+ if(isset($link['via']) && !empty($link['via'])){ -+ $via = htmlspecialchars('
    Origine => '.getJustDomain($link['via']).''); ++ if(isset($link['via']) && !empty($link['via'])){[](.html) ++ $via = htmlspecialchars('
    Origine => '.getJustDomain($link['via']).'');[](.html) + } else { + $via = ''; + } // If user wants permalinks first, put the final link in description if ($usepermalinks===true) $descriptionlink = htmlspecialchars('(Link)'); - if (strlen($link['description'])>0) $descriptionlink = '<br>'.$descriptionlink; + if (strlen($link['description'])>0) $descriptionlink = '<br>'.$descriptionlink;[](.html) -- $entries.=''.htmlspecialchars(nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))))).$descriptionlink."\n"; -+ $entries.=''.htmlspecialchars(nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))))).$descriptionlink.$via."\n"; - if ($link['tags']!='') // Adding tags to each ATOM entry (as mentioned in ATOM specification) +- $entries.=''.htmlspecialchars(nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))))).$descriptionlink."\n";[](.html) ++ $entries.=''.htmlspecialchars(nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))))).$descriptionlink.$via."\n";[](.html) + if ($link['tags']!='') // Adding tags to each ATOM entry (as mentioned in ATOM specification)[](.html) { - foreach(explode(' ',$link['tags']) as $tag) + foreach(explode(' ',$link['tags']) as $tag)[](.html) @@ -1478,7 +1495,7 @@ function renderPage() if (!startsWith($url,'http:') && !startsWith($url,'https:') && !startsWith($url,'ftp:') && !startsWith($url,'magnet:') && !startsWith($url,'?')) $url = 'http://'.$url; - $link = array('title'=>trim($_POST['lf_title']),'url'=>$url,'description'=>trim($_POST['lf_description']),'private'=>(isset($_POST['lf_private']) ? 1 : 0), + $link = array('title'=>trim($_POST['lf_title']),'url'=>$url,'description'=>trim($_POST['lf_description']),'private'=>(isset($_POST['lf_private']) ? 1 : 0),[](.html) - 'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags)); -+ 'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags), 'via'=>trim($_POST['lf_via'])); - if ($link['title']=='') $link['title']=$link['url']; // If title is empty, use the URL as title. - $LINKSDB[$linkdate] = $link; ++ 'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags), 'via'=>trim($_POST['lf_via']));[](.html) + if ($link['title']=='') $link['title']=$link['url']; // If title is empty, use the URL as title.[](.html) + $LINKSDB[$linkdate] = $link;[](.html) $LINKSDB->savedb(); // Save to disk. @@ -1556,7 +1573,8 @@ function renderPage() - $title = (empty($_GET['title']) ? '' : $_GET['title'] ); // Get title if it was provided in URL (by the bookmarklet). - $description = (empty($_GET['description']) ? '' : $_GET['description']); // Get description if it was provided in URL (by the bookmarklet). [Bronco added that] - $tags = (empty($_GET['tags']) ? '' : $_GET['tags'] ); // Get tags if it was provided in URL -- $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); // Get private if it was provided in URL -+ $via = (empty($_GET['via']) ? '' : $_GET['via'] ); -+ $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); // Get private if it was provided in URL + $title = (empty($_GET['title']) ? '' : $_GET['title'] ); // Get title if it was provided in URL (by the bookmarklet).[](.html) + $description = (empty($_GET['description']) ? '' : $_GET['description']); // Get description if it was provided in URL (by the bookmarklet). [Bronco added that][](.html) + $tags = (empty($_GET['tags']) ? '' : $_GET['tags'] ); // Get tags if it was provided in URL[](.html) +- $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); // Get private if it was provided in URL [](.html) ++ $via = (empty($_GET['via']) ? '' : $_GET['via'] );[](.html) ++ $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); // Get private if it was provided in URL[](.html) if (($url!='') && parse_url($url,PHP_URL_SCHEME)=='') $url = 'http://'.$url; // If this is an HTTP link, we try go get the page to extract the title (otherwise we will to straight to the edit form.) if (empty($title) && parse_url($url,PHP_URL_SCHEME)=='http') @@ -130,10 +131,10 @@ index 6fae2f8..53f798e 100644 - + // If found, extract encoding. - if (!empty($meta[0])) + if (!empty($meta[0]))[](.html) { @@ -1577,7 +1595,7 @@ function renderPage() - $html_charset = (!empty($enc[1])) ? strtolower($enc[1]) : 'utf-8'; + $html_charset = (!empty($enc[1])) ? strtolower($enc[1]) : 'utf-8';[](.html) } else { $html_charset = 'utf-8'; } - @@ -151,13 +152,13 @@ index 6fae2f8..53f798e 100644 $PAGE = new pageBuilder; @@ -1842,6 +1860,9 @@ function buildLinkList($PAGE,$LINKSDB) - $taglist = explode(' ',$link['tags']); + $taglist = explode(' ',$link['tags']);[](.html) uasort($taglist, 'strcasecmp'); - $link['taglist']=$taglist; -+ if(!empty($link['via'])){ -+ $link['via']=htmlspecialchars($link['via']); + $link['taglist']=$taglist;[](.html) ++ if(!empty($link['via'])){[](.html) ++ $link['via']=htmlspecialchars($link['via']);[](.html) + } - $linkDisp[$keys[$i]] = $link; + $linkDisp[$keys[$i[ = $link;](-=-$link;.html) $i++; } diff --git a/tpl/editlink.html b/tpl/editlink.html @@ -169,7 +170,7 @@ index 4a2c30c..14d4f9c 100644 Description

    Tags

    + Origine

    - {if condition="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"} + {if condition="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}[](.html)  
    diff --git a/tpl/linklist.html b/tpl/linklist.html @@ -181,9 +182,9 @@ index ddc38cb..0a8475f 100644
    {if="$value.description"}
    {$value.description}
    {/if} + {if condition="isset($value.via) && !empty($value.via)"}{/if} - {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"} + {if="!$GLOBALS['config'['HIDE_TIMESTAMPS'] || isLoggedIn()"}]('HIDE_TIMESTAMPS']-||-isLoggedIn()"}.html) {$value.localdate|htmlspecialchars} - permalink - {else} -- 2.1.1 -``` \ No newline at end of file +``` diff --git a/doc/FAQ.html b/doc/FAQ.html new file mode 100644 index 0000000..0ebd1bc --- /dev/null +++ b/doc/FAQ.html @@ -0,0 +1,97 @@ + + + + + + + Shaarli - FAQ + + + + + + +

    FAQ

    +

    Why did you create Shaarli ?

    +

    I was a StumbleUpon user. Then I got fed up with they big toolbar. I switched to delicious, which was lighter, faster and more beautiful. Until Yahoo bought it. Then the export API broke all the time, delicious became slow and was ditched by Yahoo. I switched to Diigo, which is not bad, but does too much. And Diigo is sslllooooowww and their Firefox extension a bit buggy. And… oh… their Firefox addon sends to Diigo every single URL you visit (Don't believe me ? Use Tamper Data and open any page).

    +

    Enough is enough. Saving simple links should not be a complicated heavy thing. I ditched them all and wrote my own: Shaarli. It's simple, but it does the job and does it well. And my data is not hosted on a foreign server, but on my server.

    +

    Why use Shaarli and not Delicious/Diigo ?

    +

    With Shaarli:

    +
      +
    • The data is yours: It's hosted on your server.
      • +
    • Never fear of having your data locked-in.
      • +
    • Never fear to have your data sold to third party.
      • +
    • Your private links are not hosted on a third party server.
      • +
    • You are not tracked by browser addons (like Diigo does)
      • +
    • You can change the look and feel of the pages if you want.
      • +
    • You can change the behaviour of the program.
      • +
    • It's magnitude faster than most bookmarking services.
      • +
    +

    What does Shaarli mean?

    +

    Shaarli is for shaaring your links.

    +

    My Shaarli is broken!

    +

    First of all, ensure that both the web server and Shaarli are correctly configured, and that your installation is supported.

    +

    If everything looks right but the issue(s) remain(s), please:

    +
      +
    • take a look at the troubleshooting section
      • +
    • come chat with us on Gitter, we'll be happy to help ;-)
      • +
    • browse active issues and Pull Requests +
        +
      • if you find one that is related to the issue, feel free to comment and provide additional details (host/Shaarli setup)
        • +
      • else, open a new issue, and provide information about the problem: +
          +
        • what happens? - display glitches, invalid data, security flaws...
          • +
        • what is your configuration? - OS, server version, activated extensions, web browser...
          • +
        • is it reproducible?
          • +
        • +
      • +
    +

    Why not use a real database? Files are slow!

    +

    Does browsing this page feel slow? Try browsing older pages, too.

    +

    It's not slow at all, is it? And don't forget the database contains more than 16000 links, and it's on a shared host, with 32000 visitors/day for my website alone. And it's still damn fast. Why?

    +

    The data file is only 3.7 Mb. It's read 99% of the time, and is probably already in the operation system disk cache. So generating a page involves no I/O at all most of the time.

    + + diff --git a/doc/FAQ.md b/doc/FAQ.md new file mode 100644 index 0000000..4c69763 --- /dev/null +++ b/doc/FAQ.md @@ -0,0 +1,44 @@ +#FAQ +### Why did you create Shaarli ? + +I was a StumbleUpon user. Then I got fed up with they big toolbar. I switched to delicious, which was lighter, faster and more beautiful. Until Yahoo bought it. Then the export API broke all the time, delicious became slow and was ditched by Yahoo. I switched to Diigo, which is not bad, but does too much. And Diigo is sslllooooowww and their Firefox extension a bit buggy. And… oh… **their Firefox addon sends to Diigo every single URL you visit** (Don't believe me ? Use [Tamper Data](https://addons.mozilla.org/en-US/firefox/addon/tamper-data/) and open any page).[](.html) + +Enough is enough. Saving simple links should not be a complicated heavy thing. I ditched them all and wrote my own: Shaarli. It's simple, but it does the job and does it well. And my data is not hosted on a foreign server, but on my server. + +### Why use Shaarli and not Delicious/Diigo ? + +With Shaarli: + +* The data is yours: It's hosted on your server. +* Never fear of having your data locked-in. +* Never fear to have your data sold to third party. +* Your private links are not hosted on a third party server. +* You are not tracked by browser addons (like Diigo does) +* You can change the look and feel of the pages if you want. +* You can change the behaviour of the program. +* It's magnitude faster than most bookmarking services. + +### What does Shaarli mean? + +Shaarli is for shaaring your links. + +### My Shaarli is broken! +First of all, ensure that both the [web server](Server-configuration) and [Shaarli](Shaarli-configuration) are correctly configured, and that your installation is [supported](Server-requirements).[](.html) + +If everything looks right but the issue(s) remain(s), please: +- take a look at the [troubleshooting](Troubleshooting) section[](.html) +- come [chat with us](https://gitter.im/shaarli/Shaarli) on Gitter, we'll be happy to help ;-)[](.html) +- browse active [issues](https://github.com/shaarli/Shaarli/issues) and [Pull Requests](https://github.com/shaarli/Shaarli/pulls)[](.html) + - if you find one that is related to the issue, feel free to comment and provide additional details (host/Shaarli setup) + - else, [open a new issue](https://github.com/shaarli/Shaarli/issues/new), and provide information about the problem:[](.html) + - _what happens?_ - display glitches, invalid data, security flaws... + - _what is your configuration?_ - OS, server version, activated extensions, web browser... + - _is it reproducible?_ + +### Why not use a real database? Files are slow! + +Does browsing [this page](http://sebsauvage.net/links/) feel slow? Try browsing older pages, too.[](.html) + +It's not slow at all, is it? And don't forget the database contains more than 16000 links, and it's on a shared host, with 32000 visitors/day for my website alone. And it's still damn fast. Why? + +The data file is only 3.7 Mb. It's read 99% of the time, and is probably already in the operation system disk cache. So generating a page involves no I/O at all most of the time. diff --git a/doc/Firefox-share.html b/doc/Firefox-share.html new file mode 100644 index 0000000..198afe2 --- /dev/null +++ b/doc/Firefox-share.html @@ -0,0 +1,72 @@ + + + + + + + Shaarli - Firefox share + + + + + + +

    Firefox share

    +

    Add Shaarli as a sharing service to Firefox

    +
      +
    • Open your Shaarli and Login
      • +
    • Click the Tools button in the top bar
      • +
    • Click the ✚Add to Firefox social button and accept the activation.
      • +
    + +
      +
    • Add the sharing service as described above
      • +
    • When you are visiting a webpage you would like to share with Shaarli, click the Firefox Share button images/firefoxshare.png
      • +
    • You can edit your link before and after saving, just like the bookmarklet above.
      • +
    +

    |  | Your Shaarli instance must be hosted on an HTTPS (SSL/TLS secure connection) enabled server for Firefox Share to work. Firefox Share will not work over plain HTTP connections. |
    |------|-------------------------------------------------------------------------------|

    + + diff --git a/doc/Firefox-share.md b/doc/Firefox-share.md new file mode 100644 index 0000000..58adc58 --- /dev/null +++ b/doc/Firefox-share.md @@ -0,0 +1,16 @@ +#Firefox share +### Add Shaarli as a sharing service to Firefox + + * Open your Shaarli and `Login` + * Click the `Tools` button in the top bar + * Click the `✚Add to Firefox social` button and accept the activation. + + +### Sharing links using Firefox share + + * Add the sharing service as described above + * When you are visiting a webpage you would like to share with Shaarli, click the Firefox _Share_ button [images/firefoxshare.png](images/firefoxshare.png.html) + * You can edit your link before and after saving, just like the bookmarklet above. + +|  | Your Shaarli instance must be hosted on an HTTPS (SSL/TLS secure connection) enabled server for Firefox Share to work. Firefox Share will not work over plain HTTP connections. | +|------|-------------------------------------------------------------------------------| diff --git a/doc/GnuPG-signature.html b/doc/GnuPG-signature.html new file mode 100644 index 0000000..c9e0455 --- /dev/null +++ b/doc/GnuPG-signature.html @@ -0,0 +1,199 @@ + + + + + + + Shaarli - GnuPG signature + + + + + + + +

    GnuPG signature

    +

    Introduction

    +

    PGP and GPG

    +

    Gnu Privacy Guard (GnuPG) is an Open Source implementation of the Pretty Good [](.html)
    Privacy     (OpenPGP) specification. Its main purposes are digital authentication,
    signature and encryption.

    +

    It is often used by the FLOSS community to verify:

    + +

    Trust

    +

    To quote Phil Pennock (the author of the SKS key server - http://sks.spodhuis.org/):

    +
    +

    You MUST understand that presence of data in the keyserver (pools) in no way connotes trust. Anyone can generate a key, with any name or email address, and upload it. All security and trust comes from evaluating security at the “object level”, via PGP Web-Of-Trust signatures. This keyserver makes it possible to retrieve keys, looking them up via various indices, but the collection of keys in this public pool is KNOWN to contain malicious and fraudulent keys. It is the common expectation of server operators that users understand this and use software which, like all known common OpenPGP implementations, evaluates trust accordingly. This expectation is so common that it is not normally explicitly stated.

    +
    +

    Trust can be gained by having your key signed by other people (and signing their key back, too :) ), for instance during key signing parties, see:

    + +

    Generate a GPG key

    +

    See Generating a GPG key for Git tagging.

    +

    gpg - provide identity information

    +
    $ gpg --gen-key
+
+gpg (GnuPG) 2.1.6; Copyright (C) 2015 Free Software Foundation, Inc.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
+Note: Use "gpg2 --full-gen-key" for a full featured key generation dialog.
+
+GnuPG needs to construct a user ID to identify your key.
+
+Real name: Marvin the Paranoid Android
+Email address: marvin@h2g2.net
+You selected this USER-ID:
+    "Marvin the Paranoid Android <marvin@h2g2.net>"
+
+Change (N)ame, (E)mail, or (O)kay/(Q)uit? o
+We need to generate a lot of random bytes. It is a good idea to perform
+some other action (type on the keyboard, move the mouse, utilize the
+disks) during the prime generation; this gives the random number
+generator a better chance to gain enough entropy.
    +

    gpg - entropy interlude

    +

    At this point, you will:

    +
      +
    • be prompted for a secure password to protect your key (the input method will depend on your Desktop Environment and configuration)
      • +
    • be asked to use your machine's input devices (mouse, keyboard, etc.) to generate random entropy; this step may take some time
      • +
    +

    gpg - key creation confirmation

    +
    gpg: key A9D53A3E marked as ultimately trusted
+public and secret key created and signed.
+
+gpg: checking the trustdb
+gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model
+gpg: depth: 0  valid:   2  signed:   0  trust: 0-, 0q, 0n, 0m, 0f, 2u
+pub   rsa2048/A9D53A3E 2015-07-31
+      Key fingerprint = AF2A 5381 E54B 2FD2 14C4  A9A3 0E35 ACA4 A9D5 3A3E
+uid       [ultimate] Marvin the Paranoid Android <marvin@h2g2.net>[](.html)
+sub   rsa2048/8C0EACF1 2015-07-31
    +

    gpg - submit your public key to a PGP server (Optional)

    +
    $ gpg --keyserver pgp.mit.edu --send-keys A9D53A3E
+gpg: sending key A9D53A3E to hkp server pgp.mit.edu
    +

    Create and push a GPG-signed tag

    +

    See Git - Maintaining a project - Tagging your [](.html)
    releases    .

    +

    Prerequisites

    +

    This guide assumes that you have:

    +
      +
    • a GPG key matching your GitHub authentication credentials +
        +
      • i.e., the email address identified by the GPG key is the same as the one in your ~/.gitconfig
        • +
      • +
    • a GitHub fork of Shaarli
      • +
    • a local clone of your Shaarli fork, with the following remotes: +
        +
      • origin pointing to your GitHub fork
        • +
      • upstream pointing to the main Shaarli repository
        • +
      • +
    • maintainer permissions on the main Shaarli repository (to push the signed tag)
      • +
    +

    Bump Shaarli's version

    +
    $ cd /path/to/shaarli
+
+# create a new branch
+$ git fetch upstream
+$ git checkout upstream/master -b v0.5.0
+
+# bump the version number
+$ vim index.php shaarli_version.php
+
+# commit the changes
+$ git add index.php shaarli_version.php
+$ git commit -s -m "Bump version to v0.5.0"
+
+# push the commit on your GitHub fork
+$ git push origin v0.5.0
    +

    Create and merge a Pull Request

    +

    This one is pretty straightforward ;-)

    +

    Create and push a signed tag

    +
    # update your local copy
+$ git checkout master
+$ git fetch upstream
+$ git pull upstream master
+
+# create a signed tag
+$ git tag -s -m "Release v0.5.0" v0.5.0
+
+# push it to "upstream"
+$ git push --tags upstream
    +

    Verify a signed tag

    +

    v0.5.0 is the first GPG-signed tag pushed on the Community Shaarli.

    +

    Let's have a look at its signature!

    +
    $ cd /path/to/shaarli
+$ git fetch upstream
+
+# get the SHA1 reference of the tag
+$ git show-ref tags/v0.5.0
+f7762cf803f03f5caf4b8078359a63783d0090c1 refs/tags/v0.5.0
+
+# verify the tag signature information
+$ git verify-tag f7762cf803f03f5caf4b8078359a63783d0090c1
+gpg: Signature made Thu 30 Jul 2015 11:46:34 CEST using RSA key ID 4100DF6F
+gpg: Good signature from "VirtualTam <virtualtam@flibidi.net>" [ultimate][](.html)
    + + diff --git a/doc/GnuPG-signature.md b/doc/GnuPG-signature.md new file mode 100644 index 0000000..e8dbdb1 --- /dev/null +++ b/doc/GnuPG-signature.md @@ -0,0 +1,141 @@ +#GnuPG signature +## Introduction +### PGP and GPG +[Gnu Privacy Guard](https://gnupg.org/) (GnuPG) is an Open Source implementation of the [Pretty Good [](.html) +Privacy](https://en.wikipedia.org/wiki/Pretty_Good_Privacy#OpenPGP) (OpenPGP) specification. Its main purposes are digital authentication, +signature and encryption. + +It is often used by the [FLOSS](https://en.wikipedia.org/wiki/Free_and_open-source_software) community to verify:[](.html) +- Linux package signatures: Debian [SecureApt](https://wiki.debian.org/SecureApt), ArchLinux [Master [](.html) +Keys](https://www.archlinux.org/master-keys/) +- [SCM](https://en.wikipedia.org/wiki/Revision_control) releases & maintainer identity[](.html) + +### Trust +To quote Phil Pennock (the author of the [SKS](https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Home) key server - http://sks.spodhuis.org/):[](.html) + +> You MUST understand that presence of data in the keyserver (pools) in no way connotes trust. Anyone can generate a key, with any name or email address, and upload it. All security and trust comes from evaluating security at the “object level”, via PGP Web-Of-Trust signatures. This keyserver makes it possible to retrieve keys, looking them up via various indices, but the collection of keys in this public pool is KNOWN to contain malicious and fraudulent keys. It is the common expectation of server operators that users understand this and use software which, like all known common OpenPGP implementations, evaluates trust accordingly. This expectation is so common that it is not normally explicitly stated. + +Trust can be gained by having your key signed by other people (and signing their key back, too :) ), for instance during [key signing parties](https://en.wikipedia.org/wiki/Key_signing_party), see:[](.html) +- [The Keysigning party HOWTO](http://www.cryptnet.net/fdp/crypto/keysigning_party/en/keysigning_party.html)[](.html) +- [Web of trust](https://en.wikipedia.org/wiki/Web_of_trust)[](.html) + +## Generate a GPG key +See [Generating a GPG key for Git tagging](http://stackoverflow.com/a/16725717).[](.html) + +### gpg - provide identity information +```bash +$ gpg --gen-key + +gpg (GnuPG) 2.1.6; Copyright (C) 2015 Free Software Foundation, Inc. +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law. + +Note: Use "gpg2 --full-gen-key" for a full featured key generation dialog. + +GnuPG needs to construct a user ID to identify your key. + +Real name: Marvin the Paranoid Android +Email address: marvin@h2g2.net +You selected this USER-ID: + "Marvin the Paranoid Android " + +Change (N)ame, (E)mail, or (O)kay/(Q)uit? o +We need to generate a lot of random bytes. It is a good idea to perform +some other action (type on the keyboard, move the mouse, utilize the +disks) during the prime generation; this gives the random number +generator a better chance to gain enough entropy. +``` + +### gpg - entropy interlude +At this point, you will: +- be prompted for a secure password to protect your key (the input method will depend on your Desktop Environment and configuration) +- be asked to use your machine's input devices (mouse, keyboard, etc.) to generate random entropy; this step _may take some time_ + +### gpg - key creation confirmation +```bash +gpg: key A9D53A3E marked as ultimately trusted +public and secret key created and signed. + +gpg: checking the trustdb +gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model +gpg: depth: 0 valid: 2 signed: 0 trust: 0-, 0q, 0n, 0m, 0f, 2u +pub rsa2048/A9D53A3E 2015-07-31 + Key fingerprint = AF2A 5381 E54B 2FD2 14C4 A9A3 0E35 ACA4 A9D5 3A3E +uid [ultimate] Marvin the Paranoid Android [](.html) +sub rsa2048/8C0EACF1 2015-07-31 +``` + +### gpg - submit your public key to a PGP server (Optional) +``` bash +$ gpg --keyserver pgp.mit.edu --send-keys A9D53A3E +gpg: sending key A9D53A3E to hkp server pgp.mit.edu +``` + +## Create and push a GPG-signed tag +See [Git - Maintaining a project - Tagging your [](.html) +releases](http://git-scm.com/book/en/v2/Distributed-Git-Maintaining-a-Project#Tagging-Your-Releases). + +### Prerequisites +This guide assumes that you have: +- a GPG key matching your GitHub authentication credentials + - i.e., the email address identified by the GPG key is the same as the one in your `~/.gitconfig` +- a GitHub fork of Shaarli +- a local clone of your Shaarli fork, with the following remotes: + - `origin` pointing to your GitHub fork + - `upstream` pointing to the main Shaarli repository +- maintainer permissions on the main Shaarli repository (to push the signed tag) + +### Bump Shaarli's version +```bash +$ cd /path/to/shaarli + +# create a new branch +$ git fetch upstream +$ git checkout upstream/master -b v0.5.0 + +# bump the version number +$ vim index.php shaarli_version.php + +# commit the changes +$ git add index.php shaarli_version.php +$ git commit -s -m "Bump version to v0.5.0" + +# push the commit on your GitHub fork +$ git push origin v0.5.0 +``` + +### Create and merge a Pull Request +This one is pretty straightforward ;-) + +### Create and push a signed tag +```bash +# update your local copy +$ git checkout master +$ git fetch upstream +$ git pull upstream master + +# create a signed tag +$ git tag -s -m "Release v0.5.0" v0.5.0 + +# push it to "upstream" +$ git push --tags upstream +``` + +### Verify a signed tag +[`v0.5.0`](https://github.com/shaarli/Shaarli/releases/tag/v0.5.0) is the first GPG-signed tag pushed on the Community Shaarli.[](.html) + +Let's have a look at its signature! + +```bash +$ cd /path/to/shaarli +$ git fetch upstream + +# get the SHA1 reference of the tag +$ git show-ref tags/v0.5.0 +f7762cf803f03f5caf4b8078359a63783d0090c1 refs/tags/v0.5.0 + +# verify the tag signature information +$ git verify-tag f7762cf803f03f5caf4b8078359a63783d0090c1 +gpg: Signature made Thu 30 Jul 2015 11:46:34 CEST using RSA key ID 4100DF6F +gpg: Good signature from "VirtualTam " [ultimate][](.html) +``` diff --git a/doc/Home.html b/doc/Home.html index 2cb54c8..37d62e8 100644 --- a/doc/Home.html +++ b/doc/Home.html @@ -4,7 +4,7 @@ - + Shaarli - Home - - - - - - - - -
    -

    Basic Usage

    -

    Add the sharing button (bookmarklet) to your browser

    -
      -
    • Open your Shaarli and Login
      • -
    • Click the Tools button in the top bar
      • -
    • Drag the ✚Shaare link button, and drop it to your browser's bookmarks bar.
      • -
    -

    This bookmarklet button in compatible with Firefox, Opera, Chrome and Safari. Under Opera, you can't drag'n drop the button: You have to right-click on it and add a bookmark to your personal toolbar.

    -

    -

    Add Shaarli as a sharing service to Firefox

    -
      -
    • Open your Shaarli and Login
      • -
    • Click the Tools button in the top bar
      • -
    • Click the ✚Add to Firefox social button and accept the activation.
      • -
    - -
      -
    • When you are visiting a webpage you would like to share with Shaarli, click the bookmarklet you just added.
      • -
    • A window opens.
      • -
    • You can freely edit title, description, tags... to find it later using the text search or tag filtering.
      • -
    • You will be able to edit this link later using the edit button.
      • -
    • You can also check the “Private” box so that the link is saved but only visible to you.
      • -
    • Click Save.Voila! Your link is now shared.
      • -
    - -
      -
    • Add the sharing service as described above
      • -
    • When you are visiting a webpage you would like to share with Shaarli, click the Firefox Share button [[images/firefoxshare.png]]
      • -
    • You can edit your link before and after saving, just like the bookmarklet above.
      • -
    -

    Other usage examples

    -

    Shaarli can be used:

    -
      -
    • to share, comment and save interesting links and news
      • -
    • to bookmark useful/frequent personal links (as private links) and share them between computers
      • -
    • as a minimal blog/microblog/writing platform (no character limit)
      • -
    • as a read-it-later list (for example items tagged readlater)
      • -
    • to draft and save articles/ideas
      • -
    • to keep code snippets
      • -
    • to keep notes and documentation
      • -
    • as a shared clipboard between machines
      • -
    • as a todo list
      • -
    • to store playlists (e.g. with the music or video tags)
      • -
    • to keep extracts/comments from webpages that may disappear
      • -
    • to keep track of ongoing discussions (for example items tagged discussion)
      • -
    • to feed RSS aggregators (planets) with specific tags
      • -
    • to feed other social networks, blogs... using RSS feeds and external services (dlvr.it, ifttt.com ...)
      • -
    -

    Using Shaarli as a blog, notepad, pastebin...

    -
      -
    • Go to your Shaarli setup and log in
      • -
    • Click the Add Link button
      • -
    • To share text only, do not enter any URL in the corresponding input field and click Add Link
      • -
    • Pick a title and enter your article, or note, in the description field; add a few tags; optionally check Private then click Save
      • -
    • Voilà! Your article is now published (privately if you selected that option) and accessible using its permalink.
      • -
    -

    RSS Feeds or Picture Wall for a specific search/tag

    -

    It is possible to filter RSS/ATOM feeds and Picture Wall on a Shaarli to only display results of a specific search, or for a specific tag. For example, if you want to subscribe only to links tagged photography:

    -
      -
    • Go to the desired Shaarli instance.
      • -
    • Search for the photography tag in the Filter by tag box. Links tagged photography are displayed.
      • -
    • Click on the RSS Feed button.
      • -
    • You are presented with an RSS feed showing only these links. Subscribe to it to receive only updates with this tag.
      • -
    • The same method also works for a full-text search (Search box) and for the Picture Wall (want to only see pictures about nature?)
      • -
    • You can also build the URL manually: https://my.shaarli.domain/?do=rss&searchtags=nature, https://my.shaarli.domain/links/?do=picwall&searchterm=poney
      • -
    -

    -

    Configuration

    -

    Main data/options.php file

    -

    To change the configuration, create the file data/options.php, example:

    -
        <?php
-    $GLOBALS['config']['LINKS_PER_PAGE'] = 30;
-    $GLOBALS['config']['HIDE_TIMESTAMPS'] = true;
-    $GLOBALS['config']['ENABLE_THUMBNAILS'] = false;  
-    ?>
    -

    Do not edit config options in index.php! Your changes would be lost when you upgrade. The following parameters are available (parameters (default value)):

    -
      -
    • DATADIR ('data') : This is the name of the subdirectory where Shaarli stores is data file. You can change it for better security.
      • -
    • CONFIG_FILE ($GLOBALS['config']['DATADIR'].'/config.php') : Name of file which is used to store login/password.
      • -
    • DATASTORE ($GLOBALS['config']['DATADIR'].'/datastore.php') : Name of file which contains the link database.
      • -
    • LINKS_PER_PAGE (20) : Default number of links per page displayed.
      • -
    • IPBANS_FILENAME ($GLOBALS['config']['DATADIR'].'/ipbans.php') : Name of file which records login attempts and IP bans.
      • -
    • BAN_AFTER (4) : An IP address will be banned after this many failed login attempts.
      • -
    • BAN_DURATION (1800) : Duration of ban (in seconds). (1800 seconds = 30 minutes)
      • -
    • OPEN_SHAARLI (false) : If you set this option to true, anyone will be able to add/modify/delete/import/exports links without having to login.
      • -
    • HIDE_TIMESTAMPS (false) : If you set this option to true, the date/time of each link will not be displayed (including in RSS Feed).#related-software
      • -
    • ENABLE_THUMBNAILS (true) : Enable/disable thumbnails.
      • -
    • RAINTPL_TMP (tmp/) : Raintpl cache directory (keep the trailing slash!)
      • -
    • RAINTPL_TPL (tpl/) : Raintpl template directory (keep the trailing slash!). Edit this option if you want to change the rendering template (page structure) used by Shaarli. See Changing template
      • -
    • CACHEDIR ('cache') : Directory where the thumbnails are stored.
      • -
    • ENABLE_LOCALCACHE (true) : If you have a limited quota on your webspace, you can set this option to false: Shaarli will not generate thumbnails which need to be cached locally (vimeo, flickr, etc.). Thumbnails will still be visible for the services which do not use the local cache (youtube.com, imgur.com, dailymotion.com, imageshack.us)
      • -
    • UPDATECHECK_FILENAME ($GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt') : name of the file used to store available shaarli version.
      • -
    • UPDATECHECK_INTERVAL (86400) : Delay between new Shaarli version check. 86400 seconds = 24 hours. Note that if you do not login for a week, Shaarli will not check for new version for a week.
      • -
    • ENABLE_UPDATECHECK: Determines whether Shaarli check for new releases at https://github.com/shaarli/Shaarli
      • -
    • SHOW_ATOM (false) : Show an ATOM Feed button next to the Subscribe (RSS) button. ATOM feeds are available at the address ?do=atom regardless of this option.
      • -
    • ARCHIVE_ORG (false) : For each link, display a link to an archived version on archive.org
      • -
    • ENABLE_RSS_PERMALINKS (true): choose whether the RSS item title link points directly to the link, or to the entry on Shaarli (permalink). true is the original Shaarli bahevior (point directly to the link)
      • -
    • HIDE_PUBLIC_LINKS (false): setting this to true hides all links, even public ones, for non-logged in users.
      • -
    -

    Changing theme

    -
      -
    • Shaarli's apparence can be modified by editing CSS rules in inc/user.css. This file allows to override rules defined in the main inc/shaarli.css (only add changed rules), or define a whole new theme.
      • -
    • Do not edit inc/shaarli.css! Your changes would be overriden when updating Shaarli.
      • -
    • Some themes are available at https://github.com/shaarli/shaarli-themes.
      • -
    -

    See also:

    - -

    Changing template

    -

    | WARNING | This feature is currently being worked on and will be improved in the next releases. Experimental. |
    |---------|---------|

    -
      -
    • Find the template you'd like to install. See the list of available templates (TODO). Find it's git clone URL or download the zip archive for the template.
      • -
    • In your Shaarli tpl/ directory, run git clone https://url/of/my-template/ or unpack the zip archive. There should now be a my-template/ directory under the tpl/ dir, containing directly all the template files.
      • -
    • Edit data/options.php to have Shaarli use this template. Eg.
      • -
    -

    $GLOBALS['config']['RAINTPL_TPL'] = 'tpl/my-template/' ;

    -

    You can find a list of compatible templates in Related Software

    -

    Backup

    -

    You have two ways of backing up your database:

    -
      -
    • Backup the file data/datastore.php (by FTP or SSH). Restore by putting the file back in place.
      • -
    • Example command: rsync -avzP my.server.com:/var/www/shaarli/data/datastore.php datastore-$(date +%Y-%m-%d_%H%M).php
      • -
    • Export your links as HTML (Menu Tools > Export). Restore by using the Import feature.
      • -
    • This can be done using the shaarchiver tool. Example command: ./export-bookmarks.py --url=https://my.server.com/shaarli --username=myusername --password=mysupersecretpassword --download-dir=./ --type=all
      • -
    -

    Troubleshooting

    -

    I forgot my password !

    -

    Delete the file data/config.php and display the page again. You will be asked for a new login/password.

    -

    I'm locked out - Login bruteforce protection

    -

    Login form is protected against brute force attacks: 4 failed logins will ban the IP address from login for 30 minutes. Banned IPs can still browse links.

    -

    To remove the current IP bans, delete the file data/ipbans.php

    -

    List of all login attempts

    -

    The file data/log.txt shows all logins (successful or failed) and bans/lifted bans.
    Search for failed in this file to look for unauthorized login attempts.

    -

    Exporting from Diigo

    -

    If you export your bookmark from Diigo, make sure you use the Delicious export, not the Netscape export. (Their Netscape export is broken, and they don't seem to be interested in fixing it.)

    -

    Importing from SemanticScuttle

    -

    To correctly import the tags from a SemanticScuttle HTML export, edit the HTML file before importing and replace all occurences of tags= (lowercase) to TAGS= (uppercase).

    -

    Importing from Mister Wong

    -

    See this issue for import tweaks.

    -

    Hosting problems

    -
      -
    • On free.fr : Please note that free uses php 5.1 and thus you will not have autocomplete in tag editing. Don't forget to create a sessions directory at the root of your webspace. Change the file extension to .php5 or create a .htaccess file in the directory where Shaarli is located containing:
      • -
    -
    php 1
-SetEnv PHP_VER 5
    -
      -
    • If you have an error such as: Parse error: syntax error, unexpected '=', expecting '(' in /links/index.php on line xxx, it means that your host is using php4, not php5. Shaarli requires php 5.1. Try changing the file extension to .php5
      • -
    • On 1and1 : If you add the link from the page (and not from the bookmarklet), Shaarli will no be able to get the title of the page. You will have to enter it manually. (Because they have disabled the ability to download a file through HTTP).
      • -
    • If you have the error Warning: file_get_contents() [function.file-get-contents]: URL file-access is disabled in the server configuration in /…/index.php on line xxx, it means that your host has disabled the ability to fetch a file by HTTP in the php config (Typically in 1and1 hosting). Bad host. Change host. Or comment the following lines:
      • -
    -
    //list($status,$headers,$data) = getHTTP($url,4); // Short timeout to keep the application responsive.
-// FIXME: Decode charset according to charset specified in either 1) HTTP response headers or 2) <head> in html 
-//if (strpos($status,'200 OK')) $title=html_extract_title($data);
    -
      -
    • On hosts which forbid outgoing HTTP requests (such as free.fr), some thumbnails will not work.
      • -
    • On lost-oasis, RSS doesn't work correctly, because of this message at the begining of the RSS/ATOM feed : <? // tout ce qui est charge ici (generalement des includes et require) est charge en permanence. ?>. To fix this, remove this message from php-include/prepend.php
      • -
    -

    Dates are not properly formatted

    -

    Shaarli tries to sniff the language of the browser (using HTTP_ACCEPT_LANGUAGE headers) and choose a date format accordingly. But Shaarli can only use the date formats (and more generaly speaking, the locales) provided by the webserver. So even if you have a browser in French, you may end up with dates in US format (it's the case on sebsauvage.net :-( )

    -

    Problems on CentOS servers

    -

    On CentOS/RedHat derivatives, you may need to install the php-mbstring package.

    -

    My session expires ! I can't stay logged in

    -

    This can be caused by several things:

    -
      -
    • Your php installation may not have a proper directory setup for session files. (eg. on Free.fr you need to create a session directory on the root of your website.) You may need to create the session directory of set it up.
      • -
    • Most hosts regularly clean the temporary and session directories. Your host may be cleaning those directories too aggressively (eg.OVH hosts), forcing an expire of the session. You may want to set the session directory in your web root. (eg. Create the sessions subdirectory and add ini_set('session.save_path', $_SERVER['DOCUMENT_ROOT'].'/../sessions');. Make sure this directory is not browsable !)
      • -
    • If your IP address changes during surfing, Shaarli will force expire your session for security reasons (to prevent session cookie hijacking). This can happen when surfing from WiFi or 3G (you may have switched WiFi/3G access point), or in some corporate/university proxies which use load balancing (and may have proxies with several external IP addresses).
      • -
    • Some browser addons may interfer with HTTP headers (ipfuck/ipflood/GreaseMonkey…). Try disabling those.
      • -
    • You may be using OperaTurbo or OperaMini, which use their own proxies which may change from time to time.
      • -
    • If you have another application on the same webserver where Shaarli is installed, these application may forcefully expire php sessions.
      • -
    -

    Sessions do not seem to work correctly on your server

    -

    Follow the instructions in the error message. Make sure you are accessing shaarli via a direct IP address or a proper hostname. If you have no dots in the hostname (e.g. localhost or http://my-webserver/shaarli/), some browsers will not store cookies at all (this respects the HTTP cookie specification).

    -

    pubsubhubbub support

    -

    Download publisher.php at the root of your Shaarli installation and set $GLOBALS['config']['PUBSUBHUB_URL'] in your config.php

    -

    Notes

    -

    Various hacks

    - - -
      -
    • Look for <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> in tpl/editlink.tpl (line 14)
      • -
    • Remove type="hidden" from this line
      • -
    • A new date/time field becomes available in the edit/new link dialog. You can set the timestamp manually by entering it in the format YYYMMDD_HHMMS.
      • -
    -

    Related software

    -

    Unofficial but relatedd work on Shaarli. If you maintain one of these, please get in touch with us to help us find a way to adapt your work to our fork. TODO contact repos owners to see if they'd like to standardize their work for the community fork.

    -

    Server apps

    -
      -
    • shaarchiver - Archive your Shaarli bookmarks and their content
      • -
    • shaarli-river - An aggregator for shaarlis with many features
      • -
    • Shaarlo - An aggregator for shaarlis with many features (a very popular running instance among french shaarliers: shaarli.fr)
      • -
    • Shaarlimages - An image-oriented aggregator for Shaarlis
      • -
    • mknexen/shaarli-api - A REST API for Shaarli
      • -
    -

    Android apps

    - -

    Themes & templates

    - -

    Integrate Shaarli with other platforms

    - -

    Alternative to Shaarli

    -
      -
    • Bookie - Another self-hostable, Free bookmark sharing software, written in Python
      • -
    • Unmark - An open source to do app for bookmarks (Homepage)
      • -
    -

    Other links

    - -

    FAQ

    -

    Why did you create Shaarli ?

    -

    I was a StumbleUpon user. Then I got fed up with they big toolbar. I switched to delicious, which was lighter, faster and more beautiful. Until Yahoo bought it. Then the export API broke all the time, delicious became slow and was ditched by Yahoo. I switched to Diigo, which is not bad, but does too much. And Diigo is sslllooooowww and their Firefox extension a bit buggy. And… oh… their Firefox addon sends to Diigo every single URL you visit (Don't believe me ? Use Tamper Data and open any page).

    -

    Enough is enough. Saving simple links should not be a complicated heavy thing. I ditched them all and wrote my own: Shaarli. It's simple, but it does the job and does it well. And my data is not hosted on a foreign server, but on my server.

    -

    Why use Shaarli and not Delicious/Diigo ?

    -

    With Shaarli:

    -
      -
    • The data is yours: It's hosted on your server.
      • -
    • Never fear of having your data locked-in.
      • -
    • Never fear to have your data sold to third party.
      • -
    • Your private links are not hosted on a third party server.
      • -
    • You are not tracked by browser addons (like Diigo does)
      • -
    • You can change the look and feel of the pages if you want.
      • -
    • You can change the behaviour of the program.
      • -
    • It's magnitude faster than most bookmarking services.
      • -
    -

    What does Shaarli mean ?

    -

    Shaarli is for shaaring your links.

    -

    Technical details

    -
      -
    • Application is protected against XSRF (Cross-site requests forgery): Forms which act on data (save,delete…) contain a token generated by the server. Any posted form which does not contain a valid token is rejected. Any token can only be used once. Token are attached to the session and cannot be reused in another session.
      • -
    • Sessions automatically expires after 60 minutes. Sessions are protected against highjacking: The sessionID cannot be used from a different IP address.
      • -
    • An .htaccess file protects the data file.
      • -

    • Link database is an associative array which is serialized, compressed (with deflate), base64-encoded and saved as a comment in a .php file. Thus even if the server does not support htaccess files, the data file will still not be readable by URL. The database looks like this:

      -
      <?php /* zP1ZjxxJtiYIvvevEPJ2lDOaLrZv7o...
-...ka7gaco/Z+TFXM2i7BlfMf8qxpaSSYfKlvqv/x8= */ ?>
      • -
    • The password is salted, hashed and stored in the data subdirectory, in a php file, and protected by htaccess. Even if the webserver does not support htaccess, the hash is not readable by URL. Even if the .php file is stolen, the password cannot deduced from the hash. The salt prevents rainbow-tables attacks.
      • -
    • Shaarli relies on HTTP_REFERER for some functions (like redirects and clicking on tags). If you have disabled or masqueraded HTTP_REFERER in your browser, some features of Shaarli may not work
      • -
    • magic_quotes is a horrible option of php which is often activated on servers. No serious developer should rely on this horror to secure their code against SQL injections. You should disable it (and Shaarli expects this option to be disabled). Nevertheless, I have added code to cope with magic_quotes on, so you should not be bothered even on crappy hosts.
      • -

    • Small hashes are used to make a link to an entry in Shaarli. They are unique. In fact, the date of the items (eg.20110923_150523) is hashed with CRC32, then converted to base64 and some characters are replaced. They are always 6 characters longs and use only A-Z a-z 0-9 - _ and @.

      • -
    -

    Directory structure

    -

    Here is the directory structure of Shaarli and the purpose of the different files:

    -
        index.php : Main program.
-    application/ : Shaarli classes
-        ├── LinkDB.php
-        └── Utils.php
-    tests/ : Shaarli unitary & functional tests
-        ├── LinkDBTest.php
-        ├── utils  # utilities to ease testing
-        │   └── ReferenceLinkDB.php
-        └── UtilsTest.php
-    COPYING : Shaarli license.
-    inc/ : Includes (libraries, CSS…)
-        ├── awesomplete.*: tags autocompletion library
-        ├── blazy.*: picture wall lazy image loading library
-        ├── shaarli.css, reset.css : Shaarli stylesheet.
-        ├── qr.* : qr code generation library
-        └──rain.tpl.class.php : RainTPL templating library.
-    tpl/ : RainTPL templates for Shaarli. They are used to build the pages.
-    images/ : Images and icons used in Shaarli.
-    data/ : Directory where data is stored (bookmark database, configuration, logs, banlist…)
-        ├── config.php : Shaarli configuration (login, password, timezone, title…)
-        ├── datastore.php : Your link database (compressed).
-        ├── ipban.php : IP address ban system data.
-        ├── lastupdatecheck.txt : Update check timestamp file (used to check every 24 hours if a new version of Shaarli is available).
-        └──log.txt : login/IPban log.
-    cache/ : Directory containing the thumbnails cache. This directory is automatically created. You can erase it anytime you want.
-    tmp/ : Temporary directory for compiled RainTPL templates. This directory is automatically created. You can erase it anytime you want.
    -

    Development

    - -

    Why not use a real database ? Files are slow !

    -

    Does browsing this page feel slow ? Try browsing older pages, too.

    -

    It's not slow at all, is it ? And don't forget the database contains more than 16000 links, and it's on a shared host, with 32000 visitors/day for my website alone. And it's still damn fast. Why ?

    -

    The data file is only 3.7 Mb. It's read 99% of the time, and is probably already in the operation system disk cache. So generating a page involves no I/O at all most of the time.

    -

    Wiki - TODO

    -
      -
    • translate (new page can be called Home.fr, Home.es ... and linked from Home)
      • -
    • add more screenshots
      • -
    • add developer documentation (storage architecture, classes and functions, security handling, ...)
      • -
    +

    Welcome to the Shaarli wiki

    +

    Here you can find some info on how to use, configure, tweak and solve problems with your Shaarli.

    +

    For general info, read the README.

    +

    If you have any questions or ideas, please join the chat (also reachable via IRC), post them in our general discussion or read the current issues. If you've found a bug, please create a new issue.

    +

    If you would like a feature added to Shaarli, check the issues labeled feature, enhancement, and plugin.

    +

    Note: This documentation is available online at https://github.com/shaarli/Shaarli/wiki, and locally in the doc/ directory of your Shaarli installation.

    diff --git a/doc/Home.md b/doc/Home.md index b5d9c39..a824d98 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -1,449 +1,14 @@ +#Home # Shaarli wiki -Welcome to the [Shaarli](https://github.com/shaarli/Shaarli/) wiki! Here you can find some info on how to use, configure, tweak and solve problems with your Shaarli. For general info, read the [README](https://github.com/shaarli/Shaarli/blob/master/README.md). +Welcome to the [Shaarli](https://github.com/shaarli/Shaarli/) wiki![](.html) -If you have any questions or ideas, please join the [chat](https://gitter.im/shaarli/Shaarli) (also reachable via [IRC](https://irc.gitter.im/)), post them in our [general discussion](https://github.com/shaarli/Shaarli/issues/44) or read the current [issues](https://github.com/shaarli/Shaarli/issues). If you've found a bug, please create a [new issue](https://github.com/shaarli/Shaarli/issues/new). If you would like a feature added to Shaarli, check the issues labeled [`feature`](https://github.com/shaarli/Shaarli/labels/feature), [`enhancement`](https://github.com/shaarli/Shaarli/labels/enhancement), and [`plugin`](https://github.com/shaarli/Shaarli/labels/plugin). +Here you can find some info on how to use, configure, tweak and solve problems with your Shaarli. + +For general info, read the [README](https://github.com/shaarli/Shaarli/blob/master/README.md).[](.html) + +If you have any questions or ideas, please join the [chat](https://gitter.im/shaarli/Shaarli) (also reachable via [IRC](https://irc.gitter.im/)), post them in our [general discussion](https://github.com/shaarli/Shaarli/issues/44) or read the current [issues](https://github.com/shaarli/Shaarli/issues). If you've found a bug, please create a [new issue](https://github.com/shaarli/Shaarli/issues/new).[](.html) + +If you would like a feature added to Shaarli, check the issues labeled [`feature`](https://github.com/shaarli/Shaarli/labels/feature), [`enhancement`](https://github.com/shaarli/Shaarli/labels/enhancement), and [`plugin`](https://github.com/shaarli/Shaarli/labels/plugin).[](.html) _Note: This documentation is available online at https://github.com/shaarli/Shaarli/wiki, and locally in the `doc/` directory of your Shaarli installation._ - ----------------------------------------------------------------------------------- - - - -- [Basic Usage](#basic-usage) - - [Add the sharing button (_bookmarklet_) to your browser](#add-the-sharing-button-_bookmarklet_-to-your-browser) - - [Add Shaarli as a sharing service to Firefox](#add-shaarli-as-a-sharing-service-to-firefox) - - [Share links using the _bookmarklet_](#share-links-using-the-_bookmarklet_) - - [Sharing links using Firefox share](#sharing-links-using-firefox-share) -- [Other usage examples](#other-usage-examples) - - [Using Shaarli as a blog, notepad, pastebin...](#using-shaarli-as-a-blog-notepad-pastebin) - - [RSS Feeds or Picture Wall for a specific search/tag](#rss-feeds-or-picture-wall-for-a-specific-searchtag) -- [Configuration](#configuration) - - [Main data/options.php file](#main-dataoptionsphp-file) - - [Changing theme](#changing-theme) - - [Changing template](#changing-template) -- [Backup](#backup) -- [Troubleshooting](#troubleshooting) - - [I forgot my password !](#i-forgot-my-password-) - - [I'm locked out - Login bruteforce protection](#im-locked-out---login-bruteforce-protection) - - [List of all login attempts](#list-of-all-login-attempts) - - [Exporting from Diigo](#exporting-from-diigo) - - [Importing from SemanticScuttle](#importing-from-semanticscuttle) - - [Importing from Mister Wong](#importing-from-mister-wong) - - [Hosting problems](#hosting-problems) - - [Dates are not properly formatted](#dates-are-not-properly-formatted) - - [Problems on CentOS servers](#problems-on-centos-servers) - - [My session expires ! I can't stay logged in](#my-session-expires--i-cant-stay-logged-in) - - [`Sessions do not seem to work correctly on your server`](#sessions-do-not-seem-to-work-correctly-on-your-server) - - [pubsubhubbub support](#pubsubhubbub-support) -- [Notes](#notes) - - [Various hacks](#various-hacks) - - [Changing timestamp for a link](#changing-timestamp-for-a-link) -- [Related software](#related-software) - - [Server apps](#server-apps) - - [Android apps](#android-apps) - - [Themes & templates](#themes--templates) - - [Integrate Shaarli with other platforms](#integrate-shaarli-with-other-platforms) - - [Alternative to Shaarli](#alternative-to-shaarli) -- [Other links](#other-links) -- [FAQ](#faq) - - [Why did you create Shaarli ?](#why-did-you-create-shaarli-) - - [Why use Shaarli and not Delicious/Diigo ?](#why-use-shaarli-and-not-deliciousdiigo-) - - [What does Shaarli mean ?](#what-does-shaarli-mean-) -- [Technical details](#technical-details) - - [Directory structure](#directory-structure) - - [Development](#development) - - [Why not use a real database ? Files are slow !](#why-not-use-a-real-database--files-are-slow-) -- [Wiki - TODO](#wiki---todo) - - - - - ------------------------------------------------------------------- - -# Basic Usage - -### Add the sharing button (_bookmarklet_) to your browser - - * Open your Shaarli and `Login` - * Click the `Tools` button in the top bar - * Drag the **`✚Shaare link` button**, and drop it to your browser's bookmarks bar. - -_This bookmarklet button in compatible with Firefox, Opera, Chrome and Safari. Under Opera, you can't drag'n drop the button: You have to right-click on it and add a bookmark to your personal toolbar._ - -![](images/bookmarklet.png) - - -### Add Shaarli as a sharing service to Firefox - - * Open your Shaarli and `Login` - * Click the `Tools` button in the top bar - * Click the `✚Add to Firefox social` button and accept the activation. - - -### Share links using the _bookmarklet_ - - * When you are visiting a webpage you would like to share with Shaarli, click the _bookmarklet_ you just added. - * A window opens. - * You can freely edit title, description, tags... to find it later using the text search or tag filtering. - * You will be able to edit this link later using the ![](https://raw.githubusercontent.com/shaarli/Shaarli/master/images/edit_icon.png) edit button. - * You can also check the “Private” box so that the link is saved but only visible to you. - * Click `Save`.**Voila! Your link is now shared.** - - -### Sharing links using Firefox share - - * Add the sharing service as described above - * When you are visiting a webpage you would like to share with Shaarli, click the Firefox _Share_ button [[images/firefoxshare.png]] - * You can edit your link before and after saving, just like the bookmarklet above. - - -# Other usage examples -Shaarli can be used: - - * to share, comment and save interesting links and news - * to bookmark useful/frequent personal links (as private links) and share them between computers - * as a minimal blog/microblog/writing platform (no character limit) - * as a read-it-later list (for example items tagged `readlater`) - * to draft and save articles/ideas - * to keep code snippets - * to keep notes and documentation - * as a shared clipboard between machines - * as a todo list - * to store playlists (e.g. with the `music` or `video` tags) - * to keep extracts/comments from webpages that may disappear - * to keep track of ongoing discussions (for example items tagged `discussion`) - * [to feed RSS aggregators](http://shaarli.chassegnouf.net/?9Efeiw) (planets) with specific tags - * to feed other social networks, blogs... using RSS feeds and external services (dlvr.it, ifttt.com ...) - -### Using Shaarli as a blog, notepad, pastebin... - - * Go to your Shaarli setup and log in - * Click the `Add Link` button - * To share text only, do not enter any URL in the corresponding input field and click `Add Link` - * Pick a title and enter your article, or note, in the description field; add a few tags; optionally check `Private` then click `Save` - * Voilà! Your article is now published (privately if you selected that option) and accessible using its permalink. - - -### RSS Feeds or Picture Wall for a specific search/tag -It is possible to filter RSS/ATOM feeds and Picture Wall on a Shaarli to **only display results of a specific search, or for a specific tag**. For example, if you want to subscribe only to links tagged `photography`: - * Go to the desired Shaarli instance. - * Search for the `photography` tag in the _Filter by tag_ box. Links tagged `photography` are displayed. - * Click on the `RSS Feed` button. - * You are presented with an RSS feed showing only these links. Subscribe to it to receive only updates with this tag. - * The same method **also works for a full-text search** (_Search_ box) **and for the Picture Wall** (want to only see pictures about `nature`?) - * You can also build the URL manually: `https://my.shaarli.domain/?do=rss&searchtags=nature`, `https://my.shaarli.domain/links/?do=picwall&searchterm=poney` - -![](images/rss-filter-1.png) ![](images/rss-filter-2.png) - -# Configuration - -### Main data/options.php file - -To change the configuration, create the file `data/options.php`, example: -``` - -``` - -**Do not edit config options in index.php! Your changes would be lost when you upgrade.** The following parameters are available (parameters (default value)): - - * `DATADIR ('data')` : This is the name of the subdirectory where Shaarli stores is data file. You can change it for better security. - * `CONFIG_FILE ($GLOBALS['config']['DATADIR'].'/config.php')` : Name of file which is used to store login/password. - * `DATASTORE ($GLOBALS['config']['DATADIR'].'/datastore.php')` : Name of file which contains the link database. - * `LINKS_PER_PAGE (20)` : Default number of links per page displayed. - * `IPBANS_FILENAME ($GLOBALS['config']['DATADIR'].'/ipbans.php')` : Name of file which records login attempts and IP bans. - * `BAN_AFTER (4)` : An IP address will be banned after this many failed login attempts. - * `BAN_DURATION (1800)` : Duration of ban (in seconds). (1800 seconds = 30 minutes) - * `OPEN_SHAARLI (false)` : If you set this option to true, anyone will be able to add/modify/delete/import/exports links without having to login. - * `HIDE_TIMESTAMPS (false)` : If you set this option to true, the date/time of each link will not be displayed (including in RSS Feed).#related-software - * `ENABLE_THUMBNAILS (true)` : Enable/disable thumbnails. - * `RAINTPL_TMP (tmp/)` : Raintpl cache directory (keep the trailing slash!) - * `RAINTPL_TPL (tpl/)` : Raintpl template directory (keep the trailing slash!). Edit this option if you want to change the rendering template (page structure) used by Shaarli. See [Changing template](#changing-template) - * `CACHEDIR ('cache')` : Directory where the thumbnails are stored. - * `ENABLE_LOCALCACHE (true)` : If you have a limited quota on your webspace, you can set this option to false: Shaarli will not generate thumbnails which need to be cached locally (vimeo, flickr, etc.). Thumbnails will still be visible for the services which do not use the local cache (youtube.com, imgur.com, dailymotion.com, imageshack.us) - * `UPDATECHECK_FILENAME ($GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt')` : name of the file used to store available shaarli version. - * `UPDATECHECK_INTERVAL (86400)` : Delay between new Shaarli version check. 86400 seconds = 24 hours. Note that if you do not login for a week, Shaarli will not check for new version for a week. - * `ENABLE_UPDATECHECK`: Determines whether Shaarli check for new releases at https://github.com/shaarli/Shaarli - * `SHOW_ATOM (false)` : Show an `ATOM Feed` button next to the `Subscribe` (RSS) button. ATOM feeds are available at the address `?do=atom` regardless of this option. - * `ARCHIVE_ORG (false)` : For each link, display a link to an archived version on archive.org - * `ENABLE_RSS_PERMALINKS (true)`: choose whether the RSS item title link points directly to the link, or to the entry on Shaarli (permalink). `true` is the original Shaarli bahevior (point directly to the link) - * `HIDE_PUBLIC_LINKS (false)`: setting this to true hides all links, even public ones, for non-logged in users. - - -### Changing theme - * Shaarli's apparence can be modified by editing CSS rules in `inc/user.css`. This file allows to override rules defined in the main `inc/shaarli.css` (only add changed rules), or define a whole new theme. - * Do not edit `inc/shaarli.css`! Your changes would be overriden when updating Shaarli. - * Some themes are available at https://github.com/shaarli/shaarli-themes. - -See also: - * [Download CSS styles for shaarlis listed in an opml file](https://github.com/shaarli/Shaarli/wiki/Download-CSS-styles-for-shaarlis-listed-in-an-opml-file) - -### Changing template - -| WARNING | This feature is currently being worked on and will be improved in the next releases. Experimental. | -|---------|---------| - - * Find the template you'd like to install. See the list of available templates (TODO). Find it's git clone URL or download the zip archive for the template. - * In your Shaarli `tpl/` directory, run `git clone https://url/of/my-template/` or unpack the zip archive. There should now be a `my-template/` directory under the `tpl/` dir, containing directly all the template files. - * Edit `data/options.php` to have Shaarli use this template. Eg. - -`$GLOBALS['config']['RAINTPL_TPL'] = 'tpl/my-template/' ;` - -You can find a list of compatible templates in [Related Software](#related-software) - -# Backup - -You have two ways of backing up your database: -* **Backup the file `data/datastore.php`** (by FTP or SSH). Restore by putting the file back in place. - * Example command: `rsync -avzP my.server.com:/var/www/shaarli/data/datastore.php datastore-$(date +%Y-%m-%d_%H%M).php` -* **Export your links as HTML** (Menu `Tools` > `Export`). Restore by using the `Import` feature. - * This can be done using the [shaarchiver](https://github.com/nodiscc/shaarchiver) tool. Example command: `./export-bookmarks.py --url=https://my.server.com/shaarli --username=myusername --password=mysupersecretpassword --download-dir=./ --type=all` - - -# Troubleshooting - -### I forgot my password ! - -Delete the file data/config.php and display the page again. You will be asked for a new login/password. - - - -### I'm locked out - Login bruteforce protection -Login form is protected against brute force attacks: 4 failed logins will ban the IP address from login for 30 minutes. Banned IPs can still browse links. - -To remove the current IP bans, delete the file `data/ipbans.php` - -### List of all login attempts - -The file `data/log.txt` shows all logins (successful or failed) and bans/lifted bans. -Search for `failed` in this file to look for unauthorized login attempts. - - -### Exporting from Diigo - -If you export your bookmark from Diigo, make sure you use the Delicious export, not the Netscape export. (Their Netscape export is broken, and they don't seem to be interested in fixing it.) - -### Importing from SemanticScuttle - -To correctly import the tags from a [SemanticScuttle](http://semanticscuttle.sourceforge.net/) HTML export, edit the HTML file before importing and replace all occurences of `tags=` (lowercase) to `TAGS=` (uppercase). - -### Importing from Mister Wong -See [this issue](https://github.com/sebsauvage/Shaarli/issues/146) for import tweaks. - - -### Hosting problems - * On **free.fr** : Please note that free uses php 5.1 and thus you will not have autocomplete in tag editing. Don't forget to create a `sessions` directory at the root of your webspace. Change the file extension to `.php5` or create a `.htaccess` file in the directory where Shaarli is located containing: - -``` -php 1 -SetEnv PHP_VER 5 -``` - - * If you have an error such as: `Parse error: syntax error, unexpected '=', expecting '(' in /links/index.php on line xxx`, it means that your host is using php4, not php5. Shaarli requires php 5.1. Try changing the file extension to `.php5` - * On **1and1** : If you add the link from the page (and not from the bookmarklet), Shaarli will no be able to get the title of the page. You will have to enter it manually. (Because they have disabled the ability to download a file through HTTP). - * If you have the error `Warning: file_get_contents() [function.file-get-contents]: URL file-access is disabled in the server configuration in /…/index.php on line xxx`, it means that your host has disabled the ability to fetch a file by HTTP in the php config (Typically in 1and1 hosting). Bad host. Change host. Or comment the following lines: - -``` -//list($status,$headers,$data) = getHTTP($url,4); // Short timeout to keep the application responsive. -// FIXME: Decode charset according to charset specified in either 1) HTTP response headers or 2) in html -//if (strpos($status,'200 OK')) $title=html_extract_title($data); -``` - - * On hosts which forbid outgoing HTTP requests (such as free.fr), some thumbnails will not work. - * On **lost-oasis**, RSS doesn't work correctly, because of this message at the begining of the RSS/ATOM feed : ``. To fix this, remove this message from `php-include/prepend.php` - -### Dates are not properly formatted -Shaarli tries to sniff the language of the browser (using HTTP_ACCEPT_LANGUAGE headers) and choose a date format accordingly. But Shaarli can only use the date formats (and more generaly speaking, the locales) provided by the webserver. So even if you have a browser in French, you may end up with dates in US format (it's the case on sebsauvage.net :-( ) - -### Problems on CentOS servers -On **CentOS**/RedHat derivatives, you may need to install the `php-mbstring` package. - - -### My session expires ! I can't stay logged in -This can be caused by several things: - -* Your php installation may not have a proper directory setup for session files. (eg. on Free.fr you need to create a `session` directory on the root of your website.) You may need to create the session directory of set it up. -* Most hosts regularly clean the temporary and session directories. Your host may be cleaning those directories too aggressively (eg.OVH hosts), forcing an expire of the session. You may want to set the session directory in your web root. (eg. Create the `sessions` subdirectory and add `ini_set('session.save_path', $_SERVER['DOCUMENT_ROOT'].'/../sessions');`. Make sure this directory is not browsable !) -* If your IP address changes during surfing, Shaarli will force expire your session for security reasons (to prevent session cookie hijacking). This can happen when surfing from WiFi or 3G (you may have switched WiFi/3G access point), or in some corporate/university proxies which use load balancing (and may have proxies with several external IP addresses). -* Some browser addons may interfer with HTTP headers (ipfuck/ipflood/GreaseMonkey…). Try disabling those. -* You may be using OperaTurbo or OperaMini, which use their own proxies which may change from time to time. -* If you have another application on the same webserver where Shaarli is installed, these application may forcefully expire php sessions. - -### `Sessions do not seem to work correctly on your server` -Follow the instructions in the error message. Make sure you are accessing shaarli via a direct IP address or a proper hostname. If you have **no dots** in the hostname (e.g. `localhost` or `http://my-webserver/shaarli/`), some browsers will not store cookies at all (this respects the [HTTP cookie specification](http://curl.haxx.se/rfc/cookie_spec.html)). - - -### pubsubhubbub support - -Download [publisher.php](https://pubsubhubbub.googlecode.com/git/publisher_clients/php/library/publisher.php) at the root of your Shaarli installation and set `$GLOBALS['config']['PUBSUBHUB_URL']` in your `config.php` - -# Notes -### Various hacks - - * [Example patch: add a new "via" field for links](Example-patch---add-new-via-field-for-links) - * [Copy a Shaarli installation over SSH SCP, serve it locally with php cli](Copy-a-Shaarli-installation-over-SSH-SCP,-serve-it-locally-with-php-cli) - * To display the array representing the data saved in datastore.php, use the following snippet -``` -$data = "tZNdb9MwFIb... "; -$out = unserialize(gzinflate(base64_decode($data))); -echo "
    "; // Pretty printing is love, pretty printing is life
-print_r($out);
-echo "
    "; -exit; -``` -This will output the internal representation of the datastore, "unobfuscated" (if this can really be considered obfuscation) - -### Changing timestamp for a link - * Look for `` in `tpl/editlink.tpl` (line 14) - * Remove `type="hidden"` from this line - * A new date/time field becomes available in the edit/new link dialog. You can set the timestamp manually by entering it in the format `YYYMMDD_HHMMS`. - - -# Related software -Unofficial but relatedd work on Shaarli. If you maintain one of these, please get in touch with us to help us find a way to adapt your work to our fork. **TODO** contact repos owners to see if they'd like to standardize their work for the community fork. -### Server apps - * [shaarchiver](https://github.com/nodiscc/shaarchiver) - Archive your Shaarli bookmarks and their content - * [shaarli-river](https://github.com/mknexen/shaarli-river) - An aggregator for shaarlis with many features - * [Shaarlo](https://github.com/DMeloni/shaarlo) - An aggregator for shaarlis with many features (a very popular running instance among french shaarliers: [shaarli.fr](http://shaarli.fr/)) - * [Shaarlimages](https://github.com/BoboTiG/shaarlimages) - An image-oriented aggregator for Shaarlis - * [mknexen/shaarli-api](https://github.com/mknexen/shaarli-api) - A REST API for Shaarli - -### Android apps - * [Shaarli for Android](http://sebsauvage.net/links/?ZAyDzg) - Android application that adds Shaarli as a sharing provider - * [Shaarlier for Android](https://github.com/dimtion/Shaarlier) - Android application to simply add links directly into your Shaarli - -### Themes & templates - * [AkibaTech/Shaarli Superhero Theme](https://github.com/AkibaTech/Shaarli---SuperHero-Theme) - A template/theme for Shaarli - * [alexisju/albinomouse-template](https://github.com/alexisju/albinomouse-template) - A full template for Shaarli - * [dhoko/ShaarliTemplate](https://github.com/dhoko/ShaarliTemplate) - A template/theme for Shaarli - * [kalvn/shaarli-blocks](https://github.com/kalvn/shaarli-blocks) - A template/theme for Shaarli - * [kalvn/Shaarli-Material](https://github.com/kalvn/Shaarli-Material) - A theme (template) based on Google's Material Design for Shaarli, the superfast delicious clone. - * [misterair/Limonade](https://github.com/misterair/limonade) - A fork of (legacy) Shaarli with a new template - * [Vinm/Blue-theme-for Shaarli](https://github.com/Vinm/Blue-theme-for-Shaarli) - A template/theme for Shaarli ([unmaintained](https://github.com/Vinm/Blue-theme-for-Shaarli/issues/2), compatibility unknown) - * [vivienhaese/shaarlitheme](https://github.com/vivienhaese/shaarlitheme) - A Shaarli fork meant to be run in an openshift instance - -### Integrate Shaarli with other platforms - * [tt-rss-shaarli](https://github.com/jcsaaddupuy/tt-rss-shaarli) - [TinyTiny RSS](http://tt-rss.org/) plugin that adds support for sharing articles with Shaarli - * [octopress-shaarli](https://github.com/ahmet2mir/octopress-shaarli) - octoprress plugin to retrieve SHaarli links on the sidebara - -### Alternative to Shaarli - * [Bookie](https://github.com/bookieio/bookie) - Another self-hostable, Free bookmark sharing software, written in Python - * [Unmark](https://github.com/plainmade/unmark) - An open source to do app for bookmarks ([Homepage](https://unmark.it/)) - - - -# Other links - * [Liens en vrac de sebsauvage](http://sebsauvage.net/links/) - the original Shaarli - * [A large list of Shaarlis](http://porneia.free.fr/pub/links/ou-est-shaarli.html) - * [A list of working Shaarli aggregators](https://raw.githubusercontent.com/Oros42/find_shaarlis/master/annuaires.json) - * [A list of some known Shaarlis](https://github.com/Oros42/shaarlis_list) - * [Adieu Delicious, Diigo et StumbleUpon. Salut Shaarli ! - sebsauvage.net](http://sebsauvage.net/rhaa/index.php?2011/09/16/09/29/58-adieu-delicious-diigo-et-stumbleupon-salut-shaarli-) (fr) _16/09/2011 - the original post about Shaarli_ - * [Original ideas/fixme/TODO page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:ideas) - * [Original discussion page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:discussion) (fr) - * [Original revisions history](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history) - * [Shaarli.fr/my](https://www.shaarli.fr/my.php) - Unofficial, unsupported (old fork) hosted Shaarlis provider, courtesy of [DMeloni](https://github.com/DMeloni) - * [Shaarli Communauty](http://shaarferme.etudiant-libre.fr.nf/index.php) - Another unofficial Shaarli hoster (unsupported, old fork), hoster unknown - - - - -# FAQ - -### Why did you create Shaarli ? - -I was a StumbleUpon user. Then I got fed up with they big toolbar. I switched to delicious, which was lighter, faster and more beautiful. Until Yahoo bought it. Then the export API broke all the time, delicious became slow and was ditched by Yahoo. I switched to Diigo, which is not bad, but does too much. And Diigo is sslllooooowww and their Firefox extension a bit buggy. And… oh… **their Firefox addon sends to Diigo every single URL you visit** (Don't believe me ? Use [Tamper Data](https://addons.mozilla.org/en-US/firefox/addon/tamper-data/) and open any page). - -Enough is enough. Saving simple links should not be a complicated heavy thing. I ditched them all and wrote my own: Shaarli. It's simple, but it does the job and does it well. And my data is not hosted on a foreign server, but on my server. - -### Why use Shaarli and not Delicious/Diigo ? - -With Shaarli: - -* The data is yours: It's hosted on your server. -* Never fear of having your data locked-in. -* Never fear to have your data sold to third party. -* Your private links are not hosted on a third party server. -* You are not tracked by browser addons (like Diigo does) -* You can change the look and feel of the pages if you want. -* You can change the behaviour of the program. -* It's magnitude faster than most bookmarking services. - -### What does Shaarli mean ? - -Shaarli is for shaaring your links. - - - -# Technical details - * Application is protected against XSRF (Cross-site requests forgery): Forms which act on data (save,delete…) contain a token generated by the server. Any posted form which does not contain a valid token is rejected. Any token can only be used once. Token are attached to the session and cannot be reused in another session. - * Sessions automatically expires after 60 minutes. Sessions are protected against highjacking: The sessionID cannot be used from a different IP address. - * An .htaccess file protects the data file. - * Link database is an associative array which is serialized, compressed (with deflate), base64-encoded and saved as a comment in a .php file. Thus even if the server does not support htaccess files, the data file will still not be readable by URL. The database looks like this: -``` - -``` - -* The password is salted, hashed and stored in the data subdirectory, in a php file, and protected by htaccess. Even if the webserver does not support htaccess, the hash is not readable by URL. Even if the .php file is stolen, the password cannot deduced from the hash. The salt prevents rainbow-tables attacks. -* Shaarli relies on `HTTP_REFERER` for some functions (like redirects and clicking on tags). If you have disabled or masqueraded `HTTP_REFERER` in your browser, some features of Shaarli may not work -* `magic_quotes` is a horrible option of php which is often activated on servers. No serious developer should rely on this horror to secure their code against SQL injections. You should disable it (and Shaarli expects this option to be disabled). Nevertheless, I have added code to cope with magic_quotes on, so you should not be bothered even on crappy hosts. -* Small hashes are used to make a link to an entry in Shaarli. They are unique. In fact, the date of the items (eg.20110923_150523) is hashed with CRC32, then converted to base64 and some characters are replaced. They are always 6 characters longs and use only A-Z a-z 0-9 - _ and @. - -### Directory structure - -Here is the directory structure of Shaarli and the purpose of the different files: - -``` - index.php : Main program. - application/ : Shaarli classes - ├── LinkDB.php - └── Utils.php - tests/ : Shaarli unitary & functional tests - ├── LinkDBTest.php - ├── utils # utilities to ease testing - │ └── ReferenceLinkDB.php - └── UtilsTest.php - COPYING : Shaarli license. - inc/ : Includes (libraries, CSS…) - ├── awesomplete.*: tags autocompletion library - ├── blazy.*: picture wall lazy image loading library - ├── shaarli.css, reset.css : Shaarli stylesheet. - ├── qr.* : qr code generation library - └──rain.tpl.class.php : RainTPL templating library. - tpl/ : RainTPL templates for Shaarli. They are used to build the pages. - images/ : Images and icons used in Shaarli. - data/ : Directory where data is stored (bookmark database, configuration, logs, banlist…) - ├── config.php : Shaarli configuration (login, password, timezone, title…) - ├── datastore.php : Your link database (compressed). - ├── ipban.php : IP address ban system data. - ├── lastupdatecheck.txt : Update check timestamp file (used to check every 24 hours if a new version of Shaarli is available). - └──log.txt : login/IPban log. - cache/ : Directory containing the thumbnails cache. This directory is automatically created. You can erase it anytime you want. - tmp/ : Temporary directory for compiled RainTPL templates. This directory is automatically created. You can erase it anytime you want. -``` - -### Development - - * [Contributing to Shaarli](https://github.com/shaarli/Shaarli/tree/master/CONTRIBUTING.md) - * [Running unit tests](Running-unit-tests) - * Patches should try to stick to the [PHP Standard Recommendations](http://www.php-fig.org/psr/) (PSR), especially: - * [PSR-1](http://www.php-fig.org/psr/psr-1/) - Basic Coding Standard - * [PSR-2](http://www.php-fig.org/psr/psr-2/) - Coding Style Guide - -### Why not use a real database ? Files are slow ! - -Does browsing [this page](http://sebsauvage.net/links/) feel slow ? Try browsing older pages, too. - -It's not slow at all, is it ? And don't forget the database contains more than 16000 links, and it's on a shared host, with 32000 visitors/day for my website alone. And it's still damn fast. Why ? - -The data file is only 3.7 Mb. It's read 99% of the time, and is probably already in the operation system disk cache. So generating a page involves no I/O at all most of the time. - -# Wiki - TODO - * translate (new page can be called Home.fr, Home.es ... and linked from Home) - * add more screenshots - * add developer documentation (storage architecture, classes and functions, security handling, ...) \ No newline at end of file diff --git a/doc/Plugin-System.html b/doc/Plugin-System.html new file mode 100644 index 0000000..6d08d85 --- /dev/null +++ b/doc/Plugin-System.html @@ -0,0 +1,499 @@ + + + + + + + Shaarli - Plugin System + + + + + + + +

    Plugin System

    +
    +

    Note: Plugin current status - in developpement (not merged into master).

    +
    +

    I am a user. Plugin User Guide.

    +

    I am a developper. Developper API.

    +

    I am a template designer. Guide for template designer.

    +

    Plugin User Guide

    +

    Manage plugins

    +

    In config.php, change $GLOBALS'config'['ENABLED_PLUGINS'] array:

    +
    $GLOBALS['config'['ENABLED_PLUGINS']]('ENABLED_PLUGINS'].html)
    +

    Full list:

    +
    $GLOBALS['config'['ENABLED_PLUGINS'] = array(]('ENABLED_PLUGINS']-=-array(.html)
+    'qrcode', 'archiveorg', 'readityourself', 'playvideos',
+    'wallabag', 'markdown', 'addlink_toolbar',
+);
    +

    List of plugins

    +

    Plugin maintained by the community:

    +
      +
    • Archive.org - add a clickable icon to every link to archive.org.
      • +
    • Addlink in toolbar - add a field to paste new links URL in toolbar.
      • +
    • Markdown - write and display Shaare in Markdown.
      • +
    • Play videos - popup to play all videos displayed in linklist.
      • +
    • QRCode - add a clickable icon generating a QRCode for every link.
      • +
    • ReadItYourself - add a clickable icon for ReadItYourself.
      • +
    • Wallabag - add a clickable icon for Wallabag.
      • +
    +

    Developper API

    +

    What can I do with plugins?

    +

    The plugin system let you:

    +
      +
    • insert content into specific places across templates.
      • +
    • alter data before templates rendering.
      • +
    • alter data before saving new links.
      • +
    +

    How can I create a plugin for Shaarli?

    +

    First, chose a plugin name, such as demo_plugin.

    +

    Under plugin folder, create a folder named with your plugin name. Then create a .php file in that folder.

    +

    You should have the following tree view:

    +
    | index.php
+| plugins/
+|---| demo_plugin/
+|   |---| demo_plugin.php
    +

    Understanding hooks

    +

    A plugin is a set of functions. Each function will be triggered by the plugin system at certain point in Shaarli execution.

    +

    These functions need to be named with this pattern:

    +
    hook_<plugin_name>_<hook_name>
    +

    For exemple, if my plugin want to add data to the header, this function is needed:

    +
    hook_demo_plugin_render_header()
    +

    If this function is declared, and the plugin enabled, it will be called every time Shaarli is rendering the header.

    +

    Plugin's data

    +

    Parameters

    +

    Every hook function has a $data parameter. Its content differs for each hooks.

    +

    This parameter needs to be returned every time, otherwise data is lost.

    +
    return $data;
    +

    Filling templates placeholder

    +

    Template placeholders are displayed in template in specific places.

    +

    RainTPL displays every element contained in the placeholder's array. These element can be added by plugins.

    +

    For example, let's add a value in the placeholder top_placeholder which is displayed at the top of my page:

    +
    $data['top_placeholder'[] = 'My content';](]-=-'My-content';.html)
+# OR
+array_push($data['top_placeholder'], 'My', 'content');[](.html)
+
+return $data;
    +

    Data manipulation

    +

    When a page is displayed, every variable send to the template engine is passed to plugins before that in $data.

    +

    The data contained by this array can be altered before template rendering.

    +

    For exemple, in linklist, it is possible to alter every title:

    +
    // mind the reference if you want $data to be altered
+foreach ($data['links'] as &$value) {[](.html)
+    // String reverse every title.
+    $value['title'] = strrev($value['title']);[](.html)
+}
+
+return $data;
    +

    It's not working!

    +

    Use demo_plugin as a functional example. It covers most of the plugin system features.

    +

    If it's still not working, please open an issue.

    +

    Hooks

    +
    Disable public links + +
    Update:
    Disable public linksHide public links -
    Timezone:'.$timezone_form.'
    Timezone:'.$timezone_form.'
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    HooksDescription
    render_headerAllow plugin to add content in page headers.
    render_includesAllow plugin to include their own CSS files.
    render_footerAllow plugin to add content in page footer and include their own JS files.
    render_linklistIt allows to add content at the begining and end of the page, after every link displayed and to alter link data.
    render_editlinkAllow to add fields in the form, or display elements.
    render_toolsAllow to add content at the end of the page.
    render_picwallAllow to add content at the top and bottom of the page.
    render_tagcloudAllow to add content at the top and bottom of the page.
    render_dailyAllow to add content at the top and bottom of the page, the bottom of each link and to alter data.
    savelinkAllow to alter the link being saved in the datastore.
    +

    render_header

    +

    Triggered on every page.

    +

    Allow plugin to add content in page headers.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _PAGE_: current target page (eg: linklist, picwall, etc.).
      • +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • buttons_toolbar: after the list of buttons in the header.
      • +
    +

    buttons_toolbar_example

    +
      +
    • fields_toolbar: after search fields in the header.
      • +
    +
    +

    Note: This will only be called in linklist.

    +
    +

    fields_toolbar_example

    +

    render_includes

    +

    Triggered on every page.

    +

    Allow plugin to include their own CSS files.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _PAGE_: current target page (eg: linklist, picwall, etc.).
      • +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • css_files: called after loading default CSS.
      • +
    +
    +

    Note: only add the path of the CSS file. E.g: plugins/demo_plugin/custom_demo.css.

    +
    + +

    Triggered on every page.

    +

    Allow plugin to add content in page footer and include their own JS files.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _PAGE_: current target page (eg: linklist, picwall, etc.).
      • +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • text: called after the end of the footer text.
      • +
    +

    text_example

    +
      +
    • js_files: called at the end of the page, to include custom JS scripts.
      • +
    +
    +

    Note: only add the path of the JS file. E.g: plugins/demo_plugin/custom_demo.js.

    +
    + +

    Triggered when linklist is displayed (list of links, permalink, search, tag filtered, etc.).

    +

    It allows to add content at the begining and end of the page, after every link displayed and to alter link data.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    • All templates data, including links.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • action_plugin: next to the button "private only" at the top and bottom of the page.
      • +
    +

    action_plugin_example

    +
      +
    • link_plugin: for every link, between permalink and link URL.
      • +
    +

    link_plugin_example

    +
      +
    • plugin_start_zone: before displaying the template content.
      • +
    +

    plugin_start_zone_example

    +
      +
    • plugin_end_zone: after displaying the template content.
      • +
    +

    plugin_end_zone_example

    + +

    Triggered when the link edition form is displayed.

    +

    Allow to add fields in the form, or display elements.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • All templates data.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • edit_link_plugin: after tags field.
      • +
    +

    edit_link_plugin_example

    +

    render_tools

    +

    Triggered when the "tools" page is displayed.

    +

    Allow to add content at the end of the page.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • All templates data.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • tools_plugin: at the end of the page.
      • +
    +

    tools_plugin_example

    +

    render_picwall

    +

    Triggered when picwall is displayed.

    +

    Allow to add content at the top and bottom of the page.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    • All templates data.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +

    • plugin_start_zone: before displaying the template content.

      • +

    • plugin_end_zone: after displaying the template content.

      • +
    +

    plugin_start_end_zone_example

    +

    render_tagcloud

    +

    Triggered when tagcloud is displayed.

    +

    Allow to add content at the top and bottom of the page.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    • All templates data.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +

    • plugin_start_zone: before displaying the template content.

      • +

    • plugin_end_zone: after displaying the template content.

      • +
    +

    plugin_start_end_zone_example

    +

    render_daily

    +

    Triggered when tagcloud is displayed.

    +

    Allow to add content at the top and bottom of the page, the bottom of each link and to alter data.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    • All templates data, including links.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • link_plugin: used at bottom of each link.
      • +
    +

    link_plugin_example

    +
      +

    • plugin_start_zone: before displaying the template content.

      • +

    • plugin_end_zone: after displaying the template content.

      • +
    + +

    Triggered when a link is save (new link or edit).

    +

    Allow to alter the link being saved in the datastore.

    +
    Data
    +

    $data is an array containing the link being saved:

    +
      +
    • title
      • +
    • url
      • +
    • description
      • +
    • linkdate
      • +
    • private
      • +
    • tags
      • +
    +

    Guide for template designer

    +

    Placeholder system

    +

    In order to make plugins work with every custom themes, you need to add variable placeholder in your templates.

    +

    It's a RainTPL loop like this:

    +
    {loop="$plugin_variable"}
+    {$value}
+{/loop}
    +

    You should enable demo_plugin for testing purpose, since it uses every placeholder available.

    +

    List of placeholders

    +

    page.header.html

    +

    At the end of the menu:

    +
    {loop="$plugins_header.buttons_toolbar"}
+    {$value}
+{/loop}
    +

    includes.html

    +

    At the end of the file:

    +
    {loop="$plugins_includes.css_files"}
+<link type="text/css" rel="stylesheet" href="{$value}#"/>
+{/loop}
    +

    page.footer.html

    +

    At the end of your footer notes:

    +
    {loop="$plugins_footer.text"}
+     {$value}
+{/loop}
    +

    At the end of file:

    +
    {loop="$plugins_footer.js_files"}
+     <script src="{$value}#"></script>
+{/loop}
    +

    linklist.html

    +

    After search fields:

    +
    {loop="$plugins_header.fields_toolbar"}
+     {$value}
+{/loop}
    +

    Before displaying the link list (after paging):

    +
    {loop="$plugin_start_zone"}
+     {$value}
+{/loop}
    +

    For every links (icons):

    +
    {loop="$value.link_plugin"}
+    <span>{$value}</span>
+{/loop}
    +

    Before end paging:

    +
    {loop="$plugin_end_zone"}
+     {$value}
+{/loop}
    +

    linklist.paging.html

    +

    After the "private only" icon:

    +
    {loop="$action_plugin"}
+     {$value}
+{/loop}
    +

    editlink.html

    +

    After tags field:

    +
    {loop="$edit_link_plugin"}
+     {$value}
+{/loop}
    +

    tools.html

    +

    After the last tool:

    +
    {loop="$tools_plugin"}
+     {$value}
+{/loop}
    +

    picwall.html

    +

    Top:

    +
    <div id="plugin_zone_start_picwall" class="plugin_zone">
+    {loop="$plugin_start_zone"}
+        {$value}
+    {/loop}
+</div>
    +

    Bottom:

    +
    <div id="plugin_zone_end_picwall" class="plugin_zone">
+    {loop="$plugin_end_zone"}
+        {$value}
+    {/loop}
+</div>
    +

    tagcloud.html

    +

    Top:

    +
       <div id="plugin_zone_start_tagcloud" class="plugin_zone">
+        {loop="$plugin_start_zone"}
+            {$value}
+        {/loop}
+    </div>
    +

    Bottom:

    +
        <div id="plugin_zone_end_tagcloud" class="plugin_zone">
+        {loop="$plugin_end_zone"}
+            {$value}
+        {/loop}
+    </div>
    +

    daily.html

    +

    Top:

    +
    <div id="plugin_zone_start_picwall" class="plugin_zone">
+     {loop="$plugin_start_zone"}
+         {$value}
+     {/loop}
+</div>
    +

    After every link:

    +
    <div class="dailyEntryFooter">
+     {loop="$link.link_plugin"}
+          {$value}
+     {/loop}
+</div>
    +

    Bottom:

    +
    <div id="plugin_zone_end_picwall" class="plugin_zone">
+    {loop="$plugin_end_zone"}
+        {$value}
+    {/loop}
+</div>
    + + diff --git a/doc/Plugin-System.md b/doc/Plugin-System.md new file mode 100644 index 0000000..8cba666 --- /dev/null +++ b/doc/Plugin-System.md @@ -0,0 +1,590 @@ +#Plugin System +> Note: Plugin current status - in developpement (not merged into master). + +[**I am a user.** Plugin User Guide.](#plugin-user-guide)[](.html) + +[**I am a developper.** Developper API.](#developper-api)[](.html) + +[**I am a template designer.** Guide for template designer.](#guide-for-template-designer)[](.html) + +## Plugin User Guide + +### Manage plugins + +In `config.php`, change $GLOBALS['config'['ENABLED_PLUGINS'] array:]('ENABLED_PLUGINS']-array:.html) + +```php +$GLOBALS['config'['ENABLED_PLUGINS']]('ENABLED_PLUGINS'].html) +``` + +Full list: + +```php +$GLOBALS['config'['ENABLED_PLUGINS'] = array(]('ENABLED_PLUGINS']-=-array(.html) + 'qrcode', 'archiveorg', 'readityourself', 'playvideos', + 'wallabag', 'markdown', 'addlink_toolbar', +); +``` + +### List of plugins + +Plugin maintained by the community: + + * Archive.org - add a clickable icon to every link to archive.org. + * Addlink in toolbar - add a field to paste new links URL in toolbar. + * Markdown - write and display Shaare in Markdown. + * Play videos - popup to play all videos displayed in linklist. + * QRCode - add a clickable icon generating a QRCode for every link. + * ReadItYourself - add a clickable icon for ReadItYourself. + * Wallabag - add a clickable icon for Wallabag. + +## Developper API + +### What can I do with plugins? + +The plugin system let you: + + * insert content into specific places across templates. + * alter data before templates rendering. + * alter data before saving new links. + +### How can I create a plugin for Shaarli? + +First, chose a plugin name, such as `demo_plugin`. + +Under `plugin` folder, create a folder named with your plugin name. Then create a .php file in that folder. + +You should have the following tree view: + +``` +| index.php +| plugins/ +|---| demo_plugin/ +| |---| demo_plugin.php +``` + +### Understanding hooks + +A plugin is a set of functions. Each function will be triggered by the plugin system at certain point in Shaarli execution. + +These functions need to be named with this pattern: + +``` +hook__ +``` + +For exemple, if my plugin want to add data to the header, this function is needed: + + hook_demo_plugin_render_header() + +If this function is declared, and the plugin enabled, it will be called every time Shaarli is rendering the header. + +### Plugin's data + +#### Parameters + +Every hook function has a `$data` parameter. Its content differs for each hooks. + +**This parameter needs to be returned every time**, otherwise data is lost. + + return $data; + +#### Filling templates placeholder + +Template placeholders are displayed in template in specific places. + +RainTPL displays every element contained in the placeholder's array. These element can be added by plugins. + +For example, let's add a value in the placeholder `top_placeholder` which is displayed at the top of my page: + +```php +$data['top_placeholder'[] = 'My content';](]-=-'My-content';.html) +# OR +array_push($data['top_placeholder'], 'My', 'content');[](.html) + +return $data; +``` + +#### Data manipulation + +When a page is displayed, every variable send to the template engine is passed to plugins before that in `$data`. + +The data contained by this array can be altered before template rendering. + +For exemple, in linklist, it is possible to alter every title: + +```php +// mind the reference if you want $data to be altered +foreach ($data['links'] as &$value) {[](.html) + // String reverse every title. + $value['title'] = strrev($value['title']);[](.html) +} + +return $data; +``` + +### It's not working! + +Use `demo_plugin` as a functional example. It covers most of the plugin system features. + +If it's still not working, please [open an issue](https://github.com/shaarli/Shaarli/issues/new).[](.html) + +### Hooks + +| Hooks | Description | +| ------------- |:-------------:| +| [render_header](#render_header) | Allow plugin to add content in page headers. |[](.html) +| [render_includes](#render_includes) | Allow plugin to include their own CSS files. |[](.html) +| [render_footer](#render_footer) | Allow plugin to add content in page footer and include their own JS files. | [](.html) +| [render_linklist](#render_linklist) | It allows to add content at the begining and end of the page, after every link displayed and to alter link data. |[](.html) +| [render_editlink](#render_editlink) | Allow to add fields in the form, or display elements. |[](.html) +| [render_tools](#render_tools) | Allow to add content at the end of the page. |[](.html) +| [render_picwall](#render_picwall) | Allow to add content at the top and bottom of the page. |[](.html) +| [render_tagcloud](#render_tagcloud) | Allow to add content at the top and bottom of the page. |[](.html) +| [render_daily](#render_daily) | Allow to add content at the top and bottom of the page, the bottom of each link and to alter data. |[](.html) +| [savelink](#savelink) | Allow to alter the link being saved in the datastore. |[](.html) + + +#### render_header + +Triggered on every page. + +Allow plugin to add content in page headers. + +##### Data + +`$data` is an array containing: + + * `_PAGE_`: current target page (eg: `linklist`, `picwall`, etc.). + * `_LOGGEDIN_`: true if user is logged in, false otherwise. + +##### Template placeholders + +Items can be displayed in templates by adding an entry in `$data['']` array.[](.html) + +List of placeholders: + + * `buttons_toolbar`: after the list of buttons in the header. + +![buttons_toolbar_example](http://i.imgur.com/ssJUOrt.png)[](.html) + + * `fields_toolbar`: after search fields in the header. + +> Note: This will only be called in linklist. + +![fields_toolbar_example](http://i.imgur.com/3GMifI2.png)[](.html) + +#### render_includes + +Triggered on every page. + +Allow plugin to include their own CSS files. + +##### Data + +`$data` is an array containing: + + * `_PAGE_`: current target page (eg: `linklist`, `picwall`, etc.). + * `_LOGGEDIN_`: true if user is logged in, false otherwise. + +##### Template placeholders + +Items can be displayed in templates by adding an entry in `$data['']` array.[](.html) + +List of placeholders: + + * `css_files`: called after loading default CSS. + +> Note: only add the path of the CSS file. E.g: `plugins/demo_plugin/custom_demo.css`. + +#### render_footer + +Triggered on every page. + +Allow plugin to add content in page footer and include their own JS files. + +##### Data + +`$data` is an array containing: + + * `_PAGE_`: current target page (eg: `linklist`, `picwall`, etc.). + * `_LOGGEDIN_`: true if user is logged in, false otherwise. + +##### Template placeholders + +Items can be displayed in templates by adding an entry in `$data['']` array.[](.html) + +List of placeholders: + + * `text`: called after the end of the footer text. + +![text_example](http://i.imgur.com/L5S2YEH.png)[](.html) + + * `js_files`: called at the end of the page, to include custom JS scripts. + +> Note: only add the path of the JS file. E.g: `plugins/demo_plugin/custom_demo.js`. + +#### render_linklist + +Triggered when `linklist` is displayed (list of links, permalink, search, tag filtered, etc.). + +It allows to add content at the begining and end of the page, after every link displayed and to alter link data. + +##### Data + +`$data` is an array containing: + + * `_LOGGEDIN_`: true if user is logged in, false otherwise. + * All templates data, including links. + +##### Template placeholders + +Items can be displayed in templates by adding an entry in `$data['']` array.[](.html) + +List of placeholders: + + * `action_plugin`: next to the button "private only" at the top and bottom of the page. + +![action_plugin_example](http://i.imgur.com/Q12PWg0.png)[](.html) + + * `link_plugin`: for every link, between permalink and link URL. + +![link_plugin_example](http://i.imgur.com/3oDPhWx.png)[](.html) + + * `plugin_start_zone`: before displaying the template content. + +![plugin_start_zone_example](http://i.imgur.com/OVBkGy3.png)[](.html) + + * `plugin_end_zone`: after displaying the template content. + +![plugin_end_zone_example](http://i.imgur.com/6IoRuop.png)[](.html) + +#### render_editlink + +Triggered when the link edition form is displayed. + +Allow to add fields in the form, or display elements. + +##### Data + +`$data` is an array containing: + + * All templates data. + +##### Template placeholders + +Items can be displayed in templates by adding an entry in `$data['']` array.[](.html) + +List of placeholders: + + * `edit_link_plugin`: after tags field. + +![edit_link_plugin_example](http://i.imgur.com/5u17Ens.png)[](.html) + +#### render_tools + +Triggered when the "tools" page is displayed. + +Allow to add content at the end of the page. + +##### Data + +`$data` is an array containing: + + * All templates data. + +##### Template placeholders + +Items can be displayed in templates by adding an entry in `$data['']` array.[](.html) + +List of placeholders: + + * `tools_plugin`: at the end of the page. + +![tools_plugin_example](http://i.imgur.com/Bqhu9oQ.png)[](.html) + +#### render_picwall + +Triggered when picwall is displayed. + +Allow to add content at the top and bottom of the page. + +##### Data + +`$data` is an array containing: + + * `_LOGGEDIN_`: true if user is logged in, false otherwise. + * All templates data. + +##### Template placeholders + +Items can be displayed in templates by adding an entry in `$data['']` array.[](.html) + +List of placeholders: + + * `plugin_start_zone`: before displaying the template content. + + * `plugin_end_zone`: after displaying the template content. + +![plugin_start_end_zone_example](http://i.imgur.com/tVTQFER.png)[](.html) + +#### render_tagcloud + +Triggered when tagcloud is displayed. + +Allow to add content at the top and bottom of the page. + +##### Data + +`$data` is an array containing: + + * `_LOGGEDIN_`: true if user is logged in, false otherwise. + * All templates data. + +##### Template placeholders + +Items can be displayed in templates by adding an entry in `$data['']` array.[](.html) + +List of placeholders: + + * `plugin_start_zone`: before displaying the template content. + + * `plugin_end_zone`: after displaying the template content. + +![plugin_start_end_zone_example](http://i.imgur.com/vHmyT3a.png)[](.html) + +#### render_daily + +Triggered when tagcloud is displayed. + +Allow to add content at the top and bottom of the page, the bottom of each link and to alter data. + +##### Data + +`$data` is an array containing: + + * `_LOGGEDIN_`: true if user is logged in, false otherwise. + * All templates data, including links. + +##### Template placeholders + +Items can be displayed in templates by adding an entry in `$data['']` array.[](.html) + +List of placeholders: + + * `link_plugin`: used at bottom of each link. + +![link_plugin_example](http://i.imgur.com/hzhMfSZ.png)[](.html) + + * `plugin_start_zone`: before displaying the template content. + + * `plugin_end_zone`: after displaying the template content. + +#### savelink + +Triggered when a link is save (new link or edit). + +Allow to alter the link being saved in the datastore. + +##### Data + +`$data` is an array containing the link being saved: + + * title + * url + * description + * linkdate + * private + * tags + +## Guide for template designer + +### Placeholder system + +In order to make plugins work with every custom themes, you need to add variable placeholder in your templates. + +It's a RainTPL loop like this: + + {loop="$plugin_variable"} + {$value} + {/loop} + +You should enable `demo_plugin` for testing purpose, since it uses every placeholder available. + +### List of placeholders + +**page.header.html** + +At the end of the menu: + + {loop="$plugins_header.buttons_toolbar"} + {$value} + {/loop} + +**includes.html** + +At the end of the file: + +```html +{loop="$plugins_includes.css_files"} + +{/loop} +``` + +**page.footer.html** + +At the end of your footer notes: + +```html +{loop="$plugins_footer.text"} + {$value} +{/loop} +``` + +At the end of file: + +```html +{loop="$plugins_footer.js_files"} + +{/loop} +``` + +**linklist.html** + +After search fields: + +```html +{loop="$plugins_header.fields_toolbar"} + {$value} +{/loop} +``` + +Before displaying the link list (after paging): + +```html +{loop="$plugin_start_zone"} + {$value} +{/loop} +``` + +For every links (icons): + +```html +{loop="$value.link_plugin"} + {$value} +{/loop} +``` + +Before end paging: + +```html +{loop="$plugin_end_zone"} + {$value} +{/loop} +``` + +**linklist.paging.html** + +After the "private only" icon: + +```html +{loop="$action_plugin"} + {$value} +{/loop} +``` + +**editlink.html** + +After tags field: + +```html +{loop="$edit_link_plugin"} + {$value} +{/loop} +``` + +**tools.html** + +After the last tool: + +```html +{loop="$tools_plugin"} + {$value} +{/loop} +``` + +**picwall.html** + +Top: + +```html +
    + {loop="$plugin_start_zone"} + {$value} + {/loop} +
    +``` + +Bottom: + +```html +
    + {loop="$plugin_end_zone"} + {$value} + {/loop} +
    +``` + +**tagcloud.html** + +Top: + +```html +
    + {loop="$plugin_start_zone"} + {$value} + {/loop} +
    +``` + +Bottom: + +```html +
    + {loop="$plugin_end_zone"} + {$value} + {/loop} +
    +``` + +**daily.html** + +Top: + +```html +
    + {loop="$plugin_start_zone"} + {$value} + {/loop} +
    +``` + +After every link: + +```html +
    + {loop="$link.link_plugin"} + {$value} + {/loop} +
    +``` + +Bottom: + +```html +
    + {loop="$plugin_end_zone"} + {$value} + {/loop} +
    +``` diff --git a/doc/RSS-feeds.html b/doc/RSS-feeds.html new file mode 100644 index 0000000..4a9b7a0 --- /dev/null +++ b/doc/RSS-feeds.html @@ -0,0 +1,75 @@ + + + + + + + Shaarli - RSS feeds + + + + + + +

    RSS feeds

    +

    RSS Feeds or Picture Wall for a specific search/tag

    +

    It is possible to filter RSS/ATOM feeds and Picture Wall on a Shaarli to only display results of a specific search, or for a specific tag.

    +

    For example, if you want to subscribe only to links tagged photography:

    +
      +
    • Go to the desired Shaarli instance.
      • +
    • Search for the photography tag in the Filter by tag box. Links tagged photography are displayed.
      • +
    • Click on the RSS Feed button.
      • +
    • You are presented with an RSS feed showing only these links. Subscribe to it to receive only updates with this tag.
      • +
    • The same method also works for a full-text search (Search box) and for the Picture Wall (want to only see pictures about nature?)
      • +
    • You can also build the URLs manually: +
        +
      • https://my.shaarli.domain/?do=rss&searchtags=nature
        • +
      • https://my.shaarli.domain/links/?do=picwall&searchterm=poney
        • +
      • +
    +

    (images/rss-filter-2.png)

    + + diff --git a/doc/RSS-feeds.md b/doc/RSS-feeds.md new file mode 100644 index 0000000..764b3a4 --- /dev/null +++ b/doc/RSS-feeds.md @@ -0,0 +1,15 @@ +#RSS feeds +### RSS Feeds or Picture Wall for a specific search/tag +It is possible to filter RSS/ATOM feeds and Picture Wall on a Shaarli to **only display results of a specific search, or for a specific tag**. + +For example, if you want to subscribe only to links tagged `photography`: +- Go to the desired Shaarli instance. +- Search for the `photography` tag in the _Filter by tag_ box. Links tagged `photography` are displayed. +- Click on the `RSS Feed` button. +- You are presented with an RSS feed showing only these links. Subscribe to it to receive only updates with this tag. +- The same method **also works for a full-text search** (_Search_ box) **and for the Picture Wall** (want to only see pictures about `nature`?) +- You can also build the URLs manually: + - `https://my.shaarli.domain/?do=rss&searchtags=nature` + - `https://my.shaarli.domain/links/?do=picwall&searchterm=poney` + +![(images/rss-filter-1.png) !]((images/rss-filter-1.png)-!.html)(images/rss-filter-2.png) diff --git a/doc/Security.html b/doc/Security.html new file mode 100644 index 0000000..1fbbabd --- /dev/null +++ b/doc/Security.html @@ -0,0 +1,107 @@ + + + + + + + Shaarli - Security + + + + + + + +

    Security

    +

    Client browser

    +
      +
    • Shaarli relies on HTTP_REFERER for some functions (like redirects and clicking on tags). If you have disabled or masqueraded HTTP_REFERER in your browser, some features of Shaarli may not work
      • +
    +

    PHP

    +
      +
    • magic_quotes is an horrible option of PHP which is often activated on servers. No serious developer should rely on this horror to secure their code against SQL injections. You should disable it (and Shaarli expects this option to be disabled). Nevertheless, I have added code to cope with magic_quotes on, so you should not be bothered even on crappy hosts.
      • +
    +

    Server and sessions

    +
      +
    • Directories are protected using .htaccess files
      • +
    • Forms are protected against XSRF (Cross-site requests forgery):
      • +
    • Forms which act on data (save,delete…) contain a token generated by the server.
      • +
    • Any posted form which does not contain a valid token is rejected.
      • +
    • Any token can only be used once.
      • +
    • Tokens are attached to the session and cannot be reused in another session.
      • +
    • Sessions automatically expire after 60 minutes.
      • +
    • Sessions are protected against hijacking: the session ID cannot be used from a different IP address.
      • +
    +

    Shaarli datastore and configuration

    +
      +
    • The password is salted, hashed and stored in the data subdirectory, in a PHP file, and protected by htaccess. Even if the webserver does not support htaccess, the hash is not readable by URL. Even if the .php file is stolen, the password cannot deduced from the hash. The salt prevents rainbow-tables attacks.
      • +
    • Links are stored as an associative array which is serialized, compressed (with deflate), base64-encoded and saved as a comment in a .php file.
      • +
    • Even if the server does not support .htaccess files, the data file will still not be readable by URL.
      • +

    • The database looks like this:

      +
      <?php /* zP1ZjxxJtiYIvvevEPJ2lDOaLrZv7o...
+...ka7gaco/Z+TFXM2i7BlfMf8qxpaSSYfKlvqv/x8= */ ?>
      • +

    • Small hashes are used to make a link to an entry in Shaarli. They are unique. In fact, the date of the items (eg. 20110923_150523) is hashed with CRC32, then converted to base64 and some characters are replaced. They are always 6 characters longs and use only A-Z a-z 0-9 - _ and @.

      • +
    + + diff --git a/doc/Security.md b/doc/Security.md new file mode 100644 index 0000000..7947460 --- /dev/null +++ b/doc/Security.md @@ -0,0 +1,28 @@ +#Security +## Client browser +* Shaarli relies on `HTTP_REFERER` for some functions (like redirects and clicking on tags). If you have disabled or masqueraded `HTTP_REFERER` in your browser, some features of Shaarli may not work + +## PHP +* `magic_quotes` is an horrible option of PHP which is often activated on servers. No serious developer should rely on this horror to secure their code against SQL injections. You should disable it (and Shaarli expects this option to be disabled). Nevertheless, I have added code to cope with `magic_quotes` on, so you should not be bothered even on crappy hosts. + +## Server and sessions +* Directories are protected using `.htaccess` files +* Forms are protected against XSRF (Cross-site requests forgery): + * Forms which act on data (save,delete…) contain a token generated by the server. + * Any posted form which does not contain a valid token is rejected. + * Any token can only be used once. + * Tokens are attached to the session and cannot be reused in another session. +* Sessions automatically expire after 60 minutes. +* Sessions are protected against hijacking: the session ID cannot be used from a different IP address. + +## Shaarli datastore and configuration +* The password is salted, hashed and stored in the data subdirectory, in a PHP file, and protected by htaccess. Even if the webserver does not support htaccess, the hash is not readable by URL. Even if the .php file is stolen, the password cannot deduced from the hash. The salt prevents rainbow-tables attacks. +* Links are stored as an associative array which is serialized, compressed (with deflate), base64-encoded and saved as a comment in a `.php` file. +* Even if the server does not support `.htaccess` files, the data file will still not be readable by URL. +* The database looks like this: +```php + +``` + +* Small hashes are used to make a link to an entry in Shaarli. They are unique. In fact, the date of the items (eg. `20110923_150523`) is hashed with CRC32, then converted to base64 and some characters are replaced. They are always 6 characters longs and use only `A-Z a-z 0-9 - _` and `@`. diff --git a/doc/Server-configuration.html b/doc/Server-configuration.html new file mode 100644 index 0000000..de6bf48 --- /dev/null +++ b/doc/Server-configuration.html @@ -0,0 +1,371 @@ + + + + + + + Shaarli - Server configuration + + + + + + + +

    Server configuration

    +

    Example virtual host configurations for popular web servers

    + +

    Prerequisites

    +
      +
    • Shaarli is installed in a directory readable/writeable by the user
      • +
    • the correct read/write permissions have been granted to the web server user and/or group
      • +
    • for HTTPS / SSL:
      • +
    • a key pair (public, private) and a certificate have been generated
      • +
    • the appropriate server SSL extension is installed and active
      • +
    +

    Related guides:

    + +

    Apache

    +

    Minimal

    +
    <VirtualHost *:80>
+    ServerName   shaarli.my-domain.org
+    DocumentRoot /absolute/path/to/shaarli/
+</VirtualHost>
    +

    Debug - Log all the things!

    +

    This configuration will log both Apache and PHP errors, which may prove useful to identify server configuration errors.

    +

    See:

    + +
    <VirtualHost *:80>
+    ServerName   shaarli.my-domain.org
+    DocumentRoot /absolute/path/to/shaarli/
+
+    LogLevel  warn
+    ErrorLog  /var/log/apache2/shaarli-error.log
+    CustomLog /var/log/apache2/shaarli-access.log combined
+
+    php_flag  log_errors on
+    php_flag  display_errors on
+    php_value error_reporting 2147483647
+    php_value error_log /var/log/apache2/shaarli-php-error.log
+</VirtualHost>
    +

    Standard - Keep access and error logs

    +
    <VirtualHost *:80>
+    ServerName   shaarli.my-domain.org
+    DocumentRoot /absolute/path/to/shaarli/
+
+    LogLevel  warn
+    ErrorLog  /var/log/apache2/shaarli-error.log
+    CustomLog /var/log/apache2/shaarli-access.log combined
+</VirtualHost>
    +

    Paranoid - Redirect HTTP (:80) to HTTPS (:443)

    +

    See Server-side TLS (Mozilla).

    +
    <VirtualHost *:443>
+    ServerName   shaarli.my-domain.org
+    DocumentRoot /absolute/path/to/shaarli/
+
+    SSLEngine             on
+    SSLCertificateFile    /absolute/path/to/the/website/certificate.crt
+    SSLCertificateKeyFile /absolute/path/to/the/website/key.key
+
+    <Directory /absolute/path/to/shaarli/>
+        AllowOverride All
+        Options Indexes FollowSymLinks MultiViews
+        Order allow,deny
+        allow from all
+    </Directory>
+
+    LogLevel  warn
+    ErrorLog  /var/log/apache2/shaarli-error.log
+    CustomLog /var/log/apache2/shaarli-access.log combined
+</VirtualHost>
+<VirtualHost *:80>
+    ServerName   shaarli.my-domain.org
+    Redirect 301 / https://shaarli.my-domain.org
+
+    LogLevel  warn
+    ErrorLog  /var/log/apache2/shaarli-error.log
+    CustomLog /var/log/apache2/shaarli-access.log combined
+</VirtualHost>
    +

    LightHttpd

    +

    Nginx

    +

    Foreword

    +

    Nginx does not natively interpret PHP scripts; to this effect, we will run a FastCGI service, to which Nginx's FastCGI module will proxy all requests to PHP resources.

    +

    Required packages:

    + +

    Official documentation:

    + +

    Community resources:

    + +

    Common setup

    +

    Once Nginx and PHP-FPM are installed, we need to ensure:

    +
      +
    • Nginx and PHP-FPM are running using the same user and group
      • +
    • both these user and group have +
        +
      • read permissions for Shaarli resources
        • +
      • execute permissions for Shaarli directories AND their parent directories
        • +
      • +
    +

    On a production server:

    +
      +
    • user:group will likely be http:http, www:www or www-data:www-data
      • +
    • files will be located under /var/www, /var/http or /usr/share/nginx
      • +
    +

    On a development server:

    +
      +
    • files may be located in a user's home directory
      • +
    • in this case, make sure both Nginx and PHP-FPM are running as the local user/group!
      • +
    +

    For all following examples, a development configuration will be used:

    +
      +
    • user:group = john:users,
      • +
    +

    which corresponds to the following service configuration:

    +
    ; /etc/php/php-fpm.conf
+user = john
+group = users
+
+[...][](.html)
+listen.owner = john
+listen.group = users
    +
    # /etc/nginx/nginx.conf
+user john users;
+
+http {
+    [...][](.html)
+}
    +

    Minimal

    +

    WARNING: Use for development only!

    +
    user john users;
+worker_processes  1;
+events {
+    worker_connections  1024;
+}
+
+http {
+    include            mime.types;
+    default_type       application/octet-stream;
+    keepalive_timeout  20;
+
+    index index.html index.php;
+
+    server {
+        listen       80;
+        server_name  localhost;
+        root         /home/john/web;
+
+        access_log  /var/log/nginx/access.log;
+        error_log   /var/log/nginx/error.log;
+
+        location /shaarli/ {
+            access_log  /var/log/nginx/shaarli.access.log;
+            error_log   /var/log/nginx/shaarli.error.log;
+        }
+
+        location ~ (index)\.php$ {
+            fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
+            fastcgi_index  index.php;
+            include        fastcgi.conf;
+        }
+    }
+}
    +

    Modular

    +

    The previous setup is sufficient for development purposes, but has several major caveats:

    +
      +
    • every content that does not match the PHP rule will be sent to client browsers: +
        +
      • dotfiles - in our case, .htaccess
        • +
      • temporary files, e.g. Vim or Emacs files: index.php~
        • +
      • +
    • asset / static resource caching is not optimized
      • +
    • if serving several PHP sites, there will be a lot of duplication: location /shaarli/, location /mysite/, etc.
      • +
    +

    To solve this, we will split Nginx configuration in several parts, that will be included when needed:

    +
    # /etc/nginx/deny.conf
+location ~ /\. {
+    # deny access to dotfiles
+    access_log off;
+    log_not_found off;
+    deny all;
+}
+
+location ~ ~$ {
+    # deny access to temp editor files, e.g. "script.php~"
+    access_log off;
+    log_not_found off;
+    deny all;
+}
    +
    # /etc/nginx/php.conf
+location ~ (index)\.php$ {
+    # proxy PHP requests to PHP-FPM
+    fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
+    fastcgi_index  index.php;
+    include        fastcgi.conf;
+}
    +
    # /etc/nginx/static_assets.conf
+location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
+    expires    max;
+    add_header Pragma public;
+    add_header Cache-Control "public, must-revalidate, proxy-revalidate";
+}
    +
    # /etc/nginx/nginx.conf
+[...][](.html)
+
+http {
+    [...][](.html)
+
+    root        /home/john/web;
+    access_log  /var/log/nginx/access.log;
+    error_log   /var/log/nginx/error.log;
+
+    server {
+        # virtual host for a first domain
+        listen       80;
+        server_name  my.first.domain.org;
+
+        location /shaarli/ {
+            access_log  /var/log/nginx/shaarli.access.log;
+            error_log   /var/log/nginx/shaarli.error.log;
+        }
+
+        include deny.conf;
+        include static_assets.conf;
+        include php.conf;
+    }
+
+    server {
+        # virtual host for a second domain
+        listen       80;
+        server_name  second.domain.com;
+
+        location /minigal/ {
+            access_log  /var/log/nginx/minigal.access.log;
+            error_log   /var/log/nginx/minigal.error.log;
+        }
+
+        include deny.conf;
+        include static_assets.conf;
+        include php.conf;
+    }
+}
    +

    Redirect HTTP to HTTPS

    +

    Assuming you have generated a (self-signed) key and certificate, and they are located under /home/john/ssl/localhost.{key,crt}, it is pretty straightforward to set an HTTP (:80) to HTTPS (:443) redirection to force SSL/TLS usage.

    +
    # /etc/nginx/nginx.conf
+[...][](.html)
+
+http {
+    [...][](.html)
+
+    index index.html index.php;
+
+    root        /home/john/web;
+    access_log  /var/log/nginx/access.log;
+    error_log   /var/log/nginx/error.log;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        return 301 https://localhost$request_uri;
+    }
+
+    server {
+        listen       443 ssl;
+        server_name  localhost;
+
+        ssl_certificate      /home/john/ssl/localhost.crt;
+        ssl_certificate_key  /home/john/ssl/localhost.key;
+
+        location /shaarli/ {
+            access_log  /var/log/nginx/shaarli.access.log;
+            error_log   /var/log/nginx/shaarli.error.log;
+        }
+
+        include deny.conf;
+        include static_assets.conf;
+        include php.conf;
+    }
+}
    + + diff --git a/doc/Server-configuration.md b/doc/Server-configuration.md new file mode 100644 index 0000000..c9ec4e1 --- /dev/null +++ b/doc/Server-configuration.md @@ -0,0 +1,321 @@ +#Server configuration +*Example virtual host configurations for popular web servers* + +- [Apache](#apache)[](.html) +- [LightHttpd](#lighthttpd) (empty)[](.html) +- [Nginx](#nginx)[](.html) + +## Prerequisites +* Shaarli is installed in a directory readable/writeable by the user +* the correct read/write permissions have been granted to the web server _user and/or group_ +* for HTTPS / SSL: + * a key pair (public, private) and a certificate have been generated + * the appropriate server SSL extension is installed and active + +Related guides: +* [How to Create Self-Signed SSL Certificates with OpenSSL](http://www.xenocafe.com/tutorials/linux/centos/openssl/self_signed_certificates/index.php)[](.html) +* [How do I create my own Certificate Authority?](https://workaround.org/certificate-authority)[](.html) + +## Apache +### Minimal +```apache + + ServerName shaarli.my-domain.org + DocumentRoot /absolute/path/to/shaarli/ + +``` +### Debug - Log all the things! +This configuration will log both Apache and PHP errors, which may prove useful to identify server configuration errors. + +See: +* [Apache/PHP - error log per VirtualHost](http://stackoverflow.com/q/176) (StackOverflow)[](.html) +* [PHP: php_value vs php_admin_value and the use of php_flag explained](PHP: php_value vs php_admin_value and the use of php_flag explained)[](.html) + +```apache + + ServerName shaarli.my-domain.org + DocumentRoot /absolute/path/to/shaarli/ + + LogLevel warn + ErrorLog /var/log/apache2/shaarli-error.log + CustomLog /var/log/apache2/shaarli-access.log combined + + php_flag log_errors on + php_flag display_errors on + php_value error_reporting 2147483647 + php_value error_log /var/log/apache2/shaarli-php-error.log + +``` + +### Standard - Keep access and error logs +```apache + + ServerName shaarli.my-domain.org + DocumentRoot /absolute/path/to/shaarli/ + + LogLevel warn + ErrorLog /var/log/apache2/shaarli-error.log + CustomLog /var/log/apache2/shaarli-access.log combined + +``` + +### Paranoid - Redirect HTTP (:80) to HTTPS (:443) +See [Server-side TLS](https://wiki.mozilla.org/Security/Server_Side_TLS#Apache) (Mozilla).[](.html) + +```apache + + ServerName shaarli.my-domain.org + DocumentRoot /absolute/path/to/shaarli/ + + SSLEngine on + SSLCertificateFile /absolute/path/to/the/website/certificate.crt + SSLCertificateKeyFile /absolute/path/to/the/website/key.key + + + AllowOverride All + Options Indexes FollowSymLinks MultiViews + Order allow,deny + allow from all + + + LogLevel warn + ErrorLog /var/log/apache2/shaarli-error.log + CustomLog /var/log/apache2/shaarli-access.log combined + + + ServerName shaarli.my-domain.org + Redirect 301 / https://shaarli.my-domain.org + + LogLevel warn + ErrorLog /var/log/apache2/shaarli-error.log + CustomLog /var/log/apache2/shaarli-access.log combined + +``` + +## LightHttpd + +## Nginx +### Foreword +Nginx does not natively interpret PHP scripts; to this effect, we will run a [FastCGI](https://en.wikipedia.org/wiki/FastCGI) service, to which Nginx's FastCGI module will proxy all requests to PHP resources.[](.html) + +Required packages: +- [nginx](http://nginx.org)[](.html) +- [php-fpm](http://php-fpm.org) - PHP FastCGI Process Manager[](.html) + +Official documentation: +- [Beginner's guide](http://nginx.org/en/docs/beginners_guide.html)[](.html) +- [ngx_http_fastcgi_module](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html)[](.html) +- [Pitfalls](http://wiki.nginx.org/Pitfalls)[](.html) + +Community resources: +- [Server-side TLS (Nginx)](https://wiki.mozilla.org/Security/Server_Side_TLS#Nginx) (Mozilla)[](.html) +- [PHP configuration examples](http://kbeezie.com/nginx-configuration-examples/) (Karl Blessing)[](.html) + +### Common setup +Once Nginx and PHP-FPM are installed, we need to ensure: +- Nginx and PHP-FPM are running using the _same user and group_ +- both these user and group have + - `read` permissions for Shaarli resources + - `execute` permissions for Shaarli directories _AND_ their parent directories + +On a production server: +- `user:group` will likely be `http:http`, `www:www` or `www-data:www-data` +- files will be located under `/var/www`, `/var/http` or `/usr/share/nginx` + +On a development server: +- files may be located in a user's home directory +- in this case, make sure both Nginx and PHP-FPM are running as the local user/group! + +For all following examples, a development configuration will be used: +- `user:group = john:users`, + +which corresponds to the following service configuration: + +```ini +; /etc/php/php-fpm.conf +user = john +group = users + +[...][](.html) +listen.owner = john +listen.group = users +``` + +```nginx +# /etc/nginx/nginx.conf +user john users; + +http { + [...][](.html) +} +``` + +### Minimal +_WARNING: Use for development only!_ + +```nginx +user john users; +worker_processes 1; +events { + worker_connections 1024; +} + +http { + include mime.types; + default_type application/octet-stream; + keepalive_timeout 20; + + index index.html index.php; + + server { + listen 80; + server_name localhost; + root /home/john/web; + + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + location /shaarli/ { + access_log /var/log/nginx/shaarli.access.log; + error_log /var/log/nginx/shaarli.error.log; + } + + location ~ (index)\.php$ { + fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; + fastcgi_index index.php; + include fastcgi.conf; + } + } +} +``` + +### Modular +The previous setup is sufficient for development purposes, but has several major caveats: +- every content that does not match the PHP rule will be sent to client browsers: + - dotfiles - in our case, `.htaccess` + - temporary files, e.g. Vim or Emacs files: `index.php~` +- asset / static resource caching is not optimized +- if serving several PHP sites, there will be a lot of duplication: `location /shaarli/`, `location /mysite/`, etc. + +To solve this, we will split Nginx configuration in several parts, that will be included when needed: + +```nginx +# /etc/nginx/deny.conf +location ~ /\. { + # deny access to dotfiles + access_log off; + log_not_found off; + deny all; +} + +location ~ ~$ { + # deny access to temp editor files, e.g. "script.php~" + access_log off; + log_not_found off; + deny all; +} +``` + +```nginx +# /etc/nginx/php.conf +location ~ (index)\.php$ { + # proxy PHP requests to PHP-FPM + fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; + fastcgi_index index.php; + include fastcgi.conf; +} +``` + +```nginx +# /etc/nginx/static_assets.conf +location ~* \.(?:ico|css|js|gif|jpe?g|png)$ { + expires max; + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; +} +``` + +```nginx +# /etc/nginx/nginx.conf +[...][](.html) + +http { + [...][](.html) + + root /home/john/web; + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + server { + # virtual host for a first domain + listen 80; + server_name my.first.domain.org; + + location /shaarli/ { + access_log /var/log/nginx/shaarli.access.log; + error_log /var/log/nginx/shaarli.error.log; + } + + include deny.conf; + include static_assets.conf; + include php.conf; + } + + server { + # virtual host for a second domain + listen 80; + server_name second.domain.com; + + location /minigal/ { + access_log /var/log/nginx/minigal.access.log; + error_log /var/log/nginx/minigal.error.log; + } + + include deny.conf; + include static_assets.conf; + include php.conf; + } +} +``` + +### Redirect HTTP to HTTPS +Assuming you have generated a (self-signed) key and certificate, and they are located under `/home/john/ssl/localhost.{key,crt}`, it is pretty straightforward to set an HTTP (:80) to HTTPS (:443) redirection to force SSL/TLS usage. + +```nginx +# /etc/nginx/nginx.conf +[...][](.html) + +http { + [...][](.html) + + index index.html index.php; + + root /home/john/web; + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + server { + listen 80; + server_name localhost; + + return 301 https://localhost$request_uri; + } + + server { + listen 443 ssl; + server_name localhost; + + ssl_certificate /home/john/ssl/localhost.crt; + ssl_certificate_key /home/john/ssl/localhost.key; + + location /shaarli/ { + access_log /var/log/nginx/shaarli.access.log; + error_log /var/log/nginx/shaarli.error.log; + } + + include deny.conf; + include static_assets.conf; + include php.conf; + } +} +``` diff --git a/doc/Server-requirements.html b/doc/Server-requirements.html new file mode 100644 index 0000000..bf5a2e8 --- /dev/null +++ b/doc/Server-requirements.html @@ -0,0 +1,132 @@ + + + + + + + Shaarli - Server requirements + + + + + + +

    Server requirements

    +

    PHP

    +

    Release information

    + +

    Supported versions

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    VersionStatusShaarli compatibility
    5.6Supported:white_check_mark:
    5.5Supported:white_check_mark:
    5.4Supported:white_check_mark:
    5.3EOL: 2014-08-14:white_check_mark:
    +

    See also:

    + +

    PHP 7.0 information:

    + +

    Extensions

    + + + + + + + + + + + + + + + + + + + + +
    ExtensionRequired?Usage
    php-mbstringCentOS, Fedora, RHEL, Windowsmultibyte (Unicode) string support
    php-gd-thumbnail resizing
    + + diff --git a/doc/Server-requirements.md b/doc/Server-requirements.md new file mode 100644 index 0000000..6ccccac --- /dev/null +++ b/doc/Server-requirements.md @@ -0,0 +1,30 @@ +#Server requirements +## PHP +### Release information +- [PHP: Supported versions](http://php.net/supported-versions.php)[](.html) +- [PHP: Unsupported versions](http://php.net/eol.php) _(EOL - End Of Life)_[](.html) +- [PHP 5 Changelog](http://php.net/ChangeLog-5.php)[](.html) +- [PHP: Bugs](https://bugs.php.net/)[](.html) + +### Supported versions +Version | Status | Shaarli compatibility +:---:|:---:|:---: +5.6 | Supported | :white_check_mark: +5.5 | Supported | :white_check_mark: +5.4 | Supported | :white_check_mark: +5.3 | EOL: 2014-08-14 | :white_check_mark: + +See also: +- [Travis configuration](https://github.com/shaarli/Shaarli/blob/master/.travis.yml)[](.html) + +PHP 7.0 information: +- [Beta1 announcement](http://php.net/archive/2015.php#id2015-07-10-4)[](.html) +- [TODOLIST](https://wiki.php.net/todo/php70)[](.html) +- [Recent bugs](https://bugs.php.net/search.php?limit=30&order_by=id&direction=DESC&cmd=display&status=Open&bug_type=All&phpver=7.0)[](.html) +- [Git repository](http://git.php.net/?p=php-src.git;a=shortlog;h=refs/heads/PHP-7.0.0)[](.html) + +### Extensions +Extension | Required? | Usage +---|:---:|--- +[`php-mbstring`](http://php.net/manual/en/book.mbstring.php) | CentOS, Fedora, RHEL, Windows | multibyte (Unicode) string support[](.html) +[`php-gd`](http://php.net/manual/en/book.image.php) | - | thumbnail resizing[](.html) diff --git a/doc/Shaarli-configuration.html b/doc/Shaarli-configuration.html new file mode 100644 index 0000000..90c0954 --- /dev/null +++ b/doc/Shaarli-configuration.html @@ -0,0 +1,221 @@ + + + + + + + Shaarli - Shaarli configuration + + + + + + + +

    Shaarli configuration

    +

    Foreword

    +

    Do not edit configuration options in index.php! Your changes would be lost.

    +

    Once your Shaarli instance is installed, the file data/config.php is generated:

    +
      +
    • it contains all settings, and can be edited to customize values
      • +
    • its values override those defined in index.php
      • +
    +

    File and directory permissions

    +

    The server process running Shaarli must have:

    +
      +
    • read access to the following resources: +
        +
      • PHP scripts: index.php, application/*.php
        • +
      • 3rd party PHP and Javascript libraries: inc/*.php, inc\*.js
        • +
      • static assets: +
          +
        • CSS stylesheets: inc\*.css
          • +
        • images\*
          • +
        • +
      • RainTPL templates: tpl\*.html
        • +
      • +
    • read, write and execution access to the following directories: +
        +
      • cache - thumbnail cache
        • +
      • data - link data store, configuration options
        • +
      • pagecache - Atom/RSS feed cache
        • +
      • tmp - RainTPL page cache
        • +
      • +
    +

    On a Linux distribution:

    +
      +
    • the web server user will likely be www or http (for Apache2)
      • +
    • it will be a member of a group of the same name: www:www, http:http
      • +
    • to give it access to Shaarli, either: +
        +
      • unzip Shaarli in the default web server location (usually /var/www/) and set the web server user as the owner
        • +
      • put users in the same group as the web server, and set the appropriate access rights
        • +
      • +
    • if you have a domain / subdomain to serve Shaarli, configure the server accordingly
      • +
    +

    Example data/config.php

    +
    <?php 
+// User login
+$GLOBALS['login'] = '<login>';[](.html)
+
+// User password hash
+$GLOBALS['hash'] = '200c452da46c2f889e5e48c49ef044bcacdcb095';[](.html)
+
+// Password salt
+$GLOBALS['salt'] = '13b654102321576033d8473b63a275a1bf94c0f0'; [](.html)
+
+// Local timezone
+$GLOBALS['timezone'] = 'Africa/Abidjan';[](.html)
+date_default_timezone_set('Africa/Abidjan');
+
+// Shaarli title
+$GLOBALS['title'] = 'My Little Shaarly';[](.html)
+
+// Link the Shaarli title points to
+$GLOBALS['titleLink'] = '?';[](.html)
+
+// HTTP referer redirector
+$GLOBALS['redirector'] = '';[](.html)
+
+// Disable session hijacking
+$GLOBALS['disablesessionprotection'] = false; [](.html)
+
+// Whether new links are private by default
+$GLOBALS['privateLinkByDefault'] = false;[](.html)
+
+// Subdirectory where Shaarli stores its data files.
+// You can change it for better security.
+$GLOBALS['config'['DATADIR'] = 'data';]('DATADIR']-=-'data';.html)
+
+// File used to store settings
+$GLOBALS['config'['CONFIG_FILE'] = 'data/config.php';]('CONFIG_FILE']-=-'data/config.php';.html)
+
+// File containing the link database
+$GLOBALS['config'['DATASTORE'] = 'data/datastore.php';]('DATASTORE']-=-'data/datastore.php';.html)
+
+// Number of links displayed per page
+$GLOBALS['config'['LINKS_PER_PAGE'] = 20;]('LINKS_PER_PAGE']-=-20;.html)
+
+// File recording failed login attempts and IP bans
+$GLOBALS['config'['IPBANS_FILENAME'] = 'data/ipbans.php';]('IPBANS_FILENAME']-=-'data/ipbans.php';.html)
+
+// Failed login attempts before being banned
+$GLOBALS['config'['BAN_AFTER'] = 4;]('BAN_AFTER']-=-4;.html)
+
+// Duration of an IP ban, in seconds (30 minutes)
+$GLOBALS['config'['BAN_DURATION'] = 1800;]('BAN_DURATION']-=-1800;.html)
+
+// If set to true, everyone will be able to add, edit and remove links,
+// as well as change configuration
+$GLOBALS['config'['OPEN_SHAARLI'] = false;]('OPEN_SHAARLI']-=-false;.html)
+
+// Do not show link timestamps
+$GLOBALS['config'['HIDE_TIMESTAMPS'] = false;]('HIDE_TIMESTAMPS']-=-false;.html)
+
+// Set to false to disable local thumbnail cache, e.g. due to limited disk quotas
+$GLOBALS['config'['ENABLE_THUMBNAILS'] = true;]('ENABLE_THUMBNAILS']-=-true;.html)
+
+// Thumbnail cache directory
+$GLOBALS['config'['CACHEDIR'] = 'cache';]('CACHEDIR']-=-'cache';.html)
+
+// Enable feed (rss, atom, dailyrss) cache
+$GLOBALS['config'['ENABLE_LOCALCACHE'] = true;]('ENABLE_LOCALCACHE']-=-true;.html)
+
+// Feed cache directory
+$GLOBALS['config'['PAGECACHE'] = 'pagecache';]('PAGECACHE']-=-'pagecache';.html)
+
+// RainTPL cache directory (keep the trailing slash!)
+$GLOBALS['config'['RAINTPL_TMP'] = 'tmp/';]('RAINTPL_TMP']-=-'tmp/';.html)
+
+// RainTPL template directory (keep the trailing slash!)
+$GLOBALS['config'['RAINTPL_TPL'] = 'tpl/';]('RAINTPL_TPL']-=-'tpl/';.html)
+
+// Whether Shaarli checks for new releases at https://github.com/shaarli/Shaarli
+$GLOBALS['config'['ENABLE_UPDATECHECK'] = true;]('ENABLE_UPDATECHECK']-=-true;.html)
+
+// File to store the latest Shaarli version
+$GLOBALS['config'['UPDATECHECK_FILENAME'] = 'data/lastupdatecheck.txt';]('UPDATECHECK_FILENAME']-=-'data/lastupdatecheck.txt';.html)
+
+// Delay between version checks (requires to be logged in) (24 hours)
+$GLOBALS['config'['UPDATECHECK_INTERVAL'] = 86400;]('UPDATECHECK_INTERVAL']-=-86400;.html)
+
+// For each link, display a link to an archived version on archive.org
+$GLOBALS['config'['ARCHIVE_ORG'] = false;]('ARCHIVE_ORG']-=-false;.html)
+
+// The RSS item links point:
+// true   =>  directly to the link
+// false  =>  to the entry on Shaarli (permalink)
+$GLOBALS['config'['ENABLE_RSS_PERMALINKS'] = true;]('ENABLE_RSS_PERMALINKS']-=-true;.html)
+
+// Hide all links to non-logged users
+$GLOBALS['config'['HIDE_PUBLIC_LINKS'] = false;]('HIDE_PUBLIC_LINKS']-=-false;.html)
+
+$GLOBALS['config'['PUBSUBHUB_URL'] = '';]('PUBSUBHUB_URL']-=-'';.html)
+
+// Show an ATOM Feed button next to the Subscribe (RSS) button.
+// ATOM feeds are available at the address ?do=atom regardless of this option.
+$GLOBALS['config'['SHOW_ATOM'] = false;]('SHOW_ATOM']-=-false;.html)
+?>
    + + diff --git a/doc/Shaarli-configuration.md b/doc/Shaarli-configuration.md new file mode 100644 index 0000000..5bf70a6 --- /dev/null +++ b/doc/Shaarli-configuration.md @@ -0,0 +1,137 @@ +#Shaarli configuration +## Foreword + +**Do not edit configuration options in index.php! Your changes would be lost.** + +Once your Shaarli instance is installed, the file `data/config.php` is generated: +* it contains all settings, and can be edited to customize values +* its values override those defined in `index.php` + +## File and directory permissions +The server process running Shaarli must have: +- `read` access to the following resources: + - PHP scripts: `index.php`, `application/*.php` + - 3rd party PHP and Javascript libraries: `inc/*.php`, `inc\*.js` + - static assets: + - CSS stylesheets: `inc\*.css` + - `images\*` + - RainTPL templates: `tpl\*.html` +- `read`, `write` and `execution` access to the following directories: + - `cache` - thumbnail cache + - `data` - link data store, configuration options + - `pagecache` - Atom/RSS feed cache + - `tmp` - RainTPL page cache + +On a Linux distribution: +- the web server user will likely be `www` or `http` (for Apache2) +- it will be a member of a group of the same name: `www:www`, `http:http` +- to give it access to Shaarli, either: + - unzip Shaarli in the default web server location (usually `/var/www/`) and set the web server user as the owner + - put users in the same group as the web server, and set the appropriate access rights +- if you have a domain / subdomain to serve Shaarli, [configure the server](Server-configuration) accordingly[](.html) + +## Example `data/config.php` +```php +';[](.html) + +// User password hash +$GLOBALS['hash'] = '200c452da46c2f889e5e48c49ef044bcacdcb095';[](.html) + +// Password salt +$GLOBALS['salt'] = '13b654102321576033d8473b63a275a1bf94c0f0'; [](.html) + +// Local timezone +$GLOBALS['timezone'] = 'Africa/Abidjan';[](.html) +date_default_timezone_set('Africa/Abidjan'); + +// Shaarli title +$GLOBALS['title'] = 'My Little Shaarly';[](.html) + +// Link the Shaarli title points to +$GLOBALS['titleLink'] = '?';[](.html) + +// HTTP referer redirector +$GLOBALS['redirector'] = '';[](.html) + +// Disable session hijacking +$GLOBALS['disablesessionprotection'] = false; [](.html) + +// Whether new links are private by default +$GLOBALS['privateLinkByDefault'] = false;[](.html) + +// Subdirectory where Shaarli stores its data files. +// You can change it for better security. +$GLOBALS['config'['DATADIR'] = 'data';]('DATADIR']-=-'data';.html) + +// File used to store settings +$GLOBALS['config'['CONFIG_FILE'] = 'data/config.php';]('CONFIG_FILE']-=-'data/config.php';.html) + +// File containing the link database +$GLOBALS['config'['DATASTORE'] = 'data/datastore.php';]('DATASTORE']-=-'data/datastore.php';.html) + +// Number of links displayed per page +$GLOBALS['config'['LINKS_PER_PAGE'] = 20;]('LINKS_PER_PAGE']-=-20;.html) + +// File recording failed login attempts and IP bans +$GLOBALS['config'['IPBANS_FILENAME'] = 'data/ipbans.php';]('IPBANS_FILENAME']-=-'data/ipbans.php';.html) + +// Failed login attempts before being banned +$GLOBALS['config'['BAN_AFTER'] = 4;]('BAN_AFTER']-=-4;.html) + +// Duration of an IP ban, in seconds (30 minutes) +$GLOBALS['config'['BAN_DURATION'] = 1800;]('BAN_DURATION']-=-1800;.html) + +// If set to true, everyone will be able to add, edit and remove links, +// as well as change configuration +$GLOBALS['config'['OPEN_SHAARLI'] = false;]('OPEN_SHAARLI']-=-false;.html) + +// Do not show link timestamps +$GLOBALS['config'['HIDE_TIMESTAMPS'] = false;]('HIDE_TIMESTAMPS']-=-false;.html) + +// Set to false to disable local thumbnail cache, e.g. due to limited disk quotas +$GLOBALS['config'['ENABLE_THUMBNAILS'] = true;]('ENABLE_THUMBNAILS']-=-true;.html) + +// Thumbnail cache directory +$GLOBALS['config'['CACHEDIR'] = 'cache';]('CACHEDIR']-=-'cache';.html) + +// Enable feed (rss, atom, dailyrss) cache +$GLOBALS['config'['ENABLE_LOCALCACHE'] = true;]('ENABLE_LOCALCACHE']-=-true;.html) + +// Feed cache directory +$GLOBALS['config'['PAGECACHE'] = 'pagecache';]('PAGECACHE']-=-'pagecache';.html) + +// RainTPL cache directory (keep the trailing slash!) +$GLOBALS['config'['RAINTPL_TMP'] = 'tmp/';]('RAINTPL_TMP']-=-'tmp/';.html) + +// RainTPL template directory (keep the trailing slash!) +$GLOBALS['config'['RAINTPL_TPL'] = 'tpl/';]('RAINTPL_TPL']-=-'tpl/';.html) + +// Whether Shaarli checks for new releases at https://github.com/shaarli/Shaarli +$GLOBALS['config'['ENABLE_UPDATECHECK'] = true;]('ENABLE_UPDATECHECK']-=-true;.html) + +// File to store the latest Shaarli version +$GLOBALS['config'['UPDATECHECK_FILENAME'] = 'data/lastupdatecheck.txt';]('UPDATECHECK_FILENAME']-=-'data/lastupdatecheck.txt';.html) + +// Delay between version checks (requires to be logged in) (24 hours) +$GLOBALS['config'['UPDATECHECK_INTERVAL'] = 86400;]('UPDATECHECK_INTERVAL']-=-86400;.html) + +// For each link, display a link to an archived version on archive.org +$GLOBALS['config'['ARCHIVE_ORG'] = false;]('ARCHIVE_ORG']-=-false;.html) + +// The RSS item links point: +// true => directly to the link +// false => to the entry on Shaarli (permalink) +$GLOBALS['config'['ENABLE_RSS_PERMALINKS'] = true;]('ENABLE_RSS_PERMALINKS']-=-true;.html) + +// Hide all links to non-logged users +$GLOBALS['config'['HIDE_PUBLIC_LINKS'] = false;]('HIDE_PUBLIC_LINKS']-=-false;.html) + +$GLOBALS['config'['PUBSUBHUB_URL'] = '';]('PUBSUBHUB_URL']-=-'';.html) + +// Show an ATOM Feed button next to the Subscribe (RSS) button. +// ATOM feeds are available at the address ?do=atom regardless of this option. +$GLOBALS['config'['SHOW_ATOM'] = false;]('SHOW_ATOM']-=-false;.html) +?> +``` diff --git a/doc/Sharing-button.html b/doc/Sharing-button.html new file mode 100644 index 0000000..034f2f9 --- /dev/null +++ b/doc/Sharing-button.html @@ -0,0 +1,76 @@ + + + + + + + Shaarli - Sharing button + + + + + + +

    Sharing button

    +

    Add the sharing button (bookmarklet) to your browser

    +
      +
    • Open your Shaarli and Login
      • +
    • Click the Tools button in the top bar
      • +
    • Drag the ✚Shaare link button, and drop it to your browser's bookmarks bar.
      • +
    +

    This bookmarklet button is compatible with Firefox, Opera, Chrome and Safari. Under Opera, you can't drag'n drop the button: You have to right-click on it and add a bookmark to your personal toolbar.

    +

    + +
      +
    • When you are visiting a webpage you would like to share with Shaarli, click the bookmarklet you just added.
      • +
    • A window opens.
      • +
    • You can freely edit title, description, tags... to find it later using the text search or tag filtering.
      • +
    • You will be able to edit this link later using the
      • +
    • You can also check the “Private” box so that the link is saved but only visible to you.
      • +
    • Click Save.Voilà! Your link is now shared.
      • +
    + + diff --git a/doc/Sharing-button.md b/doc/Sharing-button.md new file mode 100644 index 0000000..fe576a7 --- /dev/null +++ b/doc/Sharing-button.md @@ -0,0 +1,19 @@ +#Sharing button +### Add the sharing button (_bookmarklet_) to your browser + + * Open your Shaarli and `Login` + * Click the `Tools` button in the top bar + * Drag the **`✚Shaare link` button**, and drop it to your browser's bookmarks bar. + +_This bookmarklet button is compatible with Firefox, Opera, Chrome and Safari. Under Opera, you can't drag'n drop the button: You have to right-click on it and add a bookmark to your personal toolbar._ + +![(images/bookmarklet.png)]((images/bookmarklet.png).html) + +### Share links using the _bookmarklet_ + + * When you are visiting a webpage you would like to share with Shaarli, click the _bookmarklet_ you just added. + * A window opens. + * You can freely edit title, description, tags... to find it later using the text search or tag filtering. + * You will be able to edit this link later using the ![(https://raw.githubusercontent.com/shaarli/Shaarli/master/images/edit_icon.png) edit button.]((https://raw.githubusercontent.com/shaarli/Shaarli/master/images/edit_icon.png)-edit-button..html) + * You can also check the “Private” box so that the link is saved but only visible to you. + * Click `Save`.**Voilà! Your link is now shared.** diff --git a/doc/Static-analysis.html b/doc/Static-analysis.html new file mode 100644 index 0000000..d4588e4 --- /dev/null +++ b/doc/Static-analysis.html @@ -0,0 +1,72 @@ + + + + + + + Shaarli - Static analysis + + + + + + +

    Static analysis

    +

    WIP

    +

    This topic is currently being discussed here:

    + +

    Usage

    +

    Static analysis tools can be installed with Composer, and used through Shaarli's Makefile.

    +

    For an overview of the available features, see:

    + + + diff --git a/doc/Static-analysis.md b/doc/Static-analysis.md new file mode 100644 index 0000000..5781e05 --- /dev/null +++ b/doc/Static-analysis.md @@ -0,0 +1,12 @@ +#Static analysis +## WIP +This topic is currently being discussed here: +- [Fix coding style (static analysis)](https://github.com/shaarli/Shaarli/issues/95) (#95)[](.html) +- [Continuous Integration tools & features](https://github.com/shaarli/Shaarli/issues/130) (#130)[](.html) + +### Usage +Static analysis tools can be installed with Composer, and used through Shaarli's [Makefile](https://github.com/shaarli/Shaarli/blob/master/Makefile).[](.html) + +For an overview of the available features, see: +- [Code quality: Makefile to run static code checkers](https://github.com/shaarli/Shaarli/pull/124) (#124)[](.html) +- [Run PHPCS against different coding standards](https://github.com/shaarli/Shaarli/pull/276) (#276)[](.html) diff --git a/doc/TODO.html b/doc/TODO.html new file mode 100644 index 0000000..f66d64f --- /dev/null +++ b/doc/TODO.html @@ -0,0 +1,64 @@ + + + + + + + Shaarli - TODO + + + + + + +

    TODO

    +
      +
    • add more screenshots
      • +
    • improve developer documentation: storage architecture, classes and functions, security handling...
      • +
    • add server configuration examples: lighthttpd
      • +
    + + diff --git a/doc/TODO.md b/doc/TODO.md new file mode 100644 index 0000000..fb72fd5 --- /dev/null +++ b/doc/TODO.md @@ -0,0 +1,4 @@ +#TODO +* add more screenshots +* improve developer documentation: storage architecture, classes and functions, security handling... +* add server configuration examples: lighthttpd diff --git a/doc/Theming.html b/doc/Theming.html new file mode 100644 index 0000000..e814dad --- /dev/null +++ b/doc/Theming.html @@ -0,0 +1,138 @@ + + + + + + + Shaarli - Theming + + + + + + + +

    Theming

    +

    User CSS

    +
      +
    • Shaarli's apparence can be modified by editing CSS rules in inc/user.css. This file allows to override rules defined in the main inc/shaarli.css (only add changed rules), or define a whole new theme.
      • +
    • Do not edit inc/shaarli.css! Your changes would be overriden when updating Shaarli.
      • +
    • Some themes are available at https://github.com/shaarli/shaarli-themes.
      • +
    +

    See also:

    + +

    RainTPL template

    +

    WARNING - This feature is currently being worked on and will be improved in the next releases. Experimental.

    +
      +
    • Find the template you'd like to install (see the list of available templates|Theming#community-themes--templates)
      • +
    • Find it's git clone URL or download the zip archive for the template.
      • +
    • In your Shaarli tpl/ directory, run git clone https://url/of/my-template/ or unpack the zip archive. +
        +
      • There should now be a my-template/ directory under the tpl/ dir, containing directly all the template files.
        • +
      • +

    • Edit data/config.php to have Shaarli use this template, e.g.

      +
      $GLOBALS['config'['RAINTPL_TPL'] = 'tpl/my-template/';]('RAINTPL_TPL']-=-'tpl/my-template/';.html)
      • +
    +

    Community themes & templates

    + +

    Example installation: AlbinoMouse template

    +

    With the following configuration:

    +
      +
    • Apache 2 / PHP 5.6
      • +
    • user sites are enabled, e.g. /home/user/public_html/somedir is served as http://localhost/~user/somedir
      • +
    • http is the name of the Apache user
      • +
    +
    $ cd ~/public_html
+
+# clone repositories
+$ git clone https://github.com/shaarli/Shaarli.git shaarli
+$ pushd shaarli/tpl
+$ git clone https://github.com/alexisju/albinomouse-template.git
+$ popd
+
+# set access rights for Apache
+$ chgrp -R http shaarli
+$ chmod g+rwx shaarli shaarli/cache shaarli/data shaarli/pagecache shaarli/tmp
    +

    Get config written:

    +
      +
    • go to the freshly installed site
      • +
    • fill the install form
      • +
    • log in to Shaarli
      • +
    +

    Edit Shaarli's configuration|Shaarli configuration:

    +
    # the file should be owned by Apache, thus not writeable => sudo
+$ sudo sed -i s=tpl=tpl/albinomouse-template=g shaarli/data/config.php
    + + diff --git a/doc/Theming.md b/doc/Theming.md new file mode 100644 index 0000000..9dfdcf9 --- /dev/null +++ b/doc/Theming.md @@ -0,0 +1,63 @@ +#Theming +## User CSS + +- Shaarli's apparence can be modified by editing CSS rules in `inc/user.css`. This file allows to override rules defined in the main `inc/shaarli.css` (only add changed rules), or define a whole new theme. +- Do not edit `inc/shaarli.css`! Your changes would be overriden when updating Shaarli. +- Some themes are available at https://github.com/shaarli/shaarli-themes. + +See also: +- [Download CSS styles from an OPML list](Download-CSS-styles-from-an-OPML-list.html) + +## RainTPL template + +_WARNING - This feature is currently being worked on and will be improved in the next releases. Experimental._ + +- Find the template you'd like to install (see the list of [available templates|Theming#community-themes--templates](available-templates|Theming#community-themes--templates.html)) +- Find it's git clone URL or download the zip archive for the template. +- In your Shaarli `tpl/` directory, run `git clone https://url/of/my-template/` or unpack the zip archive. + - There should now be a `my-template/` directory under the `tpl/` dir, containing directly all the template files. +- Edit `data/config.php` to have Shaarli use this template, e.g. +```php +$GLOBALS['config'['RAINTPL_TPL'] = 'tpl/my-template/';]('RAINTPL_TPL']-=-'tpl/my-template/';.html) +``` + +## Community themes & templates +- [AkibaTech/Shaarli Superhero Theme](https://github.com/AkibaTech/Shaarli---SuperHero-Theme) - A template/theme for Shaarli[](.html) +- [alexisju/albinomouse-template](https://github.com/alexisju/albinomouse-template) - A full template for Shaarli[](.html) +- [dhoko/ShaarliTemplate](https://github.com/dhoko/ShaarliTemplate) - A template/theme for Shaarli[](.html) +- [kalvn/shaarli-blocks](https://github.com/kalvn/shaarli-blocks) - A template/theme for Shaarli[](.html) +- [kalvn/Shaarli-Material](https://github.com/kalvn/Shaarli-Material) - A theme (template) based on Google's Material Design for Shaarli, the superfast delicious clone.[](.html) +- [misterair/Limonade](https://github.com/misterair/limonade) - A fork of (legacy) Shaarli with a new template[](.html) +- [Vinm/Blue-theme-for Shaarli](https://github.com/Vinm/Blue-theme-for-Shaarli) - A template/theme for Shaarli ([unmaintained](https://github.com/Vinm/Blue-theme-for-Shaarli/issues/2), compatibility unknown)[](.html) +- [vivienhaese/shaarlitheme](https://github.com/vivienhaese/shaarlitheme) - A Shaarli fork meant to be run in an openshift instance[](.html) + +### Example installation: AlbinoMouse template +With the following configuration: +- Apache 2 / PHP 5.6 +- user sites are enabled, e.g. `/home/user/public_html/somedir` is served as `http://localhost/~user/somedir` +- `http` is the name of the Apache user + +```bash +$ cd ~/public_html + +# clone repositories +$ git clone https://github.com/shaarli/Shaarli.git shaarli +$ pushd shaarli/tpl +$ git clone https://github.com/alexisju/albinomouse-template.git +$ popd + +# set access rights for Apache +$ chgrp -R http shaarli +$ chmod g+rwx shaarli shaarli/cache shaarli/data shaarli/pagecache shaarli/tmp +``` + +Get config written: +- go to the freshly installed site +- fill the install form +- log in to Shaarli + +Edit Shaarli's [configuration|Shaarli configuration](configuration|Shaarli-configuration.html): +```bash +# the file should be owned by Apache, thus not writeable => sudo +$ sudo sed -i s=tpl=tpl/albinomouse-template=g shaarli/data/config.php +``` diff --git a/doc/Troubleshooting.html b/doc/Troubleshooting.html new file mode 100644 index 0000000..6965a57 --- /dev/null +++ b/doc/Troubleshooting.html @@ -0,0 +1,122 @@ + + + + + + + Shaarli - Troubleshooting + + + + + + + +

    Troubleshooting

    +

    Login

    +

    I forgot my password!

    +

    Delete the file data/config.php and display the page again. You will be asked for a new login/password.

    +

    I'm locked out - Login bruteforce protection

    +

    Login form is protected against brute force attacks: 4 failed logins will ban the IP address from login for 30 minutes. Banned IPs can still browse links.

    +

    To remove the current IP bans, delete the file data/ipbans.php

    +

    List of all login attempts

    +

    The file data/log.txt shows all logins (successful or failed) and bans/lifted bans.
    Search for failed in this file to look for unauthorized login attempts.

    +

    Hosting problems

    +
      +
    • On free.fr : Please note that free uses php 5.1 and thus you will not have autocomplete in tag editing. Don't forget to create a sessions directory at the root of your webspace. Change the file extension to .php5 or create a .htaccess file in the directory where Shaarli is located containing:
      • +
    +
    php 1
+SetEnv PHP_VER 5
    +
      +
    • If you have an error such as: Parse error: syntax error, unexpected '=', expecting '(' in /links/index.php on line xxx, it means that your host is using php4, not php5. Shaarli requires php 5.1. Try changing the file extension to .php5
      • +
    • On 1and1 : If you add the link from the page (and not from the bookmarklet), Shaarli will no be able to get the title of the page. You will have to enter it manually. (Because they have disabled the ability to download a file through HTTP).
      • +
    • If you have the error Warning: file_get_contents() [function.file-get-contents]: URL file-access is disabled in the server configuration in /…/index.php on line xxx, it means that your host has disabled the ability to fetch a file by HTTP in the php config (Typically in 1and1 hosting). Bad host. Change host. Or comment the following lines:
      • +
    +
    //list($status,$headers,$data) = getHTTP($url,4); // Short timeout to keep the application responsive.
+// FIXME: Decode charset according to charset specified in either 1) HTTP response headers or 2) <head> in html 
+//if (strpos($status,'200 OK')) $title=html_extract_title($data);
    +
      +
    • On hosts which forbid outgoing HTTP requests (such as free.fr), some thumbnails will not work.
      • +
    • On lost-oasis, RSS doesn't work correctly, because of this message at the begining of the RSS/ATOM feed : <? // tout ce qui est charge ici (generalement des includes et require) est charge en permanence. ?>. To fix this, remove this message from php-include/prepend.php
      • +
    +

    Dates are not properly formatted

    +

    Shaarli tries to sniff the language of the browser (using HTTP_ACCEPT_LANGUAGE headers) and choose a date format accordingly. But Shaarli can only use the date formats (and more generaly speaking, the locales) provided by the webserver. So even if you have a browser in French, you may end up with dates in US format (it's the case on sebsauvage.net :-( )

    +

    Problems on CentOS servers

    +

    On CentOS/RedHat derivatives, you may need to install the php-mbstring package.

    +

    My session expires! I can't stay logged in

    +

    This can be caused by several things:

    +
      +
    • Your php installation may not have a proper directory setup for session files. (eg. on Free.fr you need to create a session directory on the root of your website.) You may need to create the session directory of set it up.
      • +
    • Most hosts regularly clean the temporary and session directories. Your host may be cleaning those directories too aggressively (eg.OVH hosts), forcing an expire of the session. You may want to set the session directory in your web root. (eg. Create the sessions subdirectory and add ini_set('session.save_path', $_SERVER['DOCUMENT_ROOT'].'/../sessions');. Make sure this directory is not browsable !)
      • +
    • If your IP address changes during surfing, Shaarli will force expire your session for security reasons (to prevent session cookie hijacking). This can happen when surfing from WiFi or 3G (you may have switched WiFi/3G access point), or in some corporate/university proxies which use load balancing (and may have proxies with several external IP addresses).
      • +
    • Some browser addons may interfer with HTTP headers (ipfuck/ipflood/GreaseMonkey…). Try disabling those.
      • +
    • You may be using OperaTurbo or OperaMini, which use their own proxies which may change from time to time.
      • +
    • If you have another application on the same webserver where Shaarli is installed, these application may forcefully expire php sessions.
      • +
    +

    Sessions do not seem to work correctly on your server

    +

    Follow the instructions in the error message. Make sure you are accessing shaarli via a direct IP address or a proper hostname. If you have no dots in the hostname (e.g. localhost or http://my-webserver/shaarli/), some browsers will not store cookies at all (this respects the HTTP cookie specification).

    +

    pubsubhubbub support

    +

    Download publisher.php at the root of your Shaarli installation and set $GLOBALS['config'['PUBSUBHUB_URL'] in your config.php]('PUBSUBHUB_URL']-in-your-config.php`.html)

    + + diff --git a/doc/Troubleshooting.md b/doc/Troubleshooting.md new file mode 100644 index 0000000..4adf7c9 --- /dev/null +++ b/doc/Troubleshooting.md @@ -0,0 +1,60 @@ +#Troubleshooting +## Login +### I forgot my password! + +Delete the file `data/config.php` and display the page again. You will be asked for a new login/password. + +### I'm locked out - Login bruteforce protection +Login form is protected against brute force attacks: 4 failed logins will ban the IP address from login for 30 minutes. Banned IPs can still browse links. + +To remove the current IP bans, delete the file `data/ipbans.php` + +### List of all login attempts + +The file `data/log.txt` shows all logins (successful or failed) and bans/lifted bans. +Search for `failed` in this file to look for unauthorized login attempts. + +## Hosting problems + * On **free.fr** : Please note that free uses php 5.1 and thus you will not have autocomplete in tag editing. Don't forget to create a `sessions` directory at the root of your webspace. Change the file extension to `.php5` or create a `.htaccess` file in the directory where Shaarli is located containing: + +```ini +php 1 +SetEnv PHP_VER 5 +``` + + * If you have an error such as: `Parse error: syntax error, unexpected '=', expecting '(' in /links/index.php on line xxx`, it means that your host is using php4, not php5. Shaarli requires php 5.1. Try changing the file extension to `.php5` + * On **1and1** : If you add the link from the page (and not from the bookmarklet), Shaarli will no be able to get the title of the page. You will have to enter it manually. (Because they have disabled the ability to download a file through HTTP). + * If you have the error `Warning: file_get_contents() [function.file-get-contents]: URL file-access is disabled in the server configuration in /…/index.php on line xxx`, it means that your host has disabled the ability to fetch a file by HTTP in the php config (Typically in 1and1 hosting). Bad host. Change host. Or comment the following lines:[](.html) + +```php +//list($status,$headers,$data) = getHTTP($url,4); // Short timeout to keep the application responsive. +// FIXME: Decode charset according to charset specified in either 1) HTTP response headers or 2) in html +//if (strpos($status,'200 OK')) $title=html_extract_title($data); +``` + + * On hosts which forbid outgoing HTTP requests (such as free.fr), some thumbnails will not work. + * On **lost-oasis**, RSS doesn't work correctly, because of this message at the begining of the RSS/ATOM feed : ``. To fix this, remove this message from `php-include/prepend.php` + +### Dates are not properly formatted +Shaarli tries to sniff the language of the browser (using HTTP_ACCEPT_LANGUAGE headers) and choose a date format accordingly. But Shaarli can only use the date formats (and more generaly speaking, the locales) provided by the webserver. So even if you have a browser in French, you may end up with dates in US format (it's the case on sebsauvage.net :-( ) + +### Problems on CentOS servers +On **CentOS**/RedHat derivatives, you may need to install the `php-mbstring` package. + + +### My session expires! I can't stay logged in +This can be caused by several things: + +* Your php installation may not have a proper directory setup for session files. (eg. on Free.fr you need to create a `session` directory on the root of your website.) You may need to create the session directory of set it up. +* Most hosts regularly clean the temporary and session directories. Your host may be cleaning those directories too aggressively (eg.OVH hosts), forcing an expire of the session. You may want to set the session directory in your web root. (eg. Create the `sessions` subdirectory and add `ini_set('session.save_path', $_SERVER['DOCUMENT_ROOT'].'/../sessions');`. Make sure this directory is not browsable !)[](.html) +* If your IP address changes during surfing, Shaarli will force expire your session for security reasons (to prevent session cookie hijacking). This can happen when surfing from WiFi or 3G (you may have switched WiFi/3G access point), or in some corporate/university proxies which use load balancing (and may have proxies with several external IP addresses). +* Some browser addons may interfer with HTTP headers (ipfuck/ipflood/GreaseMonkey…). Try disabling those. +* You may be using OperaTurbo or OperaMini, which use their own proxies which may change from time to time. +* If you have another application on the same webserver where Shaarli is installed, these application may forcefully expire php sessions. + +## Sessions do not seem to work correctly on your server +Follow the instructions in the error message. Make sure you are accessing shaarli via a direct IP address or a proper hostname. If you have **no dots** in the hostname (e.g. `localhost` or `http://my-webserver/shaarli/`), some browsers will not store cookies at all (this respects the [HTTP cookie specification](http://curl.haxx.se/rfc/cookie_spec.html)).[](.html) + +### pubsubhubbub support + +Download [publisher.php](https://pubsubhubbub.googlecode.com/git/publisher_clients/php/library/publisher.php) at the root of your Shaarli installation and set `$GLOBALS['config'['PUBSUBHUB_URL']` in your `config.php`]('PUBSUBHUB_URL']`-in-your-`config.php`.html) diff --git a/doc/Running-unit-tests.html b/doc/Unit-tests.html similarity index 74% rename from doc/Running-unit-tests.html rename to doc/Unit-tests.html index 43423bc..25873cb 100644 --- a/doc/Running-unit-tests.html +++ b/doc/Unit-tests.html @@ -4,7 +4,7 @@ - + Shaarli - Unit tests + + + + +

    Usage

    +

    Main features

    +

    Shaarli is intended:

    +
      +
    • to share, comment and save interesting links and news
      • +
    • to bookmark useful/frequent personal links (as private links) and share them between computers
      • +
    • as a minimal blog/microblog/writing platform (no character limit)
      • +
    • as a read-it-later list (for example items tagged readlater)
      • +
    • to draft and save articles/ideas
      • +
    • to keep code snippets
      • +
    • to keep notes and documentation
      • +
    • as a shared clipboard between machines
      • +
    • as a todo list
      • +
    • to store playlists (e.g. with the music or video tags)
      • +
    • to keep extracts/comments from webpages that may disappear
      • +
    • to keep track of ongoing discussions (for example items tagged discussion)
      • +
    • to feed RSS aggregators (planets) with specific tags
      • +
    • to feed other social networks, blogs... using RSS feeds and external services (dlvr.it, ifttt.com ...)
      • +
    +

    Using Shaarli as a blog, notepad, pastebin...

    +
      +
    • Go to your Shaarli setup and log in
      • +
    • Click the Add Link button
      • +
    • To share text only, do not enter any URL in the corresponding input field and click Add Link
      • +
    • Pick a title and enter your article, or note, in the description field; add a few tags; optionally check Private then click Save
      • +
    • Voilà! Your article is now published (privately if you selected that option) and accessible using its permalink.
      • +
    + + diff --git a/doc/Usage.md b/doc/Usage.md new file mode 100644 index 0000000..30ad146 --- /dev/null +++ b/doc/Usage.md @@ -0,0 +1,25 @@ +#Usage +### Main features +Shaarli is intended: + * to share, comment and save interesting links and news + * to bookmark useful/frequent personal links (as private links) and share them between computers + * as a minimal blog/microblog/writing platform (no character limit) + * as a read-it-later list (for example items tagged `readlater`) + * to draft and save articles/ideas + * to keep code snippets + * to keep notes and documentation + * as a shared clipboard between machines + * as a todo list + * to store playlists (e.g. with the `music` or `video` tags) + * to keep extracts/comments from webpages that may disappear + * to keep track of ongoing discussions (for example items tagged `discussion`) + * [to feed RSS aggregators](http://shaarli.chassegnouf.net/?9Efeiw) (planets) with specific tags[](.html) + * to feed other social networks, blogs... using RSS feeds and external services (dlvr.it, ifttt.com ...) + +### Using Shaarli as a blog, notepad, pastebin... + + * Go to your Shaarli setup and log in + * Click the `Add Link` button + * To share text only, do not enter any URL in the corresponding input field and click `Add Link` + * Pick a title and enter your article, or note, in the description field; add a few tags; optionally check `Private` then click `Save` + * Voilà! Your article is now published (privately if you selected that option) and accessible using its permalink. diff --git a/doc/_Sidebar.html b/doc/_Sidebar.html new file mode 100644 index 0000000..c272519 --- /dev/null +++ b/doc/_Sidebar.html @@ -0,0 +1,99 @@ + + + + + + + Shaarli - _Sidebar + + + + + + +

    _Sidebar

    + + + diff --git a/doc/_Sidebar.md b/doc/_Sidebar.md new file mode 100644 index 0000000..64b1649 --- /dev/null +++ b/doc/_Sidebar.md @@ -0,0 +1,29 @@ +#_Sidebar +- [Home](Home.html) +- Installation + - [Server requirements](Server-requirements.html) + - [Server configuration](Server-configuration.html) + - [Shaarli configuration](Shaarli-configuration.html) +- [Usage](Usage.html) + - [Sharing button](Sharing-button.html) (bookmarklet) + - [Firefox share](Firefox-share.html) + - [RSS feeds](RSS-feeds.html) +- How To + - [Backup, restore, import and export](Backup,-restore,-import-and-export.html) + - [Copy an existing installation over SSH and serve it locally](Copy-an-existing-installation-over-SSH-and-serve-it-locally.html) + - [Download CSS styles from an OPML list](Download-CSS-styles-from-an-OPML-list.html) +- [Troubleshooting](Troubleshooting.html) +- [Development](Development.html) + - [GnuPG signature](GnuPG-signature.html) + - [Coding guidelines](Coding-guidelines.html) + - [Directory structure](Directory-structure.html) + - [3rd party libraries](3rd-party-libraries.html) + - [Plugin System](Plugin-System.html) + - [Security](Security.html) + - [Static analysis](Static-analysis.html) + - [Theming](Theming.html) + - [Unit tests](Unit-tests.html) +- About + - [FAQ](FAQ.html) + - [Community & Related software](Community-&-Related-software.html) + - [TODO](TODO.html) diff --git a/doc/github-markdown.css b/doc/github-markdown.css index 2b853b3..581350a 100644 --- a/doc/github-markdown.css +++ b/doc/github-markdown.css @@ -1,3 +1,13 @@ +#local-sidebar { + width: 230px; + float: right; + position: relative; + z-index: 4; + background-color: #fff; + border: 1px solid #e2e2e2; + border-radius: 3px; +} + body { font-family: Helvetica, arial, sans-serif; font-size: 14px; diff --git a/doc/sidebar.html b/doc/sidebar.html new file mode 100644 index 0000000..1b58540 --- /dev/null +++ b/doc/sidebar.html @@ -0,0 +1,42 @@ + From afd7b77b4c79a0450a6ef0489ca383c156111173 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Tue, 4 Aug 2015 18:31:16 +0200 Subject: [PATCH 159/658] Installation: default to the server's timezone Modifications - attempt to use the server's timezone - if none is set, use UTC - TimeZone: apply coding conventions - variable naming - no closing PHP tag Relates to #274 Signed-off-by: VirtualTam --- application/TimeZone.php | 62 +++++++++++++++++++++------------------- index.php | 10 ++++--- tests/TimeZoneTest.php | 1 - 3 files changed, 38 insertions(+), 35 deletions(-) diff --git a/application/TimeZone.php b/application/TimeZone.php index ccbef91..e363d90 100644 --- a/application/TimeZone.php +++ b/application/TimeZone.php @@ -5,30 +5,33 @@ * Note: 'UTC/UTC' is mapped to 'UTC' to form a valid option * * Example: preselect Europe/Paris - * list($htmlform, $js) = templateTZform('Europe/Paris'); + * list($htmlform, $js) = generateTimeZoneForm('Europe/Paris'); * * @param string $preselected_timezone preselected timezone (optional) * * @return an array containing the generated HTML form and Javascript code **/ -function generateTimeZoneForm($preselected_timezone='') +function generateTimeZoneForm($preselectedTimezone='') { - // Select the first available timezone if no preselected value is passed - if ($preselected_timezone == '') { - $l = timezone_identifiers_list(); - $preselected_timezone = $l[0]; + // Select the server timezone + if ($preselectedTimezone == '') { + $preselectedTimezone = date_default_timezone_get(); } - // Try to split the provided timezone - $spos = strpos($preselected_timezone, '/'); - $pcontinent = substr($preselected_timezone, 0, $spos); - $pcity = substr($preselected_timezone, $spos+1); + if ($preselectedTimezone == 'UTC') { + $pcity = $pcontinent = 'UTC'; + } else { + // Try to split the provided timezone + $spos = strpos($preselectedTimezone, '/'); + $pcontinent = substr($preselectedTimezone, 0, $spos); + $pcity = substr($preselectedTimezone, $spos+1); + } // Display config form: - $timezone_form = ''; - $timezone_js = ''; + $timezoneForm = ''; + $timezoneJs = ''; - // The list is in the form 'Europe/Paris', 'America/Argentina/Buenos_Aires'... + // The list is in the form 'Europe/Paris', 'America/Argentina/Buenos_Aires' // We split the list in continents/cities. $continents = array(); $cities = array(); @@ -57,33 +60,33 @@ function generateTimeZoneForm($preselected_timezone='') } } - $continents_html = ''; + $continentsHtml = ''; $continents = array_keys($continents); foreach ($continents as $continent) { - $continents_html .= ''; } // Timezone selection form - $timezone_form = 'Continent:'; - $timezone_form .= ''; - $timezone_form .= '    City:'; - $timezone_form .= '
    '; + $timezoneForm = 'Continent:'; + $timezoneForm .= ''; + $timezoneForm .= '    City:'; + $timezoneForm .= '
    '; // Javascript handler - updates the city list when the user selects a continent - $timezone_js = ''; + $timezoneJs = ''; - return array($timezone_form, $timezone_js); + return array($timezoneForm, $timezoneJs); } /** @@ -107,4 +110,3 @@ function isTimeZoneValid($continent, $city) timezone_identifiers_list() ); } -?> diff --git a/index.php b/index.php index 1439ec2..e3b612c 100644 --- a/index.php +++ b/index.php @@ -5,10 +5,12 @@ // Licence: http://www.opensource.org/licenses/zlib-license.php // Requires: PHP 5.3.x // ----------------------------------------------------------------------------------------------- -// NEVER TRUST IN PHP.INI -// Some hosts do not define a default timezone in php.ini, -// so we have to do this for avoid the strict standard error. -date_default_timezone_set('UTC'); + +// Set 'UTC' as the default timezone if it is not defined in php.ini +// See http://php.net/manual/en/datetime.configuration.php#ini.date.timezone +if (date_default_timezone_get() == '') { + date_default_timezone_set('UTC'); +} // ----------------------------------------------------------------------------------------------- // Hardcoded parameter (These parameters can be overwritten by editing the file /data/config.php) diff --git a/tests/TimeZoneTest.php b/tests/TimeZoneTest.php index f3de391..b219030 100644 --- a/tests/TimeZoneTest.php +++ b/tests/TimeZoneTest.php @@ -80,4 +80,3 @@ class TimeZoneTest extends PHPUnit_Framework_TestCase $this->assertFalse(isTimeZoneValid('Middle_Earth', 'Moria')); } } -?> From 5fbabbb9be44711837a1be595c069381574aa84b Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 29 Jul 2015 15:32:41 +0200 Subject: [PATCH 160/658] Fixes #299: prevent 404 on '?edit_link' while logged out - add a use case for edit_link in logged out part. - *really* prevent loops on login screen. --- index.php | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) mode change 100644 => 100755 index.php diff --git a/index.php b/index.php old mode 100644 new mode 100755 index e3b612c..2c731e9 --- a/index.php +++ b/index.php @@ -445,12 +445,30 @@ if (isset($_POST['login'])) session_set_cookie_params(0,$cookiedir,$_SERVER['SERVER_NAME']); // 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['title'])?'&title='.urlencode($_GET['title']):'').(!empty($_GET['description'])?'&description='.urlencode($_GET['description']):'').(!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. - header('Location: '.$_POST['returnurl']); exit; + if (isset($_GET['post'])) { + $uri = '?post='. urlencode($_GET['post']); + foreach (array('description', 'source', 'title') as $param) { + if (!empty($_GET[$param])) { + $uri .= '&'.$param.'='.urlencode($_GET[$param]); + } + } + header('Location: '. $uri); + exit; + } + + if (isset($_GET['edit_link'])) { + header('Location: ?edit_link='. escape($_GET['edit_link'])); + exit; + } + + if (isset($_POST['returnurl'])) { + // Prevent loops over login screen. + if (strpos($_POST['returnurl'], 'do=login') === false) { + header('Location: '. escape($_POST['returnurl'])); + exit; + } } header('Location: ?'); exit; } @@ -458,7 +476,14 @@ if (isset($_POST['login'])) { ban_loginFailed(); $redir = ''; - if (isset($_GET['post'])) { $redir = '&post='.urlencode($_GET['post']).(!empty($_GET['title'])?'&title='.urlencode($_GET['title']):'').(!empty($_GET['description'])?'&description='.urlencode($_GET['description']):'').(!empty($_GET['source'])?'&source='.urlencode($_GET['source']):''); } + if (isset($_GET['post'])) { + $redir = '?post=' . urlencode($_GET['post']); + foreach (array('description', 'source', 'title') as $param) { + if (!empty($_GET[$param])) { + $redir .= '&' . $param . '=' . urlencode($_GET[$param]); + } + } + } echo ''; // Redirect to login screen. exit; } @@ -1219,6 +1244,11 @@ function renderPage() exit; } + if (isset($_GET['edit_link'])) { + header('Location: ?do=login&edit_link='. escape($_GET['edit_link'])); + exit; + } + $PAGE = new pageBuilder; buildLinkList($PAGE,$LINKSDB); // Compute list of links to display $PAGE->renderPage('linklist'); @@ -1488,7 +1518,6 @@ function renderPage() { $url=$_GET['post']; - // We remove the annoying parameters added by FeedBurner, GoogleFeedProxy, Facebook... $annoyingpatterns = array('/[\?&]utm_source=[^&]*/', '/[\?&]utm_campaign=[^&]*/', From 01e48f269df59e02798dad4a698c125d76b0ed70 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Thu, 9 Jul 2015 22:14:39 +0200 Subject: [PATCH 161/658] CachedPage: move to a proper file, add tests Modifications - rename `pageCache` to `CachedPage` - move utilities to `Cache` - do not access globals - apply coding rules - update LinkDB and test code - add test coverage Signed-off-by: VirtualTam --- application/Cache.php | 46 ++++++++++++ application/CachedPage.php | 63 +++++++++++++++++ application/LinkDB.php | 7 +- index.php | 113 +++++++++-------------------- tests/CacheTest.php | 63 +++++++++++++++++ tests/CachedPageTest.php | 121 ++++++++++++++++++++++++++++++++ tests/LinkDBTest.php | 8 +-- tests/utils/ReferenceLinkDB.php | 1 - 8 files changed, 334 insertions(+), 88 deletions(-) create mode 100644 application/Cache.php create mode 100644 application/CachedPage.php create mode 100644 tests/CacheTest.php create mode 100644 tests/CachedPageTest.php diff --git a/application/Cache.php b/application/Cache.php new file mode 100644 index 0000000..9c7e818 --- /dev/null +++ b/application/Cache.php @@ -0,0 +1,46 @@ +cacheDir = $cacheDir; + $this->url = $url; + $this->filename = $this->cacheDir.'/'.sha1($url).'.cache'; + $this->shouldBeCached = $shouldBeCached; + } + + /** + * Returns the cached version of a page, if it exists and should be cached + * + * @return a cached version of the page if it exists, null otherwise + */ + public function cachedVersion() + { + if (!$this->shouldBeCached) { + return null; + } + if (is_file($this->filename)) { + return file_get_contents($this->filename); + } + return null; + } + + /** + * Puts a page in the cache + * + * @param string $pageContent XML content to cache + */ + public function cache($pageContent) + { + if (!$this->shouldBeCached) { + return; + } + file_put_contents($this->filename, $pageContent); + } +} diff --git a/application/LinkDB.php b/application/LinkDB.php index 1e16fef..463aa47 100644 --- a/application/LinkDB.php +++ b/application/LinkDB.php @@ -269,8 +269,10 @@ You use the community supported version of the original Shaarli project, by Seba /** * Saves the database from memory to disk + * + * @param string $pageCacheDir page cache directory */ - public function savedb() + public function savedb($pageCacheDir) { if (!$this->_loggedIn) { // TODO: raise an Exception instead @@ -280,7 +282,7 @@ You use the community supported version of the original Shaarli project, by Seba $this->_datastore, self::$phpPrefix.base64_encode(gzdeflate(serialize($this->_links))).self::$phpSuffix ); - invalidateCaches(); + invalidateCaches($pageCacheDir); } /** @@ -439,4 +441,3 @@ You use the community supported version of the original Shaarli project, by Seba return $linkDays; } } -?> diff --git a/index.php b/index.php index 2c731e9..84b8f01 100755 --- a/index.php +++ b/index.php @@ -70,6 +70,8 @@ if (is_file($GLOBALS['config']['CONFIG_FILE'])) { } // Shaarli library +require_once 'application/Cache.php'; +require_once 'application/CachedPage.php'; require_once 'application/LinkDB.php'; require_once 'application/TimeZone.php'; require_once 'application/Utils.php'; @@ -202,63 +204,6 @@ function checkUpdate() } -// ----------------------------------------------------------------------------------------------- -// Simple cache system (mainly for the RSS/ATOM feeds). - -class pageCache -{ - private $url; // Full URL of the page to cache (typically the value returned by pageUrl()) - private $shouldBeCached; // boolean: Should this url be cached? - private $filename; // Name of the cache file for this url. - - /* - $url = URL (typically the value returned by pageUrl()) - $shouldBeCached = boolean. If false, the cache will be disabled. - */ - public function __construct($url,$shouldBeCached) - { - $this->url = $url; - $this->filename = $GLOBALS['config']['PAGECACHE'].'/'.sha1($url).'.cache'; - $this->shouldBeCached = $shouldBeCached; - } - - // If the page should be cached and a cached version exists, - // returns the cached version (otherwise, return null). - public function cachedVersion() - { - if (!$this->shouldBeCached) return null; - if (is_file($this->filename)) { return file_get_contents($this->filename); exit; } - return null; - } - - // Put a page in the cache. - public function cache($page) - { - if (!$this->shouldBeCached) return; - file_put_contents($this->filename,$page); - } - - // Purge the whole cache. - // (call with pageCache::purgeCache()) - public static function purgeCache() - { - if (is_dir($GLOBALS['config']['PAGECACHE'])) - { - $handler = opendir($GLOBALS['config']['PAGECACHE']); - if ($handler!==false) - { - while (($filename = readdir($handler))!==false) - { - if (endsWith($filename,'.cache')) { unlink($GLOBALS['config']['PAGECACHE'].'/'.$filename); } - } - closedir($handler); - } - } - } - -} - - // ----------------------------------------------------------------------------------------------- // Log to text file function logm($message) @@ -718,8 +663,16 @@ function showRSS() // Cache system $query = $_SERVER["QUERY_STRING"]; - $cache = new pageCache(pageUrl(),startsWith($query,'do=rss') && !isLoggedIn()); - $cached = $cache->cachedVersion(); if (!empty($cached)) { echo $cached; exit; } + $cache = new CachedPage( + $GLOBALS['config']['PAGECACHE'], + pageUrl(), + startsWith($query,'do=rss') && !isLoggedIn() + ); + $cached = $cache->cachedVersion(); + if (! empty($cached)) { + echo $cached; + exit; + } // If cached was not found (or not usable), then read the database and build the response: $LINKSDB = new LinkDB( @@ -798,11 +751,19 @@ function showATOM() // Cache system $query = $_SERVER["QUERY_STRING"]; - $cache = new pageCache(pageUrl(),startsWith($query,'do=atom') && !isLoggedIn()); - $cached = $cache->cachedVersion(); if (!empty($cached)) { echo $cached; exit; } - // If cached was not found (or not usable), then read the database and build the response: + $cache = new CachedPage( + $GLOBALS['config']['PAGECACHE'], + pageUrl(), + startsWith($query,'do=atom') && !isLoggedIn() + ); + $cached = $cache->cachedVersion(); + if (!empty($cached)) { + echo $cached; + exit; + } -// Read links from database (and filter private links if used it not logged in). + // If cached was not found (or not usable), then read the database and build the response: + // Read links from database (and filter private links if used it not logged in). $LINKSDB = new LinkDB( $GLOBALS['config']['DATASTORE'], isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI'], @@ -884,7 +845,11 @@ function showATOM() function showDailyRSS() { // Cache system $query = $_SERVER["QUERY_STRING"]; - $cache = new pageCache(pageUrl(), startsWith($query, 'do=dailyrss') && !isLoggedIn()); + $cache = new CachedPage( + $GLOBALS['config']['PAGECACHE'], + pageUrl(), + startsWith($query,'do=dailyrss') && !isLoggedIn() + ); $cached = $cache->cachedVersion(); if (!empty($cached)) { echo $cached; @@ -1076,7 +1041,7 @@ function renderPage() // -------- User wants to logout. if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=logout')) { - invalidateCaches(); + invalidateCaches($GLOBALS['config']['PAGECACHE']); logout(); header('Location: ?'); exit; @@ -1383,7 +1348,7 @@ function renderPage() $value['tags']=trim(implode(' ',$tags)); $LINKSDB[$key]=$value; } - $LINKSDB->savedb(); // Save to disk. + $LINKSDB->savedb($GLOBALS['config']['PAGECACHE']); // Save to disk. echo ''; exit; } @@ -1400,7 +1365,7 @@ function renderPage() $value['tags']=trim(implode(' ',$tags)); $LINKSDB[$key]=$value; } - $LINKSDB->savedb(); // Save to disk. + $LINKSDB->savedb($GLOBALS['config']['PAGECACHE']); // Save to disk. echo ''; exit; } @@ -1429,7 +1394,7 @@ function renderPage() '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. + $LINKSDB->savedb($GLOBALS['config']['PAGECACHE']); // Save to disk. pubsubhub(); // If we are called from the bookmarklet, we must close the popup: @@ -1462,7 +1427,7 @@ function renderPage() // - we are protected from XSRF by the token. $linkdate=$_POST['lf_linkdate']; unset($LINKSDB[$linkdate]); - $LINKSDB->savedb(); // save to disk + $LINKSDB->savedb($GLOBALS['config']['PAGECACHE']); // save to disk // If we are called from the bookmarklet, we must close the popup: if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo ''; exit; } @@ -1751,7 +1716,7 @@ function importFile() } } } - $LINKSDB->savedb(); + $LINKSDB->savedb($GLOBALS['config']['PAGECACHE']); echo ''; } @@ -2386,14 +2351,6 @@ function resizeImage($filepath) return true; } -// Invalidate caches when the database is changed or the user logs out. -// (e.g. tags cache). -function invalidateCaches() -{ - unset($_SESSION['tags']); // Purge cache attached to session. - pageCache::purgeCache(); // Purge page cache shared by sessions. -} - try { mergeDeprecatedConfig($GLOBALS, isLoggedIn()); } catch(Exception $e) { diff --git a/tests/CacheTest.php b/tests/CacheTest.php new file mode 100644 index 0000000..4caf655 --- /dev/null +++ b/tests/CacheTest.php @@ -0,0 +1,63 @@ +assertFileNotExists(self::$testCacheDir.'/'.$page.'.cache'); + } + } + + /** + * Purge cached pages and session cache + */ + public function testInvalidateCaches() + { + $this->assertArrayNotHasKey('tags', $_SESSION); + $_SESSION['tags'] = array('goodbye', 'cruel', 'world'); + + invalidateCaches(self::$testCacheDir); + foreach (self::$pages as $page) { + $this->assertFileNotExists(self::$testCacheDir.'/'.$page.'.cache'); + } + + $this->assertArrayNotHasKey('tags', $_SESSION); + } +} diff --git a/tests/CachedPageTest.php b/tests/CachedPageTest.php new file mode 100644 index 0000000..e97af03 --- /dev/null +++ b/tests/CachedPageTest.php @@ -0,0 +1,121 @@ +assertFileNotExists(self::$filename); + $page->cache('

    Some content

    '); + $this->assertFileExists(self::$filename); + $this->assertEquals( + '

    Some content

    ', + file_get_contents(self::$filename) + ); + } + + /** + * "Cache" a page's content - the page is not to be cached + */ + public function testShouldNotCache() + { + $page = new CachedPage(self::$testCacheDir, self::$url, false); + + $this->assertFileNotExists(self::$filename); + $page->cache('

    Some content

    '); + $this->assertFileNotExists(self::$filename); + } + + /** + * Return a page's cached content + */ + public function testCachedVersion() + { + $page = new CachedPage(self::$testCacheDir, self::$url, true); + + $this->assertFileNotExists(self::$filename); + $page->cache('

    Some content

    '); + $this->assertFileExists(self::$filename); + $this->assertEquals( + '

    Some content

    ', + $page->cachedVersion() + ); + } + + /** + * Return a page's cached content - the file does not exist + */ + public function testCachedVersionNoFile() + { + $page = new CachedPage(self::$testCacheDir, self::$url, true); + + $this->assertFileNotExists(self::$filename); + $this->assertEquals( + null, + $page->cachedVersion() + ); + } + + /** + * Return a page's cached content - the page is not to be cached + */ + public function testNoCachedVersion() + { + $page = new CachedPage(self::$testCacheDir, self::$url, false); + + $this->assertFileNotExists(self::$filename); + $this->assertEquals( + null, + $page->cachedVersion() + ); + } +} diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php index 504c819..451f1d6 100644 --- a/tests/LinkDBTest.php +++ b/tests/LinkDBTest.php @@ -3,6 +3,7 @@ * Link datastore tests */ +require_once 'application/Cache.php'; require_once 'application/LinkDB.php'; require_once 'application/Utils.php'; require_once 'tests/utils/ReferenceLinkDB.php'; @@ -180,11 +181,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase 'tags'=>'unit test' ); $testDB[$link['linkdate']] = $link; - - // TODO: move PageCache to a proper class/file - function invalidateCaches() {} - - $testDB->savedb(); + $testDB->savedb('tests'); $testDB = new LinkDB(self::$testDatastore, true, false); $this->assertEquals($dbSize + 1, sizeof($testDB)); @@ -514,4 +511,3 @@ class LinkDBTest extends PHPUnit_Framework_TestCase ); } } -?> diff --git a/tests/utils/ReferenceLinkDB.php b/tests/utils/ReferenceLinkDB.php index 0b22572..47b5182 100644 --- a/tests/utils/ReferenceLinkDB.php +++ b/tests/utils/ReferenceLinkDB.php @@ -125,4 +125,3 @@ class ReferenceLinkDB return $this->_privateCount; } } -?> From aedd62e2b84b4ea0d3c03f5c23ec594f4ebb1c17 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Thu, 13 Aug 2015 21:39:51 +0200 Subject: [PATCH 162/658] Cache: simplify cached content cleanup, improve tests Signed-off-by: VirtualTam --- application/Cache.php | 20 ++++++-------------- tests/CacheTest.php | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/application/Cache.php b/application/Cache.php index 9c7e818..5d05016 100644 --- a/application/Cache.php +++ b/application/Cache.php @@ -7,26 +7,18 @@ * Purges all cached pages * * @param string $pageCacheDir page cache directory + * + * @return mixed an error string if the directory is missing */ function purgeCachedPages($pageCacheDir) { if (! is_dir($pageCacheDir)) { - return; + $error = 'Cannot purge '.$pageCacheDir.': no directory'; + error_log($error); + return $error; } - // TODO: check write access to the cache directory - - $handler = opendir($pageCacheDir); - if ($handler == false) { - return; - } - - while (($filename = readdir($handler)) !== false) { - if (endsWith($filename, '.cache')) { - unlink($pageCacheDir.'/'.$filename); - } - } - closedir($handler); + array_map('unlink', glob($pageCacheDir.'/*.cache')); } /** diff --git a/tests/CacheTest.php b/tests/CacheTest.php index 4caf655..aa5395b 100644 --- a/tests/CacheTest.php +++ b/tests/CacheTest.php @@ -27,11 +27,14 @@ class CachedTest extends PHPUnit_Framework_TestCase { if (! is_dir(self::$testCacheDir)) { mkdir(self::$testCacheDir); + } else { + array_map('unlink', glob(self::$testCacheDir.'/*')); } foreach (self::$pages as $page) { file_put_contents(self::$testCacheDir.'/'.$page.'.cache', $page); } + file_put_contents(self::$testCacheDir.'/intru.der', 'ShouldNotBeThere'); } /** @@ -42,7 +45,20 @@ class CachedTest extends PHPUnit_Framework_TestCase purgeCachedPages(self::$testCacheDir); foreach (self::$pages as $page) { $this->assertFileNotExists(self::$testCacheDir.'/'.$page.'.cache'); - } + } + + $this->assertFileExists(self::$testCacheDir.'/intru.der'); + } + + /** + * Purge cached pages - missing directory + */ + public function testPurgeCachedPagesMissingDir() + { + $this->assertEquals( + 'Cannot purge tests/dummycache_missing: no directory', + purgeCachedPages(self::$testCacheDir.'_missing') + ); } /** From d9d776af19fd0a191f82525991dafbb56e1bcfcb Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Fri, 14 Aug 2015 01:14:07 +0200 Subject: [PATCH 163/658] Links: refactor & improve URL cleanup Relates to #141 Relates to #133 Modifications - move URL cleanup to `application/Url.php` - rework the cleanup function - fragments: `#stuff` - GET parameters: `?var1=val1&var2=val2` - add documentation (APIs the params belong to) - add test coverage Reference - http://php.net/parse_url - http://php.net/manual/en/language.oop5.magic.php#language.oop5.magic.tostring Signed-off-by: VirtualTam --- .gitignore | 1 + application/Url.php | 150 ++++++++++++++++++++++++++++++++++++++++++ index.php | 27 ++------ tests/UrlTest.php | 154 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 309 insertions(+), 23 deletions(-) create mode 100644 application/Url.php create mode 100644 tests/UrlTest.php diff --git a/.gitignore b/.gitignore index 6fd0ccd..3ffedb3 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,5 @@ composer.lock # Ignore test data & output coverage tests/datastore.php +tests/dummycache/ phpmd.html diff --git a/application/Url.php b/application/Url.php new file mode 100644 index 0000000..23356f3 --- /dev/null +++ b/application/Url.php @@ -0,0 +1,150 @@ +parts = parse_url($url); + } + + /** + * Returns a string representation of this URL + */ + public function __toString() + { + return unparse_url($this->parts); + } + + /** + * Removes undesired query parameters + */ + protected function cleanupQuery() + { + if (! isset($this->parts['query'])) { + return; + } + + $queryParams = explode('&', $this->parts['query']); + + foreach (self::$annoyingQueryParams as $annoying) { + foreach ($queryParams as $param) { + if (startsWith($param, $annoying)) { + $queryParams = array_diff($queryParams, array($param)); + continue; + } + } + } + + if (count($queryParams) == 0) { + unset($this->parts['query']); + return; + } + + $this->parts['query'] = implode('&', $queryParams); + } + + /** + * Removes undesired fragments + */ + protected function cleanupFragment() + { + if (! isset($this->parts['fragment'])) { + return; + } + + foreach (self::$annoyingFragments as $annoying) { + if (startsWith($this->parts['fragment'], $annoying)) { + unset($this->parts['fragment']); + break; + } + } + } + + /** + * Removes undesired query parameters and fragments + * + * @return string the string representation of this URL after cleanup + */ + public function cleanup() + { + $this->cleanupQuery(); + $this->cleanupFragment(); + return $this->__toString(); + } +} diff --git a/index.php b/index.php index 84b8f01..74f9549 100755 --- a/index.php +++ b/index.php @@ -74,6 +74,7 @@ require_once 'application/Cache.php'; require_once 'application/CachedPage.php'; require_once 'application/LinkDB.php'; require_once 'application/TimeZone.php'; +require_once 'application/Url.php'; require_once 'application/Utils.php'; require_once 'application/Config.php'; @@ -1479,29 +1480,9 @@ function renderPage() } // -------- User want to post a new link: Display link edit form. - if (isset($_GET['post'])) - { - $url=$_GET['post']; - - // We remove the annoying parameters added by FeedBurner, GoogleFeedProxy, Facebook... - $annoyingpatterns = array('/[\?&]utm_source=[^&]*/', - '/[\?&]utm_campaign=[^&]*/', - '/[\?&]utm_medium=[^&]*/', - '/#xtor=RSS-[^&]*/', - '/[\?&]fb_[^&]*/', - '/[\?&]__scoop[^&]*/', - '/#tk\.rss_all\?/', - '/[\?&]action_ref_map=[^&]*/', - '/[\?&]action_type_map=[^&]*/', - '/[\?&]action_object_map=[^&]*/', - '/[\?&]utm_content=[^&]*/', - '/[\?&]fb=[^&]*/', - '/[\?&]xtor=[^&]*/' - ); - foreach($annoyingpatterns as $pattern) - { - $url = preg_replace($pattern, "", $url); - } + if (isset($_GET['post'])) { + $url = new Url($_GET['post']); + $url->cleanup(); $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) diff --git a/tests/UrlTest.php b/tests/UrlTest.php new file mode 100644 index 0000000..a39630f --- /dev/null +++ b/tests/UrlTest.php @@ -0,0 +1,154 @@ +assertEquals('', unparse_url(array())); + } + + /** + * Rebuild a full-featured URL + */ + public function testUnparseFull() + { + $ref = 'http://username:password@hostname:9090/path' + .'?arg1=value1&arg2=value2#anchor'; + $this->assertEquals($ref, unparse_url(parse_url($ref))); + } +} + +/** + * Unitary tests for URL utilities + */ +class UrlTest extends PHPUnit_Framework_TestCase +{ + // base URL for tests + protected static $baseUrl = 'http://domain.tld:3000'; + + /** + * Helper method + */ + private function assertUrlIsCleaned($query='', $fragment='') + { + $url = new Url(self::$baseUrl.$query.$fragment); + $url->cleanup(); + $this->assertEquals(self::$baseUrl, $url->__toString()); + } + + /** + * Instantiate an empty URL + */ + public function testEmptyConstruct() + { + $this->assertEquals('', new Url('')); + } + + /** + * Instantiate a URL + */ + public function testConstruct() + { + $ref = 'http://username:password@hostname:9090/path' + .'?arg1=value1&arg2=value2#anchor'; + $this->assertEquals($ref, new Url($ref)); + } + + /** + * URL cleanup - nothing to do + */ + public function testNoCleanup() + { + // URL with no query nor fragment + $this->assertUrlIsCleaned(); + + // URL with no annoying elements + $ref = self::$baseUrl.'?p1=val1&p2=1234#edit'; + $url = new Url($ref); + $this->assertEquals($ref, $url->cleanup()); + } + + /** + * URL cleanup - annoying fragment + */ + public function testCleanupFragment() + { + $this->assertUrlIsCleaned('', '#tk.rss_all'); + $this->assertUrlIsCleaned('', '#xtor=RSS-'); + $this->assertUrlIsCleaned('', '#xtor=RSS-U3ht0tkc4b'); + } + + /** + * URL cleanup - single annoying query parameter + */ + public function testCleanupSingleQueryParam() + { + $this->assertUrlIsCleaned('?action_object_map=junk'); + $this->assertUrlIsCleaned('?action_ref_map=Cr4p!'); + $this->assertUrlIsCleaned('?action_type_map=g4R84g3'); + + $this->assertUrlIsCleaned('?fb_stuff=v41u3'); + $this->assertUrlIsCleaned('?fb=71m3w4573'); + + $this->assertUrlIsCleaned('?utm_campaign=zomg'); + $this->assertUrlIsCleaned('?utm_medium=numnum'); + $this->assertUrlIsCleaned('?utm_source=c0d3'); + $this->assertUrlIsCleaned('?utm_term=1n4l'); + + $this->assertUrlIsCleaned('?xtor=some-url'); + } + + /** + * URL cleanup - multiple annoying query parameters + */ + public function testCleanupMultipleQueryParams() + { + $this->assertUrlIsCleaned('?xtor=some-url&fb=som3th1ng'); + $this->assertUrlIsCleaned( + '?fb=stuff&utm_campaign=zomg&utm_medium=numnum&utm_source=c0d3' + ); + } + + /** + * URL cleanup - multiple annoying query parameters, annoying fragment + */ + public function testCleanupMultipleQueryParamsAndFragment() + { + $this->assertUrlIsCleaned('?xtor=some-url&fb=som3th1ng', '#tk.rss_all'); + } + + /** + * Nominal case - the URL contains both useful and annoying parameters + */ + public function testCleanupMixedContent() + { + // ditch annoying query params and fragment, keep useful params + $url = new Url( + self::$baseUrl + .'?fb=zomg&my=stuff&utm_medium=numnum&is=kept#tk.rss_all' + ); + $this->assertEquals(self::$baseUrl.'?my=stuff&is=kept', $url->cleanup()); + + + // ditch annoying query params, keep useful params and fragment + $url = new Url( + self::$baseUrl + .'?fb=zomg&my=stuff&utm_medium=numnum&is=kept#again' + ); + $this->assertEquals( + self::$baseUrl.'?my=stuff&is=kept#again', + $url->cleanup() + ); + } +} From c622d32820685566c7c0228ae9cdc6c26f10fa29 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sun, 16 Aug 2015 14:50:16 +0200 Subject: [PATCH 164/658] README: add DockerHub badge See [docker-shaarli](https://github.com/shaarli/docker-shaarli) for Dockerfiles and documentation --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5743ec4..a5a3bba 100755 --- a/README.md +++ b/README.md @@ -2,12 +2,14 @@ Shaarli, the personal, minimalist, super-fast, no-database delicious clone. -You want to share the links you discover ? Shaarli is a minimalist delicious clone you can install on your own website. +Do you want to share the links you discover? Shaarli is a minimalist delicious clone you can install on your own website. It is designed to be personal (single-user), fast and handy. -[![Join the chat at https://gitter.im/shaarli/Shaarli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/shaarli/Shaarli) [![Bountysource](https://www.bountysource.com/badge/team?team_id=19583&style=bounties_received)](https://www.bountysource.com/teams/shaarli/issues) [![](https://api.travis-ci.org/shaarli/Shaarli.svg)](https://travis-ci.org/shaarli/Shaarli) +[![Join the chat at https://gitter.im/shaarli/Shaarli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/shaarli/Shaarli) +[![Bountysource](https://www.bountysource.com/badge/team?team_id=19583&style=bounties_received)](https://www.bountysource.com/teams/shaarli/issues) [![](https://api.travis-ci.org/shaarli/Shaarli.svg)](https://travis-ci.org/shaarli/Shaarli) +[![Docker repository](https://img.shields.io/docker/pulls/shaarli/shaarli.svg)](https://hub.docker.com/r/shaarli/shaarli/) -## Features: +## Features * Minimalist design (simple is beautiful) * **FAST** @@ -85,4 +87,3 @@ This is a community fork of the original [Shaarli](https://github.com/sebsauvage ## License Shaarli is [Free Software](http://en.wikipedia.org/wiki/Free_software). See [COPYING](COPYING) for a detail of the contributors and licenses for each individual component. - From 6335a0fc0ce0c2f962333f0b4d6baac1671df901 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Tue, 18 Aug 2015 00:33:25 +0200 Subject: [PATCH 165/658] Doc: sync from Wiki, generate HTML Signed-off-by: VirtualTam --- doc/3rd-party-libraries.html | 1 + doc/Backup,-restore,-import-and-export.html | 1 + doc/Coding-guidelines.html | 1 + doc/Community-&-Related-software.html | 1 + ...llation-over-SSH-and-serve-it-locally.html | 1 + doc/Datastore-hacks.html | 1 + doc/Development.html | 1 + doc/Directory-structure.html | 1 + ...Download-CSS-styles-from-an-OPML-list.html | 1 + ...e-patch---add-new-via-field-for-links.html | 1 + doc/FAQ.html | 1 + doc/Firefox-share.html | 1 + doc/GnuPG-signature.html | 1 + doc/Home.html | 1 + doc/Plugin-System.html | 1 + doc/RSS-feeds.html | 1 + doc/Security.html | 1 + doc/Server-configuration.html | 1 + doc/Server-requirements.html | 1 + doc/Shaarli-configuration.html | 1 + doc/Sharing-button.html | 1 + doc/Static-analysis.html | 1 + doc/TODO.html | 1 + doc/Theming.html | 1 + doc/Troubleshooting.html | 50 ++++++++++++++++++ doc/Troubleshooting.md | 51 +++++++++++++++++-- doc/Unit-tests.html | 1 + doc/Usage.html | 1 + doc/_Sidebar.html | 2 + doc/_Sidebar.md | 1 + doc/sidebar.html | 1 + 31 files changed, 128 insertions(+), 3 deletions(-) diff --git a/doc/3rd-party-libraries.html b/doc/3rd-party-libraries.html index a9c3a88..86f670a 100644 --- a/doc/3rd-party-libraries.html +++ b/doc/3rd-party-libraries.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Backup,-restore,-import-and-export.html b/doc/Backup,-restore,-import-and-export.html index 183a5ed..40c7a85 100644 --- a/doc/Backup,-restore,-import-and-export.html +++ b/doc/Backup,-restore,-import-and-export.html @@ -51,6 +51,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Coding-guidelines.html b/doc/Coding-guidelines.html index 0f071a5..fd6fa57 100644 --- a/doc/Coding-guidelines.html +++ b/doc/Coding-guidelines.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Community-&-Related-software.html b/doc/Community-&-Related-software.html index 5468379..25ef0f8 100644 --- a/doc/Community-&-Related-software.html +++ b/doc/Community-&-Related-software.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html index 9e930e5..1e81b73 100644 --- a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html +++ b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html @@ -51,6 +51,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Datastore-hacks.html b/doc/Datastore-hacks.html index 4677ae9..e3adee1 100644 --- a/doc/Datastore-hacks.html +++ b/doc/Datastore-hacks.html @@ -51,6 +51,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Development.html b/doc/Development.html index 1e33eff..6e22257 100644 --- a/doc/Development.html +++ b/doc/Development.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Directory-structure.html b/doc/Directory-structure.html index 4ea5e24..ae0458f 100644 --- a/doc/Directory-structure.html +++ b/doc/Directory-structure.html @@ -51,6 +51,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Download-CSS-styles-from-an-OPML-list.html b/doc/Download-CSS-styles-from-an-OPML-list.html index b21a54b..033dd18 100644 --- a/doc/Download-CSS-styles-from-an-OPML-list.html +++ b/doc/Download-CSS-styles-from-an-OPML-list.html @@ -51,6 +51,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Example-patch---add-new-via-field-for-links.html b/doc/Example-patch---add-new-via-field-for-links.html index 44352d3..ff73ec0 100644 --- a/doc/Example-patch---add-new-via-field-for-links.html +++ b/doc/Example-patch---add-new-via-field-for-links.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/FAQ.html b/doc/FAQ.html index 0ebd1bc..b26b635 100644 --- a/doc/FAQ.html +++ b/doc/FAQ.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Firefox-share.html b/doc/Firefox-share.html index 198afe2..d666ac7 100644 --- a/doc/Firefox-share.html +++ b/doc/Firefox-share.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/GnuPG-signature.html b/doc/GnuPG-signature.html index c9e0455..b7dc108 100644 --- a/doc/GnuPG-signature.html +++ b/doc/GnuPG-signature.html @@ -51,6 +51,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Home.html b/doc/Home.html index 37d62e8..90372a4 100644 --- a/doc/Home.html +++ b/doc/Home.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Plugin-System.html b/doc/Plugin-System.html index 6d08d85..719b76f 100644 --- a/doc/Plugin-System.html +++ b/doc/Plugin-System.html @@ -51,6 +51,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/RSS-feeds.html b/doc/RSS-feeds.html index 4a9b7a0..7d1de07 100644 --- a/doc/RSS-feeds.html +++ b/doc/RSS-feeds.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Security.html b/doc/Security.html index 1fbbabd..db44da2 100644 --- a/doc/Security.html +++ b/doc/Security.html @@ -51,6 +51,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Server-configuration.html b/doc/Server-configuration.html index de6bf48..e4e383a 100644 --- a/doc/Server-configuration.html +++ b/doc/Server-configuration.html @@ -51,6 +51,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Server-requirements.html b/doc/Server-requirements.html index bf5a2e8..b0426ee 100644 --- a/doc/Server-requirements.html +++ b/doc/Server-requirements.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Shaarli-configuration.html b/doc/Shaarli-configuration.html index 90c0954..663b43e 100644 --- a/doc/Shaarli-configuration.html +++ b/doc/Shaarli-configuration.html @@ -51,6 +51,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Sharing-button.html b/doc/Sharing-button.html index 034f2f9..d3f3625 100644 --- a/doc/Sharing-button.html +++ b/doc/Sharing-button.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Static-analysis.html b/doc/Static-analysis.html index d4588e4..dd1dd22 100644 --- a/doc/Static-analysis.html +++ b/doc/Static-analysis.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/TODO.html b/doc/TODO.html index f66d64f..c25775c 100644 --- a/doc/TODO.html +++ b/doc/TODO.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Theming.html b/doc/Theming.html index e814dad..b5d214e 100644 --- a/doc/Theming.html +++ b/doc/Theming.html @@ -51,6 +51,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Troubleshooting.html b/doc/Troubleshooting.html index 6965a57..00cfdff 100644 --- a/doc/Troubleshooting.html +++ b/doc/Troubleshooting.html @@ -51,6 +51,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development @@ -74,6 +75,54 @@ code > span.er { color: #ff0000; font-weight: bold; }

    Troubleshooting

    +

    Browser

    +

    Redirection issues (HTTP Referer)

    +

    Depending on its configuration and installed plugins, the browser may remove or alter (spoof) HTTP referers, thus preventing Shaarli from properly redirecting between pages.

    +

    See:

    + +

    Firefox HTTP Referer options

    +

    HTTP settings are available by browsing about:config, here are the available settings and their values.

    +

    network.http.sendRefererHeader - determines when to send the Referer HTTP header

    +
      +
    • 0: Never send the referring URL +
        +
      • not recommended, may break some sites
        • +
      • +
    • 1: Send only on clicked links
      • +
    • 2 (default): Send for links and images
      • +
    +

    network.http.referer.XOriginPolicy - Cross-domain origin policy

    +
      +
    • 0 (default): Always send
      • +
    • 1: Send if base domains match
      • +
    • 2: Send if hosts match
      • +
    +

    network.http.referer.spoofSource - Referer spoofing (~faking)

    +
      +
    • false (default): real referer
      • +
    • true: spoof referer (use target URI as referer)
      • +
    +

    network.http.referer.trimmingPolicy - trim the URI not to send a full Referer

    +
      +
    • 0 (default): send full URI
      • +
    • 1: scheme+host+port+path
      • +
    • 2: scheme+host+port
      • +
    +

    Firefox, localhost and redirections

    +

    localhost is not a proper Fully Qualified Domain Name (FQDN); if Firefox has been set up to spoof referers, or anly accept requests from the same base domain/host, Shaarli redirections will not work properly.

    +

    To solve this, assign a local domain to your host, e.g.

    +
    127.0.0.1 localhost desktop localhost.lan
+::1       localhost desktop localhost.lan
    +

    and browse Shaarli at http://localhost.lan/.

    +

    Related threads:

    +

    Login

    I forgot my password!

    Delete the file data/config.php and display the page again. You will be asked for a new login/password.

    @@ -83,6 +132,7 @@ code > span.er { color: #ff0000; font-weight: bold; }

    List of all login attempts

    The file data/log.txt shows all logins (successful or failed) and bans/lifted bans.
    Search for failed in this file to look for unauthorized login attempts.

    Hosting problems

    +

    Old PHP versions

    • On free.fr : Please note that free uses php 5.1 and thus you will not have autocomplete in tag editing. Don't forget to create a sessions directory at the root of your webspace. Change the file extension to .php5 or create a .htaccess file in the directory where Shaarli is located containing:
    diff --git a/doc/Troubleshooting.md b/doc/Troubleshooting.md index 4adf7c9..4e6cdb0 100644 --- a/doc/Troubleshooting.md +++ b/doc/Troubleshooting.md @@ -1,7 +1,53 @@ #Troubleshooting +## Browser +### Redirection issues (HTTP Referer) +Depending on its configuration and installed plugins, the browser may remove or alter (spoof) HTTP referers, thus preventing Shaarli from properly redirecting between pages. + +See: +- [HTTP referer](https://en.wikipedia.org/wiki/HTTP_referer) (Wikipedia)[](.html) +- [Improve online privacy by controlling referrer information](http://www.ghacks.net/2015/01/22/improve-online-privacy-by-controlling-referrer-information/)[](.html) +- [Better security, privacy and anonymity in Firefox](http://b.agilob.net/better-security-privacy-and-anonymity-in-firefox/)[](.html) + +### Firefox HTTP Referer options +HTTP settings are available by browsing `about:config`, here are the available settings and their values. + +`network.http.sendRefererHeader` - determines when to send the Referer HTTP header +- 0: Never send the referring URL + - not recommended, may break some sites +- 1: Send only on clicked links +- 2 (default): Send for links and images + +`network.http.referer.XOriginPolicy` - Cross-domain origin policy +- 0 (default): Always send +- 1: Send if base domains match +- 2: Send if hosts match + +`network.http.referer.spoofSource` - Referer spoofing (~faking) +- false (default): real referer +- true: spoof referer (use target URI as referer) + +`network.http.referer.trimmingPolicy` - trim the URI not to send a full Referer +- 0 (default): send full URI +- 1: scheme+host+port+path +- 2: scheme+host+port + +### Firefox, localhost and redirections +`localhost` is not a proper Fully Qualified Domain Name (FQDN); if Firefox has been set up to spoof referers, or anly accept requests from the same base domain/host, Shaarli redirections will not work properly. + +To solve this, assign a local domain to your host, e.g. +``` +127.0.0.1 localhost desktop localhost.lan +::1 localhost desktop localhost.lan +``` + +and browse Shaarli at http://localhost.lan/. + +Related threads: +- [What is localhost.localdomain for?](https://bbs.archlinux.org/viewtopic.php?id=156064)[](.html) +- [Stop returning to the first page after editing a bookmark from another page](https://github.com/shaarli/Shaarli/issues/311)[](.html) + ## Login ### I forgot my password! - Delete the file `data/config.php` and display the page again. You will be asked for a new login/password. ### I'm locked out - Login bruteforce protection @@ -10,11 +56,11 @@ Login form is protected against brute force attacks: 4 failed logins will ban th To remove the current IP bans, delete the file `data/ipbans.php` ### List of all login attempts - The file `data/log.txt` shows all logins (successful or failed) and bans/lifted bans. Search for `failed` in this file to look for unauthorized login attempts. ## Hosting problems +### Old PHP versions * On **free.fr** : Please note that free uses php 5.1 and thus you will not have autocomplete in tag editing. Don't forget to create a `sessions` directory at the root of your webspace. Change the file extension to `.php5` or create a `.htaccess` file in the directory where Shaarli is located containing: ```ini @@ -56,5 +102,4 @@ This can be caused by several things: Follow the instructions in the error message. Make sure you are accessing shaarli via a direct IP address or a proper hostname. If you have **no dots** in the hostname (e.g. `localhost` or `http://my-webserver/shaarli/`), some browsers will not store cookies at all (this respects the [HTTP cookie specification](http://curl.haxx.se/rfc/cookie_spec.html)).[](.html) ### pubsubhubbub support - Download [publisher.php](https://pubsubhubbub.googlecode.com/git/publisher_clients/php/library/publisher.php) at the root of your Shaarli installation and set `$GLOBALS['config'['PUBSUBHUB_URL']` in your `config.php`]('PUBSUBHUB_URL']`-in-your-`config.php`.html) diff --git a/doc/Unit-tests.html b/doc/Unit-tests.html index 25873cb..f4b42bd 100644 --- a/doc/Unit-tests.html +++ b/doc/Unit-tests.html @@ -51,6 +51,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/Usage.html b/doc/Usage.html index cffdc4d..ad5b796 100644 --- a/doc/Usage.html +++ b/doc/Usage.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/_Sidebar.html b/doc/_Sidebar.html index c272519..0f9d546 100644 --- a/doc/_Sidebar.html +++ b/doc/_Sidebar.html @@ -32,6 +32,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development @@ -74,6 +75,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development diff --git a/doc/_Sidebar.md b/doc/_Sidebar.md index 64b1649..db75943 100644 --- a/doc/_Sidebar.md +++ b/doc/_Sidebar.md @@ -12,6 +12,7 @@ - [Backup, restore, import and export](Backup,-restore,-import-and-export.html) - [Copy an existing installation over SSH and serve it locally](Copy-an-existing-installation-over-SSH-and-serve-it-locally.html) - [Download CSS styles from an OPML list](Download-CSS-styles-from-an-OPML-list.html) + - [Datastore hacks](Datastore-hacks.html) - [Troubleshooting](Troubleshooting.html) - [Development](Development.html) - [GnuPG signature](GnuPG-signature.html) diff --git a/doc/sidebar.html b/doc/sidebar.html index 1b58540..e8bc593 100644 --- a/doc/sidebar.html +++ b/doc/sidebar.html @@ -18,6 +18,7 @@
  • Backup, restore, import and export
  • Copy an existing installation over SSH and serve it locally
  • Download CSS styles from an OPML list
    • +
  • Datastore hacks
  • Troubleshooting
  • Development From d7efade5d651ec60a05a86baa53f99188ad5d72c Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Tue, 18 Aug 2015 00:35:42 +0200 Subject: [PATCH 166/658] Bump version to 0.5.1 Minor changes - fix 404 after editing a link while being logged out - update local documentation - improve timezone detection at installation - improve feed cache handling - improve URL cleanup for new links - add a link to the shaarli/shaarli DockerHub repository Signed-off-by: VirtualTam --- index.php | 4 ++-- shaarli_version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index 74f9549..8e04fa3 100755 --- a/index.php +++ b/index.php @@ -1,5 +1,5 @@ /shaarli/ define('WEB_PATH', substr($_SERVER["REQUEST_URI"], 0, 1+strrpos($_SERVER["REQUEST_URI"], '/', 0))); diff --git a/shaarli_version.php b/shaarli_version.php index a2045a7..294292a 100644 --- a/shaarli_version.php +++ b/shaarli_version.php @@ -1 +1 @@ - + From bdf4f785193d8a282f874eb1903a05da72270d35 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sat, 22 Aug 2015 00:06:42 +0200 Subject: [PATCH 167/658] travis: add PHP 7 to the tested environments Signed-off-by: VirtualTam --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 80db650..a3038c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ sudo: false language: php php: + - 7.0 - 5.6 - 5.5 - 5.4 From 06b6660a7e8891c6e1c47815cf50ee5b2ef5f270 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 25 Jul 2015 13:15:47 +0200 Subject: [PATCH 168/658] Avoid Full Path Disclosure error on session error. * Add a function to validate session ID. * Generate a new session ID if an invalid token is passed. --- application/Utils.php | 26 +++++++++++++++++++++++++- index.php | 41 ++++++++++++++++++++++++++++------------- tests/UtilsTest.php | 19 ++++++++++++++++++- 3 files changed, 71 insertions(+), 15 deletions(-) diff --git a/application/Utils.php b/application/Utils.php index cd4724f..fa18f15 100644 --- a/application/Utils.php +++ b/application/Utils.php @@ -137,4 +137,28 @@ function checkPHPVersion($minVersion, $curVersion) ); } } -?> + +/** + * Validate session ID to prevent Full Path Disclosure. + * See #298. + * + * @param string $sessionId Session ID + * + * @return true if valid, false otherwise. + */ +function is_session_id_valid($sessionId) +{ + if (empty($sessionId)) { + return false; + } + + if (!$sessionId) { + return false; + } + + if (!preg_match('/^[a-z0-9]{2,32}$/', $sessionId)) { + return false; + } + + return true; +} diff --git a/index.php b/index.php index 8e04fa3..a093a28 100755 --- a/index.php +++ b/index.php @@ -43,19 +43,6 @@ define('shaarli_version','0.5.1'); // http://server.com/x/shaarli --> /shaarli/ define('WEB_PATH', substr($_SERVER["REQUEST_URI"], 0, 1+strrpos($_SERVER["REQUEST_URI"], '/', 0))); -// Force cookie path (but do not change lifetime) -$cookie=session_get_cookie_params(); -$cookiedir = ''; if(dirname($_SERVER['SCRIPT_NAME'])!='/') $cookiedir=dirname($_SERVER["SCRIPT_NAME"]).'/'; -session_set_cookie_params($cookie['lifetime'],$cookiedir,$_SERVER['SERVER_NAME']); // Set default cookie expiration and path. - -// Set session parameters on server side. -define('INACTIVITY_TIMEOUT',3600); // (in seconds). If the user does not access any page within this time, his/her session is considered expired. -ini_set('session.use_cookies', 1); // Use cookies to store session. -ini_set('session.use_only_cookies', 1); // Force cookies for session (phpsessionID forbidden in URL). -ini_set('session.use_trans_sid', false); // Prevent PHP form using sessionID in URL if cookies are disabled. -session_name('shaarli'); -if (session_id() == '') session_start(); // Start session if needed (Some server auto-start sessions). - // PHP Settings ini_set('max_input_time','60'); // High execution time in case of problematic imports/exports. ini_set('memory_limit', '128M'); // Try to set max upload file size and read (May not work on some hosts). @@ -87,6 +74,34 @@ try { exit; } +// Force cookie path (but do not change lifetime) +$cookie = session_get_cookie_params(); +$cookiedir = ''; +if (dirname($_SERVER['SCRIPT_NAME']) != '/') { + $cookiedir = dirname($_SERVER["SCRIPT_NAME"]).'/'; +} +// Set default cookie expiration and path. +session_set_cookie_params($cookie['lifetime'], $cookiedir, $_SERVER['SERVER_NAME']); +// Set session parameters on server side. +// If the user does not access any page within this time, his/her session is considered expired. +define('INACTIVITY_TIMEOUT', 3600); // in seconds. +// Use cookies to store session. +ini_set('session.use_cookies', 1); +// Force cookies for session (phpsessionID forbidden in URL). +ini_set('session.use_only_cookies', 1); +// Prevent PHP form using sessionID in URL if cookies are disabled. +ini_set('session.use_trans_sid', false); + +// Regenerate session id if invalid or not defined in cookie. +if (isset($_COOKIE['shaarli']) && !is_session_id_valid($_COOKIE['shaarli'])) { + $_COOKIE['shaarli'] = uniqid(); +} +session_name('shaarli'); +// Start session if needed (Some server auto-start sessions). +if (session_id() == '') { + session_start(); +} + include "inc/rain.tpl.class.php"; //include Rain TPL raintpl::$tpl_dir = $GLOBALS['config']['RAINTPL_TPL']; // template directory raintpl::$cache_dir = $GLOBALS['config']['RAINTPL_TMP']; // cache directory diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php index 28e15f5..e39ce6b 100644 --- a/tests/UtilsTest.php +++ b/tests/UtilsTest.php @@ -150,5 +150,22 @@ class UtilsTest extends PHPUnit_Framework_TestCase { checkPHPVersion('5.3', '5.2'); } + + /** + * Test is_session_id_valid with a valid ID. + */ + public function testIsSessionIdValid() + { + $this->assertTrue(is_session_id_valid('123456789012345678901234567890az')); + } + + /** + * Test is_session_id_valid with invalid IDs. + */ + public function testIsSessionIdInvalid() + { + $this->assertFalse(is_session_id_valid('')); + $this->assertFalse(is_session_id_valid(array())); + $this->assertFalse(is_session_id_valid('c0ZqcWF3VFE2NmJBdm1HMVQ0ZHJ3UmZPbTFsNGhkNHI=')); + } } -?> From 9e1724f1922bf9e38299eecedfce2dcdbd416749 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 20 Aug 2015 19:47:01 +0200 Subject: [PATCH 169/658] Fixes #325 - Shaarli does not recognize saved links PHP doesn't seem to autoconvert objects to strings when they're use as array indexes. Fixes regression introduced in d9d776af19fd0a191f82525991dafbb56e1bcfcb --- application/Url.php | 16 ++++++++++ index.php | 76 ++++++++++++++++++++++++--------------------- tests/UrlTest.php | 16 ++++++++++ 3 files changed, 73 insertions(+), 35 deletions(-) mode change 100644 => 100755 application/Url.php mode change 100644 => 100755 tests/UrlTest.php diff --git a/application/Url.php b/application/Url.php old mode 100644 new mode 100755 index 23356f3..02a4395 --- a/application/Url.php +++ b/application/Url.php @@ -81,6 +81,10 @@ class Url public function __construct($url) { $this->parts = parse_url($url); + + if (!empty($url) && empty($this->parts['scheme'])) { + $this->parts['scheme'] = 'http'; + } } /** @@ -147,4 +151,16 @@ class Url $this->cleanupFragment(); return $this->__toString(); } + + /** + * Get URL scheme. + * + * @return string the URL scheme or false if none is provided. + */ + public function getScheme() { + if (!isset($this->parts['scheme'])) { + return false; + } + return $this->parts['scheme']; + } } diff --git a/index.php b/index.php index 8e04fa3..ba70b29 100755 --- a/index.php +++ b/index.php @@ -1485,51 +1485,57 @@ function renderPage() $url->cleanup(); $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) + // Check if URL is not already in database (in this case, we will edit the existing link) + $link = $LINKSDB->getLinkFromUrl((string)$url); if (!$link) { - $link_is_new = true; // This is a new link + $link_is_new = true; $linkdate = strval(date('Ymd_His')); - $title = (empty($_GET['title']) ? '' : $_GET['title'] ); // Get title if it was provided in URL (by the bookmarklet). - $description = (empty($_GET['description']) ? '' : $_GET['description']); // Get description if it was provided in URL (by the bookmarklet). [Bronco added that] - $tags = (empty($_GET['tags']) ? '' : $_GET['tags'] ); // Get tags if it was provided in URL - $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); // Get private if it was provided in URL - if (($url!='') && parse_url($url,PHP_URL_SCHEME)=='') $url = 'http://'.$url; + // Get title if it was provided in URL (by the bookmarklet). + $title = (empty($_GET['title']) ? '' : $_GET['title'] ); + // Get description if it was provided in URL (by the bookmarklet). [Bronco added that] + $description = (empty($_GET['description']) ? '' : $_GET['description']); + $tags = (empty($_GET['tags']) ? '' : $_GET['tags'] ); + $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); // If this is an HTTP link, we try go get the page to extract the title (otherwise we will to straight to the edit form.) - if (empty($title) && parse_url($url,PHP_URL_SCHEME)=='http') - { + if (empty($title) && $url->getScheme() == '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')!==false) - { - // Look for charset in html header. - preg_match('##Usi', $data, $meta); + if (strpos($status,'200 OK')!==false) { + // Look for charset in html header. + preg_match('##Usi', $data, $meta); - // If found, extract encoding. - if (!empty($meta[0])) - { - // Get encoding specified in header. - preg_match('#charset="?(.*)"#si', $meta[0], $enc); - // If charset not found, use utf-8. - $html_charset = (!empty($enc[1])) ? strtolower($enc[1]) : 'utf-8'; - } - else { $html_charset = 'utf-8'; } + // If found, extract encoding. + if (!empty($meta[0])) { + // Get encoding specified in header. + preg_match('#charset="?(.*)"#si', $meta[0], $enc); + // If charset not found, use utf-8. + $html_charset = (!empty($enc[1])) ? strtolower($enc[1]) : 'utf-8'; + } + else { + $html_charset = 'utf-8'; + } - // Extract title - $title = html_extract_title($data); - if (!empty($title)) - { - // Re-encode title in utf-8 if necessary. - $title = ($html_charset == 'iso-8859-1') ? utf8_encode($title) : $title; - } - } + // Extract title + $title = html_extract_title($data); + if (!empty($title)) { + // Re-encode title in utf-8 if necessary. + $title = ($html_charset == 'iso-8859-1') ? utf8_encode($title) : $title; + } + } } - if ($url=='') // In case of empty URL, this is just a text (with a link that points to itself) - { - $url='?'.smallHash($linkdate); - $title='Note: '; + if ($url == '') { + $url = '?' . smallHash($linkdate); + $title = 'Note: '; } - $link = array('linkdate'=>$linkdate,'title'=>$title,'url'=>$url,'description'=>$description,'tags'=>$tags,'private'=>$private); + $link = array( + 'linkdate' => $linkdate, + 'title' => $title, + 'url' => (string)$url, + 'description' => $description, + 'tags' => $tags, + 'private' => $private + ); } $PAGE = new pageBuilder; diff --git a/tests/UrlTest.php b/tests/UrlTest.php old mode 100644 new mode 100755 index a39630f..c848e88 --- a/tests/UrlTest.php +++ b/tests/UrlTest.php @@ -151,4 +151,20 @@ class UrlTest extends PHPUnit_Framework_TestCase $url->cleanup() ); } + + /** + * Test default http scheme. + */ + public function testDefaultScheme() { + $url = new Url(self::$baseUrl); + $this->assertEquals('http', $url->getScheme()); + $url = new Url('domain.tld'); + $this->assertEquals('http', $url->getScheme()); + $url = new Url('ssh://domain.tld'); + $this->assertEquals('ssh', $url->getScheme()); + $url = new Url('ftp://domain.tld'); + $this->assertEquals('ftp', $url->getScheme()); + $url = new Url('git://domain.tld/push?pull=clone#checkout'); + $this->assertEquals('git', $url->getScheme()); + } } From 26c503460cd2b50c2c122dba73d62e09ee04b9c8 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 31 Aug 2015 12:27:56 +0200 Subject: [PATCH 170/658] Add HTTPS support for title extracting feature --- index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index ba70b29..9c3f7c1 100755 --- a/index.php +++ b/index.php @@ -1497,8 +1497,8 @@ function renderPage() $description = (empty($_GET['description']) ? '' : $_GET['description']); $tags = (empty($_GET['tags']) ? '' : $_GET['tags'] ); $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); - // If this is an HTTP link, we try go get the page to extract the title (otherwise we will to straight to the edit form.) - if (empty($title) && $url->getScheme() == 'http') { + // If this is an HTTP(S) link, we try go get the page to extract the title (otherwise we will to straight to the edit form.) + if (empty($title) && strpos($url->getScheme(), 'http') !== false) { 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')!==false) { From 53cc2b93b85a080c6c06bc3633fb454241fc5699 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Mon, 31 Aug 2015 20:36:13 +0200 Subject: [PATCH 171/658] Bump version to 0.5.2 Minor changes - fix Full Path Disclosure upon cookie forgery - fix regression preventing to load LinkDB info when adding an existing link - also extract HTTPS page metadata (title) - add PHP 7 to Travis platforms Signed-off-by: VirtualTam --- index.php | 4 ++-- shaarli_version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index f4c7e78..b8ca734 100755 --- a/index.php +++ b/index.php @@ -1,5 +1,5 @@ /shaarli/ define('WEB_PATH', substr($_SERVER["REQUEST_URI"], 0, 1+strrpos($_SERVER["REQUEST_URI"], '/', 0))); diff --git a/shaarli_version.php b/shaarli_version.php index 294292a..6b72466 100644 --- a/shaarli_version.php +++ b/shaarli_version.php @@ -1 +1 @@ - + From 4d30975a06354c5a01d2dfdfc5441e160ef4073e Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 2 Sep 2015 17:00:38 +0200 Subject: [PATCH 172/658] Allow uppercase letters in PHP sessionid format Fixes shaarli/Shaarli#335 - Wrong login/password since v0.5.2 Regression introduced in 06b6660a7e8891c6e1c47815cf50ee5b2ef5f270 --- application/Utils.php | 2 +- tests/UtilsTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 application/Utils.php mode change 100644 => 100755 tests/UtilsTest.php diff --git a/application/Utils.php b/application/Utils.php old mode 100644 new mode 100755 index fa18f15..cb03f11 --- a/application/Utils.php +++ b/application/Utils.php @@ -156,7 +156,7 @@ function is_session_id_valid($sessionId) return false; } - if (!preg_match('/^[a-z0-9]{2,32}$/', $sessionId)) { + if (!preg_match('/^[a-z0-9]{2,32}$/i', $sessionId)) { return false; } diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php old mode 100644 new mode 100755 index e39ce6b..5175dde --- a/tests/UtilsTest.php +++ b/tests/UtilsTest.php @@ -156,7 +156,7 @@ class UtilsTest extends PHPUnit_Framework_TestCase */ public function testIsSessionIdValid() { - $this->assertTrue(is_session_id_valid('123456789012345678901234567890az')); + $this->assertTrue(is_session_id_valid('azertyuiop123456789AZERTYUIOP1aA')); } /** From ce8c4a84ba180802ca6e5f00f60353ad71d3fcc8 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 2 Sep 2015 18:06:21 +0200 Subject: [PATCH 173/658] Bump version to v0.5.3 Fixes a bug that could prevent user to login. --- index.php | 4 ++-- shaarli_version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 shaarli_version.php diff --git a/index.php b/index.php index b8ca734..d615da1 100755 --- a/index.php +++ b/index.php @@ -1,5 +1,5 @@ /shaarli/ define('WEB_PATH', substr($_SERVER["REQUEST_URI"], 0, 1+strrpos($_SERVER["REQUEST_URI"], '/', 0))); diff --git a/shaarli_version.php b/shaarli_version.php old mode 100644 new mode 100755 index 6b72466..b843a5b --- a/shaarli_version.php +++ b/shaarli_version.php @@ -1 +1 @@ - + From f8b936e7e75601b5d96525f25d5b52dbabd909b4 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Fri, 4 Sep 2015 21:25:47 +0200 Subject: [PATCH 174/658] Doc: sync from Wiki, generate HTML Additions: - Installation/Download: how to get Shaarli - Community software: ShaarliOS app Modifications: - Installation/Server requirements: PHP 5.4 EOL, PHP 7 announcements - Installation/Server configuration: improve Nginx security - Troubleshooting: PHP sessions on `free.fr` Signed-off-by: VirtualTam --- doc/3rd-party-libraries.html | 1 + doc/Backup,-restore,-import-and-export.html | 1 + doc/Coding-guidelines.html | 1 + doc/Community-&-Related-software.html | 7 +- doc/Community-&-Related-software.md | 54 ++++++----- ...llation-over-SSH-and-serve-it-locally.html | 1 + doc/Datastore-hacks.html | 1 + doc/Development.html | 1 + doc/Directory-structure.html | 1 + ...Download-CSS-styles-from-an-OPML-list.html | 1 + doc/Download.html | 97 +++++++++++++++++++ doc/Download.md | 31 ++++++ ...e-patch---add-new-via-field-for-links.html | 1 + doc/FAQ.html | 1 + doc/Firefox-share.html | 1 + doc/GnuPG-signature.html | 1 + doc/Home.html | 1 + doc/Plugin-System.html | 1 + doc/RSS-feeds.html | 1 + doc/Security.html | 1 + doc/Server-configuration.html | 8 +- doc/Server-configuration.md | 7 +- doc/Server-requirements.html | 18 ++-- doc/Server-requirements.md | 7 +- doc/Shaarli-configuration.html | 1 + doc/Sharing-button.html | 1 + doc/Static-analysis.html | 1 + doc/TODO.html | 1 + doc/Theming.html | 1 + doc/Troubleshooting.html | 8 +- doc/Troubleshooting.md | 7 +- doc/Unit-tests.html | 1 + doc/Usage.html | 1 + doc/_Footer.html | 61 ++++++++++++ doc/_Footer.md | 2 + doc/_Sidebar.html | 2 + doc/_Sidebar.md | 1 + doc/sidebar.html | 1 + 38 files changed, 289 insertions(+), 45 deletions(-) create mode 100644 doc/Download.html create mode 100644 doc/Download.md create mode 100644 doc/_Footer.html create mode 100644 doc/_Footer.md diff --git a/doc/3rd-party-libraries.html b/doc/3rd-party-libraries.html index 86f670a..21fa20a 100644 --- a/doc/3rd-party-libraries.html +++ b/doc/3rd-party-libraries.html @@ -17,6 +17,7 @@
  • Home
  • Installation
      +
    • Download
    • Server requirements
    • Server configuration
    • Shaarli configuration
      • diff --git a/doc/Backup,-restore,-import-and-export.html b/doc/Backup,-restore,-import-and-export.html index 40c7a85..5724b68 100644 --- a/doc/Backup,-restore,-import-and-export.html +++ b/doc/Backup,-restore,-import-and-export.html @@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
    • Home
    • Installation
        +
      • Download
      • Server requirements
      • Server configuration
      • Shaarli configuration
        • diff --git a/doc/Coding-guidelines.html b/doc/Coding-guidelines.html index fd6fa57..40d1791 100644 --- a/doc/Coding-guidelines.html +++ b/doc/Coding-guidelines.html @@ -17,6 +17,7 @@
      • Home
      • Installation
          +
        • Download
        • Server requirements
        • Server configuration
        • Shaarli configuration
          • diff --git a/doc/Community-&-Related-software.html b/doc/Community-&-Related-software.html index 25ef0f8..34bc615 100644 --- a/doc/Community-&-Related-software.html +++ b/doc/Community-&-Related-software.html @@ -17,6 +17,7 @@
        • Home
        • Installation -

          Android apps

          +

          Mobile Apps

          Integration with other platforms

          Alternatives to Shaarli

          diff --git a/doc/Community-&-Related-software.md b/doc/Community-&-Related-software.md index 9cf4793..77ea242 100644 --- a/doc/Community-&-Related-software.md +++ b/doc/Community-&-Related-software.md @@ -1,40 +1,42 @@ #Community & Related software -*Unofficial but related work on Shaarli. If you maintain one of these, please get in touch with us to help us find a way to adapt your work to our fork.* +_Unofficial but related work on Shaarli. If you maintain one of these, please get in touch with us to help us find a way to adapt your work to our fork._ -*TODO: contact repos owners to see if they'd like to standardize their work with the community fork.* +_TODO: contact repos owners to see if they'd like to standardize their work with the community fork._ ## Community -* [Liens en vrac de sebsauvage](http://sebsauvage.net/links/) - the original Shaarli[](.html) -* [A large list of Shaarlis](http://porneia.free.fr/pub/links/ou-est-shaarli.html)[](.html) -* [A list of working Shaarli aggregators](https://raw.githubusercontent.com/Oros42/find_shaarlis/master/annuaires.json)[](.html) -* [A list of some known Shaarlis](https://github.com/Oros42/shaarlis_list)[](.html) -* [Adieu Delicious, Diigo et StumbleUpon. Salut Shaarli ! - sebsauvage.net](http://sebsauvage.net/rhaa/index.php?2011/09/16/09/29/58-adieu-delicious-diigo-et-stumbleupon-salut-shaarli-) (fr) _16/09/2011 - the original post about Shaarli_[](.html) -* [Original ideas/fixme/TODO page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:ideas)[](.html) -* [Original discussion page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:discussion) (fr)[](.html) -* [Original revisions history](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)[](.html) -* [Shaarli.fr/my](https://www.shaarli.fr/my.php) - Unofficial, unsupported (old fork) hosted Shaarlis provider, courtesy of [DMeloni](https://github.com/DMeloni)[](.html) -* [Shaarli Community](http://shaarferme.etudiant-libre.fr.nf/index.php) - Unknown Shaarli hoster (unsupported, old fork)[](.html) +- [Liens en vrac de sebsauvage](http://sebsauvage.net/links/) - the original Shaarli[](.html) +- [A large list of Shaarlis](http://porneia.free.fr/pub/links/ou-est-shaarli.html)[](.html) +- [A list of working Shaarli aggregators](https://raw.githubusercontent.com/Oros42/find_shaarlis/master/annuaires.json)[](.html) +- [A list of some known Shaarlis](https://github.com/Oros42/shaarlis_list)[](.html) +- [Adieu Delicious, Diigo et StumbleUpon. Salut Shaarli ! - sebsauvage.net](http://sebsauvage.net/rhaa/index.php?2011/09/16/09/29/58-adieu-delicious-diigo-et-stumbleupon-salut-shaarli-) (fr) _16/09/2011 - the original post about Shaarli_[](.html) +- [Original ideas/fixme/TODO page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:ideas)[](.html) +- [Original discussion page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:discussion) (fr)[](.html) +- [Original revisions history](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)[](.html) +- [Shaarli.fr/my](https://www.shaarli.fr/my.php) - Unofficial, unsupported (old fork) hosted Shaarlis provider, courtesy of [DMeloni](https://github.com/DMeloni)[](.html) +- [Shaarli Community](http://shaarferme.etudiant-libre.fr.nf/index.php) - Unknown Shaarli hoster (unsupported, old fork)[](.html) ### Themes See [Theming](Theming.html) for the list of community-contributed themes, and an installation guide. ### Server apps - * [shaarchiver](https://github.com/nodiscc/shaarchiver) - Archive your Shaarli bookmarks and their content[](.html) - * [shaarli-river](https://github.com/mknexen/shaarli-river) - An aggregator for shaarlis with many features [](.html) - * [Shaarlo](https://github.com/DMeloni/shaarlo) - An aggregator for shaarlis with many features (a very popular running instance among french shaarliers: [shaarli.fr](http://shaarli.fr/))[](.html) - * [Shaarlimages](https://github.com/BoboTiG/shaarlimages) - An image-oriented aggregator for Shaarlis[](.html) - * [mknexen/shaarli-api](https://github.com/mknexen/shaarli-api) - A REST API for Shaarli[](.html) - * [Self dead link](https://github.com/qwertygc/shaarli-dev-code/blob/master/self-dead-link.php) - Detect dead links on shaarli. This version use the database of shaarli. An [another version](https://github.com/qwertygc/shaarli-dev-code/blob/master/dead-link.php), can be used for others shaarli (but use most ressources).[](.html) +- [shaarchiver](https://github.com/nodiscc/shaarchiver) - Archive your Shaarli bookmarks and their content[](.html) +- [shaarli-river](https://github.com/mknexen/shaarli-river) - An aggregator for shaarlis with many features [](.html) +- [Shaarlo](https://github.com/DMeloni/shaarlo) - An aggregator for shaarlis with many features (a very popular running instance among french shaarliers: [shaarli.fr](http://shaarli.fr/))[](.html) +- [Shaarlimages](https://github.com/BoboTiG/shaarlimages) - An image-oriented aggregator for Shaarlis[](.html) +- [mknexen/shaarli-api](https://github.com/mknexen/shaarli-api) - A REST API for Shaarli[](.html) +- [Self dead link](https://github.com/qwertygc/shaarli-dev-code/blob/master/self-dead-link.php) - Detect dead links on shaarli. This version use the database of shaarli. An [another version](https://github.com/qwertygc/shaarli-dev-code/blob/master/dead-link.php), can be used for others shaarli (but use most ressources).[](.html) -### Android apps - * [Shaarli for Android](http://sebsauvage.net/links/?ZAyDzg) - Android application that adds Shaarli as a sharing provider[](.html) - * [Shaarlier for Android](https://github.com/dimtion/Shaarlier) - Android application to simply add links directly into your Shaarli[](.html) +### Mobile Apps +- [github.com/mro/ShaarliOS](https://github.com/mro/ShaarliOS#the-missing-ios-8-share-extension-to-shaarli) iOS share extension - see [#308](https://github.com/shaarli/Shaarli/issues/308#issuecomment-132303709) for some promo codes,[](.html) +- [Shaarli for Android](http://sebsauvage.net/links/?ZAyDzg) - Android application that adds Shaarli as a sharing provider[](.html) +- [Shaarlier for Android](https://github.com/dimtion/Shaarlier) - Android application to simply add links directly into your Shaarli[](.html) ## Integration with other platforms - * [tt-rss-shaarli](https://github.com/jcsaaddupuy/tt-rss-shaarli) - [TinyTiny RSS](http://tt-rss.org/) plugin that adds support for sharing articles with Shaarli[](.html) - * [octopress-shaarli](https://github.com/ahmet2mir/octopress-shaarli) - Octopress plugin to retrieve Shaarli links on the sidebara[](.html) +- [tt-rss-shaarli](https://github.com/jcsaaddupuy/tt-rss-shaarli) - [TinyTiny RSS](http://tt-rss.org/) plugin that adds support for sharing articles with Shaarli[](.html) +- [octopress-shaarli](https://github.com/ahmet2mir/octopress-shaarli) - Octopress plugin to retrieve Shaarli links on the sidebar[](.html) ## Alternatives to Shaarli -* [Shaarli alternatives](http://alternativeto.net/software/shaarli/) (alternativeto.net)[](.html) -* [Bookie](https://github.com/bookieio/bookie) - Another self-hostable, free bookmark sharing software, written in Python[](.html) -* [Unmark](https://github.com/plainmade/unmark) - An open source todo app for bookmarks ([Homepage](https://unmark.it/))[](.html) +- [Shaarli alternatives](http://alternativeto.net/software/shaarli/) (alternativeto.net)[](.html) +- [Bookie](https://github.com/bookieio/bookie) - Another self-hostable, free bookmark sharing software, written in Python[](.html) +- [Unmark](https://github.com/plainmade/unmark) - An open source todo app for bookmarks ([Homepage](https://unmark.it/))[](.html) +- [Wordpress bookmarks](https://wordpress.org/plugins/wp-bookmarks/)[](.html) diff --git a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html index 1e81b73..e27b113 100644 --- a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html +++ b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html @@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
        • Home
        • Installation
            +
          • Download
          • Server requirements
          • Server configuration
          • Shaarli configuration
            • diff --git a/doc/Datastore-hacks.html b/doc/Datastore-hacks.html index e3adee1..0bf2a49 100644 --- a/doc/Datastore-hacks.html +++ b/doc/Datastore-hacks.html @@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
          • Home
          • Installation
              +
            • Download
            • Server requirements
            • Server configuration
            • Shaarli configuration
              • diff --git a/doc/Development.html b/doc/Development.html index 6e22257..88cf585 100644 --- a/doc/Development.html +++ b/doc/Development.html @@ -17,6 +17,7 @@
            • Home
            • Installation
                +
              • Download
              • Server requirements
              • Server configuration
              • Shaarli configuration
                • diff --git a/doc/Directory-structure.html b/doc/Directory-structure.html index ae0458f..7015923 100644 --- a/doc/Directory-structure.html +++ b/doc/Directory-structure.html @@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
              • Home
              • Installation
                  +
                • Download
                • Server requirements
                • Server configuration
                • Shaarli configuration
                  • diff --git a/doc/Download-CSS-styles-from-an-OPML-list.html b/doc/Download-CSS-styles-from-an-OPML-list.html index 033dd18..7d7fe96 100644 --- a/doc/Download-CSS-styles-from-an-OPML-list.html +++ b/doc/Download-CSS-styles-from-an-OPML-list.html @@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                • Home
                • Installation
                    +
                  • Download
                  • Server requirements
                  • Server configuration
                  • Shaarli configuration
                    • diff --git a/doc/Download.html b/doc/Download.html new file mode 100644 index 0000000..5f39c70 --- /dev/null +++ b/doc/Download.html @@ -0,0 +1,97 @@ + + + + + + + Shaarli - Download + + + + + + + +

                    Download

                    +

                    Get Shaarli!

                    +

                    Latest stable revision

                    +

                    This revision has been released and tested.

                    + +
                    $ git clone https://github.com/shaarli/Shaarli.git -b stable shaarli
                    +

                    Download as an archive

                    +
                    $ wget https://github.com/shaarli/Shaarli/archive/stable.zip
+$ unzip stable.zip
+$ mv Shaarli-stable shaarli
                    +

                    Tarballs are also available:

                    +
                    $ wget https://github.com/shaarli/Shaarli/archive/stable.tar.gz
+$ tar xvf stable.tar.gz
+$ mv Shaarli-stable shaarli
                    +

                    Development (mainline)

                    +

                    Use at your own risk!

                    +

                    To get the latest changes:

                    +
                    $ git clone https://github.com/shaarli/Shaarli.git shaarli
                    + + diff --git a/doc/Download.md b/doc/Download.md new file mode 100644 index 0000000..7930f54 --- /dev/null +++ b/doc/Download.md @@ -0,0 +1,31 @@ +#Download +## Get Shaarli! +### Latest stable revision +This revision has been [released](https://github.com/shaarli/Shaarli/releases) and tested.[](.html) + +#### Clone with Git (recommended) +```bash +$ git clone https://github.com/shaarli/Shaarli.git -b stable shaarli +``` + +#### Download as an archive +```bash +$ wget https://github.com/shaarli/Shaarli/archive/stable.zip +$ unzip stable.zip +$ mv Shaarli-stable shaarli +``` + +Tarballs are also available: +```bash +$ wget https://github.com/shaarli/Shaarli/archive/stable.tar.gz +$ tar xvf stable.tar.gz +$ mv Shaarli-stable shaarli +``` + +### Development (mainline) +_Use at your own risk!_ + +To get the latest changes: +```bash +$ git clone https://github.com/shaarli/Shaarli.git shaarli +``` diff --git a/doc/Example-patch---add-new-via-field-for-links.html b/doc/Example-patch---add-new-via-field-for-links.html index ff73ec0..388ff96 100644 --- a/doc/Example-patch---add-new-via-field-for-links.html +++ b/doc/Example-patch---add-new-via-field-for-links.html @@ -17,6 +17,7 @@
                  • Home
                  • Installation
                      +
                    • Download
                    • Server requirements
                    • Server configuration
                    • Shaarli configuration
                      • diff --git a/doc/FAQ.html b/doc/FAQ.html index b26b635..33eb7c6 100644 --- a/doc/FAQ.html +++ b/doc/FAQ.html @@ -17,6 +17,7 @@
                    • Home
                    • Installation
                        +
                      • Download
                      • Server requirements
                      • Server configuration
                      • Shaarli configuration
                        • diff --git a/doc/Firefox-share.html b/doc/Firefox-share.html index d666ac7..2943a86 100644 --- a/doc/Firefox-share.html +++ b/doc/Firefox-share.html @@ -17,6 +17,7 @@
                      • Home
                      • Installation
                          +
                        • Download
                        • Server requirements
                        • Server configuration
                        • Shaarli configuration
                          • diff --git a/doc/GnuPG-signature.html b/doc/GnuPG-signature.html index b7dc108..a1210b7 100644 --- a/doc/GnuPG-signature.html +++ b/doc/GnuPG-signature.html @@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                        • Home
                        • Installation
                            +
                          • Download
                          • Server requirements
                          • Server configuration
                          • Shaarli configuration
                            • diff --git a/doc/Home.html b/doc/Home.html index 90372a4..39d951c 100644 --- a/doc/Home.html +++ b/doc/Home.html @@ -17,6 +17,7 @@
                          • Home
                          • Installation
                              +
                            • Download
                            • Server requirements
                            • Server configuration
                            • Shaarli configuration
                              • diff --git a/doc/Plugin-System.html b/doc/Plugin-System.html index 719b76f..cb1cb74 100644 --- a/doc/Plugin-System.html +++ b/doc/Plugin-System.html @@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                            • Home
                            • Installation
                                +
                              • Download
                              • Server requirements
                              • Server configuration
                              • Shaarli configuration
                                • diff --git a/doc/RSS-feeds.html b/doc/RSS-feeds.html index 7d1de07..859869b 100644 --- a/doc/RSS-feeds.html +++ b/doc/RSS-feeds.html @@ -17,6 +17,7 @@
                              • Home
                              • Installation
                                  +
                                • Download
                                • Server requirements
                                • Server configuration
                                • Shaarli configuration
                                  • diff --git a/doc/Security.html b/doc/Security.html index db44da2..914fa50 100644 --- a/doc/Security.html +++ b/doc/Security.html @@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                                • Home
                                • Installation
                                    +
                                  • Download
                                  • Server requirements
                                  • Server configuration
                                  • Shaarli configuration
                                    • diff --git a/doc/Server-configuration.html b/doc/Server-configuration.html index e4e383a..3aa8972 100644 --- a/doc/Server-configuration.html +++ b/doc/Server-configuration.html @@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                                  • Home
                                  • Installation
                                      +
                                    • Download
                                    • Server requirements
                                    • Server configuration
                                    • Shaarli configuration
                                      • @@ -279,10 +280,15 @@ location ~ ~$ { } 
                                      # /etc/nginx/php.conf
 location ~ (index)\.php$ {
-    # proxy PHP requests to PHP-FPM
+    # filter and proxy PHP requests to PHP-FPM
     fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
     fastcgi_index  index.php;
     include        fastcgi.conf;
+}
+
+location ~ \.php$ {
+    # deny access to all other PHP scripts
+    deny all;
 }
                                      # /etc/nginx/static_assets.conf
 location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
diff --git a/doc/Server-configuration.md b/doc/Server-configuration.md
index c9ec4e1..c7b17c5 100644
--- a/doc/Server-configuration.md
+++ b/doc/Server-configuration.md
@@ -219,11 +219,16 @@ location ~ ~$ {
 ```nginx
 # /etc/nginx/php.conf
 location ~ (index)\.php$ {
-    # proxy PHP requests to PHP-FPM
+    # filter and proxy PHP requests to PHP-FPM
     fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
     fastcgi_index  index.php;
     include        fastcgi.conf;
 }
+
+location ~ \.php$ {
+    # deny access to all other PHP scripts
+    deny all;
+}
 ```
 
 ```nginx
diff --git a/doc/Server-requirements.html b/doc/Server-requirements.html
index b0426ee..f34f589 100644
--- a/doc/Server-requirements.html
+++ b/doc/Server-requirements.html
@@ -17,6 +17,7 @@
 
                                    • Home
                                      • 
 
                                    • Installation
 
                                        
+
                                      • Download
                                        • 
 
                                      • Server requirements
                                        • 
 
                                      • Server configuration
                                        • 
 
                                      • Shaarli configuration
                                        • 
@@ -75,21 +76,26 @@
 
 
 
+7
+RC2
+planned
+
+
 5.6
 Supported
 :white_check_mark:
 
-
+
 5.5
 Supported
 :white_check_mark:
 
-
+
 5.4
-Supported
+EOL: 2015-09-14
 :white_check_mark:
 
-
+
 5.3
 EOL: 2014-08-14
 :white_check_mark:
@@ -100,9 +106,9 @@
 
-
                                        PHP 7.0 information:
                                        
+
                                        PHP 7 information:
                                        
 
                                          
-
                                        • Beta1 announcement
                                          • 
+
                                        • Announcements: Beta1, RC1, RC2
                                          • 
 
                                        • TODOLIST
                                          • 
 
                                        • Recent bugs
                                          • 
 
                                        • Git repository
                                          • 
diff --git a/doc/Server-requirements.md b/doc/Server-requirements.md
index 6ccccac..8f44d60 100644
--- a/doc/Server-requirements.md
+++ b/doc/Server-requirements.md
@@ -9,16 +9,17 @@
 ### Supported versions
 Version | Status | Shaarli compatibility
 :---:|:---:|:---:
+7   | RC2 | planned
 5.6 | Supported | :white_check_mark:
 5.5 | Supported | :white_check_mark:
-5.4 | Supported | :white_check_mark:
+5.4 | EOL: 2015-09-14 | :white_check_mark:
 5.3 | EOL: 2014-08-14 | :white_check_mark:
 
 See also:
 - [Travis configuration](https://github.com/shaarli/Shaarli/blob/master/.travis.yml)[](.html)
 
-PHP 7.0 information:
-- [Beta1 announcement](http://php.net/archive/2015.php#id2015-07-10-4)[](.html)
+PHP 7 information:
+- Announcements: [Beta1](http://php.net/archive/2015.php#id2015-07-10-4), [RC1](http://php.net/archive/2015.php#id2015-08-21-1), [RC2](http://php.net/archive/2015.php#id2015-09-04-1)[](.html)
 - [TODOLIST](https://wiki.php.net/todo/php70)[](.html)
 - [Recent bugs](https://bugs.php.net/search.php?limit=30&order_by=id&direction=DESC&cmd=display&status=Open&bug_type=All&phpver=7.0)[](.html)
 - [Git repository](http://git.php.net/?p=php-src.git;a=shortlog;h=refs/heads/PHP-7.0.0)[](.html)
diff --git a/doc/Shaarli-configuration.html b/doc/Shaarli-configuration.html
index 663b43e..b7e29cb 100644
--- a/doc/Shaarli-configuration.html
+++ b/doc/Shaarli-configuration.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                        • Home
                                          • 
 
                                        • Installation
 
                                            
+
                                          • Download
                                            • 
 
                                          • Server requirements
                                            • 
 
                                          • Server configuration
                                            • 
 
                                          • Shaarli configuration
                                            • 
diff --git a/doc/Sharing-button.html b/doc/Sharing-button.html
index d3f3625..6fa5e77 100644
--- a/doc/Sharing-button.html
+++ b/doc/Sharing-button.html
@@ -17,6 +17,7 @@
 
                                          • Home
                                            • 
 
                                          • Installation
 
                                              
+
                                            • Download
                                              • 
 
                                            • Server requirements
                                              • 
 
                                            • Server configuration
                                              • 
 
                                            • Shaarli configuration
                                              • 
diff --git a/doc/Static-analysis.html b/doc/Static-analysis.html
index dd1dd22..e95893a 100644
--- a/doc/Static-analysis.html
+++ b/doc/Static-analysis.html
@@ -17,6 +17,7 @@
 
                                            • Home
                                              • 
 
                                            • Installation
 
                                                
+
                                              • Download
                                                • 
 
                                              • Server requirements
                                                • 
 
                                              • Server configuration
                                                • 
 
                                              • Shaarli configuration
                                                • 
diff --git a/doc/TODO.html b/doc/TODO.html
index c25775c..7a6a4bf 100644
--- a/doc/TODO.html
+++ b/doc/TODO.html
@@ -17,6 +17,7 @@
 
                                              • Home
                                                • 
 
                                              • Installation
 
                                                  
+
                                                • Download
                                                  • 
 
                                                • Server requirements
                                                  • 
 
                                                • Server configuration
                                                  • 
 
                                                • Shaarli configuration
                                                  • 
diff --git a/doc/Theming.html b/doc/Theming.html
index b5d214e..a751eb9 100644
--- a/doc/Theming.html
+++ b/doc/Theming.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                                • Home
                                                  • 
 
                                                • Installation
 
                                                    
+
                                                  • Download
                                                    • 
 
                                                  • Server requirements
                                                    • 
 
                                                  • Server configuration
                                                    • 
 
                                                  • Shaarli configuration
                                                    • 
diff --git a/doc/Troubleshooting.html b/doc/Troubleshooting.html
index 00cfdff..98fd535 100644
--- a/doc/Troubleshooting.html
+++ b/doc/Troubleshooting.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                                  • Home
                                                    • 
 
                                                  • Installation
 
                                                      
+
                                                    • Download
                                                      • 
 
                                                    • Server requirements
                                                      • 
 
                                                    • Server configuration
                                                      • 
 
                                                    • Shaarli configuration
                                                      • 
@@ -134,10 +135,11 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                                      Hosting problems
                                                      
 
                                                      Old PHP versions
                                                      
 
                                                        
-
                                                      • On free.fr : Please note that free uses php 5.1 and thus you will not have autocomplete in tag editing. Don't forget to create a sessions directory at the root of your webspace. Change the file extension to .php5 or create a .htaccess file in the directory where Shaarli is located containing:
                                                        • 
+
                                                      • On free.fr : free.fr now support php 5.6.x(link)and so support now the tag autocompletion but you have to do the following : At the root of your webspace create a sessions directory and a .htaccess file containing:
                                                        • 
 
                                                      
-
                                                      php 1
-SetEnv PHP_VER 5
                                                      
+
                                                      <IfDefine Free>
+php56 1
+</IfDefine>
                                                      
 
                                                        
 
                                                      • If you have an error such as: Parse error: syntax error, unexpected '=', expecting '(' in /links/index.php on line xxx, it means that your host is using php4, not php5. Shaarli requires php 5.1. Try changing the file extension to .php5
                                                        • 
 
                                                      • On 1and1 : If you add the link from the page (and not from the bookmarklet), Shaarli will no be able to get the title of the page. You will have to enter it manually. (Because they have disabled the ability to download a file through HTTP).
                                                        • 
diff --git a/doc/Troubleshooting.md b/doc/Troubleshooting.md
index 4e6cdb0..e91fe84 100644
--- a/doc/Troubleshooting.md
+++ b/doc/Troubleshooting.md
@@ -61,11 +61,12 @@ Search for `failed` in this file to look for unauthorized login attempts.
 
 ## Hosting problems
 ### Old PHP versions
- * On **free.fr** : Please note that free uses php 5.1 and thus you will not have autocomplete in tag editing.  Don't forget to create a `sessions` directory at the root of your webspace. Change the file extension to `.php5` or create a `.htaccess` file in the directory where Shaarli is located containing:
+ * On **free.fr** : free.fr now support php 5.6.x([link](http://les.pages.perso.chez.free.fr/migrations/php5v6.io))and so support now the tag autocompletion but you have to do the following : At the root of your webspace create a `sessions` directory and a `.htaccess` file containing:[](.html)
 
 ```ini
-php 1
-SetEnv PHP_VER 5
+
+php56 1
+
 ```
 
  * If you have an error such as: `Parse error: syntax error, unexpected '=', expecting '(' in /links/index.php on line xxx`, it means that your host is using php4, not php5. Shaarli requires php 5.1. Try changing the file extension to `.php5`
diff --git a/doc/Unit-tests.html b/doc/Unit-tests.html
index f4b42bd..6d76077 100644
--- a/doc/Unit-tests.html
+++ b/doc/Unit-tests.html
@@ -36,6 +36,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                                      • Home
                                                        • 
 
                                                      • Installation
 
                                                          
+
                                                        • Download
                                                          • 
 
                                                        • Server requirements
                                                          • 
 
                                                        • Server configuration
                                                          • 
 
                                                        • Shaarli configuration
                                                          • 
diff --git a/doc/Usage.html b/doc/Usage.html
index ad5b796..0ba457f 100644
--- a/doc/Usage.html
+++ b/doc/Usage.html
@@ -17,6 +17,7 @@
 
                                                        • Home
                                                          • 
 
                                                        • Installation
 
                                                            
+
                                                          • Download
                                                            • 
 
                                                          • Server requirements
                                                            • 
 
                                                          • Server configuration
                                                            • 
 
                                                          • Shaarli configuration
                                                            • 
diff --git a/doc/_Footer.html b/doc/_Footer.html
new file mode 100644
index 0000000..9803238
--- /dev/null
+++ b/doc/_Footer.html
@@ -0,0 +1,61 @@
+
+
+
+  
+  
+  
+  Shaarli - _Footer
+  
+  
+  
+
+
+
+
                                                            _Footer
                                                            Shaarli, the personal, minimalist, super-fast, no-database delicious clone
                                                            
+
+
diff --git a/doc/_Footer.md b/doc/_Footer.md
new file mode 100644
index 0000000..29c39bb
--- /dev/null
+++ b/doc/_Footer.md
@@ -0,0 +1,2 @@
+#_Footer
+_Shaarli, the personal, minimalist, super-fast, no-database delicious clone_
diff --git a/doc/_Sidebar.html b/doc/_Sidebar.html
index 0f9d546..fbf6dff 100644
--- a/doc/_Sidebar.html
+++ b/doc/_Sidebar.html
@@ -17,6 +17,7 @@
 
                                                          • Home
                                                            • 
 
                                                          • Installation
 
                                                              
+
                                                            • Download
                                                              • 
 
                                                            • Server requirements
                                                              • 
 
                                                            • Server configuration
                                                              • 
 
                                                            • Shaarli configuration
                                                              • 
@@ -60,6 +61,7 @@
 
                                                            • Home
                                                              • 
 
                                                            • Installation
 
                                                                
+
                                                              • Download
                                                                • 
 
                                                              • Server requirements
                                                                • 
 
                                                              • Server configuration
                                                                • 
 
                                                              • Shaarli configuration
                                                                • 
diff --git a/doc/_Sidebar.md b/doc/_Sidebar.md
index db75943..68e3b9f 100644
--- a/doc/_Sidebar.md
+++ b/doc/_Sidebar.md
@@ -1,6 +1,7 @@
 #_Sidebar
 - [Home](Home.html)
 - Installation
+    - [Download](Download.html)
     - [Server requirements](Server-requirements.html)
     - [Server configuration](Server-configuration.html)
     - [Shaarli configuration](Shaarli-configuration.html)
diff --git a/doc/sidebar.html b/doc/sidebar.html
index e8bc593..826e4cb 100644
--- a/doc/sidebar.html
+++ b/doc/sidebar.html
@@ -3,6 +3,7 @@
 
                                                              • Home
                                                                • 
 
                                                              • Installation
 
                                                                  
+
                                                                • Download
                                                                  • 
 
                                                                • Server requirements
                                                                  • 
 
                                                                • Server configuration
                                                                  • 
 
                                                                • Shaarli configuration
                                                                  • 

From e9b80e72729c3fb984f7b2f3d9603c3b3fcd1849 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Sun, 6 Sep 2015 01:56:37 +0200
Subject: [PATCH 175/658] Rewrite README.md

Modifications:
 - group content in sections
 - homogenize formatting
 - replace installation instructions by links to the corresponding wiki pages
 - update badges
   - use http://shields.io/ to generate SVGs with custom labels
   - master branch: update Travis label
   - stable branch: add Travis status
   - GitHub release: display the latest released version

Signed-off-by: VirtualTam 
---
 README.md | 163 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 94 insertions(+), 69 deletions(-)

diff --git a/README.md b/README.md
index a5a3bba..9cc4773 100755
--- a/README.md
+++ b/README.md
@@ -1,89 +1,114 @@
 ![Shaarli logo](doc/images/doc-logo.png)
 
-Shaarli, the personal, minimalist, super-fast, no-database delicious clone.
+The personal, minimalist, super-fast, no-database delicious clone.
 
-Do you want to share the links you discover? Shaarli is a minimalist delicious clone you can install on your own website.
-It is designed to be personal (single-user), fast and handy.
+_Do you want to share the links you discover?_
+_Shaarli is a minimalist delicious clone that you can install on your own server._
+_It is designed to be personal (single-user), fast and handy._
 
-[![Join the chat at https://gitter.im/shaarli/Shaarli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/shaarli/Shaarli)
-[![Bountysource](https://www.bountysource.com/badge/team?team_id=19583&style=bounties_received)](https://www.bountysource.com/teams/shaarli/issues) [![](https://api.travis-ci.org/shaarli/Shaarli.svg)](https://travis-ci.org/shaarli/Shaarli)
+[![](https://img.shields.io/travis/shaarli/Shaarli.svg?label=master)](https://travis-ci.org/shaarli/Shaarli)
+[![](https://img.shields.io/travis/shaarli/Shaarli/stable.svg?label=stable)](https://travis-ci.org/shaarli/Shaarli)
+[![](https://img.shields.io/github/release/shaarli/shaarli.svg)](https://github.com/shaarli/Shaarli/releases/latest/)
 [![Docker repository](https://img.shields.io/docker/pulls/shaarli/shaarli.svg)](https://hub.docker.com/r/shaarli/shaarli/)
 
+[![Join the chat at https://gitter.im/shaarli/Shaarli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/shaarli/Shaarli)
+[![Bountysource](https://www.bountysource.com/badge/team?team_id=19583&style=bounties_received)](https://www.bountysource.com/teams/shaarli/issues)
+
+## Quickstart
+- [Wiki/documentation](https://github.com/shaarli/Shaarli/wiki)
+- [Bugs/Feature requests/Discussion](https://github.com/shaarli/Shaarli/issues/)
+
+### Demo
+You can use this [public demo instance of Shaarli](http://shaarlidemo.tuxfamily.org/Shaarli).
+It runs the latest development version of Shaarli and is updated/reset daily.
+
+Login: `demo`; Password: `demo`
+
+### Installation & upgrade
+- [Download](https://github.com/shaarli/Shaarli/wiki/Download)
+- [Server requirements](https://github.com/shaarli/Shaarli/wiki/Server-requirements)
+- [Server configuration](https://github.com/shaarli/Shaarli/wiki/Server-configuration)
+- [Shaarli configuration](https://github.com/shaarli/Shaarli/wiki/Shaarli-configuration)
+
 ## Features
+### Interface
+- minimalist design (simple is beautiful)
+- FAST
+- ATOM and RSS feeds
+- views:
+    - paginated link list
+    - tag cloud
+    - picture wall: image and video thumbails
+    - daily: newspaper-like daily digest
+    - daily RSS feed
+- permalinks for easy reference
+- links can be public or private
 
- * Minimalist design (simple is beautiful)
- * **FAST**
- * Dead-simple installation: Drop the files, open the page. No database required.
- * Easy to use: Single button in your browser to bookmark a page (**bookmarklet**)
- * Save **URL, title, description** (unlimited size).
- * Classify, search and filter links with **tags**.
-  * Tag autocompletion, renaming, merging and deletion.
- * Save links as **public or private**
- * Browse links by page, filter by tag or use the **full text search engine**
- * **Tag cloud**
- * **Picture wall** (which can be filtered by tag or text search)
- * **“Daily”** Newspaper-like digest, browsable by day.
- * **Permalinks** (with QR-Code) for easy reference
- * **RSS** and ATOM feeds
-  * Can be filtered by tag or text search!
-  * “Daily” RSS feed: Get each day a digest of all new links.
- * Can **import/export** Netscape bookmarks (for import/export from/to Firefox, Opera, Chrome, Delicious…)
- * Automatic **image/video thumbnails** for various services (imgur, imageshack.us, flickr, youtube, vimeo, dailymotion…)
- * Support for http/ftp/file/apt/magnet protocol links
-  * URLs in descriptions are automatically converted to clickable links in descriptions
- * Easy backup (Data stored in a single file)
- * 1-click access to your private links/notes
- * Compact storage (1315 links stored in 150 kb)
- * Mobile browsers support
- * Also works with javascript disabled
- * Brute force protected login form
- * [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) protocol support
- * Automatic removal of annoying FeedBurner/Google FeedProxy parameters in URL (?utm_source…)
- * Pages are easy to customize (using CSS and simple RainTPL templates)
- * Protected against [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery), session cookie hijacking.
- * You will be automatically notified by a discreet popup if a new version is available
- * **Shaarli is a bookmarking application, but you can use it for micro-blogging (like Twitter), a pastebin, an online notepad, a snippet repository, etc. See [Usage examples](https://github.com/shaarli/Shaarli/wiki#usage-examples)**
+### Tag, view and search your links!
+- add a custom title and description to archived links
+- add tags to classify and search links
+    - features tag autocompletion, renaming, merging and deletion
+- full-text and tag search
 
-## Demo
-You can use this [public demo instance of Shaarli](http://shaarlidemo.tuxfamily.org/Shaarli). This demo runs the latest _development version_ of Shaarli and is updated/reset every day.
+### Easy setup
+- dead-simple installation: drop the files, open the page
+- links are stored in a file
+    - compact storage
+    - no database required
+    - easy backup: simply copy the datastore file
+- import and export links as Netscape bookmarks
 
-Login: `demo`
-Password: `demo`
+### Accessibility
+- Firefox bookmarlet to share links in one click
+- support for mobile browsers
+- works with Javascript disabled
+- easy page customization through HTML/CSS/RainTPL
 
+### Security
+- bruteforce-proof login form
+- protected against [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery)
+and session cookie hijacking
 
-## Links
-
- * **[Wiki/documentation](https://github.com/shaarli/Shaarli/wiki)**
- * [Bugs/Feature requests/Discussion](https://github.com/shaarli/Shaarli/issues/)
-
-
-## Requirements
-
-Check the [Server requirements](https://github.com/shaarli/Shaarli/wiki/Server-requirements) wiki page.
-
-## Installing
-
- * Download the latest stable release from https://github.com/shaarli/Shaarli/releases
- * Unpack the archive in a directory on your web server
- * Visit this directory from a web browser.
- * Choose login, password, timezone and page title. Save.
-
-_To get the development version, download https://github.com/shaarli/Shaarli/archive/master.zip or `git clone https://github.com/shaarli/Shaarli`_
-
-
-## Upgrading
-
- * **If you installed from the zip:** Delete all files and directories except the `data` directory, then unzip the new version of Shaarli.  You will not lose your links and you will not have to reconfigure it.
- * **If you installed using `git clone`**: run `git pull` in your Shaarli directory.
+### Goodies
+- thumbnail generation for images and video services:
+dailymotion, flickr, imageshack, imgur, vimeo, xkcd, youtube...
+    - lazy-loading with [bLazy](http://dinbror.dk/blazy/)
+- [PubSubHubbub](https://code.google.com/p/pubsubhubbub/) protocol support
+- URL cleanup: automatic removal of `?utm_source=...`, `fb=...`
+- discreet pop-up notification when a new release is available
 
+### Other usages
+Though Shaarli is primarily a bookmarking application, it can serve other purposes
+(see [usage examples](https://github.com/shaarli/Shaarli/wiki#usage-examples)):
+- micro-blogging
+- pastebin
+- online notepad
+- snippet archive
 
 ## About
+### Shaarli community fork
+This friendly fork is maintained by the Shaarli community at https://github.com/shaarli/Shaarli
 
-This friendly fork is maintained by the community at https://github.com/shaarli/Shaarli
+This is a community fork of the original [Shaarli](https://github.com/sebsauvage/Shaarli/) project by [Sébastien Sauvage](http://sebsauvage.net/).
 
-This is a community fork of the original [Shaarli](https://github.com/sebsauvage/Shaarli/) project by [sebsauvage](http://sebsauvage.net/). The original project is currently unmaintained, and the developer [has informed us](https://github.com/sebsauvage/Shaarli/issues/191) that he would have no time to work on Shaarli in the near future. The Shaarli community has carried on the work to provide [many patches](https://github.com/shaarli/Shaarli/compare/sebsauvage:master...master) for [bug fixes and enhancements](https://github.com/shaarli/Shaarli/issues?q=is%3Aclosed+) in this repository, and will keep maintaining the project for the foreseeable future, while keeping Shaarli simple and efficient. If you'd like to help, have a look at the current [issues](https://github.com/shaarli/Shaarli/issues) and [pull requests](https://github.com/shaarli/Shaarli/pulls) and feel free to report bugs and feature requests, propose solutions to existing problems and send us pull requests. 
+The original project is currently unmaintained, and the developer
+[has informed us](https://github.com/sebsauvage/Shaarli/issues/191) that he would
+have no time to work on Shaarli in the near future.
+The Shaarli community has carried on the work to provide
+[many patches](https://github.com/shaarli/Shaarli/compare/sebsauvage:master...master)
+for [bug fixes and enhancements](https://github.com/shaarli/Shaarli/issues?q=is%3Aclosed+)
+in this repository, and will keep maintaining the project for the foreseeable future,
+while keeping Shaarli simple and efficient.
+
+### Contributing
+If you'd like to help, please:
+- have a look at the open [issues](https://github.com/shaarli/Shaarli/issues)
+and [pull requests](https://github.com/shaarli/Shaarli/pulls)
+- feel free to report bugs (feedback is much appreciated)
+- suggest new features and improvements to both code and [documentation](https://github.com/shaarli/Shaarli/wiki)
+- propose solutions to existing problems
+- submit pull requests :-)
 
 
-## License
-
+### License
 Shaarli is [Free Software](http://en.wikipedia.org/wiki/Free_software). See [COPYING](COPYING) for a detail of the contributors and licenses for each individual component.

From cd5c1028920a096cefc4b2dc3c15bb18c07d9101 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Sun, 6 Sep 2015 02:22:52 +0200
Subject: [PATCH 176/658] Update README.md

---
 README.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 9cc4773..a693e47 100755
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Login: `demo`; Password: `demo`
 - views:
     - paginated link list
     - tag cloud
-    - picture wall: image and video thumbails
+    - picture wall: image and video thumbnails
     - daily: newspaper-like daily digest
     - daily RSS feed
 - permalinks for easy reference
@@ -91,14 +91,12 @@ This friendly fork is maintained by the Shaarli community at https://github.com/
 
 This is a community fork of the original [Shaarli](https://github.com/sebsauvage/Shaarli/) project by [Sébastien Sauvage](http://sebsauvage.net/).
 
-The original project is currently unmaintained, and the developer
-[has informed us](https://github.com/sebsauvage/Shaarli/issues/191) that he would
-have no time to work on Shaarli in the near future.
+The original project is currently unmaintained, and the developer [has informed us](https://github.com/sebsauvage/Shaarli/issues/191)
+that he would have no time to work on Shaarli in the near future.
 The Shaarli community has carried on the work to provide
 [many patches](https://github.com/shaarli/Shaarli/compare/sebsauvage:master...master)
 for [bug fixes and enhancements](https://github.com/shaarli/Shaarli/issues?q=is%3Aclosed+)
-in this repository, and will keep maintaining the project for the foreseeable future,
-while keeping Shaarli simple and efficient.
+in this repository, and will keep maintaining the project for the foreseeable future, while keeping Shaarli simple and efficient.
 
 ### Contributing
 If you'd like to help, please:

From db5453e4b6861ff8bad96ca09e55db6f75dd30a0 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Sun, 6 Sep 2015 03:07:25 +0200
Subject: [PATCH 177/658] COPYING: update contributor list

Signed-off-by: VirtualTam 
---
 COPYING | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/COPYING b/COPYING
index 7e222aa..adc856e 100644
--- a/COPYING
+++ b/COPYING
@@ -15,10 +15,16 @@ Copyright: (c) 2011-2015 Sébastien SAUVAGE 
            (c) 2011-2015 nodiscc 
            (c) 2011-2015 Florian Eula 
            (c) 2011-2015 Arthur Hoaro 
-           (c) 2011-2015 virtualtam 
+           (c) 2011-2015 Aurélien "VirtualTam" Tamisier 
            (c) 2011-2015 qwertygc 
            (c) 2011-2015 idleman 
+           (c) 2015 Alexis Ju 
+           (c) 2015 dimtion 
+           (c) 2015 Felix Bartels 
+           (c) 2015 Marsup 
            (c) 2015 Miloš Jovanović 
+           (c) 2015 Nicolás Danelón 
+           (c) 2015 TsT 
 
 
 Files: inc/reset.css

From 68bc21353a6138a898724c8bb87684bb2b6b2c1c Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Thu, 3 Sep 2015 23:12:58 +0200
Subject: [PATCH 178/658] Session ID: extend the regex to match possible hash
 representations

Improves #306
Relates to #335 & #336
Duplicated by #339

Issues:
 - PHP regenerates the session ID if it is not compliant
 - the regex checking the session ID does not cover all cases
   - different algorithms: md5, sha1, sha256, etc.
   - bit representations: 4, 5, 6

Fix:
 - `index.php`:
   - remove `uniqid()` usage
   - call `session_regenerate_id()` if an invalid cookie is detected
 - regex: support all possible characters - '[a-zA-Z,-]{2,128}'
 - tests: add coverage for all algorithms & bit representations

See:
 - http://php.net/manual/en/session.configuration.php#ini.session.hash-function
 - https://secure.php.net/manual/en/session.configuration.php#ini.session.hash-bits-per-character
 - http://php.net/manual/en/function.session-id.php
 - http://php.net/manual/en/function.session-regenerate-id.php
 - http://php.net/manual/en/function.hash-algos.php

Signed-off-by: VirtualTam 
---
 application/Utils.php                    |  7 ++-
 index.php                                | 10 +++--
 tests/UtilsTest.php                      | 56 ++++++++++++++++++++++--
 tests/utils/ReferenceSessionIdHashes.php | 55 +++++++++++++++++++++++
 4 files changed, 119 insertions(+), 9 deletions(-)
 create mode 100644 tests/utils/ReferenceSessionIdHashes.php

diff --git a/application/Utils.php b/application/Utils.php
index cb03f11..1422961 100755
--- a/application/Utils.php
+++ b/application/Utils.php
@@ -140,11 +140,16 @@ function checkPHPVersion($minVersion, $curVersion)
 
 /**
  * Validate session ID to prevent Full Path Disclosure.
+ *
  * See #298.
+ * The session ID's format depends on the hash algorithm set in PHP settings
  *
  * @param string $sessionId Session ID
  *
  * @return true if valid, false otherwise.
+ *
+ * @see http://php.net/manual/en/function.hash-algos.php
+ * @see http://php.net/manual/en/session.configuration.php
  */
 function is_session_id_valid($sessionId)
 {
@@ -156,7 +161,7 @@ function is_session_id_valid($sessionId)
         return false;
     }
 
-    if (!preg_match('/^[a-z0-9]{2,32}$/i', $sessionId)) {
+    if (!preg_match('/^[a-zA-Z0-9,-]{2,128}$/', $sessionId)) {
         return false;
     }
 
diff --git a/index.php b/index.php
index d615da1..8863cc2 100755
--- a/index.php
+++ b/index.php
@@ -92,16 +92,18 @@ ini_set('session.use_only_cookies', 1);
 // Prevent PHP form using sessionID in URL if cookies are disabled.
 ini_set('session.use_trans_sid', false);
 
-// Regenerate session id if invalid or not defined in cookie.
-if (isset($_COOKIE['shaarli']) && !is_session_id_valid($_COOKIE['shaarli'])) {
-    $_COOKIE['shaarli'] = uniqid();
-}
 session_name('shaarli');
 // Start session if needed (Some server auto-start sessions).
 if (session_id() == '') {
     session_start();
 }
 
+// Regenerate session ID if invalid or not defined in cookie.
+if (isset($_COOKIE['shaarli']) && !is_session_id_valid($_COOKIE['shaarli'])) {
+    session_regenerate_id(true);
+    $_COOKIE['shaarli'] = session_id();
+}
+
 include "inc/rain.tpl.class.php"; //include Rain TPL
 raintpl::$tpl_dir = $GLOBALS['config']['RAINTPL_TPL']; // template directory
 raintpl::$cache_dir = $GLOBALS['config']['RAINTPL_TMP']; // cache directory
diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
index 5175dde..7f218ad 100755
--- a/tests/UtilsTest.php
+++ b/tests/UtilsTest.php
@@ -4,12 +4,28 @@
  */
 
 require_once 'application/Utils.php';
+require_once 'tests/utils/ReferenceSessionIdHashes.php';
+
+// Initialize reference data before PHPUnit starts a session
+ReferenceSessionIdHashes::genAllHashes();
+
 
 /**
  * Unitary tests for Shaarli utilities
  */
 class UtilsTest extends PHPUnit_Framework_TestCase
 {
+    // Session ID hashes
+    protected static $sidHashes = null;
+
+    /**
+     * Assign reference data
+     */
+    public static function setUpBeforeClass()
+    {
+        self::$sidHashes = ReferenceSessionIdHashes::getHashes();
+    }
+
     /**
      * Represent a link by its hash
      */
@@ -152,11 +168,41 @@ class UtilsTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test is_session_id_valid with a valid ID.
+     * Test is_session_id_valid with a valid ID - TEST ALL THE HASHES!
+     *
+     * This tests extensively covers all hash algorithms / bit representations
      */
-    public function testIsSessionIdValid()
+    public function testIsAnyHashSessionIdValid()
     {
-        $this->assertTrue(is_session_id_valid('azertyuiop123456789AZERTYUIOP1aA'));
+        foreach (self::$sidHashes as $algo => $bpcs) {
+            foreach ($bpcs as $bpc => $hash) {
+                $this->assertTrue(is_session_id_valid($hash));
+            }
+        }
+    }
+
+    /**
+     * Test is_session_id_valid with a valid ID - SHA-1 hashes
+     */
+    public function testIsSha1SessionIdValid()
+    {
+        $this->assertTrue(is_session_id_valid(sha1('shaarli')));
+    }
+
+    /**
+     * Test is_session_id_valid with a valid ID - SHA-256 hashes
+     */
+    public function testIsSha256SessionIdValid()
+    {
+        $this->assertTrue(is_session_id_valid(hash('sha256', 'shaarli')));
+    }
+
+    /**
+     * Test is_session_id_valid with a valid ID - SHA-512 hashes
+     */
+    public function testIsSha512SessionIdValid()
+    {
+        $this->assertTrue(is_session_id_valid(hash('sha512', 'shaarli')));
     }
 
     /**
@@ -166,6 +212,8 @@ class UtilsTest extends PHPUnit_Framework_TestCase
     {
         $this->assertFalse(is_session_id_valid(''));
         $this->assertFalse(is_session_id_valid(array()));
-        $this->assertFalse(is_session_id_valid('c0ZqcWF3VFE2NmJBdm1HMVQ0ZHJ3UmZPbTFsNGhkNHI='));
+        $this->assertFalse(
+            is_session_id_valid('c0ZqcWF3VFE2NmJBdm1HMVQ0ZHJ3UmZPbTFsNGhkNHI=')
+        );
     }
 }
diff --git a/tests/utils/ReferenceSessionIdHashes.php b/tests/utils/ReferenceSessionIdHashes.php
new file mode 100644
index 0000000..60b1c00
--- /dev/null
+++ b/tests/utils/ReferenceSessionIdHashes.php
@@ -0,0 +1,55 @@
+
Date: Tue, 1 Sep 2015 21:45:06 +0200
Subject: [PATCH 179/658] HTTP: move utils to a proper file, add tests

Relates to #333

Modifications:
 - move HTTP utils to 'application/HttpUtils.php'
 - simplify logic
   - replace 'http_parse_headers_shaarli' by built-in 'get_headers()'
   - remove superfluous '$status' parameter (provided by the HTTP headers)
 - apply coding conventions
 - add test coverage (unitary only)

Signed-off-by: VirtualTam 
---
 application/HttpUtils.php |  52 ++++++++++++++++++
 index.php                 | 110 +++++++++++---------------------------
 tests/HttpUtilsTest.php   |  38 +++++++++++++
 3 files changed, 122 insertions(+), 78 deletions(-)
 create mode 100644 application/HttpUtils.php
 create mode 100644 tests/HttpUtilsTest.php

diff --git a/application/HttpUtils.php b/application/HttpUtils.php
new file mode 100644
index 0000000..175333a
--- /dev/null
+++ b/application/HttpUtils.php
@@ -0,0 +1,52 @@
+ array(
+            'method' => 'GET',
+            'timeout' => $timeout,
+            'user_agent' => 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:23.0)'
+                         .' Gecko/20100101 Firefox/23.0'
+        )
+    );
+
+    $context = stream_context_create($options);
+
+    try {
+        // TODO: catch Exception in calling code (thumbnailer)
+        $content = file_get_contents($url, false, $context, -1, $maxBytes);
+    } catch (Exception $exc) {
+        return array(array(0 => 'HTTP Error'), $exc->getMessage());
+    }
+
+    if (!$content) {
+        return array(array(0 => 'HTTP Error'), '');
+    }
+
+    return array(get_headers($url, 1), $content);
+}
diff --git a/index.php b/index.php
index 8863cc2..e39cff3 100755
--- a/index.php
+++ b/index.php
@@ -59,6 +59,7 @@ if (is_file($GLOBALS['config']['CONFIG_FILE'])) {
 // Shaarli library
 require_once 'application/Cache.php';
 require_once 'application/CachedPage.php';
+require_once 'application/HttpUtils.php';
 require_once 'application/LinkDB.php';
 require_once 'application/TimeZone.php';
 require_once 'application/Url.php';
@@ -209,9 +210,11 @@ function checkUpdate()
     // Get latest version number at most once a day.
     if (!is_file($GLOBALS['config']['UPDATECHECK_FILENAME']) || (filemtime($GLOBALS['config']['UPDATECHECK_FILENAME'])','',str_replace('', '', str_replace('array('method'=>'GET','timeout' => $timeout, 'user_agent' => 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0')); // Force network timeout
-        $context = stream_context_create($options);
-        $data=file_get_contents($url,false,$context,-1, 4000000); // We download at most 4 Mb from source.
-        if (!$data) { return array('HTTP Error',array(),''); }
-        $httpStatus=$http_response_header[0]; // e.g. "HTTP/1.1 200 OK"
-        $responseHeaders=http_parse_headers_shaarli($http_response_header);
-        return array($httpStatus,$responseHeaders,$data);
-    }
-    catch (Exception $e)  // getHTTP *can* fail silently (we don't care if the title cannot be fetched)
-    {
-        return array($e->getMessage(),'','');
-    }
-}
-
 // Extract title from an HTML document.
 // (Returns an empty string if not found.)
 function html_extract_title($html)
@@ -1516,9 +1472,10 @@ function renderPage()
             $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0);
             // If this is an HTTP(S) link, we try go get the page to extract the title (otherwise we will to straight to the edit form.)
             if (empty($title) && strpos($url->getScheme(), 'http') !== false) {
-                list($status,$headers,$data) = getHTTP($url,4); // Short timeout to keep the application responsive.
+                // Short timeout to keep the application responsive
+                list($headers, $data) = get_http_url($url, 4);
                 // FIXME: Decode charset according to specified in either 1) HTTP response headers or 2)  in html
-                if (strpos($status,'200 OK')!==false) {
+                if (strpos($headers[0], '200 OK') !== false) {
                     // Look for charset in html header.
                     preg_match('##Usi', $data, $meta);
 
@@ -2186,8 +2143,9 @@ function genThumbnail()
         }
         else // This is a flickr page (html)
         {
-            list($httpstatus,$headers,$data) = getHTTP($url,20); // Get the flickr html page.
-            if (strpos($httpstatus,'200 OK')!==false)
+            // Get the flickr html page.
+            list($headers, $data) = get_http_url($url, 20);
+            if (strpos($headers[0], '200 OK') !== false)
             {
                 // flickr now nicely provides the URL of the thumbnail in each flickr page.
                 preg_match('! tag on that page
         // http://www.ted.com/talks/mikko_hypponen_fighting_viruses_defending_the_net.html
         // 
-        list($httpstatus,$headers,$data) = getHTTP($url,5);
-        if (strpos($httpstatus,'200 OK')!==false)
-        {
+        list($headers, $data) = get_http_url($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)"!',$data,$matches);
             if (!empty($matches[1]))
             {   // Let's download the image.
                 $imageurl=$matches[1];
-                list($httpstatus,$headers,$data) = getHTTP($imageurl,20); // No control on image size, so wait long enough.
-                if (strpos($httpstatus,'200 OK')!==false)
-                {
+                // No control on image size, so wait long enough
+                list($headers, $data) = get_http_url($imageurl, 20);
+                if (strpos($headers[0], '200 OK') !== false) {
                     $filepath=$GLOBALS['config']['CACHEDIR'].'/'.$thumbname;
                     file_put_contents($filepath,$data); // Save image to cache.
                     if (resizeImage($filepath))
@@ -2273,17 +2228,16 @@ function genThumbnail()
         // There is no thumbnail available for xkcd comics, so download the whole image and resize it.
         // http://xkcd.com/327/
         // <BLABLA>
-        list($httpstatus,$headers,$data) = getHTTP($url,5);
-        if (strpos($httpstatus,'200 OK')!==false)
-        {
+        list($headers, $data) = get_http_url($url, 5);
+        if (strpos($headers[0], '200 OK') !== false) {
             // Extract the link to the thumbnail
             preg_match('!cleanup();
+}
+
+/**
+ * Get URL scheme.
+ *
+ * @param string url Url for which the scheme is requested
+ *
+ * @return mixed the URL scheme or false if none is provided.
+ */
+function get_url_scheme($url)
+{
+  $obj_url = new Url($url);
+  return $obj_url->getScheme();
+}
+
 /**
  * URL representation and cleanup utilities
  *
@@ -90,7 +116,7 @@ class Url
     /**
      * Returns a string representation of this URL
      */
-    public function __toString()
+    public function toString()
     {
         return unparse_url($this->parts);
     }
@@ -149,7 +175,7 @@ class Url
     {
         $this->cleanupQuery();
         $this->cleanupFragment();
-        return $this->__toString();
+        return $this->toString();
     }
 
     /**
diff --git a/index.php b/index.php
index e39cff3..61d92f0 100755
--- a/index.php
+++ b/index.php
@@ -1454,12 +1454,11 @@ function renderPage()
 
     // -------- User want to post a new link: Display link edit form.
     if (isset($_GET['post'])) {
-        $url = new Url($_GET['post']);
-        $url->cleanup();
+        $url = cleanup_url($_GET['post']);
 
         $link_is_new = false;
         // Check if URL is not already in database (in this case, we will edit the existing link)
-        $link = $LINKSDB->getLinkFromUrl((string)$url);
+        $link = $LINKSDB->getLinkFromUrl($url);
         if (!$link)
         {
             $link_is_new = true;
@@ -1471,7 +1470,7 @@ function renderPage()
             $tags = (empty($_GET['tags']) ? '' : $_GET['tags'] );
             $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0);
             // If this is an HTTP(S) link, we try go get the page to extract the title (otherwise we will to straight to the edit form.)
-            if (empty($title) && strpos($url->getScheme(), 'http') !== false) {
+            if (empty($title) && strpos(get_url_scheme($url), 'http') !== false) {
                 // Short timeout to keep the application responsive
                 list($headers, $data) = get_http_url($url, 4);
                 // FIXME: Decode charset according to specified in either 1) HTTP response headers or 2)  in html
@@ -1505,7 +1504,7 @@ function renderPage()
             $link = array(
                 'linkdate' => $linkdate,
                 'title' => $title,
-                'url' => (string)$url,
+                'url' => $url,
                 'description' => $description,
                 'tags' => $tags,
                 'private' => $private
diff --git a/tests/Url/CleanupUrlTest.php b/tests/Url/CleanupUrlTest.php
new file mode 100644
index 0000000..ba9a043
--- /dev/null
+++ b/tests/Url/CleanupUrlTest.php
@@ -0,0 +1,76 @@
+assertEquals('', cleanup_url(''));
+    }
+
+    /**
+     * Clean an already cleaned Url
+     */
+    public function testCleanupUrlAlreadyClean()
+    {
+        $ref = 'http://domain.tld:3000';
+        $this->assertEquals($ref, cleanup_url($ref));
+        $ref = $ref.'/path/to/dir/';
+        $this->assertEquals($ref, cleanup_url($ref));
+    }
+
+    /**
+     * Clean Url needing cleaning
+     */
+    public function testCleanupUrlNeedClean()
+    {
+        $ref = 'http://domain.tld:3000';
+        $this->assertEquals($ref, cleanup_url($ref.'#tk.rss_all'));
+        $this->assertEquals($ref, cleanup_url($ref.'#xtor=RSS-'));
+        $this->assertEquals($ref, cleanup_url($ref.'#xtor=RSS-U3ht0tkc4b'));
+        $this->assertEquals($ref, cleanup_url($ref.'?action_object_map=junk'));
+        $this->assertEquals($ref, cleanup_url($ref.'?action_ref_map=Cr4p!'));
+        $this->assertEquals($ref, cleanup_url($ref.'?action_type_map=g4R84g3'));
+
+        $this->assertEquals($ref, cleanup_url($ref.'?fb_stuff=v41u3'));
+        $this->assertEquals($ref, cleanup_url($ref.'?fb=71m3w4573'));
+
+        $this->assertEquals($ref, cleanup_url($ref.'?utm_campaign=zomg'));
+        $this->assertEquals($ref, cleanup_url($ref.'?utm_medium=numnum'));
+        $this->assertEquals($ref, cleanup_url($ref.'?utm_source=c0d3'));
+        $this->assertEquals($ref, cleanup_url($ref.'?utm_term=1n4l'));
+
+        $this->assertEquals($ref, cleanup_url($ref.'?xtor=some-url'));
+        $this->assertEquals($ref, cleanup_url($ref.'?xtor=some-url&fb=som3th1ng'));
+        $this->assertEquals($ref, cleanup_url(
+            $ref.'?fb=stuff&utm_campaign=zomg&utm_medium=numnum&utm_source=c0d3'
+        ));
+        $this->assertEquals($ref, cleanup_url(
+            $ref.'?xtor=some-url&fb=som3th1ng#tk.rss_all'
+        ));
+
+        // ditch annoying query params and fragment, keep useful params
+        $this->assertEquals(
+            $ref.'?my=stuff&is=kept',
+            cleanup_url(
+                $ref.'?fb=zomg&my=stuff&utm_medium=numnum&is=kept#tk.rss_all'
+            )
+        );
+
+        // ditch annoying query params, keep useful params and fragment
+        $this->assertEquals(
+            $ref.'?my=stuff&is=kept#again',
+            cleanup_url(
+                $ref.'?fb=zomg&my=stuff&utm_medium=numnum&is=kept#again'
+            )
+        );
+    }
+}
+
diff --git a/tests/Url/GetUrlSchemeTest.php b/tests/Url/GetUrlSchemeTest.php
new file mode 100644
index 0000000..72d80b3
--- /dev/null
+++ b/tests/Url/GetUrlSchemeTest.php
@@ -0,0 +1,31 @@
+assertEquals('', get_url_scheme(''));
+    }
+
+    /**
+     * Get normal scheme of Url
+     */
+    public function testGetUrlScheme()
+    {
+        $this->assertEquals('http', get_url_scheme('http://domain.tld:3000'));
+        $this->assertEquals('https', get_url_scheme('https://domain.tld:3000'));
+        $this->assertEquals('http', get_url_scheme('domain.tld'));
+        $this->assertEquals('ssh', get_url_scheme('ssh://domain.tld'));
+        $this->assertEquals('ftp', get_url_scheme('ftp://domain.tld'));
+        $this->assertEquals('git', get_url_scheme('git://domain.tld/push?pull=clone#checkout'));
+    }
+}
+
diff --git a/tests/Url/UnparseUrlTest.php b/tests/Url/UnparseUrlTest.php
new file mode 100644
index 0000000..edde73e
--- /dev/null
+++ b/tests/Url/UnparseUrlTest.php
@@ -0,0 +1,31 @@
+assertEquals('', unparse_url(array()));
+    }
+
+    /**
+     * Rebuild a full-featured URL
+     */
+    public function testUnparseFull()
+    {
+        $ref = 'http://username:password@hostname:9090/path'
+              .'?arg1=value1&arg2=value2#anchor';
+        $this->assertEquals($ref, unparse_url(parse_url($ref)));
+    }
+}
+
diff --git a/tests/UrlTest.php b/tests/Url/UrlTest.php
similarity index 85%
rename from tests/UrlTest.php
rename to tests/Url/UrlTest.php
index c848e88..e498d79 100755
--- a/tests/UrlTest.php
+++ b/tests/Url/UrlTest.php
@@ -5,30 +5,6 @@
 
 require_once 'application/Url.php';
 
-/**
- * Unitary tests for unparse_url()
- */
-class UnparseUrlTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Thanks for building nothing
-     */
-    public function testUnparseEmptyArray()
-    {
-        $this->assertEquals('', unparse_url(array()));
-    }
-
-    /**
-     * Rebuild a full-featured URL
-     */
-    public function testUnparseFull()
-    {
-        $ref = 'http://username:password@hostname:9090/path'
-              .'?arg1=value1&arg2=value2#anchor';
-        $this->assertEquals($ref, unparse_url(parse_url($ref)));
-    }
-}
-
 /**
  * Unitary tests for URL utilities
  */
@@ -44,7 +20,7 @@ class UrlTest extends PHPUnit_Framework_TestCase
     {
         $url = new Url(self::$baseUrl.$query.$fragment);
         $url->cleanup();
-        $this->assertEquals(self::$baseUrl, $url->__toString());
+        $this->assertEquals(self::$baseUrl, $url->toString());
     }
 
     /**
@@ -52,7 +28,8 @@ class UrlTest extends PHPUnit_Framework_TestCase
      */
     public function testEmptyConstruct()
     {
-        $this->assertEquals('', new Url(''));
+        $url = new Url('');
+        $this->assertEquals('', $url->toString());
     }
 
     /**
@@ -62,7 +39,8 @@ class UrlTest extends PHPUnit_Framework_TestCase
     {
         $ref = 'http://username:password@hostname:9090/path'
               .'?arg1=value1&arg2=value2#anchor';
-        $this->assertEquals($ref, new Url($ref));
+        $url = new Url($ref);
+        $this->assertEquals($ref, $url->toString());
     }
 
     /**

From 7b114771d337af3bfd51d8fda1e8f2fd5b39535d Mon Sep 17 00:00:00 2001
From: Fanch 
Date: Tue, 1 Sep 2015 13:37:04 +0200
Subject: [PATCH 181/658] SSL detection: add support for `X-Forwarded-Proto`

Duplicates #332

See:
 - RFC 7239 - Forwarded HTTP Extension
   http://www.ietf.org/rfc/rfc7239.txt
 - RFC 6238 - Deprecating the "X-" Prefix and Similar Constructs in Application Protocols
   http://www.ietf.org/rfc/rfc6648.txt
 - StackOverflow - Custom HTTP headers: naming conventions
   http://stackoverflow.com/a/3561399
---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 61d92f0..7818ee8 100755
--- a/index.php
+++ b/index.php
@@ -463,7 +463,7 @@ if (isset($_POST['login']))
 // You can append $_SERVER['SCRIPT_NAME'] to get the current script URL.
 function serverUrl()
 {
-    $https = (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS'])=='on')) || $_SERVER["SERVER_PORT"]=='443'; // HTTPS detection.
+    $https = (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS'])=='on')) || $_SERVER["SERVER_PORT"]=='443' || (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https'); // HTTPS detection.
     $serverport = ($_SERVER["SERVER_PORT"]=='80' || ($https && $_SERVER["SERVER_PORT"]=='443') ? '' : ':'.$_SERVER["SERVER_PORT"]);
     return 'http'.($https?'s':'').'://'.$_SERVER['SERVER_NAME'].$serverport;
 }

From 482d67bd523bf12f36508a0131d09fe299ee02f4 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Sun, 6 Sep 2015 21:31:37 +0200
Subject: [PATCH 182/658] HTTP: move server URL functions to `HttpUtils.php`

Relates to #333

Modifications:
 - refactor server URL utility functions
 - do not access global `$_SERVER` variables
 - add test coverage
 - improve readability
 - apply coding conventions

Signed-off-by: VirtualTam 
---
 application/HttpUtils.php                     |  80 +++++++++++
 index.php                                     |  78 ++++------
 .../GetHttpUrlTest.php}                       |   0
 tests/HttpUtils/IndexUrlTest.php              |  72 ++++++++++
 tests/HttpUtils/PageUrlTest.php               |  76 ++++++++++
 tests/HttpUtils/ServerUrlTest.php             | 135 ++++++++++++++++++
 6 files changed, 388 insertions(+), 53 deletions(-)
 rename tests/{HttpUtilsTest.php => HttpUtils/GetHttpUrlTest.php} (100%)
 create mode 100644 tests/HttpUtils/IndexUrlTest.php
 create mode 100644 tests/HttpUtils/PageUrlTest.php
 create mode 100644 tests/HttpUtils/ServerUrlTest.php

diff --git a/application/HttpUtils.php b/application/HttpUtils.php
index 175333a..499220c 100644
--- a/application/HttpUtils.php
+++ b/application/HttpUtils.php
@@ -50,3 +50,83 @@ function get_http_url($url, $timeout = 30, $maxBytes = 4194304)
 
     return array(get_headers($url, 1), $content);
 }
+
+/**
+ * Returns the server's base URL: scheme://domain.tld[:port]
+ *
+ * @param array $server the $_SERVER array
+ *
+ * @return string the server's base URL
+ *
+ * @see http://www.ietf.org/rfc/rfc7239.txt
+ * @see http://www.ietf.org/rfc/rfc6648.txt
+ * @see http://stackoverflow.com/a/3561399
+ * @see http://stackoverflow.com/q/452375
+ */
+function server_url($server)
+{
+    $scheme = 'http';
+    $port = '';
+
+    // Shaarli is served behind a proxy
+    if (isset($server['HTTP_X_FORWARDED_PROTO'])) {
+        // Keep forwarded scheme
+        $scheme = $server['HTTP_X_FORWARDED_PROTO'];
+
+        if (isset($server['HTTP_X_FORWARDED_PORT'])) {
+            // Keep forwarded port
+            $port = ':'.$server['HTTP_X_FORWARDED_PORT'];
+        }
+
+        return $scheme.'://'.$server['SERVER_NAME'].$port;
+    }
+
+    // SSL detection
+    if ((! empty($server['HTTPS']) && strtolower($server['HTTPS']) == 'on')
+        || (isset($server['SERVER_PORT']) && $server['SERVER_PORT'] == '443')) {
+        $scheme = 'https';
+    }
+
+    // Do not append standard port values
+    if (($scheme == 'http' && $server['SERVER_PORT'] != '80')
+        || ($scheme == 'https' && $server['SERVER_PORT'] != '443')) {
+        $port = ':'.$server['SERVER_PORT'];
+    }
+
+    return $scheme.'://'.$server['SERVER_NAME'].$port;
+}
+
+/**
+ * Returns the absolute URL of the current script, without the query
+ *
+ * If the resource is "index.php", then it is removed (for better-looking URLs)
+ *
+ * @param array $server the $_SERVER array
+ *
+ * @return string the absolute URL of the current script, without the query
+ */
+function index_url($server)
+{
+    $scriptname = $server['SCRIPT_NAME'];
+    if (endswith($scriptname, 'index.php')) {
+        $scriptname = substr($scriptname, 0, -9);
+    }
+    return server_url($server) . $scriptname;
+}
+
+/**
+ * Returns the absolute URL of the current script, with the query
+ *
+ * If the resource is "index.php", then it is removed (for better-looking URLs)
+ *
+ * @param array $server the $_SERVER array
+ *
+ * @return string the absolute URL of the current script, with the query
+ */
+function page_url($server)
+{
+    if (! empty($server['QUERY_STRING'])) {
+        return index_url($server).'?'.$server['QUERY_STRING'];
+    }
+    return index_url($server);
+}
diff --git a/index.php b/index.php
index 7818ee8..c1ddf4b 100755
--- a/index.php
+++ b/index.php
@@ -131,7 +131,7 @@ header("Pragma: no-cache");
 if (!is_writable(realpath(dirname(__FILE__)))) die('
                                                                  ERROR: Shaarli does not have the right to write in its own directory.
                                                                  ');
 
 // Handling of old config file which do not have the new parameters.
-if (empty($GLOBALS['title'])) $GLOBALS['title']='Shared links on '.escape(indexUrl());
+if (empty($GLOBALS['title'])) $GLOBALS['title']='Shared links on '.escape(index_url($_SERVER));
 if (empty($GLOBALS['timezone'])) $GLOBALS['timezone']=date_default_timezone_get();
 if (empty($GLOBALS['redirector'])) $GLOBALS['redirector']='';
 if (empty($GLOBALS['disablesessionprotection'])) $GLOBALS['disablesessionprotection']=false;
@@ -277,8 +277,8 @@ function pubsubhub()
     {
        $p = new Publisher($GLOBALS['config']['PUBSUBHUB_URL']);
        $topic_url = array (
-                       indexUrl().'?do=atom',
-                       indexUrl().'?do=rss'
+                       index_url($_SERVER).'?do=atom',
+                       index_url($_SERVER).'?do=rss'
                     );
        $p->publish_update($topic_url);
     }
@@ -458,34 +458,6 @@ if (isset($_POST['login']))
 // ------------------------------------------------------------------------------------------
 // Misc utility functions:
 
-// Returns the server URL (including port and http/https), without path.
-// e.g. "http://myserver.com:8080"
-// You can append $_SERVER['SCRIPT_NAME'] to get the current script URL.
-function serverUrl()
-{
-    $https = (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS'])=='on')) || $_SERVER["SERVER_PORT"]=='443' || (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https'); // HTTPS detection.
-    $serverport = ($_SERVER["SERVER_PORT"]=='80' || ($https && $_SERVER["SERVER_PORT"]=='443') ? '' : ':'.$_SERVER["SERVER_PORT"]);
-    return 'http'.($https?'s':'').'://'.$_SERVER['SERVER_NAME'].$serverport;
-}
-
-// Returns the absolute URL of current script, without the query.
-// (e.g. http://sebsauvage.net/links/)
-function indexUrl()
-{
-    $scriptname = $_SERVER["SCRIPT_NAME"];
-    // If the script is named 'index.php', we remove it (for better looking URLs,
-    // e.g. http://mysite.com/shaarli/?abcde instead of http://mysite.com/shaarli/index.php?abcde)
-    if (endswith($scriptname,'index.php')) $scriptname = substr($scriptname,0,strlen($scriptname)-9);
-    return serverUrl() . $scriptname;
-}
-
-// Returns the absolute URL of current script, WITH the query.
-// (e.g. http://sebsauvage.net/links/?toto=titi&spamspamspam=humbug)
-function pageUrl()
-{
-    return indexUrl().(!empty($_SERVER["QUERY_STRING"]) ? '?'.$_SERVER["QUERY_STRING"] : '');
-}
-
 // Convert post_max_size/upload_max_filesize (e.g. '16M') parameters to bytes.
 function return_bytes($val)
 {
@@ -591,14 +563,14 @@ class pageBuilder
     {
         $this->tpl = new RainTPL;
         $this->tpl->assign('newversion',escape(checkUpdate()));
-        $this->tpl->assign('feedurl',escape(indexUrl()));
+        $this->tpl->assign('feedurl',escape(index_url($_SERVER)));
         $searchcrits=''; // Search criteria
         if (!empty($_GET['searchtags'])) $searchcrits.='&searchtags='.urlencode($_GET['searchtags']);
         elseif (!empty($_GET['searchterm'])) $searchcrits.='&searchterm='.urlencode($_GET['searchterm']);
         $this->tpl->assign('searchcrits',$searchcrits);
-        $this->tpl->assign('source',indexUrl());
+        $this->tpl->assign('source',index_url($_SERVER));
         $this->tpl->assign('version',shaarli_version);
-        $this->tpl->assign('scripturl',indexUrl());
+        $this->tpl->assign('scripturl',index_url($_SERVER));
         $this->tpl->assign('pagetitle','Shaarli');
         $this->tpl->assign('privateonly',!empty($_SESSION['privateonly'])); // Show only private links?
         if (!empty($GLOBALS['title'])) $this->tpl->assign('pagetitle',$GLOBALS['title']);
@@ -639,7 +611,7 @@ function showRSS()
     $query = $_SERVER["QUERY_STRING"];
     $cache = new CachedPage(
         $GLOBALS['config']['PAGECACHE'],
-        pageUrl(),
+        page_url($_SERVER),
         startsWith($query,'do=rss') && !isLoggedIn()
     );
     $cached = $cache->cachedVersion();
@@ -668,7 +640,7 @@ function showRSS()
         $nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ;
     }
 
-    $pageaddr=escape(indexUrl());
+    $pageaddr=escape(index_url($_SERVER));
     echo '';
     echo ''.$GLOBALS['title'].''.$pageaddr.'';
     echo 'Shared linksen-en'.$pageaddr.''."\n\n";
@@ -706,7 +678,7 @@ function showRSS()
         echo ''."\n\n";
         $i++;
     }
-    echo '';
+    echo '';
 
     $cache->cache(ob_get_contents());
     ob_end_flush();
@@ -727,7 +699,7 @@ function showATOM()
     $query = $_SERVER["QUERY_STRING"];
     $cache = new CachedPage(
         $GLOBALS['config']['PAGECACHE'],
-        pageUrl(),
+        page_url($_SERVER),
         startsWith($query,'do=atom') && !isLoggedIn()
     );
     $cached = $cache->cachedVersion();
@@ -756,7 +728,7 @@ function showATOM()
         $nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ;
     }
 
-    $pageaddr=escape(indexUrl());
+    $pageaddr=escape(index_url($_SERVER));
     $latestDate = '';
     $entries='';
     $i=0;
@@ -794,7 +766,7 @@ function showATOM()
     $feed='';
     $feed.=''.$GLOBALS['title'].'';
     if (!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()) $feed.=''.escape($latestDate).'';
-    $feed.='';
+    $feed.='';
     if (!empty($GLOBALS['config']['PUBSUBHUB_URL']))
     {
         $feed.='';
@@ -804,7 +776,7 @@ function showATOM()
     $feed.=''.$pageaddr.''.$pageaddr.'';
     $feed.=''.$pageaddr.''."\n\n"; // Yes, I know I should use a real IRI (RFC3987), but the site URL will do.
     $feed.=$entries;
-    $feed.='';
+    $feed.='';
     echo $feed;
 
     $cache->cache(ob_get_contents());
@@ -821,7 +793,7 @@ function showDailyRSS() {
     $query = $_SERVER["QUERY_STRING"];
     $cache = new CachedPage(
         $GLOBALS['config']['PAGECACHE'],
-        pageUrl(),
+        page_url($_SERVER),
         startsWith($query,'do=dailyrss') && !isLoggedIn()
     );
     $cached = $cache->cachedVersion();
@@ -866,7 +838,7 @@ function showDailyRSS() {
 
     // Build the RSS feed.
     header('Content-Type: application/rss+xml; charset=utf-8');
-    $pageaddr = escape(indexUrl());
+    $pageaddr = escape(index_url($_SERVER));
     echo '';
     echo '';
     echo 'Daily - '. $GLOBALS['title'] . '';
@@ -879,7 +851,7 @@ function showDailyRSS() {
     foreach ($days as $day => $linkdates) {
         $daydate = linkdate2timestamp($day.'_000000'); // Full text date
         $rfc822date = linkdate2rfc822($day.'_000000');
-        $absurl = escape(indexUrl().'?do=daily&day='.$day);  // Absolute URL of the corresponding "Daily" page.
+        $absurl = escape(index_url($_SERVER).'?do=daily&day='.$day);  // Absolute URL of the corresponding "Daily" page.
 
         // Build the HTML body of this RSS entry.
         $html = '';
@@ -893,7 +865,7 @@ function showDailyRSS() {
             $l['thumbnail'] = thumbnail($l['url']);
             $l['timestamp'] = linkdate2timestamp($l['linkdate']);
             if (startsWith($l['url'], '?')) {
-                $l['url'] = indexUrl() . $l['url'];  // make permalink URL absolute
+                $l['url'] = index_url($_SERVER) . $l['url'];  // make permalink URL absolute
             }
             $links[$linkdate] = $l;
         }
@@ -909,7 +881,7 @@ function showDailyRSS() {
 
         echo $html . PHP_EOL;
     }
-    echo '';
+    echo '';
 
     $cache->cache(ob_get_contents());
     ob_end_flush();
@@ -1201,7 +1173,7 @@ function renderPage()
     {
         $PAGE = new pageBuilder;
         $PAGE->assign('linkcount',count($LINKSDB));
-        $PAGE->assign('pageabsaddr',indexUrl());
+        $PAGE->assign('pageabsaddr',index_url($_SERVER));
         $PAGE->renderPage('tools');
         exit;
     }
@@ -1767,7 +1739,7 @@ function buildLinkList($PAGE,$LINKSDB)
 
         if ($link["url"][0] === '?' && // Check for both signs of a note: starting with ? and 7 chars long. I doubt that you'll post any links that look like this.
             strlen($link["url"]) === 7) {
-            $link["url"] = indexUrl() . $link["url"];
+            $link["url"] = index_url($_SERVER) . $link["url"];
         }
 
         $linkDisp[$keys[$i]] = $link;
@@ -1902,7 +1874,7 @@ function computeThumbnail($url,$href=false)
             if ("/talks/" !== substr($path,0,7)) return array(); // 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 array('src'=>indexUrl().'?do=genthumbnail&hmac='.$sign.'&url='.urlencode($url),
+        return array('src'=>index_url($_SERVER).'?do=genthumbnail&hmac='.$sign.'&url='.urlencode($url),
                      'href'=>$href,'width'=>'120','style'=>'height:auto;','alt'=>'thumbnail');
     }
 
@@ -1913,7 +1885,7 @@ function computeThumbnail($url,$href=false)
     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 array('src'=>indexUrl().'?do=genthumbnail&hmac='.$sign.'&url='.urlencode($url),
+        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.
@@ -1999,11 +1971,11 @@ function install()
     if (!isset($_SESSION['session_tested']))
     {   // Step 1 : Try to store data in session and reload page.
         $_SESSION['session_tested'] = 'Working';  // Try to set a variable in session.
-        header('Location: '.indexUrl().'?test_session');  // Redirect to check stored data.
+        header('Location: '.index_url($_SERVER).'?test_session');  // Redirect to check stored data.
     }
     if (isset($_GET['test_session']))
     {   // Step 3: Sessions are OK. Remove test parameter from URL.
-        header('Location: '.indexUrl());
+        header('Location: '.index_url($_SERVER));
     }
 
 
@@ -2020,7 +1992,7 @@ function install()
         $GLOBALS['login'] = $_POST['setlogin'];
         $GLOBALS['salt'] = sha1(uniqid('',true).'_'.mt_rand()); // Salt renders rainbow-tables attacks useless.
         $GLOBALS['hash'] = sha1($_POST['setpassword'].$GLOBALS['login'].$GLOBALS['salt']);
-        $GLOBALS['title'] = (empty($_POST['title']) ? 'Shared links on '.escape(indexUrl()) : $_POST['title'] );
+        $GLOBALS['title'] = (empty($_POST['title']) ? 'Shared links on '.escape(index_url($_SERVER)) : $_POST['title'] );
         $GLOBALS['config']['ENABLE_UPDATECHECK'] = !empty($_POST['updateCheck']);
         try {
             writeConfig($GLOBALS, isLoggedIn());
diff --git a/tests/HttpUtilsTest.php b/tests/HttpUtils/GetHttpUrlTest.php
similarity index 100%
rename from tests/HttpUtilsTest.php
rename to tests/HttpUtils/GetHttpUrlTest.php
diff --git a/tests/HttpUtils/IndexUrlTest.php b/tests/HttpUtils/IndexUrlTest.php
new file mode 100644
index 0000000..337dcab
--- /dev/null
+++ b/tests/HttpUtils/IndexUrlTest.php
@@ -0,0 +1,72 @@
+assertEquals(
+            'http://host.tld/',
+            index_url(
+                array(
+                    'HTTPS' => 'Off',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '80',
+                    'SCRIPT_NAME' => '/index.php'
+                )
+            )
+        );
+
+        $this->assertEquals(
+            'http://host.tld/admin/',
+            index_url(
+                array(
+                    'HTTPS' => 'Off',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '80',
+                    'SCRIPT_NAME' => '/admin/index.php'
+                )
+            )
+        );
+    }
+
+    /**
+     * The resource is != "index.php"
+     */
+    public function testOtherResource()
+    {
+        $this->assertEquals(
+            'http://host.tld/page.php',
+            page_url(
+                array(
+                    'HTTPS' => 'Off',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '80',
+                    'SCRIPT_NAME' => '/page.php'
+                )
+            )
+        );
+
+        $this->assertEquals(
+            'http://host.tld/admin/page.php',
+            page_url(
+                array(
+                    'HTTPS' => 'Off',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '80',
+                    'SCRIPT_NAME' => '/admin/page.php'
+                )
+            )
+        );
+    }
+}
diff --git a/tests/HttpUtils/PageUrlTest.php b/tests/HttpUtils/PageUrlTest.php
new file mode 100644
index 0000000..4dbbe9c
--- /dev/null
+++ b/tests/HttpUtils/PageUrlTest.php
@@ -0,0 +1,76 @@
+assertEquals(
+            'http://host.tld/?p1=v1&p2=v2',
+            page_url(
+                array(
+                    'HTTPS' => 'Off',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '80',
+                    'SCRIPT_NAME' => '/index.php',
+                    'QUERY_STRING' => 'p1=v1&p2=v2'
+                )
+            )
+        );
+
+        $this->assertEquals(
+            'http://host.tld/admin/?action=edit_tag',
+            page_url(
+                array(
+                    'HTTPS' => 'Off',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '80',
+                    'SCRIPT_NAME' => '/admin/index.php',
+                    'QUERY_STRING' => 'action=edit_tag'
+                )
+            )
+        );
+    }
+
+    /**
+     * The resource is != "index.php"
+     */
+    public function testOtherResource()
+    {
+        $this->assertEquals(
+            'http://host.tld/page.php?p1=v1&p2=v2',
+            page_url(
+                array(
+                    'HTTPS' => 'Off',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '80',
+                    'SCRIPT_NAME' => '/page.php',
+                    'QUERY_STRING' => 'p1=v1&p2=v2'
+                )
+            )
+        );
+
+        $this->assertEquals(
+            'http://host.tld/admin/page.php?action=edit_tag',
+            page_url(
+                array(
+                    'HTTPS' => 'Off',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '80',
+                    'SCRIPT_NAME' => '/admin/page.php',
+                    'QUERY_STRING' => 'action=edit_tag'
+                )
+            )
+        );
+    }
+}
diff --git a/tests/HttpUtils/ServerUrlTest.php b/tests/HttpUtils/ServerUrlTest.php
new file mode 100644
index 0000000..5096db6
--- /dev/null
+++ b/tests/HttpUtils/ServerUrlTest.php
@@ -0,0 +1,135 @@
+assertEquals(
+            'https://host.tld',
+            server_url(
+                array(
+                    'HTTPS' => 'ON',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '443'
+                )
+            )
+        );
+
+        $this->assertEquals(
+            'https://host.tld:8080',
+            server_url(
+                array(
+                    'HTTPS' => 'ON',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '8080'
+                )
+            )
+        );
+    }
+
+    /**
+     * Detect a Proxy with SSL enabled
+     */
+    public function testHttpsProxyForward()
+    {
+        $this->assertEquals(
+            'https://host.tld:8080',
+            server_url(
+                array(
+                    'HTTPS' => 'Off',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '80',
+                    'HTTP_X_FORWARDED_PROTO' => 'https',
+                    'HTTP_X_FORWARDED_PORT' => '8080'
+                )
+            )
+        );
+
+        $this->assertEquals(
+            'https://host.tld',
+            server_url(
+                array(
+                    'HTTPS' => 'Off',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '80',
+                    'HTTP_X_FORWARDED_PROTO' => 'https'
+                )
+            )
+        );
+    }
+
+    /**
+     * Detect if the server uses a specific port (!= 80)
+     */
+    public function testPort()
+    {
+        // HTTP
+        $this->assertEquals(
+            'http://host.tld:8080',
+            server_url(
+                array(
+                    'HTTPS' => 'OFF',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '8080'
+                )
+            )
+        );
+
+        // HTTPS
+        $this->assertEquals(
+            'https://host.tld:8080',
+            server_url(
+                array(
+                    'HTTPS' => 'ON',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '8080'
+                )
+            )
+        );
+    }
+
+    /**
+     * HTTP server on port 80
+     */
+    public function testStandardHttpPort()
+    {
+        $this->assertEquals(
+            'http://host.tld',
+            server_url(
+                array(
+                    'HTTPS' => 'OFF',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '80'
+                )
+            )
+        );
+    }
+
+    /**
+     * HTTPS server on port 443
+     */
+    public function testStandardHttpsPort()
+    {
+        $this->assertEquals(
+            'https://host.tld',
+            server_url(
+                array(
+                    'HTTPS' => 'ON',
+                    'SERVER_NAME' => 'host.tld',
+                    'SERVER_PORT' => '443'
+                )
+            )
+        );
+    }
+}

From 49e2b35b4a2401d2213a0d3b473713c36ed18fb2 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Mon, 14 Sep 2015 20:54:13 +0200
Subject: [PATCH 183/658] Update project information: contributors, `index.php`
 header

Signed-off-by: VirtualTam 
---
 COPYING   |  2 ++
 index.php | 22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/COPYING b/COPYING
index adc856e..24b97e9 100644
--- a/COPYING
+++ b/COPYING
@@ -20,6 +20,8 @@ Copyright: (c) 2011-2015 Sébastien SAUVAGE 
            (c) 2011-2015 idleman 
            (c) 2015 Alexis Ju 
            (c) 2015 dimtion 
+           (c) 2015 Fanch 
+           (c) 2015 Guillaume Virlet 
            (c) 2015 Felix Bartels 
            (c) 2015 Marsup 
            (c) 2015 Miloš Jovanović 
diff --git a/index.php b/index.php
index c1ddf4b..10d767d 100755
--- a/index.php
+++ b/index.php
@@ -1,10 +1,20 @@
 
Date: Mon, 14 Sep 2015 21:02:52 +0200
Subject: [PATCH 184/658] Bump version to 0.5.4

Fixes:
 - PHP session IDs: handle hash algorithms and bits per char representations

Minor changes:
 - HTTPS: support being served behing an SSL-enabled proxy
 - HTTP/Server utilities: refactor & add test coverage

Project & documentation:
 - improve/rewrite `README.md`
 - update contributor list
 - update `index.php` header

Signed-off-by: VirtualTam 
---
 index.php           | 4 ++--
 shaarli_version.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index 10d767d..c430a20 100755
--- 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)));
 
diff --git a/shaarli_version.php b/shaarli_version.php
index b843a5b..17f5ffa 100755
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-
+

From d01c234235411bafb97661d335fcb6ea1e67ffbc Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Wed, 4 Nov 2015 19:53:59 +0100
Subject: [PATCH 185/658] Fixes #356  * adding a link should return added
 link's hash * allow redirection relative urls in generateLocation

---
 application/Utils.php | 11 ++++++-----
 index.php             | 10 +++++++---
 tests/UtilsTest.php   |  2 ++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/application/Utils.php b/application/Utils.php
index 1422961..120333c 100755
--- a/application/Utils.php
+++ b/application/Utils.php
@@ -97,12 +97,12 @@ function checkDateFormat($format, $string)
  */
 function generateLocation($referer, $host, $loopTerms = array())
 {
-    $final_referer = '?';
+    $finalReferer = '?';
 
     // No referer if it contains any value in $loopCriteria.
     foreach ($loopTerms as $value) {
         if (strpos($referer, $value) !== false) {
-            return $final_referer;
+            return $finalReferer;
         }
     }
 
@@ -111,11 +111,12 @@ function generateLocation($referer, $host, $loopTerms = array())
         $host = substr($host, 0, $pos);
     }
 
-    if (!empty($referer) && strpos(parse_url($referer, PHP_URL_HOST), $host) !== false) {
-        $final_referer = $referer;
+    $refererHost = parse_url($referer, PHP_URL_HOST);
+    if (!empty($referer) && (strpos($refererHost, $host) !== false || startsWith('?', $refererHost))) {
+        $finalReferer = $referer;
     }
 
-    return $final_referer;
+    return $finalReferer;
 }
 
 /**
diff --git a/index.php b/index.php
index c430a20..3be6be9 100755
--- a/index.php
+++ b/index.php
@@ -1354,10 +1354,14 @@ function renderPage()
         pubsubhub();
 
         // If we are called from the bookmarklet, we must close the popup:
-        if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo ''; exit; }
-        $returnurl = ( !empty($_POST['returnurl']) ? escape($_POST['returnurl']) : '?' );
-        $returnurl .= '#'.smallHash($_POST['lf_linkdate']);  // Scroll to the link which has been edited.
+        if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) {
+            echo '';
+            exit;
+        }
+
+        $returnurl = !empty($_POST['returnurl']) ? escape($_POST['returnurl']): '?';
         $location = generateLocation($returnurl, $_SERVER['HTTP_HOST'], array('addlink', 'post', 'edit_link'));
+        $location .= '#'.smallHash($_POST['lf_linkdate']);  // Scroll to the link which has been edited.
         header('Location: '. $location); // After saving the link, redirect to the page the user was on.
         exit;
     }
diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
index 7f218ad..311d4bf 100755
--- a/tests/UtilsTest.php
+++ b/tests/UtilsTest.php
@@ -118,6 +118,8 @@ class UtilsTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($ref, generateLocation($ref, 'localhost'));
         $ref = 'http://localhost:8080/?test';
         $this->assertEquals($ref, generateLocation($ref, 'localhost:8080'));
+        $ref = '?localreferer#hash';
+        $this->assertEquals($ref, generateLocation($ref, 'localhost:8080'));
     }
 
     /**

From 6fc14d530369740d27d6bd641369d4f5f5f04080 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Wed, 15 Jul 2015 11:42:15 +0200
Subject: [PATCH 186/658] Plugin system - CORE

see shaarli/Shaarli#275
---
 .gitignore                    |   3 +
 application/Config.php        | 263 ++++++++---------
 application/PluginManager.php | 184 ++++++++++++
 application/Router.php        | 105 +++++++
 index.php                     | 230 ++++++++++-----
 tests/PluginManagerTest.php   |  66 +++++
 tests/RouterTest.php          | 515 ++++++++++++++++++++++++++++++++++
 tests/plugins/test/test.php   |  21 ++
 8 files changed, 1190 insertions(+), 197 deletions(-)
 mode change 100755 => 100644 application/Config.php
 create mode 100644 application/PluginManager.php
 create mode 100644 application/Router.php
 create mode 100755 tests/PluginManagerTest.php
 create mode 100755 tests/RouterTest.php
 create mode 100755 tests/plugins/test/test.php

diff --git a/.gitignore b/.gitignore
index 3ffedb3..5a6b924 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,6 @@ coverage
 tests/datastore.php
 tests/dummycache/
 phpmd.html
+
+# Ignore user plugin configuration
+plugins/*/config.php
\ No newline at end of file
diff --git a/application/Config.php b/application/Config.php
old mode 100755
new mode 100644
index ec799d7..c71ef68
--- a/application/Config.php
+++ b/application/Config.php
@@ -1,129 +1,134 @@
- $value) {
-        $configStr .= '$GLOBALS[\'config\'][\''. $key .'\'] = '.var_export($config['config'][$key], true).';'. PHP_EOL;
-    }
-    $configStr .= '?>';
-
-    if (!file_put_contents($config['config']['CONFIG_FILE'], $configStr)
-        || strcmp(file_get_contents($config['config']['CONFIG_FILE']), $configStr) != 0
-    ) {
-        throw new Exception(
-            'Shaarli could not create the config file.
-            Please make sure Shaarli has the right to write in the folder is it installed in.'
-        );
-    }
-}
-
-/**
- * Milestone 0.9 - shaarli/Shaarli#41: options.php is not supported anymore.
- * ==> if user is loggedIn, merge its content with config.php, then delete options.php.
- *
- * @param array $config     contains all configuration fields.
- * @param bool  $isLoggedIn true if user is logged in.
- *
- * @return void
- */
-function mergeDeprecatedConfig($config, $isLoggedIn)
-{
-    $config_file = $config['config']['CONFIG_FILE'];
-
-    if (is_file($config['config']['DATADIR'].'/options.php') && $isLoggedIn) {
-        include $config['config']['DATADIR'].'/options.php';
-
-        // Load GLOBALS into config
-        foreach ($GLOBALS as $key => $value) {
-            $config[$key] = $value;
-        }
-        $config['config']['CONFIG_FILE'] = $config_file;
-        writeConfig($config, $isLoggedIn);
-
-        unlink($config['config']['DATADIR'].'/options.php');
-    }
-}
-
-/**
- * Exception used if a mandatory field is missing in given configuration.
- */
-class MissingFieldConfigException extends Exception
-{
-    public $field;
-
-    /**
-     * Construct exception.
-     *
-     * @param string $field field name missing.
-     */
-    public function __construct($field)
-    {
-        $this->field = $field;
-        $this->message = 'Configuration value is required for '. $this->field;
-    }
-}
-
-/**
- * Exception used if an unauthorized attempt to edit configuration has been made.
- */
-class UnauthorizedConfigException extends Exception
-{
-    /**
-     * Construct exception.
-     */
-    public function __construct()
-    {
-        $this->message = 'You are not authorized to alter config.';
-    }
-}
+ $value) {
+        $configStr .= '$GLOBALS[\'config\'][\''. $key .'\'] = '.var_export($config['config'][$key], true).';'. PHP_EOL;
+    }
+
+    if (isset($config['plugins'])) {
+        foreach ($config['plugins'] as $key => $value) {
+            $configStr .= '$GLOBALS[\'plugins\'][\''. $key .'\'] = '.var_export($config['plugins'][$key], true).';'. PHP_EOL;
+        }
+    }
+
+    if (!file_put_contents($config['config']['CONFIG_FILE'], $configStr)
+        || strcmp(file_get_contents($config['config']['CONFIG_FILE']), $configStr) != 0
+    ) {
+        throw new Exception(
+            'Shaarli could not create the config file.
+            Please make sure Shaarli has the right to write in the folder is it installed in.'
+        );
+    }
+}
+
+/**
+ * Milestone 0.9 - shaarli/Shaarli#41: options.php is not supported anymore.
+ * ==> if user is loggedIn, merge its content with config.php, then delete options.php.
+ *
+ * @param array $config     contains all configuration fields.
+ * @param bool  $isLoggedIn true if user is logged in.
+ *
+ * @return void
+ */
+function mergeDeprecatedConfig($config, $isLoggedIn)
+{
+    $config_file = $config['config']['CONFIG_FILE'];
+
+    if (is_file($config['config']['DATADIR'].'/options.php') && $isLoggedIn) {
+        include $config['config']['DATADIR'].'/options.php';
+
+        // Load GLOBALS into config
+        foreach ($GLOBALS as $key => $value) {
+            $config[$key] = $value;
+        }
+        $config['config']['CONFIG_FILE'] = $config_file;
+        writeConfig($config, $isLoggedIn);
+
+        unlink($config['config']['DATADIR'].'/options.php');
+    }
+}
+
+/**
+ * Exception used if a mandatory field is missing in given configuration.
+ */
+class MissingFieldConfigException extends Exception
+{
+    public $field;
+
+    /**
+     * Construct exception.
+     *
+     * @param string $field field name missing.
+     */
+    public function __construct($field)
+    {
+        $this->field = $field;
+        $this->message = 'Configuration value is required for '. $this->field;
+    }
+}
+
+/**
+ * Exception used if an unauthorized attempt to edit configuration has been made.
+ */
+class UnauthorizedConfigException extends Exception
+{
+    /**
+     * Construct exception.
+     */
+    public function __construct()
+    {
+        $this->message = 'You are not authorized to alter config.';
+    }
+}
diff --git a/application/PluginManager.php b/application/PluginManager.php
new file mode 100644
index 0000000..e572ff7
--- /dev/null
+++ b/application/PluginManager.php
@@ -0,0 +1,184 @@
+authorizedPlugins = $authorizedPlugins;
+
+        $dirs = glob(self::$PLUGINS_PATH . '/*', GLOB_ONLYDIR);
+        $dirnames = array_map('basename', $dirs);
+        foreach ($this->authorizedPlugins as $plugin) {
+            $index = array_search($plugin, $dirnames);
+
+            // plugin authorized, but its folder isn't listed
+            if ($index === false) {
+                continue;
+            }
+
+            try {
+                $this->loadPlugin($dirs[$index], $plugin);
+            }
+            catch (PluginFileNotFoundException $e) {
+                error_log($e->getMessage());
+            }
+        }
+    }
+
+    /**
+     * Execute all plugins registered hook.
+     *
+     * @param string $hook   name of the hook to trigger.
+     * @param array  $data   list of data to manipulate passed by reference.
+     * @param array  $params additional parameters such as page target.
+     * 
+     * @return void
+     */
+    public function executeHooks($hook, &$data, $params = array())
+    {
+        if (!empty($params['target'])) {
+            $data['_PAGE_'] = $params['target'];
+        }
+
+        if (isset($params['loggedin'])) {
+            $data['_LOGGEDIN_'] = $params['loggedin'];
+        }
+
+        foreach ($this->loadedPlugins as $plugin) {
+            $hookFunction = $this->buildHookName($hook, $plugin);
+
+            if (function_exists($hookFunction)) {
+                $data = call_user_func($hookFunction, $data);
+            }
+        }
+    }
+
+    /**
+     * Load a single plugin from its files.
+     * Add them in $loadedPlugins if successful.
+     *
+     * @param string $dir        plugin's directory.
+     * @param string $pluginName plugin's name.
+     *
+     * @return void
+     * @throws PluginFileNotFoundException - plugin files not found.
+     */
+    private function loadPlugin($dir, $pluginName)
+    {
+        if (!is_dir($dir)) {
+            throw new PluginFileNotFoundException($pluginName);
+        }
+
+        $pluginFilePath = $dir . '/' . $pluginName . '.php';
+        if (!is_file($pluginFilePath)) {
+            throw new PluginFileNotFoundException($pluginName);
+        }
+
+        include_once $pluginFilePath;
+
+        $this->loadedPlugins[] = $pluginName;
+    }
+
+    /**
+     * Construct normalize hook name for a specific plugin.
+     *
+     * Format:
+     *      hook__
+     *
+     * @param string $hook       hook name.
+     * @param string $pluginName plugin name.
+     *
+     * @return string - plugin's hook name.
+     */
+    public function buildHookName($hook, $pluginName)
+    {
+        return 'hook_' . $pluginName . '_' . $hook;
+    }
+}
+
+/**
+ * Class PluginFileNotFoundException
+ *
+ * Raise when plugin files can't be found.
+ */
+class PluginFileNotFoundException extends Exception
+{
+    /**
+     * Construct exception with plugin name.
+     * Generate message.
+     *
+     * @param string $pluginName name of the plugin not found
+     */
+    public function __construct($pluginName)
+    {
+        $this->message = 'Plugin "'. $pluginName .'" files not found.';
+    }
+}
\ No newline at end of file
diff --git a/application/Router.php b/application/Router.php
new file mode 100644
index 0000000..82b2b85
--- /dev/null
+++ b/application/Router.php
@@ -0,0 +1,105 @@
+ /shaarli/
@@ -75,6 +84,8 @@ require_once 'application/TimeZone.php';
 require_once 'application/Url.php';
 require_once 'application/Utils.php';
 require_once 'application/Config.php';
+require_once 'application/PluginManager.php';
+require_once 'application/Router.php';
 
 // Ensure the PHP version is supported
 try {
@@ -119,6 +130,9 @@ include "inc/rain.tpl.class.php"; //include Rain TPL
 raintpl::$tpl_dir = $GLOBALS['config']['RAINTPL_TPL']; // template directory
 raintpl::$cache_dir = $GLOBALS['config']['RAINTPL_TMP']; // cache directory
 
+$pluginManager = PluginManager::getInstance();
+$pluginManager->load($GLOBALS['config']['ENABLED_PLUGINS']);
+
 ob_start();  // Output buffering for the page cache.
 
 
@@ -962,16 +976,31 @@ function showDaily()
         $fill[$index]+=$length;
     }
     $PAGE = new pageBuilder;
-    $PAGE->assign('linksToDisplay',$linksToDisplay);
-    $PAGE->assign('linkcount',count($LINKSDB));
-    $PAGE->assign('cols', $columns);
-    $PAGE->assign('day',linkdate2timestamp($day.'_000000'));
-    $PAGE->assign('previousday',$previousday);
-    $PAGE->assign('nextday',$nextday);
+    $data = array(
+        'linksToDisplay' => $linksToDisplay,
+        'linkcount' => count($LINKSDB),
+        'cols' => $columns,
+        'day' => linkdate2timestamp($day.'_000000'),
+        'previousday' => $previousday,
+        'nextday' => $nextday,
+    );
+    $pluginManager = PluginManager::getInstance();
+    $pluginManager->executeHooks('render_daily', $data, array('loggedin' => isLoggedIn()));
+
+    foreach ($data as $key => $value) {
+        $PAGE->assign($key, $value);
+    }
+
     $PAGE->renderPage('daily');
     exit;
 }
 
+// Renders the linklist
+function showLinkList($PAGE, $LINKSDB) {
+    buildLinkList($PAGE,$LINKSDB); // Compute list of links to display
+    $PAGE->renderPage('linklist');
+}
+
 
 // ------------------------------------------------------------------------------------------
 // Render HTML page (according to URL parameters and user rights)
@@ -983,12 +1012,36 @@ function renderPage()
         $GLOBALS['config']['HIDE_PUBLIC_LINKS']
     );
 
+    $PAGE = new pageBuilder;
+
+    // Determine which page will be rendered.
+    $query = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : '';
+    $targetPage = Router::findPage($query, $_GET, isLoggedIn());
+
+    // Call plugin hooks for header, footer and includes, specifying which page will be rendered.
+    // Then assign generated data to RainTPL.
+    $common_hooks = array(
+        'header',
+        'footer',
+        'includes',
+    );
+    $pluginManager = PluginManager::getInstance();
+    foreach($common_hooks as $name) {
+        $plugin_data = array();
+        $pluginManager->executeHooks('render_' . $name, $plugin_data,
+            array(
+                'target' => $targetPage,
+                'loggedin' => isLoggedIn()
+            )
+        );
+        $PAGE->assign('plugins_' . $name, $plugin_data);
+    }
+
     // -------- Display login form.
-    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=login'))
+    if ($targetPage == Router::$PAGE_LOGIN)
     {
         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 = new pageBuilder;
         $PAGE->assign('token',$token);
         $PAGE->assign('returnurl',(isset($_SERVER['HTTP_REFERER']) ? escape($_SERVER['HTTP_REFERER']):''));
         $PAGE->renderPage('loginform');
@@ -1004,7 +1057,7 @@ function renderPage()
     }
 
     // -------- Picture wall
-    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=picwall'))
+    if ($targetPage == Router::$PAGE_PICWALL)
     {
         // Optionally filter the results:
         $links=array();
@@ -1027,15 +1080,22 @@ function renderPage()
             }
         }
 
-        $PAGE = new pageBuilder;
-        $PAGE->assign('linkcount',count($LINKSDB));
-        $PAGE->assign('linksToDisplay',$linksToDisplay);
+        $data = array(
+            'linkcount' => count($LINKSDB),
+            'linksToDisplay' => $linksToDisplay,
+        );
+        $pluginManager->executeHooks('render_picwall', $data, array('loggedin' => isLoggedIn()));
+
+        foreach ($data as $key => $value) {
+            $PAGE->assign($key, $value);
+        }
+
         $PAGE->renderPage('picwall');
         exit;
     }
 
     // -------- Tag cloud
-    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=tagcloud'))
+    if ($targetPage == Router::$PAGE_TAGCLOUD)
     {
         $tags= $LINKSDB->allTags();
 
@@ -1049,9 +1109,17 @@ function renderPage()
         {
             $tagList[$key] = array('count'=>$value,'size'=>log($value, 15) / log($maxcount, 30) * (22-6) + 6);
         }
-        $PAGE = new pageBuilder;
-        $PAGE->assign('linkcount',count($LINKSDB));
-        $PAGE->assign('tags',$tagList);
+
+        $data = array(
+            'linkcount' => count($LINKSDB),
+            'tags' => $tagList,
+        );
+        $pluginManager->executeHooks('render_tagcloud', $data, array('loggedin' => isLoggedIn()));
+
+        foreach ($data as $key => $value) {
+            $PAGE->assign($key, $value);
+        }
+
         $PAGE->renderPage('tagcloud');
         exit;
     }
@@ -1164,32 +1232,36 @@ function renderPage()
 			header('Location: ?do=login&post=');
 			exit;
 		}
-
+        showLinkList($PAGE, $LINKSDB);
         if (isset($_GET['edit_link'])) {
             header('Location: ?do=login&edit_link='. escape($_GET['edit_link']));
             exit;
         }
 
-        $PAGE = new pageBuilder;
-        buildLinkList($PAGE,$LINKSDB); // Compute list of links to display
-        $PAGE->renderPage('linklist');
         exit; // Never remove this one! All operations below are reserved for logged in user.
     }
 
     // -------- All other functions are reserved for the registered user:
 
     // -------- Display the Tools menu if requested (import/export/bookmarklet...)
-    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=tools'))
+    if ($targetPage == Router::$PAGE_TOOLS)
     {
-        $PAGE = new pageBuilder;
-        $PAGE->assign('linkcount',count($LINKSDB));
-        $PAGE->assign('pageabsaddr',index_url($_SERVER));
+        $data = array(
+            'linkcount' => count($LINKSDB),
+            'pageabsaddr' => index_url($_SERVER),
+        );
+        $pluginManager->executeHooks('render_tools', $data);
+
+        foreach ($data as $key => $value) {
+            $PAGE->assign($key, $value);
+        }
+
         $PAGE->renderPage('tools');
         exit;
     }
 
     // -------- User wants to change his/her password.
-    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=changepasswd'))
+    if ($targetPage == Router::$PAGE_CHANGEPASSWORD)
     {
         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']))
@@ -1220,7 +1292,6 @@ function renderPage()
         }
         else // show the change password form.
         {
-            $PAGE = new pageBuilder;
             $PAGE->assign('linkcount',count($LINKSDB));
             $PAGE->assign('token',getToken());
             $PAGE->renderPage('changepassword');
@@ -1229,7 +1300,7 @@ function renderPage()
     }
 
     // -------- User wants to change configuration
-    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=configure'))
+    if ($targetPage == Router::$PAGE_CONFIGURE)
     {
         if (!empty($_POST['title']) )
         {
@@ -1265,7 +1336,6 @@ function renderPage()
         }
         else // Show the configuration form.
         {
-            $PAGE = new pageBuilder;
             $PAGE->assign('linkcount',count($LINKSDB));
             $PAGE->assign('token',getToken());
             $PAGE->assign('title', empty($GLOBALS['title']) ? '' : $GLOBALS['title'] );
@@ -1279,11 +1349,10 @@ function renderPage()
     }
 
     // -------- User wants to rename a tag or delete it
-    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=changetag'))
+    if ($targetPage == Router::$PAGE_CHANGETAG)
     {
         if (empty($_POST['fromtag']))
         {
-            $PAGE = new pageBuilder;
             $PAGE->assign('linkcount',count($LINKSDB));
             $PAGE->assign('token',getToken());
             $PAGE->assign('tags', $LINKSDB->allTags());
@@ -1328,9 +1397,8 @@ function renderPage()
     }
 
     // -------- User wants to add a link without using the bookmarklet: Show form.
-    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=addlink'))
+    if ($targetPage == Router::$PAGE_ADDLINK)
     {
-        $PAGE = new pageBuilder;
         $PAGE->assign('linkcount',count($LINKSDB));
         $PAGE->renderPage('addlink');
         exit;
@@ -1349,6 +1417,9 @@ function renderPage()
         $link = array('title'=>trim($_POST['lf_title']),'url'=>$url,'description'=>trim($_POST['lf_description']),'private'=>(isset($_POST['lf_private']) ? 1 : 0),
                       'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags));
         if ($link['title']=='') $link['title']=$link['url']; // If title is empty, use the URL as title.
+
+        $pluginManager->executeHooks('save_link', $link);
+
         $LINKSDB[$linkdate] = $link;
         $LINKSDB->savedb($GLOBALS['config']['PAGECACHE']); // Save to disk.
         pubsubhub();
@@ -1382,6 +1453,9 @@ function renderPage()
         // - confirmation is handled by JavaScript
         // - we are protected from XSRF by the token.
         $linkdate=$_POST['lf_linkdate'];
+
+        $pluginManager->executeHooks('delete_link', $LINKSDB[$linkdate]);
+
         unset($LINKSDB[$linkdate]);
         $LINKSDB->savedb($GLOBALS['config']['PAGECACHE']); // save to disk
 
@@ -1423,13 +1497,20 @@ function renderPage()
     {
         $link = $LINKSDB[$_GET['edit_link']];  // Read database
         if (!$link) { header('Location: ?'); exit; } // Link not found in database.
-        $PAGE = new pageBuilder;
-        $PAGE->assign('linkcount',count($LINKSDB));
-        $PAGE->assign('link',$link);
-        $PAGE->assign('link_is_new',false);
-        $PAGE->assign('token',getToken()); // XSRF protection.
-        $PAGE->assign('http_referer',(isset($_SERVER['HTTP_REFERER']) ? escape($_SERVER['HTTP_REFERER']) : ''));
-        $PAGE->assign('tags', $LINKSDB->allTags());
+        $data = array(
+            'linkcount' => count($LINKSDB),
+            'link' => $link,
+            'link_is_new' => false,
+            'token' => getToken(),
+            'http_referer' => (isset($_SERVER['HTTP_REFERER']) ? escape($_SERVER['HTTP_REFERER']) : ''),
+            'tags' => $LINKSDB->allTags(),
+        );
+        $pluginManager->executeHooks('render_editlink', $data);
+
+        foreach ($data as $key => $value) {
+            $PAGE->assign($key, $value);
+        }
+
         $PAGE->renderPage('editlink');
         exit;
     }
@@ -1493,24 +1574,30 @@ function renderPage()
             );
         }
 
-        $PAGE = new pageBuilder;
-        $PAGE->assign('linkcount',count($LINKSDB));
-        $PAGE->assign('link',$link);
-        $PAGE->assign('link_is_new',$link_is_new);
-        $PAGE->assign('token',getToken()); // XSRF protection.
-        $PAGE->assign('http_referer',(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : ''));
-        $PAGE->assign('source',(isset($_GET['source']) ? $_GET['source'] : ''));
-        $PAGE->assign('tags', $LINKSDB->allTags());
+        $data = array(
+            'linkcount' => count($LINKSDB),
+            'link' => $link,
+            'link_is_new' => $link_is_new,
+            'token' => getToken(), // XSRF protection.
+            'http_referer' => (isset($_SERVER['HTTP_REFERER']) ? escape($_SERVER['HTTP_REFERER']) : ''),
+            'source' => (isset($_GET['source']) ? $_GET['source'] : ''),
+            'tags' => $LINKSDB->allTags(),
+        );
+        $pluginManager->executeHooks('render_editlink', $data);
+
+        foreach ($data as $key => $value) {
+            $PAGE->assign($key, $value);
+        }
+
         $PAGE->renderPage('editlink');
         exit;
     }
 
     // -------- Export as Netscape Bookmarks HTML file.
-    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=export'))
+    if ($targetPage == Router::$PAGE_EXPORT)
     {
         if (empty($_GET['what']))
         {
-            $PAGE = new pageBuilder;
             $PAGE->assign('linkcount',count($LINKSDB));
             $PAGE->renderPage('export');
             exit;
@@ -1562,9 +1649,8 @@ HTML;
     }
 
     // -------- Show upload/import dialog:
-    if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=import'))
+    if ($targetPage == Router::$PAGE_IMPORT)
     {
-        $PAGE = new pageBuilder;
         $PAGE->assign('linkcount',count($LINKSDB));
         $PAGE->assign('token',getToken());
         $PAGE->assign('maxfilesize',getMaxFileSize());
@@ -1573,9 +1659,7 @@ HTML;
     }
 
     // -------- Otherwise, simply display search form and links:
-    $PAGE = new pageBuilder;
-    buildLinkList($PAGE,$LINKSDB); // Compute list of links to display
-    $PAGE->renderPage('linklist');
+    showLinkList($PAGE, $LINKSDB);
     exit;
 }
 
@@ -1746,7 +1830,7 @@ function buildLinkList($PAGE,$LINKSDB)
         $taglist = explode(' ',$link['tags']);
         uasort($taglist, 'strcasecmp');
         $link['taglist']=$taglist;
-
+        $link['shorturl'] = smallHash($link['linkdate']);
         if ($link["url"][0] === '?' && // Check for both signs of a note: starting with ? and 7 chars long. I doubt that you'll post any links that look like this.
             strlen($link["url"]) === 7) {
             $link["url"] = index_url($_SERVER) . $link["url"];
@@ -1766,18 +1850,28 @@ function buildLinkList($PAGE,$LINKSDB)
     $token = ''; if (isLoggedIn()) $token=getToken();
 
     // Fill all template fields.
-    $PAGE->assign('linkcount',count($LINKSDB));
-    $PAGE->assign('previous_page_url',$previous_page_url);
-    $PAGE->assign('next_page_url',$next_page_url);
-    $PAGE->assign('page_current',$page);
-    $PAGE->assign('page_max',$pagecount);
-    $PAGE->assign('result_count',count($linksToDisplay));
-    $PAGE->assign('search_type',$search_type);
-    $PAGE->assign('search_crits',$search_crits);
-    $PAGE->assign('redirector',empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector']); // Optional redirector URL.
-    $PAGE->assign('token',$token);
-    $PAGE->assign('links',$linkDisp);
-    $PAGE->assign('tags', $LINKSDB->allTags());
+    $data = array(
+        'linkcount' => count($LINKSDB),
+        'previous_page_url' => $previous_page_url,
+        'next_page_url' => $next_page_url,
+        'page_current' => $page,
+        'page_max' => $pagecount,
+        'result_count' => count($linksToDisplay),
+        'search_type' => $search_type,
+        'search_crits' => $search_crits,
+        'redirector' => empty($GLOBALS['redirector']) ? '' : $GLOBALS['redirector'],  // Optional redirector URL.
+        'token' => $token,
+        'links' => $linkDisp,
+        'tags' => $LINKSDB->allTags(),
+    );
+
+    $pluginManager = PluginManager::getInstance();
+    $pluginManager->executeHooks('render_linklist', $data, array('loggedin' => isLoggedIn()));
+
+    foreach ($data as $key => $value) {
+        $PAGE->assign($key, $value);
+    }
+
     return;
 }
 
diff --git a/tests/PluginManagerTest.php b/tests/PluginManagerTest.php
new file mode 100755
index 0000000..749ce2b
--- /dev/null
+++ b/tests/PluginManagerTest.php
@@ -0,0 +1,66 @@
+load(array(self::$_PLUGIN_NAME));
+
+        $this->assertTrue(function_exists('hook_test_random'));
+
+        $data = array(0 => 'woot');
+        $pluginManager->executeHooks('random', $data);
+        $this->assertEquals('woot', $data[1]);
+
+        $data = array(0 => 'woot');
+        $pluginManager->executeHooks('random', $data, array('target' => 'test'));
+        $this->assertEquals('page test', $data[1]);
+
+        $data = array(0 => 'woot');
+        $pluginManager->executeHooks('random', $data, array('loggedin' => true));
+        $this->assertEquals('loggedin', $data[1]);
+    }
+
+    /**
+     * Test missing plugin loading.
+     *
+     * @return void
+     */
+    public function testPluginNotFound()
+    {
+        $pluginManager = PluginManager::getInstance();
+
+        $pluginManager->load(array());
+
+        $pluginManager->load(array('nope', 'renope'));
+    }
+}
\ No newline at end of file
diff --git a/tests/RouterTest.php b/tests/RouterTest.php
new file mode 100755
index 0000000..8838bc8
--- /dev/null
+++ b/tests/RouterTest.php
@@ -0,0 +1,515 @@
+assertEquals(
+            Router::$PAGE_LOGIN,
+            Router::findPage('do=login', array(), false)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_LOGIN,
+            Router::findPage('do=login', array(), 1)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_LOGIN,
+            Router::findPage('do=login&stuff', array(), false)
+        );
+    }
+
+    /**
+     * Test findPage: login page output.
+     * Invalid: page shouldn't be return.
+     *
+     * @return void
+     */
+    public function testFindPageLoginInvalid()
+    {
+        $this->assertNotEquals(
+            Router::$PAGE_LOGIN,
+            Router::findPage('do=login', array(), true)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_LOGIN,
+            Router::findPage('do=other', array(), false)
+        );
+    }
+
+    /**
+     * Test findPage: picwall page output.
+     * Valid: page should be return.
+     *
+     * @return void
+     */
+    public function testFindPagePicwallValid()
+    {
+        $this->assertEquals(
+            Router::$PAGE_PICWALL,
+            Router::findPage('do=picwall', array(), false)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_PICWALL,
+            Router::findPage('do=picwall', array(), true)
+        );
+    }
+
+    /**
+     * Test findPage: picwall page output.
+     * Invalid: page shouldn't be return.
+     *
+     * @return void
+     */
+    public function testFindPagePicwallInvalid()
+    {
+        $this->assertEquals(
+            Router::$PAGE_PICWALL,
+            Router::findPage('do=picwall&stuff', array(), false)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_PICWALL,
+            Router::findPage('do=other', array(), false)
+        );
+    }
+
+    /**
+     * Test findPage: tagcloud page output.
+     * Valid: page should be return.
+     *
+     * @return void
+     */
+    public function testFindPageTagcloudValid()
+    {
+        $this->assertEquals(
+            Router::$PAGE_TAGCLOUD,
+            Router::findPage('do=tagcloud', array(), false)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_TAGCLOUD,
+            Router::findPage('do=tagcloud', array(), true)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_TAGCLOUD,
+            Router::findPage('do=tagcloud&stuff', array(), false)
+        );
+    }
+
+    /**
+     * Test findPage: tagcloud page output.
+     * Invalid: page shouldn't be return.
+     *
+     * @return void
+     */
+    public function testFindPageTagcloudInvalid()
+    {
+        $this->assertNotEquals(
+            Router::$PAGE_TAGCLOUD,
+            Router::findPage('do=other', array(), false)
+        );
+    }
+
+    /**
+     * Test findPage: linklist page output.
+     * Valid: page should be return.
+     *
+     * @return void
+     */
+    public function testFindPageLinklistValid()
+    {
+        $this->assertEquals(
+            Router::$PAGE_LINKLIST,
+            Router::findPage('', array(), true)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_LINKLIST,
+            Router::findPage('whatever', array(), true)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_LINKLIST,
+            Router::findPage('whatever', array(), false)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_LINKLIST,
+            Router::findPage('do=tools', array(), false)
+        );
+    }
+
+    /**
+     * Test findPage: tools page output.
+     * Valid: page should be return.
+     *
+     * @return void
+     */
+    public function testFindPageToolsValid()
+    {
+        $this->assertEquals(
+            Router::$PAGE_TOOLS,
+            Router::findPage('do=tools', array(), true)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_TOOLS,
+            Router::findPage('do=tools&stuff', array(), true)
+        );
+    }
+
+    /**
+     * Test findPage: tools page output.
+     * Invalid: page shouldn't be return.
+     *
+     * @return void
+     */
+    public function testFindPageToolsInvalid()
+    {
+        $this->assertNotEquals(
+            Router::$PAGE_TOOLS,
+            Router::findPage('do=tools', array(), 1)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_TOOLS,
+            Router::findPage('do=tools', array(), false)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_TOOLS,
+            Router::findPage('do=other', array(), true)
+        );
+    }
+
+    /**
+     * Test findPage: changepasswd page output.
+     * Valid: page should be return.
+     *
+     * @return void
+     */
+    public function testFindPageChangepasswdValid()
+    {
+        $this->assertEquals(
+            Router::$PAGE_CHANGEPASSWORD,
+            Router::findPage('do=changepasswd', array(), true)
+        );
+        $this->assertEquals(
+            Router::$PAGE_CHANGEPASSWORD,
+            Router::findPage('do=changepasswd&stuff', array(), true)
+        );
+
+    }
+
+    /**
+     * Test findPage: changepasswd page output.
+     * Invalid: page shouldn't be return.
+     *
+     * @return void
+     */
+    public function testFindPageChangepasswdInvalid()
+    {
+        $this->assertNotEquals(
+            Router::$PAGE_CHANGEPASSWORD,
+            Router::findPage('do=changepasswd', array(), 1)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_CHANGEPASSWORD,
+            Router::findPage('do=changepasswd', array(), false)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_CHANGEPASSWORD,
+            Router::findPage('do=other', array(), true)
+        );
+    }
+    /**
+     * Test findPage: configure page output.
+     * Valid: page should be return.
+     *
+     * @return void
+     */
+    public function testFindPageConfigureValid()
+    {
+        $this->assertEquals(
+            Router::$PAGE_CONFIGURE,
+            Router::findPage('do=configure', array(), true)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_CONFIGURE,
+            Router::findPage('do=configure&stuff', array(), true)
+        );
+    }
+
+    /**
+     * Test findPage: configure page output.
+     * Invalid: page shouldn't be return.
+     *
+     * @return void
+     */
+    public function testFindPageConfigureInvalid()
+    {
+        $this->assertNotEquals(
+            Router::$PAGE_CONFIGURE,
+            Router::findPage('do=configure', array(), 1)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_CONFIGURE,
+            Router::findPage('do=configure', array(), false)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_CONFIGURE,
+            Router::findPage('do=other', array(), true)
+        );
+    }
+
+    /**
+     * Test findPage: changetag page output.
+     * Valid: page should be return.
+     *
+     * @return void
+     */
+    public function testFindPageChangetagValid()
+    {
+        $this->assertEquals(
+            Router::$PAGE_CHANGETAG,
+            Router::findPage('do=changetag', array(), true)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_CHANGETAG,
+            Router::findPage('do=changetag&stuff', array(), true)
+        );
+    }
+
+    /**
+     * Test findPage: changetag page output.
+     * Invalid: page shouldn't be return.
+     *
+     * @return void
+     */
+    public function testFindPageChangetagInvalid()
+    {
+        $this->assertNotEquals(
+            Router::$PAGE_CHANGETAG,
+            Router::findPage('do=changetag', array(), 1)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_CHANGETAG,
+            Router::findPage('do=changetag', array(), false)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_CHANGETAG,
+            Router::findPage('do=other', array(), true)
+        );
+    }
+
+    /**
+     * Test findPage: addlink page output.
+     * Valid: page should be return.
+     *
+     * @return void
+     */
+    public function testFindPageAddlinkValid()
+    {
+        $this->assertEquals(
+            Router::$PAGE_ADDLINK,
+            Router::findPage('do=addlink', array(), true)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_ADDLINK,
+            Router::findPage('do=addlink&stuff', array(), true)
+        );
+    }
+
+    /**
+     * Test findPage: addlink page output.
+     * Invalid: page shouldn't be return.
+     *
+     * @return void
+     */
+    public function testFindPageAddlinkInvalid()
+    {
+        $this->assertNotEquals(
+            Router::$PAGE_ADDLINK,
+            Router::findPage('do=addlink', array(), 1)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_ADDLINK,
+            Router::findPage('do=addlink', array(), false)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_ADDLINK,
+            Router::findPage('do=other', array(), true)
+        );
+    }
+
+    /**
+     * Test findPage: export page output.
+     * Valid: page should be return.
+     *
+     * @return void
+     */
+    public function testFindPageExportValid()
+    {
+        $this->assertEquals(
+            Router::$PAGE_EXPORT,
+            Router::findPage('do=export', array(), true)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_EXPORT,
+            Router::findPage('do=export&stuff', array(), true)
+        );
+    }
+
+    /**
+     * Test findPage: export page output.
+     * Invalid: page shouldn't be return.
+     *
+     * @return void
+     */
+    public function testFindPageExportInvalid()
+    {
+        $this->assertNotEquals(
+            Router::$PAGE_EXPORT,
+            Router::findPage('do=export', array(), 1)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_EXPORT,
+            Router::findPage('do=export', array(), false)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_EXPORT,
+            Router::findPage('do=other', array(), true)
+        );
+    }
+
+    /**
+     * Test findPage: import page output.
+     * Valid: page should be return.
+     *
+     * @return void
+     */
+    public function testFindPageImportValid()
+    {
+        $this->assertEquals(
+            Router::$PAGE_IMPORT,
+            Router::findPage('do=import', array(), true)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_IMPORT,
+            Router::findPage('do=import&stuff', array(), true)
+        );
+    }
+
+    /**
+     * Test findPage: import page output.
+     * Invalid: page shouldn't be return.
+     *
+     * @return void
+     */
+    public function testFindPageImportInvalid()
+    {
+        $this->assertNotEquals(
+            Router::$PAGE_IMPORT,
+            Router::findPage('do=import', array(), 1)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_IMPORT,
+            Router::findPage('do=import', array(), false)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_IMPORT,
+            Router::findPage('do=other', array(), true)
+        );
+    }
+
+    /**
+     * Test findPage: editlink page output.
+     * Valid: page should be return.
+     *
+     * @return void
+     */
+    public function testFindPageEditlinkValid()
+    {
+        $this->assertEquals(
+            Router::$PAGE_EDITLINK,
+            Router::findPage('whatever', array('edit_link' => 1), true)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_EDITLINK,
+            Router::findPage('', array('edit_link' => 1), true)
+        );
+
+
+        $this->assertEquals(
+            Router::$PAGE_EDITLINK,
+            Router::findPage('whatever', array('post' => 1), true)
+        );
+
+        $this->assertEquals(
+            Router::$PAGE_EDITLINK,
+            Router::findPage('whatever', array('post' => 1, 'edit_link' => 1), true)
+        );
+    }
+
+    /**
+     * Test findPage: editlink page output.
+     * Invalid: page shouldn't be return.
+     *
+     * @return void
+     */
+    public function testFindPageEditlinkInvalid()
+    {
+        $this->assertNotEquals(
+            Router::$PAGE_EDITLINK,
+            Router::findPage('whatever', array('edit_link' => 1), false)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_EDITLINK,
+            Router::findPage('whatever', array('edit_link' => 1), 1)
+        );
+
+        $this->assertNotEquals(
+            Router::$PAGE_EDITLINK,
+            Router::findPage('whatever', array(), true)
+        );
+    }
+}
\ No newline at end of file
diff --git a/tests/plugins/test/test.php b/tests/plugins/test/test.php
new file mode 100755
index 0000000..3d750c9
--- /dev/null
+++ b/tests/plugins/test/test.php
@@ -0,0 +1,21 @@
+
Date: Wed, 15 Jul 2015 12:08:52 +0200
Subject: [PATCH 187/658] Plugins TODO.md

---
 plugins/TODO.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 plugins/TODO.md

diff --git a/plugins/TODO.md b/plugins/TODO.md
new file mode 100644
index 0000000..e3313d6
--- /dev/null
+++ b/plugins/TODO.md
@@ -0,0 +1,28 @@
+https://github.com/shaarli/Shaarli/issues/181 -  Add Disqus or Isso comments box on a permalink page  
+
+ * http://posativ.org/isso/
+ * install debian package https://packages.debian.org/sid/isso  
+ * configure server http://posativ.org/isso/docs/configuration/server/  
+ * configure client http://posativ.org/isso/docs/configuration/client/  
+ * http://posativ.org/isso/docs/quickstart/ and add `` to includes.html template; then add `
                                                                  ` in the linklist template where you want the comments (in the linklist_plugins loop for example)
+ 
+
+Problem: by default, Isso thread ID is guessed from the current url (only one thread per page).  
+if we want multiple threads on a single page (shaarli linklist), we must use : the `data-isso-id` client config,
+with data-isso-id being the permalink of an item.
+
+`
                                                                  ` 
+`data-isso-id: Set a custom thread id, defaults to current URI.`
+
+Problem: feature is currently broken https://github.com/posativ/isso/issues/27 
+
+Another option, only display isso threads when current URL is a permalink (`\?(A-Z|a-z|0-9|-){7}`) (only show thread
+when displaying only this link), and just display a "comments" button on each linklist item. Optionally show the comment
+count on each item using the API (http://posativ.org/isso/docs/extras/api/#get-comment-count). API requests can be done
+by raintpl `{function` or client-side with js. The former should be faster if isso and shaarli are on ther same server.
+
+Showing all full isso threads in the linklist would destroy layout
+
+-----------------------------------------------------------
+
+http://www.git-attitude.fr/2014/11/04/git-rerere/ for the merge

From 567967fdf94b2b8ba2b2fc9c8836e89ac23c8c71 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Wed, 15 Jul 2015 11:47:12 +0200
Subject: [PATCH 188/658] Template upgrade to handle plugin zones

Add a bunch of plugin placeholders in templates
---
 COPYING                       |   14 +-
 application/PluginManager.php |    2 +-
 images/qrcode.png             |  Bin 321 -> 0 bytes
 inc/qr-1.1.3.js               | 1215 ---------------------------------
 inc/qr-1.1.3.min.js           |    5 -
 inc/shaarli.css               |    8 +-
 tpl/configure.html            |    1 +
 tpl/daily.html                |   59 +-
 tpl/editlink.html             |    5 +
 tpl/includes.html             |    3 +
 tpl/linklist.html             |   90 +--
 tpl/linklist.paging.html      |    5 +
 tpl/page.footer.html          |    7 +
 tpl/page.header.html          |    5 +-
 tpl/picwall.html              |   19 +
 tpl/tagcloud.html             |   18 +-
 tpl/tools.html                |    3 +
 17 files changed, 147 insertions(+), 1312 deletions(-)
 delete mode 100644 images/qrcode.png
 delete mode 100644 inc/qr-1.1.3.js
 delete mode 100644 inc/qr-1.1.3.min.js

diff --git a/COPYING b/COPYING
index 24b97e9..1044a3b 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Files: * 
+Files: *
 License: zlib/libpng
 Copyright: (c) 2011-2015 Sébastien SAUVAGE 
            (c) 2011-2015 Alexandre Alapetite 
@@ -31,9 +31,9 @@ Copyright: (c) 2011-2015 Sébastien SAUVAGE 
 
 Files: inc/reset.css
 License: BSD (http://opensource.org/licenses/BSD-3-Clause)
-Copyright: (c) 2010, Yahoo! Inc. 
+Copyright: (c) 2010, Yahoo! Inc.
 
-Files: images/calendar.png, images/edit_icon.png, images/feed-icon-14x14.png, images/private.png, images/private_16x16.png, images/private_16x16_active.png, images/qrcode.png, images/tag_blue.png
+Files: images/calendar.png, images/edit_icon.png, images/feed-icon-14x14.png, images/private.png, images/private_16x16.png, images/private_16x16_active.png, images/tag_blue.png
 License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
 Copyright: (c) 2014 Yusuke Kamiyamane
 Source: http://p.yusukekamiyamane.com/
@@ -59,10 +59,6 @@ Files: inc/blazy*.js
 License: MIT License (http://opensource.org/licenses/MIT)
 Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy
 
-Files: inc/qr.js
-License: GPLv3 License (http://opensource.org/licenses/gpl-3.0)
-Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com, https://github.com/neocotic/qr.js
-
 Files: inc/rain.tpl.class.php
 Copyright: 2011-2012, Federico Ulfo 
            2011-2012, The Rain Team 
@@ -80,10 +76,10 @@ In no event will the authors be held liable for any damages arising from
 the use of this software.
 
 Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it 
+including commercial applications, and to alter it and redistribute it
 freely, subject to the following restrictions:
 
-  1. The origin of this software must not be misrepresented; you must not 
+  1. The origin of this software must not be misrepresented; you must not
      claim that you wrote the original software. If you use this software
      in a product, an acknowledgment in the product documentation would
      be appreciated but is not required.
diff --git a/application/PluginManager.php b/application/PluginManager.php
index e572ff7..803f11b 100644
--- a/application/PluginManager.php
+++ b/application/PluginManager.php
@@ -99,7 +99,7 @@ class PluginManager
      * @param string $hook   name of the hook to trigger.
      * @param array  $data   list of data to manipulate passed by reference.
      * @param array  $params additional parameters such as page target.
-     * 
+     *
      * @return void
      */
     public function executeHooks($hook, &$data, $params = array())
diff --git a/images/qrcode.png b/images/qrcode.png
deleted file mode 100644
index c2cfa4765abf4f837d36536299b9b0715acfea4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 321
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X9(%ethE&{2`t$$4J+o>9tBZl5p(&GQuE|aTg}CNcUgq%s
ze}9LcXDDJ+R(@=ykmhjc^@WTzSq@b*7c4vYf;Xc^O(#jCri7Vk!-tQn5*v$VG*)O&
zGhphhd>nk3;~TrM@H&Tkj7x1dcrq~yzFTuQpy$jz-m52iRQf!flN04lQoai&D1Sa!
zmB{ws5c@(2>Hi8I`Z@yrNgo%P3fxvcDcjm5>+08HAU?-s^G_8+lOm_2)=SSX{8$rU
zD3ROe<{ZPovi;(mdTD;?bMAc2-VT3cye%4zs7!n^;bwND#f*uU-tY({F#J|Y=2x5Q
RJs;>@22WQ%mvv4FO#u0=d4&J~

diff --git a/inc/qr-1.1.3.js b/inc/qr-1.1.3.js
deleted file mode 100644
index 4f127e6..0000000
--- a/inc/qr-1.1.3.js
+++ /dev/null
@@ -1,1215 +0,0 @@
-// [qr.js](http://neocotic.com/qr.js)  
-// (c) 2014 Alasdair Mercer  
-// Licensed under the GPL Version 3 license.  
-// Based on [jsqrencode](http://code.google.com/p/jsqrencode/)  
-// (c) 2010 tz@execpc.com  
-// Licensed under the GPL Version 3 license.  
-// For all details and documentation:  
-// 
-
-(function (root) {
-
-  'use strict';
-
-  // Private constants
-  // -----------------
-
-  // Alignment pattern.
-  var ALIGNMENT_DELTA = [
-    0,  11, 15, 19, 23, 27, 31,
-    16, 18, 20, 22, 24, 26, 28, 20, 22, 24, 24, 26, 28, 28, 22, 24, 24,
-    26, 26, 28, 28, 24, 24, 26, 26, 26, 28, 28, 24, 26, 26, 26, 28, 28
-  ];
-  // Default MIME type.
-  var DEFAULT_MIME = 'image/png';
-  // MIME used to initiate a browser download prompt when `qr.save` is called.
-  var DOWNLOAD_MIME = 'image/octet-stream';
-  // There are four elements per version. The first two indicate the number of blocks, then the
-  // data width, and finally the ECC width.
-  var ECC_BLOCKS = [
-    1,  0,  19,  7,     1,  0,  16,  10,    1,  0,  13,  13,    1,  0,  9,   17,
-    1,  0,  34,  10,    1,  0,  28,  16,    1,  0,  22,  22,    1,  0,  16,  28,
-    1,  0,  55,  15,    1,  0,  44,  26,    2,  0,  17,  18,    2,  0,  13,  22,
-    1,  0,  80,  20,    2,  0,  32,  18,    2,  0,  24,  26,    4,  0,  9,   16,
-    1,  0,  108, 26,    2,  0,  43,  24,    2,  2,  15,  18,    2,  2,  11,  22,
-    2,  0,  68,  18,    4,  0,  27,  16,    4,  0,  19,  24,    4,  0,  15,  28,
-    2,  0,  78,  20,    4,  0,  31,  18,    2,  4,  14,  18,    4,  1,  13,  26,
-    2,  0,  97,  24,    2,  2,  38,  22,    4,  2,  18,  22,    4,  2,  14,  26,
-    2,  0,  116, 30,    3,  2,  36,  22,    4,  4,  16,  20,    4,  4,  12,  24,
-    2,  2,  68,  18,    4,  1,  43,  26,    6,  2,  19,  24,    6,  2,  15,  28,
-    4,  0,  81,  20,    1,  4,  50,  30,    4,  4,  22,  28,    3,  8,  12,  24,
-    2,  2,  92,  24,    6,  2,  36,  22,    4,  6,  20,  26,    7,  4,  14,  28,
-    4,  0,  107, 26,    8,  1,  37,  22,    8,  4,  20,  24,    12, 4,  11,  22,
-    3,  1,  115, 30,    4,  5,  40,  24,    11, 5,  16,  20,    11, 5,  12,  24,
-    5,  1,  87,  22,    5,  5,  41,  24,    5,  7,  24,  30,    11, 7,  12,  24,
-    5,  1,  98,  24,    7,  3,  45,  28,    15, 2,  19,  24,    3,  13, 15,  30,
-    1,  5,  107, 28,    10, 1,  46,  28,    1,  15, 22,  28,    2,  17, 14,  28,
-    5,  1,  120, 30,    9,  4,  43,  26,    17, 1,  22,  28,    2,  19, 14,  28,
-    3,  4,  113, 28,    3,  11, 44,  26,    17, 4,  21,  26,    9,  16, 13,  26,
-    3,  5,  107, 28,    3,  13, 41,  26,    15, 5,  24,  30,    15, 10, 15,  28,
-    4,  4,  116, 28,    17, 0,  42,  26,    17, 6,  22,  28,    19, 6,  16,  30,
-    2,  7,  111, 28,    17, 0,  46,  28,    7,  16, 24,  30,    34, 0,  13,  24,
-    4,  5,  121, 30,    4,  14, 47,  28,    11, 14, 24,  30,    16, 14, 15,  30,
-    6,  4,  117, 30,    6,  14, 45,  28,    11, 16, 24,  30,    30, 2,  16,  30,
-    8,  4,  106, 26,    8,  13, 47,  28,    7,  22, 24,  30,    22, 13, 15,  30,
-    10, 2,  114, 28,    19, 4,  46,  28,    28, 6,  22,  28,    33, 4,  16,  30,
-    8,  4,  122, 30,    22, 3,  45,  28,    8,  26, 23,  30,    12, 28, 15,  30,
-    3,  10, 117, 30,    3,  23, 45,  28,    4,  31, 24,  30,    11, 31, 15,  30,
-    7,  7,  116, 30,    21, 7,  45,  28,    1,  37, 23,  30,    19, 26, 15,  30,
-    5,  10, 115, 30,    19, 10, 47,  28,    15, 25, 24,  30,    23, 25, 15,  30,
-    13, 3,  115, 30,    2,  29, 46,  28,    42, 1,  24,  30,    23, 28, 15,  30,
-    17, 0,  115, 30,    10, 23, 46,  28,    10, 35, 24,  30,    19, 35, 15,  30,
-    17, 1,  115, 30,    14, 21, 46,  28,    29, 19, 24,  30,    11, 46, 15,  30,
-    13, 6,  115, 30,    14, 23, 46,  28,    44, 7,  24,  30,    59, 1,  16,  30,
-    12, 7,  121, 30,    12, 26, 47,  28,    39, 14, 24,  30,    22, 41, 15,  30,
-    6,  14, 121, 30,    6,  34, 47,  28,    46, 10, 24,  30,    2,  64, 15,  30,
-    17, 4,  122, 30,    29, 14, 46,  28,    49, 10, 24,  30,    24, 46, 15,  30,
-    4,  18, 122, 30,    13, 32, 46,  28,    48, 14, 24,  30,    42, 32, 15,  30,
-    20, 4,  117, 30,    40, 7,  47,  28,    43, 22, 24,  30,    10, 67, 15,  30,
-    19, 6,  118, 30,    18, 31, 47,  28,    34, 34, 24,  30,    20, 61, 15,  30
-  ];
-  // Map of human-readable ECC levels.
-  var ECC_LEVELS = {
-    L: 1,
-    M: 2,
-    Q: 3,
-    H: 4
-  };
-  // Final format bits with mask (level << 3 | mask).
-  var FINAL_FORMAT = [
-    0x77c4, 0x72f3, 0x7daa, 0x789d, 0x662f, 0x6318, 0x6c41, 0x6976, /* L */
-    0x5412, 0x5125, 0x5e7c, 0x5b4b, 0x45f9, 0x40ce, 0x4f97, 0x4aa0, /* M */
-    0x355f, 0x3068, 0x3f31, 0x3a06, 0x24b4, 0x2183, 0x2eda, 0x2bed, /* Q */
-    0x1689, 0x13be, 0x1ce7, 0x19d0, 0x0762, 0x0255, 0x0d0c, 0x083b  /* H */
-  ];
-  // Galois field exponent table.
-  var GALOIS_EXPONENT = [
-    0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1d, 0x3a, 0x74, 0xe8, 0xcd, 0x87, 0x13, 0x26,
-    0x4c, 0x98, 0x2d, 0x5a, 0xb4, 0x75, 0xea, 0xc9, 0x8f, 0x03, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0,
-    0x9d, 0x27, 0x4e, 0x9c, 0x25, 0x4a, 0x94, 0x35, 0x6a, 0xd4, 0xb5, 0x77, 0xee, 0xc1, 0x9f, 0x23,
-    0x46, 0x8c, 0x05, 0x0a, 0x14, 0x28, 0x50, 0xa0, 0x5d, 0xba, 0x69, 0xd2, 0xb9, 0x6f, 0xde, 0xa1,
-    0x5f, 0xbe, 0x61, 0xc2, 0x99, 0x2f, 0x5e, 0xbc, 0x65, 0xca, 0x89, 0x0f, 0x1e, 0x3c, 0x78, 0xf0,
-    0xfd, 0xe7, 0xd3, 0xbb, 0x6b, 0xd6, 0xb1, 0x7f, 0xfe, 0xe1, 0xdf, 0xa3, 0x5b, 0xb6, 0x71, 0xe2,
-    0xd9, 0xaf, 0x43, 0x86, 0x11, 0x22, 0x44, 0x88, 0x0d, 0x1a, 0x34, 0x68, 0xd0, 0xbd, 0x67, 0xce,
-    0x81, 0x1f, 0x3e, 0x7c, 0xf8, 0xed, 0xc7, 0x93, 0x3b, 0x76, 0xec, 0xc5, 0x97, 0x33, 0x66, 0xcc,
-    0x85, 0x17, 0x2e, 0x5c, 0xb8, 0x6d, 0xda, 0xa9, 0x4f, 0x9e, 0x21, 0x42, 0x84, 0x15, 0x2a, 0x54,
-    0xa8, 0x4d, 0x9a, 0x29, 0x52, 0xa4, 0x55, 0xaa, 0x49, 0x92, 0x39, 0x72, 0xe4, 0xd5, 0xb7, 0x73,
-    0xe6, 0xd1, 0xbf, 0x63, 0xc6, 0x91, 0x3f, 0x7e, 0xfc, 0xe5, 0xd7, 0xb3, 0x7b, 0xf6, 0xf1, 0xff,
-    0xe3, 0xdb, 0xab, 0x4b, 0x96, 0x31, 0x62, 0xc4, 0x95, 0x37, 0x6e, 0xdc, 0xa5, 0x57, 0xae, 0x41,
-    0x82, 0x19, 0x32, 0x64, 0xc8, 0x8d, 0x07, 0x0e, 0x1c, 0x38, 0x70, 0xe0, 0xdd, 0xa7, 0x53, 0xa6,
-    0x51, 0xa2, 0x59, 0xb2, 0x79, 0xf2, 0xf9, 0xef, 0xc3, 0x9b, 0x2b, 0x56, 0xac, 0x45, 0x8a, 0x09,
-    0x12, 0x24, 0x48, 0x90, 0x3d, 0x7a, 0xf4, 0xf5, 0xf7, 0xf3, 0xfb, 0xeb, 0xcb, 0x8b, 0x0b, 0x16,
-    0x2c, 0x58, 0xb0, 0x7d, 0xfa, 0xe9, 0xcf, 0x83, 0x1b, 0x36, 0x6c, 0xd8, 0xad, 0x47, 0x8e, 0x00
-  ];
-  // Galois field log table.
-  var GALOIS_LOG = [
-    0xff, 0x00, 0x01, 0x19, 0x02, 0x32, 0x1a, 0xc6, 0x03, 0xdf, 0x33, 0xee, 0x1b, 0x68, 0xc7, 0x4b,
-    0x04, 0x64, 0xe0, 0x0e, 0x34, 0x8d, 0xef, 0x81, 0x1c, 0xc1, 0x69, 0xf8, 0xc8, 0x08, 0x4c, 0x71,
-    0x05, 0x8a, 0x65, 0x2f, 0xe1, 0x24, 0x0f, 0x21, 0x35, 0x93, 0x8e, 0xda, 0xf0, 0x12, 0x82, 0x45,
-    0x1d, 0xb5, 0xc2, 0x7d, 0x6a, 0x27, 0xf9, 0xb9, 0xc9, 0x9a, 0x09, 0x78, 0x4d, 0xe4, 0x72, 0xa6,
-    0x06, 0xbf, 0x8b, 0x62, 0x66, 0xdd, 0x30, 0xfd, 0xe2, 0x98, 0x25, 0xb3, 0x10, 0x91, 0x22, 0x88,
-    0x36, 0xd0, 0x94, 0xce, 0x8f, 0x96, 0xdb, 0xbd, 0xf1, 0xd2, 0x13, 0x5c, 0x83, 0x38, 0x46, 0x40,
-    0x1e, 0x42, 0xb6, 0xa3, 0xc3, 0x48, 0x7e, 0x6e, 0x6b, 0x3a, 0x28, 0x54, 0xfa, 0x85, 0xba, 0x3d,
-    0xca, 0x5e, 0x9b, 0x9f, 0x0a, 0x15, 0x79, 0x2b, 0x4e, 0xd4, 0xe5, 0xac, 0x73, 0xf3, 0xa7, 0x57,
-    0x07, 0x70, 0xc0, 0xf7, 0x8c, 0x80, 0x63, 0x0d, 0x67, 0x4a, 0xde, 0xed, 0x31, 0xc5, 0xfe, 0x18,
-    0xe3, 0xa5, 0x99, 0x77, 0x26, 0xb8, 0xb4, 0x7c, 0x11, 0x44, 0x92, 0xd9, 0x23, 0x20, 0x89, 0x2e,
-    0x37, 0x3f, 0xd1, 0x5b, 0x95, 0xbc, 0xcf, 0xcd, 0x90, 0x87, 0x97, 0xb2, 0xdc, 0xfc, 0xbe, 0x61,
-    0xf2, 0x56, 0xd3, 0xab, 0x14, 0x2a, 0x5d, 0x9e, 0x84, 0x3c, 0x39, 0x53, 0x47, 0x6d, 0x41, 0xa2,
-    0x1f, 0x2d, 0x43, 0xd8, 0xb7, 0x7b, 0xa4, 0x76, 0xc4, 0x17, 0x49, 0xec, 0x7f, 0x0c, 0x6f, 0xf6,
-    0x6c, 0xa1, 0x3b, 0x52, 0x29, 0x9d, 0x55, 0xaa, 0xfb, 0x60, 0x86, 0xb1, 0xbb, 0xcc, 0x3e, 0x5a,
-    0xcb, 0x59, 0x5f, 0xb0, 0x9c, 0xa9, 0xa0, 0x51, 0x0b, 0xf5, 0x16, 0xeb, 0x7a, 0x75, 0x2c, 0xd7,
-    0x4f, 0xae, 0xd5, 0xe9, 0xe6, 0xe7, 0xad, 0xe8, 0x74, 0xd6, 0xf4, 0xea, 0xa8, 0x50, 0x58, 0xaf
-  ];
-  // *Badness* coefficients.
-  var N1 = 3;
-  var N2 = 3;
-  var N3 = 40;
-  var N4 = 10;
-  // Version pattern.
-  var VERSION_BLOCK = [ 
-    0xc94, 0x5bc, 0xa99, 0x4d3, 0xbf6, 0x762, 0x847, 0x60d, 0x928, 0xb78, 0x45d, 0xa17, 0x532,
-    0x9a6, 0x683, 0x8c9, 0x7ec, 0xec4, 0x1e1, 0xfab, 0x08e, 0xc1a, 0x33f, 0xd75, 0x250, 0x9d5,
-    0x6f0, 0x8ba, 0x79f, 0xb0b, 0x42e, 0xa64, 0x541, 0xc69
-  ];
-  // Mode for node.js file system file writes.
-  var WRITE_MODE = parseInt('0666', 8);
-
-  // Private variables
-  // -----------------
-
-  // Run lengths for badness.
-  var badBuffer = [];
-  // Constructor for `canvas` elements in the node.js environment.
-  var Canvas;
-  // Data block.
-  var dataBlock;
-  // ECC data blocks and tables.
-  var eccBlock, neccBlock1, neccBlock2;
-  // ECC buffer.
-  var eccBuffer = [];
-  // ECC level (defaults to **L**).
-  var eccLevel = 1;
-  // Image buffer.
-  var frameBuffer = [];
-  // Fixed part of the image.
-  var frameMask = [];
-  // File system within the node.js environment.
-  var fs;
-  // Constructor for `img` elements in the node.js environment.
-  var Image;
-  // Indicates whether or not this script is running in node.js.
-  var inNode = false;
-  // Generator polynomial.
-  var polynomial = [];
-  // Save the previous value of the `qr` variable.
-  var previousQr = root.qr;
-  // Data input buffer.
-  var stringBuffer = [];
-  // Version for the data.
-  var version;
-  // Data width is based on `version`.
-  var width;
-
-  // Private functions
-  // -----------------
-
-  // Create a new canvas  using `document.createElement` unless script is running in node.js, in
-  // which case the `canvas` module is used.
-  function createCanvas() {
-    return inNode ? new Canvas() : root.document.createElement('canvas');
-  }
-
-  // Create a new image using `document.createElement` unless script is running in node.js, in
-  // which case the `canvas` module is used.
-  function createImage() {
-    return inNode ? new Image() : root.document.createElement('img');
-  }
-
-  // Force the canvas image to be downloaded in the browser.  
-  // Optionally, a `callback` function can be specified which will be called upon completed. Since
-  // this is not an asynchronous operation, this is merely convenient and helps simplify the
-  // calling code.
-  function download(cvs, data, callback) {
-    var mime = data.mime || DEFAULT_MIME;
-
-    root.location.href = cvs.toDataURL(mime).replace(mime, DOWNLOAD_MIME);
-
-    if (typeof callback === 'function') callback();
-  }
-
-  // Normalize the `data` that is provided to the main API.
-  function normalizeData(data) {
-    if (typeof data === 'string') data = { value: data };
-    return data || {};
-  }
-
-  // Override the `qr` API methods that require HTML5 canvas support to throw a relevant error.
-  function overrideAPI(qr) {
-    var methods = [ 'canvas', 'image', 'save', 'saveSync', 'toDataURL' ];
-    var i;
-
-    function overrideMethod(name) {
-      qr[name] = function () {
-        throw new Error(name + ' requires HTML5 canvas element support');
-      };
-    }
-
-    for (i = 0; i < methods.length; i++) {
-      overrideMethod(methods[i]);
-    }
-  }
-
-  // Asynchronously write the data of the rendered canvas to a given file path.
-  function writeFile(cvs, data, callback) {
-    if (typeof data.path !== 'string') {
-      return callback(new TypeError('Invalid path type: ' + typeof data.path));
-    }
-
-    var fd, buff;
-
-    // Write the buffer to the open file stream once both prerequisites are met.
-    function writeBuffer() {
-      fs.write(fd, buff, 0, buff.length, 0, function (error) {
-        fs.close(fd);
-
-        callback(error);
-      });
-    }
-
-    // Create a buffer of the canvas' data.
-    cvs.toBuffer(function (error, _buff) {
-      if (error) return callback(error);
-
-      buff = _buff;
-      if (fd) {
-        writeBuffer();
-      }
-    });
-
-    // Open a stream for the file to be written.
-    fs.open(data.path, 'w', WRITE_MODE, function (error, _fd) {
-      if (error) return callback(error);
-
-      fd = _fd;
-      if (buff) {
-        writeBuffer();
-      }
-    });
-  }
-
-  // Write the data of the rendered canvas to a given file path.
-  function writeFileSync(cvs, data) {
-    if (typeof data.path !== 'string') {
-      throw new TypeError('Invalid path type: ' + typeof data.path);
-    }
-
-    var buff = cvs.toBuffer();
-    var fd = fs.openSync(data.path, 'w', WRITE_MODE);
-
-    try {
-      fs.writeSync(fd, buff, 0, buff.length, 0);
-    } finally {
-      fs.closeSync(fd);
-    }
-  }
-
-  // Set bit to indicate cell in frame is immutable (symmetric around diagonal).
-  function setMask(x, y) {
-    var bit;
-
-    if (x > y) {
-      bit = x;
-      x   = y;
-      y   = bit;
-    }
-
-    bit   = y;
-    bit  *= y;
-    bit  += y;
-    bit >>= 1;
-    bit  += x;
-
-    frameMask[bit] = 1;
-  }
-
-  // Enter alignment pattern. Foreground colour to frame, background to mask. Frame will be merged
-  // with mask later.
-  function addAlignment(x, y) {
-    var i;
-
-    frameBuffer[x + width * y] = 1;
-
-    for (i = -2; i < 2; i++) {
-      frameBuffer[(x + i)     + width * (y - 2)]     = 1;
-      frameBuffer[(x - 2)     + width * (y + i + 1)] = 1;
-      frameBuffer[(x + 2)     + width * (y + i)]     = 1;
-      frameBuffer[(x + i + 1) + width * (y + 2)]     = 1;
-    }
-
-    for (i = 0; i < 2; i++) {
-      setMask(x - 1, y + i);
-      setMask(x + 1, y - i);
-      setMask(x - i, y - 1);
-      setMask(x + i, y + 1);
-    }
-  }
-
-  // Exponentiation mod N.
-  function modN(x) {
-    while (x >= 255) {
-      x -= 255;
-      x  = (x >> 8) + (x & 255);
-    }
-
-    return x;
-  }
-
-  // Calculate and append `ecc` data to the `data` block. If block is in the string buffer the
-  // indices to buffers are used.
-  function appendData(data, dataLength, ecc, eccLength) {
-    var bit, i, j;
-
-    for (i = 0; i < eccLength; i++) {
-      stringBuffer[ecc + i] = 0;
-    }
-
-    for (i = 0; i < dataLength; i++) {
-      bit = GALOIS_LOG[stringBuffer[data + i] ^ stringBuffer[ecc]];
-
-      if (bit !== 255) {
-        for (j = 1; j < eccLength; j++) {
-          stringBuffer[ecc + j - 1] = stringBuffer[ecc + j] ^
-              GALOIS_EXPONENT[modN(bit + polynomial[eccLength - j])];
-        }
-      } else {
-        for (j = ecc; j < ecc + eccLength; j++) {
-          stringBuffer[j] = stringBuffer[j + 1];
-        }
-      }
-
-      stringBuffer[ecc + eccLength - 1] = bit === 255 ? 0 :
-          GALOIS_EXPONENT[modN(bit + polynomial[0])];
-    }
-  }
-
-  // Check mask since symmetricals use half.
-  function isMasked(x, y) {
-    var bit;
-
-    if (x > y) {
-      bit = x;
-      x   = y;
-      y   = bit;
-    }
-
-    bit   = y;
-    bit  += y * y;
-    bit >>= 1;
-    bit  += x;
-
-    return frameMask[bit] === 1;
-  }
-
-  // Apply the selected mask out of the 8 options.
-  function applyMask(mask) {
-    var x, y, r3x, r3y;
-
-    switch (mask) {
-      case 0:
-        for (y = 0; y < width; y++) {
-          for (x = 0; x < width; x++) {
-            if (!((x + y) & 1) && !isMasked(x, y)) {
-              frameBuffer[x + y * width] ^= 1;
-            }
-          }
-        }
-
-        break;
-      case 1:
-        for (y = 0; y < width; y++) {
-          for (x = 0; x < width; x++) {
-            if (!(y & 1) && !isMasked(x, y)) {
-              frameBuffer[x + y * width] ^= 1;
-            }
-          }
-        }
-
-        break;
-      case 2:
-        for (y = 0; y < width; y++) {
-          for (r3x = 0, x = 0; x < width; x++, r3x++) {
-            if (r3x === 3) r3x = 0;
-
-            if (!r3x && !isMasked(x, y)) {
-              frameBuffer[x + y * width] ^= 1;
-            }
-          }
-        }
-
-        break;
-      case 3:
-        for (r3y = 0, y = 0; y < width; y++, r3y++) {
-          if (r3y === 3) r3y = 0;
-
-          for (r3x = r3y, x = 0; x < width; x++, r3x++) {
-            if (r3x === 3) r3x = 0;
-
-            if (!r3x && !isMasked(x, y)) {
-              frameBuffer[x + y * width] ^= 1;
-            }
-          }
-        }
-
-        break;
-      case 4:
-        for (y = 0; y < width; y++) {
-          for (r3x = 0, r3y = ((y >> 1) & 1), x = 0; x < width; x++, r3x++) {
-            if (r3x === 3) {
-              r3x = 0;
-              r3y = !r3y;
-            }
-
-            if (!r3y && !isMasked(x, y)) {
-              frameBuffer[x + y * width] ^= 1;
-            }
-          }
-        }
-
-        break;
-      case 5:
-        for (r3y = 0, y = 0; y < width; y++, r3y++) {
-          if (r3y === 3) r3y = 0;
-
-          for (r3x = 0, x = 0; x < width; x++, r3x++) {
-            if (r3x === 3) r3x = 0;
-
-            if (!((x & y & 1) + !(!r3x | !r3y)) && !isMasked(x, y)) {
-              frameBuffer[x + y * width] ^= 1;
-            }
-          }
-        }
-
-        break;
-      case 6:
-        for (r3y = 0, y = 0; y < width; y++, r3y++) {
-          if (r3y === 3) r3y = 0;
-
-          for (r3x = 0, x = 0; x < width; x++, r3x++) {
-            if (r3x === 3) r3x = 0;
-
-            if (!(((x & y & 1) + (r3x && (r3x === r3y))) & 1) && !isMasked(x, y)) {
-              frameBuffer[x + y * width] ^= 1;
-            }
-          }
-        }
-
-        break;
-      case 7:
-        for (r3y = 0, y = 0; y < width; y++, r3y++) {
-          if (r3y === 3) r3y = 0;
-
-          for (r3x = 0, x = 0; x < width; x++, r3x++) {
-            if (r3x === 3) r3x = 0;
-
-            if (!(((r3x && (r3x === r3y)) + ((x + y) & 1)) & 1) && !isMasked(x, y)) {
-              frameBuffer[x + y * width] ^= 1;
-            }
-          }
-        }
-
-        break;
-    }
-  }
-
-  // Using the table for the length of each run, calculate the amount of bad image. Long runs or
-  // those that look like finders are called twice; once for X and Y.
-  function getBadRuns(length) {
-    var badRuns = 0;
-    var i;
-
-    for (i = 0; i <= length; i++) {
-      if (badBuffer[i] >= 5) {
-        badRuns += N1 + badBuffer[i] - 5;
-      }
-    }
-
-    // FBFFFBF as in finder.
-    for (i = 3; i < length - 1; i += 2) {
-      if (badBuffer[i - 2] === badBuffer[i + 2] &&
-          badBuffer[i + 2] === badBuffer[i - 1] &&
-          badBuffer[i - 1] === badBuffer[i + 1] &&
-          badBuffer[i - 1] * 3 === badBuffer[i] &&
-          // Background around the foreground pattern? Not part of the specs.
-          (badBuffer[i - 3] === 0 || i + 3 > length ||
-           badBuffer[i - 3] * 3 >= badBuffer[i] * 4 ||
-           badBuffer[i + 3] * 3 >= badBuffer[i] * 4)) {
-        badRuns += N3;
-      }
-    }
-
-    return badRuns;
-  }
-
-  // Calculate how bad the masked image is (e.g. blocks, imbalance, runs, or finders).
-  function checkBadness() {
-    var b, b1, bad, big, bw, count, h, x, y;
-    bad = bw = count = 0;
-
-    // Blocks of same colour.
-    for (y = 0; y < width - 1; y++) {
-      for (x = 0; x < width - 1; x++) {
-            // All foreground colour.
-        if ((frameBuffer[x + width * y] &&
-             frameBuffer[(x + 1) + width * y] &&
-             frameBuffer[x + width * (y + 1)] &&
-             frameBuffer[(x + 1) + width * (y + 1)]) ||
-            // All background colour.
-            !(frameBuffer[x + width * y] ||
-              frameBuffer[(x + 1) + width * y] ||
-              frameBuffer[x + width * (y + 1)] ||
-              frameBuffer[(x + 1) + width * (y + 1)])) {
-          bad += N2;
-        }
-      }
-    }
-
-    // X runs.
-    for (y = 0; y < width; y++) {
-      badBuffer[0] = 0;
-
-      for (h = b = x = 0; x < width; x++) {
-        if ((b1 = frameBuffer[x + width * y]) === b) {
-          badBuffer[h]++;
-        } else {
-          badBuffer[++h] = 1;
-        }
-
-        b   = b1;
-        bw += b ? 1 : -1;
-      }
-
-      bad += getBadRuns(h);
-    }
-
-    if (bw < 0) bw = -bw;
-
-    big   = bw;
-    big  += big << 2;
-    big <<= 1;
-
-    while (big > width * width) {
-      big -= width * width;
-      count++;
-    }
-
-    bad += count * N4;
-
-    // Y runs.
-    for (x = 0; x < width; x++) {
-      badBuffer[0] = 0;
-
-      for (h = b = y = 0; y < width; y++) {
-        if ((b1 = frameBuffer[x + width * y]) === b) {
-          badBuffer[h]++;
-        } else {
-          badBuffer[++h] = 1;
-        }
-
-        b = b1;
-      }
-
-      bad += getBadRuns(h);
-    }
-
-    return bad;
-  }
-
-  // Generate the encoded QR image for the string provided.
-  function generateFrame(str) {
-    var i, j, k, m, t, v, x, y;
-
-    // Find the smallest version that fits the string.
-    t = str.length;
-
-    version = 0;
-
-    do {
-      version++;
-
-      k = (eccLevel - 1) * 4 + (version - 1) * 16;
-
-      neccBlock1 = ECC_BLOCKS[k++];
-      neccBlock2 = ECC_BLOCKS[k++];
-      dataBlock  = ECC_BLOCKS[k++];
-      eccBlock   = ECC_BLOCKS[k];
-
-      k = dataBlock * (neccBlock1 + neccBlock2) + neccBlock2 - 3 + (version <= 9);
-
-      if (t <= k) break;
-    } while (version < 40);
-
-    // FIXME: Ensure that it fits insted of being truncated.
-    width = 17 + 4 * version;
-
-    // Allocate, clear and setup data structures.
-    v = dataBlock + (dataBlock + eccBlock) * (neccBlock1 + neccBlock2) + neccBlock2;
-
-    for (t = 0; t < v; t++) {
-      eccBuffer[t] = 0;
-    }
-
-    stringBuffer = str.slice(0);
-
-    for (t = 0; t < width * width; t++) {
-      frameBuffer[t] = 0;
-    }
-
-    for (t = 0; t < (width * (width + 1) + 1) / 2; t++) {
-      frameMask[t] = 0;
-    }
-
-    // Insert finders: Foreground colour to frame and background to mask.
-    for (t = 0; t < 3; t++) {
-      k = y = 0;
-
-      if (t === 1) k = (width - 7);
-      if (t === 2) y = (width - 7);
-
-      frameBuffer[(y + 3) + width * (k + 3)] = 1;
-
-      for (x = 0; x < 6; x++) {
-        frameBuffer[(y + x) + width * k] = 1;
-        frameBuffer[y + width * (k + x + 1)] = 1;
-        frameBuffer[(y + 6) + width * (k + x)] = 1;
-        frameBuffer[(y + x + 1) + width * (k + 6)] = 1;
-      }
-
-      for (x = 1; x < 5; x++) {
-        setMask(y + x, k + 1);
-        setMask(y + 1, k + x + 1);
-        setMask(y + 5, k + x);
-        setMask(y + x + 1, k + 5);
-      }
-
-      for (x = 2; x < 4; x++) {
-        frameBuffer[(y + x) + width * (k + 2)] = 1;
-        frameBuffer[(y + 2) + width * (k + x + 1)] = 1;
-        frameBuffer[(y + 4) + width * (k + x)] = 1;
-        frameBuffer[(y + x + 1) + width * (k + 4)] = 1;
-      }
-    }
-
-    // Alignment blocks.
-    if (version > 1) {
-      t = ALIGNMENT_DELTA[version];
-      y = width - 7;
-
-      for (;;) {
-        x = width - 7;
-
-        while (x > t - 3) {
-          addAlignment(x, y);
-
-          if (x < t) break;
-
-          x -= t;
-        }
-
-        if (y <= t + 9) break;
-
-        y -= t;
-
-        addAlignment(6, y);
-        addAlignment(y, 6);
-      }
-    }
-
-    // Single foreground cell.
-    frameBuffer[8 + width * (width - 8)] = 1;
-
-    // Timing gap (mask only).
-    for (y = 0; y < 7; y++) {
-      setMask(7, y);
-      setMask(width - 8, y);
-      setMask(7, y + width - 7);
-    }
-
-    for (x = 0; x < 8; x++) {
-      setMask(x, 7);
-      setMask(x + width - 8, 7);
-      setMask(x, width - 8);
-    }
-
-    // Reserve mask, format area.
-    for (x = 0; x < 9; x++) {
-      setMask(x, 8);
-    }
-
-    for (x = 0; x < 8; x++) {
-      setMask(x + width - 8, 8);
-      setMask(8, x);
-    }
-
-    for (y = 0; y < 7; y++) {
-      setMask(8, y + width - 7);
-    }
-
-    // Timing row/column.
-    for (x = 0; x < width - 14; x++) {
-      if (x & 1) {
-        setMask(8 + x, 6);
-        setMask(6, 8 + x);
-      } else {
-        frameBuffer[(8 + x) + width * 6] = 1;
-        frameBuffer[6 + width * (8 + x)] = 1;
-      }
-    }
-
-    // Version block.
-    if (version > 6) {
-      t = VERSION_BLOCK[version - 7];
-      k = 17;
-
-      for (x = 0; x < 6; x++) {
-        for (y = 0; y < 3; y++, k--) {
-          if (1 & (k > 11 ? version >> (k - 12) : t >> k)) {
-            frameBuffer[(5 - x) + width * (2 - y + width - 11)] = 1;
-            frameBuffer[(2 - y + width - 11) + width * (5 - x)] = 1;
-          } else {
-            setMask(5 - x, 2 - y + width - 11);
-            setMask(2 - y + width - 11, 5 - x);
-          }
-        }
-      }
-    }
-
-    // Sync mask bits. Only set above for background cells, so now add the foreground.
-    for (y = 0; y < width; y++) {
-      for (x = 0; x <= y; x++) {
-        if (frameBuffer[x + width * y]) {
-          setMask(x, y);
-        }
-      }
-    }
-
-    // Convert string to bit stream. 8-bit data to QR-coded 8-bit data (numeric, alphanum, or kanji
-    // not supported).
-    v = stringBuffer.length;
-
-    // String to array.
-    for (i = 0; i < v; i++) {
-      eccBuffer[i] = stringBuffer.charCodeAt(i);
-    }
-
-    stringBuffer = eccBuffer.slice(0);
-
-    // Calculate max string length.
-    x = dataBlock * (neccBlock1 + neccBlock2) + neccBlock2;
-
-    if (v >= x - 2) {
-      v = x - 2;
-
-      if (version > 9) v--;
-    }
-
-    // Shift and re-pack to insert length prefix.
-    i = v;
-
-    if (version > 9) {
-      stringBuffer[i + 2] = 0;
-      stringBuffer[i + 3] = 0;
-
-      while (i--) {
-        t = stringBuffer[i];
-
-        stringBuffer[i + 3] |= 255 & (t << 4);
-        stringBuffer[i + 2] = t >> 4;
-      }
-
-      stringBuffer[2] |= 255 & (v << 4);
-      stringBuffer[1] = v >> 4;
-      stringBuffer[0] = 0x40 | (v >> 12);
-    } else {
-      stringBuffer[i + 1] = 0;
-      stringBuffer[i + 2] = 0;
-
-      while (i--) {
-        t = stringBuffer[i];
-
-        stringBuffer[i + 2] |= 255 & (t << 4);
-        stringBuffer[i + 1] = t >> 4;
-      }
-
-      stringBuffer[1] |= 255 & (v << 4);
-      stringBuffer[0] = 0x40 | (v >> 4);
-    }
-
-    // Fill to end with pad pattern.
-    i = v + 3 - (version < 10);
-
-    while (i < x) {
-      stringBuffer[i++] = 0xec;
-      stringBuffer[i++] = 0x11;
-    }
-
-    // Calculate generator polynomial.
-    polynomial[0] = 1;
-
-    for (i = 0; i < eccBlock; i++) {
-      polynomial[i + 1] = 1;
-
-      for (j = i; j > 0; j--) {
-        polynomial[j] = polynomial[j] ? polynomial[j - 1] ^
-            GALOIS_EXPONENT[modN(GALOIS_LOG[polynomial[j]] + i)] : polynomial[j - 1];
-      }
-
-      polynomial[0] = GALOIS_EXPONENT[modN(GALOIS_LOG[polynomial[0]] + i)];
-    }
-
-    // Use logs for generator polynomial to save calculation step.
-    for (i = 0; i <= eccBlock; i++) {
-      polynomial[i] = GALOIS_LOG[polynomial[i]];
-    }
-
-    // Append ECC to data buffer.
-    k = x;
-    y = 0;
-
-    for (i = 0; i < neccBlock1; i++) {
-      appendData(y, dataBlock, k, eccBlock);
-
-      y += dataBlock;
-      k += eccBlock;
-    }
-
-    for (i = 0; i < neccBlock2; i++) {
-      appendData(y, dataBlock + 1, k, eccBlock);
-
-      y += dataBlock + 1;
-      k += eccBlock;
-    }
-
-    // Interleave blocks.
-    y = 0;
-
-    for (i = 0; i < dataBlock; i++) {
-      for (j = 0; j < neccBlock1; j++) {
-        eccBuffer[y++] = stringBuffer[i + j * dataBlock];
-      }
-
-      for (j = 0; j < neccBlock2; j++) {
-        eccBuffer[y++] = stringBuffer[(neccBlock1 * dataBlock) + i + (j * (dataBlock + 1))];
-      }
-    }
-
-    for (j = 0; j < neccBlock2; j++) {
-      eccBuffer[y++] = stringBuffer[(neccBlock1 * dataBlock) + i + (j * (dataBlock + 1))];
-    }
-
-    for (i = 0; i < eccBlock; i++) {
-      for (j = 0; j < neccBlock1 + neccBlock2; j++) {
-        eccBuffer[y++] = stringBuffer[x + i + j * eccBlock];
-      }
-    }
-
-    stringBuffer = eccBuffer;
-
-    // Pack bits into frame avoiding masked area.
-    x = y = width - 1;
-    k = v = 1;
-
-    // inteleaved data and ECC codes.
-    m = (dataBlock + eccBlock) * (neccBlock1 + neccBlock2) + neccBlock2;
-
-    for (i = 0; i < m; i++) {
-      t = stringBuffer[i];
-
-      for (j = 0; j < 8; j++, t <<= 1) {
-        if (0x80 & t) {
-          frameBuffer[x + width * y] = 1;
-        }
-
-        // Find next fill position.
-        do {
-          if (v) {
-            x--;
-          } else {
-            x++;
-
-            if (k) {
-              if (y !== 0) {
-                y--;
-              } else {
-                x -= 2;
-                k  = !k;
-
-                if (x === 6) {
-                  x--;
-                  y = 9;
-                }
-              }
-            } else {
-              if (y !== width - 1) {
-                y++;
-              } else {
-                x -= 2;
-                k  = !k;
-
-                if (x === 6) {
-                  x--;
-                  y -= 8;
-                }
-              }
-            }
-          }
-
-          v = !v;
-        } while (isMasked(x, y));
-      }
-    }
-
-    // Save pre-mask copy of frame.
-    stringBuffer = frameBuffer.slice(0);
-
-    t = 0;
-    y = 30000;
-
-    // Using `for` instead of `while` since in original Arduino code if an early mask was *good
-    // enough* it wouldn't try for a better one since they get more complex and take longer.
-    for (k = 0; k < 8; k++) {
-      // Returns foreground-background imbalance.
-      applyMask(k);
-
-      x = checkBadness();
-
-      // Is current mask better than previous best?
-      if (x < y) {
-        y = x;
-        t = k;
-      }
-
-      // Don't increment `i` to a void redoing mask.
-      if (t === 7) break;
-
-      // Reset for next pass.
-      frameBuffer = stringBuffer.slice(0);
-    }
-
-    // Redo best mask as none were *good enough* (i.e. last wasn't `t`).
-    if (t !== k) {
-      applyMask(t);
-    }
-
-    // Add in final mask/ECC level bytes.
-    y = FINAL_FORMAT[t + ((eccLevel - 1) << 3)];
-
-    // Low byte.
-    for (k = 0; k < 8; k++, y >>= 1) {
-      if (y & 1) {
-        frameBuffer[(width - 1 - k) + width * 8] = 1;
-
-        if (k < 6) {
-          frameBuffer[8 + width * k] = 1;
-        } else {
-          frameBuffer[8 + width * (k + 1)] = 1;
-        }
-      }
-    }
-
-    // High byte.
-    for (k = 0; k < 7; k++, y >>= 1) {
-      if (y & 1) {
-        frameBuffer[8 + width * (width - 7 + k)] = 1;
-
-        if (k) {
-          frameBuffer[(6 - k) + width * 8] = 1;
-        } else {
-          frameBuffer[7 + width * 8] = 1;
-        }
-      }
-    }
-
-    // Finally, return the image data.
-    return frameBuffer;
-  }
-
-  // qr.js setup
-  // -----------
-
-  // Build the publicly exposed API.
-  var qr = {
-
-    // Constants
-    // ---------
-
-    // Current version of `qr`.
-    VERSION: '1.1.3',
-
-    // QR functions
-    // ------------
-
-    // Generate the QR code using the data provided and render it on to a `` element.  
-    // If no `` element is specified in the argument provided a new one will be created and
-    // used.  
-    // ECC (error correction capacity) determines how many intential errors are contained in the QR
-    // code.
-    canvas: function(data) {
-      data = normalizeData(data);
-
-      // Module size of the generated QR code (i.e. 1-10).
-      var size = data.size >= 1 && data.size <= 10 ? data.size : 4;
-      // Actual size of the QR code symbol and is scaled to 25 pixels (e.g. 1 = 25px, 3 = 75px).
-      size *= 25;
-
-      // `` element used to render the QR code.
-      var cvs = data.canvas || createCanvas();
-      // Retreive the 2D context of the canvas.
-      var c2d = cvs.getContext('2d');
-      // Ensure the canvas has the correct dimensions.
-      c2d.canvas.width  = size;
-      c2d.canvas.height = size;
-      // Fill the canvas with the correct background colour.
-      c2d.fillStyle = data.background || '#fff';
-      c2d.fillRect(0, 0, size, size);
-
-      // Determine the ECC level to be applied.
-      eccLevel = ECC_LEVELS[(data.level && data.level.toUpperCase()) || 'L'];
-
-      // Generate the image frame for the given `value`.
-      var frame = generateFrame(data.value || '');
-
-      c2d.lineWidth = 1;
-
-      // Determine the *pixel* size.
-      var px = size;
-      px /= width;
-      px  = Math.floor(px);
-
-      // Draw the QR code.
-      c2d.clearRect(0, 0, size, size);
-      c2d.fillStyle = data.background || '#fff';
-      c2d.fillRect(0, 0, px * (width + 8), px * (width + 8));
-      c2d.fillStyle = data.foreground || '#000';
-
-      var i, j;
-
-      for (i = 0; i < width; i++) {
-        for (j = 0; j < width; j++) {
-          if (frame[j * width + i]) {
-            c2d.fillRect(px * i, px * j, px, px);
-          }
-        }
-      }
-
-      return cvs;
-    },
-
-    // Generate the QR code using the data provided and render it on to a `` element.  
-    // If no `` element is specified in the argument provided a new one will be created and
-    // used.  
-    // ECC (error correction capacity) determines how many intential errors are contained in the QR
-    // code.
-    image: function(data) {
-      data = normalizeData(data);
-
-      // `` element only which the QR code is rendered.
-      var cvs = this.canvas(data);
-      // `` element used to display the QR code.
-      var img = data.image || createImage();
-
-      // Apply the QR code to `img`.
-      img.src    = cvs.toDataURL(data.mime || DEFAULT_MIME);
-      img.height = cvs.height;
-      img.width  = cvs.width;
-
-      return img;
-    },
-
-    // Generate the QR code using the data provided and render it on to a `` element and
-    // save it as an image file.  
-    // If no `` element is specified in the argument provided a new one will be created and
-    // used.  
-    // ECC (error correction capacity) determines how many intential errors are contained in the QR
-    // code.  
-    // If called in a browser the `path` property/argument is ignored and will simply prompt the
-    // user to choose a location and file name. However, if called within node.js the file will be
-    // saved to specified path.  
-    // A `callback` function must be provided which will be called once the saving process has
-    // started. If an error occurs it will be passed as the first argument to this function,
-    // otherwise this argument will be `null`.
-    save: function(data, path, callback) {
-      data = normalizeData(data);
-
-      switch (typeof path) {
-        case 'function':
-          callback = path;
-          path = null;
-          break;
-        case 'string':
-          data.path = path;
-          break;
-      }
-
-      // Callback function is required.
-      if (typeof callback !== 'function') {
-        throw new TypeError('Invalid callback type: ' + typeof callback);
-      }
-
-      var completed = false;
-      // `` element only which the QR code is rendered.
-      var cvs = this.canvas(data);
-
-      // Simple function to try and ensure that the `callback` function is only called once.
-      function done(error) {
-        if (!completed) {
-          completed = true;
-
-          callback(error);
-        }
-      }
-
-      if (inNode) {
-        writeFile(cvs, data, done);
-      } else {
-        download(cvs, data, done);
-      }
-    },
-
-    // Generate the QR code using the data provided and render it on to a `` element and
-    // save it as an image file.  
-    // If no `` element is specified in the argument provided a new one will be created and
-    // used.  
-    // ECC (error correction capacity) determines how many intential errors are contained in the QR
-    // code.  
-    // If called in a browser the `path` property/argument is ignored and will simply prompt the
-    // user to choose a location and file name. However, if called within node.js the file will be
-    // saved to specified path.
-    saveSync: function(data, path) {
-      data = normalizeData(data);
-
-      if (typeof path === 'string') data.path = path;
-
-      // `` element only which the QR code is rendered.
-      var cvs = this.canvas(data);
-
-      if (inNode) {
-        writeFileSync(cvs, data);
-      } else {
-        download(cvs, data);
-      }
-    },
-
-    // Generate the QR code using the data provided and render it on to a `` element before
-    // returning its data URI.  
-    // If no `` element is specified in the argument provided a new one will be created and
-    // used.  
-    // ECC (error correction capacity) determines how many intential errors are contained in the QR
-    // code.
-    toDataURL: function(data) {
-      data = normalizeData(data);
-
-      return this.canvas(data).toDataURL(data.mime || DEFAULT_MIME);
-    },
-
-    // Utility functions
-    // -----------------
-
-    // Run qr.js in *noConflict* mode, returning the `qr` variable to its previous owner.  
-    // Returns a reference to `qr`.
-    noConflict: function() {
-      root.qr = previousQr;
-      return this;
-    }
-
-  };
-
-  // Support
-  // -------
-
-  // Export `qr` for node.js and CommonJS.
-  if (typeof exports !== 'undefined') {
-    inNode = true;
-
-    if (typeof module !== 'undefined' && module.exports) {
-      exports = module.exports = qr;
-    }
-    exports.qr = qr;
-
-    // Import required node.js modules.
-    Canvas = require('canvas');
-    Image = Canvas.Image;
-    fs = require('fs');
-  } else if (typeof define === 'function' && define.amd) {
-    define(function () {
-      return qr;
-    });
-  } else {
-    // In non-HTML5 browser so strip base functionality.
-    if (!root.HTMLCanvasElement) {
-      overrideAPI(qr);
-    }
-
-    root.qr = qr;
-  }
-
-})(this);
diff --git a/inc/qr-1.1.3.min.js b/inc/qr-1.1.3.min.js
deleted file mode 100644
index 19d704e..0000000
--- a/inc/qr-1.1.3.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! qr-js v1.1.3 | (c) 2014 Alasdair Mercer | GPL v3 License
-jsqrencode | (c) 2010 tz@execpc.com | GPL v3 License
-*/
-!function(a){"use strict";function b(){return T?new r:a.document.createElement("canvas")}function c(){return T?new x:a.document.createElement("img")}function d(b,c,d){var e=c.mime||B;a.location.href=b.toDataURL(e).replace(e,C),"function"==typeof d&&d()}function e(a){return"string"==typeof a&&(a={value:a}),a||{}}function f(a){function b(b){a[b]=function(){throw new Error(b+" requires HTML5 canvas element support")}}var c,d=["canvas","image","save","saveSync","toDataURL"];for(c=0;cb&&(c=a,a=b,b=c),c=b,c*=b,c+=b,c>>=1,c+=a,S[c]=1}function j(a,b){var c;for(R[a+z*b]=1,c=-2;2>c;c++)R[a+c+z*(b-2)]=1,R[a-2+z*(b+c+1)]=1,R[a+2+z*(b+c)]=1,R[a+c+1+z*(b+2)]=1;for(c=0;2>c;c++)i(a-1,b+c),i(a+1,b-c),i(a-c,b-1),i(a+c,b+1)}function k(a){for(;a>=255;)a-=255,a=(a>>8)+(255&a);return a}function l(a,b,c,d){var e,f,g;for(f=0;d>f;f++)W[c+f]=0;for(f=0;b>f;f++){if(e=H[W[a+f]^W[c]],255!==e)for(g=1;d>g;g++)W[c+g-1]=W[c+g]^G[k(e+U[d-g])];else for(g=c;c+d>g;g++)W[g]=W[g+1];W[c+d-1]=255===e?0:G[k(e+U[0])]}}function m(a,b){var c;return a>b&&(c=a,a=b,b=c),c=b,c+=b*b,c>>=1,c+=a,1===S[c]}function n(a){var b,c,d,e;switch(a){case 0:for(c=0;z>c;c++)for(b=0;z>b;b++)b+c&1||m(b,c)||(R[b+c*z]^=1);break;case 1:for(c=0;z>c;c++)for(b=0;z>b;b++)1&c||m(b,c)||(R[b+c*z]^=1);break;case 2:for(c=0;z>c;c++)for(d=0,b=0;z>b;b++,d++)3===d&&(d=0),d||m(b,c)||(R[b+c*z]^=1);break;case 3:for(e=0,c=0;z>c;c++,e++)for(3===e&&(e=0),d=e,b=0;z>b;b++,d++)3===d&&(d=0),d||m(b,c)||(R[b+c*z]^=1);break;case 4:for(c=0;z>c;c++)for(d=0,e=c>>1&1,b=0;z>b;b++,d++)3===d&&(d=0,e=!e),e||m(b,c)||(R[b+c*z]^=1);break;case 5:for(e=0,c=0;z>c;c++,e++)for(3===e&&(e=0),d=0,b=0;z>b;b++,d++)3===d&&(d=0),(b&c&1)+!(!d|!e)||m(b,c)||(R[b+c*z]^=1);break;case 6:for(e=0,c=0;z>c;c++,e++)for(3===e&&(e=0),d=0,b=0;z>b;b++,d++)3===d&&(d=0),(b&c&1)+(d&&d===e)&1||m(b,c)||(R[b+c*z]^=1);break;case 7:for(e=0,c=0;z>c;c++,e++)for(3===e&&(e=0),d=0,b=0;z>b;b++,d++)3===d&&(d=0),(d&&d===e)+(b+c&1)&1||m(b,c)||(R[b+c*z]^=1)}}function o(a){var b,c=0;for(b=0;a>=b;b++)O[b]>=5&&(c+=I+O[b]-5);for(b=3;a-1>b;b+=2)O[b-2]===O[b+2]&&O[b+2]===O[b-1]&&O[b-1]===O[b+1]&&3*O[b-1]===O[b]&&(0===O[b-3]||b+3>a||3*O[b-3]>=4*O[b]||3*O[b+3]>=4*O[b])&&(c+=K);return c}function p(){var a,b,c,d,e,f,g,h,i;for(c=e=f=0,i=0;z-1>i;i++)for(h=0;z-1>h;h++)(R[h+z*i]&&R[h+1+z*i]&&R[h+z*(i+1)]&&R[h+1+z*(i+1)]||!(R[h+z*i]||R[h+1+z*i]||R[h+z*(i+1)]||R[h+1+z*(i+1)]))&&(c+=J);for(i=0;z>i;i++){for(O[0]=0,g=a=h=0;z>h;h++)(b=R[h+z*i])===a?O[g]++:O[++g]=1,a=b,e+=a?1:-1;c+=o(g)}for(0>e&&(e=-e),d=e,d+=d<<2,d<<=1;d>z*z;)d-=z*z,f++;for(c+=f*L,h=0;z>h;h++){for(O[0]=0,g=a=i=0;z>i;i++)(b=R[h+z*i])===a?O[g]++:O[++g]=1,a=b;c+=o(g)}return c}function q(a){var b,c,d,e,f,g,h,o;f=a.length,y=0;do if(y++,d=4*(Q-1)+16*(y-1),u=D[d++],v=D[d++],s=D[d++],t=D[d],d=s*(u+v)+v-3+(9>=y),d>=f)break;while(40>y);for(z=17+4*y,g=s+(s+t)*(u+v)+v,f=0;g>f;f++)P[f]=0;for(W=a.slice(0),f=0;z*z>f;f++)R[f]=0;for(f=0;(z*(z+1)+1)/2>f;f++)S[f]=0;for(f=0;3>f;f++){for(d=o=0,1===f&&(d=z-7),2===f&&(o=z-7),R[o+3+z*(d+3)]=1,h=0;6>h;h++)R[o+h+z*d]=1,R[o+z*(d+h+1)]=1,R[o+6+z*(d+h)]=1,R[o+h+1+z*(d+6)]=1;for(h=1;5>h;h++)i(o+h,d+1),i(o+1,d+h+1),i(o+5,d+h),i(o+h+1,d+5);for(h=2;4>h;h++)R[o+h+z*(d+2)]=1,R[o+2+z*(d+h+1)]=1,R[o+4+z*(d+h)]=1,R[o+h+1+z*(d+4)]=1}if(y>1)for(f=A[y],o=z-7;;){for(h=z-7;h>f-3&&(j(h,o),!(f>h));)h-=f;if(f+9>=o)break;o-=f,j(6,o),j(o,6)}for(R[8+z*(z-8)]=1,o=0;7>o;o++)i(7,o),i(z-8,o),i(7,o+z-7);for(h=0;8>h;h++)i(h,7),i(h+z-8,7),i(h,z-8);for(h=0;9>h;h++)i(h,8);for(h=0;8>h;h++)i(h+z-8,8),i(8,h);for(o=0;7>o;o++)i(8,o+z-7);for(h=0;z-14>h;h++)1&h?(i(8+h,6),i(6,8+h)):(R[8+h+6*z]=1,R[6+z*(8+h)]=1);if(y>6)for(f=M[y-7],d=17,h=0;6>h;h++)for(o=0;3>o;o++,d--)1&(d>11?y>>d-12:f>>d)?(R[5-h+z*(2-o+z-11)]=1,R[2-o+z-11+z*(5-h)]=1):(i(5-h,2-o+z-11),i(2-o+z-11,5-h));for(o=0;z>o;o++)for(h=0;o>=h;h++)R[h+z*o]&&i(h,o);for(g=W.length,b=0;g>b;b++)P[b]=W.charCodeAt(b);if(W=P.slice(0),h=s*(u+v)+v,g>=h-2&&(g=h-2,y>9&&g--),b=g,y>9){for(W[b+2]=0,W[b+3]=0;b--;)f=W[b],W[b+3]|=255&f<<4,W[b+2]=f>>4;W[2]|=255&g<<4,W[1]=g>>4,W[0]=64|g>>12}else{for(W[b+1]=0,W[b+2]=0;b--;)f=W[b],W[b+2]|=255&f<<4,W[b+1]=f>>4;W[1]|=255&g<<4,W[0]=64|g>>4}for(b=g+3-(10>y);h>b;)W[b++]=236,W[b++]=17;for(U[0]=1,b=0;t>b;b++){for(U[b+1]=1,c=b;c>0;c--)U[c]=U[c]?U[c-1]^G[k(H[U[c]]+b)]:U[c-1];U[0]=G[k(H[U[0]]+b)]}for(b=0;t>=b;b++)U[b]=H[U[b]];for(d=h,o=0,b=0;u>b;b++)l(o,s,d,t),o+=s,d+=t;for(b=0;v>b;b++)l(o,s+1,d,t),o+=s+1,d+=t;for(o=0,b=0;s>b;b++){for(c=0;u>c;c++)P[o++]=W[b+c*s];for(c=0;v>c;c++)P[o++]=W[u*s+b+c*(s+1)]}for(c=0;v>c;c++)P[o++]=W[u*s+b+c*(s+1)];for(b=0;t>b;b++)for(c=0;u+v>c;c++)P[o++]=W[h+b+c*t];for(W=P,h=o=z-1,d=g=1,e=(s+t)*(u+v)+v,b=0;e>b;b++)for(f=W[b],c=0;8>c;c++,f<<=1){128&f&&(R[h+z*o]=1);do g?h--:(h++,d?0!==o?o--:(h-=2,d=!d,6===h&&(h--,o=9)):o!==z-1?o++:(h-=2,d=!d,6===h&&(h--,o-=8))),g=!g;while(m(h,o))}for(W=R.slice(0),f=0,o=3e4,d=0;8>d&&(n(d),h=p(),o>h&&(o=h,f=d),7!==f);d++)R=W.slice(0);for(f!==d&&n(f),o=F[f+(Q-1<<3)],d=0;8>d;d++,o>>=1)1&o&&(R[z-1-d+8*z]=1,6>d?R[8+z*d]=1:R[8+z*(d+1)]=1);for(d=0;7>d;d++,o>>=1)1&o&&(R[8+z*(z-7+d)]=1,d?R[6-d+8*z]=1:R[7+8*z]=1);return R}var r,s,t,u,v,w,x,y,z,A=[0,11,15,19,23,27,31,16,18,20,22,24,26,28,20,22,24,24,26,28,28,22,24,24,26,26,28,28,24,24,26,26,26,28,28,24,26,26,26,28,28],B="image/png",C="image/octet-stream",D=[1,0,19,7,1,0,16,10,1,0,13,13,1,0,9,17,1,0,34,10,1,0,28,16,1,0,22,22,1,0,16,28,1,0,55,15,1,0,44,26,2,0,17,18,2,0,13,22,1,0,80,20,2,0,32,18,2,0,24,26,4,0,9,16,1,0,108,26,2,0,43,24,2,2,15,18,2,2,11,22,2,0,68,18,4,0,27,16,4,0,19,24,4,0,15,28,2,0,78,20,4,0,31,18,2,4,14,18,4,1,13,26,2,0,97,24,2,2,38,22,4,2,18,22,4,2,14,26,2,0,116,30,3,2,36,22,4,4,16,20,4,4,12,24,2,2,68,18,4,1,43,26,6,2,19,24,6,2,15,28,4,0,81,20,1,4,50,30,4,4,22,28,3,8,12,24,2,2,92,24,6,2,36,22,4,6,20,26,7,4,14,28,4,0,107,26,8,1,37,22,8,4,20,24,12,4,11,22,3,1,115,30,4,5,40,24,11,5,16,20,11,5,12,24,5,1,87,22,5,5,41,24,5,7,24,30,11,7,12,24,5,1,98,24,7,3,45,28,15,2,19,24,3,13,15,30,1,5,107,28,10,1,46,28,1,15,22,28,2,17,14,28,5,1,120,30,9,4,43,26,17,1,22,28,2,19,14,28,3,4,113,28,3,11,44,26,17,4,21,26,9,16,13,26,3,5,107,28,3,13,41,26,15,5,24,30,15,10,15,28,4,4,116,28,17,0,42,26,17,6,22,28,19,6,16,30,2,7,111,28,17,0,46,28,7,16,24,30,34,0,13,24,4,5,121,30,4,14,47,28,11,14,24,30,16,14,15,30,6,4,117,30,6,14,45,28,11,16,24,30,30,2,16,30,8,4,106,26,8,13,47,28,7,22,24,30,22,13,15,30,10,2,114,28,19,4,46,28,28,6,22,28,33,4,16,30,8,4,122,30,22,3,45,28,8,26,23,30,12,28,15,30,3,10,117,30,3,23,45,28,4,31,24,30,11,31,15,30,7,7,116,30,21,7,45,28,1,37,23,30,19,26,15,30,5,10,115,30,19,10,47,28,15,25,24,30,23,25,15,30,13,3,115,30,2,29,46,28,42,1,24,30,23,28,15,30,17,0,115,30,10,23,46,28,10,35,24,30,19,35,15,30,17,1,115,30,14,21,46,28,29,19,24,30,11,46,15,30,13,6,115,30,14,23,46,28,44,7,24,30,59,1,16,30,12,7,121,30,12,26,47,28,39,14,24,30,22,41,15,30,6,14,121,30,6,34,47,28,46,10,24,30,2,64,15,30,17,4,122,30,29,14,46,28,49,10,24,30,24,46,15,30,4,18,122,30,13,32,46,28,48,14,24,30,42,32,15,30,20,4,117,30,40,7,47,28,43,22,24,30,10,67,15,30,19,6,118,30,18,31,47,28,34,34,24,30,20,61,15,30],E={L:1,M:2,Q:3,H:4},F=[30660,29427,32170,30877,26159,25368,27713,26998,21522,20773,24188,23371,17913,16590,20375,19104,13663,12392,16177,14854,9396,8579,11994,11245,5769,5054,7399,6608,1890,597,3340,2107],G=[1,2,4,8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143,3,6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140,5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141,7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138,9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,0],H=[255,0,1,25,2,50,26,198,3,223,51,238,27,104,199,75,4,100,224,14,52,141,239,129,28,193,105,248,200,8,76,113,5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154,9,120,77,228,114,166,6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87,7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175],I=3,J=3,K=40,L=10,M=[3220,1468,2713,1235,3062,1890,2119,1549,2344,2936,1117,2583,1330,2470,1667,2249,2028,3780,481,4011,142,3098,831,3445,592,2517,1776,2234,1951,2827,1070,2660,1345,3177],N=parseInt("0666",8),O=[],P=[],Q=1,R=[],S=[],T=!1,U=[],V=a.qr,W=[],X={VERSION:"1.1.3",canvas:function(a){a=e(a);var c=a.size>=1&&a.size<=10?a.size:4;c*=25;var d=a.canvas||b(),f=d.getContext("2d");f.canvas.width=c,f.canvas.height=c,f.fillStyle=a.background||"#fff",f.fillRect(0,0,c,c),Q=E[a.level&&a.level.toUpperCase()||"L"];var g=q(a.value||"");f.lineWidth=1;var h=c;h/=z,h=Math.floor(h),f.clearRect(0,0,c,c),f.fillStyle=a.background||"#fff",f.fillRect(0,0,h*(z+8),h*(z+8)),f.fillStyle=a.foreground||"#000";var i,j;for(i=0;z>i;i++)for(j=0;z>j;j++)g[j*z+i]&&f.fillRect(h*i,h*j,h,h);return d},image:function(a){a=e(a);var b=this.canvas(a),d=a.image||c();return d.src=b.toDataURL(a.mime||B),d.height=b.height,d.width=b.width,d},save:function(a,b,c){function f(a){h||(h=!0,c(a))}switch(a=e(a),typeof b){case"function":c=b,b=null;break;case"string":a.path=b}if("function"!=typeof c)throw new TypeError("Invalid callback type: "+typeof c);var h=!1,i=this.canvas(a);T?g(i,a,f):d(i,a,f)},saveSync:function(a,b){a=e(a),"string"==typeof b&&(a.path=b);var c=this.canvas(a);T?h(c,a):d(c,a)},toDataURL:function(a){return a=e(a),this.canvas(a).toDataURL(a.mime||B)},noConflict:function(){return a.qr=V,this}};"undefined"!=typeof exports?(T=!0,"undefined"!=typeof module&&module.exports&&(exports=module.exports=X),exports.qr=X,r=require("canvas"),x=r.Image,w=require("fs")):"function"==typeof define&&define.amd?define(function(){return X}):(a.HTMLCanvasElement||f(X),a.qr=X)}(this);
-//# sourceMappingURL=qr.min.map
\ No newline at end of file
diff --git a/inc/shaarli.css b/inc/shaarli.css
index 78bcfd3..d119348 100644
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -405,12 +405,12 @@ h1 {
 }
 */
 
-.linkdate, .linkarchive {
+.linkdate {
     font-size:8pt;
     color:#888;
 }
 
-.linkdate a, .linkarchive a {
+.linkdate a {
     color:#E28E3F;
 }
 
@@ -451,12 +451,12 @@ a.qrcode img {
     color: #F57900;
 }
 
-.linkdate, .linkarchive {
+.linkdate {
     font-size: 8pt;
     color: #888;
 }
 
-.linkdate a, .linkarchive a {
+.linkdate a {
     background-image: url('../images/calendar.png');
     padding: 2px 0 3px 20px;
     background-repeat: no-repeat;
diff --git a/tpl/configure.html b/tpl/configure.html
index e4bd076..9c725a5 100644
--- a/tpl/configure.html
+++ b/tpl/configure.html
@@ -38,6 +38,7 @@
             
             
         
+
 	  
 	
 	
diff --git a/tpl/daily.html b/tpl/daily.html
index 38aa401..93a3ab4 100644
--- a/tpl/daily.html
+++ b/tpl/daily.html
@@ -2,18 +2,43 @@
 
 {include="includes"}
 
-
+
 
                                                                  
-    
                                                                  
-      All links of one day
                                                                  in a single page.
                                                                  
-	  {if="$previousday"} <Previous day{else}<Previous day{/if}
-	  - 
-	  {if="$nextday"}Next day>{else}Next day>{/if}
-      

                                                                  
-	  rss_feedDaily RSS Feed
+    
                                                                  
+        {loop="$plugin_start_zone"}
+            {$value}
+        {/loop}
     
                                                                  
-    
                                                                  floral_left The Daily Shaarli floral_right
                                                                  
-    
                                                                  ——————————— {function="strftime('%A %d, %B %Y', $day)"} ———————————
                                                                  
+
+    
                                                                  
+        All links of one day
                                                                  in a single page.
                                                                  
+        {if="$previousday"} <Previous day{else}<Previous day{/if}
+        -
+        {if="$nextday"}Next day>{else}Next day>{/if}
+        
                                                                  
+
+        {loop="$daily_about_plugin"}
+            {$value}
+        {/loop}
+
+        
                                                                  
+        rss_feedDaily RSS Feed
+    
                                                                  
+
+    
                                                                  
+        floral_left
+        The Daily Shaarli
+        floral_right
+    
                                                                  
+
+    
                                                                  
+        ———————————
+        {function="strftime('%A %d, %B %Y', $day)"}
+        ———————————
+    
                                                                  
+
     
                                                                  
 
     {if="$linksToDisplay"}
@@ -47,6 +72,12 @@
                             
                                                                  {$link.thumbnail}
                                                                  
                         {/if}
                         
                                                                  {$link.formatedDescription}
                                                                  
+
+                        
                                                                  
+                            {loop="$link.link_plugin"}
+                                {$value}
+                            {/loop}
+                        
                                                                  
                     
                                                                  
                 {/loop}
             
                                                                  
@@ -55,6 +86,14 @@
     {else}
          
                                                                  No articles on this day.
                                                                  
     {/if}
+
+    
                                                                  
+
+    
                                                                  
+        {loop="$plugin_end_zone"}
+            {$value}
+        {/loop}
+    
                                                                  
     
                                                                  -
                                                                  
 
 {include="page.footer"}
diff --git a/tpl/editlink.html b/tpl/editlink.html
index 3733ca2..889d913 100644
--- a/tpl/editlink.html
+++ b/tpl/editlink.html
@@ -21,6 +21,11 @@
             
                                                                  
             
                                                                  
+
+            {loop="$edit_link_plugin"}
+                {$value}
+            {/loop}
+
 	        {if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}
             
              
                                                                  
diff --git a/tpl/includes.html b/tpl/includes.html
index 623e19e..bdf3a07 100644
--- a/tpl/includes.html
+++ b/tpl/includes.html
@@ -8,3 +8,6 @@
 
 
 {if="is_file('inc/user.css')"}{/if}
+{loop="$plugins_includes.css_files"}
+
+{/loop}
\ No newline at end of file
diff --git a/tpl/linklist.html b/tpl/linklist.html
index daf8706..9ed2885 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -17,6 +17,9 @@
             
             
         
+        {loop="$plugins_header.fields_toolbar"}
+            {$value}
+        {/loop}
     
 
 
@@ -24,6 +27,12 @@
 
     {include="linklist.paging"}
 
+    
+
     {if="count($links)==0"}
         
                                                                  Nothing found.
                                                                  
     {else}
@@ -40,7 +49,7 @@
     
 
+    
+
     {include="linklist.paging"}
 
 
 
     {include="page.footer"}
 
-
 
 
 
diff --git a/tpl/linklist.paging.html b/tpl/linklist.paging.html
index 848541c..e91c8f8 100644
--- a/tpl/linklist.paging.html
+++ b/tpl/linklist.paging.html
@@ -8,8 +8,13 @@
 		Click to see only private links
 		{/if}
 		
+
+
     
 {/if}
+    {loop="$action_plugin"}
+        {$value}
+    {/loop}
     
                                                                  
         Links per page: 20 50 100
         
                                                                  
diff --git a/tpl/page.footer.html b/tpl/page.footer.html
index 8143669..6c29850 100644
--- a/tpl/page.footer.html
+++ b/tpl/page.footer.html
@@ -1,5 +1,8 @@
 
 {if="$newversion"}
     
                                                                  ● Shaarli {$newversion} is available.
                                                                  
@@ -7,3 +10,7 @@
 {if="isLoggedIn()"}
 
 {/if}
+
+{loop="$plugins_footer.js_files"}
+	
+{/loop}
diff --git a/tpl/page.header.html b/tpl/page.header.html
index 2d186aa..1d46d80 100644
--- a/tpl/page.header.html
+++ b/tpl/page.header.html
@@ -11,7 +11,7 @@
         {$shaarlititle}
     
     
-  
+
 {if="!empty($_GET['source']) && $_GET['source']=='bookmarklet'"}
     {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore}
 {else}
@@ -33,6 +33,9 @@
     
                                                                • Tag cloud
                                                                  • 
     
                                                                • Picture wall
                                                                  • 
     
                                                                • Daily
                                                                  • 
+    {loop="$plugins_header.buttons_toolbar"}
+        {$value}
+    {/loop}
 {/if}
   
                                                                
 
diff --git a/tpl/picwall.html b/tpl/picwall.html
index f59685c..97d5efd 100644
--- a/tpl/picwall.html
+++ b/tpl/picwall.html
@@ -5,15 +5,34 @@
 
 
 
+
+
                                                                
+    {loop="$plugin_start_zone"}
+        {$value}
+    {/loop}
+
                                                                
+
 
                                                                
         
                                                                
             {loop="linksToDisplay"}
             
                                                                
         	    {$value.thumbnail}{$value.title}
+                {loop="$value.picwall_plugin"}
+                    {$value}
+                {/loop}
             
                                                                
             {/loop}
         
                                                                
 
                                                                
+
+
                                                                
+
+
                                                                
+    {loop="$plugin_end_zone"}
+        {$value}
+    {/loop}
+
                                                                
+
 {include="page.footer"}
 
 
 
 
+
 
 {/if}
 
diff --git a/tpl/linklist.html b/tpl/linklist.html
index 9ed2885..f6e9e82 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -9,12 +9,13 @@
     {include="page.header"}
     
                 {/if}
-                {$value.title}
+                
+                    {$value.title}
+                
                 
                                                                
                 {if="$value.description"}
                                                                {$value.description}
                                                                {/if}
                 {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
@@ -83,7 +85,7 @@
                     {$value} -
                 {/loop}
 
-                {$value.url}
                                                                
+                {$value.url}
                                                                
                 {if="$value.tags"}
                     
                                                                
                     {loop="value.taglist"}{$value} {/loop}
diff --git a/tpl/picwall.html b/tpl/picwall.html
index 97d5efd..230c948 100644
--- a/tpl/picwall.html
+++ b/tpl/picwall.html
@@ -16,7 +16,7 @@
         
                                                                
             {loop="linksToDisplay"}
             
                                                                
-        	    {$value.thumbnail}{$value.title}
+        	    {$value.thumbnail}{$value.title}
                 {loop="$value.picwall_plugin"}
                     {$value}
                 {/loop}

From 657f0e25ba2c6f39775a8386b62d7c662ae709f7 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Thu, 26 Nov 2015 20:51:53 +0100
Subject: [PATCH 219/658] Fixes incorrect call to

From 2e28269baed195d58bbe169841eed176b171db76
---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index b4d9395..bb00c11 100644
--- a/index.php
+++ b/index.php
@@ -337,7 +337,7 @@ function checkUpdate()
 function logm($message)
 {
     $t = strval(date('Y/m/d_H:i:s')).' - '.$_SERVER["REMOTE_ADDR"].' - '.strval($message)."\n";
-    file_put_contents($GLOBAL['config']['LOG_FILE'], $t, FILE_APPEND);
+    file_put_contents($GLOBALS['config']['LOG_FILE'], $t, FILE_APPEND);
 }
 
 // In a string, converts URLs to clickable links.

From 4bf35ba56bb9f06de0cb9ab920b799a39f8eaffc Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Tue, 24 Nov 2015 02:52:22 +0100
Subject: [PATCH 220/658] application: refactor version checks, move to
 ApplicationUtils

Relates to #372

Modifications:
 - move checkUpdate() to ApplicationUtils
 - reduce file I/O operations during version checks
 - apply coding conventions
 - add test coverage

Tools:
 - create a sandbox directory for tests

Signed-off-by: VirtualTam 
---
 .gitignore                       |   5 +-
 Makefile                         |   2 +
 application/ApplicationUtils.php |  92 +++++++++++++
 index.php                        |  39 ++----
 tests/ApplicationUtilsTest.php   | 218 +++++++++++++++++++++++++++++++
 tests/CacheTest.php              |   6 +-
 tests/CachedPageTest.php         |   2 +-
 tests/LinkDBTest.php             |   2 +-
 8 files changed, 331 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index b98c38b..75cd3a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,9 +19,8 @@ composer.lock
 # Ignore development and test resources
 coverage
 doxygen
-tests/datastore.php
-tests/dummycache/
+sandbox
 phpmd.html
 
 # Ignore user plugin configuration
-plugins/*/config.php
\ No newline at end of file
+plugins/*/config.php
diff --git a/Makefile b/Makefile
index c560d8d..a86f9aa 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,7 @@ test:
 	@echo "-------"
 	@echo "PHPUNIT"
 	@echo "-------"
+	@mkdir -p sandbox
 	@$(BIN)/phpunit tests
 
 ##
@@ -119,6 +120,7 @@ test:
 ### remove all unversioned files
 clean:
 	@git clean -df
+	@rm -rf sandbox
 
 ### generate Doxygen documentation
 doxygen: clean
diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php
index b0e94e2..c7414b7 100644
--- a/application/ApplicationUtils.php
+++ b/application/ApplicationUtils.php
@@ -4,6 +4,98 @@
  */
 class ApplicationUtils
 {
+    private static $GIT_URL = 'https://raw.githubusercontent.com/shaarli/Shaarli';
+    private static $GIT_BRANCH = 'master';
+    private static $VERSION_FILE = 'shaarli_version.php';
+    private static $VERSION_START_TAG = '';
+
+    /**
+     * Gets the latest version code from the Git repository
+     *
+     * The code is read from the raw content of the version file on the Git server.
+     *
+     * @return mixed the version code from the repository if available, else 'false'
+     */
+    public static function getLatestGitVersionCode($url, $timeout=2)
+    {
+        list($headers, $data) = get_http_url($url, $timeout);
+
+        if (strpos($headers[0], '200 OK') === false) {
+            error_log('Failed to retrieve ' . $url);
+            return false;
+        }
+
+        return str_replace(
+            array(self::$VERSION_START_TAG, self::$VERSION_END_TAG, PHP_EOL),
+            array('', '', ''),
+            $data
+        );
+    }
+
+    /**
+     * Checks if a new Shaarli version has been published on the Git repository
+     *
+     * Updates checks are run periodically, according to the following criteria:
+     * - the update checks are enabled (install, global config);
+     * - the user is logged in (or this is an open instance);
+     * - the last check is older than a given interval;
+     * - the check is non-blocking if the HTTPS connection to Git fails;
+     * - in case of failure, the update file's modification date is updated,
+     *   to avoid intempestive connection attempts.
+     *
+     * @param string $currentVersion the current version code
+     * @param string $updateFile     the file where to store the latest version code
+     * @param int    $checkInterval  the minimum interval between update checks (in seconds
+     * @param bool   $enableCheck    whether to check for new versions
+     * @param bool   $isLoggedIn     whether the user is logged in
+     *
+     * @return mixed the new version code if available and greater, else 'false'
+     */
+    public static function checkUpdate(
+        $currentVersion, $updateFile, $checkInterval, $enableCheck, $isLoggedIn)
+    {
+        if (! $isLoggedIn) {
+            // Do not check versions for visitors
+            return false;
+        }
+
+        if (empty($enableCheck)) {
+            // Do not check if the user doesn't want to
+            return false;
+        }
+
+        if (is_file($updateFile) && (filemtime($updateFile) > time() - $checkInterval)) {
+            // Shaarli has checked for updates recently - skip HTTP query
+            $latestKnownVersion = file_get_contents($updateFile);
+
+            if (version_compare($latestKnownVersion, $currentVersion) == 1) {
+                return $latestKnownVersion;
+            }
+            return false;
+        }
+
+        // Late Static Binding allows overriding within tests
+        // See http://php.net/manual/en/language.oop5.late-static-bindings.php
+        $latestVersion = static::getLatestGitVersionCode(
+            self::$GIT_URL . '/' . self::$GIT_BRANCH . '/' . self::$VERSION_FILE
+        );
+
+        if (! $latestVersion) {
+            // Only update the file's modification date
+            file_put_contents($updateFile, $currentVersion);
+            return false;
+        }
+
+        // Update the file's content and modification date
+        file_put_contents($updateFile, $latestVersion);
+
+        if (version_compare($latestVersion, $currentVersion) == 1) {
+            return $latestVersion;
+        }
+
+        return false;
+    }
 
     /**
      * Checks the PHP version to ensure Shaarli can run
diff --git a/index.php b/index.php
index 3954be9..90045d6 100644
--- a/index.php
+++ b/index.php
@@ -305,32 +305,6 @@ function setup_login_state() {
 }
 $userIsLoggedIn = setup_login_state();
 
-// 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.
-    if (empty($GLOBALS['config']['ENABLE_UPDATECHECK'])) return ''; // Do not check if the user doesn't want to.
-
-    // Get latest version number at most once a day.
-    if (!is_file($GLOBALS['config']['UPDATECHECK_FILENAME']) || (filemtime($GLOBALS['config']['UPDATECHECK_FILENAME'])', '', str_replace('tpl = new RainTPL;
-        $this->tpl->assign('newversion', escape(checkUpdate()));
+        $this->tpl->assign(
+            'newversion',
+            escape(
+                ApplicationUtils::checkUpdate(
+                    shaarli_version,
+                    $GLOBALS['config']['UPDATECHECK_FILENAME'],
+                    $GLOBALS['config']['UPDATECHECK_INTERVAL'],
+                    $GLOBALS['config']['ENABLE_UPDATECHECK'],
+                    isLoggedIn()
+                )
+            )
+        );
         $this->tpl->assign('feedurl', escape(index_url($_SERVER)));
         $searchcrits = ''; // Search criteria
         if (!empty($_GET['searchtags'])) {
diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php
index 01301e6..437c21f 100644
--- a/tests/ApplicationUtilsTest.php
+++ b/tests/ApplicationUtilsTest.php
@@ -5,12 +5,230 @@
 
 require_once 'application/ApplicationUtils.php';
 
+/**
+ * Fake ApplicationUtils class to avoid HTTP requests
+ */
+class FakeApplicationUtils extends ApplicationUtils
+{
+    public static $VERSION_CODE = '';
+
+    /**
+     * Toggle HTTP requests, allow overriding the version code
+     */
+    public static function getLatestGitVersionCode($url, $timeout=0)
+    {
+        return self::$VERSION_CODE;
+    }
+}
+
 
 /**
  * Unitary tests for Shaarli utilities
  */
 class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
 {
+    protected static $testUpdateFile = 'sandbox/update.txt';
+    protected static $testVersion = '0.5.0';
+    protected static $versionPattern = '/^\d+\.\d+\.\d+$/';
+
+    /**
+     * Reset test data for each test
+     */
+    public function setUp()
+    {
+        FakeApplicationUtils::$VERSION_CODE = '';
+        if (file_exists(self::$testUpdateFile)) {
+            unlink(self::$testUpdateFile);
+        }
+    }
+
+    /**
+     * Retrieve the latest version code available on Git
+     *
+     * Expected format: Semantic Versioning - major.minor.patch
+     */
+    public function testGetLatestGitVersionCode()
+    {
+        $testTimeout = 10;
+
+        $this->assertEquals(
+            '0.5.4',
+            ApplicationUtils::getLatestGitVersionCode(
+                'https://raw.githubusercontent.com/shaarli/Shaarli/'
+               .'v0.5.4/shaarli_version.php',
+                $testTimeout
+            )
+        );
+        $this->assertRegexp(
+            self::$versionPattern,
+            ApplicationUtils::getLatestGitVersionCode(
+                'https://raw.githubusercontent.com/shaarli/Shaarli/'
+               .'master/shaarli_version.php',
+                $testTimeout
+            )
+        );
+    }
+
+    /**
+     * Attempt to retrieve the latest version from an invalid URL
+     */
+    public function testGetLatestGitVersionCodeInvalidUrl()
+    {
+        $this->assertFalse(
+            ApplicationUtils::getLatestGitVersionCode('htttp://null.io', 0)
+        );
+    }
+
+    /**
+     * Test update checks - the user is logged off
+     */
+    public function testCheckUpdateLoggedOff()
+    {
+        $this->assertFalse(
+            ApplicationUtils::checkUpdate(self::$testVersion, 'null', 0, false, false)
+        );
+    }
+
+    /**
+     * Test update checks - the user has disabled updates
+     */
+    public function testCheckUpdateUserDisabled()
+    {
+        $this->assertFalse(
+            ApplicationUtils::checkUpdate(self::$testVersion, 'null', 0, false, true)
+        );
+    }
+
+    /**
+     * A newer version is available
+     */
+    public function testCheckUpdateNewVersionNew()
+    {
+        $newVersion = '1.8.3';
+        FakeApplicationUtils::$VERSION_CODE = $newVersion;
+
+        $version = FakeApplicationUtils::checkUpdate(
+            self::$testVersion,
+            self::$testUpdateFile,
+            100,
+            true,
+            true
+        );
+
+        $this->assertEquals($newVersion, $version);
+    }
+
+    /**
+     * No available information about versions
+     */
+    public function testCheckUpdateNewVersionUnavailable()
+    {
+        $version = FakeApplicationUtils::checkUpdate(
+            self::$testVersion,
+            self::$testUpdateFile,
+            100,
+            true,
+            true
+        );
+
+        $this->assertFalse($version);
+    }
+
+    /**
+     * Shaarli is up-to-date
+     */
+    public function testCheckUpdateNewVersionUpToDate()
+    {
+        FakeApplicationUtils::$VERSION_CODE = self::$testVersion;
+
+        $version = FakeApplicationUtils::checkUpdate(
+            self::$testVersion,
+            self::$testUpdateFile,
+            100,
+            true,
+            true
+        );
+
+        $this->assertFalse($version);
+    }
+
+    /**
+     * Time-traveller's Shaarli
+     */
+    public function testCheckUpdateNewVersionMaartiMcFly()
+    {
+        FakeApplicationUtils::$VERSION_CODE = '0.4.1';
+
+        $version = FakeApplicationUtils::checkUpdate(
+            self::$testVersion,
+            self::$testUpdateFile,
+            100,
+            true,
+            true
+        );
+
+        $this->assertFalse($version);
+    }
+
+    /**
+     * The version has been checked recently and Shaarli is up-to-date
+     */
+    public function testCheckUpdateNewVersionTwiceUpToDate()
+    {
+        FakeApplicationUtils::$VERSION_CODE = self::$testVersion;
+
+        // Create the update file
+        $version = FakeApplicationUtils::checkUpdate(
+            self::$testVersion,
+            self::$testUpdateFile,
+            100,
+            true,
+            true
+        );
+
+        $this->assertFalse($version);
+
+        // Reuse the update file
+        $version = FakeApplicationUtils::checkUpdate(
+            self::$testVersion,
+            self::$testUpdateFile,
+            100,
+            true,
+            true
+        );
+
+        $this->assertFalse($version);
+    }
+
+    /**
+     * The version has been checked recently and Shaarli is outdated
+     */
+    public function testCheckUpdateNewVersionTwiceOutdated()
+    {
+        $newVersion = '1.8.3';
+        FakeApplicationUtils::$VERSION_CODE = $newVersion;
+
+        // Create the update file
+        $version = FakeApplicationUtils::checkUpdate(
+            self::$testVersion,
+            self::$testUpdateFile,
+            100,
+            true,
+            true
+        );
+        $this->assertEquals($newVersion, $version);
+
+        // Reuse the update file
+        $version = FakeApplicationUtils::checkUpdate(
+            self::$testVersion,
+            self::$testUpdateFile,
+            100,
+            true,
+            true
+        );
+        $this->assertEquals($newVersion, $version);
+    }
+
     /**
      * Check supported PHP versions
      */
diff --git a/tests/CacheTest.php b/tests/CacheTest.php
index aa5395b..eacd448 100644
--- a/tests/CacheTest.php
+++ b/tests/CacheTest.php
@@ -11,10 +11,10 @@ require_once 'application/Cache.php';
 /**
  * Unitary tests for cached pages
  */
-class CachedTest extends PHPUnit_Framework_TestCase
+class CacheTest extends PHPUnit_Framework_TestCase
 {
     // test cache directory
-    protected static $testCacheDir = 'tests/dummycache';
+    protected static $testCacheDir = 'sandbox/dummycache';
 
     // dummy cached file names / content
     protected static $pages = array('a', 'toto', 'd7b59c');
@@ -56,7 +56,7 @@ class CachedTest extends PHPUnit_Framework_TestCase
     public function testPurgeCachedPagesMissingDir()
     {
         $this->assertEquals(
-            'Cannot purge tests/dummycache_missing: no directory',
+            'Cannot purge sandbox/dummycache_missing: no directory',
             purgeCachedPages(self::$testCacheDir.'_missing')
         );
     }
diff --git a/tests/CachedPageTest.php b/tests/CachedPageTest.php
index e97af03..51565cd 100644
--- a/tests/CachedPageTest.php
+++ b/tests/CachedPageTest.php
@@ -11,7 +11,7 @@ require_once 'application/CachedPage.php';
 class CachedPageTest extends PHPUnit_Framework_TestCase
 {
     // test cache directory
-    protected static $testCacheDir = 'tests/pagecache';
+    protected static $testCacheDir = 'sandbox/pagecache';
     protected static $url = 'http://shaar.li/?do=atom';
     protected static $filename;
 
diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php
index ff917f6..7b22b27 100644
--- a/tests/LinkDBTest.php
+++ b/tests/LinkDBTest.php
@@ -16,7 +16,7 @@ require_once 'tests/utils/ReferenceLinkDB.php';
 class LinkDBTest extends PHPUnit_Framework_TestCase
 {
     // datastore to test write operations
-    protected static $testDatastore = 'tests/datastore.php';
+    protected static $testDatastore = 'sandbox/datastore.php';
     protected static $refDB = null;
     protected static $publicLinkDB = null;
     protected static $privateLinkDB = null;

From 4407b45fd3b09257ea79edba8d4f50db350f8fa9 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Fri, 27 Nov 2015 00:10:43 +0100
Subject: [PATCH 221/658] application: default to the "stable" branch for
 update checks

Relates to #372
Relates to #390

Signed-off-by: VirtualTam 
---
 application/ApplicationUtils.php | 18 ++++++++++++++----
 index.php                        | 32 +++++++++++++++++++-------------
 tests/ApplicationUtilsTest.php   | 14 ++++++++++++--
 tpl/page.footer.html             | 12 ++++++++++--
 4 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php
index c7414b7..6d87811 100644
--- a/application/ApplicationUtils.php
+++ b/application/ApplicationUtils.php
@@ -5,7 +5,7 @@
 class ApplicationUtils
 {
     private static $GIT_URL = 'https://raw.githubusercontent.com/shaarli/Shaarli';
-    private static $GIT_BRANCH = 'master';
+    private static $GIT_BRANCHES = array('master', 'stable');
     private static $VERSION_FILE = 'shaarli_version.php';
     private static $VERSION_START_TAG = '';
@@ -52,8 +52,12 @@ class ApplicationUtils
      *
      * @return mixed the new version code if available and greater, else 'false'
      */
-    public static function checkUpdate(
-        $currentVersion, $updateFile, $checkInterval, $enableCheck, $isLoggedIn)
+    public static function checkUpdate($currentVersion,
+                                       $updateFile,
+                                       $checkInterval,
+                                       $enableCheck,
+                                       $isLoggedIn,
+                                       $branch='stable')
     {
         if (! $isLoggedIn) {
             // Do not check versions for visitors
@@ -75,10 +79,16 @@ class ApplicationUtils
             return false;
         }
 
+        if (! in_array($branch, self::$GIT_BRANCHES)) {
+            throw new Exception(
+                'Invalid branch selected for updates: "' . $branch . '"'
+            );
+        }
+
         // Late Static Binding allows overriding within tests
         // See http://php.net/manual/en/language.oop5.late-static-bindings.php
         $latestVersion = static::getLatestGitVersionCode(
-            self::$GIT_URL . '/' . self::$GIT_BRANCH . '/' . self::$VERSION_FILE
+            self::$GIT_URL . '/' . $branch . '/' . self::$VERSION_FILE
         );
 
         if (! $latestVersion) {
diff --git a/index.php b/index.php
index 90045d6..a100563 100644
--- a/index.php
+++ b/index.php
@@ -92,7 +92,8 @@ $GLOBALS['config']['ENABLE_THUMBNAILS'] = true;
 $GLOBALS['config']['ENABLE_LOCALCACHE'] = true;
 
 // Update check frequency for Shaarli. 86400 seconds=24 hours
-$GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400 ;
+$GLOBALS['config']['UPDATECHECK_BRANCH'] = 'stable';
+$GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400;
 
 
 /*
@@ -631,18 +632,23 @@ class pageBuilder
     private function initialize()
     {
         $this->tpl = new RainTPL;
-        $this->tpl->assign(
-            'newversion',
-            escape(
-                ApplicationUtils::checkUpdate(
-                    shaarli_version,
-                    $GLOBALS['config']['UPDATECHECK_FILENAME'],
-                    $GLOBALS['config']['UPDATECHECK_INTERVAL'],
-                    $GLOBALS['config']['ENABLE_UPDATECHECK'],
-                    isLoggedIn()
-                )
-            )
-        );
+
+        try {
+            $version = ApplicationUtils::checkUpdate(
+                shaarli_version,
+                $GLOBALS['config']['UPDATECHECK_FILENAME'],
+                $GLOBALS['config']['UPDATECHECK_INTERVAL'],
+                $GLOBALS['config']['ENABLE_UPDATECHECK'],
+                isLoggedIn(),
+                $GLOBALS['config']['UPDATECHECK_BRANCH']
+            );
+            $this->tpl->assign('newVersion', escape($version));
+
+        } catch (Exception $exc) {
+            logm($exc->getMessage());
+            $this->tpl->assign('versionError', escape($exc->getMessage()));
+        }
+
         $this->tpl->assign('feedurl', escape(index_url($_SERVER)));
         $searchcrits = ''; // Search criteria
         if (!empty($_GET['searchtags'])) {
diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php
index 437c21f..6064357 100644
--- a/tests/ApplicationUtilsTest.php
+++ b/tests/ApplicationUtilsTest.php
@@ -75,7 +75,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
     public function testGetLatestGitVersionCodeInvalidUrl()
     {
         $this->assertFalse(
-            ApplicationUtils::getLatestGitVersionCode('htttp://null.io', 0)
+            ApplicationUtils::getLatestGitVersionCode('htttp://null.io', 1)
         );
     }
 
@@ -102,7 +102,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
     /**
      * A newer version is available
      */
-    public function testCheckUpdateNewVersionNew()
+    public function testCheckUpdateNewVersionAvailable()
     {
         $newVersion = '1.8.3';
         FakeApplicationUtils::$VERSION_CODE = $newVersion;
@@ -134,6 +134,16 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($version);
     }
 
+    /**
+     * Test update checks - invalid Git branch
+     * @expectedException              Exception
+     * @expectedExceptionMessageRegExp /Invalid branch selected for updates/
+     */
+    public function testCheckUpdateInvalidGitBranch()
+    {
+        ApplicationUtils::checkUpdate('', 'null', 0, true, true, 'unstable');
+    }
+
     /**
      * Shaarli is up-to-date
      */
diff --git a/tpl/page.footer.html b/tpl/page.footer.html
index 6c29850..b20aae5 100644
--- a/tpl/page.footer.html
+++ b/tpl/page.footer.html
@@ -4,8 +4,16 @@
         {$value}
     {/loop}
 
                                                                
-{if="$newversion"}
-    
                                                                ● Shaarli {$newversion} is available.
                                                                
+{if="$newVersion"}
+
                                                                
+  ● Shaarli {$newVersion} is
+  available.
+
                                                                
+{/if}
+{if="$versionError"}
+
                                                                
+  Error: {$versionError}
+
                                                                
 {/if}
 {if="isLoggedIn()"}
 

From a33c574461cd082588b11b8843fe8fd7f92e3fe6 Mon Sep 17 00:00:00 2001
From: nodiscc 
Date: Mon, 30 Nov 2015 22:43:28 +0100
Subject: [PATCH 222/658] remove obsolete doc

---
 plugins/playvideos/README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/playvideos/README.md b/plugins/playvideos/README.md
index ec1ead8..54729e0 100644
--- a/plugins/playvideos/README.md
+++ b/plugins/playvideos/README.md
@@ -1,22 +1,22 @@
 ### ► Play Videos plugin for Shaarli
-This plugin adds a `► Play Videos` button to [Shaarli](https://github.com/shaarli/Shaarli)'s toolbar. Click this button to play all videos on the page in an overlay HTML5 player. Nice for continuous stream of music, documentaries, talks...
+
+Adds a `► Play Videos` button to [Shaarli](https://github.com/shaarli/Shaarli)'s toolbar. Click this button to play all videos on the page in an overlay HTML5 player. Nice for continuous stream of music, documentaries, talks...
+
+
 
 This uses code from https://zaius.github.io/youtube_playlist/ and is currently only compatible with Youtube videos.
 
-![](https://cdn.mediacru.sh/D_izf0zjAtxy.png)
-
 #### Installation and setup
-Place the files in the `tpl/plugins/playvideos/` directory of your Shaarli.
-This is a default Shaarli plugin, you just have to enable it.
 
-To enable the plugin, add `playvideos` to the `TOOLBAR_PLUGINS` config option in your `index.php` or `data/options.php`. Example:
+This is a default Shaarli plugin, you just have to enable it. See https://github.com/shaarli/Shaarli/wiki/Shaarli-configuration/
 
-    $GLOBALS['config']['TOOLBAR_PLUGINS'] = array('aplugins', 'anotherone', 'playvideos');
 
 #### Troubleshooting
+
 If your server has [Content Security Policy](http://content-security-policy.com/) headers enabled, this may prevent the script from loading fully. You should relax the CSP in your server settings. Example CSP rule for apache2:
 `Header set Content-Security-Policy "script-src 'self' 'unsafe-inline' https://www.youtube.com https://s.ytimg.com 'unsafe-eval'"`
 
+
 ### License
 ```
 File: youtube_playlist.js
@@ -68,4 +68,4 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 ----------------------------------------------------
-```
\ No newline at end of file
+```

From 8025c63906eab4091b75ec0beac06b3a5837d31b Mon Sep 17 00:00:00 2001
From: nodiscc 
Date: Mon, 30 Nov 2015 23:17:01 +0100
Subject: [PATCH 223/658] [doc] add apache2 CSP config

---
 plugins/playvideos/README.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/playvideos/README.md b/plugins/playvideos/README.md
index 54729e0..b169847 100644
--- a/plugins/playvideos/README.md
+++ b/plugins/playvideos/README.md
@@ -14,8 +14,16 @@ This is a default Shaarli plugin, you just have to enable it. See https://github
 #### Troubleshooting
 
 If your server has [Content Security Policy](http://content-security-policy.com/) headers enabled, this may prevent the script from loading fully. You should relax the CSP in your server settings. Example CSP rule for apache2:
-`Header set Content-Security-Policy "script-src 'self' 'unsafe-inline' https://www.youtube.com https://s.ytimg.com 'unsafe-eval'"`
 
+In `/etc/apache2/conf-available/shaarli-csp.conf`:
+
+```apache
+
+    Header set Content-Security-Policy "script-src 'self' 'unsafe-inline' https://www.youtube.com https://s.ytimg.com 'unsafe-eval'"
+
+```
+
+Then run `a2enconf shaarli-csp; service apache2 reload`
 
 ### License
 ```

From 9ecdeb54528eaebf12edc6af7a4082420a9899ee Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Tue, 1 Dec 2015 21:25:50 +0100
Subject: [PATCH 224/658] Bump version to v0.6.1

Signed-off-by: VirtualTam 
---
 index.php           | 4 ++--
 shaarli_version.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index a100563..d26c0c1 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)));
diff --git a/shaarli_version.php b/shaarli_version.php
index a5f0a09..11ad87d 100644
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-
+

From b6a54537b8823d2b96e9bdb64e280959d6681c36 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Thu, 3 Dec 2015 19:27:34 +0100
Subject: [PATCH 225/658] Remove dummycache folder on tear down.

---
 tests/CacheTest.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/CacheTest.php b/tests/CacheTest.php
index eacd448..26c4322 100644
--- a/tests/CacheTest.php
+++ b/tests/CacheTest.php
@@ -30,13 +30,22 @@ class CacheTest extends PHPUnit_Framework_TestCase
         } else {
             array_map('unlink', glob(self::$testCacheDir.'/*'));
         }
-        
+
         foreach (self::$pages as $page) {
             file_put_contents(self::$testCacheDir.'/'.$page.'.cache', $page);
         }
         file_put_contents(self::$testCacheDir.'/intru.der', 'ShouldNotBeThere');
     }
 
+    /**
+     * Remove dummycache folder after each tests.
+     */
+    public function tearDown()
+    {
+        array_map('unlink', glob(self::$testCacheDir.'/*'));
+        rmdir(self::$testCacheDir);
+    }
+
     /**
      * Purge cached pages
      */

From 4a7af9759a1874bdf6ec00a286040a3c64b9870e Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Thu, 3 Dec 2015 20:30:46 +0100
Subject: [PATCH 226/658] fix: assign template variables to empty values so
 they can be evaluated

Regression introduced in #394

Signed-off-by: VirtualTam 
---
 application/ApplicationUtils.php | 2 ++
 index.php                        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php
index 6d87811..274331e 100644
--- a/application/ApplicationUtils.php
+++ b/application/ApplicationUtils.php
@@ -50,6 +50,8 @@ class ApplicationUtils
      * @param bool   $enableCheck    whether to check for new versions
      * @param bool   $isLoggedIn     whether the user is logged in
      *
+     * @throws Exception an invalid branch has been set for update checks
+     *
      * @return mixed the new version code if available and greater, else 'false'
      */
     public static function checkUpdate($currentVersion,
diff --git a/index.php b/index.php
index d26c0c1..e259204 100644
--- a/index.php
+++ b/index.php
@@ -643,9 +643,11 @@ class pageBuilder
                 $GLOBALS['config']['UPDATECHECK_BRANCH']
             );
             $this->tpl->assign('newVersion', escape($version));
+            $this->tpl->assign('versionError', '');
 
         } catch (Exception $exc) {
             logm($exc->getMessage());
+            $this->tpl->assign('newVersion', '');
             $this->tpl->assign('versionError', escape($exc->getMessage()));
         }
 

From 2f5c1361045d7ad4de31bceff04f03bad655c7c4 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Sat, 5 Dec 2015 11:05:08 +0100
Subject: [PATCH 227/658] Fixes #399 - show single link title as page title

---
 index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.php b/index.php
index e259204..81ab767 100644
--- a/index.php
+++ b/index.php
@@ -1948,6 +1948,7 @@ function buildLinkList($PAGE,$LINKSDB)
 
     // Fill all template fields.
     $data = array(
+        'pagetitle' => $GLOBALS['pagetitle'],
         'linkcount' => count($LINKSDB),
         'previous_page_url' => $previous_page_url,
         'next_page_url' => $next_page_url,

From 18cca483b0b51f190bd875fc4273a0fff3fedebd Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Mon, 7 Dec 2015 10:29:24 +0100
Subject: [PATCH 228/658] Temporary fix for head titles

only set the title on permalink.
---
 index.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 index.php

diff --git a/index.php b/index.php
old mode 100644
new mode 100755
index 81ab767..0dd5829
--- a/index.php
+++ b/index.php
@@ -1948,7 +1948,6 @@ function buildLinkList($PAGE,$LINKSDB)
 
     // Fill all template fields.
     $data = array(
-        'pagetitle' => $GLOBALS['pagetitle'],
         'linkcount' => count($LINKSDB),
         'previous_page_url' => $previous_page_url,
         'next_page_url' => $next_page_url,
@@ -1962,6 +1961,10 @@ function buildLinkList($PAGE,$LINKSDB)
         'links' => $linkDisp,
         'tags' => $LINKSDB->allTags(),
     );
+    // FIXME! temporary fix - see #399.
+    if (!empty($GLOBALS['pagetitle']) && count($linkDisp) == 1) {
+        $data['pagetitle'] = $GLOBALS['pagetitle'];
+    }
 
     $pluginManager = PluginManager::getInstance();
     $pluginManager->executeHooks('render_linklist', $data, array('loggedin' => isLoggedIn()));

From 0504659db7de8a0e490e26a85ccfe704e5693494 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Thu, 26 Nov 2015 21:09:09 +0100
Subject: [PATCH 229/658] Minimal indent of tools.html

---
 tpl/tools.html | 51 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 tpl/tools.html

diff --git a/tpl/tools.html b/tpl/tools.html
old mode 100644
new mode 100755
index c9ada4a..c13f4f1
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -10,12 +10,50 @@
 		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.

                                                                
-		✚Add Note ⇐ Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).
                                                                    Then click "✚Add Note" button anytime to start composing a (default private)  Note (text post) to your Shaarli.

                                                                
-		✚Add to Firefox social ⇐ Click on this button to add Shaarli to the "Share this page" button in Firefox.

                                                                
-        {loop="$tools_plugin"}
+		
+			✚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.
+			                                                                
+		

                                                                
+		
+			✚Add Note
+		
+		
+			
+				⇐ Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).
                                                                
+				    Then click "✚Add Note" button anytime to start composing a private Note (text post) to your Shaarli.
+			                                                                
+		

                                                                
+		
+			✚Add to Firefox social
+		
+		
+			⇐ Click on this button to add Shaarli to the "Share this page" button in Firefox.
+		

                                                                
+
+		{loop="$tools_plugin"}
             {$value}
         {/loop}
+
 		
                                                                
 
 		
 	
                                                                
 
                                                                

From 6a6f6c32e5876a347a806cc43d25596b9257765b Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Mon, 7 Dec 2015 10:50:28 +0100
Subject: [PATCH 230/658] Fixes #403 : Remove QRCode in core CSS and fix plugin
 layout

---
 inc/shaarli.css            | 10 ----------
 plugins/qrcode/qrcode.html |  8 +++-----
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/inc/shaarli.css b/inc/shaarli.css
index 5578610..451f048 100644
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -414,16 +414,6 @@ h1 {
     color:#E28E3F;
 }
 
-.linkqrcode {
-    display: inline;
-    position: relative;
-}
-
-a.qrcode img {
-    width: 13px;
-    height: 13px;
-}
-
 #linklist li.private {
     background: url('../images/private.png') no-repeat 4px center;
     padding-left: 30px;
diff --git a/plugins/qrcode/qrcode.html b/plugins/qrcode/qrcode.html
index ffdaf3b..58ac500 100644
--- a/plugins/qrcode/qrcode.html
+++ b/plugins/qrcode/qrcode.html
@@ -1,5 +1,3 @@
-
                                                                
-    
-        
-    
-
                                                                
+
+    
+

From aca447a71353b304c6180c10b0bee18cfacbc4f9 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Tue, 8 Dec 2015 15:09:17 +0100
Subject: [PATCH 231/658] Reset permissions on index.php (changed in
 18cca483b0b51f190bd875fc4273a0fff3fedebd ).

---
 index.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 index.php

diff --git a/index.php b/index.php
old mode 100755
new mode 100644

From 38603b2450e983edfab5770bd3dd681c6073f898 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Mon, 7 Dec 2015 11:25:11 +0100
Subject: [PATCH 232/658] Fixes #403: build the daily page through renderPage()

  * new entry in the Router for daily page.
  * add an always displayed button in demo_plugin
---
 application/Router.php              |  6 ++++++
 index.php                           | 20 ++++++++++++++------
 plugins/demo_plugin/demo_plugin.php |  2 ++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/application/Router.php b/application/Router.php
index 1e6a398..0c81384 100644
--- a/application/Router.php
+++ b/application/Router.php
@@ -13,6 +13,8 @@ class Router
 
     public static $PAGE_TAGCLOUD = 'tagcloud';
 
+    public static $PAGE_DAILY = 'daily';
+
     public static $PAGE_TOOLS = 'tools';
 
     public static $PAGE_CHANGEPASSWORD = 'changepasswd';
@@ -69,6 +71,10 @@ class Router
             return self::$PAGE_OPENSEARCH;
         }
 
+        if (startsWith($query, 'do='. self::$PAGE_DAILY)) {
+            return self::$PAGE_DAILY;
+        }
+
         // At this point, only loggedin pages.
         if (!$loggedIn) {
             return self::$PAGE_LINKLIST;
diff --git a/index.php b/index.php
index 81ab767..1850e40 100644
--- a/index.php
+++ b/index.php
@@ -995,8 +995,12 @@ function showDailyRSS() {
     exit;
 }
 
-// "Daily" page.
-function showDaily()
+/**
+ * Show the 'Daily' page.
+ *
+ * @param PageBuilder $pageBuilder Template engine wrapper.
+ */
+function showDaily($pageBuilder)
 {
     $LINKSDB = new LinkDB(
         $GLOBALS['config']['DATASTORE'],
@@ -1059,7 +1063,7 @@ function showDaily()
         array_push($columns[$index],$link); // Put entry in this column.
         $fill[$index]+=$length;
     }
-    $PAGE = new pageBuilder;
+
     $data = array(
         'linksToDisplay' => $linksToDisplay,
         'linkcount' => count($LINKSDB),
@@ -1072,10 +1076,10 @@ function showDaily()
     $pluginManager->executeHooks('render_daily', $data, array('loggedin' => isLoggedIn()));
 
     foreach ($data as $key => $value) {
-        $PAGE->assign($key, $value);
+        $pageBuilder->assign($key, $value);
     }
 
-    $PAGE->renderPage('daily');
+    $pageBuilder->renderPage('daily');
     exit;
 }
 
@@ -1209,6 +1213,11 @@ function renderPage()
         exit;
     }
 
+    // Daily page.
+    if ($targetPage == Router::$PAGE_DAILY) {
+        showDaily($PAGE);
+    }
+
     // Display openseach plugin (XML)
     if ($targetPage == Router::$PAGE_OPENSEARCH) {
         header('Content-Type: application/xml; charset=utf-8');
@@ -2456,7 +2465,6 @@ if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=g
 if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=rss')) { showRSS(); exit; }
 if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=atom')) { showATOM(); exit; }
 if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=dailyrss')) { showDailyRSS(); exit; }
-if (isset($_SERVER["QUERY_STRING"]) && startswith($_SERVER["QUERY_STRING"],'do=daily')) { showDaily(); exit; }
 if (!isset($_SESSION['LINKS_PER_PAGE'])) $_SESSION['LINKS_PER_PAGE']=$GLOBALS['config']['LINKS_PER_PAGE'];
 renderPage();
 ?>
diff --git a/plugins/demo_plugin/demo_plugin.php b/plugins/demo_plugin/demo_plugin.php
index 84763c2..9384c21 100644
--- a/plugins/demo_plugin/demo_plugin.php
+++ b/plugins/demo_plugin/demo_plugin.php
@@ -40,6 +40,8 @@ function hook_demo_plugin_render_header($data)
         // Fields in toolbar
         $data['fields_toolbar'][] = 'DEMO_fields_toolbar';
     }
+    // Another button always displayed
+    $data['buttons_toolbar'][] = '
                                                              • DEMO
                                                                • ';
 
     return $data;
 }

From 40a5f296a6f983e5a31961994e7c2db461e70f5e Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Mon, 7 Dec 2015 11:54:18 +0100
Subject: [PATCH 233/658] Adding a new placeholder in render_footer hook.

Allow free elements at the end of the page.
---
 plugins/demo_plugin/custom_demo.css | 6 ++++++
 plugins/demo_plugin/demo_plugin.php | 6 ++++++
 tpl/page.footer.html                | 5 +++++
 3 files changed, 17 insertions(+)

diff --git a/plugins/demo_plugin/custom_demo.css b/plugins/demo_plugin/custom_demo.css
index ab1720b..af5e8bf 100644
--- a/plugins/demo_plugin/custom_demo.css
+++ b/plugins/demo_plugin/custom_demo.css
@@ -4,4 +4,10 @@
 
 .upper_plugin_demo {
     float: left;
+}
+
+#demo_marquee {
+	background: darkmagenta;
+	color: white;
+	font-weight: bold;
 }
\ No newline at end of file
diff --git a/plugins/demo_plugin/demo_plugin.php b/plugins/demo_plugin/demo_plugin.php
index 84763c2..f03ddb2 100644
--- a/plugins/demo_plugin/demo_plugin.php
+++ b/plugins/demo_plugin/demo_plugin.php
@@ -74,6 +74,7 @@ function hook_demo_plugin_render_includes($data)
  *
  * Template placeholders:
  *   - text
+ *   - endofpage
  *   - js_files
  *
  * Data:
@@ -89,6 +90,11 @@ function hook_demo_plugin_render_footer($data)
     // footer text
     $data['text'][] = 'Shaarli is now enhanced by the awesome demo_plugin.';
 
+    // Free elements at the end of the page.
+    $data['endofpage'][] = '' .
+            'DEMO: it\'s 1999 all over again!' .
+        '';
+
     // List of plugin's JS files.
     // Note that you just need to specify CSS path.
     $data['js_files'][] = PluginManager::$PLUGINS_PATH . '/demo_plugin/demo_plugin.js';
diff --git a/tpl/page.footer.html b/tpl/page.footer.html
index b20aae5..195dada 100644
--- a/tpl/page.footer.html
+++ b/tpl/page.footer.html
@@ -4,6 +4,11 @@
         {$value}
     {/loop}
 
+
+{loop="$plugins_footer.endofpage"}
+    {$value}
+{/loop}
+
 {if="$newVersion"}
 
                                                                
   ● Shaarli {$newVersion} is

From 28a4fc546fd937ba4aef89e2a70bf3e1ae1508d3 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Sun, 13 Dec 2015 20:44:22 +0100
Subject: [PATCH 234/658] Fixes QRCode style

 * fixes a regression misplacing QRCode popup.
 * adds a 'show' class in JS to handle CSS transition.
---
 inc/shaarli.css                  | 19 -------------------
 plugins/qrcode/qrcode.css        | 23 +++++++++++++++++++++++
 plugins/qrcode/qrcode.html       |  8 +++++---
 plugins/qrcode/qrcode.php        | 16 ++++++++++++++++
 plugins/qrcode/shaarli-qrcode.js | 10 ++++++++--
 5 files changed, 52 insertions(+), 24 deletions(-)
 create mode 100755 plugins/qrcode/qrcode.css

diff --git a/inc/shaarli.css b/inc/shaarli.css
index 451f048..d6bbdbc 100644
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -739,25 +739,6 @@ h1 {
     background: #ffffff;
 }
 
-div#permalinkQrcode {
-    padding: 20px;
-    width: 220px;
-    height: 220px;
-    background-color: #ffffff;
-    border: 1px solid black;
-    position: absolute;
-    top: -100px;
-    left: -100px;
-    text-align: center;
-    font-size: 8pt;
-    z-index: 50;
-    -webkit-box-shadow: 2px 2px 20px 2px #333333;
-    -moz-box-shadow: 2px 2px 20px 2px #333333;
-    -o-box-shadow: 2px 2px 20px 2px #333333;
-    -ms-box-shadow: 2px 2px 20px 2px #333333;
-    box-shadow: 2px 2px 20px 2px #333333;
-}
-
 div.daily {
     font-family: Georgia, 'DejaVu Serif', Norasi, serif;
     background-color: #E6D6BE;
diff --git a/plugins/qrcode/qrcode.css b/plugins/qrcode/qrcode.css
new file mode 100755
index 0000000..0d514a0
--- /dev/null
+++ b/plugins/qrcode/qrcode.css
@@ -0,0 +1,23 @@
+.linkqrcode {
+    display: inline;
+    position: relative;
+}
+
+#permalinkQrcode {
+    position: absolute;
+    z-index: 200;
+    padding: 20px;
+    width: 220px;
+    height: 220px;
+    background-color: #ffffff;
+    border: 1px solid black;
+    top: -110px;
+    left: -110px;
+    text-align: center;
+    font-size: 8pt;
+    box-shadow: 2px 2px 20px 2px #333333;
+}
+
+#permalinkQrcode img {
+    margin-bottom: 5px;
+}
diff --git a/plugins/qrcode/qrcode.html b/plugins/qrcode/qrcode.html
index 58ac500..ffdaf3b 100644
--- a/plugins/qrcode/qrcode.html
+++ b/plugins/qrcode/qrcode.html
@@ -1,3 +1,5 @@
-
-    
-
+
                                                                
+    
+        
+    
+
                                                                
diff --git a/plugins/qrcode/qrcode.php b/plugins/qrcode/qrcode.php
index 5f6e76a..a709aba 100644
--- a/plugins/qrcode/qrcode.php
+++ b/plugins/qrcode/qrcode.php
@@ -39,3 +39,19 @@ function hook_qrcode_render_footer($data)
 
     return $data;
 }
+
+/**
+ * When linklist is displayed, include qrcode CSS file.
+ *
+ * @param array $data - header data.
+ *
+ * @return mixed - header data with qrcode CSS file added.
+ */
+function hook_qrcode_render_includes($data)
+{
+    if ($data['_PAGE_'] == Router::$PAGE_LINKLIST) {
+        $data['css_files'][] = PluginManager::$PLUGINS_PATH . '/qrcode/qrcode.css';
+    }
+
+    return $data;
+}
diff --git a/plugins/qrcode/shaarli-qrcode.js b/plugins/qrcode/shaarli-qrcode.js
index 0a8de21..615f54c 100644
--- a/plugins/qrcode/shaarli-qrcode.js
+++ b/plugins/qrcode/shaarli-qrcode.js
@@ -19,7 +19,7 @@ function showQrCode(caller,loading)
     
     // Build the div which contains the QR-Code:
     var element = document.createElement('div');
-    element.id="permalinkQrcode";
+    element.id = 'permalinkQrcode';
 
 	// Make QR-Code div commit sepuku when clicked:
     if ( element.attachEvent ){
@@ -37,6 +37,12 @@ function showQrCode(caller,loading)
         element.appendChild(image);
         element.innerHTML += "
                                                                Click to close";
         caller.parentNode.appendChild(element);
+
+        // Show the QRCode
+        qrcodeImage = document.getElementById('permalinkQrcode');
+        // Workaround to deal with newly created element lag for transition.
+        window.getComputedStyle(qrcodeImage).opacity;
+        qrcodeImage.className = 'show';
     }
     else
     {
@@ -48,7 +54,7 @@ function showQrCode(caller,loading)
 // Remove any displayed QR-Code
 function removeQrcode()
 {
-    var elem = document.getElementById("permalinkQrcode");
+    var elem = document.getElementById('permalinkQrcode');
     if (elem) {
         elem.parentNode.removeChild(elem);
     }

From 49e62f22ad750d4d60936ec8437caee91809b179 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Tue, 22 Dec 2015 10:24:31 +0100
Subject: [PATCH 235/658] QRCode plugin: use url instead of real_url

Fixes #414 and avoid usage of redirector in QRCode.

Also fixed a bug with URL encoding.
---
 application/LinkDB.php           | 4 +++-
 plugins/qrcode/qrcode.php        | 6 +++++-
 tests/plugins/PlugQrcodeTest.php | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/application/LinkDB.php b/application/LinkDB.php
index f771ac8..51fa926 100644
--- a/application/LinkDB.php
+++ b/application/LinkDB.php
@@ -17,8 +17,10 @@
  *  - private:  Is this link private? 0=no, other value=yes
  *  - tags:     tags attached to this entry (separated by spaces)
  *  - title     Title of the link
- *  - url       URL of the link. Can be absolute or relative.
+ *  - url       URL of the link. Used for displayable links (no redirector, relative, etc.).
+ *              Can be absolute or relative.
  *              Relative URLs are permalinks (e.g.'?m-ukcw')
+ *  - real_url  Absolute processed URL.
  *
  * Implements 3 interfaces:
  *  - ArrayAccess: behaves like an associative array;
diff --git a/plugins/qrcode/qrcode.php b/plugins/qrcode/qrcode.php
index 5f6e76a..84a1961 100644
--- a/plugins/qrcode/qrcode.php
+++ b/plugins/qrcode/qrcode.php
@@ -17,7 +17,11 @@ function hook_qrcode_render_linklist($data)
     $qrcode_html = file_get_contents(PluginManager::$PLUGINS_PATH . '/qrcode/qrcode.html');
 
     foreach ($data['links'] as &$value) {
-        $qrcode = sprintf($qrcode_html, $value['real_url'], $value['real_url'], PluginManager::$PLUGINS_PATH);
+        $qrcode = sprintf($qrcode_html,
+            urlencode($value['url']),
+            $value['url'],
+            PluginManager::$PLUGINS_PATH
+        );
         $value['link_plugin'][] = $qrcode;
     }
 
diff --git a/tests/plugins/PlugQrcodeTest.php b/tests/plugins/PlugQrcodeTest.php
index c749fa8..86dc7f2 100644
--- a/tests/plugins/PlugQrcodeTest.php
+++ b/tests/plugins/PlugQrcodeTest.php
@@ -30,7 +30,7 @@ class PlugQrcodeTest extends PHPUnit_Framework_TestCase
             'title' => $str,
             'links' => array(
                 array(
-                    'real_url' => $str,
+                    'url' => $str,
                 )
             )
         );
@@ -39,7 +39,7 @@ class PlugQrcodeTest extends PHPUnit_Framework_TestCase
         $link = $data['links'][0];
         // data shouldn't be altered
         $this->assertEquals($str, $data['title']);
-        $this->assertEquals($str, $link['real_url']);
+        $this->assertEquals($str, $link['url']);
 
         // plugin data
         $this->assertEquals(1, count($link['link_plugin']));

From ba83317573a1477d731cbd3d974b601cf9afdba3 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Wed, 23 Dec 2015 19:54:37 +0100
Subject: [PATCH 236/658] Bump version to v0.6.2

Signed-off-by: VirtualTam 
---
 index.php           | 4 ++--
 shaarli_version.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index d0876d9..40a6fbe 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)));
diff --git a/shaarli_version.php b/shaarli_version.php
index 11ad87d..fe5f389 100644
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-
+

From c6a7972de51a15d94ccb69dfb008d5560820452c Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Wed, 23 Dec 2015 19:11:33 +0100
Subject: [PATCH 237/658] Add a .gitattributes to ease repository management

Features:
- enforce LF (Unix) line endings
- omit dev/test resources & code from Git(Hub) archives
- treat minified resources (CSS, JS) as binaries to avoid cluttered diffs

Resources:
- http://git-scm.com/docs/gitattributes
- https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes
- https://help.github.com/articles/dealing-with-line-endings/
- http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/
- https://github.com/Danimoth/gitattributes

Signed-off-by: VirtualTam 
---
 .gitattributes | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..e616be2
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,28 @@
+# Set default behavior
+*       text=auto eol=lf
+
+# Ensure sources are processed
+*.css   text
+*.html  text diff=html
+*.js    text
+*.md    text
+*.php   text diff=php
+
+# Do not alter images nor minified scripts
+*.ico           binary
+*.jpg           binary
+*.png           binary
+*.min.css       binary
+*.min.js        binary
+
+# Exclude from Git archives
+.gitattributes  export-ignore
+.gitignore      export-ignore
+.travis.yml     export-ignore
+composer.json   export-ignore
+doc/**/*.json   export-ignore
+doc/**/*.md     export-ignore
+Doxyfile        export-ignore
+Makefile        export-ignore
+phpunit.xml     export-ignore
+tests/          export-ignore

From 938d9cce77ed5098dd69643795cb4014f3688b35 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Tue, 22 Dec 2015 10:20:27 +0100
Subject: [PATCH 238/658] Wallabag plugin improvement

  * Fixes a bug where URL weren't properly encoded.
  * Adds Wallabag V2 support.
  * Adds a URL function to handle trailing slash.
  * UT.
  * README updated.
---
 application/Url.php                    | 12 +++++
 plugins/wallabag/README.md             | 25 ++++++---
 plugins/wallabag/WallabagInstance.php  | 71 ++++++++++++++++++++++++++
 plugins/wallabag/config.php.dist       |  3 +-
 plugins/wallabag/wallabag.html         |  2 +-
 plugins/wallabag/wallabag.php          | 17 +++++-
 tests/Url/UrlTest.php                  | 11 ++++
 tests/plugins/PluginWallabagTest.php   |  4 +-
 tests/plugins/WallabagInstanceTest.php | 60 ++++++++++++++++++++++
 9 files changed, 194 insertions(+), 11 deletions(-)
 create mode 100644 plugins/wallabag/WallabagInstance.php
 create mode 100644 tests/plugins/WallabagInstanceTest.php

diff --git a/application/Url.php b/application/Url.php
index af43b45..d80c9c5 100644
--- a/application/Url.php
+++ b/application/Url.php
@@ -51,6 +51,18 @@ function get_url_scheme($url)
   return $obj_url->getScheme();
 }
 
+/**
+ * Adds a trailing slash at the end of URL if necessary.
+ *
+ * @param string $url URL to check/edit.
+ *
+ * @return string $url URL with a end trailing slash.
+ */
+function add_trailing_slash($url)
+{
+    return $url . (!endsWith($url, '/') ? '/' : '');
+}
+
 /**
  * URL representation and cleanup utilities
  *
diff --git a/plugins/wallabag/README.md b/plugins/wallabag/README.md
index 08e0d44..5bc35be 100644
--- a/plugins/wallabag/README.md
+++ b/plugins/wallabag/README.md
@@ -2,7 +2,8 @@
 
 For each link in your Shaarli, adds a button to save the target page in your [wallabag](https://www.wallabag.org/).
 
-### Installation/configuration
+### Installation
+
 Clone this repository inside your `tpl/plugins/` directory, or download the archive and unpack it there.  
 The directory structure should look like:
 
@@ -11,19 +12,31 @@ The directory structure should look like:
     └── plugins
         └── wallabag
             ├── README.md
+            ├── config.php.dist
             ├── wallabag.html
+            ├── wallabag.php
             └── wallabag.png
 ```
 
-To enable the plugin, add `'wallabag'` to your list of enabled plugins in `data/options.php` (`PLUGINS` array)
-. This should look like:
+To enable the plugin, add `'wallabag'` to your list of enabled plugins in `data/options.php` (`PLUGINS` array).
+This should look like:
 
 ```
 $GLOBALS['config']['PLUGINS'] = array('qrcode', 'any_other_plugin', 'wallabag')
 ```
 
-Then, set the `WALLABAG_URL` variable in `data/options.php` pointing to your wallabag URL. Example:
+### Configuration
 
+Copy `config.php.dist` into `config.php` and setup your instance.
+
+*Wallabag instance URL*
 ```
-$GLOBALS['config']['WALLABAG_URL'] = 'http://demo.wallabag.org' ; //Base URL of your wallabag installation
-```
\ No newline at end of file
+$GLOBALS['config']['WALLABAG_URL'] = 'http://v2.wallabag.org' ;
+```
+
+*Wallabag version*: either `1` (for 1.x) or `2` (for 2.x)
+```
+$GLOBALS['config']['WALLABAG_VERSION'] = 2;
+```
+
+> Note: these settings can also be set in `data/config.php`.
\ No newline at end of file
diff --git a/plugins/wallabag/WallabagInstance.php b/plugins/wallabag/WallabagInstance.php
new file mode 100644
index 0000000..87352e6
--- /dev/null
+++ b/plugins/wallabag/WallabagInstance.php
@@ -0,0 +1,71 @@
+ '1.x',
+        2 => '2.x',
+    );
+
+    /**
+     * @var array Static reference to WB endpoint according to the API version.
+     *          - key: version name.
+     *          - value: endpoint.
+     */
+    private static $wallabagEndpoints = array(
+        '1.x' => '?plainurl=',
+        '2.x' => 'bookmarklet?url=',
+    );
+
+    /**
+     * @var string Wallabag user instance URL.
+     */
+    private $instanceUrl;
+
+    /**
+     * @var string Wallabag user instance API version.
+     */
+    private $apiVersion;
+
+    function __construct($instance, $version)
+    {
+        if ($this->isVersionAllowed($version)) {
+            $this->apiVersion = self::$wallabagVersions[$version];
+        } else {
+            // Default API version: 1.x.
+            $this->apiVersion = self::$wallabagVersions[1];
+        }
+
+        $this->instanceUrl = add_trailing_slash($instance);
+    }
+
+    /**
+     * Build the Wallabag URL to reach from instance URL and API version endpoint.
+     *
+     * @return string wallabag url.
+     */
+    public function getWallabagUrl()
+    {
+        return $this->instanceUrl . self::$wallabagEndpoints[$this->apiVersion];
+    }
+
+    /**
+     * Checks version configuration.
+     *
+     * @param mixed $version given version ID.
+     *
+     * @return bool true if it's valid, false otherwise.
+     */
+    private function isVersionAllowed($version)
+    {
+        return isset(self::$wallabagVersions[$version]);
+    }
+}
diff --git a/plugins/wallabag/config.php.dist b/plugins/wallabag/config.php.dist
index 7cf0d30..a602708 100644
--- a/plugins/wallabag/config.php.dist
+++ b/plugins/wallabag/config.php.dist
@@ -1,3 +1,4 @@
 
+
diff --git a/plugins/wallabag/wallabag.php b/plugins/wallabag/wallabag.php
index 37969c9..e3c399a 100644
--- a/plugins/wallabag/wallabag.php
+++ b/plugins/wallabag/wallabag.php
@@ -4,6 +4,8 @@
  * Plugin Wallabag.
  */
 
+require_once 'WallabagInstance.php';
+
 // don't raise unnecessary warnings
 if (is_file(PluginManager::$PLUGINS_PATH . '/wallabag/config.php')) {
     include PluginManager::$PLUGINS_PATH . '/wallabag/config.php';
@@ -28,12 +30,23 @@ function hook_wallabag_render_linklist($data)
         return $data;
     }
 
-    $wallabag_html = file_get_contents(PluginManager::$PLUGINS_PATH . '/wallabag/wallabag.html');
+    $version = isset($GLOBALS['plugins']['WALLABAG_VERSION'])
+        ? $GLOBALS['plugins']['WALLABAG_VERSION']
+        : '';
+    $wallabagInstance = new WallabagInstance($GLOBALS['plugins']['WALLABAG_URL'], $version);
+
+    $wallabagHtml = file_get_contents(PluginManager::$PLUGINS_PATH . '/wallabag/wallabag.html');
 
     foreach ($data['links'] as &$value) {
-        $wallabag = sprintf($wallabag_html, $GLOBALS['plugins']['WALLABAG_URL'], $value['url'], PluginManager::$PLUGINS_PATH);
+        $wallabag = sprintf(
+            $wallabagHtml,
+            $wallabagInstance->getWallabagUrl(),
+            urlencode($value['url']),
+            PluginManager::$PLUGINS_PATH
+        );
         $value['link_plugin'][] = $wallabag;
     }
 
     return $data;
 }
+
diff --git a/tests/Url/UrlTest.php b/tests/Url/UrlTest.php
index e498d79..af6daaa 100644
--- a/tests/Url/UrlTest.php
+++ b/tests/Url/UrlTest.php
@@ -145,4 +145,15 @@ class UrlTest extends PHPUnit_Framework_TestCase
         $url = new Url('git://domain.tld/push?pull=clone#checkout');
         $this->assertEquals('git', $url->getScheme());
     }
+
+    /**
+     * Test add trailing slash.
+     */
+    function testAddTrailingSlash()
+    {
+        $strOn = 'http://randomstr.com/test/';
+        $strOff = 'http://randomstr.com/test';
+        $this->assertEquals($strOn, add_trailing_slash($strOn));
+        $this->assertEquals($strOn, add_trailing_slash($strOff));
+    }
 }
diff --git a/tests/plugins/PluginWallabagTest.php b/tests/plugins/PluginWallabagTest.php
index 7cc83f4..5d3a60e 100644
--- a/tests/plugins/PluginWallabagTest.php
+++ b/tests/plugins/PluginWallabagTest.php
@@ -44,6 +44,8 @@ class PluginWallabagTest extends PHPUnit_Framework_TestCase
 
         // plugin data
         $this->assertEquals(1, count($link['link_plugin']));
-        $this->assertNotFalse(strpos($link['link_plugin'][0], $str));
+        $this->assertNotFalse(strpos($link['link_plugin'][0], urlencode($str)));
+        $this->assertNotFalse(strpos($link['link_plugin'][0], $GLOBALS['plugins']['WALLABAG_URL']));
     }
 }
+
diff --git a/tests/plugins/WallabagInstanceTest.php b/tests/plugins/WallabagInstanceTest.php
new file mode 100644
index 0000000..7c14c1d
--- /dev/null
+++ b/tests/plugins/WallabagInstanceTest.php
@@ -0,0 +1,60 @@
+instance = 'http://some.url';
+    }
+
+    /**
+     * Test WallabagInstance with API V1.
+     */
+    function testWallabagInstanceV1()
+    {
+        $instance = new WallabagInstance($this->instance, 1);
+        $expected = $this->instance . '/?plainurl=';
+        $result = $instance->getWallabagUrl();
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * Test WallabagInstance with API V2.
+     */
+    function testWallabagInstanceV2()
+    {
+        $instance = new WallabagInstance($this->instance, 2);
+        $expected = $this->instance . '/bookmarklet?url=';
+        $result = $instance->getWallabagUrl();
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * Test WallabagInstance with an invalid API version.
+     */
+    function testWallabagInstanceInvalidVersion()
+    {
+        $instance = new WallabagInstance($this->instance, false);
+        $expected = $this->instance . '/?plainurl=';
+        $result = $instance->getWallabagUrl();
+        $this->assertEquals($expected, $result);
+
+        $instance = new WallabagInstance($this->instance, 3);
+        $expected = $this->instance . '/?plainurl=';
+        $result = $instance->getWallabagUrl();
+        $this->assertEquals($expected, $result);
+    }
+}

From 453f4653c325dc23193e16432170bf634c42e8a2 Mon Sep 17 00:00:00 2001
From: VirtualTam 
Date: Thu, 24 Dec 2015 17:17:46 +0100
Subject: [PATCH 239/658] Docker: move Dockerfiles to the main repository

Relates to #420

Fixes:
- [all] remove Nginx' 'server_name' attribute
- [dev] create the phpinfo() script from the Dockerfile

Modifications:
- [all] remove documentation/guide (to be added to the wiki)
- [all] update maintainer information
- [prod] differentiate 'master' (:latest) and 'stable' (:stable) images

Signed-off-by: VirtualTam 
---
 .gitattributes                           |  3 ++
 docker/.htaccess                         |  2 +
 docker/development/Dockerfile            | 28 +++++++++++
 docker/development/IMAGE.md              | 10 ++++
 docker/development/nginx.conf            | 64 ++++++++++++++++++++++++
 docker/development/supervised.conf       | 13 +++++
 docker/production/Dockerfile             | 20 ++++++++
 docker/production/IMAGE.md               |  5 ++
 docker/production/nginx.conf             | 56 +++++++++++++++++++++
 docker/production/stable/Dockerfile      | 20 ++++++++
 docker/production/stable/IMAGE.md        |  5 ++
 docker/production/stable/nginx.conf      | 56 +++++++++++++++++++++
 docker/production/stable/supervised.conf | 13 +++++
 docker/production/supervised.conf        | 13 +++++
 14 files changed, 308 insertions(+)
 create mode 100644 docker/.htaccess
 create mode 100644 docker/development/Dockerfile
 create mode 100644 docker/development/IMAGE.md
 create mode 100644 docker/development/nginx.conf
 create mode 100644 docker/development/supervised.conf
 create mode 100644 docker/production/Dockerfile
 create mode 100644 docker/production/IMAGE.md
 create mode 100644 docker/production/nginx.conf
 create mode 100644 docker/production/stable/Dockerfile
 create mode 100644 docker/production/stable/IMAGE.md
 create mode 100644 docker/production/stable/nginx.conf
 create mode 100644 docker/production/stable/supervised.conf
 create mode 100644 docker/production/supervised.conf

diff --git a/.gitattributes b/.gitattributes
index e616be2..aaf6a39 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,11 +2,13 @@
 *       text=auto eol=lf
 
 # Ensure sources are processed
+*.conf  text
 *.css   text
 *.html  text diff=html
 *.js    text
 *.md    text
 *.php   text diff=php
+Dockerfile      text
 
 # Do not alter images nor minified scripts
 *.ico           binary
@@ -22,6 +24,7 @@
 composer.json   export-ignore
 doc/**/*.json   export-ignore
 doc/**/*.md     export-ignore
+docker/         export-ignore
 Doxyfile        export-ignore
 Makefile        export-ignore
 phpunit.xml     export-ignore
diff --git a/docker/.htaccess b/docker/.htaccess
new file mode 100644
index 0000000..b584d98
--- /dev/null
+++ b/docker/.htaccess
@@ -0,0 +1,2 @@
+Allow from none
+Deny from all
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
new file mode 100644
index 0000000..2ed59b8
--- /dev/null
+++ b/docker/development/Dockerfile
@@ -0,0 +1,28 @@
+FROM debian:jessie
+MAINTAINER Shaarli Community
+
+RUN apt-get update \
+    && apt-get install -y \
+       nginx-light php5-fpm php5-gd supervisor \
+       git nano
+
+ADD https://getcomposer.org/composer.phar /usr/local/bin/composer
+RUN chmod 755 /usr/local/bin/composer
+
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
+RUN echo "" > /var/www/index.php
+
+WORKDIR /var/www
+RUN rm -rf html \
+    && git clone https://github.com/shaarli/Shaarli.git shaarli \
+    && chown -R www-data:www-data .
+
+WORKDIR /var/www/shaarli
+RUN composer install
+
+VOLUME /var/www/shaarli/data
+
+EXPOSE 80
+
+CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf"]
diff --git a/docker/development/IMAGE.md b/docker/development/IMAGE.md
new file mode 100644
index 0000000..e2ff0f0
--- /dev/null
+++ b/docker/development/IMAGE.md
@@ -0,0 +1,10 @@
+## shaarli:dev
+- [Debian 8 Jessie](https://hub.docker.com/_/debian/)
+- [PHP5-FPM](http://php-fpm.org/)
+- [Nginx](http://nginx.org/)
+- [Shaarli](https://github.com/shaarli/Shaarli)
+
+### Development tools
+- [composer](https://getcomposer.org/)
+- [git](http://git-scm.com/)
+- [nano](http://www.nano-editor.org/)
diff --git a/docker/development/nginx.conf b/docker/development/nginx.conf
new file mode 100644
index 0000000..cda09b5
--- /dev/null
+++ b/docker/development/nginx.conf
@@ -0,0 +1,64 @@
+user www-data www-data;
+daemon off;
+worker_processes 4;
+
+events {
+    worker_connections  768;
+}
+
+http {
+    include            mime.types;
+    default_type       application/octet-stream;
+    keepalive_timeout  20;
+
+    index index.html index.php;
+
+    server {
+        listen       80;
+        root         /var/www/shaarli;
+
+        access_log  /var/log/nginx/shaarli.access.log;
+        error_log   /var/log/nginx/shaarli.error.log;
+
+        location /phpinfo/ {
+            # add a PHP info page for convenience
+            fastcgi_pass   unix:/var/run/php5-fpm.sock;
+            fastcgi_index  index.php;
+            fastcgi_param  SCRIPT_FILENAME  /var/www/index.php;
+            include fastcgi_params;
+        }
+
+        location ~ /\. {
+            # deny access to dotfiles
+            access_log off;
+            log_not_found off;
+            deny all;
+        }
+        
+        location ~ ~$ {
+            # deny access to temp editor files, e.g. "script.php~"
+            access_log off;
+            log_not_found off;
+            deny all;
+        }
+
+        location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
+            # cache static assets
+            expires    max;
+            add_header Pragma public;
+            add_header Cache-Control "public, must-revalidate, proxy-revalidate";
+        }
+
+        location ~ (index)\.php$ {
+            # filter and proxy PHP requests to PHP-FPM
+            fastcgi_pass   unix:/var/run/php5-fpm.sock;
+            fastcgi_index  index.php;
+            include        fastcgi.conf;
+        }
+
+        location ~ \.php$ {
+            # deny access to all other PHP scripts
+            deny all;
+        }
+    }
+}
diff --git a/docker/development/supervised.conf b/docker/development/supervised.conf
new file mode 100644
index 0000000..5acd979
--- /dev/null
+++ b/docker/development/supervised.conf
@@ -0,0 +1,13 @@
+[program:php5-fpm]
+command=/usr/sbin/php5-fpm -F
+priority=5
+autostart=true
+autorestart=true
+
+[program:nginx]
+command=/usr/sbin/nginx
+priority=10
+autostart=true
+autorestart=true
+stdout_events_enabled=true
+stderr_events_enabled=true
diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile
new file mode 100644
index 0000000..3db4eb5
--- /dev/null
+++ b/docker/production/Dockerfile
@@ -0,0 +1,20 @@
+FROM debian:jessie
+MAINTAINER Shaarli Community
+
+RUN apt-get update \
+    && apt-get install -y curl nginx-light php5-fpm php5-gd supervisor
+
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
+
+WORKDIR /var/www
+RUN rm -rf html \
+    && curl -L https://github.com/shaarli/Shaarli/archive/master.tar.gz | tar xvzf - \
+    && mv Shaarli-master shaarli \
+    && chown -R www-data:www-data shaarli
+
+VOLUME /var/www/shaarli/data
+
+EXPOSE 80
+
+CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf"]
diff --git a/docker/production/IMAGE.md b/docker/production/IMAGE.md
new file mode 100644
index 0000000..6f827b3
--- /dev/null
+++ b/docker/production/IMAGE.md
@@ -0,0 +1,5 @@
+## shaarli:latest
+- [Debian 8 Jessie](https://hub.docker.com/_/debian/)
+- [PHP5-FPM](http://php-fpm.org/)
+- [Nginx](http://nginx.org/)
+- [Shaarli](https://github.com/shaarli/Shaarli)
diff --git a/docker/production/nginx.conf b/docker/production/nginx.conf
new file mode 100644
index 0000000..e23c458
--- /dev/null
+++ b/docker/production/nginx.conf
@@ -0,0 +1,56 @@
+user www-data www-data;
+daemon off;
+worker_processes 4;
+
+events {
+    worker_connections  768;
+}
+
+http {
+    include            mime.types;
+    default_type       application/octet-stream;
+    keepalive_timeout  20;
+
+    index index.html index.php;
+
+    server {
+        listen       80;
+        root         /var/www/shaarli;
+
+        access_log  /var/log/nginx/shaarli.access.log;
+        error_log   /var/log/nginx/shaarli.error.log;
+
+        location ~ /\. {
+            # deny access to dotfiles
+            access_log off;
+            log_not_found off;
+            deny all;
+        }
+        
+        location ~ ~$ {
+            # deny access to temp editor files, e.g. "script.php~"
+            access_log off;
+            log_not_found off;
+            deny all;
+        }
+
+        location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
+            # cache static assets
+            expires    max;
+            add_header Pragma public;
+            add_header Cache-Control "public, must-revalidate, proxy-revalidate";
+        }
+
+        location ~ (index)\.php$ {
+            # filter and proxy PHP requests to PHP-FPM
+            fastcgi_pass   unix:/var/run/php5-fpm.sock;
+            fastcgi_index  index.php;
+            include        fastcgi.conf;
+        }
+
+        location ~ \.php$ {
+            # deny access to all other PHP scripts
+            deny all;
+        }
+    }
+}
diff --git a/docker/production/stable/Dockerfile b/docker/production/stable/Dockerfile
new file mode 100644
index 0000000..2bb3948
--- /dev/null
+++ b/docker/production/stable/Dockerfile
@@ -0,0 +1,20 @@
+FROM debian:jessie
+MAINTAINER Shaarli Community
+
+RUN apt-get update \
+    && apt-get install -y curl nginx-light php5-fpm php5-gd supervisor
+
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY supervised.conf /etc/supervisor/conf.d/supervised.conf
+
+WORKDIR /var/www
+RUN rm -rf html \
+    && curl -L https://github.com/shaarli/Shaarli/archive/stable.tar.gz | tar xvzf - \
+    && mv Shaarli-stable shaarli \
+    && chown -R www-data:www-data shaarli
+
+VOLUME /var/www/shaarli/data
+
+EXPOSE 80
+
+CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf"]
diff --git a/docker/production/stable/IMAGE.md b/docker/production/stable/IMAGE.md
new file mode 100644
index 0000000..d85b1d7
--- /dev/null
+++ b/docker/production/stable/IMAGE.md
@@ -0,0 +1,5 @@
+## shaarli:stable
+- [Debian 8 Jessie](https://hub.docker.com/_/debian/)
+- [PHP5-FPM](http://php-fpm.org/)
+- [Nginx](http://nginx.org/)
+- [Shaarli (stable)](https://github.com/shaarli/Shaarli/tree/stable)
diff --git a/docker/production/stable/nginx.conf b/docker/production/stable/nginx.conf
new file mode 100644
index 0000000..e23c458
--- /dev/null
+++ b/docker/production/stable/nginx.conf
@@ -0,0 +1,56 @@
+user www-data www-data;
+daemon off;
+worker_processes 4;
+
+events {
+    worker_connections  768;
+}
+
+http {
+    include            mime.types;
+    default_type       application/octet-stream;
+    keepalive_timeout  20;
+
+    index index.html index.php;
+
+    server {
+        listen       80;
+        root         /var/www/shaarli;
+
+        access_log  /var/log/nginx/shaarli.access.log;
+        error_log   /var/log/nginx/shaarli.error.log;
+
+        location ~ /\. {
+            # deny access to dotfiles
+            access_log off;
+            log_not_found off;
+            deny all;
+        }
+        
+        location ~ ~$ {
+            # deny access to temp editor files, e.g. "script.php~"
+            access_log off;
+            log_not_found off;
+            deny all;
+        }
+
+        location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
+            # cache static assets
+            expires    max;
+            add_header Pragma public;
+            add_header Cache-Control "public, must-revalidate, proxy-revalidate";
+        }
+
+        location ~ (index)\.php$ {
+            # filter and proxy PHP requests to PHP-FPM
+            fastcgi_pass   unix:/var/run/php5-fpm.sock;
+            fastcgi_index  index.php;
+            include        fastcgi.conf;
+        }
+
+        location ~ \.php$ {
+            # deny access to all other PHP scripts
+            deny all;
+        }
+    }
+}
diff --git a/docker/production/stable/supervised.conf b/docker/production/stable/supervised.conf
new file mode 100644
index 0000000..5acd979
--- /dev/null
+++ b/docker/production/stable/supervised.conf
@@ -0,0 +1,13 @@
+[program:php5-fpm]
+command=/usr/sbin/php5-fpm -F
+priority=5
+autostart=true
+autorestart=true
+
+[program:nginx]
+command=/usr/sbin/nginx
+priority=10
+autostart=true
+autorestart=true
+stdout_events_enabled=true
+stderr_events_enabled=true
diff --git a/docker/production/supervised.conf b/docker/production/supervised.conf
new file mode 100644
index 0000000..5acd979
--- /dev/null
+++ b/docker/production/supervised.conf
@@ -0,0 +1,13 @@
+[program:php5-fpm]
+command=/usr/sbin/php5-fpm -F
+priority=5
+autostart=true
+autorestart=true
+
+[program:nginx]
+command=/usr/sbin/nginx
+priority=10
+autostart=true
+autorestart=true
+stdout_events_enabled=true
+stderr_events_enabled=true

From 6a6aa2b96da86f100089c643e905aede5260c8c8 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Sun, 3 Jan 2016 14:42:43 +0100
Subject: [PATCH 240/658] Fixes #428: validate buttons presence instead of
 value

Also adds a validation where renaming with 'fromtag' specified and empty 'totag'.
It was causing a 404, now it just re-render the form.
---
 index.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/index.php b/index.php
index 40a6fbe..1a83ca4 100644
--- a/index.php
+++ b/index.php
@@ -1453,19 +1453,20 @@ function renderPage()
     // -------- User wants to rename a tag or delete it
     if ($targetPage == Router::$PAGE_CHANGETAG)
     {
-        if (empty($_POST['fromtag']))
-        {
-            $PAGE->assign('linkcount',count($LINKSDB));
-            $PAGE->assign('token',getToken());
+        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');
             exit;
         }
-        if (!tokenOk($_POST['token'])) die('Wrong token.');
+
+        if (!tokenOk($_POST['token'])) {
+            die('Wrong token.');
+        }
 
         // Delete a tag:
-        if (!empty($_POST['deletetag']) && !empty($_POST['fromtag']))
-        {
+        if (isset($_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)
@@ -1481,8 +1482,7 @@ function renderPage()
         }
 
         // Rename a tag:
-        if (!empty($_POST['renametag']) && !empty($_POST['fromtag']) && !empty($_POST['totag']))
-        {
+        if (isset($_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)

From 1be4afacf98e0124258199ec416dc1c4b4948305 Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Tue, 17 Nov 2015 21:01:11 +0100
Subject: [PATCH 241/658] PLUGIN Markdown

    Parse link description in Markdown (HTML) before rendering.

      * hard remove of Shaarli's HTML before parsing.
      * Using Parsedown  PHP lib.
      * Includes basic markdown CSS.
      * Style: removed 400px height max limit for shaares.
      * Unit tests.
---
 COPYING                              |    4 +
 application/Utils.php                |    8 -
 inc/shaarli.css                      |    1 -
 plugins/markdown/Parsedown.php       | 1528 ++++++++++++++++++++++++++
 plugins/markdown/README.md           |   51 +
 plugins/markdown/help.html           |    5 +
 plugins/markdown/markdown.css        |  137 +++
 plugins/markdown/markdown.meta       |    1 +
 plugins/markdown/markdown.php        |  158 +++
 tests/plugins/PluginMarkdownTest.php |  112 ++
 10 files changed, 1996 insertions(+), 9 deletions(-)
 create mode 100644 plugins/markdown/Parsedown.php
 create mode 100644 plugins/markdown/README.md
 create mode 100644 plugins/markdown/help.html
 create mode 100644 plugins/markdown/markdown.css
 create mode 100644 plugins/markdown/markdown.meta
 create mode 100644 plugins/markdown/markdown.php
 create mode 100644 tests/plugins/PluginMarkdownTest.php

diff --git a/COPYING b/COPYING
index 2292946..2893910 100644
--- a/COPYING
+++ b/COPYING
@@ -72,6 +72,10 @@ Files: plugins/wallabag/wallabag.png
 License: MIT License (http://opensource.org/licenses/MIT)
 Copyright: (C) 2015 Nicolas Lœuillet - https://github.com/wallabag/wallabag
 
+Files: plugins/markdown/Parsedown.php
+License: MIT License (http://opensource.org/licenses/MIT)
+Copyright: (C) 2015 Emanuil Rusev - https://github.com/erusev/parsedown
+
 ----------------------------------------------------
 ZLIB/LIBPNG LICENSE
 
diff --git a/application/Utils.php b/application/Utils.php
index f84f70e..ac8bfbf 100644
--- a/application/Utils.php
+++ b/application/Utils.php
@@ -43,14 +43,6 @@ function endsWith($haystack, $needle, $case=true)
     return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)), $needle) === 0);
 }
 
-/**
- * Same as nl2br(), but escapes < and >
- */
-function nl2br_escaped($html)
-{
-    return str_replace('>', '>', str_replace('<', '<', nl2br($html)));
-}
-
 /**
  * htmlspecialchars wrapper
  */
diff --git a/inc/shaarli.css b/inc/shaarli.css
index 451f048..79ba1d6 100644
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -467,7 +467,6 @@ h1 {
     margin-top: 0;
     margin-bottom: 12px;
     font-weight: normal;
-    max-height: 400px;
     overflow: auto;
 }
 
diff --git a/plugins/markdown/Parsedown.php b/plugins/markdown/Parsedown.php
new file mode 100644
index 0000000..91e05dc
--- /dev/null
+++ b/plugins/markdown/Parsedown.php
@@ -0,0 +1,1528 @@
+DefinitionData = array();
+
+        # standardize line breaks
+        $text = str_replace(array("\r\n", "\r"), "\n", $text);
+
+        # remove surrounding line breaks
+        $text = trim($text, "\n");
+
+        # split text into lines
+        $lines = explode("\n", $text);
+
+        # iterate through lines to identify blocks
+        $markup = $this->lines($lines);
+
+        # trim line breaks
+        $markup = trim($markup, "\n");
+
+        return $markup;
+    }
+
+    #
+    # Setters
+    #
+
+    function setBreaksEnabled($breaksEnabled)
+    {
+        $this->breaksEnabled = $breaksEnabled;
+
+        return $this;
+    }
+
+    protected $breaksEnabled;
+
+    function setMarkupEscaped($markupEscaped)
+    {
+        $this->markupEscaped = $markupEscaped;
+
+        return $this;
+    }
+
+    protected $markupEscaped;
+
+    function setUrlsLinked($urlsLinked)
+    {
+        $this->urlsLinked = $urlsLinked;
+
+        return $this;
+    }
+
+    protected $urlsLinked = true;
+
+    #
+    # Lines
+    #
+
+    protected $BlockTypes = array(
+        '#' => array('Header'),
+        '*' => array('Rule', 'List'),
+        '+' => array('List'),
+        '-' => array('SetextHeader', 'Table', 'Rule', 'List'),
+        '0' => array('List'),
+        '1' => array('List'),
+        '2' => array('List'),
+        '3' => array('List'),
+        '4' => array('List'),
+        '5' => array('List'),
+        '6' => array('List'),
+        '7' => array('List'),
+        '8' => array('List'),
+        '9' => array('List'),
+        ':' => array('Table'),
+        '<' => array('Comment', 'Markup'),
+        '=' => array('SetextHeader'),
+        '>' => array('Quote'),
+        '[' => array('Reference'),
+        '_' => array('Rule'),
+        '`' => array('FencedCode'),
+        '|' => array('Table'),
+        '~' => array('FencedCode'),
+    );
+
+    # ~
+
+    protected $unmarkedBlockTypes = array(
+        'Code',
+    );
+
+    #
+    # Blocks
+    #
+
+    private function lines(array $lines)
+    {
+        $CurrentBlock = null;
+
+        foreach ($lines as $line)
+        {
+            if (chop($line) === '')
+            {
+                if (isset($CurrentBlock))
+                {
+                    $CurrentBlock['interrupted'] = true;
+                }
+
+                continue;
+            }
+
+            if (strpos($line, "\t") !== false)
+            {
+                $parts = explode("\t", $line);
+
+                $line = $parts[0];
+
+                unset($parts[0]);
+
+                foreach ($parts as $part)
+                {
+                    $shortage = 4 - mb_strlen($line, 'utf-8') % 4;
+
+                    $line .= str_repeat(' ', $shortage);
+                    $line .= $part;
+                }
+            }
+
+            $indent = 0;
+
+            while (isset($line[$indent]) and $line[$indent] === ' ')
+            {
+                $indent ++;
+            }
+
+            $text = $indent > 0 ? substr($line, $indent) : $line;
+
+            # ~
+
+            $Line = array('body' => $line, 'indent' => $indent, 'text' => $text);
+
+            # ~
+
+            if (isset($CurrentBlock['continuable']))
+            {
+                $Block = $this->{'block'.$CurrentBlock['type'].'Continue'}($Line, $CurrentBlock);
+
+                if (isset($Block))
+                {
+                    $CurrentBlock = $Block;
+
+                    continue;
+                }
+                else
+                {
+                    if (method_exists($this, 'block'.$CurrentBlock['type'].'Complete'))
+                    {
+                        $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
+                    }
+                }
+            }
+
+            # ~
+
+            $marker = $text[0];
+
+            # ~
+
+            $blockTypes = $this->unmarkedBlockTypes;
+
+            if (isset($this->BlockTypes[$marker]))
+            {
+                foreach ($this->BlockTypes[$marker] as $blockType)
+                {
+                    $blockTypes []= $blockType;
+                }
+            }
+
+            #
+            # ~
+
+            foreach ($blockTypes as $blockType)
+            {
+                $Block = $this->{'block'.$blockType}($Line, $CurrentBlock);
+
+                if (isset($Block))
+                {
+                    $Block['type'] = $blockType;
+
+                    if ( ! isset($Block['identified']))
+                    {
+                        $Blocks []= $CurrentBlock;
+
+                        $Block['identified'] = true;
+                    }
+
+                    if (method_exists($this, 'block'.$blockType.'Continue'))
+                    {
+                        $Block['continuable'] = true;
+                    }
+
+                    $CurrentBlock = $Block;
+
+                    continue 2;
+                }
+            }
+
+            # ~
+
+            if (isset($CurrentBlock) and ! isset($CurrentBlock['type']) and ! isset($CurrentBlock['interrupted']))
+            {
+                $CurrentBlock['element']['text'] .= "\n".$text;
+            }
+            else
+            {
+                $Blocks []= $CurrentBlock;
+
+                $CurrentBlock = $this->paragraph($Line);
+
+                $CurrentBlock['identified'] = true;
+            }
+        }
+
+        # ~
+
+        if (isset($CurrentBlock['continuable']) and method_exists($this, 'block'.$CurrentBlock['type'].'Complete'))
+        {
+            $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
+        }
+
+        # ~
+
+        $Blocks []= $CurrentBlock;
+
+        unset($Blocks[0]);
+
+        # ~
+
+        $markup = '';
+
+        foreach ($Blocks as $Block)
+        {
+            if (isset($Block['hidden']))
+            {
+                continue;
+            }
+
+            $markup .= "\n";
+            $markup .= isset($Block['markup']) ? $Block['markup'] : $this->element($Block['element']);
+        }
+
+        $markup .= "\n";
+
+        # ~
+
+        return $markup;
+    }
+
+    #
+    # Code
+
+    protected function blockCode($Line, $Block = null)
+    {
+        if (isset($Block) and ! isset($Block['type']) and ! isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if ($Line['indent'] >= 4)
+        {
+            $text = substr($Line['body'], 4);
+
+            $Block = array(
+                'element' => array(
+                    'name' => 'pre',
+                    'handler' => 'element',
+                    'text' => array(
+                        'name' => 'code',
+                        'text' => $text,
+                    ),
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockCodeContinue($Line, $Block)
+    {
+        if ($Line['indent'] >= 4)
+        {
+            if (isset($Block['interrupted']))
+            {
+                $Block['element']['text']['text'] .= "\n";
+
+                unset($Block['interrupted']);
+            }
+
+            $Block['element']['text']['text'] .= "\n";
+
+            $text = substr($Line['body'], 4);
+
+            $Block['element']['text']['text'] .= $text;
+
+            return $Block;
+        }
+    }
+
+    protected function blockCodeComplete($Block)
+    {
+        $text = $Block['element']['text']['text'];
+
+        $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
+
+        $Block['element']['text']['text'] = $text;
+
+        return $Block;
+    }
+
+    #
+    # Comment
+
+    protected function blockComment($Line)
+    {
+        if ($this->markupEscaped)
+        {
+            return;
+        }
+
+        if (isset($Line['text'][3]) and $Line['text'][3] === '-' and $Line['text'][2] === '-' and $Line['text'][1] === '!')
+        {
+            $Block = array(
+                'markup' => $Line['body'],
+            );
+
+            if (preg_match('/-->$/', $Line['text']))
+            {
+                $Block['closed'] = true;
+            }
+
+            return $Block;
+        }
+    }
+
+    protected function blockCommentContinue($Line, array $Block)
+    {
+        if (isset($Block['closed']))
+        {
+            return;
+        }
+
+        $Block['markup'] .= "\n" . $Line['body'];
+
+        if (preg_match('/-->$/', $Line['text']))
+        {
+            $Block['closed'] = true;
+        }
+
+        return $Block;
+    }
+
+    #
+    # Fenced Code
+
+    protected function blockFencedCode($Line)
+    {
+        if (preg_match('/^['.$Line['text'][0].']{3,}[ ]*([\w-]+)?[ ]*$/', $Line['text'], $matches))
+        {
+            $Element = array(
+                'name' => 'code',
+                'text' => '',
+            );
+
+            if (isset($matches[1]))
+            {
+                $class = 'language-'.$matches[1];
+
+                $Element['attributes'] = array(
+                    'class' => $class,
+                );
+            }
+
+            $Block = array(
+                'char' => $Line['text'][0],
+                'element' => array(
+                    'name' => 'pre',
+                    'handler' => 'element',
+                    'text' => $Element,
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockFencedCodeContinue($Line, $Block)
+    {
+        if (isset($Block['complete']))
+        {
+            return;
+        }
+
+        if (isset($Block['interrupted']))
+        {
+            $Block['element']['text']['text'] .= "\n";
+
+            unset($Block['interrupted']);
+        }
+
+        if (preg_match('/^'.$Block['char'].'{3,}[ ]*$/', $Line['text']))
+        {
+            $Block['element']['text']['text'] = substr($Block['element']['text']['text'], 1);
+
+            $Block['complete'] = true;
+
+            return $Block;
+        }
+
+        $Block['element']['text']['text'] .= "\n".$Line['body'];;
+
+        return $Block;
+    }
+
+    protected function blockFencedCodeComplete($Block)
+    {
+        $text = $Block['element']['text']['text'];
+
+        $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
+
+        $Block['element']['text']['text'] = $text;
+
+        return $Block;
+    }
+
+    #
+    # Header
+
+    protected function blockHeader($Line)
+    {
+        if (isset($Line['text'][1]))
+        {
+            $level = 1;
+
+            while (isset($Line['text'][$level]) and $Line['text'][$level] === '#')
+            {
+                $level ++;
+            }
+
+            if ($level > 6)
+            {
+                return;
+            }
+
+            $text = trim($Line['text'], '# ');
+
+            $Block = array(
+                'element' => array(
+                    'name' => 'h' . min(6, $level),
+                    'text' => $text,
+                    'handler' => 'line',
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    #
+    # List
+
+    protected function blockList($Line)
+    {
+        list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]+[.]');
+
+        if (preg_match('/^('.$pattern.'[ ]+)(.*)/', $Line['text'], $matches))
+        {
+            $Block = array(
+                'indent' => $Line['indent'],
+                'pattern' => $pattern,
+                'element' => array(
+                    'name' => $name,
+                    'handler' => 'elements',
+                ),
+            );
+
+            $Block['li'] = array(
+                'name' => 'li',
+                'handler' => 'li',
+                'text' => array(
+                    $matches[2],
+                ),
+            );
+
+            $Block['element']['text'] []= & $Block['li'];
+
+            return $Block;
+        }
+    }
+
+    protected function blockListContinue($Line, array $Block)
+    {
+        if ($Block['indent'] === $Line['indent'] and preg_match('/^'.$Block['pattern'].'(?:[ ]+(.*)|$)/', $Line['text'], $matches))
+        {
+            if (isset($Block['interrupted']))
+            {
+                $Block['li']['text'] []= '';
+
+                unset($Block['interrupted']);
+            }
+
+            unset($Block['li']);
+
+            $text = isset($matches[1]) ? $matches[1] : '';
+
+            $Block['li'] = array(
+                'name' => 'li',
+                'handler' => 'li',
+                'text' => array(
+                    $text,
+                ),
+            );
+
+            $Block['element']['text'] []= & $Block['li'];
+
+            return $Block;
+        }
+
+        if ($Line['text'][0] === '[' and $this->blockReference($Line))
+        {
+            return $Block;
+        }
+
+        if ( ! isset($Block['interrupted']))
+        {
+            $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
+
+            $Block['li']['text'] []= $text;
+
+            return $Block;
+        }
+
+        if ($Line['indent'] > 0)
+        {
+            $Block['li']['text'] []= '';
+
+            $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
+
+            $Block['li']['text'] []= $text;
+
+            unset($Block['interrupted']);
+
+            return $Block;
+        }
+    }
+
+    #
+    # Quote
+
+    protected function blockQuote($Line)
+    {
+        if (preg_match('/^>[ ]?(.*)/', $Line['text'], $matches))
+        {
+            $Block = array(
+                'element' => array(
+                    'name' => 'blockquote',
+                    'handler' => 'lines',
+                    'text' => (array) $matches[1],
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockQuoteContinue($Line, array $Block)
+    {
+        if ($Line['text'][0] === '>' and preg_match('/^>[ ]?(.*)/', $Line['text'], $matches))
+        {
+            if (isset($Block['interrupted']))
+            {
+                $Block['element']['text'] []= '';
+
+                unset($Block['interrupted']);
+            }
+
+            $Block['element']['text'] []= $matches[1];
+
+            return $Block;
+        }
+
+        if ( ! isset($Block['interrupted']))
+        {
+            $Block['element']['text'] []= $Line['text'];
+
+            return $Block;
+        }
+    }
+
+    #
+    # Rule
+
+    protected function blockRule($Line)
+    {
+        if (preg_match('/^(['.$Line['text'][0].'])([ ]*\1){2,}[ ]*$/', $Line['text']))
+        {
+            $Block = array(
+                'element' => array(
+                    'name' => 'hr'
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    #
+    # Setext
+
+    protected function blockSetextHeader($Line, array $Block = null)
+    {
+        if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if (chop($Line['text'], $Line['text'][0]) === '')
+        {
+            $Block['element']['name'] = $Line['text'][0] === '=' ? 'h1' : 'h2';
+
+            return $Block;
+        }
+    }
+
+    #
+    # Markup
+
+    protected function blockMarkup($Line)
+    {
+        if ($this->markupEscaped)
+        {
+            return;
+        }
+
+        if (preg_match('/^<(\w*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches))
+        {
+            $element = strtolower($matches[1]);
+
+            if (in_array($element, $this->textLevelElements))
+            {
+                return;
+            }
+
+            $Block = array(
+                'name' => $matches[1],
+                'depth' => 0,
+                'markup' => $Line['text'],
+            );
+
+            $length = strlen($matches[0]);
+
+            $remainder = substr($Line['text'], $length);
+
+            if (trim($remainder) === '')
+            {
+                if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
+                {
+                    $Block['closed'] = true;
+
+                    $Block['void'] = true;
+                }
+            }
+            else
+            {
+                if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
+                {
+                    return;
+                }
+
+                if (preg_match('/<\/'.$matches[1].'>[ ]*$/i', $remainder))
+                {
+                    $Block['closed'] = true;
+                }
+            }
+
+            return $Block;
+        }
+    }
+
+    protected function blockMarkupContinue($Line, array $Block)
+    {
+        if (isset($Block['closed']))
+        {
+            return;
+        }
+
+        if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) # open
+        {
+            $Block['depth'] ++;
+        }
+
+        if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close
+        {
+            if ($Block['depth'] > 0)
+            {
+                $Block['depth'] --;
+            }
+            else
+            {
+                $Block['closed'] = true;
+            }
+        }
+
+        if (isset($Block['interrupted']))
+        {
+            $Block['markup'] .= "\n";
+
+            unset($Block['interrupted']);
+        }
+
+        $Block['markup'] .= "\n".$Line['body'];
+
+        return $Block;
+    }
+
+    #
+    # Reference
+
+    protected function blockReference($Line)
+    {
+        if (preg_match('/^\[(.+?)\]:[ ]*?(?:[ ]+["\'(](.+)["\')])?[ ]*$/', $Line['text'], $matches))
+        {
+            $id = strtolower($matches[1]);
+
+            $Data = array(
+                'url' => $matches[2],
+                'title' => null,
+            );
+
+            if (isset($matches[3]))
+            {
+                $Data['title'] = $matches[3];
+            }
+
+            $this->DefinitionData['Reference'][$id] = $Data;
+
+            $Block = array(
+                'hidden' => true,
+            );
+
+            return $Block;
+        }
+    }
+
+    #
+    # Table
+
+    protected function blockTable($Line, array $Block = null)
+    {
+        if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if (strpos($Block['element']['text'], '|') !== false and chop($Line['text'], ' -:|') === '')
+        {
+            $alignments = array();
+
+            $divider = $Line['text'];
+
+            $divider = trim($divider);
+            $divider = trim($divider, '|');
+
+            $dividerCells = explode('|', $divider);
+
+            foreach ($dividerCells as $dividerCell)
+            {
+                $dividerCell = trim($dividerCell);
+
+                if ($dividerCell === '')
+                {
+                    continue;
+                }
+
+                $alignment = null;
+
+                if ($dividerCell[0] === ':')
+                {
+                    $alignment = 'left';
+                }
+
+                if (substr($dividerCell, - 1) === ':')
+                {
+                    $alignment = $alignment === 'left' ? 'center' : 'right';
+                }
+
+                $alignments []= $alignment;
+            }
+
+            # ~
+
+            $HeaderElements = array();
+
+            $header = $Block['element']['text'];
+
+            $header = trim($header);
+            $header = trim($header, '|');
+
+            $headerCells = explode('|', $header);
+
+            foreach ($headerCells as $index => $headerCell)
+            {
+                $headerCell = trim($headerCell);
+
+                $HeaderElement = array(
+                    'name' => 'th',
+                    'text' => $headerCell,
+                    'handler' => 'line',
+                );
+
+                if (isset($alignments[$index]))
+                {
+                    $alignment = $alignments[$index];
+
+                    $HeaderElement['attributes'] = array(
+                        'style' => 'text-align: '.$alignment.';',
+                    );
+                }
+
+                $HeaderElements []= $HeaderElement;
+            }
+
+            # ~
+
+            $Block = array(
+                'alignments' => $alignments,
+                'identified' => true,
+                'element' => array(
+                    'name' => 'table',
+                    'handler' => 'elements',
+                ),
+            );
+
+            $Block['element']['text'] []= array(
+                'name' => 'thead',
+                'handler' => 'elements',
+            );
+
+            $Block['element']['text'] []= array(
+                'name' => 'tbody',
+                'handler' => 'elements',
+                'text' => array(),
+            );
+
+            $Block['element']['text'][0]['text'] []= array(
+                'name' => 'tr',
+                'handler' => 'elements',
+                'text' => $HeaderElements,
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockTableContinue($Line, array $Block)
+    {
+        if (isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if ($Line['text'][0] === '|' or strpos($Line['text'], '|'))
+        {
+            $Elements = array();
+
+            $row = $Line['text'];
+
+            $row = trim($row);
+            $row = trim($row, '|');
+
+            preg_match_all('/(?:(\\\\[|])|[^|`]|`[^`]+`|`)+/', $row, $matches);
+
+            foreach ($matches[0] as $index => $cell)
+            {
+                $cell = trim($cell);
+
+                $Element = array(
+                    'name' => 'td',
+                    'handler' => 'line',
+                    'text' => $cell,
+                );
+
+                if (isset($Block['alignments'][$index]))
+                {
+                    $Element['attributes'] = array(
+                        'style' => 'text-align: '.$Block['alignments'][$index].';',
+                    );
+                }
+
+                $Elements []= $Element;
+            }
+
+            $Element = array(
+                'name' => 'tr',
+                'handler' => 'elements',
+                'text' => $Elements,
+            );
+
+            $Block['element']['text'][1]['text'] []= $Element;
+
+            return $Block;
+        }
+    }
+
+    #
+    # ~
+    #
+
+    protected function paragraph($Line)
+    {
+        $Block = array(
+            'element' => array(
+                'name' => 'p',
+                'text' => $Line['text'],
+                'handler' => 'line',
+            ),
+        );
+
+        return $Block;
+    }
+
+    #
+    # Inline Elements
+    #
+
+    protected $InlineTypes = array(
+        '"' => array('SpecialCharacter'),
+        '!' => array('Image'),
+        '&' => array('SpecialCharacter'),
+        '*' => array('Emphasis'),
+        ':' => array('Url'),
+        '<' => array('UrlTag', 'EmailTag', 'Markup', 'SpecialCharacter'),
+        '>' => array('SpecialCharacter'),
+        '[' => array('Link'),
+        '_' => array('Emphasis'),
+        '`' => array('Code'),
+        '~' => array('Strikethrough'),
+        '\\' => array('EscapeSequence'),
+    );
+
+    # ~
+
+    protected $inlineMarkerList = '!"*_&[:<>`~\\';
+
+    #
+    # ~
+    #
+
+    public function line($text)
+    {
+        $markup = '';
+
+        # $excerpt is based on the first occurrence of a marker
+
+        while ($excerpt = strpbrk($text, $this->inlineMarkerList))
+        {
+            $marker = $excerpt[0];
+
+            $markerPosition = strpos($text, $marker);
+
+            $Excerpt = array('text' => $excerpt, 'context' => $text);
+
+            foreach ($this->InlineTypes[$marker] as $inlineType)
+            {
+                $Inline = $this->{'inline'.$inlineType}($Excerpt);
+
+                if ( ! isset($Inline))
+                {
+                    continue;
+                }
+
+                # makes sure that the inline belongs to "our" marker
+
+                if (isset($Inline['position']) and $Inline['position'] > $markerPosition)
+                {
+                    continue;
+                }
+
+                # sets a default inline position
+
+                if ( ! isset($Inline['position']))
+                {
+                    $Inline['position'] = $markerPosition;
+                }
+
+                # the text that comes before the inline
+                $unmarkedText = substr($text, 0, $Inline['position']);
+
+                # compile the unmarked text
+                $markup .= $this->unmarkedText($unmarkedText);
+
+                # compile the inline
+                $markup .= isset($Inline['markup']) ? $Inline['markup'] : $this->element($Inline['element']);
+
+                # remove the examined text
+                $text = substr($text, $Inline['position'] + $Inline['extent']);
+
+                continue 2;
+            }
+
+            # the marker does not belong to an inline
+
+            $unmarkedText = substr($text, 0, $markerPosition + 1);
+
+            $markup .= $this->unmarkedText($unmarkedText);
+
+            $text = substr($text, $markerPosition + 1);
+        }
+
+        $markup .= $this->unmarkedText($text);
+
+        return $markup;
+    }
+
+    #
+    # ~
+    #
+
+    protected function inlineCode($Excerpt)
+    {
+        $marker = $Excerpt['text'][0];
+
+        if (preg_match('/^('.$marker.'+)[ ]*(.+?)[ ]*(? strlen($matches[0]),
+                'element' => array(
+                    'name' => 'code',
+                    'text' => $text,
+                ),
+            );
+        }
+    }
+
+    protected function inlineEmailTag($Excerpt)
+    {
+        if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<((mailto:)?\S+?@\S+?)>/i', $Excerpt['text'], $matches))
+        {
+            $url = $matches[1];
+
+            if ( ! isset($matches[2]))
+            {
+                $url = 'mailto:' . $url;
+            }
+
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'a',
+                    'text' => $matches[1],
+                    'attributes' => array(
+                        'href' => $url,
+                    ),
+                ),
+            );
+        }
+    }
+
+    protected function inlineEmphasis($Excerpt)
+    {
+        if ( ! isset($Excerpt['text'][1]))
+        {
+            return;
+        }
+
+        $marker = $Excerpt['text'][0];
+
+        if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
+        {
+            $emphasis = 'strong';
+        }
+        elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
+        {
+            $emphasis = 'em';
+        }
+        else
+        {
+            return;
+        }
+
+        return array(
+            'extent' => strlen($matches[0]),
+            'element' => array(
+                'name' => $emphasis,
+                'handler' => 'line',
+                'text' => $matches[1],
+            ),
+        );
+    }
+
+    protected function inlineEscapeSequence($Excerpt)
+    {
+        if (isset($Excerpt['text'][1]) and in_array($Excerpt['text'][1], $this->specialCharacters))
+        {
+            return array(
+                'markup' => $Excerpt['text'][1],
+                'extent' => 2,
+            );
+        }
+    }
+
+    protected function inlineImage($Excerpt)
+    {
+        if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
+        {
+            return;
+        }
+
+        $Excerpt['text']= substr($Excerpt['text'], 1);
+
+        $Link = $this->inlineLink($Excerpt);
+
+        if ($Link === null)
+        {
+            return;
+        }
+
+        $Inline = array(
+            'extent' => $Link['extent'] + 1,
+            'element' => array(
+                'name' => 'img',
+                'attributes' => array(
+                    'src' => $Link['element']['attributes']['href'],
+                    'alt' => $Link['element']['text'],
+                ),
+            ),
+        );
+
+        $Inline['element']['attributes'] += $Link['element']['attributes'];
+
+        unset($Inline['element']['attributes']['href']);
+
+        return $Inline;
+    }
+
+    protected function inlineLink($Excerpt)
+    {
+        $Element = array(
+            'name' => 'a',
+            'handler' => 'line',
+            'text' => null,
+            'attributes' => array(
+                'href' => null,
+                'title' => null,
+            ),
+        );
+
+        $extent = 0;
+
+        $remainder = $Excerpt['text'];
+
+        if (preg_match('/\[((?:[^][]|(?R))*)\]/', $remainder, $matches))
+        {
+            $Element['text'] = $matches[1];
+
+            $extent += strlen($matches[0]);
+
+            $remainder = substr($remainder, $extent);
+        }
+        else
+        {
+            return;
+        }
+
+        if (preg_match('/^[(]((?:[^ ()]|[(][^ )]+[)])+)(?:[ ]+("[^"]*"|\'[^\']*\'))?[)]/', $remainder, $matches))
+        {
+            $Element['attributes']['href'] = $matches[1];
+
+            if (isset($matches[2]))
+            {
+                $Element['attributes']['title'] = substr($matches[2], 1, - 1);
+            }
+
+            $extent += strlen($matches[0]);
+        }
+        else
+        {
+            if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches))
+            {
+                $definition = strlen($matches[1]) ? $matches[1] : $Element['text'];
+                $definition = strtolower($definition);
+
+                $extent += strlen($matches[0]);
+            }
+            else
+            {
+                $definition = strtolower($Element['text']);
+            }
+
+            if ( ! isset($this->DefinitionData['Reference'][$definition]))
+            {
+                return;
+            }
+
+            $Definition = $this->DefinitionData['Reference'][$definition];
+
+            $Element['attributes']['href'] = $Definition['url'];
+            $Element['attributes']['title'] = $Definition['title'];
+        }
+
+        $Element['attributes']['href'] = str_replace(array('&', '<'), array('&', '<'), $Element['attributes']['href']);
+
+        return array(
+            'extent' => $extent,
+            'element' => $Element,
+        );
+    }
+
+    protected function inlineMarkup($Excerpt)
+    {
+        if ($this->markupEscaped or strpos($Excerpt['text'], '>') === false)
+        {
+            return;
+        }
+
+        if ($Excerpt['text'][1] === '/' and preg_match('/^<\/\w*[ ]*>/s', $Excerpt['text'], $matches))
+        {
+            return array(
+                'markup' => $matches[0],
+                'extent' => strlen($matches[0]),
+            );
+        }
+
+        if ($Excerpt['text'][1] === '!' and preg_match('/^/s', $Excerpt['text'], $matches))
+        {
+            return array(
+                'markup' => $matches[0],
+                'extent' => strlen($matches[0]),
+            );
+        }
+
+        if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w*(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*\/?>/s', $Excerpt['text'], $matches))
+        {
+            return array(
+                'markup' => $matches[0],
+                'extent' => strlen($matches[0]),
+            );
+        }
+    }
+
+    protected function inlineSpecialCharacter($Excerpt)
+    {
+        if ($Excerpt['text'][0] === '&' and ! preg_match('/^&#?\w+;/', $Excerpt['text']))
+        {
+            return array(
+                'markup' => '&',
+                'extent' => 1,
+            );
+        }
+
+        $SpecialCharacter = array('>' => 'gt', '<' => 'lt', '"' => 'quot');
+
+        if (isset($SpecialCharacter[$Excerpt['text'][0]]))
+        {
+            return array(
+                'markup' => '&'.$SpecialCharacter[$Excerpt['text'][0]].';',
+                'extent' => 1,
+            );
+        }
+    }
+
+    protected function inlineStrikethrough($Excerpt)
+    {
+        if ( ! isset($Excerpt['text'][1]))
+        {
+            return;
+        }
+
+        if ($Excerpt['text'][1] === '~' and preg_match('/^~~(?=\S)(.+?)(?<=\S)~~/', $Excerpt['text'], $matches))
+        {
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'del',
+                    'text' => $matches[1],
+                    'handler' => 'line',
+                ),
+            );
+        }
+    }
+
+    protected function inlineUrl($Excerpt)
+    {
+        if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
+        {
+            return;
+        }
+
+        if (preg_match('/\bhttps?:[\/]{2}[^\s<]+\b\/*/ui', $Excerpt['context'], $matches, PREG_OFFSET_CAPTURE))
+        {
+            $Inline = array(
+                'extent' => strlen($matches[0][0]),
+                'position' => $matches[0][1],
+                'element' => array(
+                    'name' => 'a',
+                    'text' => $matches[0][0],
+                    'attributes' => array(
+                        'href' => $matches[0][0],
+                    ),
+                ),
+            );
+
+            return $Inline;
+        }
+    }
+
+    protected function inlineUrlTag($Excerpt)
+    {
+        if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<(\w+:\/{2}[^ >]+)>/i', $Excerpt['text'], $matches))
+        {
+            $url = str_replace(array('&', '<'), array('&', '<'), $matches[1]);
+
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'a',
+                    'text' => $url,
+                    'attributes' => array(
+                        'href' => $url,
+                    ),
+                ),
+            );
+        }
+    }
+
+    # ~
+
+    protected function unmarkedText($text)
+    {
+        if ($this->breaksEnabled)
+        {
+            $text = preg_replace('/[ ]*\n/', "
                                                                \n", $text);
+        }
+        else
+        {
+            $text = preg_replace('/(?:[ ][ ]+|[ ]*\\\\)\n/', "
                                                                \n", $text);
+            $text = str_replace(" \n", "\n", $text);
+        }
+
+        return $text;
+    }
+
+    #
+    # Handlers
+    #
+
+    protected function element(array $Element)
+    {
+        $markup = '<'.$Element['name'];
+
+        if (isset($Element['attributes']))
+        {
+            foreach ($Element['attributes'] as $name => $value)
+            {
+                if ($value === null)
+                {
+                    continue;
+                }
+
+                $markup .= ' '.$name.'="'.$value.'"';
+            }
+        }
+
+        if (isset($Element['text']))
+        {
+            $markup .= '>';
+
+            if (isset($Element['handler']))
+            {
+                $markup .= $this->{$Element['handler']}($Element['text']);
+            }
+            else
+            {
+                $markup .= $Element['text'];
+            }
+
+            $markup .= '';
+        }
+        else
+        {
+            $markup .= ' />';
+        }
+
+        return $markup;
+    }
+
+    protected function elements(array $Elements)
+    {
+        $markup = '';
+
+        foreach ($Elements as $Element)
+        {
+            $markup .= "\n" . $this->element($Element);
+        }
+
+        $markup .= "\n";
+
+        return $markup;
+    }
+
+    # ~
+
+    protected function li($lines)
+    {
+        $markup = $this->lines($lines);
+
+        $trimmedMarkup = trim($markup);
+
+        if ( ! in_array('', $lines) and substr($trimmedMarkup, 0, 3) === '
                                                                ')
+        {
+            $markup = $trimmedMarkup;
+            $markup = substr($markup, 3);
+
+            $position = strpos($markup, "
                                                                ");
+
+            $markup = substr_replace($markup, '', $position, 4);
+        }
+
+        return $markup;
+    }
+
+    #
+    # Deprecated Methods
+    #
+
+    function parse($text)
+    {
+        $markup = $this->text($text);
+
+        return $markup;
+    }
+
+    #
+    # Static Methods
+    #
+
+    static function instance($name = 'default')
+    {
+        if (isset(self::$instances[$name]))
+        {
+            return self::$instances[$name];
+        }
+
+        $instance = new static();
+
+        self::$instances[$name] = $instance;
+
+        return $instance;
+    }
+
+    private static $instances = array();
+
+    #
+    # Fields
+    #
+
+    protected $DefinitionData;
+
+    #
+    # Read-Only
+
+    protected $specialCharacters = array(
+        '\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!', '|',
+    );
+
+    protected $StrongRegex = array(
+        '*' => '/^[*]{2}((?:\\\\\*|[^*]|[*][^*]*[*])+?)[*]{2}(?![*])/s',
+        '_' => '/^__((?:\\\\_|[^_]|_[^_]*_)+?)__(?!_)/us',
+    );
+
+    protected $EmRegex = array(
+        '*' => '/^[*]((?:\\\\\*|[^*]|[*][*][^*]+?[*][*])+?)[*](?![*])/s',
+        '_' => '/^_((?:\\\\_|[^_]|__[^_]*__)+?)_(?!_)\b/us',
+    );
+
+    protected $regexHtmlAttribute = '[a-zA-Z_:][\w:.-]*(?:\s*=\s*(?:[^"\'=<>`\s]+|"[^"]*"|\'[^\']*\'))?';
+
+    protected $voidElements = array(
+        'area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source',
+    );
+
+    protected $textLevelElements = array(
+        'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont',
+        'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing',
+        'i', 'rp', 'del', 'code',          'strike', 'marquee',
+        'q', 'rt', 'ins', 'font',          'strong',
+        's', 'tt', 'sub', 'mark',
+        'u', 'xm', 'sup', 'nobr',
+        'var', 'ruby',
+        'wbr', 'span',
+        'time',
+    );
+}
\ No newline at end of file
diff --git a/plugins/markdown/README.md b/plugins/markdown/README.md
new file mode 100644
index 0000000..22d0af3
--- /dev/null
+++ b/plugins/markdown/README.md
@@ -0,0 +1,51 @@
+## Markdown Shaarli plugin
+
+Convert all your shaares description to HTML formatted Markdown.
+
+Read more about Markdown syntax here.
+
+### Installation
+
+Clone this repository inside your `tpl/plugins/` directory, or download the archive and unpack it there.
+The directory structure should look like:
+
+```
+??? plugins
+  ??? markdown
+        ??? help.html
+        ??? markdown.css
+        ??? markdown.meta
+        ??? markdown.php
+        ??? Parsedown.php
+      ??? README.md
+```
+
+To enable the plugin, add `markdown` to your list of enabled plugins in `data/config.php`
+(`ENABLED_PLUGINS` array).
+
+This should look like:
+
+```
+$GLOBALS['config']['ENABLED_PLUGINS'] = array('qrcode', 'any_other_plugin', 'markdown')
+```
+
+### Known issue
+
+#### Redirector
+
+If you're using a redirector, you *need* to add a space after a link,
+otherwise the rest of the line will be `urlencode`.
+
+```
+[link](http://domain.tld)-->test
+```
+
+Will consider `http://domain.tld)-->test` as URL.
+
+Instead, add an additional space.
+
+```
+[link](http://domain.tld) -->test
+```
+
+> Won't fix because a `)` is a valid part of an URL.
diff --git a/plugins/markdown/help.html b/plugins/markdown/help.html
new file mode 100644
index 0000000..a679783
--- /dev/null
+++ b/plugins/markdown/help.html
@@ -0,0 +1,5 @@
+
                                                                
+    Description will be rendered with
+    
+        Markdown syntax.
+
                                                                
diff --git a/plugins/markdown/markdown.css b/plugins/markdown/markdown.css
new file mode 100644
index 0000000..6d666dc
--- /dev/null
+++ b/plugins/markdown/markdown.css
@@ -0,0 +1,137 @@
+/**
+ * Credit to Simon Laroche 
+ * whom created the CSS which this file is based on.
+ * License: Unlicense 
+ */
+
+.markdown p{
+    margin:0.75em 0;
+}
+
+.markdown img{
+    max-width:100%;
+}
+
+.markdown h1, .markdown h2, .markdown h3, .markdown h4, .markdown h5, .markdown h6{
+    font-weight:normal;
+    font-style:normal;
+    line-height:1em;
+    margin:0.75em 0;
+}
+.markdown h4, .markdown h5, .markdown h6{ font-weight: bold; }
+.markdown h1{ font-size:2.5em; }
+.markdown h2{ font-size:2em; }
+.markdown h3{ font-size:1.5em; }
+.markdown h4{ font-size:1.2em; }
+.markdown h5{ font-size:1em; }
+.markdown h6{ font-size:0.9em; }
+
+.markdown blockquote{
+    color:#666666;
+    padding-left: 3em;
+    border-left: 0.5em #EEE solid;
+    margin:0.75em 0;
+}
+.markdown hr { display: block; height: 2px; border: 0; border-top: 1px solid #aaa;border-bottom: 1px solid #eee; margin: 1em 0; padding: 0; }
+.markdown pre, .markdown code, .markdown kbd, .markdown samp {
+    font-family: monospace, 'courier new';
+    font-size: 0.98em;
+}
+.markdown pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; }
+
+.markdown b, .markdown strong { font-weight: bold; }
+
+.markdown dfn, .markdown em { font-style: italic; }
+
+.markdown ins { background: #ff9; color: #000; text-decoration: none; }
+
+.markdown mark { background: #ff0; color: #000; font-style: italic; font-weight: bold; }
+
+.markdown sub, .markdown sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
+.markdown sup { top: -0.5em; }
+.markdown sub { bottom: -0.25em; }
+
+.markdown ul, .markdown ol { margin: 1em 0; padding: 0 0 0 2em; }
+.markdown li p:last-child { margin:0 }
+.markdown dd { margin: 0 0 0 2em; }
+
+.markdown img { border: 0; -ms-interpolation-mode: bicubic; vertical-align: middle; }
+
+.markdown table { border-collapse: collapse; border-spacing: 0; }
+.markdown td { vertical-align: top; }
+
+@media only screen and (min-width: 480px) {
+    .markdown {font-size:0.9em;}
+}
+
+@media only screen and (min-width: 768px) {
+    .markdown {font-size:1em;}
+}
+
+#linklist .markdown li {
+    padding: 0;
+    border: none;
+    background: none;
+}
+
+#linklist .markdown ul li {
+    list-style: circle;
+}
+
+#linklist .markdown ol li {
+    list-style: decimal;
+}
+
+.markdown table {
+    padding: 0;
+}
+.markdown table tr {
+    border-top: 1px solid #cccccc;
+    background-color: white;
+    margin: 0;
+    padding: 0;
+}
+.markdown table tr:nth-child(2n) {
+    background-color: #f8f8f8;
+}
+.markdown table tr th {
+    font-weight: bold;
+    border: 1px solid #cccccc;
+    text-align: left;
+    margin: 0;
+    padding: 6px 13px;
+}
+.markdown table tr td {
+    border: 1px solid #cccccc;
+    text-align: left;
+    margin: 0;
+    padding: 6px 13px;
+}
+.markdown table tr th :first-child, .markdown  table tr td :first-child {
+    margin-top: 0;
+}
+.markdown table tr th :last-child, table tr td :last-child {
+    margin-bottom: 0;
+}
+
+.md_help {
+    color: white;
+}
+
+/*
+ Remove header links style
+ */
+#pageheader .md_help a {
+    color: lightgray;
+    font-weight: bold;
+    text-decoration: underline;
+
+    background: none;
+    box-shadow: none;
+    padding: 0;
+    margin: 0;
+}
+
+#pageheader .md_help a:hover {
+    color: white;
+}
diff --git a/plugins/markdown/markdown.meta b/plugins/markdown/markdown.meta
new file mode 100644
index 0000000..af8c0db
--- /dev/null
+++ b/plugins/markdown/markdown.meta
@@ -0,0 +1 @@
+description="Render shaare description with Markdown syntax."
diff --git a/plugins/markdown/markdown.php b/plugins/markdown/markdown.php
new file mode 100644
index 0000000..3630ef1
--- /dev/null
+++ b/plugins/markdown/markdown.php
@@ -0,0 +1,158 @@
+[^ ]+!m', '$1', $description);
+}
+
+/**
+ * Remove 
                                                                 tag to let markdown handle it.
+ *
+ * @param string $description input description text.
+ *
+ * @return string $description without 
                                                                 tags.
+ */
+function reverse_nl2br($description)
+{
+    return preg_replace('!
                                                                !im', '', $description);
+}
+
+/**
+ * Remove HTML spaces ' ' auto generated by Shaarli core system.
+ *
+ * @param string $description input description text.
+ *
+ * @return string $description without HTML links.
+ */
+function reverse_space2nbsp($description)
+{
+    return preg_replace('/(^| ) /m', '$1 ', $description);
+}
+
+/**
+ * Remove '>' at start of line auto generated by Shaarli core system
+ * to allow markdown blockquotes.
+ *
+ * @param string $description input description text.
+ *
+ * @return string $description without HTML links.
+ */
+function reset_quote_tags($description)
+{
+    return preg_replace('/^( *)> /m', '$1> ', $description);
+}
+
+/**
+ * Render shaare contents through Markdown parser.
+ *   1. Remove HTML generated by Shaarli core.
+ *   2. Generate markdown descriptions.
+ *   3. Wrap description in 'markdown' CSS class.
+ *
+ * @param string $description input description text.
+ *
+ * @return string HTML processed $description.
+ */
+function process_markdown($description)
+{
+    $parsedown = new Parsedown();
+
+    $processedDescription = $description;
+    $processedDescription = reverse_text2clickable($processedDescription);
+    $processedDescription = reverse_nl2br($processedDescription);
+    $processedDescription = reverse_space2nbsp($processedDescription);
+    $processedDescription = reset_quote_tags($processedDescription);
+    $processedDescription = $parsedown
+        ->setMarkupEscaped(false)
+        ->setBreaksEnabled(true)
+        ->text($processedDescription);
+    $processedDescription = '
                                                                '. $processedDescription . '
                                                                ';
+
+    return $processedDescription;
+}
diff --git a/tests/plugins/PluginMarkdownTest.php b/tests/plugins/PluginMarkdownTest.php
new file mode 100644
index 0000000..455f5ba
--- /dev/null
+++ b/tests/plugins/PluginMarkdownTest.php
@@ -0,0 +1,112 @@
+ array(
+                0 => array(
+                    'description' => $markdown,
+                ),
+            ),
+        );
+
+        $data = hook_markdown_render_linklist($data);
+        $this->assertNotFalse(strpos($data['links'][0]['description'], '
                                                                '));
+        $this->assertNotFalse(strpos($data['links'][0]['description'], '
                                                                '));
+    }
+
+    /**
+     * Test render_daily hook.
+     * Only check that there is basic markdown rendering.
+     */
+    function testMarkdownDaily()
+    {
+        $markdown = '# My title' . PHP_EOL . 'Very interesting content.';
+        $data = array(
+            // Columns data
+            'cols' => array(
+                // First, second, third.
+                0 => array(
+                    // nth link
+                    0 => array(
+                        'formatedDescription' => $markdown,
+                    ),
+                ),
+            ),
+        );
+
+        $data = hook_markdown_render_daily($data);
+        $this->assertNotFalse(strpos($data['cols'][0][0]['formatedDescription'], '
                                                                '));
+        $this->assertNotFalse(strpos($data['cols'][0][0]['formatedDescription'], '
                                                                '));
+    }
+
+    /**
+     * Test reverse_text2clickable().
+     */
+    function testReverseText2clickable()
+    {
+        $text = 'stuff http://hello.there/is=someone#here otherstuff';
+        $clickableText = text2clickable($text, '');
+        $reversedText = reverse_text2clickable($clickableText);
+        $this->assertEquals($text, $reversedText);
+    }
+
+    /**
+     * Test reverse_nl2br().
+     */
+    function testReverseNl2br()
+    {
+        $text = 'stuff' . PHP_EOL . 'otherstuff';
+        $processedText = nl2br($text);
+        $reversedText = reverse_nl2br($processedText);
+        $this->assertEquals($text, $reversedText);
+    }
+
+    /**
+     * Test reverse_space2nbsp().
+     */
+    function testReverseSpace2nbsp()
+    {
+        $text = ' stuff' . PHP_EOL . '  otherstuff  and another';
+        $processedText = space2nbsp($text);
+        $reversedText = reverse_space2nbsp($processedText);
+        $this->assertEquals($text, $reversedText);
+    }
+
+    /**
+     * Test reset_quote_tags()
+     */
+    function testResetQuoteTags()
+    {
+        $text = '> quote1'. PHP_EOL . ' > quote2 ' . PHP_EOL . 'noquote';
+        $processedText = escape($text);
+        $reversedText = reset_quote_tags($processedText);
+        $this->assertEquals($text, $reversedText);
+    }
+}

From 822bffced8212e7f34bcb2ad063b31a78bd57bdb Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Sun, 27 Dec 2015 10:08:20 +0100
Subject: [PATCH 242/658] Link filter refactoring

  * introduce class LinkFilter to handle link filter operation (and lighten LinkDB).
  * handle 'private only' in filtering.
  * update template to prefill search fields with current search terms.
  * coding style.
  * unit test (mostly move from LinkDB to LinkFilter).

PS: preparation for #358 #315 and 'AND' search.
---
 application/LinkDB.php          | 120 ++-------------
 application/LinkFilter.php      | 259 ++++++++++++++++++++++++++++++++
 application/Utils.php           |  12 +-
 index.php                       | 200 +++++++++++++-----------
 tests/LinkDBTest.php            | 235 +++--------------------------
 tests/LinkFilterTest.php        | 242 +++++++++++++++++++++++++++++
 tests/utils/ReferenceLinkDB.php |   5 +
 tpl/linklist.html               |  17 ++-
 8 files changed, 676 insertions(+), 414 deletions(-)
 create mode 100644 application/LinkFilter.php
 create mode 100644 tests/LinkFilterTest.php

diff --git a/application/LinkDB.php b/application/LinkDB.php
index 51fa926..be7d901 100644
--- a/application/LinkDB.php
+++ b/application/LinkDB.php
@@ -62,6 +62,11 @@ class LinkDB implements Iterator, Countable, ArrayAccess
     // link redirector set in user settings.
     private $_redirector;
 
+    /**
+     * @var LinkFilter instance.
+     */
+    private $linkFilter;
+
     /**
      * Creates a new LinkDB
      *
@@ -80,6 +85,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
         $this->_redirector = $redirector;
         $this->_checkDB();
         $this->_readDB();
+        $this->linkFilter = new LinkFilter($this->_links);
     }
 
     /**
@@ -334,114 +340,18 @@ You use the community supported version of the original Shaarli project, by Seba
     }
 
     /**
-     * Returns the list of links corresponding to a full-text search
+     * Filter links.
      *
-     * Searches:
-     *  - in the URLs, title and description;
-     *  - are case-insensitive.
+     * @param string $type          Type of filter.
+     * @param mixed  $request       Search request, string or array.
+     * @param bool   $casesensitive Optional: Perform case sensitive filter
+     * @param bool   $privateonly   Optional: Returns private links only if true.
      *
-     * Example:
-     *    print_r($mydb->filterFulltext('hollandais'));
-     *
-     * mb_convert_case($val, MB_CASE_LOWER, 'UTF-8')
-     *  - allows to perform searches on Unicode text
-     *  - see https://github.com/shaarli/Shaarli/issues/75 for examples
+     * @return array filtered links
      */
-    public function filterFulltext($searchterms)
-    {
-        // FIXME: explode(' ',$searchterms) and perform a AND search.
-        // FIXME: accept double-quotes to search for a string "as is"?
-        $filtered = array();
-        $search = mb_convert_case($searchterms, MB_CASE_LOWER, 'UTF-8');
-        $keys = array('title', 'description', 'url', 'tags');
-
-        foreach ($this->_links as $link) {
-            $found = false;
-
-            foreach ($keys as $key) {
-                if (strpos(mb_convert_case($link[$key], MB_CASE_LOWER, 'UTF-8'),
-                           $search) !== false) {
-                    $found = true;
-                }
-            }
-
-            if ($found) {
-                $filtered[$link['linkdate']] = $link;
-            }
-        }
-        krsort($filtered);
-        return $filtered;
-    }
-
-    /**
-     * Returns the list of links associated with a given list of tags
-     *
-     * You can specify one or more tags, separated by space or a comma, e.g.
-     *  print_r($mydb->filterTags('linux programming'));
-     */
-    public function filterTags($tags, $casesensitive=false)
-    {
-        // Same as above, we use UTF-8 conversion to handle various graphemes (i.e. cyrillic, or greek)
-        // FIXME: is $casesensitive ever true?
-        $t = str_replace(
-            ',', ' ',
-            ($casesensitive ? $tags : mb_convert_case($tags, MB_CASE_LOWER, 'UTF-8'))
-        );
-
-        $searchtags = explode(' ', $t);
-        $filtered = array();
-
-        foreach ($this->_links as $l) {
-            $linktags = explode(
-                ' ',
-                ($casesensitive ? $l['tags']:mb_convert_case($l['tags'], MB_CASE_LOWER, 'UTF-8'))
-            );
-
-            if (count(array_intersect($linktags, $searchtags)) == count($searchtags)) {
-                $filtered[$l['linkdate']] = $l;
-            }
-        }
-        krsort($filtered);
-        return $filtered;
-    }
-
-
-    /**
-     * Returns the list of articles for a given day, chronologically sorted
-     *
-     * Day must be in the form 'YYYYMMDD' (e.g. '20120125'), e.g.
-     *  print_r($mydb->filterDay('20120125'));
-     */
-    public function filterDay($day)
-    {
-        if (! checkDateFormat('Ymd', $day)) {
-            throw new Exception('Invalid date format');
-        }
-
-        $filtered = array();
-        foreach ($this->_links as $l) {
-            if (startsWith($l['linkdate'], $day)) {
-                $filtered[$l['linkdate']] = $l;
-            }
-        }
-        ksort($filtered);
-        return $filtered;
-    }
-
-    /**
-     * Returns the article corresponding to a smallHash
-     */
-    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;
+    public function filter($type, $request, $casesensitive = false, $privateonly = false) {
+        $requestFilter = is_array($request) ? implode(' ', $request) : $request;
+        return $this->linkFilter->filter($type, $requestFilter, $casesensitive, $privateonly);
     }
 
     /**
diff --git a/application/LinkFilter.php b/application/LinkFilter.php
new file mode 100644
index 0000000..cf64737
--- /dev/null
+++ b/application/LinkFilter.php
@@ -0,0 +1,259 @@
+links = $links;
+    }
+
+    /**
+     * Filter links according to parameters.
+     *
+     * @param string $type          Type of filter (eg. tags, permalink, etc.).
+     * @param string $request       Filter content.
+     * @param bool   $casesensitive Optional: Perform case sensitive filter if true.
+     * @param bool   $privateonly   Optional: Only returns private links if true.
+     *
+     * @return array filtered link list.
+     */
+    public function filter($type, $request, $casesensitive = false, $privateonly = false)
+    {
+        switch($type) {
+            case self::$FILTER_HASH:
+                return $this->filterSmallHash($request);
+                break;
+            case self::$FILTER_TEXT:
+                return $this->filterFulltext($request, $privateonly);
+                break;
+            case self::$FILTER_TAG:
+                return $this->filterTags($request, $casesensitive, $privateonly);
+                break;
+            case self::$FILTER_DAY:
+                return $this->filterDay($request);
+                break;
+            default:
+                return $this->noFilter($privateonly);
+        }
+    }
+
+    /**
+     * Unknown filter, but handle private only.
+     *
+     * @param bool $privateonly returns private link only if true.
+     *
+     * @return array filtered links.
+     */
+    private function noFilter($privateonly = false)
+    {
+        if (! $privateonly) {
+            krsort($this->links);
+            return $this->links;
+        }
+
+        $out = array();
+        foreach ($this->links as $value) {
+            if ($value['private']) {
+                $out[$value['linkdate']] = $value;
+            }
+        }
+
+        krsort($out);
+        return $out;
+    }
+
+    /**
+     * Returns the shaare corresponding to a smallHash.
+     *
+     * @param string $smallHash permalink hash.
+     *
+     * @return array $filtered array containing permalink data.
+     */
+    private 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 links corresponding to a full-text search
+     *
+     * Searches:
+     *  - in the URLs, title and description;
+     *  - are case-insensitive.
+     *
+     * Example:
+     *    print_r($mydb->filterFulltext('hollandais'));
+     *
+     * mb_convert_case($val, MB_CASE_LOWER, 'UTF-8')
+     *  - allows to perform searches on Unicode text
+     *  - see https://github.com/shaarli/Shaarli/issues/75 for examples
+     *
+     * @param string $searchterms search query.
+     * @param bool   $privateonly return only private links if true.
+     *
+     * @return array search results.
+     */
+    private function filterFulltext($searchterms, $privateonly = false)
+    {
+        // FIXME: explode(' ',$searchterms) and perform a AND search.
+        // FIXME: accept double-quotes to search for a string "as is"?
+        $filtered = array();
+        $search = mb_convert_case($searchterms, MB_CASE_LOWER, 'UTF-8');
+        $explodedSearch = explode(' ', trim($search));
+        $keys = array('title', 'description', 'url', 'tags');
+
+        // Iterate over every stored link.
+        foreach ($this->links as $link) {
+            $found = false;
+
+            // ignore non private links when 'privatonly' is on.
+            if (! $link['private'] && $privateonly === true) {
+                continue;
+            }
+
+            // Iterate over searchable link fields.
+            foreach ($keys as $key) {
+                // Search full expression.
+                if (strpos(
+                    mb_convert_case($link[$key], MB_CASE_LOWER, 'UTF-8'),
+                    $search
+                ) !== false) {
+                    $found = true;
+                }
+
+                if ($found) {
+                    break;
+                }
+            }
+
+            if ($found) {
+                $filtered[$link['linkdate']] = $link;
+            }
+        }
+
+        krsort($filtered);
+        return $filtered;
+    }
+
+    /**
+     * Returns the list of links associated with a given list of tags
+     *
+     * You can specify one or more tags, separated by space or a comma, e.g.
+     *  print_r($mydb->filterTags('linux programming'));
+     *
+     * @param string $tags          list of tags separated by commas or blank spaces.
+     * @param bool   $casesensitive ignore case if false.
+     * @param bool   $privateonly   returns private links only.
+     *
+     * @return array filtered links.
+     */
+    public function filterTags($tags, $casesensitive = false, $privateonly = false)
+    {
+        $searchtags = $this->tagsStrToArray($tags, $casesensitive);
+        $filtered = array();
+
+        foreach ($this->links as $l) {
+            // ignore non private links when 'privatonly' is on.
+            if (! $l['private'] && $privateonly === true) {
+                continue;
+            }
+
+            $linktags = $this->tagsStrToArray($l['tags'], $casesensitive);
+
+            if (count(array_intersect($linktags, $searchtags)) == count($searchtags)) {
+                $filtered[$l['linkdate']] = $l;
+            }
+        }
+        krsort($filtered);
+        return $filtered;
+    }
+
+    /**
+     * Returns the list of articles for a given day, chronologically sorted
+     *
+     * Day must be in the form 'YYYYMMDD' (e.g. '20120125'), e.g.
+     *  print_r($mydb->filterDay('20120125'));
+     *
+     * @param string $day day to filter.
+     *
+     * @return array all link matching given day.
+     *
+     * @throws Exception if date format is invalid.
+     */
+    public function filterDay($day)
+    {
+        if (! checkDateFormat('Ymd', $day)) {
+            throw new Exception('Invalid date format');
+        }
+
+        $filtered = array();
+        foreach ($this->links as $l) {
+            if (startsWith($l['linkdate'], $day)) {
+                $filtered[$l['linkdate']] = $l;
+            }
+        }
+        ksort($filtered);
+        return $filtered;
+    }
+
+    /**
+     * Convert a list of tags (str) to an array. Also
+     * - handle case sensitivity.
+     * - accepts spaces commas as separator.
+     * - remove private tags for loggedout users.
+     *
+     * @param string $tags          string containing a list of tags.
+     * @param bool   $casesensitive will convert everything to lowercase if false.
+     *
+     * @return array filtered tags string.
+    */
+    public function tagsStrToArray($tags, $casesensitive)
+    {
+        // We use UTF-8 conversion to handle various graphemes (i.e. cyrillic, or greek)
+        $tagsOut = $casesensitive ? $tags : mb_convert_case($tags, MB_CASE_LOWER, 'UTF-8');
+        $tagsOut = str_replace(',', ' ', $tagsOut);
+
+        return explode(' ', trim($tagsOut));
+    }
+}
diff --git a/application/Utils.php b/application/Utils.php
index f84f70e..aeaef9f 100644
--- a/application/Utils.php
+++ b/application/Utils.php
@@ -72,12 +72,14 @@ function sanitizeLink(&$link)
 
 /**
  * Checks if a string represents a valid date
+
+ * @param string $format The expected DateTime format of the string
+ * @param string $string A string-formatted date
  *
- * @param string        a string-formatted date
- * @param format        the expected DateTime format of the string
- * @return              whether the string is a valid date
- * @see                 http://php.net/manual/en/class.datetime.php
- * @see                 http://php.net/manual/en/datetime.createfromformat.php
+ * @return bool whether the string is a valid date
+ *
+ * @see http://php.net/manual/en/class.datetime.php
+ * @see http://php.net/manual/en/datetime.createfromformat.php
  */
 function checkDateFormat($format, $string)
 {
diff --git a/index.php b/index.php
index 40a6fbe..1664c01 100644
--- a/index.php
+++ b/index.php
@@ -151,6 +151,7 @@ require_once 'application/CachedPage.php';
 require_once 'application/FileUtils.php';
 require_once 'application/HttpUtils.php';
 require_once 'application/LinkDB.php';
+require_once 'application/LinkFilter.php';
 require_once 'application/TimeZone.php';
 require_once 'application/Url.php';
 require_once 'application/Utils.php';
@@ -730,18 +731,23 @@ function showRSS()
     // Read links from database (and filter private links if user it not logged in).
 
     // Optionally filter the results:
-    $linksToDisplay=array();
-    if (!empty($_GET['searchterm'])) $linksToDisplay = $LINKSDB->filterFulltext($_GET['searchterm']);
-    else if (!empty($_GET['searchtags']))   $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags']));
-    else $linksToDisplay = $LINKSDB;
-
-    $nblinksToDisplay = 50;  // Number of links to display.
-    if (!empty($_GET['nb']))  // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.
-    {
-        $nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ;
+    if (!empty($_GET['searchterm'])) {
+        $linksToDisplay = $LINKSDB->filter(LinkFilter::$FILTER_TEXT, $_GET['searchterm']);
+    }
+    elseif (!empty($_GET['searchtags'])) {
+        $linksToDisplay = $LINKSDB->filter(LinkFilter::$FILTER_TAG, trim($_GET['searchtags']));
+    }
+    else {
+        $linksToDisplay = $LINKSDB;
     }
 
-    $pageaddr=escape(index_url($_SERVER));
+    $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);
+    }
+
+    $pageaddr = escape(index_url($_SERVER));
     echo '';
     echo ''.$GLOBALS['title'].''.$pageaddr.'';
     echo 'Shared linksen-en'.$pageaddr.''."\n\n";
@@ -821,15 +827,20 @@ function showATOM()
     );
 
     // Optionally filter the results:
-    $linksToDisplay=array();
-    if (!empty($_GET['searchterm'])) $linksToDisplay = $LINKSDB->filterFulltext($_GET['searchterm']);
-    else if (!empty($_GET['searchtags']))   $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags']));
-    else $linksToDisplay = $LINKSDB;
+    if (!empty($_GET['searchterm'])) {
+        $linksToDisplay = $LINKSDB->filter(LinkFilter::$FILTER_TEXT, $_GET['searchterm']);
+    }
+    else if (!empty($_GET['searchtags'])) {
+        $linksToDisplay = $LINKSDB->filter(LinkFilter::$FILTER_TAG, trim($_GET['searchtags']));
+    }
+    else {
+        $linksToDisplay = $LINKSDB;
+    }
 
     $nblinksToDisplay = 50;  // Number of links to display.
-    if (!empty($_GET['nb']))  // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.
-    {
-        $nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ;
+    // 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);
     }
 
     $pageaddr=escape(index_url($_SERVER));
@@ -1024,7 +1035,7 @@ function showDaily($pageBuilder)
     }
 
     try {
-        $linksToDisplay = $LINKSDB->filterDay($day);
+        $linksToDisplay = $LINKSDB->filter(LinkFilter::$FILTER_DAY, $day);
     } catch (Exception $exc) {
         error_log($exc);
         $linksToDisplay = array();
@@ -1149,13 +1160,17 @@ function renderPage()
     if ($targetPage == Router::$PAGE_PICWALL)
     {
         // Optionally filter the results:
-        $links=array();
-        if (!empty($_GET['searchterm'])) $links = $LINKSDB->filterFulltext($_GET['searchterm']);
-        elseif (!empty($_GET['searchtags']))   $links = $LINKSDB->filterTags(trim($_GET['searchtags']));
-        else $links = $LINKSDB;
+        if (!empty($_GET['searchterm'])) {
+            $links = $LINKSDB->filter(LinkFilter::$FILTER_TEXT, $_GET['searchterm']);
+        }
+        elseif (! empty($_GET['searchtags'])) {
+            $links = $LINKSDB->filter(LinkFilter::$FILTER_TAG, trim($_GET['searchtags']));
+        }
+        else {
+            $links = $LINKSDB;
+        }
 
-        $body='';
-        $linksToDisplay=array();
+        $linksToDisplay = array();
 
         // Get only links which have a thumbnail.
         foreach($links as $link)
@@ -1282,7 +1297,7 @@ function renderPage()
         }
 
         if (isset($params['searchtags'])) {
-            $tags = explode(' ',$params['searchtags']);
+            $tags = explode(' ', $params['searchtags']);
             $tags=array_diff($tags, array($_GET['removetag'])); // Remove value from array $tags.
             if (count($tags)==0) {
                 unset($params['searchtags']);
@@ -1467,7 +1482,8 @@ function renderPage()
         if (!empty($_POST['deletetag']) && !empty($_POST['fromtag']))
         {
             $needle=trim($_POST['fromtag']);
-            $linksToAlter = $LINKSDB->filterTags($needle,true); // True for case-sensitive tag search.
+            // True for case-sensitive tag search.
+            $linksToAlter = $LINKSDB->filter(LinkFilter::$FILTER_TAG, $needle, true);
             foreach($linksToAlter as $key=>$value)
             {
                 $tags = explode(' ',trim($value['tags']));
@@ -1484,7 +1500,8 @@ function renderPage()
         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.
+            // True for case-sensitive tag search.
+            $linksToAlter = $LINKSDB->filter(LinkFilter::$FILTER_TAG, $needle, true);
             foreach($linksToAlter as $key=>$value)
             {
                 $tags = explode(' ',trim($value['tags']));
@@ -1865,81 +1882,78 @@ function importFile()
 function buildLinkList($PAGE,$LINKSDB)
 {
     // ---- Filter link database according to parameters
-    $linksToDisplay=array();
-    $search_type='';
-    $search_crits='';
-    if (isset($_GET['searchterm'])) // Fulltext search
-    {
-        $linksToDisplay = $LINKSDB->filterFulltext(trim($_GET['searchterm']));
-        $search_crits=escape(trim($_GET['searchterm']));
-        $search_type='fulltext';
+    $search_type = '';
+    $search_crits = '';
+    $privateonly = !empty($_SESSION['privateonly']) ? true : false;
+
+    // Fulltext search
+    if (isset($_GET['searchterm'])) {
+        $search_crits = escape(trim($_GET['searchterm']));
+        $search_type = LinkFilter::$FILTER_TEXT;
+        $linksToDisplay = $LINKSDB->filter($search_type, $search_crits, false, $privateonly);
     }
-    elseif (isset($_GET['searchtags'])) // Search by tag
-    {
-        $linksToDisplay = $LINKSDB->filterTags(trim($_GET['searchtags']));
-        $search_crits=explode(' ',escape(trim($_GET['searchtags'])));
-        $search_type='tags';
+    // Search by tag
+    elseif (isset($_GET['searchtags'])) {
+        $search_crits = explode(' ', escape(trim($_GET['searchtags'])));
+        $search_type = LinkFilter::$FILTER_TAG;
+        $linksToDisplay = $LINKSDB->filter($search_type, $search_crits, false, $privateonly);
     }
-    elseif (isset($_SERVER['QUERY_STRING']) && preg_match('/[a-zA-Z0-9-_@]{6}(&.+?)?/',$_SERVER['QUERY_STRING'])) // Detect smallHashes in URL
-    {
-        $linksToDisplay = $LINKSDB->filterSmallHash(substr(trim($_SERVER["QUERY_STRING"], '/'),0,6));
-        if (count($linksToDisplay)==0)
-        {
-            header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
-            echo '
                                                                404 Not found.
                                                                Oh crap. The link you are trying to reach does not exist or has been deleted.';
+    // Detect smallHashes in URL.
+    elseif (isset($_SERVER['QUERY_STRING'])
+        && preg_match('/[a-zA-Z0-9-_@]{6}(&.+?)?/', $_SERVER['QUERY_STRING'])) {
+        $search_type = LinkFilter::$FILTER_HASH;
+        $search_crits = substr(trim($_SERVER["QUERY_STRING"], '/'), 0, 6);
+        $linksToDisplay = $LINKSDB->filter($search_type, $search_crits);
+
+        if (count($linksToDisplay) == 0) {
+            header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
+            echo '
                                                                404 Not found.
                                                                Oh crap.
+                  The link you are trying to reach does not exist or has been deleted.';
             echo '
                                                                Would you mind clicking here?';
             exit;
         }
-        $search_type='permalink';
     }
-    else
-        $linksToDisplay = $LINKSDB;  // Otherwise, display without filtering.
-
-
-    // Option: Show only private links
-    if (!empty($_SESSION['privateonly']))
-    {
-        $tmp = array();
-        foreach($linksToDisplay as $linkdate=>$link)
-        {
-            if ($link['private']!=0) $tmp[$linkdate]=$link;
-        }
-        $linksToDisplay=$tmp;
+    // Otherwise, display without filtering.
+    else {
+        $linksToDisplay = $LINKSDB->filter('', '', false, $privateonly);
     }
 
     // ---- Handle paging.
-    /* Can someone explain to me why you get the following error when using array_keys() on an object which implements the interface ArrayAccess???
-       "Warning: array_keys() expects parameter 1 to be array, object given in ... "
-       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.
+    $keys = array();
+    foreach ($linksToDisplay as $key => $value) {
+        $keys[] = $key;
+    }
 
     // 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'];
+    if (count($linksToDisplay) == 1) {
+        $GLOBALS['pagetitle'] = $linksToDisplay[$keys[0]]['title'].' - '.$GLOBALS['title'];
+    }
 
     // Select articles according to paging.
-    $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'];
-    $linkDisp=array(); // Links to display
+    $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;
+    // Start index.
+    $i = ($page-1) * $_SESSION['LINKS_PER_PAGE'];
+    $end = $i + $_SESSION['LINKS_PER_PAGE'];
+    $linkDisp = array();
     while ($i<$end && $i1) $next_page_url='?page='.($page-1).$searchterm.$searchtags;
+    $searchterm = empty($_GET['searchterm']) ? '' : '&searchterm=' . $_GET['searchterm'];
+    $searchtags = empty($_GET['searchtags']) ? '' : '&searchtags=' . $_GET['searchtags'];
+    $previous_page_url = '';
+    if ($i != count($keys)) {
+        $previous_page_url = '?page=' . ($page+1) . $searchterm . $searchtags;
+    }
+    $next_page_url='';
+    if ($page>1) {
+        $next_page_url = '?page=' . ($page-1) . $searchterm . $searchtags;
+    }
 
-    $token = ''; if (isLoggedIn()) $token=getToken();
+    $token = '';
+    if (isLoggedIn()) {
+        $token = getToken();
+    }
 
     // Fill all template fields.
     $data = array(
diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php
index 7b22b27..3b1a205 100644
--- a/tests/LinkDBTest.php
+++ b/tests/LinkDBTest.php
@@ -301,217 +301,6 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
         );
     }
 
-    /**
-     * Filter links using a tag
-     */
-    public function testFilterOneTag()
-    {
-        $this->assertEquals(
-            3,
-            sizeof(self::$publicLinkDB->filterTags('web', false))
-        );
-
-        $this->assertEquals(
-            4,
-            sizeof(self::$privateLinkDB->filterTags('web', false))
-        );
-    }
-
-    /**
-     * Filter links using a tag - case-sensitive
-     */
-    public function testFilterCaseSensitiveTag()
-    {
-        $this->assertEquals(
-            0,
-            sizeof(self::$privateLinkDB->filterTags('mercurial', true))
-        );
-
-        $this->assertEquals(
-            1,
-            sizeof(self::$privateLinkDB->filterTags('Mercurial', true))
-        );
-    }
-
-    /**
-     * Filter links using a tag combination
-     */
-    public function testFilterMultipleTags()
-    {
-        $this->assertEquals(
-            1,
-            sizeof(self::$publicLinkDB->filterTags('dev cartoon', false))
-        );
-
-        $this->assertEquals(
-            2,
-            sizeof(self::$privateLinkDB->filterTags('dev cartoon', false))
-        );
-    }
-
-    /**
-     * Filter links using a non-existent tag
-     */
-    public function testFilterUnknownTag()
-    {
-        $this->assertEquals(
-            0,
-            sizeof(self::$publicLinkDB->filterTags('null', false))
-        );
-    }
-
-    /**
-     * Return links for a given day
-     */
-    public function testFilterDay()
-    {
-        $this->assertEquals(
-            2,
-            sizeof(self::$publicLinkDB->filterDay('20121206'))
-        );
-
-        $this->assertEquals(
-            3,
-            sizeof(self::$privateLinkDB->filterDay('20121206'))
-        );
-    }
-
-    /**
-     * 404 - day not found
-     */
-    public function testFilterUnknownDay()
-    {
-        $this->assertEquals(
-            0,
-            sizeof(self::$publicLinkDB->filterDay('19700101'))
-        );
-
-        $this->assertEquals(
-            0,
-            sizeof(self::$privateLinkDB->filterDay('19700101'))
-        );
-    }
-
-    /**
-     * Use an invalid date format
-     * @expectedException              Exception
-     * @expectedExceptionMessageRegExp /Invalid date format/
-     */
-    public function testFilterInvalidDayWithChars()
-    {
-        self::$privateLinkDB->filterDay('Rainy day, dream away');
-    }
-
-    /**
-     * Use an invalid date format
-     * @expectedException              Exception
-     * @expectedExceptionMessageRegExp /Invalid date format/
-     */
-    public function testFilterInvalidDayDigits()
-    {
-        self::$privateLinkDB->filterDay('20');
-    }
-
-    /**
-     * Retrieve a link entry with its hash
-     */
-    public function testFilterSmallHash()
-    {
-        $links = self::$privateLinkDB->filterSmallHash('IuWvgA');
-
-        $this->assertEquals(
-            1,
-            sizeof($links)
-        );
-
-        $this->assertEquals(
-            'MediaGoblin',
-            $links['20130614_184135']['title']
-        );
-        
-    }
-
-    /**
-     * No link for this hash
-     */
-    public function testFilterUnknownSmallHash()
-    {
-        $this->assertEquals(
-            0,
-            sizeof(self::$privateLinkDB->filterSmallHash('Iblaah'))
-        );
-    }
-
-    /**
-     * Full-text search - result from a link's URL
-     */
-    public function testFilterFullTextURL()
-    {
-        $this->assertEquals(
-            2,
-            sizeof(self::$publicLinkDB->filterFullText('ars.userfriendly.org'))
-        );
-    }
-
-    /**
-     * Full-text search - result from a link's title only
-     */
-    public function testFilterFullTextTitle()
-    {
-        // use miscellaneous cases
-        $this->assertEquals(
-            2,
-            sizeof(self::$publicLinkDB->filterFullText('userfriendly -'))
-        );
-        $this->assertEquals(
-            2,
-            sizeof(self::$publicLinkDB->filterFullText('UserFriendly -'))
-        );
-        $this->assertEquals(
-            2,
-            sizeof(self::$publicLinkDB->filterFullText('uSeRFrIendlY -'))
-        );
-
-        // use miscellaneous case and offset
-        $this->assertEquals(
-            2,
-            sizeof(self::$publicLinkDB->filterFullText('RFrIendL'))
-        );
-    }
-
-    /**
-     * Full-text search - result from the link's description only
-     */
-    public function testFilterFullTextDescription()
-    {
-        $this->assertEquals(
-            1,
-            sizeof(self::$publicLinkDB->filterFullText('media publishing'))
-        );
-    }
-
-    /**
-     * Full-text search - result from the link's tags only
-     */
-    public function testFilterFullTextTags()
-    {
-        $this->assertEquals(
-            2,
-            sizeof(self::$publicLinkDB->filterFullText('gnu'))
-        );
-    }
-
-    /**
-     * Full-text search - result set from mixed sources
-     */
-    public function testFilterFullTextMixed()
-    {
-        $this->assertEquals(
-            2,
-            sizeof(self::$publicLinkDB->filterFullText('free software'))
-        );
-    }
-
     /**
      * Test real_url without redirector.
      */
@@ -534,4 +323,28 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
             $this->assertStringStartsWith($redirector, $link['real_url']);
         }
     }
+
+    /**
+     * Test filter with string.
+     */
+    public function testFilterString()
+    {
+        $tags = 'dev cartoon';
+        $this->assertEquals(
+            2,
+            count(self::$privateLinkDB->filter(LinkFilter::$FILTER_TAG, $tags, true, false))
+        );
+    }
+
+    /**
+     * Test filter with string.
+     */
+    public function testFilterArray()
+    {
+        $tags = array('dev', 'cartoon');
+        $this->assertEquals(
+            2,
+            count(self::$privateLinkDB->filter(LinkFilter::$FILTER_TAG, $tags, true, false))
+        );
+    }
 }
diff --git a/tests/LinkFilterTest.php b/tests/LinkFilterTest.php
new file mode 100644
index 0000000..5107ab7
--- /dev/null
+++ b/tests/LinkFilterTest.php
@@ -0,0 +1,242 @@
+getLinks());
+    }
+
+    /**
+     * Blank filter.
+     */
+    public function testFilter()
+    {
+        $this->assertEquals(
+            6,
+            count(self::$linkFilter->filter('', ''))
+        );
+
+        // Private only.
+        $this->assertEquals(
+            2,
+            count(self::$linkFilter->filter('', '', false, true))
+        );
+    }
+
+    /**
+     * Filter links using a tag
+     */
+    public function testFilterOneTag()
+    {
+        $this->assertEquals(
+            4,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, 'web', false))
+        );
+
+        // Private only.
+        $this->assertEquals(
+            1,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, 'web', false, true))
+        );
+    }
+
+    /**
+     * Filter links using a tag - case-sensitive
+     */
+    public function testFilterCaseSensitiveTag()
+    {
+        $this->assertEquals(
+            0,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, 'mercurial', true))
+        );
+
+        $this->assertEquals(
+            1,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, 'Mercurial', true))
+        );
+    }
+
+    /**
+     * Filter links using a tag combination
+     */
+    public function testFilterMultipleTags()
+    {
+        $this->assertEquals(
+            2,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, 'dev cartoon', false))
+        );
+    }
+
+    /**
+     * Filter links using a non-existent tag
+     */
+    public function testFilterUnknownTag()
+    {
+        $this->assertEquals(
+            0,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, 'null', false))
+        );
+    }
+
+    /**
+     * Return links for a given day
+     */
+    public function testFilterDay()
+    {
+        $this->assertEquals(
+            3,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_DAY, '20121206'))
+        );
+    }
+
+    /**
+     * 404 - day not found
+     */
+    public function testFilterUnknownDay()
+    {
+        $this->assertEquals(
+            0,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_DAY, '19700101'))
+        );
+    }
+
+    /**
+     * Use an invalid date format
+     * @expectedException              Exception
+     * @expectedExceptionMessageRegExp /Invalid date format/
+     */
+    public function testFilterInvalidDayWithChars()
+    {
+        self::$linkFilter->filter(LinkFilter::$FILTER_DAY, 'Rainy day, dream away');
+    }
+
+    /**
+     * Use an invalid date format
+     * @expectedException              Exception
+     * @expectedExceptionMessageRegExp /Invalid date format/
+     */
+    public function testFilterInvalidDayDigits()
+    {
+        self::$linkFilter->filter(LinkFilter::$FILTER_DAY, '20');
+    }
+
+    /**
+     * Retrieve a link entry with its hash
+     */
+    public function testFilterSmallHash()
+    {
+        $links = self::$linkFilter->filter(LinkFilter::$FILTER_HASH, 'IuWvgA');
+
+        $this->assertEquals(
+            1,
+            count($links)
+        );
+
+        $this->assertEquals(
+            'MediaGoblin',
+            $links['20130614_184135']['title']
+        );
+    }
+
+    /**
+     * No link for this hash
+     */
+    public function testFilterUnknownSmallHash()
+    {
+        $this->assertEquals(
+            0,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_HASH, 'Iblaah'))
+        );
+    }
+
+    /**
+     * Full-text search - result from a link's URL
+     */
+    public function testFilterFullTextURL()
+    {
+        $this->assertEquals(
+            2,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'ars.userfriendly.org'))
+        );
+    }
+
+    /**
+     * Full-text search - result from a link's title only
+     */
+    public function testFilterFullTextTitle()
+    {
+        // use miscellaneous cases
+        $this->assertEquals(
+            2,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'userfriendly -'))
+        );
+        $this->assertEquals(
+            2,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'UserFriendly -'))
+        );
+        $this->assertEquals(
+            2,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'uSeRFrIendlY -'))
+        );
+
+        // use miscellaneous case and offset
+        $this->assertEquals(
+            2,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'RFrIendL'))
+        );
+    }
+
+    /**
+     * Full-text search - result from the link's description only
+     */
+    public function testFilterFullTextDescription()
+    {
+        $this->assertEquals(
+            1,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'media publishing'))
+        );
+    }
+
+    /**
+     * Full-text search - result from the link's tags only
+     */
+    public function testFilterFullTextTags()
+    {
+        $this->assertEquals(
+            2,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'gnu'))
+        );
+
+        // Private only.
+        $this->assertEquals(
+            1,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'web', false, true))
+        );
+    }
+
+    /**
+     * Full-text search - result set from mixed sources
+     */
+    public function testFilterFullTextMixed()
+    {
+        $this->assertEquals(
+            2,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'free software'))
+        );
+    }
+}
diff --git a/tests/utils/ReferenceLinkDB.php b/tests/utils/ReferenceLinkDB.php
index 47b5182..011317e 100644
--- a/tests/utils/ReferenceLinkDB.php
+++ b/tests/utils/ReferenceLinkDB.php
@@ -124,4 +124,9 @@ class ReferenceLinkDB
     {
         return $this->_privateCount;
     }
+
+    public function getLinks()
+    {
+        return $this->_links;
+    }
 }
diff --git a/tpl/linklist.html b/tpl/linklist.html
index 666748a..09860ba 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -7,15 +7,24 @@
 
 
                                                              • 
+
                                                            • Docker
                                                              • 
+
                                                            • Plugin list
                                                              • 
 
                                                            • Usage
 
                                                              • 
 
                                                            • How To
 
                                                              • 
@@ -62,6 +88,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                                            • Directory structure
                                                              • 
 
                                                            • 3rd party libraries
                                                              • 
 
                                                            • Plugin System
                                                              • 
+
                                                            • Release Shaarli
                                                              • 
 
                                                            • Security
                                                              • 
 
                                                            • Static analysis
                                                              • 
 
                                                            • Theming
                                                              • 
@@ -79,7 +106,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                                              Backup and restore the datastore file
                                                              
 
                                                              Backup the file data/datastore.php (by FTP or SSH). Restore by putting the file back in place.
                                                              
 
                                                              Example command:
                                                              
-
                                                              rsync -avzP my.server.com:/var/www/shaarli/data/datastore.php datastore-$(date +%Y-%m-%d_%H%M).php
                                                              
+
                                                              rsync -avzP my.server.com:/var/www/shaarli/data/datastore.php datastore-$(date +%Y-%m-%d_%H%M).php
                                                              
 
 
                                                              To export links as an HTML file, under Tools > Export, choose:
                                                              
 
                                                                
@@ -92,7 +119,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                                              • This can be done using the shaarchiver tool.
                                                                • 
 
                                                              
 
                                                              Example command:
                                                              
-
                                                              ./export-bookmarks.py --url=https://my.server.com/shaarli --username=myusername --password=mysupersecretpassword --download-dir=./ --type=all
                                                              
+
                                                              ./export-bookmarks.py --url=https://my.server.com/shaarli --username=myusername --password=mysupersecretpassword --download-dir=./ --type=all
                                                              
 
 
                                                              Diigo
                                                              
 
                                                              If you export your bookmark from Diigo, make sure you use the Delicious export, not the Netscape export. (Their Netscape export is broken, and they don't seem to be interested in fixing it.)
                                                              
diff --git a/doc/Browsing-and-searching.html b/doc/Browsing-and-searching.html
new file mode 100644
index 0000000..a088785
--- /dev/null
+++ b/doc/Browsing-and-searching.html
@@ -0,0 +1,84 @@
+
+
+
+  
+  
+  
+  Shaarli – Browsing and searching
+  
+  
+  
+
+
+
+
                                                              Browsing and searching
                                                              
+
                                                              Browsing and Searching
                                                              
+
                                                              Status: DRAFT
                                                              
+
                                                              
+
                                                              Plain text search
                                                              
+
                                                              Use the Search text field to search in any of the fields of all links (Title, URL, Description...)
                                                              
+
                                                              Exclude text/tags: Use the - operator before a word or tag (example -uninteresting) to prevent entries containing (or tagged) uninteresting from showing up in the search results.
                                                              
+
                                                              Exact text search: Use double-quotes (example "exact search") to search for the exact expression.
                                                              
+
                                                              Both exclude patterns and exact searches can be combined with normal searches (example "exact search" term otherterm -notthis "very exact" stuff -notagain)
                                                              
+
+
                                                              Use the Filter by tags field to restrict displayed links to entries tagged with one or multiple tags (use space to separate tags).
                                                              
+
                                                              Hidden tags: Tags starting with a dot . (example .secret) are private. They can only be seen and searched when logged in.
                                                              
+
                                                              Alternatively you can use the Tag cloud to discover all tags and click on any of them to display related links.
                                                              
+
                                                              Filtering RSS feeds/Picture wall
                                                              
+
                                                              RSS feeds can also be restricted to only return items matching a text/tag search: see RSS feeds.
                                                              
+
+
diff --git a/doc/Browsing-and-searching.md b/doc/Browsing-and-searching.md
new file mode 100644
index 0000000..187fe44
--- /dev/null
+++ b/doc/Browsing-and-searching.md
@@ -0,0 +1,28 @@
+#Browsing and searching
+# Browsing and Searching
+
+Status: DRAFT
+
+![(http://pix.toile-libre.org/upload/original/1455571378.png)]((http://pix.toile-libre.org/upload/original/1455571378.png).html)
+
+## Plain text search
+
+Use the `Search text` field to search in _any_ of the fields of all links (Title, URL, Description...)
+
+**Exclude text/tags:** Use the `-` operator before a word or tag (example `-uninteresting`) to prevent entries containing (or tagged) `uninteresting` from showing up in the search results.
+
+**Exact text search:** Use double-quotes (example `"exact search"`) to search for the exact expression.
+
+Both exclude patterns and exact searches can be combined with normal searches (example `"exact search" term otherterm -notthis "very exact" stuff -notagain`)
+
+## Tags search
+
+Use the `Filter by tags` field to restrict displayed links to entries tagged with one or multiple tags (use space to separate tags).  
+
+**Hidden tags:** Tags starting with a dot `.` (example `.secret`) are private. They can only be seen and searched when logged in.
+
+Alternatively you can use the `Tag cloud` to discover all tags and click on any of them to display related links.
+
+## Filtering RSS feeds/Picture wall
+
+RSS feeds can also be restricted to only return items matching a text/tag search: see [RSS feeds](RSS-feeds.html).
diff --git a/doc/Coding-guidelines.html b/doc/Coding-guidelines.html
index 40d1791..8dbf3bc 100644
--- a/doc/Coding-guidelines.html
+++ b/doc/Coding-guidelines.html
@@ -4,12 +4,12 @@
   
   
   
-  Shaarli - Coding guidelines
+  Shaarli – Coding guidelines
   
-  
   
+  
 
 
 
                                                            • 
+
                                                          • Docker
                                                            • 
+
                                                          • Plugin list
                                                            • 
 
                                                          • Usage
 
                                                            • 
 
                                                          • How To
 
                                                            • 
@@ -43,6 +51,7 @@
 
                                                          • Directory structure
                                                            • 
 
                                                          • 3rd party libraries
                                                            • 
 
                                                          • Plugin System
                                                            • 
+
                                                          • Release Shaarli
                                                            • 
 
                                                          • Security
                                                            • 
 
                                                          • Static analysis
                                                            • 
 
                                                          • Theming
                                                            • 
diff --git a/doc/Community-&-Related-software.html b/doc/Community-&-Related-software.html
index 34bc615..8dd0e43 100644
--- a/doc/Community-&-Related-software.html
+++ b/doc/Community-&-Related-software.html
@@ -4,12 +4,12 @@
   
   
   
-  Shaarli - Community & Related software
+  Shaarli – Community & Related software
   
-  
   
+  
 
 
 
                                                          • 
+
                                                        • Docker
                                                          • 
+
                                                        • Plugin list
                                                          • 
 
                                                        • Usage
 
                                                          • 
 
                                                        • How To
 
                                                          • 
@@ -43,6 +51,7 @@
 
                                                        • Directory structure
                                                          • 
 
                                                        • 3rd party libraries
                                                          • 
 
                                                        • Plugin System
                                                          • 
+
                                                        • Release Shaarli
                                                          • 
 
                                                        • Security
                                                          • 
 
                                                        • Static analysis
                                                          • 
 
                                                        • Theming
                                                          • 
@@ -72,6 +81,10 @@
 
                                                        • Shaarli.fr/my - Unofficial, unsupported (old fork) hosted Shaarlis provider, courtesy of DMeloni
                                                          • 
 
                                                        • Shaarli Community - Unknown Shaarli hoster (unsupported, old fork)
                                                          • 
 
                                                        
+
                                                        Third party plugins
                                                        
+
                                                          
+
                                                        • autosave - periodically saves contents of the Edit link/Save link dialog to your browser's LocalStorage to avoid data loss when typing a long entry.
                                                          • 
+
                                                        
 
                                                        Themes
                                                        
 
                                                        See Theming for the list of community-contributed themes, and an installation guide.
                                                        
 
                                                        Server apps
                                                        
@@ -85,7 +98,7 @@
 
                                                      
 
                                                      Mobile Apps
                                                      
 
diff --git a/doc/Community-&-Related-software.md b/doc/Community-&-Related-software.md
index 77ea242..27da45d 100644
--- a/doc/Community-&-Related-software.md
+++ b/doc/Community-&-Related-software.md
@@ -15,6 +15,10 @@ _TODO: contact repos owners to see if they'd like to standardize their work with
 - [Shaarli.fr/my](https://www.shaarli.fr/my.php) - Unofficial, unsupported (old fork) hosted Shaarlis provider, courtesy of [DMeloni](https://github.com/DMeloni)[](.html)
 - [Shaarli Community](http://shaarferme.etudiant-libre.fr.nf/index.php) - Unknown Shaarli hoster (unsupported, old fork)[](.html)
 
+### Third party plugins
+
+ * [autosave](https://github.com/kalvn/shaarli-plugin-autosave) - periodically saves contents of the _Edit link/Save link_ dialog to your browser's LocalStorage to avoid data loss when typing a long entry.[](.html)
+
 ### Themes
 See [Theming](Theming.html) for the list of community-contributed themes, and an installation guide.
 
@@ -27,7 +31,7 @@ See [Theming](Theming.html) for the list of community-contributed themes, and an
 - [Self dead link](https://github.com/qwertygc/shaarli-dev-code/blob/master/self-dead-link.php) - Detect dead links on shaarli. This version use the database of shaarli. An [another version](https://github.com/qwertygc/shaarli-dev-code/blob/master/dead-link.php), can be used for others shaarli (but use most ressources).[](.html)
 
 ### Mobile Apps
-- [github.com/mro/ShaarliOS](https://github.com/mro/ShaarliOS#the-missing-ios-8-share-extension-to-shaarli) iOS share extension - see [#308](https://github.com/shaarli/Shaarli/issues/308#issuecomment-132303709) for some promo codes,[](.html)
+- [Shaarli💫](http://app.mro.name/Shaarli💫) iOS share extension - see [#308](https://github.com/shaarli/Shaarli/issues/308#issuecomment-184592070) for some promo codes,[](.html)
 - [Shaarli for Android](http://sebsauvage.net/links/?ZAyDzg) - Android application that adds Shaarli as a sharing provider[](.html)
 - [Shaarlier for Android](https://github.com/dimtion/Shaarlier) - Android application to simply add links directly into your Shaarli[](.html)
 
diff --git a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html
index e27b113..067c682 100644
--- a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html
+++ b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html
@@ -4,31 +4,49 @@
   
   
   
-  Shaarli - Copy an existing installation over SSH and serve it locally
+  Shaarli – Copy an existing installation over SSH and serve it locally
   
-  
   
   
+  
 
 
 
                                                    • 
+
                                                  • Docker
                                                    • 
+
                                                  • Plugin list
                                                    • 
 
                                                  • Usage
 
                                                    • 
 
                                                  • How To
 
                                                    • 
@@ -62,6 +88,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                                  • Directory structure
                                                    • 
 
                                                  • 3rd party libraries
                                                    • 
 
                                                  • Plugin System
                                                    • 
+
                                                  • Release Shaarli
                                                    • 
 
                                                  • Security
                                                    • 
 
                                                  • Static analysis
                                                    • 
 
                                                  • Theming
                                                    • 
@@ -77,7 +104,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
 
                                                    Copy an existing installation over SSH and serve it locally
                                                    
 
                                                    Example bash script:
                                                    
-
                                                    #!/bin/bash
+
                                                    #!/bin/bash
 #Description: Copy a Shaarli installation over SSH/SCP, serve it locally with php-cli
 #Will create a local-shaarli/ directory when you run it, backup your Shaarli there, and serve it locally.
 #Will NOT download linked pages. It's just a directly usable backup/copy/mirror of your Shaarli
@@ -124,9 +151,9 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
 ##### MAIN #################
 
-_main
                                                    
+_main
                                                    
 
                                                    This outputs:
                                                    
-
                                                    $ ./local-shaarli.sh
+
                                                    $ ./local-shaarli.sh
 PHP 5.6.0RC4 Development Server started at Mon Sep  1 21:56:19 2014
 Listening on http://localhost:7431
 Document root is /home/user/local-shaarli/shaarli
@@ -134,6 +161,6 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
 [Mon Sep  1 21:56:27 2014] ::1:57868 [200]: /[](.html)
 [Mon Sep  1 21:56:27 2014] ::1:57869 [200]: /index.html[](.html)
-[Mon Sep  1 21:56:37 2014] ::1:57881 [200]: /...[](.html)
                                                    
+[Mon Sep  1 21:56:37 2014] ::1:57881 [200]: /...[](.html)
                                                    
 
 
diff --git a/doc/Create-and-serve-multiple-Shaarlis-(farm).html b/doc/Create-and-serve-multiple-Shaarlis-(farm).html
new file mode 100644
index 0000000..d3da1a2
--- /dev/null
+++ b/doc/Create-and-serve-multiple-Shaarlis-(farm).html
@@ -0,0 +1,160 @@
+
+
+
+  
+  
+  
+  Shaarli – Create and serve multiple Shaarlis (farm)
+  
+  
+  
+  
+
+
+
+
                                                    Create and serve multiple Shaarlis (farm)
                                                    
+
                                                    Example bash script (creates multiple shaarli instances and generates an HTML index of them)
                                                    
+
                                                    #!/bin/bash
+set -o errexit
+set -o nounset
+
+#config
+shaarli_base_dir='/var/www/shaarli'
+accounts='bob john whatever username'
+shaarli_repo_url='https://github.com/shaarli/Shaarli'
+ref="master"
+
+#clone multiple shaarli instances
+if [ ! -d "$shaarli_base_dir" ]; then mkdir "$shaarli_base_dir"; fi[](.html)
+   
+for account in $accounts; do
+    if [ -d "$shaarli_base_dir/$account" ];[](.html)
+    then echo "[info] account $account already exists, skipping";[](.html)
+    else echo "[info] creating new account $account ..."; git clone --quiet "$shaarli_repo_url" -b "$ref" "$shaarli_base_dir/$account"; fi[](.html)
+done
+
+#generate html index of shaarlis
+htmlhead='<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!-- Minimal html template thanks to http://www.sitepoint.com/a-minimal-html-document/ -->
+<html lang="en">
+    <head>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8">
+        <title>My Shaarli farm</title>
+        <style>body {font-family: "Open Sans"}</style>
+    </head>
+    <body>
+    <div>
+    <h1>My Shaarli farm</h1>
+    <ul style="list-style-type: none;">'
+
+accountlinks=''
+    
+htmlfooter='
+    </ul>
+    </div>
+    </body>
+</html>'    
+    
+
+
+for account in $accounts; do accountlinks="$accountlinks\n<li><a href=\"$account\">$account</a></li>"; done
+if [ -d "$shaarli_base_dir/index.html" ]; then echo "[removing old index.html]"; rm "$shaarli_base_dir/index.html" ]; fi[](.html)
+echo "[info] generating new index of shaarlis"[](.html)
+echo -e "$htmlhead $accountlinks $htmlfooter" > "$shaarli_base_dir/index.html"
+echo '[info] done.'[](.html)
+echo "[info] list of accounts: $accounts"[](.html)
+echo "[info] contents of $shaarli_base_dir:"[](.html)
+tree -a -L 1 "$shaarli_base_dir"
                                                    
+
                                                    This script just serves as an example. More precise or complex (applying custom configuration, etc) automation is possible using configuration management software like Ansible
                                                    
+
+
diff --git a/doc/Create-and-serve-multiple-Shaarlis-(farm).md b/doc/Create-and-serve-multiple-Shaarlis-(farm).md
new file mode 100644
index 0000000..a71f652
--- /dev/null
+++ b/doc/Create-and-serve-multiple-Shaarlis-(farm).md
@@ -0,0 +1,58 @@
+#Create and serve multiple Shaarlis (farm)
+Example bash script (creates multiple shaarli instances and generates an HTML index of them)
+
+```bash
+#!/bin/bash
+set -o errexit
+set -o nounset
+
+#config
+shaarli_base_dir='/var/www/shaarli'
+accounts='bob john whatever username'
+shaarli_repo_url='https://github.com/shaarli/Shaarli'
+ref="master"
+
+#clone multiple shaarli instances
+if [ ! -d "$shaarli_base_dir" ]; then mkdir "$shaarli_base_dir"; fi[](.html)
+   
+for account in $accounts; do
+    if [ -d "$shaarli_base_dir/$account" ];[](.html)
+	then echo "[info] account $account already exists, skipping";[](.html)
+	else echo "[info] creating new account $account ..."; git clone --quiet "$shaarli_repo_url" -b "$ref" "$shaarli_base_dir/$account"; fi[](.html)
+done
+
+#generate html index of shaarlis
+htmlhead='
+
+
+	
+		
+		My Shaarli farm
+		
+	
+	
+	
                                                    
+	
                                                    My Shaarli farm
                                                    
+	
                                                      '
+
+accountlinks=''
+    
+htmlfooter='
+	
                                                    
+	
                                                    
+	
+'    
+    
+
+
+for account in $accounts; do accountlinks="$accountlinks\n
                                                  • $account
                                                    • "; done
+if [ -d "$shaarli_base_dir/index.html" ]; then echo "[removing old index.html]"; rm "$shaarli_base_dir/index.html" ]; fi[](.html)
+echo "[info] generating new index of shaarlis"[](.html)
+echo -e "$htmlhead $accountlinks $htmlfooter" > "$shaarli_base_dir/index.html"
+echo '[info] done.'[](.html)
+echo "[info] list of accounts: $accounts"[](.html)
+echo "[info] contents of $shaarli_base_dir:"[](.html)
+tree -a -L 1 "$shaarli_base_dir"
+```
+
+This script just serves as an example. More precise or complex (applying custom configuration, etc) automation is possible using configuration management software like [Ansible](https://www.ansible.com/)[](.html)
diff --git a/doc/Datastore-hacks.html b/doc/Datastore-hacks.html
index 0bf2a49..6273fae 100644
--- a/doc/Datastore-hacks.html
+++ b/doc/Datastore-hacks.html
@@ -4,31 +4,49 @@
   
   
   
-  Shaarli - Datastore hacks
+  Shaarli – Datastore hacks
   
-  
   
   
+  
 
 
 
                                                  • 
+
                                                • Docker
                                                  • 
+
                                                • Plugin list
                                                  • 
 
                                                • Usage
 
                                                  • 
 
                                                • How To
 
                                                  • 
@@ -62,6 +88,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                                • Directory structure
                                                  • 
 
                                                • 3rd party libraries
                                                  • 
 
                                                • Plugin System
                                                  • 
+
                                                • Release Shaarli
                                                  • 
 
                                                • Security
                                                  • 
 
                                                • Static analysis
                                                  • 
 
                                                • Theming
                                                  • 
@@ -78,17 +105,19 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                                  Datastore hacks
                                                  
 
                                                  Decode datastore content
                                                  
 
                                                  To display the array representing the data saved in data/datastore.php, use the following snippet:
                                                  
-
                                                  $data = "tZNdb9MwFIb... <Commented content inside datastore.php>";
+
                                                  $data = "tZNdb9MwFIb... <Commented content inside datastore.php>";
 $out = unserialize(gzinflate(base64_decode($data)));
 echo "<pre>"; // Pretty printing is love, pretty printing is life
 print_r($out);
 echo "</pre>";
-exit;
                                                  
+exit;
                                                  
 
                                                  This will output the internal representation of the datastore, "unobfuscated" (if this can really be considered obfuscation).
                                                  
+
                                                  Alternatively, you can transform to JSON format (and pretty-print if you have jq installed):
                                                  
+
                                                  php -r 'print(json_encode(unserialize(gzinflate(base64_decode(preg_replace("!.*/\* (.+) \*/.*!", "$1", file_get_contents("data/datastore.php")))))));' | jq .
                                                  
 
 
                                                    
 
                                                  • Look for <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> in tpl/editlink.tpl (line 14)
                                                    • 
-
                                                  • Remove type="hidden" from this line
                                                    • 
+
                                                  • Replace type="hidden" with type="text" from this line
                                                    • 
 
                                                  • A new date/time field becomes available in the edit/new link dialog.
                                                    • 
 
                                                  • You can set the timestamp manually by entering it in the format YYYMMDD_HHMMS.
                                                    • 
 
                                                  
diff --git a/doc/Datastore-hacks.md b/doc/Datastore-hacks.md
index 33aa222..ef6f6d5 100644
--- a/doc/Datastore-hacks.md
+++ b/doc/Datastore-hacks.md
@@ -12,8 +12,13 @@ exit;
 ```
 This will output the internal representation of the datastore, "unobfuscated" (if this can really be considered obfuscation).
 
+Alternatively, you can transform to JSON format (and pretty-print if you have `jq` installed):
+```
+php -r 'print(json_encode(unserialize(gzinflate(base64_decode(preg_replace("!.*/\* (.+) \*/.*!", "$1", file_get_contents("data/datastore.php")))))));' | jq .
+```
+
 ### Changing the timestamp for a link
 * Look for `` in `tpl/editlink.tpl` (line 14)
-* Remove `type="hidden"` from this line
+* Replace `type="hidden"` with `type="text"` from this line
 * A new date/time field becomes available in the edit/new link dialog.
 * You can set the timestamp manually by entering it in the format `YYYMMDD_HHMMS`.
diff --git a/doc/Development.html b/doc/Development.html
index 88cf585..f7ada07 100644
--- a/doc/Development.html
+++ b/doc/Development.html
@@ -4,12 +4,12 @@
   
   
   
-  Shaarli - Development
+  Shaarli – Development
   
-  
   
+  
 
 
 
                                                • 
+
                                              • Docker
                                                • 
+
                                              • Plugin list
                                                • 
 
                                              • Usage
 
                                                • 
 
                                              • How To
 
                                                • 
@@ -43,6 +51,7 @@
 
                                              • Directory structure
                                                • 
 
                                              • 3rd party libraries
                                                • 
 
                                              • Plugin System
                                                • 
+
                                              • Release Shaarli
                                                • 
 
                                              • Security
                                                • 
 
                                              • Static analysis
                                                • 
 
                                              • Theming
                                                • 
@@ -92,7 +101,7 @@
 
                                              
 
                                              After all jobs have finished, Travis returns the results to GitHub:
                                              
 
                                                
-
                                              • a status icon represents the result for the master branch: (https://api.travis-ci.org/shaarli/Shaarli.svg)
                                                • 
+
                                              • a status icon represents the result for the master branch: (https://api.travis-ci.org/shaarli/Shaarli.svg)
                                                • 
 
                                              • Pull Requests are updated with the Travis result
 
                                                  
 
                                                • Green: all tests have passed
                                                  • 
diff --git a/doc/Directory-structure.html b/doc/Directory-structure.html
index 7015923..2369950 100644
--- a/doc/Directory-structure.html
+++ b/doc/Directory-structure.html
@@ -4,31 +4,49 @@
   
   
   
-  Shaarli - Directory structure
+  Shaarli – Directory structure
   
-  
   
   
+  
 
 
 
                                                • 
+
                                              • Docker
                                                • 
+
                                              • Plugin list
                                                • 
 
                                              • Usage
 
                                                • 
 
                                              • How To
 
                                                • 
@@ -62,6 +88,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                              • Directory structure
                                                • 
 
                                              • 3rd party libraries
                                                • 
 
                                              • Plugin System
                                                • 
+
                                              • Release Shaarli
                                                • 
 
                                              • Security
                                                • 
 
                                              • Static analysis
                                                • 
 
                                              • Theming
                                                • 
@@ -77,7 +104,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
 
                                                Directory structure
                                                
 
                                                Here is the directory structure of Shaarli and the purpose of the different files:
                                                
-
                                                    index.php        # Main program
+
                                                    index.php        # Main program
     application/     # Shaarli classes
         ├── LinkDB.php
         └── Utils.php
@@ -104,6 +131,6 @@ code > span.er { color: #ff0000; font-weight: bold; }
     cache/           # thumbnails cache
                      # This directory is automatically created. You can erase it anytime you want.
     tmp/             # Temporary directory for compiled RainTPL templates.
-                     # This directory is automatically created. You can erase it anytime you want.
                                                
+                     # This directory is automatically created. You can erase it anytime you want.
                                                
 
 
diff --git a/doc/Docker.html b/doc/Docker.html
new file mode 100644
index 0000000..ab95da3
--- /dev/null
+++ b/doc/Docker.html
@@ -0,0 +1,245 @@
+
+
+
+  
+  
+  
+  Shaarli – Docker
+  
+  
+  
+  
+
+
+
+
                                                Docker
                                                
+
+
                                                Docker usage
                                                
+
                                                Basics
                                                
+
                                                Install Docker, by following the instructions relevant
                                                
+to your OS / distribution, and start the service.
                                                
+
                                                Search an image on DockerHub
                                                
+
                                                $ docker search debian
+
+NAME            DESCRIPTION                                     STARS   OFFICIAL   AUTOMATED
+ubuntu          Ubuntu is a Debian-based Linux operating s...   2065    [OK][](.html)
+debian          Debian is a Linux distribution that's comp...   603     [OK][](.html)
+google/debian                                                   47                 [OK][](.html)
                                                
+
                                                Show available tags for a repository
                                                
+
                                                $ curl https://index.docker.io/v1/repositories/debian/tags | python -m json.tool
+
+% Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
+Dload  Upload   Total   Spent    Left  Speed
+100  1283    0  1283    0     0    433      0 --:--:--  0:00:02 --:--:--   433
                                                
+
                                                Sample output:
                                                
+
                                                [[](.html)
+    {
+        "layer": "85a02782",
+        "name": "stretch"
+    },
+    {
+        "layer": "59abecbc",
+        "name": "testing"
+    },
+    {
+        "layer": "bf0fd686",
+        "name": "unstable"
+    },
+    {
+        "layer": "60c52dbe",
+        "name": "wheezy"
+    },
+    {
+        "layer": "c5b806fe",
+        "name": "wheezy-backports"
+    }
+]
                                                
+
                                                Pull an image from DockerHub
                                                
+
                                                $ docker pull repository[:tag][](.html)
+
+$ docker pull debian:wheezy
+wheezy: Pulling from debian
+4c8cbfd2973e: Pull complete
+60c52dbe9d91: Pull complete
+Digest: sha256:c584131da2ac1948aa3e66468a4424b6aea2f33acba7cec0b631bdb56254c4fe
+Status: Downloaded newer image for debian:wheezy
                                                
+
                                                Get and run a Shaarli image
                                                
+
                                                DockerHub repository
                                                
+
                                                The images can be found in the shaarli/shaarli
                                                
+repository.
                                                
+
                                                Available image tags
                                                
+
                                                  
+
                                                • latest: master branch (tarball release)
                                                  • 
+
                                                • stable: stable branch (tarball release)
                                                  • 
+
                                                • dev: master branch (Git clone)
                                                  • 
+
                                                
+
                                                All images rely on:
                                                
+
+
                                                Download from DockerHub
                                                
+
                                                $ docker pull shaarli/shaarli
+latest: Pulling from shaarli/shaarli
+32716d9fcddb: Pull complete
+84899d045435: Pull complete
+4b6ad7444763: Pull complete
+e0345ef7a3e0: Pull complete
+5c1dd344094f: Pull complete
+6422305a200b: Pull complete
+7d63f861dbef: Pull complete
+3eb97210645c: Pull complete
+869319d746ff: Already exists
+869319d746ff: Pulling fs layer
+902b87aaaec9: Already exists
+Digest: sha256:f836b4627b958b3f83f59c332f22f02fcd495ace3056f2be2c4912bd8704cc98
+Status: Downloaded newer image for shaarli/shaarli:latest
                                                
+
                                                Create and start a new container from the image
                                                
+
                                                # map the host's :8000 port to the container's :80 port
+$ docker create -p 8000:80 shaarli/shaarli
+d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
+
+# launch the container in the background
+$ docker start d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
+d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
+
+# list active containers
+$ docker ps
+CONTAINER ID  IMAGE            COMMAND               CREATED         STATUS        PORTS                 NAMES
+d40b7af693d6  shaarli/shaarli  /usr/bin/supervisor  15 seconds ago  Up 4 seconds  0.0.0.0:8000->80/tcp  backstabbing_galileo
                                                
+
                                                Stop and destroy a container
                                                
+
                                                $ docker stop backstabbing_galileo  # those docker guys are really rude to physicists!
+backstabbing_galileo
+
+# check the container is stopped
+$ docker ps
+CONTAINER ID  IMAGE            COMMAND               CREATED         STATUS        PORTS                 NAMES
+
+# list ALL containers
+$ docker ps -a
+CONTAINER ID        IMAGE               COMMAND                CREATED             STATUS                      PORTS               NAMES
+d40b7af693d6        shaarli/shaarli     /usr/bin/supervisor   5 minutes ago       Exited (0) 48 seconds ago                       backstabbing_galileo
+
+# destroy the container
+$ docker rm backstabbing_galileo  # let's put an end to these barbarian practices
+backstabbing_galileo
+
+$ docker ps -a
+CONTAINER ID  IMAGE            COMMAND               CREATED         STATUS        PORTS                 NAMES
                                                
+
                                                Resources
                                                
+
                                                Docker
                                                
+
+
                                                DockerHub
                                                
+
+
                                                Service management
                                                
+
+
+
diff --git a/doc/Docker.md b/doc/Docker.md
new file mode 100644
index 0000000..1faa790
--- /dev/null
+++ b/doc/Docker.md
@@ -0,0 +1,157 @@
+#Docker
+- [Docker usage](#docker-usage)[](.html)
+- [Get and run a Shaarli image](#get-and-run-a-shaarli-image)[](.html)
+- [Resources](#resources)[](.html)
+
+## Docker usage
+### Basics
+Install [Docker](https://www.docker.com/), by following the instructions relevant[](.html)
+to your OS / distribution, and start the service.
+
+#### Search an image on [DockerHub](https://hub.docker.com/)[](.html)
+
+```bash
+$ docker search debian
+
+NAME            DESCRIPTION                                     STARS   OFFICIAL   AUTOMATED
+ubuntu          Ubuntu is a Debian-based Linux operating s...   2065    [OK][](.html)
+debian          Debian is a Linux distribution that's comp...   603     [OK][](.html)
+google/debian                                                   47                 [OK][](.html)
+```
+
+#### Show available tags for a repository
+```bash
+$ curl https://index.docker.io/v1/repositories/debian/tags | python -m json.tool
+
+% Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
+Dload  Upload   Total   Spent    Left  Speed
+100  1283    0  1283    0     0    433      0 --:--:--  0:00:02 --:--:--   433
+```
+
+Sample output:
+```json
+[[](.html)
+    {
+        "layer": "85a02782",
+        "name": "stretch"
+    },
+    {
+        "layer": "59abecbc",
+        "name": "testing"
+    },
+    {
+        "layer": "bf0fd686",
+        "name": "unstable"
+    },
+    {
+        "layer": "60c52dbe",
+        "name": "wheezy"
+    },
+    {
+        "layer": "c5b806fe",
+        "name": "wheezy-backports"
+    }
+]
+
+```
+
+#### Pull an image from DockerHub
+```bash
+$ docker pull repository[:tag][](.html)
+
+$ docker pull debian:wheezy
+wheezy: Pulling from debian
+4c8cbfd2973e: Pull complete
+60c52dbe9d91: Pull complete
+Digest: sha256:c584131da2ac1948aa3e66468a4424b6aea2f33acba7cec0b631bdb56254c4fe
+Status: Downloaded newer image for debian:wheezy
+```
+
+## Get and run a Shaarli image
+### DockerHub repository
+The images can be found in the [`shaarli/shaarli`](https://hub.docker.com/r/shaarli/shaarli/)[](.html)
+repository.
+
+### Available image tags
+- `latest`: master branch (tarball release)
+- `stable`: stable branch (tarball release)
+- `dev`: master branch (Git clone)
+
+All images rely on:
+- [Debian 8 Jessie](https://hub.docker.com/_/debian/)[](.html)
+- [PHP5-FPM](http://php-fpm.org/)[](.html)
+- [Nginx](http://nginx.org/)[](.html)
+
+### Download from DockerHub
+```bash
+$ docker pull shaarli/shaarli
+latest: Pulling from shaarli/shaarli
+32716d9fcddb: Pull complete
+84899d045435: Pull complete
+4b6ad7444763: Pull complete
+e0345ef7a3e0: Pull complete
+5c1dd344094f: Pull complete
+6422305a200b: Pull complete
+7d63f861dbef: Pull complete
+3eb97210645c: Pull complete
+869319d746ff: Already exists
+869319d746ff: Pulling fs layer
+902b87aaaec9: Already exists
+Digest: sha256:f836b4627b958b3f83f59c332f22f02fcd495ace3056f2be2c4912bd8704cc98
+Status: Downloaded newer image for shaarli/shaarli:latest
+```
+
+### Create and start a new container from the image
+```bash
+# map the host's :8000 port to the container's :80 port
+$ docker create -p 8000:80 shaarli/shaarli
+d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
+
+# launch the container in the background
+$ docker start d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
+d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
+
+# list active containers
+$ docker ps
+CONTAINER ID  IMAGE            COMMAND               CREATED         STATUS        PORTS                 NAMES
+d40b7af693d6  shaarli/shaarli  /usr/bin/supervisor  15 seconds ago  Up 4 seconds  0.0.0.0:8000->80/tcp  backstabbing_galileo
+```
+
+### Stop and destroy a container
+```bash
+$ docker stop backstabbing_galileo  # those docker guys are really rude to physicists!
+backstabbing_galileo
+
+# check the container is stopped
+$ docker ps
+CONTAINER ID  IMAGE            COMMAND               CREATED         STATUS        PORTS                 NAMES
+
+# list ALL containers
+$ docker ps -a
+CONTAINER ID        IMAGE               COMMAND                CREATED             STATUS                      PORTS               NAMES
+d40b7af693d6        shaarli/shaarli     /usr/bin/supervisor   5 minutes ago       Exited (0) 48 seconds ago                       backstabbing_galileo
+
+# destroy the container
+$ docker rm backstabbing_galileo  # let's put an end to these barbarian practices
+backstabbing_galileo
+
+$ docker ps -a
+CONTAINER ID  IMAGE            COMMAND               CREATED         STATUS        PORTS                 NAMES
+```
+
+## Resources
+### Docker
+- [Where are Docker images stored?](http://blog.thoward37.me/articles/where-are-docker-images-stored/)[](.html)
+- [Dockerfile reference](https://docs.docker.com/reference/builder/)[](.html)
+- [Dockerfile best practices](https://docs.docker.com/articles/dockerfile_best-practices/)[](.html)
+- [Volumes](https://docs.docker.com/userguide/dockervolumes/)[](.html)
+
+### DockerHub
+- [Repositories](https://docs.docker.com/userguide/dockerrepos/)[](.html)
+- [Teams and organizations](https://docs.docker.com/docker-hub/orgs/)[](.html)
+- [GitHub automated build](https://docs.docker.com/docker-hub/github/)[](.html)
+
+### Service management
+- [Using supervisord](https://docs.docker.com/articles/using_supervisord/)[](.html)
+- [Nginx in the foreground](http://nginx.org/en/docs/ngx_core_module.html#daemon)[](.html)
+- [supervisord](http://supervisord.org/)[](.html)
diff --git a/doc/Download-CSS-styles-from-an-OPML-list.html b/doc/Download-CSS-styles-from-an-OPML-list.html
index 7d7fe96..aaafbfe 100644
--- a/doc/Download-CSS-styles-from-an-OPML-list.html
+++ b/doc/Download-CSS-styles-from-an-OPML-list.html
@@ -4,31 +4,49 @@
   
   
   
-  Shaarli - Download CSS styles from an OPML list
+  Shaarli – Download CSS styles from an OPML list
   
-  
   
   
+  
 
 
 
                                              • 
+
                                            • Docker
                                              • 
+
                                            • Plugin list
                                              • 
 
                                            • Usage
 
                                              • 
 
                                            • How To
 
                                              • 
@@ -62,6 +88,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                            • Directory structure
                                              • 
 
                                            • 3rd party libraries
                                              • 
 
                                            • Plugin System
                                              • 
+
                                            • Release Shaarli
                                              • 
 
                                            • Security
                                              • 
 
                                            • Static analysis
                                              • 
 
                                            • Theming
                                              • 
@@ -78,7 +105,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                              Download CSS styles from an OPML list
                                              
 
                                              Download CSS styles for shaarlis listed in an opml file
                                              
 
                                              Example php script:
                                              
-
                                              <!---- ?php -->
+
                                              <!---- ?php -->
 <!---- Copyright (c) 2014 Nicolas Delsaux (https://github.com/Riduidel) -->
 <!---- License: zlib (http://www.gzip.org/zlib/zlib_license.html) -->
 
@@ -226,6 +253,6 @@ code > span.er { color: #ff0000; font-weight: bold; }
 $knownStyles = findKnownStyles();
 copyUserStylesFrom(createShaarliHashFromOPMLL(SHAARLI_RSS_OPML), $knownStyles);
 
-<!--- ? ---->
                                              
+<!--- ? ---->
                                              
 
 
diff --git a/doc/Download.html b/doc/Download.html
index 5f39c70..6d668e8 100644
--- a/doc/Download.html
+++ b/doc/Download.html
@@ -4,31 +4,49 @@
   
   
   
-  Shaarli - Download
+  Shaarli – Download
   
-  
   
   
+  
 
 
 
                                            • 
+
                                          • Docker
                                            • 
+
                                          • Plugin list
                                            • 
 
                                          • Usage
 
                                            • 
 
                                          • How To
 
                                            • 
@@ -62,6 +88,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                          • Directory structure
                                            • 
 
                                          • 3rd party libraries
                                            • 
 
                                          • Plugin System
                                            • 
+
                                          • Release Shaarli
                                            • 
 
                                          • Security
                                            • 
 
                                          • Static analysis
                                            • 
 
                                          • Theming
                                            • 
@@ -80,18 +107,18 @@ code > span.er { color: #ff0000; font-weight: bold; }
 
                                            Latest stable revision
                                            
 
                                            This revision has been released and tested.
                                            
 
-
                                            $ git clone https://github.com/shaarli/Shaarli.git -b stable shaarli
                                            
+
                                            $ git clone https://github.com/shaarli/Shaarli.git -b stable shaarli
                                            
 
                                            Download as an archive
                                            
-
                                            $ wget https://github.com/shaarli/Shaarli/archive/stable.zip
+
                                            $ wget https://github.com/shaarli/Shaarli/archive/stable.zip
 $ unzip stable.zip
-$ mv Shaarli-stable shaarli
                                            
+$ mv Shaarli-stable shaarli
                                            
 
                                            Tarballs are also available:
                                            
-
                                            $ wget https://github.com/shaarli/Shaarli/archive/stable.tar.gz
+
                                            $ wget https://github.com/shaarli/Shaarli/archive/stable.tar.gz
 $ tar xvf stable.tar.gz
-$ mv Shaarli-stable shaarli
                                            
+$ mv Shaarli-stable shaarli
                                            
 
                                            Development (mainline)
                                            
 
                                            Use at your own risk!
                                            
 
                                            To get the latest changes:
                                            
-
                                            $ git clone https://github.com/shaarli/Shaarli.git shaarli
                                            
+
                                            $ git clone https://github.com/shaarli/Shaarli.git shaarli
                                            
 
 
diff --git a/doc/Example-patch---add-new-via-field-for-links.html b/doc/Example-patch---add-new-via-field-for-links.html
index 388ff96..d6f9a92 100644
--- a/doc/Example-patch---add-new-via-field-for-links.html
+++ b/doc/Example-patch---add-new-via-field-for-links.html
@@ -4,12 +4,12 @@
   
   
   
-  Shaarli - Example patch   add new via field for links
+  Shaarli – Example patch   add new via field for links
   
-  
   
+  
 
 
 
                                          • 
+
                                        • Docker
                                          • 
+
                                        • Plugin list
                                          • 
 
                                        • Usage
 
                                          • 
 
                                        • How To
 
                                          • 
@@ -43,6 +51,7 @@
 
                                        • Directory structure
                                          • 
 
                                        • 3rd party libraries
                                          • 
 
                                        • Plugin System
                                          • 
+
                                        • Release Shaarli
                                          • 
 
                                        • Security
                                          • 
 
                                        • Static analysis
                                          • 
 
                                        • Theming
                                          • 
diff --git a/doc/FAQ.html b/doc/FAQ.html
index 33eb7c6..72343b3 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -4,12 +4,12 @@
   
   
   
-  Shaarli - FAQ
+  Shaarli – FAQ
   
-  
   
+  
 
 
 
                                        
+
                                      • Docker
                                        • 
+
                                      • Plugin list
                                        • 
 
                                      • Usage
 
                                        • 
 
                                      • How To
 
                                        • 
@@ -43,6 +51,7 @@
 
                                      • Directory structure
                                        • 
 
                                      • 3rd party libraries
                                        • 
 
                                      • Plugin System
                                        • 
+
                                      • Release Shaarli
                                        • 
 
                                      • Security
                                        • 
 
                                      • Static analysis
                                        • 
 
                                      • Theming
                                        • 
diff --git a/doc/Firefox-share.html b/doc/Firefox-share.html
index 2943a86..0ae7060 100644
--- a/doc/Firefox-share.html
+++ b/doc/Firefox-share.html
@@ -4,12 +4,12 @@
   
   
   
-  Shaarli - Firefox share
+  Shaarli – Firefox share
   
-  
   
+  
 
 
 
                                      • 
+
                                    • Docker
                                      • 
+
                                    • Plugin list
                                      • 
 
                                    • Usage
 
                                      • 
 
                                    • How To
 
                                      • 
@@ -43,6 +51,7 @@
 
                                    • Directory structure
                                      • 
 
                                    • 3rd party libraries
                                      • 
 
                                    • Plugin System
                                      • 
+
                                    • Release Shaarli
                                      • 
 
                                    • Security
                                      • 
 
                                    • Static analysis
                                      • 
 
                                    • Theming
                                      • 
@@ -69,6 +78,19 @@
 
                                    • When you are visiting a webpage you would like to share with Shaarli, click the Firefox Share button images/firefoxshare.png
                                      • 
 
                                    • You can edit your link before and after saving, just like the bookmarklet above.
                                      •
                                    -

                                    |  | Your Shaarli instance must be hosted on an HTTPS (SSL/TLS secure connection) enabled server for Firefox Share to work. Firefox Share will not work over plain HTTP connections. |
                                    |------|-------------------------------------------------------------------------------|

                                    + ++++ + + + + + + + + +
                                    Your Shaarli instance must be hosted on an HTTPS (SSL/TLS secure connection) enabled server for Firefox Share to work. Firefox Share will not work over plain HTTP connections.
                                    diff --git a/doc/GnuPG-signature.html b/doc/GnuPG-signature.html index a1210b7..c187c99 100644 --- a/doc/GnuPG-signature.html +++ b/doc/GnuPG-signature.html @@ -4,31 +4,49 @@ - Shaarli - GnuPG signature + Shaarli – GnuPG signature - +
                                    @@ -39,18 +57,26 @@ code > span.er { color: #ff0000; font-weight: bold; }
                                  • Download
                                  • Server requirements
                                  • Server configuration
                                    • +
                                  • Server security
                                    • +
                                  • Shaarli installation
                                  • Shaarli configuration
                                    • +
                                  • Plugin installation & configuration
                                  • +
                                • Docker
                                  • +
                                • Plugin list
                                • Usage
                                • How To
                                  • @@ -62,6 +88,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                                • Directory structure
                                • 3rd party libraries
                                • Plugin System
                                  • +
                                • Release Shaarli
                                • Security
                                • Static analysis
                                • Theming
                                  • @@ -78,10 +105,13 @@ code > span.er { color: #ff0000; font-weight: bold; }

                                  GnuPG signature

                                  Introduction

                                  PGP and GPG

                                  -

                                  Gnu Privacy Guard (GnuPG) is an Open Source implementation of the Pretty Good [](.html)
                                  Privacy                                   (OpenPGP) specification. Its main purposes are digital authentication,
                                  signature and encryption.

                                  +

                                  Gnu Privacy Guard (GnuPG) is an Open Source implementation of the Pretty Good [](.html)
                                  +Privacy                                   (OpenPGP) specification. Its main purposes are digital authentication,
                                  +signature and encryption.

                                  It is often used by the FLOSS community to verify:

                                  Trust

                                  @@ -95,9 +125,12 @@ code > span.er { color: #ff0000; font-weight: bold; }
                                • Web of trust

                                Generate a GPG key

                                -

                                See Generating a GPG key for Git tagging.

                                +

                                gpg - provide identity information

                                -
                                $ gpg --gen-key
+
                                $ gpg --gen-key
 
 gpg (GnuPG) 2.1.6; Copyright (C) 2015 Free Software Foundation, Inc.
 This is free software: you are free to change and redistribute it.
@@ -116,7 +149,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
 We need to generate a lot of random bytes. It is a good idea to perform
 some other action (type on the keyboard, move the mouse, utilize the
 disks) during the prime generation; this gives the random number
-generator a better chance to gain enough entropy.
                                
+generator a better chance to gain enough entropy.

                                gpg - entropy interlude

                                At this point, you will:

                                  @@ -124,7 +157,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                                • be asked to use your machine's input devices (mouse, keyboard, etc.) to generate random entropy; this step may take some time

                                gpg - key creation confirmation

                                -
                                gpg: key A9D53A3E marked as ultimately trusted
+
                                gpg: key A9D53A3E marked as ultimately trusted
 public and secret key created and signed.
 
 gpg: checking the trustdb
@@ -133,69 +166,11 @@ code > span.er { color: #ff0000; font-weight: bold; }
 pub   rsa2048/A9D53A3E 2015-07-31
       Key fingerprint = AF2A 5381 E54B 2FD2 14C4  A9A3 0E35 ACA4 A9D5 3A3E
 uid       [ultimate] Marvin the Paranoid Android <marvin@h2g2.net>[](.html)
-sub   rsa2048/8C0EACF1 2015-07-31
                                
+sub   rsa2048/8C0EACF1 2015-07-31

                                gpg - submit your public key to a PGP server (Optional)

                                -
                                $ gpg --keyserver pgp.mit.edu --send-keys A9D53A3E
-gpg: sending key A9D53A3E to hkp server pgp.mit.edu
                                +
                                $ gpg --keyserver pgp.mit.edu --send-keys A9D53A3E
+gpg: sending key A9D53A3E to hkp server pgp.mit.edu

                                Create and push a GPG-signed tag

                                -

                                See Git - Maintaining a project - Tagging your [](.html)
                                releases                                .

                                -

                                Prerequisites

                                -

                                This guide assumes that you have:

                                -
                                  -
                                • a GPG key matching your GitHub authentication credentials -
                                    -
                                  • i.e., the email address identified by the GPG key is the same as the one in your ~/.gitconfig
                                    • -
                                  • -
                                • a GitHub fork of Shaarli
                                  • -
                                • a local clone of your Shaarli fork, with the following remotes: -
                                    -
                                  • origin pointing to your GitHub fork
                                    • -
                                  • upstream pointing to the main Shaarli repository
                                    • -
                                  • -
                                • maintainer permissions on the main Shaarli repository (to push the signed tag)
                                  • -
                                -

                                Bump Shaarli's version

                                -
                                $ cd /path/to/shaarli
-
-# create a new branch
-$ git fetch upstream
-$ git checkout upstream/master -b v0.5.0
-
-# bump the version number
-$ vim index.php shaarli_version.php
-
-# commit the changes
-$ git add index.php shaarli_version.php
-$ git commit -s -m "Bump version to v0.5.0"
-
-# push the commit on your GitHub fork
-$ git push origin v0.5.0
                                -

                                Create and merge a Pull Request

                                -

                                This one is pretty straightforward ;-)

                                -

                                Create and push a signed tag

                                -
                                # update your local copy
-$ git checkout master
-$ git fetch upstream
-$ git pull upstream master
-
-# create a signed tag
-$ git tag -s -m "Release v0.5.0" v0.5.0
-
-# push it to "upstream"
-$ git push --tags upstream
                                -

                                Verify a signed tag

                                -

                                v0.5.0 is the first GPG-signed tag pushed on the Community Shaarli.

                                -

                                Let's have a look at its signature!

                                -
                                $ cd /path/to/shaarli
-$ git fetch upstream
-
-# get the SHA1 reference of the tag
-$ git show-ref tags/v0.5.0
-f7762cf803f03f5caf4b8078359a63783d0090c1 refs/tags/v0.5.0
-
-# verify the tag signature information
-$ git verify-tag f7762cf803f03f5caf4b8078359a63783d0090c1
-gpg: Signature made Thu 30 Jul 2015 11:46:34 CEST using RSA key ID 4100DF6F
-gpg: Good signature from "VirtualTam <virtualtam@flibidi.net>" [ultimate][](.html)
                                +

                                See Release Shaarli.

                                diff --git a/doc/GnuPG-signature.md b/doc/GnuPG-signature.md index e8dbdb1..b0028d5 100644 --- a/doc/GnuPG-signature.md +++ b/doc/GnuPG-signature.md @@ -20,7 +20,8 @@ Trust can be gained by having your key signed by other people (and signing their - [Web of trust](https://en.wikipedia.org/wiki/Web_of_trust)[](.html) ## Generate a GPG key -See [Generating a GPG key for Git tagging](http://stackoverflow.com/a/16725717).[](.html) +- [Generating a GPG key for Git tagging](http://stackoverflow.com/a/16725717) (StackOverflow)[](.html) +- [Generating a GPG key](https://help.github.com/articles/generating-a-gpg-key/) (GitHub)[](.html) ### gpg - provide identity information ```bash @@ -72,70 +73,5 @@ gpg: sending key A9D53A3E to hkp server pgp.mit.edu ``` ## Create and push a GPG-signed tag -See [Git - Maintaining a project - Tagging your [](.html) -releases](http://git-scm.com/book/en/v2/Distributed-Git-Maintaining-a-Project#Tagging-Your-Releases). -### Prerequisites -This guide assumes that you have: -- a GPG key matching your GitHub authentication credentials - - i.e., the email address identified by the GPG key is the same as the one in your `~/.gitconfig` -- a GitHub fork of Shaarli -- a local clone of your Shaarli fork, with the following remotes: - - `origin` pointing to your GitHub fork - - `upstream` pointing to the main Shaarli repository -- maintainer permissions on the main Shaarli repository (to push the signed tag) - -### Bump Shaarli's version -```bash -$ cd /path/to/shaarli - -# create a new branch -$ git fetch upstream -$ git checkout upstream/master -b v0.5.0 - -# bump the version number -$ vim index.php shaarli_version.php - -# commit the changes -$ git add index.php shaarli_version.php -$ git commit -s -m "Bump version to v0.5.0" - -# push the commit on your GitHub fork -$ git push origin v0.5.0 -``` - -### Create and merge a Pull Request -This one is pretty straightforward ;-) - -### Create and push a signed tag -```bash -# update your local copy -$ git checkout master -$ git fetch upstream -$ git pull upstream master - -# create a signed tag -$ git tag -s -m "Release v0.5.0" v0.5.0 - -# push it to "upstream" -$ git push --tags upstream -``` - -### Verify a signed tag -[`v0.5.0`](https://github.com/shaarli/Shaarli/releases/tag/v0.5.0) is the first GPG-signed tag pushed on the Community Shaarli.[](.html) - -Let's have a look at its signature! - -```bash -$ cd /path/to/shaarli -$ git fetch upstream - -# get the SHA1 reference of the tag -$ git show-ref tags/v0.5.0 -f7762cf803f03f5caf4b8078359a63783d0090c1 refs/tags/v0.5.0 - -# verify the tag signature information -$ git verify-tag f7762cf803f03f5caf4b8078359a63783d0090c1 -gpg: Signature made Thu 30 Jul 2015 11:46:34 CEST using RSA key ID 4100DF6F -gpg: Good signature from "VirtualTam " [ultimate][](.html) -``` +See [Release Shaarli](Release-Shaarli.html). diff --git a/doc/Home.html b/doc/Home.html index 39d951c..827d256 100644 --- a/doc/Home.html +++ b/doc/Home.html @@ -4,12 +4,12 @@ - Shaarli - Home + Shaarli – Home - +
                                @@ -20,18 +20,26 @@
                              • Download
                              • Server requirements
                              • Server configuration
                                • +
                              • Server security
                                • +
                              • Shaarli installation
                              • Shaarli configuration
                                • +
                              • Plugin installation & configuration
                              • +
                            • Docker
                              • +
                            • Plugin list
                            • Usage
                            • How To
                              • @@ -43,6 +51,7 @@
                            • Directory structure
                            • 3rd party libraries
                            • Plugin System
                              • +
                            • Release Shaarli
                            • Security
                            • Static analysis
                            • Theming
                              • @@ -61,7 +70,7 @@

                              Welcome to the Shaarli wiki

                              Here you can find some info on how to use, configure, tweak and solve problems with your Shaarli.

                              For general info, read the README.

                              -

                              If you have any questions or ideas, please join the chat (also reachable via IRC), post them in our general discussion or read the current issues. If you've found a bug, please create a new issue.

                              +

                              If you have any questions or ideas, please join the chat (also reachable via IRC), post them in our general discussion (archive) or read the current issues. If you've found a bug, please create a new issue.

                              If you would like a feature added to Shaarli, check the issues labeled feature, enhancement, and plugin.

                              Note: This documentation is available online at https://github.com/shaarli/Shaarli/wiki, and locally in the doc/ directory of your Shaarli installation.

                              diff --git a/doc/Home.md b/doc/Home.md index a824d98..38413f2 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -7,7 +7,7 @@ Here you can find some info on how to use, configure, tweak and solve problems w For general info, read the [README](https://github.com/shaarli/Shaarli/blob/master/README.md).[](.html) -If you have any questions or ideas, please join the [chat](https://gitter.im/shaarli/Shaarli) (also reachable via [IRC](https://irc.gitter.im/)), post them in our [general discussion](https://github.com/shaarli/Shaarli/issues/44) or read the current [issues](https://github.com/shaarli/Shaarli/issues). If you've found a bug, please create a [new issue](https://github.com/shaarli/Shaarli/issues/new).[](.html) +If you have any questions or ideas, please join the [chat](https://gitter.im/shaarli/Shaarli) (also reachable via [IRC](https://irc.gitter.im/)), post them in our [general discussion](https://github.com/shaarli/Shaarli/issues/308) ([archive](https://github.com/shaarli/Shaarli/issues/44)) or read the current [issues](https://github.com/shaarli/Shaarli/issues). If you've found a bug, please create a [new issue](https://github.com/shaarli/Shaarli/issues/new).[](.html) If you would like a feature added to Shaarli, check the issues labeled [`feature`](https://github.com/shaarli/Shaarli/labels/feature), [`enhancement`](https://github.com/shaarli/Shaarli/labels/enhancement), and [`plugin`](https://github.com/shaarli/Shaarli/labels/plugin).[](.html) diff --git a/doc/Plugin-System.html b/doc/Plugin-System.html index cb1cb74..2a660c4 100644 --- a/doc/Plugin-System.html +++ b/doc/Plugin-System.html @@ -4,31 +4,49 @@ - Shaarli - Plugin System + Shaarli – Plugin System - +
                            • +
                          • Docker
                            • +
                          • Plugin list
                          • Usage
                          • How To
                            • @@ -62,6 +88,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                          • Directory structure
                          • 3rd party libraries
                          • Plugin System
                            • +
                          • Release Shaarli
                          • Security
                          • Static analysis
                          • Theming
                            • @@ -77,32 +104,11 @@ code > span.er { color: #ff0000; font-weight: bold; }

                            Plugin System

                            -

                            Note: Plugin current status - in developpement (not merged into master).

                            +

                            Note: Plugin current status - in development (not merged into master).

                            -

                            I am a user. Plugin User Guide.

                            -

                            I am a developper. Developper API.

                            +

                            I am a developer. Developer API.

                            I am a template designer. Guide for template designer.

                            -

                            Plugin User Guide

                            -

                            Manage plugins

                            -

                            In config.php, change $GLOBALS'config'['ENABLED_PLUGINS'] array:

                            -
                            $GLOBALS['config'['ENABLED_PLUGINS']]('ENABLED_PLUGINS'].html)
                            -

                            Full list:

                            -
                            $GLOBALS['config'['ENABLED_PLUGINS'] = array(]('ENABLED_PLUGINS']-=-array(.html)
-    'qrcode', 'archiveorg', 'readityourself', 'playvideos',
-    'wallabag', 'markdown', 'addlink_toolbar',
-);
                            -

                            List of plugins

                            -

                            Plugin maintained by the community:

                            -
                              -
                            • Archive.org - add a clickable icon to every link to archive.org.
                              • -
                            • Addlink in toolbar - add a field to paste new links URL in toolbar.
                              • -
                            • Markdown - write and display Shaare in Markdown.
                              • -
                            • Play videos - popup to play all videos displayed in linklist.
                              • -
                            • QRCode - add a clickable icon generating a QRCode for every link.
                              • -
                            • ReadItYourself - add a clickable icon for ReadItYourself.
                              • -
                            • Wallabag - add a clickable icon for Wallabag.
                              • -
                            -

                            Developper API

                            +

                            Developer API

                            What can I do with plugins?

                            The plugin system let you:

                              @@ -134,72 +140,86 @@ code > span.er { color: #ff0000; font-weight: bold; }

                              Template placeholders are displayed in template in specific places.

                              RainTPL displays every element contained in the placeholder's array. These element can be added by plugins.

                              For example, let's add a value in the placeholder top_placeholder which is displayed at the top of my page:

                              -
                              $data['top_placeholder'[] = 'My content';](]-=-'My-content';.html)
+
                              $data['top_placeholder'[] = 'My content';](]-=-'My-content';.html)
 # OR
 array_push($data['top_placeholder'], 'My', 'content');[](.html)
 
-return $data;
                              
+return $data;

                              Data manipulation

                              When a page is displayed, every variable send to the template engine is passed to plugins before that in $data.

                              The data contained by this array can be altered before template rendering.

                              For exemple, in linklist, it is possible to alter every title:

                              -
                              // mind the reference if you want $data to be altered
+
                              // mind the reference if you want $data to be altered
 foreach ($data['links'] as &$value) {[](.html)
     // String reverse every title.
     $value['title'] = strrev($value['title']);[](.html)
 }
 
-return $data;
                              
+return $data;
                              +

                              Metadata

                              +

                              Every plugin needs a <plugin_name>.meta file, which is in fact an .ini file (KEY="VALUE"), to be listed in plugin administration.

                              +

                              Each file contain two keys:

                              +
                                +
                              • description: plugin description
                                • +
                              • parameters: user parameter names, separated by a ;.
                                • +
                              +
                              +

                              Note: In PHP, parse_ini_file() seems to want strings to be between by quotes " in the ini file.

                              +

                              It's not working!

                              Use demo_plugin as a functional example. It covers most of the plugin system features.

                              If it's still not working, please open an issue.

                              Hooks

                              - +
                              ++++ - + - + - + - + - + - + - + - + - + - + - + @@ -393,6 +413,20 @@ code > span.er { color: #ff0000; font-weight: bold; }
                            • tags

                              • Guide for template designer

                              +

                              Plugin administration

                              +

                              Your theme must include a plugin administration page: pluginsadmin.html.

                              +
                              +

                              Note: repo's template link needs to be added when the PR is merged.

                              +
                              +

                              Use the default one as an example.

                              +

                              Aside from classic RainTPL loops, plugins order is handle by JavaScript. You can just include plugin_admin.js, only if:

                              +
                                +
                              • you're using a table.
                                • +
                              • you call orderUp() and orderUp() onclick on arrows.
                                • +
                              • you add data-line and data-order to your rows.
                                • +
                              +

                              Otherwise, you can use your own JS as long as this field is send by the form:

                              +

                              Placeholder system

                              In order to make plugins work with every custom themes, you need to add variable placeholder in your templates.

                              It's a RainTPL loop like this:

                              @@ -406,96 +440,104 @@ code > span.er { color: #ff0000; font-weight: bold; } 
                              {loop="$plugins_header.buttons_toolbar"}
     {$value}
 {/loop}
                              +

                              At the end of file, before clearing floating blocks:

                              +
                              {if="!empty($plugin_errors) && isLoggedIn()"}
+    <ul class="errors">
+        {loop="plugin_errors"}
+            <li>{$value}</li>
+        {/loop}
+    </ul>
+{/if}

                              includes.html

                              At the end of the file:

                              -
                              {loop="$plugins_includes.css_files"}
+
                              {loop="$plugins_includes.css_files"}
 <link type="text/css" rel="stylesheet" href="{$value}#"/>
-{/loop}
                              
+{/loop}

                              page.footer.html

                              At the end of your footer notes:

                              -
                              {loop="$plugins_footer.text"}
+
                              {loop="$plugins_footer.text"}
      {$value}
-{/loop}
                              
+{/loop}

                              At the end of file:

                              -
                              {loop="$plugins_footer.js_files"}
+
                              {loop="$plugins_footer.js_files"}
      <script src="{$value}#"></script>
-{/loop}
                              
+{/loop}

                              linklist.html

                              After search fields:

                              -
                              {loop="$plugins_header.fields_toolbar"}
+
                              {loop="$plugins_header.fields_toolbar"}
      {$value}
-{/loop}
                              
+{/loop}

                              Before displaying the link list (after paging):

                              -
                              {loop="$plugin_start_zone"}
+
                              {loop="$plugin_start_zone"}
      {$value}
-{/loop}
                              
+{/loop}

                              For every links (icons):

                              -
                              {loop="$value.link_plugin"}
+
                              {loop="$value.link_plugin"}
     <span>{$value}</span>
-{/loop}
                              
+{/loop}

                              Before end paging:

                              -
                              {loop="$plugin_end_zone"}
+
                              {loop="$plugin_end_zone"}
      {$value}
-{/loop}
                              
+{/loop}

                              linklist.paging.html

                              After the "private only" icon:

                              -
                              {loop="$action_plugin"}
+
                              {loop="$action_plugin"}
      {$value}
-{/loop}
                              
+{/loop}

                              editlink.html

                              After tags field:

                              -
                              {loop="$edit_link_plugin"}
+
                              {loop="$edit_link_plugin"}
      {$value}
-{/loop}
                              
+{/loop}

                              tools.html

                              After the last tool:

                              -
                              {loop="$tools_plugin"}
+
                              {loop="$tools_plugin"}
      {$value}
-{/loop}
                              
+{/loop}

                              picwall.html

                              Top:

                              -
                              <div id="plugin_zone_start_picwall" class="plugin_zone">
+
                              <div id="plugin_zone_start_picwall" class="plugin_zone">
     {loop="$plugin_start_zone"}
         {$value}
     {/loop}
-</div>
                              
+</div>

                              Bottom:

                              -
                              <div id="plugin_zone_end_picwall" class="plugin_zone">
+
                              <div id="plugin_zone_end_picwall" class="plugin_zone">
     {loop="$plugin_end_zone"}
         {$value}
     {/loop}
-</div>
                              
+</div>

                              tagcloud.html

                              Top:

                              -
                                 <div id="plugin_zone_start_tagcloud" class="plugin_zone">
+
                                 <div id="plugin_zone_start_tagcloud" class="plugin_zone">
         {loop="$plugin_start_zone"}
             {$value}
         {/loop}
-    </div>
                              
+    </div>

                              Bottom:

                              -
                                  <div id="plugin_zone_end_tagcloud" class="plugin_zone">
+
                                  <div id="plugin_zone_end_tagcloud" class="plugin_zone">
         {loop="$plugin_end_zone"}
             {$value}
         {/loop}
-    </div>
                              
+    </div>

                              daily.html

                              Top:

                              -
                              <div id="plugin_zone_start_picwall" class="plugin_zone">
+
                              <div id="plugin_zone_start_picwall" class="plugin_zone">
      {loop="$plugin_start_zone"}
          {$value}
      {/loop}
-</div>
                              
+</div>

                              After every link:

                              -
                              <div class="dailyEntryFooter">
+
                              <div class="dailyEntryFooter">
      {loop="$link.link_plugin"}
           {$value}
      {/loop}
-</div>
                              
+</div>

                              Bottom:

                              -
                              <div id="plugin_zone_end_picwall" class="plugin_zone">
+
                              <div id="plugin_zone_end_picwall" class="plugin_zone">
     {loop="$plugin_end_zone"}
         {$value}
     {/loop}
-</div>
                              
+</div>
                              diff --git a/doc/Plugin-System.md b/doc/Plugin-System.md index 8cba666..8281e61 100644 --- a/doc/Plugin-System.md +++ b/doc/Plugin-System.md @@ -1,44 +1,11 @@ #Plugin System -> Note: Plugin current status - in developpement (not merged into master). +> Note: Plugin current status - in development (not merged into master). -[**I am a user.** Plugin User Guide.](#plugin-user-guide)[](.html) - -[**I am a developper.** Developper API.](#developper-api)[](.html) +[**I am a developer.** Developer API.](#developer-api)[](.html) [**I am a template designer.** Guide for template designer.](#guide-for-template-designer)[](.html) -## Plugin User Guide - -### Manage plugins - -In `config.php`, change $GLOBALS['config'['ENABLED_PLUGINS'] array:]('ENABLED_PLUGINS']-array:.html) - -```php -$GLOBALS['config'['ENABLED_PLUGINS']]('ENABLED_PLUGINS'].html) -``` - -Full list: - -```php -$GLOBALS['config'['ENABLED_PLUGINS'] = array(]('ENABLED_PLUGINS']-=-array(.html) - 'qrcode', 'archiveorg', 'readityourself', 'playvideos', - 'wallabag', 'markdown', 'addlink_toolbar', -); -``` - -### List of plugins - -Plugin maintained by the community: - - * Archive.org - add a clickable icon to every link to archive.org. - * Addlink in toolbar - add a field to paste new links URL in toolbar. - * Markdown - write and display Shaare in Markdown. - * Play videos - popup to play all videos displayed in linklist. - * QRCode - add a clickable icon generating a QRCode for every link. - * ReadItYourself - add a clickable icon for ReadItYourself. - * Wallabag - add a clickable icon for Wallabag. - -## Developper API +## Developer API ### What can I do with plugins? @@ -123,6 +90,17 @@ foreach ($data['links'] as &$value) {[](.html) return $data; ``` +### Metadata + +Every plugin needs a `.meta` file, which is in fact an `.ini` file (`KEY="VALUE"`), to be listed in plugin administration. + +Each file contain two keys: + + * `description`: plugin description + * `parameters`: user parameter names, separated by a `;`. + +> Note: In PHP, `parse_ini_file()` seems to want strings to be between by quotes `"` in the ini file. + ### It's not working! Use `demo_plugin` as a functional example. It covers most of the plugin system features. @@ -399,6 +377,24 @@ Allow to alter the link being saved in the datastore. ## Guide for template designer +### Plugin administration + +Your theme must include a plugin administration page: `pluginsadmin.html`. + +> Note: repo's template link needs to be added when the PR is merged. + +Use the default one as an example. + +Aside from classic RainTPL loops, plugins order is handle by JavaScript. You can just include `plugin_admin.js`, only if: + + * you're using a table. + * you call orderUp() and orderUp() onclick on arrows. + * you add data-line and data-order to your rows. + +Otherwise, you can use your own JS as long as this field is send by the form: + + + ### Placeholder system In order to make plugins work with every custom themes, you need to add variable placeholder in your templates. @@ -421,6 +417,16 @@ At the end of the menu: {$value} {/loop} +At the end of file, before clearing floating blocks: + + {if="!empty($plugin_errors) && isLoggedIn()"} +
                                + {loop="plugin_errors"} +
                              • {$value}
                                • + {/loop} +
                              + {/if} + **includes.html** At the end of the file: diff --git a/doc/Plugin-installation-&-configuration.html b/doc/Plugin-installation-&-configuration.html new file mode 100644 index 0000000..3d2f970 --- /dev/null +++ b/doc/Plugin-installation-&-configuration.html @@ -0,0 +1,154 @@ + + + + + + + Shaarli – Plugin installation & configuration + + + + + + + +

                              Plugin installation & configuration

                              +

                              Plugin installation

                              +

                              There is a bunch of plugins shipped with Shaarli, where there is nothing to do to install them.

                              +

                              If you want to install a third party plugin:

                              +
                                +
                              • Download it.
                                • +
                              • Put it in the plugins directory in Shaarli's installation folder.
                                • +
                              • Make sure you put it correctly:
                                • +
                              +
                              | index.php
+| plugins/
+|---| custom_plugin/
+|   |---| custom_plugin.php
+|   |---| ...
+
                              +
                                +
                              • Make sure your webserver can read and write the files in your plugin folder.
                                • +
                              +

                              Plugin configuration

                              +

                              In Shaarli's administration page (Tools link), go to Plugin administration.

                              +

                              Here you can enable and disable all plugins available, and configure them.

                              +

                              administration screenshot

                              +

                              Plugin order

                              +

                              In the plugin administration page, you can move enabled plugins to the top or bottom of the list. The first plugins in the list will be processed first.

                              +

                              This is important in case plugins are depending on each other. Read plugins README details for more information.

                              +

                              Use case: The (non existent) plugin shaares_footer adds a footer to every shaare in Markdown syntax. It needs to be processed before (higher in the list) the Markdown plugin. Otherwise its syntax won't be translated in HTML.

                              +

                              File mode

                              +

                              Enabled plugin are stored in your config.php parameters file, under the array:

                              +
                              $GLOBALS['config'['ENABLED_PLUGINS']]('ENABLED_PLUGINS'].html)
                              +

                              You can edit them manually here.
                              +Example:

                              +
                              $GLOBALS['config'['ENABLED_PLUGINS'] = array(]('ENABLED_PLUGINS']-=-array(.html)
+    'qrcode', 
+    'archiveorg',
+    'wallabag',
+    'markdown',
+);
                              +

                              Plugin usage

                              +

                              Usage of each plugin is documented in it's README file:

                              +
                                +
                              • addlink-toolbar: Adds the addlink input on the linklist page
                                • +
                              • archiveorg: For each link, add an Archive.org icon
                                • +
                              • markdown: Render shaare description with Markdown syntax.
                                • +
                              • playvideos: Add a button in the toolbar allowing to watch all videos.
                                • +
                              • qrcode: For each link, add a QRCode icon.
                                • +
                              • readityourself: For each link, add a ReadItYourself icon to save the shaared URL
                                • +
                              • wallabag: For each link, add a Wallabag icon to save it in your instance.
                                • +
                              + + diff --git a/doc/Plugin-installation-&-configuration.md b/doc/Plugin-installation-&-configuration.md new file mode 100644 index 0000000..c260aa1 --- /dev/null +++ b/doc/Plugin-installation-&-configuration.md @@ -0,0 +1,69 @@ +#Plugin installation & configuration +## Plugin installation + +There is a bunch of plugins shipped with Shaarli, where there is nothing to do to install them. + +If you want to install a third party plugin: + + * Download it. + * Put it in the `plugins` directory in Shaarli's installation folder. + * Make sure you put it correctly: + +``` +| index.php +| plugins/ +|---| custom_plugin/ +| |---| custom_plugin.php +| |---| ... + +``` + + * Make sure your webserver can read and write the files in your plugin folder. + +## Plugin configuration + +In Shaarli's administration page (`Tools` link), go to `Plugin administration`. + +Here you can enable and disable all plugins available, and configure them. + +![administration screenshot](https://camo.githubusercontent.com/5da68e191969007492ca0fbeb25f3b2357b748cc/687474703a2f2f692e696d6775722e636f6d2f766837544643712e706e67)[](.html) + +## Plugin order + +In the plugin administration page, you can move enabled plugins to the top or bottom of the list. The first plugins in the list will be processed first. + +This is important in case plugins are depending on each other. Read plugins README details for more information. + +**Use case**: The (non existent) plugin `shaares_footer` adds a footer to every shaare in Markdown syntax. It needs to be processed *before* (higher in the list) the Markdown plugin. Otherwise its syntax won't be translated in HTML. + +## File mode + +Enabled plugin are stored in your `config.php` parameters file, under the `array`: + +```php +$GLOBALS['config'['ENABLED_PLUGINS']]('ENABLED_PLUGINS'].html) +``` + +You can edit them manually here. +Example: + +```php +$GLOBALS['config'['ENABLED_PLUGINS'] = array(]('ENABLED_PLUGINS']-=-array(.html) + 'qrcode', + 'archiveorg', + 'wallabag', + 'markdown', +); +``` + +### Plugin usage + +Usage of each plugin is documented in it's README file: + + * `addlink-toolbar`: Adds the addlink input on the linklist page + * `archiveorg`: For each link, add an Archive.org icon + * [`markdown`](https://github.com/shaarli/Shaarli/blob/master/plugins/markdown/README.md): Render shaare description with Markdown syntax.[](.html) + * [`playvideos`](https://github.com/shaarli/Shaarli/blob/master/plugins/playvideos/README.md): Add a button in the toolbar allowing to watch all videos.[](.html) + * `qrcode`: For each link, add a QRCode icon. + * `readityourself`: For each link, add a ReadItYourself icon to save the shaared URL + * [`wallabag`](https://github.com/shaarli/Shaarli/blob/master/plugins/wallabag/README.md): For each link, add a Wallabag icon to save it in your instance.[](.html) diff --git a/doc/Plugin-list.html b/doc/Plugin-list.html new file mode 100644 index 0000000..16eca04 --- /dev/null +++ b/doc/Plugin-list.html @@ -0,0 +1,87 @@ + + + + + + + Shaarli – Plugin list + + + + + + +

                              Plugin list

                              +

                              Community plugins

                              +

                              These plugins are maintained by the community:

                              +
                                +
                              • Archive.org - add a clickable icon to every link to archive.org.
                                • +
                              • Addlink in toolbar - add a field to paste new links URL in toolbar.
                                • +
                              • Markdown - write and display Shaare in Markdown.
                                • +
                              • Play videos - popup to play all videos displayed in linklist.
                                • +
                              • QRCode - add a clickable icon generating a QRCode for every link.
                                • +
                              • ReadItYourself - add a clickable icon for ReadItYourself.
                                • +
                              • Wallabag - add a clickable icon for Wallabag.
                                • +
                              +

                              Third party plugins

                              + + + diff --git a/doc/Plugin-list.md b/doc/Plugin-list.md new file mode 100644 index 0000000..bb4f553 --- /dev/null +++ b/doc/Plugin-list.md @@ -0,0 +1,18 @@ +#Plugin list +## Community plugins + +These plugins are maintained by the community: + + * Archive.org - add a clickable icon to every link to archive.org. + * Addlink in toolbar - add a field to paste new links URL in toolbar. + * Markdown - write and display Shaare in Markdown. + * Play videos - popup to play all videos displayed in linklist. + * QRCode - add a clickable icon generating a QRCode for every link. + * ReadItYourself - add a clickable icon for ReadItYourself. + * Wallabag - add a clickable icon for Wallabag. + +## Third party plugins + + * [autosave](https://github.com/kalvn/shaarli-plugin-autosave) by [@kalvn](https://github.com/kalvn): Automatically saves data when editing a link to avoid any loss in case of crash or unexpected shutdown.[](.html) + * [Code Coloration](https://github.com/ArthurHoaro/code-coloration) by [@ArthurHoaro](https://github.com/ArthurHoaro): client side code syntax highlighter.[](.html) + * [social](https://github.com/alexisju/social) by [@alexisju](https://github.com/alexisju): share links to social networks.[](.html) diff --git a/doc/RSS-feeds.html b/doc/RSS-feeds.html index 859869b..9b1447a 100644 --- a/doc/RSS-feeds.html +++ b/doc/RSS-feeds.html @@ -4,12 +4,12 @@ - Shaarli - RSS feeds + Shaarli – RSS feeds - +

                              RSS feeds

                              +

                              Feeds options

                              +

                              Feeds are available in ATOM with ?do=atom and RSS with do=RSS.

                              +

                              Options:

                              +
                                +
                              • You can use permalinks in the feed URL to get permalink to Shaares instead of direct link to shaared URL. +
                                  +
                                • E.G. https://my.shaarli.domain/?do=atom&permalinks.
                                  • +
                                • +
                              • You can use nb parameter in the feed URL to specify the number of Shaares you want in a feed (default if not specified: 50). The keyword all is available if you want everything. +
                                  +
                                • https://my.shaarli.domain/?do=atom&permalinks&nb=42
                                  • +
                                • https://my.shaarli.domain/?do=atom&permalinks&nb=all
                                  • +
                                • +

                              RSS Feeds or Picture Wall for a specific search/tag

                              It is possible to filter RSS/ATOM feeds and Picture Wall on a Shaarli to only display results of a specific search, or for a specific tag.

                              For example, if you want to subscribe only to links tagged photography:

                              diff --git a/doc/RSS-feeds.md b/doc/RSS-feeds.md index 764b3a4..757bed9 100644 --- a/doc/RSS-feeds.md +++ b/doc/RSS-feeds.md @@ -1,5 +1,17 @@ #RSS feeds +### Feeds options + +Feeds are available in ATOM with `?do=atom` and RSS with `do=RSS`. + +Options: +- You can use `permalinks` in the feed URL to get permalink to Shaares instead of direct link to shaared URL. + - E.G. `https://my.shaarli.domain/?do=atom&permalinks`. +- You can use `nb` parameter in the feed URL to specify the number of Shaares you want in a feed (default if not specified: `50`). The keyword `all` is available if you want everything. + - `https://my.shaarli.domain/?do=atom&permalinks&nb=42` + - `https://my.shaarli.domain/?do=atom&permalinks&nb=all` + ### RSS Feeds or Picture Wall for a specific search/tag + It is possible to filter RSS/ATOM feeds and Picture Wall on a Shaarli to **only display results of a specific search, or for a specific tag**. For example, if you want to subscribe only to links tagged `photography`: diff --git a/doc/Release-Shaarli.html b/doc/Release-Shaarli.html new file mode 100644 index 0000000..69b4947 --- /dev/null +++ b/doc/Release-Shaarli.html @@ -0,0 +1,171 @@ + + + + + + + Shaarli – Release Shaarli + + + + + + + +

                              Release Shaarli

                              +

                              See Git - Maintaining a project - Tagging your [](.html)
                              +releases                              .

                              +

                              Prerequisites

                              +

                              This guide assumes that you have:

                              +
                                +
                              • a GPG key matching your GitHub authentication credentials +
                                  +
                                • i.e., the email address identified by the GPG key is the same as the one in your ~/.gitconfig
                                  • +
                                • +
                              • a GitHub fork of Shaarli
                                • +
                              • a local clone of your Shaarli fork, with the following remotes: +
                                  +
                                • origin pointing to your GitHub fork
                                  • +
                                • upstream pointing to the main Shaarli repository
                                  • +
                                • +
                              • maintainer permissions on the main Shaarli repository (to push the signed tag)
                                • +
                              • Pandoc needs to be installed.
                                • +
                              +

                              Bump Shaarli's version

                              +
                              $ cd /path/to/shaarli
+
+# create a new branch
+$ git fetch upstream
+$ git checkout upstream/master -b v0.5.0
+
+# bump the version number
+$ vim index.php shaarli_version.php
+
+# rebuild the documentation from the wiki
+$ make htmldoc
+
+# commit the changes
+$ git add index.php shaarli_version.php doc
+$ git commit -s -m "Bump version to v0.5.0"
+
+# push the commit on your GitHub fork
+$ git push origin v0.5.0
                              +

                              Create and merge a Pull Request

                              +

                              This one is pretty straightforward ;-)

                              +

                              Create and push a signed tag

                              +
                              # update your local copy
+$ git checkout master
+$ git fetch upstream
+$ git pull upstream master
+
+# create a signed tag
+$ git tag -s -m "Release v0.5.0" v0.5.0
+
+# push it to "upstream"
+$ git push --tags upstream
                              +

                              Verify a signed tag

                              +

                              v0.5.0 is the first GPG-signed tag pushed on the Community Shaarli.

                              +

                              Let's have a look at its signature!

                              +
                              $ cd /path/to/shaarli
+$ git fetch upstream
+
+# get the SHA1 reference of the tag
+$ git show-ref tags/v0.5.0
+f7762cf803f03f5caf4b8078359a63783d0090c1 refs/tags/v0.5.0
+
+# verify the tag signature information
+$ git verify-tag f7762cf803f03f5caf4b8078359a63783d0090c1
+gpg: Signature made Thu 30 Jul 2015 11:46:34 CEST using RSA key ID 4100DF6F
+gpg: Good signature from "VirtualTam <virtualtam@flibidi.net>" [ultimate][](.html)
                              + + diff --git a/doc/Release-Shaarli.md b/doc/Release-Shaarli.md new file mode 100644 index 0000000..d5044fe --- /dev/null +++ b/doc/Release-Shaarli.md @@ -0,0 +1,72 @@ +#Release Shaarli +See [Git - Maintaining a project - Tagging your [](.html) +releases](http://git-scm.com/book/en/v2/Distributed-Git-Maintaining-a-Project#Tagging-Your-Releases). + +### Prerequisites +This guide assumes that you have: +- a GPG key matching your GitHub authentication credentials + - i.e., the email address identified by the GPG key is the same as the one in your `~/.gitconfig` +- a GitHub fork of Shaarli +- a local clone of your Shaarli fork, with the following remotes: + - `origin` pointing to your GitHub fork + - `upstream` pointing to the main Shaarli repository +- maintainer permissions on the main Shaarli repository (to push the signed tag) +- [Pandoc](http://pandoc.org/) needs to be installed.[](.html) + +### Bump Shaarli's version +```bash +$ cd /path/to/shaarli + +# create a new branch +$ git fetch upstream +$ git checkout upstream/master -b v0.5.0 + +# bump the version number +$ vim index.php shaarli_version.php + +# rebuild the documentation from the wiki +$ make htmldoc + +# commit the changes +$ git add index.php shaarli_version.php doc +$ git commit -s -m "Bump version to v0.5.0" + +# push the commit on your GitHub fork +$ git push origin v0.5.0 +``` + +### Create and merge a Pull Request +This one is pretty straightforward ;-) + +### Create and push a signed tag +```bash +# update your local copy +$ git checkout master +$ git fetch upstream +$ git pull upstream master + +# create a signed tag +$ git tag -s -m "Release v0.5.0" v0.5.0 + +# push it to "upstream" +$ git push --tags upstream +``` + +### Verify a signed tag +[`v0.5.0`](https://github.com/shaarli/Shaarli/releases/tag/v0.5.0) is the first GPG-signed tag pushed on the Community Shaarli.[](.html) + +Let's have a look at its signature! + +```bash +$ cd /path/to/shaarli +$ git fetch upstream + +# get the SHA1 reference of the tag +$ git show-ref tags/v0.5.0 +f7762cf803f03f5caf4b8078359a63783d0090c1 refs/tags/v0.5.0 + +# verify the tag signature information +$ git verify-tag f7762cf803f03f5caf4b8078359a63783d0090c1 +gpg: Signature made Thu 30 Jul 2015 11:46:34 CEST using RSA key ID 4100DF6F +gpg: Good signature from "VirtualTam " [ultimate][](.html) +``` diff --git a/doc/Security.html b/doc/Security.html index 914fa50..87a4ee4 100644 --- a/doc/Security.html +++ b/doc/Security.html @@ -4,31 +4,49 @@ - Shaarli - Security + Shaarli – Security - +
                              @@ -39,18 +57,26 @@ code > span.er { color: #ff0000; font-weight: bold; }
                            • Download
                            • Server requirements
                            • Server configuration
                              • +
                            • Server security
                              • +
                            • Shaarli installation
                            • Shaarli configuration
                              • +
                            • Plugin installation & configuration
                              • +
                            • Docker
                              • +
                            • Plugin list
                            • Usage
                            • How To
                              • @@ -62,6 +88,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                            • Directory structure
                            • 3rd party libraries
                            • Plugin System
                              • +
                            • Release Shaarli
                            • Security
                            • Static analysis
                            • Theming
                              • @@ -101,8 +128,8 @@ code > span.er { color: #ff0000; font-weight: bold; }
                            • Links are stored as an associative array which is serialized, compressed (with deflate), base64-encoded and saved as a comment in a .php file.
                            • Even if the server does not support .htaccess files, the data file will still not be readable by URL.

                            • The database looks like this:

                              -
                              <?php /* zP1ZjxxJtiYIvvevEPJ2lDOaLrZv7o...
-...ka7gaco/Z+TFXM2i7BlfMf8qxpaSSYfKlvqv/x8= */ ?>
                              • +
                              <?php /* zP1ZjxxJtiYIvvevEPJ2lDOaLrZv7o...
+...ka7gaco/Z+TFXM2i7BlfMf8qxpaSSYfKlvqv/x8= */ ?>

                            • Small hashes are used to make a link to an entry in Shaarli. They are unique. In fact, the date of the items (eg. 20110923_150523) is hashed with CRC32, then converted to base64 and some characters are replaced. They are always 6 characters longs and use only A-Z a-z 0-9 - _ and @.

                              • diff --git a/doc/Server-configuration.html b/doc/Server-configuration.html index 3aa8972..e1edf55 100644 --- a/doc/Server-configuration.html +++ b/doc/Server-configuration.html @@ -4,31 +4,49 @@ - Shaarli - Server configuration + Shaarli – Server configuration - +
                              @@ -39,18 +57,26 @@ code > span.er { color: #ff0000; font-weight: bold; }
                            • Download
                            • Server requirements
                            • Server configuration
                              • +
                            • Server security
                              • +
                            • Shaarli installation
                            • Shaarli configuration
                              • +
                            • Plugin installation & configuration
                              • +
                            • Docker
                              • +
                            • Plugin list
                            • Usage
                            • How To
                              • @@ -62,6 +88,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                            • Directory structure
                            • 3rd party libraries
                            • Plugin System
                              • +
                            • Release Shaarli
                            • Security
                            • Static analysis
                            • Theming
                              • @@ -79,10 +106,10 @@ code > span.er { color: #ff0000; font-weight: bold; }

                              Example virtual host configurations for popular web servers

                              Prerequisites

                              +

                              Shaarli

                              • Shaarli is installed in a directory readable/writeable by the user
                              • the correct read/write permissions have been granted to the web server user and/or group
                                • @@ -90,25 +117,35 @@ code > span.er { color: #ff0000; font-weight: bold; }
                              • a key pair (public, private) and a certificate have been generated
                              • the appropriate server SSL extension is installed and active
                              +

                              HTTPS, TLS and self-signed certificates

                              Related guides:

                              +

                              Proxies

                              +

                              If Shaarli is served behind a proxy (i.e. there is a proxy server between clients and the web server hosting Shaarli), please refer to the proxy server documentation for proper configuration. In particular, you have to ensure that the following server variables are properly set:

                              +
                                +
                              • X-Forwarded-Proto;
                                • +
                              • X-Forwarded-Host;
                                • +
                              • X-Forwarded-For.
                                • +
                              +

                              See also proxy-related issues.

                              Apache

                              Minimal

                              -
                              <VirtualHost *:80>
+
                              <VirtualHost *:80>
     ServerName   shaarli.my-domain.org
     DocumentRoot /absolute/path/to/shaarli/
-</VirtualHost>
                              
+</VirtualHost>

                              Debug - Log all the things!

                              This configuration will log both Apache and PHP errors, which may prove useful to identify server configuration errors.

                              See:

                              -
                              <VirtualHost *:80>
+
                              <VirtualHost *:80>
     ServerName   shaarli.my-domain.org
     DocumentRoot /absolute/path/to/shaarli/
 
@@ -120,24 +157,24 @@ code > span.er { color: #ff0000; font-weight: bold; }
     php_flag  display_errors on
     php_value error_reporting 2147483647
     php_value error_log /var/log/apache2/shaarli-php-error.log
-</VirtualHost>
                              
+</VirtualHost>

                              Standard - Keep access and error logs

                              -
                              <VirtualHost *:80>
+
                              <VirtualHost *:80>
     ServerName   shaarli.my-domain.org
     DocumentRoot /absolute/path/to/shaarli/
 
     LogLevel  warn
     ErrorLog  /var/log/apache2/shaarli-error.log
     CustomLog /var/log/apache2/shaarli-access.log combined
-</VirtualHost>
                              
+</VirtualHost>

                              Paranoid - Redirect HTTP (:80) to HTTPS (:443)

                              See Server-side TLS (Mozilla).

                              -
                              <VirtualHost *:443>
+
                              <VirtualHost *:443>
     ServerName   shaarli.my-domain.org
     DocumentRoot /absolute/path/to/shaarli/
 
     SSLEngine             on
-    SSLCertificateFile    /absolute/path/to/the/website/certificate.crt
+    SSLCertificateFile    /absolute/path/to/the/website/certificate.pem
     SSLCertificateKeyFile /absolute/path/to/the/website/key.key
 
     <Directory /absolute/path/to/shaarli/>
@@ -158,7 +195,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
     LogLevel  warn
     ErrorLog  /var/log/apache2/shaarli-error.log
     CustomLog /var/log/apache2/shaarli-access.log combined
-</VirtualHost>
                              
+</VirtualHost>

                              LightHttpd

                              Nginx

                              Foreword

                              @@ -204,13 +241,13 @@ code > span.er { color: #ff0000; font-weight: bold; }
                            • user:group = john:users,

                              • which corresponds to the following service configuration:

                              -
                              ; /etc/php/php-fpm.conf
+
                              ; /etc/php/php-fpm.conf
 user = john
 group = users
 
 [...][](.html)
 listen.owner = john
-listen.group = users
                              
+listen.group = users
                              # /etc/nginx/nginx.conf
 user john users;
 
@@ -374,5 +411,10 @@ http {
         include php.conf;
     }
 }
                              +

                              Restricting search engines and web crawler traffic

                              +

                              Creating a robots.txt witht he following contents at the root of your Shaarli installation will prevent "honest" web crawlers from indexing each and every link and Daily page from a Shaarli instance, thus getting rid of a certain amount of unsollicited network traffic.

                              +
                              User-agent: *
+Disallow: /
                              +

                              See: http://www.robotstxt.org/, http://www.robotstxt.org/robotstxt.html, http://www.robotstxt.org/meta.html

                              diff --git a/doc/Server-configuration.md b/doc/Server-configuration.md index c7b17c5..fd98a60 100644 --- a/doc/Server-configuration.md +++ b/doc/Server-configuration.md @@ -2,19 +2,29 @@ *Example virtual host configurations for popular web servers* - [Apache](#apache)[](.html) -- [LightHttpd](#lighthttpd) (empty)[](.html) - [Nginx](#nginx)[](.html) ## Prerequisites +### Shaarli * Shaarli is installed in a directory readable/writeable by the user * the correct read/write permissions have been granted to the web server _user and/or group_ * for HTTPS / SSL: * a key pair (public, private) and a certificate have been generated * the appropriate server SSL extension is installed and active +### HTTPS, TLS and self-signed certificates Related guides: * [How to Create Self-Signed SSL Certificates with OpenSSL](http://www.xenocafe.com/tutorials/linux/centos/openssl/self_signed_certificates/index.php)[](.html) * [How do I create my own Certificate Authority?](https://workaround.org/certificate-authority)[](.html) +* Generate a self-signed certificate (will trigger browser warnings) with apache2: `make-ssl-cert generate-default-snakeoil --force-overwrite` will create `/etc/ssl/certs/ssl-cert-snakeoil.pem` and `/etc/ssl/private/ssl-cert-snakeoil.key` + +### Proxies +If Shaarli is served behind a proxy (i.e. there is a proxy server between clients and the web server hosting Shaarli), please refer to the proxy server documentation for proper configuration. In particular, you have to ensure that the following server variables are properly set: +- `X-Forwarded-Proto`; +- `X-Forwarded-Host`; +- `X-Forwarded-For`. + +See also [proxy-related](https://github.com/shaarli/Shaarli/issues?utf8=%E2%9C%93&q=label%3Aproxy+) issues.[](.html) ## Apache ### Minimal @@ -29,7 +39,7 @@ This configuration will log both Apache and PHP errors, which may prove useful t See: * [Apache/PHP - error log per VirtualHost](http://stackoverflow.com/q/176) (StackOverflow)[](.html) -* [PHP: php_value vs php_admin_value and the use of php_flag explained](PHP: php_value vs php_admin_value and the use of php_flag explained)[](.html) +* [PHP: php_value vs php_admin_value and the use of php_flag explained](https://ma.ttias.be/php-php_value-vs-php_admin_value-and-the-use-of-php_flag-explained/)[](.html) ```apache @@ -68,7 +78,7 @@ See [Server-side TLS](https://wiki.mozilla.org/Security/Server_Side_TLS#Apache) DocumentRoot /absolute/path/to/shaarli/ SSLEngine on - SSLCertificateFile /absolute/path/to/the/website/certificate.crt + SSLCertificateFile /absolute/path/to/the/website/certificate.pem SSLCertificateKeyFile /absolute/path/to/the/website/key.key @@ -324,3 +334,15 @@ http { } } ``` + +## Restricting search engines and web crawler traffic + +Creating a `robots.txt` witht he following contents at the root of your Shaarli installation will prevent "honest" web crawlers from indexing each and every link and Daily page from a Shaarli instance, thus getting rid of a certain amount of unsollicited network traffic. + +``` +User-agent: * +Disallow: / +``` + +See: http://www.robotstxt.org/, http://www.robotstxt.org/robotstxt.html, http://www.robotstxt.org/meta.html + diff --git a/doc/Server-requirements.html b/doc/Server-requirements.html index f34f589..ff0ad9c 100644 --- a/doc/Server-requirements.html +++ b/doc/Server-requirements.html @@ -4,12 +4,12 @@ - Shaarli - Server requirements + Shaarli – Server requirements - +                               - - - + + + - + - + - + - +
                              HooksHooks Description
                              render_headerrender_header Allow plugin to add content in page headers.
                              render_includesrender_includes Allow plugin to include their own CSS files.
                              render_footerrender_footer Allow plugin to add content in page footer and include their own JS files.
                              render_linklistrender_linklist It allows to add content at the begining and end of the page, after every link displayed and to alter link data.
                              render_editlinkrender_editlink Allow to add fields in the form, or display elements.
                              render_toolsrender_tools Allow to add content at the end of the page.
                              render_picwallrender_picwall Allow to add content at the top and bottom of the page.
                              render_tagcloudrender_tagcloud Allow to add content at the top and bottom of the page.
                              render_dailyrender_daily Allow to add content at the top and bottom of the page, the bottom of each link and to alter data.
                              savelinksavelink Allow to alter the link being saved in the datastore.
                              7RC2planned7.0Supported✅
                              5.6 Supported:white_check_mark:✅
                              5.5 Supported:white_check_mark:✅
                              5.4 EOL: 2015-09-14:white_check_mark:✅
                              5.3 EOL: 2014-08-14:white_check_mark:✅
                              @@ -106,32 +116,40 @@ -

                              PHP 7 information:

                              -

                              Extensions

                              - +
                              +++++ - + - + - - - + + + - + + + + + + - + + + + + +
                              ExtensionExtension Required?UsageUsage
                              php-mbstringCentOS, Fedora, RHEL, Windowsmultibyte (Unicode) string supportopensslAllOpenSSL, HTTPS
                              php-gdphp-mbstringCentOS, Fedora, RHEL, Windowsmultibyte (Unicode) string support
                              php-gd -thumbnail resizingthumbnail resizing
                              php-intlOptionalTag cloud intelligent sorting (eg. e->è->f)
                              diff --git a/doc/Server-requirements.md b/doc/Server-requirements.md index 8f44d60..7955fdd 100644 --- a/doc/Server-requirements.md +++ b/doc/Server-requirements.md @@ -3,13 +3,14 @@ ### Release information - [PHP: Supported versions](http://php.net/supported-versions.php)[](.html) - [PHP: Unsupported versions](http://php.net/eol.php) _(EOL - End Of Life)_[](.html) +- [PHP 7 Changelog](http://php.net/ChangeLog-7.php)[](.html) - [PHP 5 Changelog](http://php.net/ChangeLog-5.php)[](.html) - [PHP: Bugs](https://bugs.php.net/)[](.html) ### Supported versions Version | Status | Shaarli compatibility :---:|:---:|:---: -7 | RC2 | planned +7.0 | Supported | :white_check_mark: 5.6 | Supported | :white_check_mark: 5.5 | Supported | :white_check_mark: 5.4 | EOL: 2015-09-14 | :white_check_mark: @@ -18,14 +19,10 @@ Version | Status | Shaarli compatibility See also: - [Travis configuration](https://github.com/shaarli/Shaarli/blob/master/.travis.yml)[](.html) -PHP 7 information: -- Announcements: [Beta1](http://php.net/archive/2015.php#id2015-07-10-4), [RC1](http://php.net/archive/2015.php#id2015-08-21-1), [RC2](http://php.net/archive/2015.php#id2015-09-04-1)[](.html) -- [TODOLIST](https://wiki.php.net/todo/php70)[](.html) -- [Recent bugs](https://bugs.php.net/search.php?limit=30&order_by=id&direction=DESC&cmd=display&status=Open&bug_type=All&phpver=7.0)[](.html) -- [Git repository](http://git.php.net/?p=php-src.git;a=shortlog;h=refs/heads/PHP-7.0.0)[](.html) - ### Extensions Extension | Required? | Usage ---|:---:|--- +[`openssl`](http://php.net/manual/en/book.openssl.php) | All | OpenSSL, HTTPS[](.html) [`php-mbstring`](http://php.net/manual/en/book.mbstring.php) | CentOS, Fedora, RHEL, Windows | multibyte (Unicode) string support[](.html) [`php-gd`](http://php.net/manual/en/book.image.php) | - | thumbnail resizing[](.html) +[`php-intl`](http://php.net/manual/fr/book.intl.php) | Optional | Tag cloud intelligent sorting (eg. `e->è->f`)[](.html) diff --git a/doc/Server-security.html b/doc/Server-security.html new file mode 100644 index 0000000..97f9378 --- /dev/null +++ b/doc/Server-security.html @@ -0,0 +1,166 @@ + + + + + + + Shaarli – Server security + + + + + + + +

                              Server security

                              +

                              php.ini

                              +

                              PHP settings are defined in:

                              +
                                +
                              • a main configuration file, usually found under /etc/php5/php.ini; some distributions provide different configuration environments, e.g. +
                                  +
                                • /etc/php5/php.ini - used when running console scripts
                                  • +
                                • /etc/php5/apache2/php.ini - used when a client requests PHP resources from Apache
                                  • +
                                • /etc/php5/php-fpm.conf - used when PHP requests are proxied to PHP-FPM
                                  • +
                                • +
                              • additional configuration files/entries, depending on the installed/enabled extensions: +
                                  +
                                • /etc/php/conf.d/xdebug.ini
                                  • +
                                • +
                              +

                              Locate .ini files

                              +

                              Console environment

                              +
                              $ php --ini
+Configuration File (php.ini) Path: /etc/php
+Loaded Configuration File:         /etc/php/php.ini
+Scan for additional .ini files in: /etc/php/conf.d
+Additional .ini files parsed:      /etc/php/conf.d/xdebug.ini
                              +

                              Server environment

                              +
                                +
                              • create a phpinfo.php script located in a path supported by the web server, e.g. +
                                  +
                                • Apache (with user dirs enabled): /home/myself/public_html/phpinfo.php
                                  • +
                                • /var/www/test/phpinfo.php
                                  • +
                                • +
                              • make sure the script is readable by the web server user/group (usually, www, www-data or httpd)
                                • +
                              • access the script from a web browser
                                • +

                              • look at the Loaded Configuration File and Scan this dir for additional .ini files entries

                                +
                                <?php phpinfo(); ?>
                                • +
                              +

                              fail2ban

                              +

                              fail2ban is an intrusion prevention framework that reads server (Apache, SSH, etc.) and uses iptables profiles to block brute-force attempts:

                              + +

                              Read Shaarli logs to ban IPs

                              +

                              Example configuration:

                              +
                                +
                              • allow 3 login attempts per IP address
                                • +
                              • after 3 failures, permanently ban the corresponding IP adddress
                                • +
                              +

                              /etc/fail2ban/jail.local

                              +
                              [shaarli-auth][](.html)
+enabled  = true
+port     = https,http
+filter   = shaarli-auth
+logpath  = /var/www/path/to/shaarli/data/log.txt
+maxretry = 3
+bantime = -1
                              +

                              /etc/fail2ban/filter.d/shaarli-auth.conf

                              +
                              [INCLUDES][](.html)
+before = common.conf
+[Definition][](.html)
+failregex = \s-\s<HOST>\s-\sLogin failed for user.*$
+ignoreregex =
                              + + diff --git a/doc/Server-security.md b/doc/Server-security.md new file mode 100644 index 0000000..0d16e28 --- /dev/null +++ b/doc/Server-security.md @@ -0,0 +1,60 @@ +#Server security +## php.ini +PHP settings are defined in: +- a main configuration file, usually found under `/etc/php5/php.ini`; some distributions provide different configuration environments, e.g. + - `/etc/php5/php.ini` - used when running console scripts + - `/etc/php5/apache2/php.ini` - used when a client requests PHP resources from Apache + - `/etc/php5/php-fpm.conf` - used when PHP requests are proxied to PHP-FPM +- additional configuration files/entries, depending on the installed/enabled extensions: + - `/etc/php/conf.d/xdebug.ini` + +### Locate .ini files +#### Console environment +```bash +$ php --ini +Configuration File (php.ini) Path: /etc/php +Loaded Configuration File: /etc/php/php.ini +Scan for additional .ini files in: /etc/php/conf.d +Additional .ini files parsed: /etc/php/conf.d/xdebug.ini +``` + +#### Server environment +- create a `phpinfo.php` script located in a path supported by the web server, e.g. + - Apache (with user dirs enabled): `/home/myself/public_html/phpinfo.php` + - `/var/www/test/phpinfo.php` +- make sure the script is readable by the web server user/group (usually, `www`, `www-data` or `httpd`) +- access the script from a web browser +- look at the _Loaded Configuration File_ and _Scan this dir for additional .ini files_ entries +```php + +``` + +## fail2ban +`fail2ban` is an intrusion prevention framework that reads server (Apache, SSH, etc.) and uses `iptables` profiles to block brute-force attempts: +- [Official website](http://www.fail2ban.org/wiki/index.php/Main_Page)[](.html) +- [Source code](https://github.com/fail2ban/fail2ban)[](.html) + +### Read Shaarli logs to ban IPs +Example configuration: +- allow 3 login attempts per IP address +- after 3 failures, permanently ban the corresponding IP adddress + +`/etc/fail2ban/jail.local` +```ini +[shaarli-auth][](.html) +enabled = true +port = https,http +filter = shaarli-auth +logpath = /var/www/path/to/shaarli/data/log.txt +maxretry = 3 +bantime = -1 +``` + +`/etc/fail2ban/filter.d/shaarli-auth.conf` +```ini +[INCLUDES][](.html) +before = common.conf +[Definition][](.html) +failregex = \s-\s\s-\sLogin failed for user.*$ +ignoreregex = +``` diff --git a/doc/Shaarli-configuration.html b/doc/Shaarli-configuration.html index b7e29cb..f53289f 100644 --- a/doc/Shaarli-configuration.html +++ b/doc/Shaarli-configuration.html @@ -4,31 +4,49 @@ - Shaarli - Shaarli configuration + Shaarli – Shaarli configuration - +
                            +
                          • Docker
                            • +
                          • Plugin list
                          • Usage
                          • How To
                            • @@ -62,6 +88,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                          • Directory structure
                          • 3rd party libraries
                          • Plugin System
                            • +
                          • Release Shaarli
                          • Security
                          • Static analysis
                          • Theming
                            • @@ -81,6 +108,7 @@ code > span.er { color: #ff0000; font-weight: bold; }

                            Once your Shaarli instance is installed, the file data/config.php is generated:

                            • it contains all settings, and can be edited to customize values
                              • +
                            • it defines which plugins are enabled
                            • its values override those defined in index.php

                            File and directory permissions

                            @@ -88,14 +116,14 @@ code > span.er { color: #ff0000; font-weight: bold; }
                            • read access to the following resources:
                                -
                              • PHP scripts: index.php, application/*.php
                                • -
                              • 3rd party PHP and Javascript libraries: inc/*.php, inc\*.js
                                • +
                              • PHP scripts: index.php, application/*.php, plugins/*.php
                                • +
                              • 3rd party PHP and Javascript libraries: inc/*.php, inc/*.js
                              • static assets:
                                  -
                                • CSS stylesheets: inc\*.css
                                  • -
                                • images\*
                                  • +
                                • CSS stylesheets: inc/*.css
                                  • +
                                • images/*
                                • -
                              • RainTPL templates: tpl\*.html
                                • +
                              • RainTPL templates: tpl/*.html
                            • read, write and execution access to the following directories:
                                @@ -117,7 +145,8 @@ code > span.er { color: #ff0000; font-weight: bold; }
                              • if you have a domain / subdomain to serve Shaarli, configure the server accordingly

                              Example data/config.php

                              -
                              <?php 
+
                              See also Plugin System.
                              
+
                              <?php 
 // User login
 $GLOBALS['login'] = '<login>';[](.html)
 
@@ -146,6 +175,10 @@ code > span.er { color: #ff0000; font-weight: bold; }
 // Whether new links are private by default
 $GLOBALS['privateLinkByDefault'] = false;[](.html)
 
+// Enabled plugins
+// Note: each plugin may provide further settings through its own "config.php"
+$GLOBALS['config'['ENABLED_PLUGINS'] = array('addlink_toolbar', 'qrcode');]('ENABLED_PLUGINS']-=-array('addlink_toolbar',-'qrcode');.html)
+
 // Subdirectory where Shaarli stores its data files.
 // You can change it for better security.
 $GLOBALS['config'['DATADIR'] = 'data';]('DATADIR']-=-'data';.html)
@@ -218,6 +251,11 @@ code > span.er { color: #ff0000; font-weight: bold; }
 // Show an ATOM Feed button next to the Subscribe (RSS) button.
 // ATOM feeds are available at the address ?do=atom regardless of this option.
 $GLOBALS['config'['SHOW_ATOM'] = false;]('SHOW_ATOM']-=-false;.html)
-?>
                              
+
+// Set this to true if the redirector requires encoded URL, false otherwise.
+$GLOBALS['config'['REDIRECTOR_URLENCODE'] = true;]('REDIRECTOR_URLENCODE']-=-true;.html)
+?>
                              +

                              Additional configuration

                              +

                              The playvideos plugin may require that you adapt your server's Content Security Policy configuration to work properly.

                              diff --git a/doc/Shaarli-configuration.md b/doc/Shaarli-configuration.md index 5bf70a6..d0560d7 100644 --- a/doc/Shaarli-configuration.md +++ b/doc/Shaarli-configuration.md @@ -5,17 +5,18 @@ Once your Shaarli instance is installed, the file `data/config.php` is generated: * it contains all settings, and can be edited to customize values +* it defines which [plugins](Plugin-System) are enabled[](.html) * its values override those defined in `index.php` ## File and directory permissions The server process running Shaarli must have: - `read` access to the following resources: - - PHP scripts: `index.php`, `application/*.php` - - 3rd party PHP and Javascript libraries: `inc/*.php`, `inc\*.js` + - PHP scripts: `index.php`, `application/*.php`, `plugins/*.php` + - 3rd party PHP and Javascript libraries: `inc/*.php`, `inc/*.js` - static assets: - - CSS stylesheets: `inc\*.css` - - `images\*` - - RainTPL templates: `tpl\*.html` + - CSS stylesheets: `inc/*.css` + - `images/*` + - RainTPL templates: `tpl/*.html` - `read`, `write` and `execution` access to the following directories: - `cache` - thumbnail cache - `data` - link data store, configuration options @@ -31,6 +32,8 @@ On a Linux distribution: - if you have a domain / subdomain to serve Shaarli, [configure the server](Server-configuration) accordingly[](.html) ## Example `data/config.php` +See also [Plugin System](Plugin-System.html). + ```php ``` + +## Additional configuration + +The playvideos plugin may require that you adapt your server's [Content Security Policy](https://github.com/shaarli/Shaarli/blob/master/plugins/playvideos/README.md#troubleshooting) configuration to work properly.[](.html) diff --git a/doc/Shaarli-installation.html b/doc/Shaarli-installation.html new file mode 100644 index 0000000..ae40b3a --- /dev/null +++ b/doc/Shaarli-installation.html @@ -0,0 +1,73 @@ + + + + + + + Shaarli – Shaarli installation + + + + + + +

                              Shaarli installation

                              +

                              Once Shaarli is downloaded and installed behind a web server, open it in your favorite browser.

                              +

                              install screenshot

                              +

                              Setup your Shaarli installation, and it's ready to use!

                              + + diff --git a/doc/Shaarli-installation.md b/doc/Shaarli-installation.md new file mode 100644 index 0000000..be9726e --- /dev/null +++ b/doc/Shaarli-installation.md @@ -0,0 +1,6 @@ +#Shaarli installation +Once Shaarli is downloaded and installed behind a web server, open it in your favorite browser. + +![install screenshot](http://i.imgur.com/wuMpDSN.png)[](.html) + +Setup your Shaarli installation, and it's ready to use! diff --git a/doc/Sharing-button.html b/doc/Sharing-button.html index 6fa5e77..6dfdd56 100644 --- a/doc/Sharing-button.html +++ b/doc/Sharing-button.html @@ -4,12 +4,12 @@ - Shaarli - Sharing button + Shaarli – Sharing button - +
                              @@ -20,18 +20,26 @@
                            • Download
                            • Server requirements
                            • Server configuration
                              • +
                            • Server security
                              • +
                            • Shaarli installation
                            • Shaarli configuration
                              • +
                            • Plugin installation & configuration
                            +
                          • Docker
                            • +
                          • Plugin list
                          • Usage
                          • How To
                            • @@ -43,6 +51,7 @@
                          • Directory structure
                          • 3rd party libraries
                          • Plugin System
                            • +
                          • Release Shaarli
                          • Security
                          • Static analysis
                          • Theming
                            • @@ -74,5 +83,13 @@
                          • You can also check the “Private” box so that the link is saved but only visible to you.
                          • Click Save.Voilà! Your link is now shared.
                          +

                          Troubleshooting: The bookmarklet doesn't work with a few website (e.g. Github.com)

                          +

                          Websites which enforce Content Security Policy (CSP), such as github.com, disallow usage of bookmarklets. Unfortunatly, there is nothing Shaarli can do about it.

                          +

                          See #196.

                          +

                          There is an open bug for both Firefox and Chromium:

                          + diff --git a/doc/Sharing-button.md b/doc/Sharing-button.md index fe576a7..e438886 100644 --- a/doc/Sharing-button.md +++ b/doc/Sharing-button.md @@ -17,3 +17,15 @@ _This bookmarklet button is compatible with Firefox, Opera, Chrome and Safari. U * You will be able to edit this link later using the ![(https://raw.githubusercontent.com/shaarli/Shaarli/master/images/edit_icon.png) edit button.]((https://raw.githubusercontent.com/shaarli/Shaarli/master/images/edit_icon.png)-edit-button..html) * You can also check the “Private” box so that the link is saved but only visible to you. * Click `Save`.**Voilà! Your link is now shared.** + +### Troubleshooting: The bookmarklet doesn't work with a few website (e.g. Github.com) + +Websites which enforce Content Security Policy (CSP), such as github.com, disallow usage of bookmarklets. Unfortunatly, there is nothing Shaarli can do about it. + +See [#196](https://github.com/shaarli/Shaarli#196).[](.html) + +There is an open bug for both Firefox and Chromium: + + * https://bugzilla.mozilla.org/show_bug.cgi?id=866522 + * https://code.google.com/p/chromium/issues/detail?id=233903 + diff --git a/doc/Static-analysis.html b/doc/Static-analysis.html index e95893a..6d1695c 100644 --- a/doc/Static-analysis.html +++ b/doc/Static-analysis.html @@ -4,12 +4,12 @@ - Shaarli - Static analysis + Shaarli – Static analysis - +
                          @@ -20,18 +20,26 @@
                        • Download
                        • Server requirements
                        • Server configuration
                          • +
                        • Server security
                          • +
                        • Shaarli installation
                        • Shaarli configuration
                          • +
                        • Plugin installation & configuration
                        • +
                      • Docker
                        • +
                      • Plugin list
                      • Usage
                      • How To
                        • @@ -43,6 +51,7 @@
                      • Directory structure
                      • 3rd party libraries
                      • Plugin System
                        • +
                      • Release Shaarli
                      • Security
                      • Static analysis
                      • Theming
                        • diff --git a/doc/TODO.html b/doc/TODO.html index 7a6a4bf..e7ce4f0 100644 --- a/doc/TODO.html +++ b/doc/TODO.html @@ -4,12 +4,12 @@ - Shaarli - TODO + Shaarli – TODO - +
                      • +
                    • Docker
                      • +
                    • Plugin list
                    • Usage
                    • How To
                      • @@ -43,6 +51,7 @@
                    • Directory structure
                    • 3rd party libraries
                    • Plugin System
                      • +
                    • Release Shaarli
                    • Security
                    • Static analysis
                    • Theming
                      • diff --git a/doc/Theming.html b/doc/Theming.html index a751eb9..1eda52e 100644 --- a/doc/Theming.html +++ b/doc/Theming.html @@ -4,31 +4,49 @@ - Shaarli - Theming + Shaarli – Theming - +
                    • +
                  • Docker
                    • +
                  • Plugin list
                  • Usage
                  • How To
                    • @@ -62,6 +88,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                  • Directory structure
                  • 3rd party libraries
                  • Plugin System
                    • +
                  • Release Shaarli
                  • Security
                  • Static analysis
                  • Theming
                    • @@ -89,14 +116,14 @@ code > span.er { color: #ff0000; font-weight: bold; }

                    RainTPL template

                    WARNING - This feature is currently being worked on and will be improved in the next releases. Experimental.

                      -
                    • Find the template you'd like to install (see the list of available templates|Theming#community-themes--templates)
                      • +
                    • Find the template you'd like to install (see the list of available templates|Theming#community-themes--templates)
                    • Find it's git clone URL or download the zip archive for the template.
                    • In your Shaarli tpl/ directory, run git clone https://url/of/my-template/ or unpack the zip archive.
                      • There should now be a my-template/ directory under the tpl/ dir, containing directly all the template files.

                    • Edit data/config.php to have Shaarli use this template, e.g.

                      -
                      $GLOBALS['config'['RAINTPL_TPL'] = 'tpl/my-template/';]('RAINTPL_TPL']-=-'tpl/my-template/';.html)
                      • +
                      $GLOBALS['config'['RAINTPL_TPL'] = 'tpl/my-template/';]('RAINTPL_TPL']-=-'tpl/my-template/';.html)

                    Community themes & templates

                      @@ -116,7 +143,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                    • user sites are enabled, e.g. /home/user/public_html/somedir is served as http://localhost/~user/somedir
                    • http is the name of the Apache user
                    -
                    $ cd ~/public_html
+
                    $ cd ~/public_html
 
 # clone repositories
 $ git clone https://github.com/shaarli/Shaarli.git shaarli
@@ -126,15 +153,15 @@ $ popd
 
 # set access rights for Apache
 $ chgrp -R http shaarli
-$ chmod g+rwx shaarli shaarli/cache shaarli/data shaarli/pagecache shaarli/tmp
                    
+$ chmod g+rwx shaarli shaarli/cache shaarli/data shaarli/pagecache shaarli/tmp

                    Get config written:

                    • go to the freshly installed site
                    • fill the install form
                    • log in to Shaarli
                    -

                    Edit Shaarli's configuration|Shaarli configuration:

                    -
                    # the file should be owned by Apache, thus not writeable => sudo
-$ sudo sed -i s=tpl=tpl/albinomouse-template=g shaarli/data/config.php
                    +

                    Edit Shaarli's configuration|Shaarli configuration:

                    +
                    # the file should be owned by Apache, thus not writeable => sudo
+$ sudo sed -i s=tpl=tpl/albinomouse-template=g shaarli/data/config.php
                    diff --git a/doc/Troubleshooting.html b/doc/Troubleshooting.html index 98fd535..0d58f32 100644 --- a/doc/Troubleshooting.html +++ b/doc/Troubleshooting.html @@ -4,31 +4,49 @@ - Shaarli - Troubleshooting + Shaarli – Troubleshooting - +
                  • +
                • Docker
                  • +
                • Plugin list
                • Usage
                • How To
                  • @@ -62,6 +88,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                • Directory structure
                • 3rd party libraries
                • Plugin System
                  • +
                • Release Shaarli
                • Security
                • Static analysis
                • Theming
                  • @@ -131,23 +158,24 @@ code > span.er { color: #ff0000; font-weight: bold; }

                  Login form is protected against brute force attacks: 4 failed logins will ban the IP address from login for 30 minutes. Banned IPs can still browse links.

                  To remove the current IP bans, delete the file data/ipbans.php

                  List of all login attempts

                  -

                  The file data/log.txt shows all logins (successful or failed) and bans/lifted bans.
                  Search for failed in this file to look for unauthorized login attempts.

                  +

                  The file data/log.txt shows all logins (successful or failed) and bans/lifted bans.
                  +Search for failed in this file to look for unauthorized login attempts.

                  Hosting problems

                  Old PHP versions

                  • On free.fr : free.fr now support php 5.6.x(link)and so support now the tag autocompletion but you have to do the following : At the root of your webspace create a sessions directory and a .htaccess file containing:
                  -
                  <IfDefine Free>
+
                  <IfDefine Free>
 php56 1
-</IfDefine>
                  
+</IfDefine>
                  • If you have an error such as: Parse error: syntax error, unexpected '=', expecting '(' in /links/index.php on line xxx, it means that your host is using php4, not php5. Shaarli requires php 5.1. Try changing the file extension to .php5
                  • On 1and1 : If you add the link from the page (and not from the bookmarklet), Shaarli will no be able to get the title of the page. You will have to enter it manually. (Because they have disabled the ability to download a file through HTTP).
                  • If you have the error Warning: file_get_contents() [function.file-get-contents]: URL file-access is disabled in the server configuration in /…/index.php on line xxx, it means that your host has disabled the ability to fetch a file by HTTP in the php config (Typically in 1and1 hosting). Bad host. Change host. Or comment the following lines:
                  -
                  //list($status,$headers,$data) = getHTTP($url,4); // Short timeout to keep the application responsive.
+
                  //list($status,$headers,$data) = getHTTP($url,4); // Short timeout to keep the application responsive.
 // FIXME: Decode charset according to charset specified in either 1) HTTP response headers or 2) <head> in html 
-//if (strpos($status,'200 OK')) $title=html_extract_title($data);
                  
+//if (strpos($status,'200 OK')) $title=html_extract_title($data);
                  • On hosts which forbid outgoing HTTP requests (such as free.fr), some thumbnails will not work.
                  • On lost-oasis, RSS doesn't work correctly, because of this message at the begining of the RSS/ATOM feed : <? // tout ce qui est charge ici (generalement des includes et require) est charge en permanence. ?>. To fix this, remove this message from php-include/prepend.php
                    • diff --git a/doc/Unit-tests.html b/doc/Unit-tests.html index 6d76077..b933bc7 100644 --- a/doc/Unit-tests.html +++ b/doc/Unit-tests.html @@ -4,31 +4,49 @@ - Shaarli - Unit tests + Shaarli – Unit tests - +
                  +
                • Docker
                  • +
                • Plugin list
                • Usage
                • How To
                  • @@ -62,6 +88,7 @@ code > span.er { color: #ff0000; font-weight: bold; }
                • Directory structure
                • 3rd party libraries
                • Plugin System
                  • +
                • Release Shaarli
                • Security
                • Static analysis
                • Theming
                  • @@ -84,27 +111,27 @@ code > span.er { color: #ff0000; font-weight: bold; }
                • a local version, downloadable here

                Sample usage

                -
                # system-wide version
+
                # system-wide version
 $ composer install
 $ composer update
 
 # local version
 $ php composer.phar self-update
 $ php composer.phar install
-$ php composer.phar update
                
+$ php composer.phar update

                Install Shaarli dev dependencies

                -
                $ cd /path/to/shaarli
-$ composer update
                +
                $ cd /path/to/shaarli
+$ composer update

                Install and enable Xdebug to generate PHPUnit coverage reports

                For Debian-based distros:

                -
                $ aptitude install php5-xdebug
                +
                $ aptitude install php5-xdebug

                For ArchLinux:

                -
                $ pacman -S xdebug
                +
                $ pacman -S xdebug

                Then add the following line to /etc/php/php.ini:

                -
                zend_extension=xdebug.so
                +
                zend_extension=xdebug.so

                Run unit tests

                Successful test suite:

                -
                $ make test
+
                $ make test
 
 -------
 PHPUNIT
@@ -117,9 +144,9 @@ $ composer update
                
 
 Time: 759 ms, Memory: 8.25Mb
 
-OK (36 tests, 65 assertions)
                +OK (36 tests, 65 assertions)

                Test suite with failures and errors:

                -
                $ make test
+
                $ make test
 -------
 PHPUNIT
 -------
@@ -165,7 +192,7 @@ DBTest.php on line 79 and defined
 /home/virtualtam/public_html/shaarli/tests/LinkDBTest.php:133
 
 FAILURES!
-Tests: 36, Assertions: 63, Errors: 1, Failures: 2.
                
+Tests: 36, Assertions: 63, Errors: 1, Failures: 2.

                Test results and coverage

                By default, PHPUnit will run all suitable tests found under the tests directory.

                Each test has 3 possible outcomes:

                diff --git a/doc/Upgrade-from-original-sebsauvage-Shaarli.html b/doc/Upgrade-from-original-sebsauvage-Shaarli.html new file mode 100644 index 0000000..5297c8b --- /dev/null +++ b/doc/Upgrade-from-original-sebsauvage-Shaarli.html @@ -0,0 +1,75 @@ + + + + + + + Shaarli – Upgrade from original sebsauvage Shaarli + + + + + + +

                Upgrade from original sebsauvage Shaarli

                +
                  +
                • Backup your original data/ directory.
                  • +
                • Install and setup the Shaarli community fork.
                  • +
                • Copy your original data directory over the new installation.
                  • +
                + + diff --git a/doc/Upgrade-from-original-sebsauvage-Shaarli.md b/doc/Upgrade-from-original-sebsauvage-Shaarli.md new file mode 100644 index 0000000..6ae0c67 --- /dev/null +++ b/doc/Upgrade-from-original-sebsauvage-Shaarli.md @@ -0,0 +1,4 @@ +#Upgrade from original sebsauvage Shaarli + * Backup your original `data/` directory. + * [Install](https://github.com/shaarli/Shaarli#installation--upgrade) and setup the Shaarli community fork.[](.html) + * Copy your original `data` directory over the new installation. diff --git a/doc/Usage.html b/doc/Usage.html index 0ba457f..5b4b8a5 100644 --- a/doc/Usage.html +++ b/doc/Usage.html @@ -4,12 +4,12 @@ - Shaarli - Usage + Shaarli – Usage - +
                @@ -20,18 +20,26 @@
              • Download
              • Server requirements
              • Server configuration
                • +
              • Server security
                • +
              • Shaarli installation
              • Shaarli configuration
                • +
              • Plugin installation & configuration
              • +
            • Docker
              • +
            • Plugin list
            • Usage
            • How To
              • @@ -43,6 +51,7 @@
            • Directory structure
            • 3rd party libraries
            • Plugin System
              • +
            • Release Shaarli
            • Security
            • Static analysis
            • Theming
              • diff --git a/doc/_Footer.html b/doc/_Footer.html index 9803238..8cc166a 100644 --- a/doc/_Footer.html +++ b/doc/_Footer.html @@ -4,12 +4,12 @@ - Shaarli - _Footer + Shaarli – _Footer - +
            • +
          • Docker
            • +
          • Plugin list
          • Usage
          • How To
            • @@ -43,6 +51,7 @@
          • Directory structure
          • 3rd party libraries
          • Plugin System
            • +
          • Release Shaarli
          • Security
          • Static analysis
          • Theming
            • @@ -56,6 +65,7 @@
        -

        _Footer
        Shaarli, the personal, minimalist, super-fast, no-database delicious clone

        +

        _Footer
        +Shaarli, the personal, minimalist, super-fast, no-database delicious clone

        diff --git a/doc/_Sidebar.html b/doc/_Sidebar.html index fbf6dff..2c7d283 100644 --- a/doc/_Sidebar.html +++ b/doc/_Sidebar.html @@ -4,12 +4,12 @@ - Shaarli - _Sidebar + Shaarli – _Sidebar - +
        @@ -20,18 +20,26 @@
      • Download
      • Server requirements
      • Server configuration
        • +
      • Server security
        • +
      • Shaarli installation
      • Shaarli configuration
        • +
      • Plugin installation & configuration
      • +
    • Docker
      • +
    • Plugin list
    • Usage
    • How To
      • @@ -43,6 +51,7 @@
    • Directory structure
    • 3rd party libraries
    • Plugin System
      • +
    • Release Shaarli
    • Security
    • Static analysis
    • Theming
      • @@ -64,18 +73,26 @@
    • Download
    • Server requirements
    • Server configuration
      • +
    • Server security
      • +
    • Shaarli installation
    • Shaarli configuration
      • +
    • Plugin installation & configuration
    • +
  • Docker
    • +
  • Plugin list
  • Usage
  • How To
    • @@ -87,6 +104,7 @@
  • Directory structure
  • 3rd party libraries
  • Plugin System
    • +
  • Release Shaarli
  • Security
  • Static analysis
  • Theming
    • diff --git a/doc/_Sidebar.md b/doc/_Sidebar.md index 68e3b9f..4522c25 100644 --- a/doc/_Sidebar.md +++ b/doc/_Sidebar.md @@ -4,14 +4,22 @@ - [Download](Download.html) - [Server requirements](Server-requirements.html) - [Server configuration](Server-configuration.html) + - [Server security](Server-security.html) + - [Shaarli installation](Shaarli-installation.html) - [Shaarli configuration](Shaarli-configuration.html) + - [Plugin installation & configuration](Plugin-installation-&-configuration.html) +- [Docker](Docker.html) +- [Plugin list](Plugin-list.html) - [Usage](Usage.html) - [Sharing button](Sharing-button.html) (bookmarklet) + - [Browsing and Searching](Browsing-and-Searching.html) - [Firefox share](Firefox-share.html) - [RSS feeds](RSS-feeds.html) - How To - [Backup, restore, import and export](Backup,-restore,-import-and-export.html) + - [Upgrade from original sebsauvage/Shaarli](Upgrade-from-original-sebsauvage/Shaarli.html) - [Copy an existing installation over SSH and serve it locally](Copy-an-existing-installation-over-SSH-and-serve-it-locally.html) + - [Create and serve multiple Shaarlis (farm)](Create-and-serve-multiple-Shaarlis-(farm).html) - [Download CSS styles from an OPML list](Download-CSS-styles-from-an-OPML-list.html) - [Datastore hacks](Datastore-hacks.html) - [Troubleshooting](Troubleshooting.html) @@ -21,6 +29,7 @@ - [Directory structure](Directory-structure.html) - [3rd party libraries](3rd-party-libraries.html) - [Plugin System](Plugin-System.html) + - [Release Shaarli](Release-Shaarli.html) - [Security](Security.html) - [Static analysis](Static-analysis.html) - [Theming](Theming.html) diff --git a/doc/images/doc-logo.svg b/doc/images/doc-logo.svg new file mode 100644 index 0000000..37fc665 --- /dev/null +++ b/doc/images/doc-logo.svg @@ -0,0 +1,522 @@ + + + Shaarli Logo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Shaarli Logo + + + http://blog.idleman.fr/ + + + 2012-08-29 22:36:01+02:00 + + + http://sebsauvage.net/ + + + + + Shaarli + Logo + + + + + http://thatguynamedandy.com/, +http://mro.name/me + + + + http://sebsauvage.net/files/shaarli_logo.zip + http://sebsauvage.net/wiki/doku.php?id=php:shaarli:discussion#comment_09a1e91bc0abc7db6d186a6abf429877 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/sidebar.html b/doc/sidebar.html index 826e4cb..8603eca 100644 --- a/doc/sidebar.html +++ b/doc/sidebar.html @@ -6,18 +6,26 @@
  • Download
  • Server requirements
  • Server configuration
    • +
  • Server security
    • +
  • Shaarli installation
  • Shaarli configuration
    • +
  • Plugin installation & configuration
    • +
  • Docker
    • +
  • Plugin list
  • Usage
  • How To
    • @@ -29,6 +37,7 @@
  • Directory structure
  • 3rd party libraries
  • Plugin System
    • +
  • Release Shaarli
  • Security
  • Static analysis
  • Theming
    • From 69a1a90c27953b8a2523f6e49258170cdc6b682d Mon Sep 17 00:00:00 2001 From: kalvn Date: Tue, 3 May 2016 19:05:36 +0200 Subject: [PATCH 313/658] Renames Awesomeplete dollar variable to avoid conflicts with jQuery --- inc/awesomplete-multiple-tags.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/awesomplete-multiple-tags.js b/inc/awesomplete-multiple-tags.js index e0f889b..4cc8429 100644 --- a/inc/awesomplete-multiple-tags.js +++ b/inc/awesomplete-multiple-tags.js @@ -1,5 +1,5 @@ -$ = Awesomplete.$; -awesomplete = new Awesomplete($('input[data-multiple]'), { +var awp = Awesomplete.$; +awesomplete = new Awesomplete(awp('input[data-multiple]'), { filter: function(text, input) { return Awesomplete.FILTER_CONTAINS(text, input.match(/[^ ]*$/)[0]); }, From ce7b0b6480aa854ee6893f5c889277b0e3b13efc Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 6 Apr 2016 22:00:52 +0200 Subject: [PATCH 314/658] Fixes #531 - Title retrieving is failing with multiple use case see https://github.com/shaarli/Shaarli/issues/531 for details --- application/HttpUtils.php | 60 +++++++++++++++++++++++++----- application/LinkUtils.php | 6 +-- application/Url.php | 42 +++++++++++++++++++++ index.php | 8 ++-- tests/HttpUtils/GetHttpUrlTest.php | 27 ++++++++++++++ tests/Url/UrlTest.php | 15 ++++++++ 6 files changed, 142 insertions(+), 16 deletions(-) diff --git a/application/HttpUtils.php b/application/HttpUtils.php index af7cb37..0e1ce87 100644 --- a/application/HttpUtils.php +++ b/application/HttpUtils.php @@ -27,7 +27,9 @@ function get_http_response($url, $timeout = 30, $maxBytes = 4194304) { $urlObj = new Url($url); - if (! filter_var($url, FILTER_VALIDATE_URL) || ! $urlObj->isHttp()) { + $cleanUrl = $urlObj->indToAscii(); + + if (! filter_var($cleanUrl, FILTER_VALIDATE_URL) || ! $urlObj->isHttp()) { return array(array(0 => 'Invalid HTTP Url'), false); } @@ -35,22 +37,27 @@ function get_http_response($url, $timeout = 30, $maxBytes = 4194304) 'http' => array( 'method' => 'GET', 'timeout' => $timeout, - 'user_agent' => 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:23.0)' - .' Gecko/20100101 Firefox/23.0', - 'request_fulluri' => true, + 'user_agent' => 'Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:45.0)' + .' Gecko/20100101 Firefox/45.0', + 'accept_language' => substr(setlocale(LC_COLLATE, 0), 0, 2) . ',en-US;q=0.7,en;q=0.3', ) ); - $context = stream_context_create($options); stream_context_set_default($options); + list($headers, $finalUrl) = get_redirected_headers($cleanUrl); + if (! $headers || strpos($headers[0], '200 OK') === false) { + $options['http']['request_fulluri'] = true; + stream_context_set_default($options); + list($headers, $finalUrl) = get_redirected_headers($cleanUrl); + } - list($headers, $finalUrl) = get_redirected_headers($urlObj->cleanup()); if (! $headers || strpos($headers[0], '200 OK') === false) { return array($headers, false); } try { // TODO: catch Exception in calling code (thumbnailer) + $context = stream_context_create($options); $content = file_get_contents($finalUrl, false, $context, -1, $maxBytes); } catch (Exception $exc) { return array(array(0 => 'HTTP Error'), $exc->getMessage()); @@ -60,16 +67,19 @@ function get_http_response($url, $timeout = 30, $maxBytes = 4194304) } /** - * Retrieve HTTP headers, following n redirections (temporary and permanent). + * Retrieve HTTP headers, following n redirections (temporary and permanent ones). * - * @param string $url initial URL to reach. - * @param int $redirectionLimit max redirection follow.. + * @param string $url initial URL to reach. + * @param int $redirectionLimit max redirection follow.. * - * @return array + * @return array HTTP headers, or false if it failed. */ function get_redirected_headers($url, $redirectionLimit = 3) { $headers = get_headers($url, 1); + if (!empty($headers['location']) && empty($headers['Location'])) { + $headers['Location'] = $headers['location']; + } // Headers found, redirection found, and limit not reached. if ($redirectionLimit-- > 0 @@ -79,6 +89,7 @@ function get_redirected_headers($url, $redirectionLimit = 3) $redirection = is_array($headers['Location']) ? end($headers['Location']) : $headers['Location']; if ($redirection != $url) { + $redirection = getAbsoluteUrl($url, $redirection); return get_redirected_headers($redirection, $redirectionLimit); } } @@ -86,6 +97,35 @@ function get_redirected_headers($url, $redirectionLimit = 3) return array($headers, $url); } +/** + * Get an absolute URL from a complete one, and another absolute/relative URL. + * + * @param string $originalUrl The original complete URL. + * @param string $newUrl The new one, absolute or relative. + * + * @return string Final URL: + * - $newUrl if it was already an absolute URL. + * - if it was relative, absolute URL from $originalUrl path. + */ +function getAbsoluteUrl($originalUrl, $newUrl) +{ + $newScheme = parse_url($newUrl, PHP_URL_SCHEME); + // Already an absolute URL. + if (!empty($newScheme)) { + return $newUrl; + } + + $parts = parse_url($originalUrl); + $final = $parts['scheme'] .'://'. $parts['host']; + $final .= (!empty($parts['port'])) ? $parts['port'] : ''; + $final .= '/'; + if ($newUrl[0] != '/') { + $final .= substr(ltrim($parts['path'], '/'), 0, strrpos($parts['path'], '/')); + } + $final .= ltrim($newUrl, '/'); + return $final; +} + /** * Returns the server's base URL: scheme://domain.tld[:port] * diff --git a/application/LinkUtils.php b/application/LinkUtils.php index d8dc8b5..2df76ba 100644 --- a/application/LinkUtils.php +++ b/application/LinkUtils.php @@ -9,8 +9,8 @@ */ function html_extract_title($html) { - if (preg_match('!(.*?)!is', $html, $matches)) { - return trim(str_replace("\n", ' ', $matches[1])); + if (preg_match('!(.*?)!is', $html, $matches)) { + return trim(str_replace("\n", '', $matches[1])); } return false; } @@ -70,7 +70,7 @@ function headers_extract_charset($headers) function html_extract_charset($html) { // Get encoding specified in HTML header. - preg_match('#/]+)"? */?>#Usi', $html, $enc); + preg_match('#/]+)["\']? */?>#Usi', $html, $enc); if (!empty($enc[1])) { return strtolower($enc[1]); } diff --git a/application/Url.php b/application/Url.php index af38c4d..61a30a7 100644 --- a/application/Url.php +++ b/application/Url.php @@ -62,7 +62,21 @@ function add_trailing_slash($url) { return $url . (!endsWith($url, '/') ? '/' : ''); } +/** + * Converts an URL with an IDN host to a ASCII one. + * + * @param string $url Input URL. + * + * @return string converted URL. + */ +function url_with_idn_to_ascii($url) +{ + $parts = parse_url($url); + $parts['host'] = idn_to_ascii($parts['host']); + $httpUrl = new \http\Url($parts); + return $httpUrl->toString(); +} /** * URL representation and cleanup utilities * @@ -220,6 +234,22 @@ class Url return $this->toString(); } + /** + * Converts an URL with an International Domain Name host to a ASCII one. + * This requires PHP-intl. If it's not available, just returns this->cleanup(). + * + * @return string converted cleaned up URL. + */ + public function indToAscii() + { + $out = $this->cleanup(); + if (! function_exists('idn_to_ascii') || ! isset($this->parts['host'])) { + return $out; + } + $asciiHost = idn_to_ascii($this->parts['host']); + return str_replace($this->parts['host'], $asciiHost, $out); + } + /** * Get URL scheme. * @@ -232,6 +262,18 @@ class Url return $this->parts['scheme']; } + /** + * Get URL host. + * + * @return string the URL host or false if none is provided. + */ + public function getHost() { + if (empty($this->parts['host'])) { + return false; + } + return $this->parts['host']; + } + /** * Test if the Url is an HTTP one. * diff --git a/index.php b/index.php index dfc00fb..41a42cf 100644 --- a/index.php +++ b/index.php @@ -1516,7 +1516,7 @@ function renderPage() // -------- User want to post a new link: Display link edit form. if (isset($_GET['post'])) { - $url = cleanup_url(escape($_GET['post'])); + $url = cleanup_url($_GET['post']); $link_is_new = false; // Check if URL is not already in database (in this case, we will edit the existing link) @@ -1541,8 +1541,8 @@ function renderPage() // Extract title. $title = html_extract_title($content); // Re-encode title in utf-8 if necessary. - if (! empty($title) && $charset != 'utf-8') { - $title = mb_convert_encoding($title, $charset, 'utf-8'); + if (! empty($title) && strtolower($charset) != 'utf-8') { + $title = mb_convert_encoding($title, 'utf-8', $charset); } } } @@ -1551,6 +1551,8 @@ function renderPage() $url = '?' . smallHash($linkdate); $title = 'Note: '; } + $url = escape($url); + $title = escape($title); $link = array( 'linkdate' => $linkdate, diff --git a/tests/HttpUtils/GetHttpUrlTest.php b/tests/HttpUtils/GetHttpUrlTest.php index fd29350..ea53de5 100644 --- a/tests/HttpUtils/GetHttpUrlTest.php +++ b/tests/HttpUtils/GetHttpUrlTest.php @@ -35,4 +35,31 @@ class GetHttpUrlTest extends PHPUnit_Framework_TestCase $this->assertFalse($headers); $this->assertFalse($content); } + + /** + * Test getAbsoluteUrl with relative target URL. + */ + public function testGetAbsoluteUrlWithRelative() + { + $origin = 'http://non.existent/blabla/?test'; + $target = '/stuff.php'; + + $expected = 'http://non.existent/stuff.php'; + $this->assertEquals($expected, getAbsoluteUrl($origin, $target)); + + $target = 'stuff.php'; + $expected = 'http://non.existent/blabla/stuff.php'; + $this->assertEquals($expected, getAbsoluteUrl($origin, $target)); + } + + /** + * Test getAbsoluteUrl with absolute target URL. + */ + public function testGetAbsoluteUrlWithAbsolute() + { + $origin = 'http://non.existent/blabla/?test'; + $target = 'http://other.url/stuff.php'; + + $this->assertEquals($target, getAbsoluteUrl($origin, $target)); + } } diff --git a/tests/Url/UrlTest.php b/tests/Url/UrlTest.php index a64a73e..5fdc861 100644 --- a/tests/Url/UrlTest.php +++ b/tests/Url/UrlTest.php @@ -181,4 +181,19 @@ class UrlTest extends PHPUnit_Framework_TestCase $url = new Url('ftp://save.tld/mysave'); $this->assertFalse($url->isHttp()); } + + /** + * Test IndToAscii. + */ + function testIndToAscii() + { + $ind = 'http://www.académie-française.fr/'; + $expected = 'http://www.xn--acadmie-franaise-npb1a.fr/'; + $url = new Url($ind); + $this->assertEquals($expected, $url->indToAscii()); + + $notInd = 'http://www.academie-francaise.fr/'; + $url = new Url($notInd); + $this->assertEquals($notInd, $url->indToAscii()); + } } From 12ff86c961b49727fcae97938e864766aa77a2a9 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 3 May 2016 20:09:24 +0200 Subject: [PATCH 315/658] Use correct 'UTC' timezone --- application/TimeZone.php | 4 ---- index.php | 20 ++++++++++++-------- tests/TimeZoneTest.php | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/application/TimeZone.php b/application/TimeZone.php index e363d90..26f2232 100644 --- a/application/TimeZone.php +++ b/application/TimeZone.php @@ -101,10 +101,6 @@ function generateTimeZoneForm($preselectedTimezone='') */ function isTimeZoneValid($continent, $city) { - if ($continent == 'UTC' && $city == 'UTC') { - return true; - } - return in_array( $continent.'/'.$city, timezone_identifiers_list() diff --git a/index.php b/index.php index d3369a2..01122eb 100644 --- a/index.php +++ b/index.php @@ -1276,11 +1276,15 @@ function renderPage() { if (!empty($_POST['title']) ) { - if (!tokenOk($_POST['token'])) die('Wrong token.'); // Go away! + if (!tokenOk($_POST['token'])) { + die('Wrong token.'); // Go away! + } $tz = 'UTC'; - if (!empty($_POST['continent']) && !empty($_POST['city'])) - if (isTimeZoneValid($_POST['continent'],$_POST['city'])) - $tz = $_POST['continent'].'/'.$_POST['city']; + if (!empty($_POST['continent']) && !empty($_POST['city']) + && isTimeZoneValid($_POST['continent'], $_POST['city']) + ) { + $tz = $_POST['continent'] . '/' . $_POST['city']; + } $GLOBALS['timezone'] = $tz; $GLOBALS['title']=$_POST['title']; $GLOBALS['titleLink']=$_POST['titleLink']; @@ -2113,10 +2117,10 @@ function install() if (!empty($_POST['setlogin']) && !empty($_POST['setpassword'])) { $tz = 'UTC'; - if (!empty($_POST['continent']) && !empty($_POST['city'])) { - if (isTimeZoneValid($_POST['continent'], $_POST['city'])) { - $tz = $_POST['continent'].'/'.$_POST['city']; - } + if (!empty($_POST['continent']) && !empty($_POST['city']) + && isTimeZoneValid($_POST['continent'], $_POST['city']) + ) { + $tz = $_POST['continent'].'/'.$_POST['city']; } $GLOBALS['timezone'] = $tz; // Everything is ok, let's create config file. diff --git a/tests/TimeZoneTest.php b/tests/TimeZoneTest.php index b219030..2976d11 100644 --- a/tests/TimeZoneTest.php +++ b/tests/TimeZoneTest.php @@ -67,7 +67,6 @@ class TimeZoneTest extends PHPUnit_Framework_TestCase { $this->assertTrue(isTimeZoneValid('America', 'Argentina/Ushuaia')); $this->assertTrue(isTimeZoneValid('Europe', 'Oslo')); - $this->assertTrue(isTimeZoneValid('UTC', 'UTC')); } /** @@ -78,5 +77,6 @@ class TimeZoneTest extends PHPUnit_Framework_TestCase $this->assertFalse(isTimeZoneValid('CEST', 'CEST')); $this->assertFalse(isTimeZoneValid('Europe', 'Atlantis')); $this->assertFalse(isTimeZoneValid('Middle_Earth', 'Moria')); + $this->assertFalse(isTimeZoneValid('UTC', 'UTC')); } } From caa69b585381cc1c22df3dbb9c943855b8f13a70 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 5 May 2016 13:28:43 +0200 Subject: [PATCH 316/658] typo --- application/HttpUtils.php | 4 ++-- application/Url.php | 2 +- tests/Url/UrlTest.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/HttpUtils.php b/application/HttpUtils.php index 0e1ce87..c84ba6f 100644 --- a/application/HttpUtils.php +++ b/application/HttpUtils.php @@ -27,7 +27,7 @@ function get_http_response($url, $timeout = 30, $maxBytes = 4194304) { $urlObj = new Url($url); - $cleanUrl = $urlObj->indToAscii(); + $cleanUrl = $urlObj->idnToAscii(); if (! filter_var($cleanUrl, FILTER_VALIDATE_URL) || ! $urlObj->isHttp()) { return array(array(0 => 'Invalid HTTP Url'), false); @@ -70,7 +70,7 @@ function get_http_response($url, $timeout = 30, $maxBytes = 4194304) * Retrieve HTTP headers, following n redirections (temporary and permanent ones). * * @param string $url initial URL to reach. - * @param int $redirectionLimit max redirection follow.. + * @param int $redirectionLimit max redirection follow. * * @return array HTTP headers, or false if it failed. */ diff --git a/application/Url.php b/application/Url.php index 61a30a7..77447c8 100644 --- a/application/Url.php +++ b/application/Url.php @@ -240,7 +240,7 @@ class Url * * @return string converted cleaned up URL. */ - public function indToAscii() + public function idnToAscii() { $out = $this->cleanup(); if (! function_exists('idn_to_ascii') || ! isset($this->parts['host'])) { diff --git a/tests/Url/UrlTest.php b/tests/Url/UrlTest.php index 5fdc861..ce82265 100644 --- a/tests/Url/UrlTest.php +++ b/tests/Url/UrlTest.php @@ -190,10 +190,10 @@ class UrlTest extends PHPUnit_Framework_TestCase $ind = 'http://www.académie-française.fr/'; $expected = 'http://www.xn--acadmie-franaise-npb1a.fr/'; $url = new Url($ind); - $this->assertEquals($expected, $url->indToAscii()); + $this->assertEquals($expected, $url->idnToAscii()); $notInd = 'http://www.academie-francaise.fr/'; $url = new Url($notInd); - $this->assertEquals($notInd, $url->indToAscii()); + $this->assertEquals($notInd, $url->idnToAscii()); } } From d8bf2463571cc38f883f7d27fb8a3bf50cb8702d Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 4 May 2016 21:27:32 +0200 Subject: [PATCH 317/658] add link to plugins doc --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a693e47..8577fbf 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ Login: `demo`; Password: `demo` - daily RSS feed - permalinks for easy reference - links can be public or private +- extensible through [plugins](https://github.com/shaarli/Shaarli/wiki/Plugins#plugin-usage) ### Tag, view and search your links! - add a custom title and description to archived links From bb4a23aa863b63e6148a085c15dedd7c960b4206 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Thu, 5 May 2016 19:22:06 +0200 Subject: [PATCH 318/658] Export: allow prepending notes with the Shaarli instance's URL Relates to #102 Additions: - application: - export: allow prepending note permalinks with the instance's URL - test coverage Modifications: - export template: switch to an HTML form - link selection (all/private/public) - prepend note permalinks with the instance's URL Signed-off-by: VirtualTam --- application/NetscapeBookmarkUtils.php | 15 ++++++++--- index.php | 16 +++++++++-- tests/NetscapeBookmarkUtilsTest.php | 38 ++++++++++++++++++++++++--- tpl/export.html | 24 ++++++++++------- 4 files changed, 74 insertions(+), 19 deletions(-) diff --git a/application/NetscapeBookmarkUtils.php b/application/NetscapeBookmarkUtils.php index 8a29670..fdbb0ad 100644 --- a/application/NetscapeBookmarkUtils.php +++ b/application/NetscapeBookmarkUtils.php @@ -13,17 +13,19 @@ class NetscapeBookmarkUtils * - timestamp link addition date, using the Unix epoch format * - taglist comma-separated tag list * - * @param LinkDB $linkDb The link datastore - * @param string $selection Which links to export: (all|private|public) + * @param LinkDB $linkDb Link datastore + * @param string $selection Which links to export: (all|private|public) + * @param bool $prependNoteUrl Prepend note permalinks with the server's URL + * @param string $indexUrl Absolute URL of the Shaarli index page * * @throws Exception Invalid export selection * * @return array The links to be exported, with additional fields */ - public static function filterAndFormat($linkDb, $selection) + public static function filterAndFormat($linkDb, $selection, $prependNoteUrl, $indexUrl) { // see tpl/export.html for possible values - if (! in_array($selection, array('all','public','private'))) { + if (! in_array($selection, array('all', 'public', 'private'))) { throw new Exception('Invalid export selection: "'.$selection.'"'); } @@ -39,6 +41,11 @@ class NetscapeBookmarkUtils $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']); $link['timestamp'] = $date->getTimestamp(); $link['taglist'] = str_replace(' ', ',', $link['tags']); + + if (startsWith($link['url'], '?') && $prependNoteUrl) { + $link['url'] = $indexUrl . $link['url']; + } + $bookmarkLinks[] = $link; } diff --git a/index.php b/index.php index 47bae6e..408aeae 100644 --- a/index.php +++ b/index.php @@ -1590,8 +1590,9 @@ function renderPage() exit; } - // -------- Export as Netscape Bookmarks HTML file. if ($targetPage == Router::$PAGE_EXPORT) { + // Export links as a Netscape Bookmarks file + if (empty($_GET['selection'])) { $PAGE->assign('linkcount',count($LINKSDB)); $PAGE->renderPage('export'); @@ -1600,10 +1601,21 @@ function renderPage() // export as bookmarks_(all|private|public)_YYYYmmdd_HHMMSS.html $selection = $_GET['selection']; + if (isset($_GET['prepend_note_url'])) { + $prependNoteUrl = $_GET['prepend_note_url']; + } else { + $prependNoteUrl = false; + } + try { $PAGE->assign( 'links', - NetscapeBookmarkUtils::filterAndFormat($LINKSDB, $selection) + NetscapeBookmarkUtils::filterAndFormat( + $LINKSDB, + $selection, + $prependNoteUrl, + index_url($_SERVER) + ) ); } catch (Exception $exc) { header('Content-Type: text/plain; charset=utf-8'); diff --git a/tests/NetscapeBookmarkUtilsTest.php b/tests/NetscapeBookmarkUtilsTest.php index b7472d9..41e6d84 100644 --- a/tests/NetscapeBookmarkUtilsTest.php +++ b/tests/NetscapeBookmarkUtilsTest.php @@ -39,7 +39,7 @@ class NetscapeBookmarkUtilsTest extends PHPUnit_Framework_TestCase */ public function testFilterAndFormatInvalid() { - NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'derp'); + NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'derp', false, ''); } /** @@ -47,7 +47,7 @@ class NetscapeBookmarkUtilsTest extends PHPUnit_Framework_TestCase */ public function testFilterAndFormatAll() { - $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'all'); + $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'all', false, ''); $this->assertEquals(self::$refDb->countLinks(), sizeof($links)); foreach ($links as $link) { $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']); @@ -67,7 +67,7 @@ class NetscapeBookmarkUtilsTest extends PHPUnit_Framework_TestCase */ public function testFilterAndFormatPrivate() { - $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'private'); + $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'private', false, ''); $this->assertEquals(self::$refDb->countPrivateLinks(), sizeof($links)); foreach ($links as $link) { $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']); @@ -87,7 +87,7 @@ class NetscapeBookmarkUtilsTest extends PHPUnit_Framework_TestCase */ public function testFilterAndFormatPublic() { - $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'public'); + $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'public', false, ''); $this->assertEquals(self::$refDb->countPublicLinks(), sizeof($links)); foreach ($links as $link) { $date = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $link['linkdate']); @@ -101,4 +101,34 @@ class NetscapeBookmarkUtilsTest extends PHPUnit_Framework_TestCase ); } } + + /** + * Do not prepend notes with the Shaarli index's URL + */ + public function testFilterAndFormatDoNotPrependNoteUrl() + { + $links = NetscapeBookmarkUtils::filterAndFormat(self::$linkDb, 'public', false, ''); + $this->assertEquals( + '?WDWyig', + $links[0]['url'] + ); + } + + /** + * Prepend notes with the Shaarli index's URL + */ + public function testFilterAndFormatPrependNoteUrl() + { + $indexUrl = 'http://localhost:7469/shaarli/'; + $links = NetscapeBookmarkUtils::filterAndFormat( + self::$linkDb, + 'public', + true, + $indexUrl + ); + $this->assertEquals( + $indexUrl . '?WDWyig', + $links[0]['url'] + ); + } } diff --git a/tpl/export.html b/tpl/export.html index 9582627..67c3d05 100644 --- a/tpl/export.html +++ b/tpl/export.html @@ -5,15 +5,21 @@ From dbcd06e988d8434f125b8a5ee8f5bbcb7cd87874 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 6 May 2016 19:58:19 +0200 Subject: [PATCH 319/658] Reindent the login template --- tpl/loginform.html | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/tpl/loginform.html b/tpl/loginform.html index 678375f..f0b45df 100644 --- a/tpl/loginform.html +++ b/tpl/loginform.html @@ -1,26 +1,27 @@ {include="includes"} - + {include="page.footer"} From 85c4bdc23581b91971315c42508c2d8f7a5fa738 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 6 May 2016 20:03:10 +0200 Subject: [PATCH 320/658] Prefill the login field when the authentication has failed --- index.php | 7 +++++-- tpl/loginform.html | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/index.php b/index.php index 47bae6e..dd876a6 100644 --- a/index.php +++ b/index.php @@ -495,9 +495,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]); @@ -943,6 +943,9 @@ 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; diff --git a/tpl/loginform.html b/tpl/loginform.html index f0b45df..a49b42d 100644 --- a/tpl/loginform.html +++ b/tpl/loginform.html @@ -2,7 +2,13 @@ {include="includes"} +{if="ban_canLogin()"} + {if="empty($username)"} + onload="document.loginform.login.focus();" + {else} + onload="document.loginform.password.focus();" + {/if} +{/if}>
    - floral_left + floral_left The Daily Shaarli - floral_right + floral_right
    @@ -50,7 +50,7 @@
    - permalink + permalink
    {if="!$hide_timestamps || isLoggedIn()"} @@ -94,7 +94,7 @@ {$value} {/loop}
    -
    -
    +
    -
    {include="page.footer"} diff --git a/tpl/dailyrss.html b/tpl/default/dailyrss.html similarity index 100% rename from tpl/dailyrss.html rename to tpl/default/dailyrss.html diff --git a/tpl/editlink.html b/tpl/default/editlink.html similarity index 97% rename from tpl/editlink.html rename to tpl/default/editlink.html index 870cc16..d3f99fe 100644 --- a/tpl/editlink.html +++ b/tpl/default/editlink.html @@ -1,7 +1,7 @@ {include="includes"} - + - - -{if="is_file('inc/user.css')"}{/if} + + +{if="is_file('inc/user.css')"}{/if} {loop="$plugins_includes.css_files"} {/loop} diff --git a/tpl/install.html b/tpl/default/install.html similarity index 100% rename from tpl/install.html rename to tpl/default/install.html diff --git a/tpl/linklist.html b/tpl/default/linklist.html similarity index 98% rename from tpl/linklist.html rename to tpl/default/linklist.html index d423234..5accc92 100644 --- a/tpl/linklist.html +++ b/tpl/default/linklist.html @@ -1,7 +1,7 @@ - + {include="includes"} diff --git a/tpl/linklist.paging.html b/tpl/default/linklist.paging.html similarity index 100% rename from tpl/linklist.paging.html rename to tpl/default/linklist.paging.html diff --git a/tpl/loginform.html b/tpl/default/loginform.html similarity index 100% rename from tpl/loginform.html rename to tpl/default/loginform.html diff --git a/tpl/opensearch.html b/tpl/default/opensearch.html similarity index 100% rename from tpl/opensearch.html rename to tpl/default/opensearch.html diff --git a/tpl/page.footer.html b/tpl/default/page.footer.html similarity index 100% rename from tpl/page.footer.html rename to tpl/default/page.footer.html diff --git a/tpl/page.header.html b/tpl/default/page.header.html similarity index 100% rename from tpl/page.header.html rename to tpl/default/page.header.html diff --git a/tpl/page.html b/tpl/default/page.html similarity index 100% rename from tpl/page.html rename to tpl/default/page.html diff --git a/tpl/picwall.html b/tpl/default/picwall.html similarity index 100% rename from tpl/picwall.html rename to tpl/default/picwall.html diff --git a/tpl/pluginsadmin.html b/tpl/default/pluginsadmin.html similarity index 100% rename from tpl/pluginsadmin.html rename to tpl/default/pluginsadmin.html diff --git a/tpl/readme.txt b/tpl/default/readme.txt similarity index 100% rename from tpl/readme.txt rename to tpl/default/readme.txt diff --git a/tpl/tagcloud.html b/tpl/default/tagcloud.html similarity index 100% rename from tpl/tagcloud.html rename to tpl/default/tagcloud.html diff --git a/tpl/tools.html b/tpl/default/tools.html similarity index 100% rename from tpl/tools.html rename to tpl/default/tools.html From 69173356cd3e1862dbfd5072120e69ec48a11640 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Wed, 4 Jan 2017 18:06:14 +0100 Subject: [PATCH 446/658] API+Docker: enable nginx URL rewriting Closes https://github.com/shaarli/Shaarli/issues/668 Changed: - let nginx rewrite API URLs See: - https://www.slimframework.com/docs/start/web-servers.html - https://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#fastcgi_split_path_info Signed-off-by: VirtualTam --- docker/development/nginx.conf | 9 +++++++++ docker/production/nginx.conf | 9 +++++++++ docker/production/stable/nginx.conf | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/docker/development/nginx.conf b/docker/development/nginx.conf index ac0c6c6..79c45bf 100644 --- a/docker/development/nginx.conf +++ b/docker/development/nginx.conf @@ -56,7 +56,16 @@ http { alias /var/www/shaarli/images/favicon.ico; } + location / { + # Slim - rewrite URLs + try_files $uri /index.php$is_args$args; + } + location ~ (index)\.php$ { + # Slim - split URL path into (script_filename, path_info) + try_files $uri =404; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + # filter and proxy PHP requests to PHP-FPM fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_index index.php; diff --git a/docker/production/nginx.conf b/docker/production/nginx.conf index 5ffa02d..e8754d9 100644 --- a/docker/production/nginx.conf +++ b/docker/production/nginx.conf @@ -48,7 +48,16 @@ http { alias /var/www/shaarli/images/favicon.ico; } + location / { + # Slim - rewrite URLs + try_files $uri /index.php$is_args$args; + } + location ~ (index)\.php$ { + # Slim - split URL path into (script_filename, path_info) + try_files $uri =404; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + # filter and proxy PHP requests to PHP-FPM fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_index index.php; diff --git a/docker/production/stable/nginx.conf b/docker/production/stable/nginx.conf index 5ffa02d..e8754d9 100644 --- a/docker/production/stable/nginx.conf +++ b/docker/production/stable/nginx.conf @@ -48,7 +48,16 @@ http { alias /var/www/shaarli/images/favicon.ico; } + location / { + # Slim - rewrite URLs + try_files $uri /index.php$is_args$args; + } + location ~ (index)\.php$ { + # Slim - split URL path into (script_filename, path_info) + try_files $uri =404; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + # filter and proxy PHP requests to PHP-FPM fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_index index.php; From a0df06517bada0f811b464017ce385290e02c2bf Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 3 Jan 2017 11:42:21 +0100 Subject: [PATCH 447/658] Minor improvements regarding #705 (coding style, unit tests, etc.) --- .gitignore | 4 ++ CHANGELOG.md | 5 +- COPYING | 2 +- application/ApplicationUtils.php | 20 ++++++++ application/PageBuilder.php | 2 +- application/Utils.php | 10 ---- images/squiggle.png | Bin 684 -> 0 bytes index.php | 4 +- tests/ApplicationUtilsTest.php | 44 ++++++++++++++++++ tests/Updater/UpdaterTest.php | 1 + tests/utils/config/configJson.json.php | 3 +- tpl/default/configure.html | 13 +++--- tpl/default/{inc => css}/reset.css | 0 tpl/default/{inc => css}/shaarli.css | 0 tpl/default/daily.html | 8 ++-- .../default/images}/floral_left.png | Bin .../default/images}/floral_right.png | Bin .../default/images/squiggle.png | Bin .../default/images}/squiggle_closing.png | Bin tpl/default/includes.html | 4 +- 20 files changed, 92 insertions(+), 28 deletions(-) delete mode 100644 images/squiggle.png rename tpl/default/{inc => css}/reset.css (100%) rename tpl/default/{inc => css}/shaarli.css (100%) rename {images => tpl/default/images}/floral_left.png (100%) rename {images => tpl/default/images}/floral_right.png (100%) rename images/squiggle2.png => tpl/default/images/squiggle.png (100%) rename {images => tpl/default/images}/squiggle_closing.png (100%) diff --git a/.gitignore b/.gitignore index 9121905..19f3dc8 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,7 @@ phpmd.html # User plugin configuration plugins/*/config.php + +# 3rd party themes +tpl/* +!tpl/default diff --git a/CHANGELOG.md b/CHANGELOG.md index fe775b3..d3ecc1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,14 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [v0.9.0](https://github.com/shaarli/Shaarli/releases/tag/v0.9.0) - UNPUBLISHED -**WARNING**: Shaarli now requires PHP 5.5+. +**WARNING**: Shaarli now requires PHP 5.5+. ### Added - REST API: see [Shaarli API documentation](http://shaarli.github.io/api-documentation/) +- The theme can now be selected in the administration page. ### Changed +- Default template files are moved to a subfolder (`default`). + ### Fixed diff --git a/COPYING b/COPYING index 2292946..547ea57 100644 --- a/COPYING +++ b/COPYING @@ -43,7 +43,7 @@ License: CC-BY (http://creativecommons.org/licenses/by/3.0/) Copyright: (c) 2014 Designmodo Source: http://designmodo.com/linecons-free/ -Files: images/floral_left.png, images/floral_right.png, images/squiggle.png, images/squiggle2.png, images/squiggle_closing.png +Files: images/floral_left.png, images/floral_right.png, images/squiggle.png, images/squiggle_closing.png Licence: Public Domain Source: https://openclipart.org/people/j4p4n/j4p4n_ornimental_bookend_-_left.svg diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php index a0f482b..cc009a1 100644 --- a/application/ApplicationUtils.php +++ b/application/ApplicationUtils.php @@ -195,4 +195,24 @@ class ApplicationUtils return $errors; } + + /** + * Get a list of available themes. + * + * It will return the name of any directory present in the template folder. + * + * @param string $tplDir Templates main directory. + * + * @return array List of theme names. + */ + public static function getThemes($tplDir) + { + $allTheme = glob($tplDir.'/*', GLOB_ONLYDIR); + $themes = []; + foreach ($allTheme as $value) { + $themes[] = str_replace($tplDir.'/', '', $value); + } + + return $themes; + } } diff --git a/application/PageBuilder.php b/application/PageBuilder.php index e226a77..32c7f9f 100644 --- a/application/PageBuilder.php +++ b/application/PageBuilder.php @@ -79,7 +79,7 @@ class PageBuilder $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false)); $this->tpl->assign('token', getToken($this->conf)); // To be removed with a proper theme configuration. - $this->tpl->assign('theme', $this->conf->get('resource.theme', 'default')); + $this->tpl->assign('conf', $this->conf); } /** diff --git a/application/Utils.php b/application/Utils.php index 7556d3c..35d6522 100644 --- a/application/Utils.php +++ b/application/Utils.php @@ -270,13 +270,3 @@ function normalize_spaces($string) { return preg_replace('/\s{2,}/', ' ', trim($string)); } - -function getAllTheme($raintpl_tpl) -{ - $allTheme = glob($raintpl_tpl.'/*', GLOB_ONLYDIR); - foreach ($allTheme as $value) { - $themes[] = str_replace($raintpl_tpl.'/', '', $value); - } - - return $themes; -} diff --git a/images/squiggle.png b/images/squiggle.png deleted file mode 100644 index a6ce218c71972a1f48e1e7026a8764e2b2a49c9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 684 zcmV;d0#p5oP)P001!v1^@s6FBSqg00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru-UtB;02}HY-Bthq0y#-U zK~z}7?bb_(jbR)H@ZZdt8Iw!ycTvfihIz2AAC_y7EFhXxvGpn(P&Xy8A@#O8lM zvbo*_gK)jxo-D-FdXr2-TRlluU;#??BpHK67}-)Mf=%d1;MId<8Ft_;zSqNp@i>JF zUf?#q{;k8CqW?ww3P}a;QT`hQ!>|R9(T%RGRiaAM01huce#V=c(Te4Gf;$+T_oE_R6|)ognn~KQ9xwCbGkM>Mz1WV4h3^mITd78p z(Ks48zJ=^sh$kfA;^O@KX>CR$4rX@L=`&%qs z(S2oP`VgYS*?)y+7=iYIcHyTuhT(V=$sR?%_vy$V`zqID97rKnN5n52!Udehy<}NA z1Td$s#n^#MY1u0aZDsr)72b)hg<_nC^O-BXq7#=39rb#uz9+O~B5uME?1`LRz5QQW zn_Mr>hcb@za;Z_+iF0_6?<+mchIMiCO>rg^>`Q_@ws4_h^V}C{zgI8VgsBP8Jgmuc zTOW$?F0LeIHsetEmpty('general.timezone', date_default_timezone_get()); $conf->setEmpty('general.title', 'Shared links on '. escape(index_url($_SERVER))); -$conf->setEmpty('resource.theme', 'default'); RainTPL::$tpl_dir = $conf->get('resource.raintpl_tpl').'/'.$conf->get('resource.theme').'/'; // template directory RainTPL::$cache_dir = $conf->get('resource.raintpl_tmp'); // cache directory @@ -1155,7 +1155,7 @@ function renderPage($conf, $pluginManager, $LINKSDB) { $PAGE->assign('title', $conf->get('general.title')); $PAGE->assign('theme', $conf->get('resource.theme')); - $PAGE->assign('theme_available', getAllTheme($conf->get('resource.raintpl_tpl'))); + $PAGE->assign('theme_available', ThemeUtils::getThemes($conf->get('resource.raintpl_tpl'))); $PAGE->assign('redirector', $conf->get('redirector.url')); list($timezone_form, $timezone_js) = generateTimeZoneForm($conf->get('general.timezone')); $PAGE->assign('timezone_form', $timezone_form); diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php index 634bd0e..c39649e 100644 --- a/tests/ApplicationUtilsTest.php +++ b/tests/ApplicationUtilsTest.php @@ -331,4 +331,48 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase ApplicationUtils::checkResourcePermissions($conf) ); } + + /** + * Test getThemes() with existing theme directories. + */ + public function testGetThemes() + { + $themes = ['theme1', 'default', 'Bl1p_- bL0p']; + foreach ($themes as $theme) { + mkdir('sandbox/tpl/'. $theme, 0777, true); + } + + // include a file which should be ignored + touch('sandbox/tpl/supertheme'); + + $res = ApplicationUtils::getThemes('sandbox/tpl/'); + foreach ($res as $theme) { + $this->assertTrue(in_array($theme, $themes)); + } + $this->assertFalse(in_array('supertheme', $res)); + + foreach ($themes as $theme) { + rmdir('sandbox/tpl/'. $theme); + } + unlink('sandbox/tpl/supertheme'); + rmdir('sandbox/tpl'); + } + + /** + * Test getThemes() without any theme dir. + */ + public function testGetThemesEmpty() + { + mkdir('sandbox/tpl/', 0777, true); + $this->assertEquals([], ApplicationUtils::getThemes('sandbox/tpl/')); + rmdir('sandbox/tpl/'); + } + + /** + * Test getThemes() with an invalid path. + */ + public function testGetThemesInvalid() + { + $this->assertEquals([], ApplicationUtils::getThemes('nope')); + } } diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php index 0171daa..a153099 100644 --- a/tests/Updater/UpdaterTest.php +++ b/tests/Updater/UpdaterTest.php @@ -2,6 +2,7 @@ require_once 'application/config/ConfigManager.php'; require_once 'tests/Updater/DummyUpdater.php'; +require_once 'inc/rain.tpl.class.php'; /** * Class UpdaterTest. diff --git a/tests/utils/config/configJson.json.php b/tests/utils/config/configJson.json.php index 06a302e..13d38c6 100644 --- a/tests/utils/config/configJson.json.php +++ b/tests/utils/config/configJson.json.php @@ -24,7 +24,8 @@ }, "resource": { "datastore": "tests\/utils\/config\/datastore.php", - "data_dir": "tests\/utils\/config" + "data_dir": "tests\/utils\/config", + "raintpl_tpl": "tpl/" }, "plugins": { "WALLABAG_VERSION": 1 diff --git a/tpl/default/configure.html b/tpl/default/configure.html index 94f6df6..e71133b 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html @@ -25,14 +25,15 @@ - diff --git a/tpl/default/inc/reset.css b/tpl/default/css/reset.css similarity index 100% rename from tpl/default/inc/reset.css rename to tpl/default/css/reset.css diff --git a/tpl/default/inc/shaarli.css b/tpl/default/css/shaarli.css similarity index 100% rename from tpl/default/inc/shaarli.css rename to tpl/default/css/shaarli.css diff --git a/tpl/default/daily.html b/tpl/default/daily.html index 024ee32..e86e90b 100644 --- a/tpl/default/daily.html +++ b/tpl/default/daily.html @@ -28,9 +28,9 @@
    - floral_left + floral_left The Daily Shaarli - floral_right + floral_right
    @@ -50,7 +50,7 @@
    - permalink + permalink
    {if="!$hide_timestamps || isLoggedIn()"} @@ -94,7 +94,7 @@ {$value} {/loop}
    -
    -
    +
    -
    {include="page.footer"} diff --git a/images/floral_left.png b/tpl/default/images/floral_left.png similarity index 100% rename from images/floral_left.png rename to tpl/default/images/floral_left.png diff --git a/images/floral_right.png b/tpl/default/images/floral_right.png similarity index 100% rename from images/floral_right.png rename to tpl/default/images/floral_right.png diff --git a/images/squiggle2.png b/tpl/default/images/squiggle.png similarity index 100% rename from images/squiggle2.png rename to tpl/default/images/squiggle.png diff --git a/images/squiggle_closing.png b/tpl/default/images/squiggle_closing.png similarity index 100% rename from images/squiggle_closing.png rename to tpl/default/images/squiggle_closing.png diff --git a/tpl/default/includes.html b/tpl/default/includes.html index 2ff5d8d..c3b837f 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html @@ -6,8 +6,8 @@ - - + + {if="is_file('inc/user.css')"}{/if} {loop="$plugins_includes.css_files"} From 04a0e8ea34c241fdf6bd30b11f5242656f9cd1c2 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 3 Jan 2017 12:01:25 +0100 Subject: [PATCH 448/658] Updater: keep custom theme preference with the new theme setting --- application/ApplicationUtils.php | 20 ------------ application/ThemeUtils.php | 33 +++++++++++++++++++ application/Updater.php | 29 +++++++++++++++++ composer.json | 1 + tests/ApplicationUtilsTest.php | 44 ------------------------- tests/ThemeUtilsTest.php | 55 ++++++++++++++++++++++++++++++++ tests/Updater/UpdaterTest.php | 44 +++++++++++++++++++++++++ tpl/default/configure.html | 6 +--- 8 files changed, 163 insertions(+), 69 deletions(-) create mode 100644 application/ThemeUtils.php create mode 100644 tests/ThemeUtilsTest.php diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php index cc009a1..a0f482b 100644 --- a/application/ApplicationUtils.php +++ b/application/ApplicationUtils.php @@ -195,24 +195,4 @@ class ApplicationUtils return $errors; } - - /** - * Get a list of available themes. - * - * It will return the name of any directory present in the template folder. - * - * @param string $tplDir Templates main directory. - * - * @return array List of theme names. - */ - public static function getThemes($tplDir) - { - $allTheme = glob($tplDir.'/*', GLOB_ONLYDIR); - $themes = []; - foreach ($allTheme as $value) { - $themes[] = str_replace($tplDir.'/', '', $value); - } - - return $themes; - } } diff --git a/application/ThemeUtils.php b/application/ThemeUtils.php new file mode 100644 index 0000000..2718ed1 --- /dev/null +++ b/application/ThemeUtils.php @@ -0,0 +1,33 @@ +conf->write($this->isLoggedIn); return true; } + + /** + * New setting: theme name. If the default theme is used, nothing to do. + * + * If the user uses a custom theme, raintpl_tpl dir is updated to the parent directory, + * and the current theme is set as default in the theme setting. + * + * @return bool true if the update is successful, false otherwise. + */ + public function updateMethodDefaultTheme() + { + // raintpl_tpl isn't the root template directory anymore. + // We run the update only if this folder still contains the template files. + $tplDir = $this->conf->get('resource.raintpl_tpl'); + $tplFile = $tplDir . '/linklist.html'; + if (! file_exists($tplFile)) { + return true; + } + + $parent = dirname($tplDir); + $this->conf->set('resource.raintpl_tpl', $parent); + $this->conf->set('resource.theme', trim(str_replace($parent, '', $tplDir), '/')); + $this->conf->write($this->isLoggedIn); + + // Dependency injection gore + RainTPL::$tpl_dir = $tplDir; + + return true; + } } /** diff --git a/composer.json b/composer.json index cfbde1a..2fed0df 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,7 @@ }, "autoload": { "psr-4": { + "Shaarli\\": "application", "Shaarli\\Api\\": "application/api/", "Shaarli\\Api\\Controllers\\": "application/api/controllers", "Shaarli\\Api\\Exceptions\\": "application/api/exceptions" diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php index c39649e..634bd0e 100644 --- a/tests/ApplicationUtilsTest.php +++ b/tests/ApplicationUtilsTest.php @@ -331,48 +331,4 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase ApplicationUtils::checkResourcePermissions($conf) ); } - - /** - * Test getThemes() with existing theme directories. - */ - public function testGetThemes() - { - $themes = ['theme1', 'default', 'Bl1p_- bL0p']; - foreach ($themes as $theme) { - mkdir('sandbox/tpl/'. $theme, 0777, true); - } - - // include a file which should be ignored - touch('sandbox/tpl/supertheme'); - - $res = ApplicationUtils::getThemes('sandbox/tpl/'); - foreach ($res as $theme) { - $this->assertTrue(in_array($theme, $themes)); - } - $this->assertFalse(in_array('supertheme', $res)); - - foreach ($themes as $theme) { - rmdir('sandbox/tpl/'. $theme); - } - unlink('sandbox/tpl/supertheme'); - rmdir('sandbox/tpl'); - } - - /** - * Test getThemes() without any theme dir. - */ - public function testGetThemesEmpty() - { - mkdir('sandbox/tpl/', 0777, true); - $this->assertEquals([], ApplicationUtils::getThemes('sandbox/tpl/')); - rmdir('sandbox/tpl/'); - } - - /** - * Test getThemes() with an invalid path. - */ - public function testGetThemesInvalid() - { - $this->assertEquals([], ApplicationUtils::getThemes('nope')); - } } diff --git a/tests/ThemeUtilsTest.php b/tests/ThemeUtilsTest.php new file mode 100644 index 0000000..e44564b --- /dev/null +++ b/tests/ThemeUtilsTest.php @@ -0,0 +1,55 @@ +assertTrue(in_array($theme, $themes)); + } + $this->assertFalse(in_array('supertheme', $res)); + + foreach ($themes as $theme) { + rmdir('sandbox/tpl/'. $theme); + } + unlink('sandbox/tpl/supertheme'); + rmdir('sandbox/tpl'); + } + + /** + * Test getThemes() without any theme dir. + */ + public function testGetThemesEmpty() + { + mkdir('sandbox/tpl/', 0755, true); + $this->assertEquals([], ThemeUtils::getThemes('sandbox/tpl/')); + rmdir('sandbox/tpl/'); + } + + /** + * Test getThemes() with an invalid path. + */ + public function testGetThemesInvalid() + { + $this->assertEquals([], ThemeUtils::getThemes('nope')); + } +} diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php index a153099..1d15cfa 100644 --- a/tests/Updater/UpdaterTest.php +++ b/tests/Updater/UpdaterTest.php @@ -422,4 +422,48 @@ $GLOBALS[\'privateLinkByDefault\'] = true;'; $this->assertTrue($updater->updateMethodDatastoreIds()); $this->assertEquals($checksum, hash_file('sha1', self::$testDatastore)); } + + /** + * Test defaultTheme update with default settings: nothing to do. + */ + public function testDefaultThemeWithDefaultSettings() + { + $sandbox = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandbox . '.json.php'); + $this->conf = new ConfigManager($sandbox); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodDefaultTheme()); + + $this->assertEquals('tpl/', $this->conf->get('resource.raintpl_tpl')); + $this->assertEquals('default', $this->conf->get('resource.theme')); + $this->conf = new ConfigManager($sandbox); + $this->assertEquals('tpl/', $this->conf->get('resource.raintpl_tpl')); + $this->assertEquals('default', $this->conf->get('resource.theme')); + unlink($sandbox . '.json.php'); + } + + /** + * Test defaultTheme update with a custom theme in a subfolder + */ + public function testDefaultThemeWithCustomTheme() + { + $theme = 'iamanartist'; + $sandbox = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandbox . '.json.php'); + $this->conf = new ConfigManager($sandbox); + mkdir('sandbox/'. $theme); + touch('sandbox/'. $theme .'/linklist.html'); + $this->conf->set('resource.raintpl_tpl', 'sandbox/'. $theme .'/'); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodDefaultTheme()); + + $this->assertEquals('sandbox', $this->conf->get('resource.raintpl_tpl')); + $this->assertEquals($theme, $this->conf->get('resource.theme')); + $this->conf = new ConfigManager($sandbox); + $this->assertEquals('sandbox', $this->conf->get('resource.raintpl_tpl')); + $this->assertEquals($theme, $this->conf->get('resource.theme')); + unlink($sandbox . '.json.php'); + unlink('sandbox/'. $theme .'/linklist.html'); + rmdir('sandbox/'. $theme); + } } diff --git a/tpl/default/configure.html b/tpl/default/configure.html index e71133b..5820e6e 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html @@ -25,11 +25,7 @@ - {if="!$link_is_new"}{/if} + {if="!$link_is_new && isset($link.id)"} + + {'Delete'|t} + + {/if} {if="$http_referer"}{/if} From ee6f4b64a91d76070f930cdf7602ab4686714c7a Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Fri, 6 Jan 2017 18:54:29 +0100 Subject: [PATCH 453/658] Cleanup: use safe boolean comparisons Signed-off-by: VirtualTam --- application/HttpUtils.php | 2 +- application/LinkUtils.php | 4 +++- application/Updater.php | 2 +- index.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/application/HttpUtils.php b/application/HttpUtils.php index e8fc1f5..a81f905 100644 --- a/application/HttpUtils.php +++ b/application/HttpUtils.php @@ -122,7 +122,7 @@ function get_http_response($url, $timeout = 30, $maxBytes = 4194304) $content = substr($response, $headSize); $headers = array(); foreach (preg_split('~[\r\n]+~', $rawHeadersLastRedir) as $line) { - if (empty($line) or ctype_space($line)) { + if (empty($line) || ctype_space($line)) { continue; } $splitLine = explode(': ', $line, 2); diff --git a/application/LinkUtils.php b/application/LinkUtils.php index cf58f80..976474d 100644 --- a/application/LinkUtils.php +++ b/application/LinkUtils.php @@ -89,7 +89,9 @@ function count_private($links) { $cpt = 0; foreach ($links as $link) { - $cpt = $link['private'] == true ? $cpt + 1 : $cpt; + if ($link['private']) { + $cpt += 1; + } } return $cpt; diff --git a/application/Updater.php b/application/Updater.php index 621c723..704ce7a 100644 --- a/application/Updater.php +++ b/application/Updater.php @@ -69,7 +69,7 @@ class Updater return $updatesRan; } - if ($this->methods == null) { + if ($this->methods === null) { throw new UpdaterException('Couldn\'t retrieve Updater class methods.'); } diff --git a/index.php b/index.php index e553d1d..a54dfb1 100644 --- a/index.php +++ b/index.php @@ -204,7 +204,7 @@ function setup_login_state($conf) } // If session does not exist on server side, or IP address has changed, or session has expired, logout. if (empty($_SESSION['uid']) - || ($conf->get('security.session_protection_disabled') == false && $_SESSION['ip'] != allIPs()) + || ($conf->get('security.session_protection_disabled') === false && $_SESSION['ip'] != allIPs()) || time() >= $_SESSION['expires_on']) { logout(); From 3ee5c69777af4d5b20cfd8e89e1cc3cf13f640eb Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Fri, 6 Jan 2017 18:34:36 +0100 Subject: [PATCH 454/658] Add an AUTHORS file, simplify COPYING, bump year to 2017 Added: - AUTHORS file listing Shaarli contributors - mailmap information to group a Git author's different aliases - Makefile target to list contributors from Git commit data Changed: - Simplify COPYING by using a single "Shaarli Community" entry - Bump year to 2017 See: - man git-shortlog - https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html#_mapping_authors Signed-off-by: VirtualTam --- .gitattributes | 1 + .github/mailmap | 13 +++++++++++++ AUTHORS | 40 ++++++++++++++++++++++++++++++++++++++++ COPYING | 28 +--------------------------- Makefile | 8 +++++++- 5 files changed, 62 insertions(+), 28 deletions(-) create mode 100644 .github/mailmap create mode 100644 AUTHORS diff --git a/.gitattributes b/.gitattributes index d753b1d..059fbb1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -19,6 +19,7 @@ Dockerfile text # Exclude from Git archives .gitattributes export-ignore +.github export-ignore .gitignore export-ignore .travis.yml export-ignore doc/**/*.json export-ignore diff --git a/.github/mailmap b/.github/mailmap new file mode 100644 index 0000000..41d91e4 --- /dev/null +++ b/.github/mailmap @@ -0,0 +1,13 @@ +ArthurHoaro +Florian Eula feula +Florian Eula +Nicolas Danelon nicolasm +Nicolas Danelon +Nicolas Danelon +Nicolas Danelon +Sébastien Sauvage +Timo Van Neerden +Timo Van Neerden lehollandaisvolant +VirtualTam +VirtualTam +VirtualTam diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..aa041ae --- /dev/null +++ b/AUTHORS @@ -0,0 +1,40 @@ + 327 ArthurHoaro + 188 VirtualTam + 132 nodiscc + 56 Sébastien Sauvage + 15 Florian Eula + 13 Emilien Klein + 12 Nicolas Danelon + 7 Christophe HENRY + 4 Alexandre Alapetite + 4 David Sferruzza + 3 Teromene + 2 Chris Kuethe + 2 Knah Tsaeb + 2 Mathieu Chabanon + 2 Miloš Jovanović + 2 Qwerty + 2 Timo Van Neerden + 2 julienCXX + 2 kalvn + 1 Adrien Oliva + 1 Alexis J + 1 BoboTiG + 1 Bronco + 1 D Low + 1 Dimtion + 1 Fanch + 1 Felix Bartels + 1 Felix Kästner + 1 Florian Voigt + 1 Gary Marigliano + 1 Guillaume Virlet + 1 Jonathan Druart + 1 Julien Pivotto + 1 Kevin Canévet + 1 Knah Tsaeb + 1 Lionel Martin + 1 Marsup + 1 Sbgodin + 1 TsT + 1 dimtion diff --git a/COPYING b/COPYING index 547ea57..4bbdf2b 100644 --- a/COPYING +++ b/COPYING @@ -1,33 +1,7 @@ Files: * License: zlib/libpng Copyright: (c) 2011-2015 Sébastien SAUVAGE - (c) 2011-2015 Alexandre Alapetite - (c) 2011-2015 David Sferruzza - (c) 2011-2015 Christophe HENRY - (c) 2011-2015 Mathieu Chabanon - (c) 2011-2015 BoboTiG - (c) 2011-2015 Bronco - (c) 2011-2015 Emilien Klein - (c) 2011-2015 Knah Tsaeb - (c) 2011-2015 Lionel Martin - (c) 2011-2015 lehollandaisvolant - (c) 2011-2015 timo van neerden - (c) 2011-2015 nodiscc - (c) 2011-2015 Florian Eula - (c) 2011-2015 Arthur Hoaro - (c) 2011-2015 Aurélien "VirtualTam" Tamisier - (c) 2011-2015 qwertygc - (c) 2011-2015 idleman - (c) 2015 Alexis Ju - (c) 2015 dimtion - (c) 2015 Fanch - (c) 2015 Guillaume Virlet - (c) 2015 Felix Bartels - (c) 2015 Marsup - (c) 2015 Miloš Jovanović - (c) 2015 Nicolás Danelón - (c) 2015 TsT - + (c) 2011-2017 The Shaarli Community, see AUTHORS Files: inc/reset.css License: BSD (http://opensource.org/licenses/BSD-3-Clause) diff --git a/Makefile b/Makefile index 60aec9a..f3065b7 100644 --- a/Makefile +++ b/Makefile @@ -169,6 +169,12 @@ clean: @git clean -df @rm -rf sandbox +### generate the AUTHORS file from Git commit information +authors: + @cp .github/mailmap .mailmap + @git shortlog -sne > AUTHORS + @rm .mailmap + ### generate Doxygen documentation doxygen: clean @rm -rf doxygen @@ -214,4 +220,4 @@ htmlpages: -o doc/$$base.html $$file; \ done; -htmldoc: doc htmlsidebar htmlpages +htmldoc: authors doc htmlsidebar htmlpages From 7282418baa20861dd8132524bc99be65ed9c1c24 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 14 Jan 2017 16:43:32 +0100 Subject: [PATCH 455/658] Move user.css to data folder --- application/Updater.php | 16 ++++++++++++++++ tpl/default/includes.html | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/application/Updater.php b/application/Updater.php index 704ce7a..eb03c6d 100644 --- a/application/Updater.php +++ b/application/Updater.php @@ -308,6 +308,22 @@ class Updater return true; } + + /** + * Move the file to inc/user.css to data/user.css. + * + * Note: Due to hardcoded paths, it's not unit testable. But one line of code should be fine. + * + * @return bool true if the update is successful, false otherwise. + */ + public function updateMethodMoveUserCss() + { + if (! is_file('inc/user.css')) { + return true; + } + + return rename('inc/user.css', 'data/user.css'); + } } /** diff --git a/tpl/default/includes.html b/tpl/default/includes.html index c3b837f..17b78b1 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html @@ -8,7 +8,7 @@ -{if="is_file('inc/user.css')"}{/if} +{if="is_file('data/user.css')"}{/if} {loop="$plugins_includes.css_files"} {/loop} From 63ef549749fac9d0e302842f06e7794d1daabc13 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sat, 7 Jan 2017 22:23:47 +0100 Subject: [PATCH 456/658] API: expect JWT in the Authorization header Relates to https://github.com/shaarli/Shaarli/pull/731 Added: - require the presence of the 'Authorization' header Changed: - use the HTTP Bearer Token authorization schema See: - https://jwt.io/introduction/#how-do-json-web-tokens-work- - https://tools.ietf.org/html/rfc6750 - http://security.stackexchange.com/q/108662 Signed-off-by: VirtualTam --- application/api/ApiMiddleware.php | 11 ++++++++--- tests/api/ApiMiddlewareTest.php | 29 ++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/application/api/ApiMiddleware.php b/application/api/ApiMiddleware.php index 162e88e..522091c 100644 --- a/application/api/ApiMiddleware.php +++ b/application/api/ApiMiddleware.php @@ -98,8 +98,7 @@ class ApiMiddleware * @throws ApiAuthorizationException The token couldn't be validated. */ protected function checkToken($request) { - $jwt = $request->getHeaderLine('jwt'); - if (empty($jwt)) { + if (! $request->hasHeader('Authorization')) { throw new ApiAuthorizationException('JWT token not provided'); } @@ -107,7 +106,13 @@ class ApiMiddleware throw new ApiAuthorizationException('Token secret must be set in Shaarli\'s administration'); } - ApiUtils::validateJwtToken($jwt, $this->conf->get('api.secret')); + $authorization = $request->getHeaderLine('Authorization'); + + if (! preg_match('/^Bearer (.*)/i', $authorization, $matches)) { + throw new ApiAuthorizationException('Invalid JWT header'); + } + + ApiUtils::validateJwtToken($matches[1], $this->conf->get('api.secret')); } /** diff --git a/tests/api/ApiMiddlewareTest.php b/tests/api/ApiMiddlewareTest.php index 4d4dd9b..d9753b1 100644 --- a/tests/api/ApiMiddlewareTest.php +++ b/tests/api/ApiMiddlewareTest.php @@ -143,7 +143,7 @@ class ApiMiddlewareTest extends \PHPUnit_Framework_TestCase $env = Environment::mock([ 'REQUEST_METHOD' => 'GET', 'REQUEST_URI' => '/echo', - 'HTTP_JWT'=> 'jwt', + 'HTTP_AUTHORIZATION'=> 'Bearer jwt', ]); $request = Request::createFromEnvironment($env); $response = new Response(); @@ -157,7 +157,30 @@ class ApiMiddlewareTest extends \PHPUnit_Framework_TestCase } /** - * Invoke the middleware without an invalid JWT token (debug): + * Invoke the middleware with an invalid JWT token header + */ + public function testInvalidJwtAuthHeaderDebug() + { + $this->conf->set('dev.debug', true); + $mw = new ApiMiddleware($this->container); + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'REQUEST_URI' => '/echo', + 'HTTP_AUTHORIZATION'=> 'PolarBearer jwt', + ]); + $request = Request::createFromEnvironment($env); + $response = new Response(); + /** @var Response $response */ + $response = $mw($request, $response, null); + + $this->assertEquals(401, $response->getStatusCode()); + $body = json_decode((string) $response->getBody()); + $this->assertEquals('Not authorized: Invalid JWT header', $body->message); + $this->assertContains('ApiAuthorizationException', $body->stacktrace); + } + + /** + * Invoke the middleware with an invalid JWT token (debug): * should return a 401 error Unauthorized - with a specific message and a stacktrace. * * Note: specific JWT errors tests are handled in ApiUtilsTest. @@ -169,7 +192,7 @@ class ApiMiddlewareTest extends \PHPUnit_Framework_TestCase $env = Environment::mock([ 'REQUEST_METHOD' => 'GET', 'REQUEST_URI' => '/echo', - 'HTTP_JWT'=> 'bad jwt', + 'HTTP_AUTHORIZATION'=> 'Bearer jwt', ]); $request = Request::createFromEnvironment($env); $response = new Response(); From c3b00963fe22479e87998c82bc83827a54c8d972 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 22 Dec 2016 14:36:45 +0100 Subject: [PATCH 457/658] REST API: implement getLinks service See http://shaarli.github.io/api-documentation/#links-links-collection-get --- application/api/ApiUtils.php | 31 ++ application/api/controllers/Links.php | 86 ++++++ index.php | 1 + tests/api/ApiUtilsTest.php | 65 +++++ tests/api/controllers/LinksTest.php | 393 ++++++++++++++++++++++++++ 5 files changed, 576 insertions(+) create mode 100644 application/api/controllers/Links.php create mode 100644 tests/api/controllers/LinksTest.php diff --git a/application/api/ApiUtils.php b/application/api/ApiUtils.php index fbb1e72..d024291 100644 --- a/application/api/ApiUtils.php +++ b/application/api/ApiUtils.php @@ -48,4 +48,35 @@ class ApiUtils throw new ApiAuthorizationException('Invalid JWT issued time'); } } + + /** + * Format a Link for the REST API. + * + * @param array $link Link data read from the datastore. + * @param string $indexUrl Shaarli's index URL (used for relative URL). + * + * @return array Link data formatted for the REST API. + */ + public static function formatLink($link, $indexUrl) + { + $out['id'] = $link['id']; + // Not an internal link + if ($link['url'][0] != '?') { + $out['url'] = $link['url']; + } else { + $out['url'] = $indexUrl . $link['url']; + } + $out['shorturl'] = $link['shorturl']; + $out['title'] = $link['title']; + $out['description'] = $link['description']; + $out['tags'] = preg_split('/\s+/', $link['tags'], -1, PREG_SPLIT_NO_EMPTY); + $out['private'] = $link['private'] == true; + $out['created'] = $link['created']->format(\DateTime::ATOM); + if (! empty($link['updated'])) { + $out['updated'] = $link['updated']->format(\DateTime::ATOM); + } else { + $out['updated'] = ''; + } + return $out; + } } diff --git a/application/api/controllers/Links.php b/application/api/controllers/Links.php new file mode 100644 index 0000000..1c7b41c --- /dev/null +++ b/application/api/controllers/Links.php @@ -0,0 +1,86 @@ +getParam('private'); + $links = $this->linkDb->filterSearch( + [ + 'searchtags' => $request->getParam('searchtags', ''), + 'searchterm' => $request->getParam('searchterm', ''), + ], + false, + $private === 'true' || $private === '1' + ); + + // Return links from the {offset}th link, starting from 0. + $offset = $request->getParam('offset'); + if (! empty($offset) && ! ctype_digit($offset)) { + throw new ApiBadParametersException('Invalid offset'); + } + $offset = ! empty($offset) ? intval($offset) : 0; + if ($offset > count($links)) { + return $response->withJson([], 200, $this->jsonStyle); + } + + // limit parameter is either a number of links or 'all' for everything. + $limit = $request->getParam('limit'); + if (empty($limit)) { + $limit = self::$DEFAULT_LIMIT; + } + else if (ctype_digit($limit)) { + $limit = intval($limit); + } else if ($limit === 'all') { + $limit = count($links); + } else { + throw new ApiBadParametersException('Invalid limit'); + } + + // 'environment' is set by Slim and encapsulate $_SERVER. + $index = index_url($this->ci['environment']); + + $out = []; + $cpt = 0; + foreach ($links as $link) { + if (count($out) >= $limit) { + break; + } + if ($cpt++ >= $offset) { + $out[] = ApiUtils::formatLink($link, $index); + } + } + + return $response->withJson($out, 200, $this->jsonStyle); + } +} diff --git a/index.php b/index.php index 2ed14d4..ff24ed7 100644 --- a/index.php +++ b/index.php @@ -2232,6 +2232,7 @@ $app = new \Slim\App($container); // REST API routes $app->group('/api/v1', function() { $this->get('/info', '\Shaarli\Api\Controllers\Info:getInfo'); + $this->get('/links', '\Shaarli\Api\Controllers\Links:getLinks'); })->add('\Shaarli\Api\ApiMiddleware'); $response = $app->run(true); diff --git a/tests/api/ApiUtilsTest.php b/tests/api/ApiUtilsTest.php index 10da145..516ee68 100644 --- a/tests/api/ApiUtilsTest.php +++ b/tests/api/ApiUtilsTest.php @@ -203,4 +203,69 @@ class ApiUtilsTest extends \PHPUnit_Framework_TestCase $token = $this->generateCustomJwtToken('{"JSON":1}', '{"iat":' . (time() + 60) . '}', 'secret'); ApiUtils::validateJwtToken($token, 'secret'); } + + /** + * Test formatLink() with a link using all useful fields. + */ + public function testFormatLinkComplete() + { + $indexUrl = 'https://domain.tld/sub/'; + $link = [ + 'id' => 12, + 'url' => 'http://lol.lol', + 'shorturl' => 'abc', + 'title' => 'Important Title', + 'description' => 'It is very lol' . PHP_EOL . 'new line', + 'tags' => 'blip .blop ', + 'private' => '1', + 'created' => \DateTime::createFromFormat('Ymd_His', '20170107_160102'), + 'updated' => \DateTime::createFromFormat('Ymd_His', '20170107_160612'), + ]; + + $expected = [ + 'id' => 12, + 'url' => 'http://lol.lol', + 'shorturl' => 'abc', + 'title' => 'Important Title', + 'description' => 'It is very lol' . PHP_EOL . 'new line', + 'tags' => ['blip', '.blop'], + 'private' => true, + 'created' => '2017-01-07T16:01:02+00:00', + 'updated' => '2017-01-07T16:06:12+00:00', + ]; + + $this->assertEquals($expected, ApiUtils::formatLink($link, $indexUrl)); + } + + /** + * Test formatLink() with only minimal fields filled, and internal link. + */ + public function testFormatLinkMinimalNote() + { + $indexUrl = 'https://domain.tld/sub/'; + $link = [ + 'id' => 12, + 'url' => '?abc', + 'shorturl' => 'abc', + 'title' => 'Note', + 'description' => '', + 'tags' => '', + 'private' => '', + 'created' => \DateTime::createFromFormat('Ymd_His', '20170107_160102'), + ]; + + $expected = [ + 'id' => 12, + 'url' => 'https://domain.tld/sub/?abc', + 'shorturl' => 'abc', + 'title' => 'Note', + 'description' => '', + 'tags' => [], + 'private' => false, + 'created' => '2017-01-07T16:01:02+00:00', + 'updated' => '', + ]; + + $this->assertEquals($expected, ApiUtils::formatLink($link, $indexUrl)); + } } diff --git a/tests/api/controllers/LinksTest.php b/tests/api/controllers/LinksTest.php new file mode 100644 index 0000000..4ead26b --- /dev/null +++ b/tests/api/controllers/LinksTest.php @@ -0,0 +1,393 @@ +conf = new \ConfigManager('tests/utils/config/configJson.json.php'); + $this->refDB = new \ReferenceLinkDB(); + $this->refDB->write(self::$testDatastore); + + $this->container = new Container(); + $this->container['conf'] = $this->conf; + $this->container['db'] = new \LinkDB(self::$testDatastore, true, false); + + $this->controller = new Links($this->container); + } + + /** + * After every test, remove the test datastore. + */ + public function tearDown() + { + @unlink(self::$testDatastore); + } + + /** + * Test basic getLinks service: returns all links. + */ + public function testGetLinks() + { + // Used by index_url(). + $_SERVER['SERVER_NAME'] = 'domain.tld'; + $_SERVER['SERVER_PORT'] = 80; + $_SERVER['SCRIPT_NAME'] = '/'; + + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + ]); + $request = Request::createFromEnvironment($env); + + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals($this->refDB->countLinks(), count($data)); + + // Check order + $order = [41, 8, 6, 7, 0, 1, 4, 42]; + $cpt = 0; + foreach ($data as $link) { + $this->assertEquals(self::NB_FIELDS_LINK, count($link)); + $this->assertEquals($order[$cpt++], $link['id']); + } + + // Check first element fields\ + $first = $data[0]; + $this->assertEquals('http://domain.tld/?WDWyig', $first['url']); + $this->assertEquals('WDWyig', $first['shorturl']); + $this->assertEquals('Link title: @website', $first['title']); + $this->assertEquals( + 'Stallman has a beard and is part of the Free Software Foundation (or not). Seriously, read this. #hashtag', + $first['description'] + ); + $this->assertEquals('sTuff', $first['tags'][0]); + $this->assertEquals(false, $first['private']); + $this->assertEquals( + \DateTime::createFromFormat(\LinkDB::LINK_DATE_FORMAT, '20150310_114651')->format(\DateTime::ATOM), + $first['created'] + ); + $this->assertEmpty($first['updated']); + + // Multi tags + $link = $data[1]; + $this->assertEquals(7, count($link['tags'])); + + // Update date + $this->assertEquals( + \DateTime::createFromFormat(\LinkDB::LINK_DATE_FORMAT, '20160803_093033')->format(\DateTime::ATOM), + $link['updated'] + ); + } + + /** + * Test getLinks service with offset and limit parameter: + * limit=1 and offset=1 should return only the second link, ID=8 (ordered by creation date DESC). + */ + public function testGetLinksOffsetLimit() + { + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'offset=1&limit=1' + ]); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals(1, count($data)); + $this->assertEquals(8, $data[0]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); + } + + /** + * Test getLinks with limit=all (return all link). + */ + public function testGetLinksLimitAll() + { + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'limit=all' + ]); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals($this->refDB->countLinks(), count($data)); + // Check order + $order = [41, 8, 6, 7, 0, 1, 4, 42]; + $cpt = 0; + foreach ($data as $link) { + $this->assertEquals(self::NB_FIELDS_LINK, count($link)); + $this->assertEquals($order[$cpt++], $link['id']); + } + } + + /** + * Test getLinks service with offset and limit parameter: + * limit=1 and offset=1 should return only the second link, ID=8 (ordered by creation date DESC). + */ + public function testGetLinksOffsetTooHigh() + { + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'offset=100' + ]); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEmpty(count($data)); + } + + /** + * Test getLinks with private attribute to 1 or true. + */ + public function testGetLinksPrivate() + { + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'private=true' + ]); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals($this->refDB->countPrivateLinks(), count($data)); + $this->assertEquals(6, $data[0]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); + + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'private=1' + ]); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals($this->refDB->countPrivateLinks(), count($data)); + $this->assertEquals(6, $data[0]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); + } + + /** + * Test getLinks with private attribute to false or 0 + */ + public function testGetLinksNotPrivate() + { + $env = Environment::mock( + [ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'private=0' + ] + ); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string)$response->getBody(), true); + $this->assertEquals($this->refDB->countLinks(), count($data)); + $this->assertEquals(41, $data[0]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); + + $env = Environment::mock( + [ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'private=false' + ] + ); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string)$response->getBody(), true); + $this->assertEquals($this->refDB->countLinks(), count($data)); + $this->assertEquals(41, $data[0]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); + } + + /** + * Test getLinks service with offset and limit parameter: + * limit=1 and offset=1 should return only the second link, ID=8 (ordered by creation date DESC). + */ + public function testGetLinksSearchTerm() + { + // Only in description - 1 result + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'searchterm=Tropical' + ]); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals(1, count($data)); + $this->assertEquals(1, $data[0]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); + + // Only in tags - 1 result + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'searchterm=tag3' + ]); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals(1, count($data)); + $this->assertEquals(0, $data[0]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); + + // Multiple results (2) + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'searchterm=stallman' + ]); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals(2, count($data)); + $this->assertEquals(41, $data[0]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); + $this->assertEquals(8, $data[1]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[1])); + + // Multiword - 2 results + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'searchterm=stallman+software' + ]); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals(2, count($data)); + $this->assertEquals(41, $data[0]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); + $this->assertEquals(8, $data[1]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[1])); + + // URL encoding + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'searchterm='. urlencode('@web') + ]); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals(2, count($data)); + $this->assertEquals(41, $data[0]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); + $this->assertEquals(8, $data[1]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[1])); + } + + public function testGetLinksSearchTermNoResult() + { + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'searchterm=nope' + ]); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals(0, count($data)); + } + + public function testGetLinksSearchTags() + { + // Single tag + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'searchtags=dev', + ]); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals(2, count($data)); + $this->assertEquals(0, $data[0]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); + $this->assertEquals(4, $data[1]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[1])); + + // Multitag + exclude + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'searchtags=stuff+-gnu', + ]); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals(1, count($data)); + $this->assertEquals(41, $data[0]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); + } + + /** + * Test getLinks service with search tags+terms. + */ + public function testGetLinksSearchTermsAndTags() + { + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'searchterm=poke&searchtags=dev', + ]); + $request = Request::createFromEnvironment($env); + $response = $this->controller->getLinks($request, new Response()); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals(1, count($data)); + $this->assertEquals(0, $data[0]['id']); + $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); + } +} From d6327389fc5cbb659e7f32fb61b2f1d5c86b02ee Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 15 Jan 2017 17:46:24 +0100 Subject: [PATCH 458/658] Prevent tag duplicate when renaming Fixes #757 --- index.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/index.php b/index.php index beb1cbc..5576756 100644 --- a/index.php +++ b/index.php @@ -1207,15 +1207,15 @@ function renderPage($conf, $pluginManager, $LINKSDB) $needle = trim($_POST['fromtag']); // True for case-sensitive tag search. $linksToAlter = $LINKSDB->filterSearch(array('searchtags' => $needle), true); - foreach($linksToAlter as $key=>$value) - { - $tags = explode(' ',trim($value['tags'])); - $tags[array_search($needle,$tags)] = trim($_POST['totag']); // Replace tags value. - $value['tags']=trim(implode(' ',$tags)); - $LINKSDB[$key]=$value; + foreach($linksToAlter as $key=>$value) { + $tags = preg_split('/\s+/', trim($value['tags'])); + // Replace tags value. + $tags[array_search($needle, $tags)] = trim($_POST['totag']); + $value['tags'] = implode(' ', array_unique($tags)); + $LINKSDB[$key] = $value; } $LINKSDB->save($conf->get('resource.page_cache')); // Save to disk. - echo ''; + echo ''; exit; } } From 053673cb71a45a38a2eb517c4e630656a5626327 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 15 Jan 2017 17:50:16 +0100 Subject: [PATCH 459/658] Remove CSS call for addlink toolbar plugin Fixes #724 --- plugins/addlink_toolbar/addlink_toolbar.php | 16 --------- tests/plugins/PluginAddlinkTest.php | 40 --------------------- 2 files changed, 56 deletions(-) diff --git a/plugins/addlink_toolbar/addlink_toolbar.php b/plugins/addlink_toolbar/addlink_toolbar.php index bf8a198..ddf50aa 100644 --- a/plugins/addlink_toolbar/addlink_toolbar.php +++ b/plugins/addlink_toolbar/addlink_toolbar.php @@ -40,19 +40,3 @@ function hook_addlink_toolbar_render_header($data) return $data; } - -/** - * When link list is displayed, include markdown CSS. - * - * @param array $data - includes data. - * - * @return mixed - includes data with markdown CSS file added. - */ -function hook_addlink_toolbar_render_includes($data) -{ - if ($data['_PAGE_'] == Router::$PAGE_LINKLIST && $data['_LOGGEDIN_'] === true) { - $data['css_files'][] = PluginManager::$PLUGINS_PATH . '/addlink_toolbar/addlink_toolbar.css'; - } - - return $data; -} diff --git a/tests/plugins/PluginAddlinkTest.php b/tests/plugins/PluginAddlinkTest.php index b77fe12..b6239e7 100644 --- a/tests/plugins/PluginAddlinkTest.php +++ b/tests/plugins/PluginAddlinkTest.php @@ -57,44 +57,4 @@ class PluginAddlinkTest extends PHPUnit_Framework_TestCase $this->assertEquals($str, $data[$str]); $this->assertArrayNotHasKey('fields_toolbar', $data); } - - /** - * Test render_includes hook while logged in. - */ - public function testAddlinkIncludesLoggedIn() - { - $str = 'stuff'; - $data = array($str => $str); - $data['_PAGE_'] = Router::$PAGE_LINKLIST; - $data['_LOGGEDIN_'] = true; - - $data = hook_addlink_toolbar_render_includes($data); - $this->assertEquals($str, $data[$str]); - $this->assertEquals(1, count($data['css_files'])); - - $str = 'stuff'; - $data = array($str => $str); - $data['_PAGE_'] = $str; - $data['_LOGGEDIN_'] = true; - - $data = hook_addlink_toolbar_render_includes($data); - $this->assertEquals($str, $data[$str]); - $this->assertArrayNotHasKey('css_files', $data); - } - - /** - * Test render_includes hook. - * Should not affect css files while logged out. - */ - public function testAddlinkIncludesLoggedOut() - { - $str = 'stuff'; - $data = array($str => $str); - $data['_PAGE_'] = Router::$PAGE_LINKLIST; - $data['_LOGGEDIN_'] = false; - - $data = hook_addlink_toolbar_render_includes($data); - $this->assertEquals($str, $data[$str]); - $this->assertArrayNotHasKey('css_files', $data); - } } From 8bbf02e0dbc60395a3ec4e8482d652011379fb60 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 15 Jan 2017 17:58:19 +0100 Subject: [PATCH 460/658] Prevent warning if HTTP_REFERER isn't set Fixes #723 --- index.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index beb1cbc..f736fcf 100644 --- a/index.php +++ b/index.php @@ -1012,7 +1012,12 @@ function renderPage($conf, $pluginManager, $LINKSDB) $_SESSION['LINKS_PER_PAGE']=abs(intval($_GET['linksperpage'])); } - header('Location: '. generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('linksperpage'))); + if (! empty($_SERVER['HTTP_REFERER'])) { + $location = generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('linksperpage')); + } else { + $location = '?'; + } + header('Location: '. $location); exit; } @@ -1024,7 +1029,12 @@ function renderPage($conf, $pluginManager, $LINKSDB) unset($_SESSION['privateonly']); // See all links } - header('Location: '. generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('privateonly'))); + if (! empty($_SERVER['HTTP_REFERER'])) { + $location = generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('privateonly')); + } else { + $location = '?'; + } + header('Location: '. $location); exit; } @@ -1361,7 +1371,7 @@ function renderPage($conf, $pluginManager, $LINKSDB) ) { if (isset($_POST['returnurl'])) { $location = $_POST['returnurl']; // Handle redirects given by the form - } else { + } else if (isset($_SERVER['HTTP_REFERER'])) { $location = generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('delete_link')); } } From 3947bbb0438beae6ef746c4c946fafe40faa27a8 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sun, 15 Jan 2017 19:27:57 +0100 Subject: [PATCH 461/658] Bump expected minimal PHP version to 5.5 Relates to https://github.com/shaarli/Shaarli/issues/599 Relates to db6b09b69ee265a7d775924fcff9c61aaaabf1cb Signed-off-by: VirtualTam --- index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index beb1cbc..32f5ca3 100644 --- a/index.php +++ b/index.php @@ -13,7 +13,7 @@ * * Licence: http://www.opensource.org/licenses/zlib-license.php * - * Requires: PHP 5.3.x + * Requires: PHP 5.5.x */ // Set 'UTC' as the default timezone if it is not defined in php.ini @@ -83,7 +83,7 @@ use \Shaarli\ThemeUtils; // Ensure the PHP version is supported try { - ApplicationUtils::checkPHPVersion('5.3', PHP_VERSION); + ApplicationUtils::checkPHPVersion('5.5', PHP_VERSION); } catch(Exception $exc) { header('Content-Type: text/plain; charset=utf-8'); echo $exc->getMessage(); From 36dcf997e404e2cd4bc31d132875484d6cf4e667 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sun, 15 Jan 2017 19:24:17 +0100 Subject: [PATCH 462/658] Update Changelog Signed-off-by: VirtualTam --- CHANGELOG.md | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3ecc1e..d2d6316 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,18 +7,50 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [v0.9.0](https://github.com/shaarli/Shaarli/releases/tag/v0.9.0) - UNPUBLISHED +This release introduces the REST API, and requires updating HTTP server +configuration to enable URL rewriting, see: +- https://shaarli.github.io/api-documentation/ +- https://github.com/shaarli/Shaarli/wiki/Server-configuration + **WARNING**: Shaarli now requires PHP 5.5+. ### Added - -- REST API: see [Shaarli API documentation](http://shaarli.github.io/api-documentation/) -- The theme can now be selected in the administration page. +- REST API v1 + - [Slim](https://www.slimframework.com/) framework + - [JSON Web Token](https://jwt.io/introduction/) (JWT) authentication + - versioned API endpoints: + - `/api/v1/info`: get general information on the Shaarli instance + - `/api/v1/links`: get a list of shaared links +- Allow selecting themes/templates from the configuration page +- Add plugin placeholders to Atom/RSS feed templates +- Add OpenSearch to feed templates +- Add `campaign_` to the URL cleanup pattern list +- Add an AUTHORS file and Makefile target to list authors from Git commit data ### Changed +- Docker: enable nginx URL rewriting for the REST API +- Move `user.css` to the `data` folder +- Move default template files to a subfolder (`default`) +- Move PubSubHub to a dedicated plugin +- Coding style: + - explicit method visibility + - safe boolean comparisons + - remove unused variables +- The updater now keeps custom theme preferences +- Simplify the COPYING information -- Default template files are moved to a subfolder (`default`). + +### Removed +- PHP < 5.5 compatibility ### Fixed +- Ignore generated release tarballs +- Hide default port when behind a reverse proxy +- Fix a typo in the Markdown plugin description +- Fix the presence of empty tags for private tags and in search results +- Fix a fatal error during the install +- Fix permalink image alignment in daily page +- Fix the delete button in `editlink` ## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - 2016-12-12 From fcb0d86b9021c7310fc46a6720504d28c668afd4 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 15 Dec 2016 11:49:41 +0100 Subject: [PATCH 463/658] v0.8.2 Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2d6316..04aacad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,11 @@ configuration to enable URL rewriting, see: - Fix permalink image alignment in daily page - Fix the delete button in `editlink` +## [v0.8.2](https://github.com/shaarli/Shaarli/releases/tag/v0.8.2) - 2016-12-15 + +### Fixed + +- Editing a link created before the new ID system would change its permalink. ## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - 2016-12-12 From ae7f6b9d09c0f3e31d64e6c8a9804d5ab0c62eae Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 15 Dec 2016 11:52:31 +0100 Subject: [PATCH 464/658] Bump version to v0.8.2 --- index.php | 4 ++-- shaarli_version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index b27c83b..145ea3f 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))); diff --git a/shaarli_version.php b/shaarli_version.php index 431387b..e93b0e7 100644 --- a/shaarli_version.php +++ b/shaarli_version.php @@ -1 +1 @@ - + From 95e5add4be1fb98a1cae5d30f4fd6e0d2b0a56bc Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 16 Jan 2017 13:07:53 +0100 Subject: [PATCH 465/658] Fix redirection after link deletion relates to #756 --- index.php | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/index.php b/index.php index 145ea3f..677c196 100644 --- a/index.php +++ b/index.php @@ -1349,31 +1349,15 @@ function renderPage($conf, $pluginManager, $LINKSDB) // If we are called from the bookmarklet, we must close the popup: if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { echo ''; exit; } - // Pick where we're going to redirect - // ============================================================= - // Basically, we can't redirect to where we were previously if it was a permalink - // or an edit_link, because it would 404. - // Cases: - // - / : nothing in $_GET, redirect to self - // - /?page : redirect to self - // - /?searchterm : redirect to self (there might be other links) - // - /?searchtags : redirect to self - // - /permalink : redirect to / (the link does not exist anymore) - // - /?edit_link : redirect to / (the link does not exist anymore) - // PHP treats the permalink as a $_GET variable, so we need to check if every condition for self - // redirect is not satisfied, and only then redirect to / - $location = "?"; - // Self redirection - if (count($_GET) == 0 - || isset($_GET['page']) - || isset($_GET['searchterm']) - || isset($_GET['searchtags']) - ) { - if (isset($_POST['returnurl'])) { - $location = $_POST['returnurl']; // Handle redirects given by the form - } else if (isset($_SERVER['HTTP_REFERER'])) { - $location = generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('delete_link')); - } + + $location = '?'; + if (isset($_SERVER['HTTP_REFERER'])) { + // Don't redirect to where we were previously if it was a permalink or an edit_link, because it would 404. + $location = generateLocation( + $_SERVER['HTTP_REFERER'], + $_SERVER['HTTP_HOST'], + ['delete_link', 'edit_link', $link['shorturl']] + ); } header('Location: ' . $location); // After deleting the link, redirect to appropriate location From b87442f216e6745b8472b85ae8fe5d85ede29094 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 16 Jan 2017 13:16:03 +0100 Subject: [PATCH 466/658] Stay on the changetag page after tag deletion + fix changetag CSS alignement relates to #756 --- index.php | 2 +- tpl/default/css/shaarli.css | 2 +- tpl/default/editlink.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index 145ea3f..5cc440b 100644 --- a/index.php +++ b/index.php @@ -1208,7 +1208,7 @@ function renderPage($conf, $pluginManager, $LINKSDB) $LINKSDB[$key]=$value; } $LINKSDB->save($conf->get('resource.page_cache')); - echo ''; + echo ''; exit; } diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index 6d73af3..7ca567e 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -55,7 +55,7 @@ strong { cursor: pointer; height: 24px; padding: 0 5px; - margin: 5px 5px 0 0; + margin: 0 5px 0 0; color: #606060; border-style: outset; border-width: 1px; diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index a2d9b78..f855dfb 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html @@ -35,7 +35,7 @@  
    {else} -  
    +  

    {/if} From 7f96d9ec21a95cb85d0292b46e18235b20efbcb2 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 16 Jan 2017 13:57:11 +0100 Subject: [PATCH 467/658] Update LinkFilter to be able to filter only public links No update regarding the UI or the API for now Fixes #758 --- application/LinkDB.php | 6 +-- application/LinkFilter.php | 60 +++++++++++++--------- application/api/controllers/Links.php | 3 +- index.php | 4 +- tests/LinkFilterTest.php | 73 +++++++++++++++++++++++---- 5 files changed, 107 insertions(+), 39 deletions(-) diff --git a/application/LinkDB.php b/application/LinkDB.php index 1e13286..4cee2af 100644 --- a/application/LinkDB.php +++ b/application/LinkDB.php @@ -443,11 +443,11 @@ You use the community supported version of the original Shaarli project, by Seba * - searchtags: list of tags * - searchterm: term search * @param bool $casesensitive Optional: Perform case sensitive filter - * @param bool $privateonly Optional: Returns private links only if true. + * @param string $visibility return only all/private/public links * * @return array filtered links, all links if no suitable filter was provided. */ - public function filterSearch($filterRequest = array(), $casesensitive = false, $privateonly = false) + public function filterSearch($filterRequest = array(), $casesensitive = false, $visibility = 'all') { // Filter link database according to parameters. $searchtags = !empty($filterRequest['searchtags']) ? escape($filterRequest['searchtags']) : ''; @@ -475,7 +475,7 @@ You use the community supported version of the original Shaarli project, by Seba } $linkFilter = new LinkFilter($this); - return $linkFilter->filter($type, $request, $casesensitive, $privateonly); + return $linkFilter->filter($type, $request, $casesensitive, $visibility); } /** diff --git a/application/LinkFilter.php b/application/LinkFilter.php index 57ebfd5..81832a4 100644 --- a/application/LinkFilter.php +++ b/application/LinkFilter.php @@ -51,12 +51,16 @@ class LinkFilter * @param string $type Type of filter (eg. tags, permalink, etc.). * @param mixed $request Filter content. * @param bool $casesensitive Optional: Perform case sensitive filter if true. - * @param bool $privateonly Optional: Only returns private links if true. + * @param string $visibility Optional: return only all/private/public links * * @return array filtered link list. */ - public function filter($type, $request, $casesensitive = false, $privateonly = false) + public function filter($type, $request, $casesensitive = false, $visibility = 'all') { + if (! in_array($visibility, ['all', 'public', 'private'])) { + $visibility = 'all'; + } + switch($type) { case self::$FILTER_HASH: return $this->filterSmallHash($request); @@ -64,42 +68,44 @@ class LinkFilter if (!empty($request)) { $filtered = $this->links; if (isset($request[0])) { - $filtered = $this->filterTags($request[0], $casesensitive, $privateonly); + $filtered = $this->filterTags($request[0], $casesensitive, $visibility); } if (isset($request[1])) { $lf = new LinkFilter($filtered); - $filtered = $lf->filterFulltext($request[1], $privateonly); + $filtered = $lf->filterFulltext($request[1], $visibility); } return $filtered; } - return $this->noFilter($privateonly); + return $this->noFilter($visibility); case self::$FILTER_TEXT: - return $this->filterFulltext($request, $privateonly); + return $this->filterFulltext($request, $visibility); case self::$FILTER_TAG: - return $this->filterTags($request, $casesensitive, $privateonly); + return $this->filterTags($request, $casesensitive, $visibility); case self::$FILTER_DAY: return $this->filterDay($request); default: - return $this->noFilter($privateonly); + return $this->noFilter($visibility); } } /** * Unknown filter, but handle private only. * - * @param bool $privateonly returns private link only if true. + * @param string $visibility Optional: return only all/private/public links * * @return array filtered links. */ - private function noFilter($privateonly = false) + private function noFilter($visibility = 'all') { - if (! $privateonly) { + if ($visibility === 'all') { return $this->links; } $out = array(); foreach ($this->links as $key => $value) { - if ($value['private']) { + if ($value['private'] && $visibility === 'private') { + $out[$key] = $value; + } else if (! $value['private'] && $visibility === 'public') { $out[$key] = $value; } } @@ -151,14 +157,14 @@ class LinkFilter * - see https://github.com/shaarli/Shaarli/issues/75 for examples * * @param string $searchterms search query. - * @param bool $privateonly return only private links if true. + * @param string $visibility Optional: return only all/private/public links. * * @return array search results. */ - private function filterFulltext($searchterms, $privateonly = false) + private function filterFulltext($searchterms, $visibility = 'all') { if (empty($searchterms)) { - return $this->links; + return $this->noFilter($visibility); } $filtered = array(); @@ -189,8 +195,12 @@ class LinkFilter foreach ($this->links as $id => $link) { // ignore non private links when 'privatonly' is on. - if (! $link['private'] && $privateonly === true) { - continue; + if ($visibility !== 'all') { + if (! $link['private'] && $visibility === 'private') { + continue; + } else if ($link['private'] && $visibility === 'public') { + continue; + } } // Concatenate link fields to search across fields. @@ -235,16 +245,16 @@ class LinkFilter * * @param string $tags list of tags separated by commas or blank spaces. * @param bool $casesensitive ignore case if false. - * @param bool $privateonly returns private links only. + * @param string $visibility Optional: return only all/private/public links. * * @return array filtered links. */ - public function filterTags($tags, $casesensitive = false, $privateonly = false) + public function filterTags($tags, $casesensitive = false, $visibility = 'all') { // Implode if array for clean up. $tags = is_array($tags) ? trim(implode(' ', $tags)) : $tags; if (empty($tags)) { - return $this->links; + return $this->noFilter($visibility); } $searchtags = self::tagsStrToArray($tags, $casesensitive); @@ -255,8 +265,12 @@ class LinkFilter foreach ($this->links as $key => $link) { // ignore non private links when 'privatonly' is on. - if (! $link['private'] && $privateonly === true) { - continue; + if ($visibility !== 'all') { + if (! $link['private'] && $visibility === 'private') { + continue; + } else if ($link['private'] && $visibility === 'public') { + continue; + } } $linktags = self::tagsStrToArray($link['tags'], $casesensitive); @@ -341,7 +355,7 @@ class LinkFilter * @param bool $casesensitive will convert everything to lowercase if false. * * @return array filtered tags string. - */ + */ public static function tagsStrToArray($tags, $casesensitive) { // We use UTF-8 conversion to handle various graphemes (i.e. cyrillic, or greek) diff --git a/application/api/controllers/Links.php b/application/api/controllers/Links.php index 1c7b41c..01b7e78 100644 --- a/application/api/controllers/Links.php +++ b/application/api/controllers/Links.php @@ -41,7 +41,8 @@ class Links extends ApiController 'searchterm' => $request->getParam('searchterm', ''), ], false, - $private === 'true' || $private === '1' + // to updated in another PR depending on the API doc + ($private === 'true' || $private === '1') ? 'private' : 'all' ); // Return links from the {offset}th link, starting from 0. diff --git a/index.php b/index.php index 145ea3f..4f07a01 100644 --- a/index.php +++ b/index.php @@ -1630,8 +1630,8 @@ function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager) } } else { // Filter links according search parameters. - $privateonly = !empty($_SESSION['privateonly']); - $linksToDisplay = $LINKSDB->filterSearch($_GET, false, $privateonly); + $visibility = ! empty($_SESSION['privateonly']) ? 'private' : 'all'; + $linksToDisplay = $LINKSDB->filterSearch($_GET, false, $visibility); } // ---- Handle paging. diff --git a/tests/LinkFilterTest.php b/tests/LinkFilterTest.php index 21d680a..37d5ca3 100644 --- a/tests/LinkFilterTest.php +++ b/tests/LinkFilterTest.php @@ -12,13 +12,18 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase */ protected static $linkFilter; + /** + * @var ReferenceLinkDB instance + */ + protected static $refDB; + /** * Instanciate linkFilter with ReferenceLinkDB data. */ public static function setUpBeforeClass() { - $refDB = new ReferenceLinkDB(); - self::$linkFilter = new LinkFilter($refDB->getLinks()); + self::$refDB = new ReferenceLinkDB(); + self::$linkFilter = new LinkFilter(self::$refDB->getLinks()); } /** @@ -27,14 +32,30 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase public function testFilter() { $this->assertEquals( - ReferenceLinkDB::$NB_LINKS_TOTAL, + self::$refDB->countLinks(), count(self::$linkFilter->filter('', '')) ); + $this->assertEquals( + self::$refDB->countLinks(), + count(self::$linkFilter->filter('', '', 'all')) + ); + + $this->assertEquals( + self::$refDB->countLinks(), + count(self::$linkFilter->filter('', '', 'randomstr')) + ); + // Private only. $this->assertEquals( - 2, - count(self::$linkFilter->filter('', '', false, true)) + self::$refDB->countPrivateLinks(), + count(self::$linkFilter->filter('', '', false, 'private')) + ); + + // Public only. + $this->assertEquals( + self::$refDB->countPublicLinks(), + count(self::$linkFilter->filter('', '', false, 'public')) ); $this->assertEquals( @@ -58,10 +79,26 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, 'web', false)) ); + $this->assertEquals( + 4, + count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, 'web', false, 'all')) + ); + + $this->assertEquals( + 4, + count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, 'web', false, 'default-blabla')) + ); + // Private only. $this->assertEquals( 1, - count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, 'web', false, true)) + count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, 'web', false, 'private')) + ); + + // Public only. + $this->assertEquals( + 3, + count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, 'web', false, 'public')) ); } @@ -253,14 +290,30 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase public function testFilterFullTextTags() { $this->assertEquals( - 2, - count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'gnu')) + 6, + count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'web')) + ); + + $this->assertEquals( + 6, + count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'web', 'all')) + ); + + $this->assertEquals( + 6, + count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'web', 'bla')) ); // Private only. $this->assertEquals( 1, - count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'web', false, true)) + count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'web', false, 'private')) + ); + + // Public only. + $this->assertEquals( + 5, + count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'web', false, 'public')) ); } @@ -409,7 +462,7 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase LinkFilter::$FILTER_TAG, $hashtag, false, - true + 'private' )) ); } From c37a6f820b0a213ee2d5980a96aafac262aeb97a Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 17 Jan 2017 18:51:40 +0100 Subject: [PATCH 468/658] REST API - getLinks: support the visibility parameter --- application/api/controllers/Links.php | 5 ++- tests/api/controllers/LinksTest.php | 50 ++++++++++++--------------- 2 files changed, 24 insertions(+), 31 deletions(-) diff --git a/application/api/controllers/Links.php b/application/api/controllers/Links.php index 01b7e78..0a7968e 100644 --- a/application/api/controllers/Links.php +++ b/application/api/controllers/Links.php @@ -34,15 +34,14 @@ class Links extends ApiController */ public function getLinks($request, $response) { - $private = $request->getParam('private'); + $private = $request->getParam('visibility'); $links = $this->linkDb->filterSearch( [ 'searchtags' => $request->getParam('searchtags', ''), 'searchterm' => $request->getParam('searchterm', ''), ], false, - // to updated in another PR depending on the API doc - ($private === 'true' || $private === '1') ? 'private' : 'all' + $private ); // Return links from the {offset}th link, starting from 0. diff --git a/tests/api/controllers/LinksTest.php b/tests/api/controllers/LinksTest.php index 4ead26b..284c3a9 100644 --- a/tests/api/controllers/LinksTest.php +++ b/tests/api/controllers/LinksTest.php @@ -188,25 +188,33 @@ class LinksTest extends \PHPUnit_Framework_TestCase } /** - * Test getLinks with private attribute to 1 or true. + * Test getLinks with visibility parameter set to all */ - public function testGetLinksPrivate() + public function testGetLinksVisibilityAll() { - $env = Environment::mock([ - 'REQUEST_METHOD' => 'GET', - 'QUERY_STRING' => 'private=true' - ]); + $env = Environment::mock( + [ + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => 'visibility=all' + ] + ); $request = Request::createFromEnvironment($env); $response = $this->controller->getLinks($request, new Response()); $this->assertEquals(200, $response->getStatusCode()); - $data = json_decode((string) $response->getBody(), true); - $this->assertEquals($this->refDB->countPrivateLinks(), count($data)); - $this->assertEquals(6, $data[0]['id']); + $data = json_decode((string)$response->getBody(), true); + $this->assertEquals($this->refDB->countLinks(), count($data)); + $this->assertEquals(41, $data[0]['id']); $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); + } + /** + * Test getLinks with visibility parameter set to private + */ + public function testGetLinksVisibilityPrivate() + { $env = Environment::mock([ 'REQUEST_METHOD' => 'GET', - 'QUERY_STRING' => 'private=1' + 'QUERY_STRING' => 'visibility=private' ]); $request = Request::createFromEnvironment($env); $response = $this->controller->getLinks($request, new Response()); @@ -218,35 +226,21 @@ class LinksTest extends \PHPUnit_Framework_TestCase } /** - * Test getLinks with private attribute to false or 0 + * Test getLinks with visibility parameter set to public */ - public function testGetLinksNotPrivate() + public function testGetLinksVisibilityPublic() { $env = Environment::mock( [ 'REQUEST_METHOD' => 'GET', - 'QUERY_STRING' => 'private=0' + 'QUERY_STRING' => 'visibility=public' ] ); $request = Request::createFromEnvironment($env); $response = $this->controller->getLinks($request, new Response()); $this->assertEquals(200, $response->getStatusCode()); $data = json_decode((string)$response->getBody(), true); - $this->assertEquals($this->refDB->countLinks(), count($data)); - $this->assertEquals(41, $data[0]['id']); - $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); - - $env = Environment::mock( - [ - 'REQUEST_METHOD' => 'GET', - 'QUERY_STRING' => 'private=false' - ] - ); - $request = Request::createFromEnvironment($env); - $response = $this->controller->getLinks($request, new Response()); - $this->assertEquals(200, $response->getStatusCode()); - $data = json_decode((string)$response->getBody(), true); - $this->assertEquals($this->refDB->countLinks(), count($data)); + $this->assertEquals($this->refDB->countPublicLinks(), count($data)); $this->assertEquals(41, $data[0]['id']); $this->assertEquals(self::NB_FIELDS_LINK, count($data[0])); } From 848939b7ba6e34789baa32e467042f481754e2e5 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 15 Dec 2016 10:57:11 +0100 Subject: [PATCH 469/658] Fixes can login function call in loginform.html Fixes #711 --- .travis.yml | 1 + tpl/loginform.html | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ffb3d0..6ff1b20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ cache: directories: - $HOME/.composer/cache php: + - 7.1 - 7.0 - 5.6 - 5.5 diff --git a/tpl/loginform.html b/tpl/loginform.html index a49b42d..8417638 100644 --- a/tpl/loginform.html +++ b/tpl/loginform.html @@ -2,7 +2,7 @@ {include="includes"} - {if="!ban_canLogin()"} + {if="!ban_canLogin($conf)"} You have been banned from login after too many failed attempts. Try later. {else}
    From faf8bdda50ed8ed393e8840e341239aa41a139f8 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 20 Jan 2017 16:44:52 +0100 Subject: [PATCH 470/658] Changelog v0.8.3 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3157d5..502fdad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Fixed +## [v0.8.3](https://github.com/shaarli/Shaarli/releases/tag/v0.8.3) - 2017-01-20 + +### Fixed + +- PHP 7.1 compatibility: add ConfigManager parameter to anti-bruteforce function call in login template. + ## [v0.8.2](https://github.com/shaarli/Shaarli/releases/tag/v0.8.2) - 2016-12-15 ### Fixed From 63bddaad4b6578d5d9a5728cba9f2f0d552805e5 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 20 Jan 2017 16:47:36 +0100 Subject: [PATCH 471/658] Bump version to v0.8.3 Signed-off-by: ArthurHoaro --- index.php | 2 +- shaarli_version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 62bdffd..17fb4a2 100644 --- a/index.php +++ b/index.php @@ -1,6 +1,6 @@ + From 90d4ed9850fa1d26412052c7b4c9b9b984c21e26 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 20 Jan 2017 16:44:52 +0100 Subject: [PATCH 472/658] Changelog v0.8.3 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04aacad..7e98a5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,12 @@ configuration to enable URL rewriting, see: - Fix permalink image alignment in daily page - Fix the delete button in `editlink` +## [v0.8.3](https://github.com/shaarli/Shaarli/releases/tag/v0.8.3) - 2017-01-20 + +### Fixed + +- PHP 7.1 compatibility: add ConfigManager parameter to anti-bruteforce function call in login template. + ## [v0.8.2](https://github.com/shaarli/Shaarli/releases/tag/v0.8.2) - 2016-12-15 ### Fixed From 03cadbe2208f865af3da8986cb9820cbb5e1fb24 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 20 Jan 2017 16:47:36 +0100 Subject: [PATCH 473/658] Bump version to v0.8.3 Signed-off-by: ArthurHoaro --- index.php | 2 +- shaarli_version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index b62149f..d1eee09 100644 --- a/index.php +++ b/index.php @@ -1,6 +1,6 @@ + From c03455af1161befa404ed8759ca55b63bbf593a2 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 4 Feb 2017 12:01:48 +0100 Subject: [PATCH 474/658] Fixes #775: LinkDB do not access LinkDB before ID system migration To access LinkDB items with its ArrayAccess implementation, the IDs must be consistent, which isn't the case before `updateMethodDatastoreIds()` execution. v0.6.4 method `updateMethodRenameDashTags()` was accessing it, so an upgrade <0.6.4 to >0.8.x was failing. This just move the minor update `RenameDashTags` after the IDs update. --- application/Updater.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/application/Updater.php b/application/Updater.php index eb03c6d..90aba74 100644 --- a/application/Updater.php +++ b/application/Updater.php @@ -132,21 +132,6 @@ class Updater return true; } - /** - * Rename tags starting with a '-' to work with tag exclusion search. - */ - public function updateMethodRenameDashTags() - { - $linklist = $this->linkDB->filterSearch(); - foreach ($linklist as $key => $link) { - $link['tags'] = preg_replace('/(^| )\-/', '$1', $link['tags']); - $link['tags'] = implode(' ', array_unique(LinkFilter::tagsStrToArray($link['tags'], true))); - $this->linkDB[$key] = $link; - } - $this->linkDB->save($this->conf->get('resource.page_cache')); - return true; - } - /** * Move old configuration in PHP to the new config system in JSON format. * @@ -257,6 +242,21 @@ class Updater return true; } + /** + * Rename tags starting with a '-' to work with tag exclusion search. + */ + public function updateMethodRenameDashTags() + { + $linklist = $this->linkDB->filterSearch(); + foreach ($linklist as $key => $link) { + $link['tags'] = preg_replace('/(^| )\-/', '$1', $link['tags']); + $link['tags'] = implode(' ', array_unique(LinkFilter::tagsStrToArray($link['tags'], true))); + $this->linkDB[$key] = $link; + } + $this->linkDB->save($this->conf->get('resource.page_cache')); + return true; + } + /** * Initialize API settings: * - api.enabled: true From 16e3d006e9e9386001881053f610657525feb188 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 24 Dec 2016 10:30:21 +0100 Subject: [PATCH 475/658] REST API: implements getLink by ID service See http://shaarli.github.io/api-documentation/#links-link-get --- application/api/controllers/Links.php | 25 +++- .../exceptions/ApiLinkNotFoundException.php | 32 +++++ index.php | 5 +- tests/api/controllers/GetLinkIdTest.php | 130 ++++++++++++++++++ .../{LinksTest.php => GetLinksTest.php} | 13 +- 5 files changed, 195 insertions(+), 10 deletions(-) create mode 100644 application/api/exceptions/ApiLinkNotFoundException.php create mode 100644 tests/api/controllers/GetLinkIdTest.php rename tests/api/controllers/{LinksTest.php => GetLinksTest.php} (98%) diff --git a/application/api/controllers/Links.php b/application/api/controllers/Links.php index 0a7968e..d4f1a09 100644 --- a/application/api/controllers/Links.php +++ b/application/api/controllers/Links.php @@ -4,6 +4,7 @@ namespace Shaarli\Api\Controllers; use Shaarli\Api\ApiUtils; use Shaarli\Api\Exceptions\ApiBadParametersException; +use Shaarli\Api\Exceptions\ApiLinkNotFoundException; use Slim\Http\Request; use Slim\Http\Response; @@ -58,8 +59,7 @@ class Links extends ApiController $limit = $request->getParam('limit'); if (empty($limit)) { $limit = self::$DEFAULT_LIMIT; - } - else if (ctype_digit($limit)) { + } else if (ctype_digit($limit)) { $limit = intval($limit); } else if ($limit === 'all') { $limit = count($links); @@ -83,4 +83,25 @@ class Links extends ApiController return $response->withJson($out, 200, $this->jsonStyle); } + + /** + * Return a single formatted link by its ID. + * + * @param Request $request Slim request. + * @param Response $response Slim response. + * @param array $args Path parameters. including the ID. + * + * @return Response containing the link array. + * + * @throws ApiLinkNotFoundException generating a 404 error. + */ + public function getLink($request, $response, $args) + { + if (! isset($this->linkDb[$args['id']])) { + throw new ApiLinkNotFoundException(); + } + $index = index_url($this->ci['environment']); + $out = ApiUtils::formatLink($this->linkDb[$args['id']], $index); + return $response->withJson($out, 200, $this->jsonStyle); + } } diff --git a/application/api/exceptions/ApiLinkNotFoundException.php b/application/api/exceptions/ApiLinkNotFoundException.php new file mode 100644 index 0000000..de7e14f --- /dev/null +++ b/application/api/exceptions/ApiLinkNotFoundException.php @@ -0,0 +1,32 @@ +message = 'Link not found'; + } + + /** + * {@inheritdoc} + */ + public function getApiResponse() + { + return $this->buildApiResponse(404); + } +} diff --git a/index.php b/index.php index d1eee09..8eb36d8 100644 --- a/index.php +++ b/index.php @@ -2232,12 +2232,13 @@ $app = new \Slim\App($container); $app->group('/api/v1', function() { $this->get('/info', '\Shaarli\Api\Controllers\Info:getInfo'); $this->get('/links', '\Shaarli\Api\Controllers\Links:getLinks'); + $this->get('/links/{id:[\d]+}', '\Shaarli\Api\Controllers\Links:getLink'); })->add('\Shaarli\Api\ApiMiddleware'); $response = $app->run(true); // Hack to make Slim and Shaarli router work together: -// If a Slim route isn't found, we call renderPage(). -if ($response->getStatusCode() == 404) { +// If a Slim route isn't found and NOT API call, we call renderPage(). +if ($response->getStatusCode() == 404 && strpos($_SERVER['REQUEST_URI'], '/api/v1') === false) { // We use UTF-8 for proper international characters handling. header('Content-Type: text/html; charset=utf-8'); renderPage($conf, $pluginManager, $linkDb); diff --git a/tests/api/controllers/GetLinkIdTest.php b/tests/api/controllers/GetLinkIdTest.php new file mode 100644 index 0000000..1b02050 --- /dev/null +++ b/tests/api/controllers/GetLinkIdTest.php @@ -0,0 +1,130 @@ +conf = new \ConfigManager('tests/utils/config/configJson'); + $this->refDB = new \ReferenceLinkDB(); + $this->refDB->write(self::$testDatastore); + + $this->container = new Container(); + $this->container['conf'] = $this->conf; + $this->container['db'] = new \LinkDB(self::$testDatastore, true, false); + + $this->controller = new Links($this->container); + } + + /** + * After each test, remove the test datastore. + */ + public function tearDown() + { + @unlink(self::$testDatastore); + } + + /** + * Test basic getLink service: return link ID=41. + */ + public function testGetLinkId() + { + // Used by index_url(). + $_SERVER['SERVER_NAME'] = 'domain.tld'; + $_SERVER['SERVER_PORT'] = 80; + $_SERVER['SCRIPT_NAME'] = '/'; + + $id = 41; + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + ]); + $request = Request::createFromEnvironment($env); + + $response = $this->controller->getLink($request, new Response(), ['id' => $id]); + $this->assertEquals(200, $response->getStatusCode()); + $data = json_decode((string) $response->getBody(), true); + $this->assertEquals(self::NB_FIELDS_LINK, count($data)); + $this->assertEquals($id, $data['id']); + + // Check link elements + $this->assertEquals('http://domain.tld/?WDWyig', $data['url']); + $this->assertEquals('WDWyig', $data['shorturl']); + $this->assertEquals('Link title: @website', $data['title']); + $this->assertEquals( + 'Stallman has a beard and is part of the Free Software Foundation (or not). Seriously, read this. #hashtag', + $data['description'] + ); + $this->assertEquals('sTuff', $data['tags'][0]); + $this->assertEquals(false, $data['private']); + $this->assertEquals( + \DateTime::createFromFormat(\LinkDB::LINK_DATE_FORMAT, '20150310_114651')->format(\DateTime::ATOM), + $data['created'] + ); + $this->assertEmpty($data['updated']); + } + + /** + * Test basic getLink service: get non existent link => ApiLinkNotFoundException. + * + * @expectedException Shaarli\Api\Exceptions\ApiLinkNotFoundException + * @expectedExceptionMessage Link not found + */ + public function testGetLink404() + { + $env = Environment::mock([ + 'REQUEST_METHOD' => 'GET', + ]); + $request = Request::createFromEnvironment($env); + + $this->controller->getLink($request, new Response(), ['id' => -1]); + } +} diff --git a/tests/api/controllers/LinksTest.php b/tests/api/controllers/GetLinksTest.php similarity index 98% rename from tests/api/controllers/LinksTest.php rename to tests/api/controllers/GetLinksTest.php index 284c3a9..da54fcf 100644 --- a/tests/api/controllers/LinksTest.php +++ b/tests/api/controllers/GetLinksTest.php @@ -9,14 +9,15 @@ use Slim\Http\Request; use Slim\Http\Response; /** - * Class LinksTest + * Class GetLinksTest * - * Test Links REST API services. - * Note that api call results are tightly related to data contained in ReferenceLinkDB. + * Test get Link list REST API service. + * + * @see http://shaarli.github.io/api-documentation/#links-links-collection-get * * @package Shaarli\Api\Controllers */ -class LinksTest extends \PHPUnit_Framework_TestCase +class GetLinksTest extends \PHPUnit_Framework_TestCase { /** * @var string datastore to test write operations @@ -53,7 +54,7 @@ class LinksTest extends \PHPUnit_Framework_TestCase */ public function setUp() { - $this->conf = new \ConfigManager('tests/utils/config/configJson.json.php'); + $this->conf = new \ConfigManager('tests/utils/config/configJson'); $this->refDB = new \ReferenceLinkDB(); $this->refDB->write(self::$testDatastore); @@ -100,7 +101,7 @@ class LinksTest extends \PHPUnit_Framework_TestCase $this->assertEquals($order[$cpt++], $link['id']); } - // Check first element fields\ + // Check first element fields $first = $data[0]; $this->assertEquals('http://domain.tld/?WDWyig', $first['url']); $this->assertEquals('WDWyig', $first['shorturl']); From b848615c52660f9e3173ab7eedab29af0c49a4fc Mon Sep 17 00:00:00 2001 From: Christophe HENRY Date: Wed, 22 Feb 2017 14:55:52 +0100 Subject: [PATCH 476/658] Removes spaces before and after bookmarklet's name Carriage returns turns into space in some cases. The name of the bookmarklet, once in the browser bookmarks, is surrounded by spaces. --- tpl/default/tools.html | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tpl/default/tools.html b/tpl/default/tools.html index e06d239..c36aa5b 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html @@ -30,9 +30,7 @@ '&source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no,dialog=1' ); } - )();"> - ✚Shaare link - + )();">✚Shaare link ⇐ Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).
    @@ -41,9 +39,7 @@

    - ✚Add Note - + href="?private=1&post=">✚Add Note ⇐ Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).
    @@ -52,9 +48,7 @@

    {if="$sslenabled"} - - ✚Add to Firefox social - + ✚Add to Firefox social ⇐ Click on this button to add Shaarli to the "Share this page" button in Firefox.

    From 009ce9358168cc06c76fc2f4162829e552e633a3 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 14 Jan 2017 15:51:30 +0100 Subject: [PATCH 477/658] Move default template to vintage folder --- .gitignore | 1 + tpl/{default => vintage}/404.html | 0 tpl/{default => vintage}/addlink.html | 0 tpl/{default => vintage}/changepassword.html | 0 tpl/{default => vintage}/changetag.html | 0 tpl/{default => vintage}/configure.html | 0 tpl/{default => vintage}/css/reset.css | 0 tpl/{default => vintage}/css/shaarli.css | 0 tpl/{default => vintage}/daily.html | 0 tpl/{default => vintage}/dailyrss.html | 0 tpl/{default => vintage}/editlink.html | 0 tpl/{default => vintage}/export.bookmarks.html | 0 tpl/{default => vintage}/export.html | 0 tpl/{default => vintage}/feed.atom.html | 0 tpl/{default => vintage}/feed.rss.html | 0 .../images/50pc_transparent.png | Bin .../images/Paper_texture_v5_by_bashcorpo_w1000.jpg | Bin tpl/{default => vintage}/images/calendar.png | Bin tpl/{default => vintage}/images/floral_left.png | Bin tpl/{default => vintage}/images/floral_right.png | Bin tpl/{default => vintage}/images/private.png | Bin tpl/{default => vintage}/images/squiggle.png | Bin .../images/squiggle_closing.png | Bin tpl/{default => vintage}/images/tag_blue.png | Bin tpl/{default => vintage}/import.html | 0 tpl/{default => vintage}/includes.html | 0 tpl/{default => vintage}/install.html | 0 tpl/{default => vintage}/linklist.html | 0 tpl/{default => vintage}/linklist.paging.html | 0 tpl/{default => vintage}/loginform.html | 0 tpl/{default => vintage}/opensearch.html | 0 tpl/{default => vintage}/page.footer.html | 0 tpl/{default => vintage}/page.header.html | 0 tpl/{default => vintage}/page.html | 0 tpl/{default => vintage}/picwall.html | 0 tpl/{default => vintage}/pluginsadmin.html | 0 tpl/{default => vintage}/readme.txt | 0 tpl/{default => vintage}/tagcloud.html | 0 tpl/{default => vintage}/tools.html | 0 39 files changed, 1 insertion(+) rename tpl/{default => vintage}/404.html (100%) rename tpl/{default => vintage}/addlink.html (100%) rename tpl/{default => vintage}/changepassword.html (100%) rename tpl/{default => vintage}/changetag.html (100%) rename tpl/{default => vintage}/configure.html (100%) rename tpl/{default => vintage}/css/reset.css (100%) rename tpl/{default => vintage}/css/shaarli.css (100%) rename tpl/{default => vintage}/daily.html (100%) rename tpl/{default => vintage}/dailyrss.html (100%) rename tpl/{default => vintage}/editlink.html (100%) rename tpl/{default => vintage}/export.bookmarks.html (100%) rename tpl/{default => vintage}/export.html (100%) rename tpl/{default => vintage}/feed.atom.html (100%) rename tpl/{default => vintage}/feed.rss.html (100%) rename tpl/{default => vintage}/images/50pc_transparent.png (100%) rename tpl/{default => vintage}/images/Paper_texture_v5_by_bashcorpo_w1000.jpg (100%) rename tpl/{default => vintage}/images/calendar.png (100%) rename tpl/{default => vintage}/images/floral_left.png (100%) rename tpl/{default => vintage}/images/floral_right.png (100%) rename tpl/{default => vintage}/images/private.png (100%) rename tpl/{default => vintage}/images/squiggle.png (100%) rename tpl/{default => vintage}/images/squiggle_closing.png (100%) rename tpl/{default => vintage}/images/tag_blue.png (100%) rename tpl/{default => vintage}/import.html (100%) rename tpl/{default => vintage}/includes.html (100%) rename tpl/{default => vintage}/install.html (100%) rename tpl/{default => vintage}/linklist.html (100%) rename tpl/{default => vintage}/linklist.paging.html (100%) rename tpl/{default => vintage}/loginform.html (100%) rename tpl/{default => vintage}/opensearch.html (100%) rename tpl/{default => vintage}/page.footer.html (100%) rename tpl/{default => vintage}/page.header.html (100%) rename tpl/{default => vintage}/page.html (100%) rename tpl/{default => vintage}/picwall.html (100%) rename tpl/{default => vintage}/pluginsadmin.html (100%) rename tpl/{default => vintage}/readme.txt (100%) rename tpl/{default => vintage}/tagcloud.html (100%) rename tpl/{default => vintage}/tools.html (100%) diff --git a/.gitignore b/.gitignore index 19f3dc8..e64c8a4 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ plugins/*/config.php # 3rd party themes tpl/* !tpl/default +!tpl/vintage diff --git a/tpl/default/404.html b/tpl/vintage/404.html similarity index 100% rename from tpl/default/404.html rename to tpl/vintage/404.html diff --git a/tpl/default/addlink.html b/tpl/vintage/addlink.html similarity index 100% rename from tpl/default/addlink.html rename to tpl/vintage/addlink.html diff --git a/tpl/default/changepassword.html b/tpl/vintage/changepassword.html similarity index 100% rename from tpl/default/changepassword.html rename to tpl/vintage/changepassword.html diff --git a/tpl/default/changetag.html b/tpl/vintage/changetag.html similarity index 100% rename from tpl/default/changetag.html rename to tpl/vintage/changetag.html diff --git a/tpl/default/configure.html b/tpl/vintage/configure.html similarity index 100% rename from tpl/default/configure.html rename to tpl/vintage/configure.html diff --git a/tpl/default/css/reset.css b/tpl/vintage/css/reset.css similarity index 100% rename from tpl/default/css/reset.css rename to tpl/vintage/css/reset.css diff --git a/tpl/default/css/shaarli.css b/tpl/vintage/css/shaarli.css similarity index 100% rename from tpl/default/css/shaarli.css rename to tpl/vintage/css/shaarli.css diff --git a/tpl/default/daily.html b/tpl/vintage/daily.html similarity index 100% rename from tpl/default/daily.html rename to tpl/vintage/daily.html diff --git a/tpl/default/dailyrss.html b/tpl/vintage/dailyrss.html similarity index 100% rename from tpl/default/dailyrss.html rename to tpl/vintage/dailyrss.html diff --git a/tpl/default/editlink.html b/tpl/vintage/editlink.html similarity index 100% rename from tpl/default/editlink.html rename to tpl/vintage/editlink.html diff --git a/tpl/default/export.bookmarks.html b/tpl/vintage/export.bookmarks.html similarity index 100% rename from tpl/default/export.bookmarks.html rename to tpl/vintage/export.bookmarks.html diff --git a/tpl/default/export.html b/tpl/vintage/export.html similarity index 100% rename from tpl/default/export.html rename to tpl/vintage/export.html diff --git a/tpl/default/feed.atom.html b/tpl/vintage/feed.atom.html similarity index 100% rename from tpl/default/feed.atom.html rename to tpl/vintage/feed.atom.html diff --git a/tpl/default/feed.rss.html b/tpl/vintage/feed.rss.html similarity index 100% rename from tpl/default/feed.rss.html rename to tpl/vintage/feed.rss.html diff --git a/tpl/default/images/50pc_transparent.png b/tpl/vintage/images/50pc_transparent.png similarity index 100% rename from tpl/default/images/50pc_transparent.png rename to tpl/vintage/images/50pc_transparent.png diff --git a/tpl/default/images/Paper_texture_v5_by_bashcorpo_w1000.jpg b/tpl/vintage/images/Paper_texture_v5_by_bashcorpo_w1000.jpg similarity index 100% rename from tpl/default/images/Paper_texture_v5_by_bashcorpo_w1000.jpg rename to tpl/vintage/images/Paper_texture_v5_by_bashcorpo_w1000.jpg diff --git a/tpl/default/images/calendar.png b/tpl/vintage/images/calendar.png similarity index 100% rename from tpl/default/images/calendar.png rename to tpl/vintage/images/calendar.png diff --git a/tpl/default/images/floral_left.png b/tpl/vintage/images/floral_left.png similarity index 100% rename from tpl/default/images/floral_left.png rename to tpl/vintage/images/floral_left.png diff --git a/tpl/default/images/floral_right.png b/tpl/vintage/images/floral_right.png similarity index 100% rename from tpl/default/images/floral_right.png rename to tpl/vintage/images/floral_right.png diff --git a/tpl/default/images/private.png b/tpl/vintage/images/private.png similarity index 100% rename from tpl/default/images/private.png rename to tpl/vintage/images/private.png diff --git a/tpl/default/images/squiggle.png b/tpl/vintage/images/squiggle.png similarity index 100% rename from tpl/default/images/squiggle.png rename to tpl/vintage/images/squiggle.png diff --git a/tpl/default/images/squiggle_closing.png b/tpl/vintage/images/squiggle_closing.png similarity index 100% rename from tpl/default/images/squiggle_closing.png rename to tpl/vintage/images/squiggle_closing.png diff --git a/tpl/default/images/tag_blue.png b/tpl/vintage/images/tag_blue.png similarity index 100% rename from tpl/default/images/tag_blue.png rename to tpl/vintage/images/tag_blue.png diff --git a/tpl/default/import.html b/tpl/vintage/import.html similarity index 100% rename from tpl/default/import.html rename to tpl/vintage/import.html diff --git a/tpl/default/includes.html b/tpl/vintage/includes.html similarity index 100% rename from tpl/default/includes.html rename to tpl/vintage/includes.html diff --git a/tpl/default/install.html b/tpl/vintage/install.html similarity index 100% rename from tpl/default/install.html rename to tpl/vintage/install.html diff --git a/tpl/default/linklist.html b/tpl/vintage/linklist.html similarity index 100% rename from tpl/default/linklist.html rename to tpl/vintage/linklist.html diff --git a/tpl/default/linklist.paging.html b/tpl/vintage/linklist.paging.html similarity index 100% rename from tpl/default/linklist.paging.html rename to tpl/vintage/linklist.paging.html diff --git a/tpl/default/loginform.html b/tpl/vintage/loginform.html similarity index 100% rename from tpl/default/loginform.html rename to tpl/vintage/loginform.html diff --git a/tpl/default/opensearch.html b/tpl/vintage/opensearch.html similarity index 100% rename from tpl/default/opensearch.html rename to tpl/vintage/opensearch.html diff --git a/tpl/default/page.footer.html b/tpl/vintage/page.footer.html similarity index 100% rename from tpl/default/page.footer.html rename to tpl/vintage/page.footer.html diff --git a/tpl/default/page.header.html b/tpl/vintage/page.header.html similarity index 100% rename from tpl/default/page.header.html rename to tpl/vintage/page.header.html diff --git a/tpl/default/page.html b/tpl/vintage/page.html similarity index 100% rename from tpl/default/page.html rename to tpl/vintage/page.html diff --git a/tpl/default/picwall.html b/tpl/vintage/picwall.html similarity index 100% rename from tpl/default/picwall.html rename to tpl/vintage/picwall.html diff --git a/tpl/default/pluginsadmin.html b/tpl/vintage/pluginsadmin.html similarity index 100% rename from tpl/default/pluginsadmin.html rename to tpl/vintage/pluginsadmin.html diff --git a/tpl/default/readme.txt b/tpl/vintage/readme.txt similarity index 100% rename from tpl/default/readme.txt rename to tpl/vintage/readme.txt diff --git a/tpl/default/tagcloud.html b/tpl/vintage/tagcloud.html similarity index 100% rename from tpl/default/tagcloud.html rename to tpl/vintage/tagcloud.html diff --git a/tpl/default/tools.html b/tpl/vintage/tools.html similarity index 100% rename from tpl/default/tools.html rename to tpl/vintage/tools.html From 402b03464812aaec76bc841ca7dacb775baf1e03 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 14 Jan 2017 15:52:17 +0100 Subject: [PATCH 478/658] Introduce the new default Shaarli template --- tpl/default/404.html | 16 + tpl/default/addlink.html | 24 + tpl/default/changepassword.html | 28 + tpl/default/changetag.html | 38 + tpl/default/configure.html | 210 ++ tpl/default/css/font-awesome.css | 2086 +++++++++++++++++++ tpl/default/css/font-awesome.min.css | 4 + tpl/default/css/grids-responsive.css | 861 ++++++++ tpl/default/css/grids-responsive.min.css | 7 + tpl/default/css/pure-extras.css | 262 +++ tpl/default/css/pure.css | 1475 +++++++++++++ tpl/default/css/pure.min.css | 11 + tpl/default/css/shaarli.css | 1180 +++++++++++ tpl/default/daily.html | 113 + tpl/default/dailyrss.html | 16 + tpl/default/editlink.html | 98 + tpl/default/export.bookmarks.html | 10 + tpl/default/export.html | 68 + tpl/default/feed.atom.html | 40 + tpl/default/feed.rss.html | 37 + tpl/default/fonts/Fira-Sans-regular.woff | Bin 0 -> 14119 bytes tpl/default/fonts/Fira-Sans-regular.woff2 | Bin 0 -> 11464 bytes tpl/default/fonts/FontAwesome.otf | Bin 0 -> 109687 bytes tpl/default/fonts/fontawesome-webfont.eot | Bin 0 -> 70806 bytes tpl/default/fonts/fontawesome-webfont.svg | 655 ++++++ tpl/default/fonts/fontawesome-webfont.ttf | Bin 0 -> 142049 bytes tpl/default/fonts/fontawesome-webfont.woff | Bin 0 -> 83588 bytes tpl/default/fonts/fontawesome-webfont.woff2 | Bin 0 -> 66623 bytes tpl/default/img/favicon.png | Bin 0 -> 41600 bytes tpl/default/img/icon.png | Bin 0 -> 530 bytes tpl/default/img/sad_star.png | Bin 0 -> 7099 bytes tpl/default/import.html | 85 + tpl/default/includes.html | 20 + tpl/default/install.html | 122 ++ tpl/default/js/shaarli.js | 228 ++ tpl/default/linklist.html | 246 +++ tpl/default/linklist.paging.html | 55 + tpl/default/loginform.html | 59 + tpl/default/opensearch.html | 45 + tpl/default/page.footer.html | 25 + tpl/default/page.header.html | 174 ++ tpl/default/picwall.html | 50 + tpl/default/pluginsadmin.html | 182 ++ tpl/default/tagcloud.html | 42 + tpl/default/tools.html | 179 ++ 45 files changed, 8751 insertions(+) create mode 100644 tpl/default/404.html create mode 100644 tpl/default/addlink.html create mode 100644 tpl/default/changepassword.html create mode 100644 tpl/default/changetag.html create mode 100644 tpl/default/configure.html create mode 100644 tpl/default/css/font-awesome.css create mode 100644 tpl/default/css/font-awesome.min.css create mode 100644 tpl/default/css/grids-responsive.css create mode 100644 tpl/default/css/grids-responsive.min.css create mode 100644 tpl/default/css/pure-extras.css create mode 100644 tpl/default/css/pure.css create mode 100644 tpl/default/css/pure.min.css create mode 100644 tpl/default/css/shaarli.css create mode 100644 tpl/default/daily.html create mode 100644 tpl/default/dailyrss.html create mode 100644 tpl/default/editlink.html create mode 100644 tpl/default/export.bookmarks.html create mode 100644 tpl/default/export.html create mode 100644 tpl/default/feed.atom.html create mode 100644 tpl/default/feed.rss.html create mode 100644 tpl/default/fonts/Fira-Sans-regular.woff create mode 100644 tpl/default/fonts/Fira-Sans-regular.woff2 create mode 100644 tpl/default/fonts/FontAwesome.otf create mode 100644 tpl/default/fonts/fontawesome-webfont.eot create mode 100644 tpl/default/fonts/fontawesome-webfont.svg create mode 100644 tpl/default/fonts/fontawesome-webfont.ttf create mode 100644 tpl/default/fonts/fontawesome-webfont.woff create mode 100644 tpl/default/fonts/fontawesome-webfont.woff2 create mode 100644 tpl/default/img/favicon.png create mode 100644 tpl/default/img/icon.png create mode 100644 tpl/default/img/sad_star.png create mode 100644 tpl/default/import.html create mode 100644 tpl/default/includes.html create mode 100644 tpl/default/install.html create mode 100644 tpl/default/js/shaarli.js create mode 100644 tpl/default/linklist.html create mode 100644 tpl/default/linklist.paging.html create mode 100644 tpl/default/loginform.html create mode 100644 tpl/default/opensearch.html create mode 100644 tpl/default/page.footer.html create mode 100644 tpl/default/page.header.html create mode 100644 tpl/default/picwall.html create mode 100644 tpl/default/pluginsadmin.html create mode 100644 tpl/default/tagcloud.html create mode 100644 tpl/default/tools.html diff --git a/tpl/default/404.html b/tpl/default/404.html new file mode 100644 index 0000000..2de6b6d --- /dev/null +++ b/tpl/default/404.html @@ -0,0 +1,16 @@ + + + + {include="includes"} + + + + +
    +
    + +
    +
    +{loop="$plugins_footer.endofpage"} + {$value} +{/loop} + +{loop="$plugins_footer.js_files"} + +{/loop} + + + + diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html new file mode 100644 index 0000000..c304e5d --- /dev/null +++ b/tpl/default/page.header.html @@ -0,0 +1,174 @@ +
    +
    +
    + + + {$shaarlititle} + + +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    + + {if="!isLoggedIn()"} +
    +
    + + +
    + + +
    + + + +
    +
    + {/if} +{if="!empty($newVersion) || !empty($versionError)"} +
    +
    + {if="$newVersion"} +
    + Shaarli {$newVersion} + {'is available'|t}. +
    + {/if} + {if="$versionError"} +
    + {'Error'|t}: {$versionError} +
    + {/if} +
    + +
    +
    +{/if} + +{if="!empty($plugin_errors) && isLoggedIn()"} +
    +
    +
    + {loop="plugin_errors"} +

    {$value}

    + {/loop} +
    +
    + +
    +
    +{/if} + +
    diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html new file mode 100644 index 0000000..b9ae2f2 --- /dev/null +++ b/tpl/default/picwall.html @@ -0,0 +1,50 @@ + + + + {include="includes"} + + +{include="page.header"} + +
    +
    +
    + {$countPics=count($linksToDisplay)} +

    {'Picture Wall'|t} - {$countPics} {'pics'|t}

    + +
    + {loop="$plugin_start_zone"} + {$value} + {/loop} +
    + +
    + {loop="$linksToDisplay"} +
    + {$value.thumbnail}{$value.title} + {loop="$value.picwall_plugin"} + {$value} + {/loop} +
    + {/loop} +
    +
    + +
    + {loop="$plugin_end_zone"} + {$value} + {/loop} +
    +
    +
    + +{include="page.footer"} + + + + + diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html new file mode 100644 index 0000000..92af2ee --- /dev/null +++ b/tpl/default/pluginsadmin.html @@ -0,0 +1,182 @@ + + + + {include="includes"} + + +{include="page.header"} + + + +
    +
    +
    +
    +

    {'Plugin administration'|t}

    + +
    +

    {'Enabled Plugins'|t}

    + +
    + {if="count($enabledPlugins)==0"} +

    {'No plugin enabled.'|t}

    + {else} + + + + + + + + + + + {loop="$enabledPlugins"} + + + + + + + + + + {/loop} + + + + + + + + + +
    {'Disable'|t}{'Name'|t}
    {'Description'|t}
    		{'Order'|t}
    + +
    		+ {if="count($enabledPlugins)>1"} + + ▲ + + + ▼ + + {/if} + +
    {'Disable'|t}{'Name'|t}
    {'Description'|t}
    		{'Order'|t}
    + {/if} +
    +
    + +
    +

    {'Disabled Plugins'|t}

    + +
    + {if="count($disabledPlugins)==0"} +

    {'No plugin disabled.'|t}

    + {else} + + + + + + + + + + {loop="$disabledPlugins"} + + + + + + + + + {/loop} + + + + + + + + +
    {'Enable'|t}{'Name'|t}
    {'Description'|t}
    + +
    + +
    {'Enable'|t}{'Name'|t}
    {'Description'|t}
    + {/if} +
    +
    + +
    + More plugins available + in the documentation. +
    +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +

    {'Plugin configuration'|t}

    +
    +
    + {if="count($enabledPlugins)==0"} +

    {'No plugin enabled.'|t}

    + {else} + {loop="$enabledPlugins"} + {if="count($value.parameters) > 0"} +
    +

    {function="str_replace('_', ' ', $key)"}

    + {loop="$value.parameters"} +
    +

    + +

    +
    + +
    +
    + {/loop} +
    + {/if} + {/loop} + {/if} +
    + +
    +
    +
    +
    +
    +
    + +{include="page.footer"} + + + + diff --git a/tpl/default/tagcloud.html b/tpl/default/tagcloud.html new file mode 100644 index 0000000..53c3174 --- /dev/null +++ b/tpl/default/tagcloud.html @@ -0,0 +1,42 @@ + + + + {include="includes"} + + +{include="page.header"} + +
    +
    +
    + {$countTags=count($tags)} +

    {'Tag cloud'|t} - {$countTags} {'tags'|t}

    + +
    + {loop="$plugin_start_zone"} + {$value} + {/loop} +
    + +
    + {loop="tags"} + {$key}{$value.count} + {loop="$value.tag_plugin"} + {$value} + {/loop} + {/loop} +
    + +
    + {loop="$plugin_end_zone"} + {$value} + {/loop} +
    +
    +
    + +{include="page.footer"} + + + diff --git a/tpl/default/tools.html b/tpl/default/tools.html new file mode 100644 index 0000000..b9df32d --- /dev/null +++ b/tpl/default/tools.html @@ -0,0 +1,179 @@ + + + + {include="includes"} + + +{include="page.header"} + +
    +
    +
    +

    {'Settings'|t}

    +
    + + {'Configure your Shaarli'|t} + +
    +
    + + {'Plugin administration'|t} + +
    + {if="!$openshaarli"} +
    + + {'Change password'|t} + +
    + {/if} +
    + + {'Manage tags'|t} + +
    +
    + + {'Import links'|t} + +
    +
    + + {'Export database'|t} + +
    + + {loop="$tools_plugin"} +
    + {$value} +
    + {/loop} +
    + + +
    +
    + +
    +
    +
    +

    Bookmarklets

    +

    + {'Drag one of these button to your bookmarks toolbar or right-click it and "Bookmark This Link"'|t}, + {'then click on the bookmarklet in any page you want to share.'|t} +

    +
    + + ✚ {'Shaare link'|t} + +
    +
    + + ✚ {'Add Note'|t} + +
    +
    +
    + +{if="$sslenabled"} +
    +
    +
    +

    Firefox Social API

    +

    {'You need to browse your Shaarli over HTTPS to use this functionality.'|t}

    + +
    + + ✚ {'Add to'|t} Firefox Social + +
    +
    +
    +{/if} + +
    +
    +
    +

    {'3rd party'|t}

    +
    + + Firefox {'plugin'|t} + +
    +
    + + Chrome {'plugin'|t} + +
    +
    + + Android + +
    +
    + + iOS + +
    +
    +
    + +{include="page.footer"} + + + + + From 147f4df8436fcd3d157c48c181d7b0c6a1fd474b Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 14 Jan 2017 15:53:39 +0100 Subject: [PATCH 479/658] Improve plugin_admin.js to support multiple ordered rows --- inc/plugin_admin.js | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/inc/plugin_admin.js b/inc/plugin_admin.js index 134ffb3..055ac28 100644 --- a/inc/plugin_admin.js +++ b/inc/plugin_admin.js @@ -22,14 +22,22 @@ function changePos(elem, toPos) function changeOrder(pos, move) { var newpos = parseInt(pos) + move; - var line = document.querySelector('[data-order="'+ pos +'"]'); - var changeline = document.querySelector('[data-order="'+ newpos +'"]'); - var parent = changeline.parentNode; + var lines = document.querySelectorAll('[data-order="'+ pos +'"]'); + var changelines = document.querySelectorAll('[data-order="'+ newpos +'"]'); + + // If we go down reverse lines to preserve the rows order + if (move > 0) { + lines = [].slice.call(lines).reverse(); + } + + for (var i = 0 ; i < lines.length ; i++) { + var parent = changelines[0].parentNode; + changePos(lines[i], newpos); + changePos(changelines[i], parseInt(pos)); + var changeItem = move < 0 ? changelines[0] : changelines[changelines.length - 1].nextSibling; + parent.insertBefore(lines[i], changeItem); + } - changePos(line, newpos); - changePos(changeline, parseInt(pos)); - var changeItem = move < 0 ? changeline : changeline.nextSibling; - parent.insertBefore(line, changeItem); } /** From 246d72e14344c417e37599b9ed4ce2c324e244f4 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 14 Jan 2017 15:57:34 +0100 Subject: [PATCH 480/658] Fix markdown plugin color overriding --- plugins/markdown/markdown.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/markdown/markdown.css b/plugins/markdown/markdown.css index 6789ce8..ce19cd2 100644 --- a/plugins/markdown/markdown.css +++ b/plugins/markdown/markdown.css @@ -150,7 +150,7 @@ box-shadow: 0 -1px 0 #e5e5e5,0 0 1px rgba(0,0,0,0.12),0 1px 1px rgba(0,0,0,0.24); } -.md_help { +#pageheader .md_help { color: white; } From 430ff0710265ff281727ef6824cf292d1dfc50f1 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 14 Jan 2017 16:13:32 +0100 Subject: [PATCH 481/658] Upgrade awesomplete + fix multiple autocompletion fields --- inc/awesomplete-multiple-tags.js | 21 ++-- inc/awesomplete.js | 184 +++++++++++++++++++++---------- inc/awesomplete.min.js | 11 +- 3 files changed, 137 insertions(+), 79 deletions(-) diff --git a/inc/awesomplete-multiple-tags.js b/inc/awesomplete-multiple-tags.js index 4cc8429..faecb41 100644 --- a/inc/awesomplete-multiple-tags.js +++ b/inc/awesomplete-multiple-tags.js @@ -1,13 +1,16 @@ var awp = Awesomplete.$; -awesomplete = new Awesomplete(awp('input[data-multiple]'), { - filter: function(text, input) { - return Awesomplete.FILTER_CONTAINS(text, input.match(/[^ ]*$/)[0]); - }, - replace: function(text) { - var before = this.input.value.match(/^.+ \s*|/)[0]; - this.input.value = before + text + " "; - }, - minChars: 1 +var autocompleteFields = document.querySelectorAll('input[data-multiple]'); +[].forEach.call(autocompleteFields, function(autocompleteField) { + awesomplete = new Awesomplete(awp(autocompleteField), { + filter: function (text, input) { + return Awesomplete.FILTER_CONTAINS(text, input.match(/[^ ]*$/)[0]); + }, + replace: function (text) { + var before = this.input.value.match(/^.+ \s*|/)[0]; + this.input.value = before + text + " "; + }, + minChars: 1 + }) }); /** diff --git a/inc/awesomplete.js b/inc/awesomplete.js index fae550e..32f49e5 100644 --- a/inc/awesomplete.js +++ b/inc/awesomplete.js @@ -12,26 +12,23 @@ // Setup + this.isOpened = false; + this.input = $(input); + this.input.setAttribute("autocomplete", "off"); this.input.setAttribute("aria-autocomplete", "list"); o = o || {}; - configure.call(this, { + configure(this, { minChars: 2, maxItems: 10, autoFirst: false, + data: _.DATA, filter: _.FILTER_CONTAINS, sort: _.SORT_BYLENGTH, - item: function (text, input) { - return $.create("li", { - innerHTML: text.replace(RegExp($.regExpEscape(input.trim()), "gi"), "$&"), - "aria-selected": "false" - }); - }, - replace: function (text) { - this.input.value = text; - } + item: _.ITEM, + replace: _.REPLACE }, o); this.index = -1; @@ -44,7 +41,7 @@ }); this.ul = $.create("ul", { - hidden: "", + hidden: "hidden", inside: this.container }); @@ -60,7 +57,7 @@ $.bind(this.input, { "input": this.evaluate.bind(this), - "blur": this.close.bind(this), + "blur": this.close.bind(this, { reason: "blur" }), "keydown": function(evt) { var c = evt.keyCode; @@ -72,7 +69,7 @@ me.select(); } else if (c === 27) { // Esc - me.close(); + me.close({ reason: "esc" }); } else if (c === 38 || c === 40) { // Down/Up arrow evt.preventDefault(); @@ -82,7 +79,7 @@ } }); - $.bind(this.input.form, {"submit": this.close.bind(this)}); + $.bind(this.input.form, {"submit": this.close.bind(this, { reason: "submit" })}); $.bind(this.ul, {"mousedown": function(evt) { var li = evt.target; @@ -93,15 +90,16 @@ li = li.parentNode; } - if (li) { - me.select(li); + if (li && evt.button === 0) { // Only select on left click + evt.preventDefault(); + me.select(li, evt.target); } } }}); if (this.input.hasAttribute("list")) { - this.list = "#" + input.getAttribute("list"); - input.removeAttribute("list"); + this.list = "#" + this.input.getAttribute("list"); + this.input.removeAttribute("list"); } else { this.list = this.input.getAttribute("data-list") || o.list || []; @@ -122,9 +120,18 @@ list = $(list); if (list && list.children) { - this._list = slice.apply(list.children).map(function (el) { - return el.innerHTML.trim(); + var items = []; + slice.apply(list.children).forEach(function (el) { + if (!el.disabled) { + var text = el.textContent.trim(); + var value = el.value || text; + var label = el.label || text; + if (value !== "") { + items.push({ label: label, value: value }); + } + } }); + this._list = items; } } @@ -138,18 +145,24 @@ }, get opened() { - return this.ul && this.ul.getAttribute("hidden") == null; + return this.isOpened; }, - close: function () { + close: function (o) { + if (!this.opened) { + return; + } + this.ul.setAttribute("hidden", ""); + this.isOpened = false; this.index = -1; - $.fire(this.input, "awesomplete-close"); + $.fire(this.input, "awesomplete-close", o || {}); }, open: function () { this.ul.removeAttribute("hidden"); + this.isOpened = true; if (this.autoFirst && this.index === -1) { this.goto(0); @@ -160,14 +173,14 @@ next: function () { var count = this.ul.children.length; - - this.goto(this.index < count - 1? this.index + 1 : -1); + this.goto(this.index < count - 1 ? this.index + 1 : (count ? 0 : -1) ); }, previous: function () { var count = this.ul.children.length; + var pos = this.index - 1; - this.goto(this.selected? this.index - 1 : count - 1); + this.goto(this.selected && pos !== -1 ? pos : count - 1); }, // Should not be used, highlights specific item without any checks! @@ -183,28 +196,37 @@ if (i > -1 && lis.length > 0) { lis[i].setAttribute("aria-selected", "true"); this.status.textContent = lis[i].textContent; - } - $.fire(this.input, "awesomplete-highlight"); + // scroll to highlighted element in case parent's height is fixed + this.ul.scrollTop = lis[i].offsetTop - this.ul.clientHeight + lis[i].clientHeight; + + $.fire(this.input, "awesomplete-highlight", { + text: this.suggestions[this.index] + }); + } }, - select: function (selected) { - selected = selected || this.ul.children[this.index]; + select: function (selected, origin) { + if (selected) { + this.index = $.siblingIndex(selected); + } else { + selected = this.ul.children[this.index]; + } if (selected) { - var prevented; + var suggestion = this.suggestions[this.index]; - $.fire(this.input, "awesomplete-select", { - text: selected.textContent, - preventDefault: function () { - prevented = true; - } + var allowed = $.fire(this.input, "awesomplete-select", { + text: suggestion, + origin: origin || selected }); - if (!prevented) { - this.replace(selected.textContent); - this.close(); - $.fire(this.input, "awesomplete-selectcomplete"); + if (allowed) { + this.replace(suggestion); + this.close({ reason: "select" }); + $.fire(this.input, "awesomplete-selectcomplete", { + text: suggestion + }); } } }, @@ -218,25 +240,28 @@ // Populate list with options that match this.ul.innerHTML = ""; - this._list + this.suggestions = this._list + .map(function(item) { + return new Suggestion(me.data(item, value)); + }) .filter(function(item) { return me.filter(item, value); }) .sort(this.sort) - .every(function(text, i) { - me.ul.appendChild(me.item(text, value)); + .slice(0, this.maxItems); - return i < me.maxItems - 1; - }); + this.suggestions.forEach(function(text) { + me.ul.appendChild(me.item(text, value)); + }); if (this.ul.children.length === 0) { - this.close(); + this.close({ reason: "nomatches" }); } else { this.open(); } } else { - this.close(); + this.close({ reason: "nomatches" }); } } }; @@ -261,27 +286,58 @@ return a < b? -1 : 1; }; + _.ITEM = function (text, input) { + var html = input.trim() === '' ? text : text.replace(RegExp($.regExpEscape(input.trim()), "gi"), "$&"); + return $.create("li", { + innerHTML: html, + "aria-selected": "false" + }); + }; + + _.REPLACE = function (text) { + this.input.value = text.value; + }; + + _.DATA = function (item/*, input*/) { return item; }; + // Private functions - function configure(properties, o) { + function Suggestion(data) { + var o = Array.isArray(data) + ? { label: data[0], value: data[1] } + : typeof data === "object" && "label" in data && "value" in data ? data : { label: data, value: data }; + + this.label = o.label || o.value; + this.value = o.value; + } + Object.defineProperty(Suggestion.prototype = Object.create(String.prototype), "length", { + get: function() { return this.label.length; } + }); + Suggestion.prototype.toString = Suggestion.prototype.valueOf = function () { + return "" + this.label; + }; + + function configure(instance, properties, o) { for (var i in properties) { var initial = properties[i], - attrValue = this.input.getAttribute("data-" + i.toLowerCase()); + attrValue = instance.input.getAttribute("data-" + i.toLowerCase()); if (typeof initial === "number") { - this[i] = +attrValue; + instance[i] = parseInt(attrValue); } else if (initial === false) { // Boolean options must be false by default anyway - this[i] = attrValue !== null; + instance[i] = attrValue !== null; } else if (initial instanceof Function) { - this[i] = null; + instance[i] = null; } else { - this[i] = attrValue; + instance[i] = attrValue; } - this[i] = this[i] || o[i] || initial; + if (!instance[i] && instance[i] !== 0) { + instance[i] = (i in o)? o[i] : initial; + } } } @@ -343,23 +399,29 @@ evt[j] = properties[j]; } - target.dispatchEvent(evt); + return target.dispatchEvent(evt); }; $.regExpEscape = function (s) { return s.replace(/[-\\^$*+?.()|[\]{}]/g, "\\$&"); - } + }; + + $.siblingIndex = function (el) { + /* eslint-disable no-cond-assign */ + for (var i = 0; el = el.previousElementSibling; i++); + return i; + }; // Initialization function init() { $$("input.awesomplete").forEach(function (input) { - new Awesomplete(input); + new _(input); }); } // Are we in a browser? Check for Document constructor - if (typeof Document !== 'undefined') { + if (typeof Document !== "undefined") { // DOM already loaded? if (document.readyState !== "loading") { init(); @@ -374,15 +436,15 @@ _.$$ = $$; // Make sure to export Awesomplete on self when in a browser - if (typeof self !== 'undefined') { + if (typeof self !== "undefined") { self.Awesomplete = _; } // Expose Awesomplete as a CJS module - if (typeof exports === 'object') { + if (typeof module === "object" && module.exports) { module.exports = _; } return _; -}()); +}()); \ No newline at end of file diff --git a/inc/awesomplete.min.js b/inc/awesomplete.min.js index 3bfb05e..cd08c94 100644 --- a/inc/awesomplete.min.js +++ b/inc/awesomplete.min.js @@ -1,10 +1,3 @@ // Awesomplete - Lea Verou - MIT license -(function(){function m(a,b){for(var c in a){var f=a[c],e=this.input.getAttribute("data-"+c.toLowerCase());this[c]="number"===typeof f?+e:!1===f?null!==e:f instanceof Function?null:e;this[c]=this[c]||b[c]||f}}function d(a,b){return"string"===typeof a?(b||document).querySelector(a):a||null}function h(a,b){return k.call((b||document).querySelectorAll(a))}function l(){h("input.awesomplete").forEach(function(a){new Awesomplete(a)})}var g=self.Awesomplete=function(a,b){var c=this;this.input=d(a);this.input.setAttribute("aria-autocomplete", - "list");b=b||{};m.call(this,{minChars:2,maxItems:10,autoFirst:!1,filter:g.FILTER_CONTAINS,sort:g.SORT_BYLENGTH,item:function(a,b){return d.create("li",{innerHTML:a.replace(RegExp(d.regExpEscape(b.trim()),"gi"),"$&"),"aria-selected":"false"})},replace:function(a){this.input.value=a}},b);this.index=-1;this.container=d.create("div",{className:"awesomplete",around:a});this.ul=d.create("ul",{hidden:"",inside:this.container});this.status=d.create("span",{className:"visually-hidden",role:"status", - "aria-live":"assertive","aria-relevant":"additions",inside:this.container});d.bind(this.input,{input:this.evaluate.bind(this),blur:this.close.bind(this),keydown:function(a){var b=a.keyCode;if(c.opened)if(13===b&&c.selected)a.preventDefault(),c.select();else if(27===b)c.close();else if(38===b||40===b)a.preventDefault(),c[38===b?"previous":"next"]()}});d.bind(this.input.form,{submit:this.close.bind(this)});d.bind(this.ul,{mousedown:function(a){a=a.target;if(a!==this){for(;a&&!/li/i.test(a.nodeName);)a= - a.parentNode;a&&c.select(a)}}});this.input.hasAttribute("list")?(this.list="#"+a.getAttribute("list"),a.removeAttribute("list")):this.list=this.input.getAttribute("data-list")||b.list||[];g.all.push(this)};g.prototype={set list(a){Array.isArray(a)?this._list=a:"string"===typeof a&&-1=this.minChars&&0-1)this._list=t.split(/\s*,\s*/);else if(t=i(t),t&&t.children){var e=[];o.apply(t.children).forEach(function(t){if(!t.disabled){var i=t.textContent.trim(),n=t.value||i,s=t.label||i;""!==n&&e.push({label:s,value:n})}}),this._list=e}document.activeElement===this.input&&this.evaluate()},get selected(){return this.index>-1},get opened(){return this.isOpened},close:function(t){this.opened&&(this.ul.setAttribute("hidden",""),this.isOpened=!1,this.index=-1,i.fire(this.input,"awesomplete-close",t||{}))},open:function(){this.ul.removeAttribute("hidden"),this.isOpened=!0,this.autoFirst&&this.index===-1&&this.goto(0),i.fire(this.input,"awesomplete-open")},next:function(){var t=this.ul.children.length;this.goto(this.index-1&&e.length>0&&(e[t].setAttribute("aria-selected","true"),this.status.textContent=e[t].textContent,i.fire(this.input,"awesomplete-highlight",{text:this.suggestions[this.index]}))},select:function(t,e){if(t?this.index=i.siblingIndex(t):t=this.ul.children[this.index],t){var n=this.suggestions[this.index],s=i.fire(this.input,"awesomplete-select",{text:n,origin:e||t});s&&(this.replace(n),this.close({reason:"select"}),i.fire(this.input,"awesomplete-selectcomplete",{text:n}))}},evaluate:function(){var e=this,i=this.input.value;i.length>=this.minChars&&this._list.length>0?(this.index=-1,this.ul.innerHTML="",this.suggestions=this._list.map(function(n){return new t(e.data(n,i))}).filter(function(t){return e.filter(t,i)}).sort(this.sort).slice(0,this.maxItems),this.suggestions.forEach(function(t){e.ul.appendChild(e.item(t,i))}),0===this.ul.children.length?this.close({reason:"nomatches"}):this.open()):this.close({reason:"nomatches"})}},r.all=[],r.FILTER_CONTAINS=function(t,e){return RegExp(i.regExpEscape(e.trim()),"i").test(t)},r.FILTER_STARTSWITH=function(t,e){return RegExp("^"+i.regExpEscape(e.trim()),"i").test(t)},r.SORT_BYLENGTH=function(t,e){return t.length!==e.length?t.length-e.length:t$&");return i.create("li",{innerHTML:n,"aria-selected":"false"})},r.REPLACE=function(t){this.input.value=t.value},r.DATA=function(t){return t},Object.defineProperty(t.prototype=Object.create(String.prototype),"length",{get:function(){return this.label.length}}),t.prototype.toString=t.prototype.valueOf=function(){return""+this.label};var o=Array.prototype.slice;return i.create=function(t,e){var n=document.createElement(t);for(var s in e){var r=e[s];if("inside"===s)i(r).appendChild(n);else if("around"===s){var o=i(r);o.parentNode.insertBefore(n,o),n.appendChild(o)}else s in n?n[s]=r:n.setAttribute(s,r)}return n},i.bind=function(t,e){if(t)for(var i in e){var n=e[i];i.split(/\s+/).forEach(function(e){t.addEventListener(e,n)})}},i.fire=function(t,e,i){var n=document.createEvent("HTMLEvents");n.initEvent(e,!0,!0);for(var s in i)n[s]=i[s];return t.dispatchEvent(n)},i.regExpEscape=function(t){return t.replace(/[-\\^$*+?.()|[\]{}]/g,"\\$&")},i.siblingIndex=function(t){for(var e=0;t=t.previousElementSibling;e++);return e},"undefined"!=typeof Document&&("loading"!==document.readyState?s():document.addEventListener("DOMContentLoaded",s)),r.$=i,r.$$=n,"undefined"!=typeof self&&(self.Awesomplete=r),"object"==typeof module&&module.exports&&(module.exports=r),r}(); +//# sourceMappingURL=awesomplete.min.js.map \ No newline at end of file From 7040169069322d72cec4276b7b812291b57a0d40 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 21 Feb 2017 14:16:48 +0100 Subject: [PATCH 482/658] Multiple minor improvements and bugfixes regarding the new templates: * Add API settings in `configure.html` * Fix textarea autoresize * Load user.css from data folder * Move fold/expand all button to the right and fix an issue with already folded items * Reset datetime display to international datetime * Temporarilly remove JS login panel (need improvement and integration with the plugin system) * Body background is slightly lighter * Fix an issue where thumbnails were hidden by description * Fix an issue where private orange bar wasn't displayed with thumbnails * Remove the gradient bar behind titles * Fix empty bookmarklet name in Firefox --- tpl/default/configure.html | 30 ++++++++++++++ tpl/default/css/shaarli.css | 68 +++++++++++++++++++------------- tpl/default/editlink.html | 15 ++----- tpl/default/includes.html | 2 +- tpl/default/js/shaarli.js | 34 ++++++++++++++++ tpl/default/linklist.html | 2 +- tpl/default/linklist.paging.html | 5 ++- tpl/default/page.header.html | 2 +- 8 files changed, 116 insertions(+), 42 deletions(-) diff --git a/tpl/default/configure.html b/tpl/default/configure.html index a242560..2f54a08 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html @@ -183,6 +183,36 @@
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index 161c36d..b937c59 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -2,7 +2,7 @@ * General */ body { - background: #c5c5c5; + background: #d0d0d0; } .strong { @@ -268,6 +268,12 @@ pre { width: 200px; } +/* because chrome */ +#header-login-form input[type="text"]::-webkit-input-placeholder, +#header-login-form input[type="password"]::-webkit-input-placeholder { + color: #777777; +} + .subheader-form { visibility: hidden; position: fixed; @@ -384,6 +390,10 @@ pre { color: #252525; } +.toolbar-plugin input[type="submit"]:hover { + background: #fff; +} + @media screen and (max-width: 64em) { .toolbar-plugin input[type="text"] { width: 70%; @@ -484,19 +494,6 @@ pre { background: #f5f5f5; } -.linklist-item.private .linklist-item-title::before { - position: absolute; - left: 3px; - top: 0; - display: block; - content:""; - background: #F89406; - height: 95%; - width: 2px; - margin-top: 3px; - z-index: 1; -} - .linklist-item-title h2 { padding: 3px 10px 0 10px; line-height: 30px; @@ -563,14 +560,13 @@ pre { .linklist-item-description { position: relative; padding: 10px; - background: #f5f5f5; font-family: Roboto Slab, Arial, sans-serif; word-wrap: break-word; color: #252525; line-height: 1.3em; } -.linklist-item.private .linklist-item-description::before { + { position: absolute; left: 3px; top: 0; @@ -596,9 +592,29 @@ pre { } .linklist-item-thumbnail { + position: relative; margin-top: 10px; padding: 10px; float: left; + z-index: 50; +} + +.linklist-item.private .linklist-item-title::before, +.linklist-item.private .linklist-item-description::before, +.linklist-item.private .linklist-item-thumbnail::before { + position: absolute; + left: 3px; + top: 0; + display: block; + content:""; + background: #F89406; + height: 95%; + width: 2px; + z-index: 1; +} + +.linklist-item.private .linklist-item-title::before { + margin-top: 3px; } .linklist-item-infos { @@ -702,15 +718,6 @@ pre { text-align: center; } -.page-form .window-title:after { - display: block; - content:""; - background: linear-gradient(to right, #f5f5f5, #1b926c, #f5f5f5); - height: 1px; - width: 80%; - margin: auto; -} - .page-form .window-subtitle { text-align: center; } @@ -740,7 +747,7 @@ pre { } .page-form textarea { - height: 240px; + min-height: 240px; padding: 15px 5px 3px 15px; resize: vertical; overflow-y: auto; @@ -1163,7 +1170,7 @@ div.awesomplete > ul { .daily-entry-thumbnail { float: left; - margin: 15px 5px 5px 5px; + margin: 15px 5px 5px 15px; } .daily-entry-description a { @@ -1178,3 +1185,10 @@ div.awesomplete > ul { .daily-entry-description a:visited { color: #20b988; } + +/* + * Fix empty bookmarklet name in Firefox + */ +.pure-button { + -moz-user-select: auto; +} diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index 4f10ffb..d6f81f9 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html @@ -33,8 +33,7 @@
    - +
    @@ -46,7 +45,7 @@
      @@ -62,7 +61,7 @@
    {if="!$link_is_new"} - {'Delete'|t} @@ -75,7 +74,7 @@ {/if}
    - {if="$source !== 'firefoxsocialapi'"} + {if="$source !== 'firefoxsocialapi' && $source !== 'bookmarklet'"} {include="page.footer"} {/if} diff --git a/tpl/default/includes.html b/tpl/default/includes.html index ca5c4f3..91c6ca3 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html @@ -12,7 +12,7 @@ {if="is_file('inc/user.css')"} - + {/if} {loop="$plugins_includes.css_files"} diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index d8464aa..d47c257 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js @@ -84,7 +84,13 @@ window.onload = function () { [].forEach.call(foldAllButtons, function (foldAllButton) { foldAllButton.addEventListener('click', function (event) { event.preventDefault(); + var state = foldAllButton.firstElementChild.getAttribute('class').indexOf('down') != -1 ? 'down' : 'up'; [].forEach.call(foldButtons, function (foldButton) { + if (foldButton.firstElementChild.classList.contains('fa-chevron-up') && state == 'down' + || foldButton.firstElementChild.classList.contains('fa-chevron-down') && state == 'up' + ) { + return; + } // Retrieve description var description = null; var thumbnail = null; @@ -225,4 +231,32 @@ window.onload = function () { anchor.style.paddingTop = 0; } } + + /** + * Text area resizer + */ + var description = document.getElementById('lf_description'); + var observe = function (element, event, handler) { + element.addEventListener(event, handler, false); + }; + function init () { + function resize () { + description.style.height = 'auto'; + description.style.height = description.scrollHeight+10+'px'; + } + /* 0-timeout to get the already changed text */ + function delayedResize () { + window.setTimeout(resize, 0); + } + observe(description, 'change', resize); + observe(description, 'cut', delayedResize); + observe(description, 'paste', delayedResize); + observe(description, 'drop', delayedResize); + observe(description, 'keydown', delayedResize); + + resize(); + } + if (description != null) { + init(); + } }; diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 639fbe7..a971270 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -174,7 +174,7 @@ {$updated=$value.updated_timestamp ? 'Edited: '. strftime('%c', $value.updated_timestamp) : 'Permalink'} - {function="strftime('%d %B %Y %H:%M', $value.timestamp)"}{if="$value.updated_timestamp"}*{/if} + {function="strftime('%c', $value.timestamp)"}{if="$value.updated_timestamp"}*{/if} · {/if} diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html index bc1591e..d8c1e76 100644 --- a/tpl/default/linklist.paging.html +++ b/tpl/default/linklist.paging.html @@ -10,7 +10,7 @@ class={if="$privateonly"}"filter-on"{else}"filter-off"{/if} > {/if} - + {loop="$action_plugin"} @@ -50,6 +50,9 @@
    + + +
    \ No newline at end of file diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index c304e5d..b76fc03 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html @@ -76,7 +76,7 @@ {if="!isLoggedIn()"}
  • - From 7dcbfde5ffbc057a44f710e3be7e4856d235e90b Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 27 Feb 2017 20:20:53 +0100 Subject: [PATCH 483/658] Set the vintage theme by default for the time being --- application/Updater.php | 14 ++++++++++++ tests/Updater/UpdaterTest.php | 40 +++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/application/Updater.php b/application/Updater.php index 90aba74..3f5d325 100644 --- a/application/Updater.php +++ b/application/Updater.php @@ -324,6 +324,20 @@ class Updater return rename('inc/user.css', 'data/user.css'); } + + /** + * While the new default theme is in an unstable state + * continue to use the vintage theme + */ + public function updateMethodDefaultThemeVintage() + { + if ($this->conf->get('resource.theme') !== 'default') { + return true; + } + $this->conf->set('resource.theme', 'vintage'); + $this->conf->write($this->isLoggedIn); + return true; + } } /** diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php index 1d15cfa..de330ae 100644 --- a/tests/Updater/UpdaterTest.php +++ b/tests/Updater/UpdaterTest.php @@ -466,4 +466,44 @@ $GLOBALS[\'privateLinkByDefault\'] = true;'; unlink('sandbox/'. $theme .'/linklist.html'); rmdir('sandbox/'. $theme); } + + /** + * Test updateMethodDefaultThemeVintage with the default theme enabled. + */ + public function testSetDefaultThemeToVintage() + { + $sandboxConf = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); + $this->conf = new ConfigManager($sandboxConf); + + $this->conf->set('resource.theme', 'default'); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodDefaultThemeVintage()); + $this->assertEquals('vintage', $this->conf->get('resource.theme')); + + // reload from file + $this->conf = new ConfigManager($sandboxConf); + $this->assertEquals('vintage', $this->conf->get('resource.theme')); + } + + /** + * Test updateMethodDefaultThemeVintage with custom theme enabled => nothing to do. + */ + public function testSetDefaultThemeNothingToDo() + { + $sandboxConf = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); + $this->conf = new ConfigManager($sandboxConf); + + $theme = 'myawesometheme'; + $this->conf->set('resource.theme', $theme); + $this->conf->write(true); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodDefaultThemeVintage()); + $this->assertEquals($theme, $this->conf->get('resource.theme')); + + // reload from file + $this->conf = new ConfigManager($sandboxConf); + $this->assertEquals($theme, $this->conf->get('resource.theme')); + } } From e03761011521929a375ebb56f21adacb226a3a8d Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 27 Feb 2017 19:45:55 +0100 Subject: [PATCH 484/658] Add markdown_escape setting This setting allows to escape HTML in markdown rendering or not. The goal behind it is to avoid XSS issue in shared instances. More info: * the setting is set to true by default * it is set to false for anyone who already have the plugin enabled (avoid breaking existing entries) * improve the HTML sanitization when the setting is set to false - but don't consider it XSS proof * mention the setting in the plugin README --- application/Updater.php | 23 ++++++++++ plugins/markdown/README.md | 27 ++++++++--- plugins/markdown/markdown.php | 29 +++++++----- tests/Updater/UpdaterTest.php | 66 +++++++++++++++++++++++++++ tests/plugins/PluginMarkdownTest.php | 57 ++++++++++++++++++++--- tests/plugins/resources/markdown.html | 6 +-- 6 files changed, 181 insertions(+), 27 deletions(-) diff --git a/application/Updater.php b/application/Updater.php index 3f5d325..f5ebf31 100644 --- a/application/Updater.php +++ b/application/Updater.php @@ -336,6 +336,29 @@ class Updater } $this->conf->set('resource.theme', 'vintage'); $this->conf->write($this->isLoggedIn); + + return true; + } + + /** + * * `markdown_escape` is a new setting, set to true as default. + * + * If the markdown plugin was already enabled, escaping is disabled to avoid + * breaking existing entries. + */ + public function updateMethodEscapeMarkdown() + { + if ($this->conf->exists('security.markdown_escape')) { + return true; + } + + if (in_array('markdown', $this->conf->get('general.enabled_plugins'))) { + $this->conf->set('security.markdown_escape', false); + } else { + $this->conf->set('security.markdown_escape', true); + } + $this->conf->write($this->isLoggedIn); + return true; } } diff --git a/plugins/markdown/README.md b/plugins/markdown/README.md index aafcf06..bc9427e 100644 --- a/plugins/markdown/README.md +++ b/plugins/markdown/README.md @@ -50,9 +50,20 @@ If the tag `nomarkdown` is set for a shaare, it won't be converted to Markdown s > Note: this is a special tag, so it won't be displayed in link list. -### HTML rendering +### HTML escape -Markdown support HTML tags. For example: +By default, HTML tags are escaped. You can enable HTML tags rendering +by setting `security.markdwon_escape` to `false` in `data/config.json.php`: + +```json +{ + "security": { + "markdown_escape": false + } +} +``` + +With this setting, Markdown support HTML tags. For example: > strongstrike @@ -60,12 +71,14 @@ Will render as: > strongstrike -If you want to shaare HTML code, it is necessary to use inline code or code blocks. - -**If your shaared descriptions containing HTML tags before enabling the markdown plugin, -enabling it might break your page.** -> Note: HTML tags such as script, iframe, etc. are disabled for security reasons. +**Warning:** + + * This setting might present **security risks** (XSS) on shared instances, even though tags + such as script, iframe, etc should be disabled. + * If you want to shaare HTML code, it is necessary to use inline code or code blocks. + * If your shaared descriptions contained HTML tags before enabling the markdown plugin, +enabling it might break your page. ### Known issue diff --git a/plugins/markdown/markdown.php b/plugins/markdown/markdown.php index 0cf6e6e..de7c823 100644 --- a/plugins/markdown/markdown.php +++ b/plugins/markdown/markdown.php @@ -14,18 +14,19 @@ define('NO_MD_TAG', 'nomarkdown'); /** * Parse linklist descriptions. * - * @param array $data linklist data. + * @param array $data linklist data. + * @param ConfigManager $conf instance. * * @return mixed linklist data parsed in markdown (and converted to HTML). */ -function hook_markdown_render_linklist($data) +function hook_markdown_render_linklist($data, $conf) { foreach ($data['links'] as &$value) { if (!empty($value['tags']) && noMarkdownTag($value['tags'])) { $value = stripNoMarkdownTag($value); continue; } - $value['description'] = process_markdown($value['description']); + $value['description'] = process_markdown($value['description'], $conf->get('security.markdown_escape', true)); } return $data; } @@ -34,17 +35,18 @@ function hook_markdown_render_linklist($data) * Parse feed linklist descriptions. * * @param array $data linklist data. + * @param ConfigManager $conf instance. * * @return mixed linklist data parsed in markdown (and converted to HTML). */ -function hook_markdown_render_feed($data) +function hook_markdown_render_feed($data, $conf) { foreach ($data['links'] as &$value) { if (!empty($value['tags']) && noMarkdownTag($value['tags'])) { $value = stripNoMarkdownTag($value); continue; } - $value['description'] = process_markdown($value['description']); + $value['description'] = process_markdown($value['description'], $conf->get('security.markdown_escape', true)); } return $data; @@ -53,11 +55,12 @@ function hook_markdown_render_feed($data) /** * Parse daily descriptions. * - * @param array $data daily data. + * @param array $data daily data. + * @param ConfigManager $conf instance. * * @return mixed daily data parsed in markdown (and converted to HTML). */ -function hook_markdown_render_daily($data) +function hook_markdown_render_daily($data, $conf) { // Manipulate columns data foreach ($data['cols'] as &$value) { @@ -66,7 +69,10 @@ function hook_markdown_render_daily($data) $value2 = stripNoMarkdownTag($value2); continue; } - $value2['formatedDescription'] = process_markdown($value2['formatedDescription']); + $value2['formatedDescription'] = process_markdown( + $value2['formatedDescription'], + $conf->get('security.markdown_escape', true) + ); } } @@ -250,7 +256,7 @@ function sanitize_html($description) $description); } $description = preg_replace( - '#(<[^>]+)on[a-z]*="[^"]*"#is', + '#(<[^>]+)on[a-z]*="?[^ "]*"?#is', '$1', $description); return $description; @@ -265,10 +271,11 @@ function sanitize_html($description) * 5. Wrap description in 'markdown' CSS class. * * @param string $description input description text. + * @param bool $escape escape HTML entities * * @return string HTML processed $description. */ -function process_markdown($description) +function process_markdown($description, $escape = true) { $parsedown = new Parsedown(); @@ -278,7 +285,7 @@ function process_markdown($description) $processedDescription = reverse_text2clickable($processedDescription); $processedDescription = unescape($processedDescription); $processedDescription = $parsedown - ->setMarkupEscaped(false) + ->setMarkupEscaped($escape) ->setBreaksEnabled(true) ->text($processedDescription); $processedDescription = sanitize_html($processedDescription); diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php index de330ae..39be88f 100644 --- a/tests/Updater/UpdaterTest.php +++ b/tests/Updater/UpdaterTest.php @@ -506,4 +506,70 @@ $GLOBALS[\'privateLinkByDefault\'] = true;'; $this->conf = new ConfigManager($sandboxConf); $this->assertEquals($theme, $this->conf->get('resource.theme')); } + + /** + * Test updateMethodEscapeMarkdown with markdown plugin enabled + * => setting markdown_escape set to false. + */ + public function testEscapeMarkdownSettingToFalse() + { + $sandboxConf = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); + $this->conf = new ConfigManager($sandboxConf); + + $this->conf->set('general.enabled_plugins', ['markdown']); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodEscapeMarkdown()); + $this->assertFalse($this->conf->get('security.markdown_escape')); + + // reload from file + $this->conf = new ConfigManager($sandboxConf); + $this->assertFalse($this->conf->get('security.markdown_escape')); + } + + + /** + * Test updateMethodEscapeMarkdown with markdown plugin disabled + * => setting markdown_escape set to true. + */ + public function testEscapeMarkdownSettingToTrue() + { + $sandboxConf = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); + $this->conf = new ConfigManager($sandboxConf); + + $this->conf->set('general.enabled_plugins', []); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodEscapeMarkdown()); + $this->assertTrue($this->conf->get('security.markdown_escape')); + + // reload from file + $this->conf = new ConfigManager($sandboxConf); + $this->assertTrue($this->conf->get('security.markdown_escape')); + } + + /** + * Test updateMethodEscapeMarkdown with nothing to do (setting already enabled) + */ + public function testEscapeMarkdownSettingNothingToDoEnabled() + { + $sandboxConf = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); + $this->conf = new ConfigManager($sandboxConf); + $this->conf->set('security.markdown_escape', true); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodEscapeMarkdown()); + $this->assertTrue($this->conf->get('security.markdown_escape')); + } + + /** + * Test updateMethodEscapeMarkdown with nothing to do (setting already disabled) + */ + public function testEscapeMarkdownSettingNothingToDoDisabled() + { + $this->conf->set('security.markdown_escape', false); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodEscapeMarkdown()); + $this->assertFalse($this->conf->get('security.markdown_escape')); + } } diff --git a/tests/plugins/PluginMarkdownTest.php b/tests/plugins/PluginMarkdownTest.php index d359b2a..d4cd1b9 100644 --- a/tests/plugins/PluginMarkdownTest.php +++ b/tests/plugins/PluginMarkdownTest.php @@ -13,12 +13,18 @@ require_once 'plugins/markdown/markdown.php'; */ class PluginMarkdownTest extends PHPUnit_Framework_TestCase { + /** + * @var ConfigManager instance. + */ + protected $conf; + /** * Reset plugin path */ public function setUp() { PluginManager::$PLUGINS_PATH = 'plugins'; + $this->conf = new ConfigManager('tests/utils/config/configJson'); } /** @@ -36,7 +42,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase ), ); - $data = hook_markdown_render_linklist($data); + $data = hook_markdown_render_linklist($data, $this->conf); $this->assertNotFalse(strpos($data['links'][0]['description'], '

    ')); $this->assertNotFalse(strpos($data['links'][0]['description'], '

    ')); } @@ -61,7 +67,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase ), ); - $data = hook_markdown_render_daily($data); + $data = hook_markdown_render_daily($data, $this->conf); $this->assertNotFalse(strpos($data['cols'][0][0]['formatedDescription'], '

    ')); $this->assertNotFalse(strpos($data['cols'][0][0]['formatedDescription'], '

    ')); } @@ -110,6 +116,8 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase $output = escape($input); $input .= 'link'; $output .= 'link'; + $input .= 'link'; + $output .= 'link'; $this->assertEquals($output, sanitize_html($input)); // Do not touch escaped HTML. $input = escape($input); @@ -130,10 +138,10 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase )) ); - $processed = hook_markdown_render_linklist($data); + $processed = hook_markdown_render_linklist($data, $this->conf); $this->assertEquals($str, $processed['links'][0]['description']); - $processed = hook_markdown_render_feed($data); + $processed = hook_markdown_render_feed($data, $this->conf); $this->assertEquals($str, $processed['links'][0]['description']); $data = array( @@ -151,7 +159,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase ), ); - $data = hook_markdown_render_daily($data); + $data = hook_markdown_render_daily($data, $this->conf); $this->assertEquals($str, $data['cols'][0][0]['formatedDescription']); } @@ -169,7 +177,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase )) ); - $data = hook_markdown_render_feed($data); + $data = hook_markdown_render_feed($data, $this->conf); $this->assertContains('', $data['links'][0]['description']); } @@ -185,4 +193,41 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase $data = process_markdown($md); $this->assertEquals($html, $data); } + + /** + * Make sure that the HTML tags are escaped. + */ + public function testMarkdownWithHtmlEscape() + { + $md = '**strong** strong'; + $html = '

    strong <strong>strong</strong>

    '; + $data = array( + 'links' => array( + 0 => array( + 'description' => $md, + ), + ), + ); + $data = hook_markdown_render_linklist($data, $this->conf); + $this->assertEquals($html, $data['links'][0]['description']); + } + + /** + * Make sure that the HTML tags aren't escaped with the setting set to false. + */ + public function testMarkdownWithHtmlNoEscape() + { + $this->conf->set('security.markdown_escape', false); + $md = '**strong** strong'; + $html = '

    strong strong

    '; + $data = array( + 'links' => array( + 0 => array( + 'description' => $md, + ), + ), + ); + $data = hook_markdown_render_linklist($data, $this->conf); + $this->assertEquals($html, $data['links'][0]['description']); + } } diff --git a/tests/plugins/resources/markdown.html b/tests/plugins/resources/markdown.html index c0fbe7f..07a5a32 100644 --- a/tests/plugins/resources/markdown.html +++ b/tests/plugins/resources/markdown.html @@ -12,11 +12,11 @@
  • two
  • three
  • four
    • -
  • foo #foobar
    • +
  • foo <a href="?addtag=foobar" title="Hashtag foobar">#foobar</a>

    • -

    #foobar foo lol #foo #bar

    -

    fsdfs http://link.tld #foobar http://link.tld

    +

    <a href="?addtag=foobar" title="Hashtag foobar">#foobar</a> foo lol #foo <a href="?addtag=bar" title="Hashtag bar">#bar</a>

    +

    fsdfs http://link.tld <a href="?addtag=foobar" title="Hashtag foobar">#foobar</a> http://link.tld

    http://link.tld #foobar
 next #foo

    Block:

    From 9ff17ae20effa5d54fd8481c19518123590e3bd0 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 27 Feb 2017 19:45:55 +0100 Subject: [PATCH 485/658] Add markdown_escape setting This setting allows to escape HTML in markdown rendering or not. The goal behind it is to avoid XSS issue in shared instances. More info: * the setting is set to true by default * it is set to false for anyone who already have the plugin enabled (avoid breaking existing entries) * improve the HTML sanitization when the setting is set to false - but don't consider it XSS proof * mention the setting in the plugin README --- application/Updater.php | 22 +++++++++ plugins/markdown/README.md | 27 ++++++++--- plugins/markdown/markdown.php | 29 +++++++----- tests/Updater/UpdaterTest.php | 65 +++++++++++++++++++++++++++ tests/plugins/PluginMarkdownTest.php | 57 ++++++++++++++++++++--- tests/plugins/resources/markdown.html | 6 +-- 6 files changed, 179 insertions(+), 27 deletions(-) diff --git a/application/Updater.php b/application/Updater.php index f0d0281..555d4c2 100644 --- a/application/Updater.php +++ b/application/Updater.php @@ -256,6 +256,28 @@ class Updater return true; } + + /** + * * `markdown_escape` is a new setting, set to true as default. + * + * If the markdown plugin was already enabled, escaping is disabled to avoid + * breaking existing entries. + */ + public function updateMethodEscapeMarkdown() + { + if ($this->conf->exists('security.markdown_escape')) { + return true; + } + + if (in_array('markdown', $this->conf->get('general.enabled_plugins'))) { + $this->conf->set('security.markdown_escape', false); + } else { + $this->conf->set('security.markdown_escape', true); + } + $this->conf->write($this->isLoggedIn); + + return true; + } } /** diff --git a/plugins/markdown/README.md b/plugins/markdown/README.md index aafcf06..bc9427e 100644 --- a/plugins/markdown/README.md +++ b/plugins/markdown/README.md @@ -50,9 +50,20 @@ If the tag `nomarkdown` is set for a shaare, it won't be converted to Markdown s > Note: this is a special tag, so it won't be displayed in link list. -### HTML rendering +### HTML escape -Markdown support HTML tags. For example: +By default, HTML tags are escaped. You can enable HTML tags rendering +by setting `security.markdwon_escape` to `false` in `data/config.json.php`: + +```json +{ + "security": { + "markdown_escape": false + } +} +``` + +With this setting, Markdown support HTML tags. For example: > strongstrike @@ -60,12 +71,14 @@ Will render as: > strongstrike -If you want to shaare HTML code, it is necessary to use inline code or code blocks. - -**If your shaared descriptions containing HTML tags before enabling the markdown plugin, -enabling it might break your page.** -> Note: HTML tags such as script, iframe, etc. are disabled for security reasons. +**Warning:** + + * This setting might present **security risks** (XSS) on shared instances, even though tags + such as script, iframe, etc should be disabled. + * If you want to shaare HTML code, it is necessary to use inline code or code blocks. + * If your shaared descriptions contained HTML tags before enabling the markdown plugin, +enabling it might break your page. ### Known issue diff --git a/plugins/markdown/markdown.php b/plugins/markdown/markdown.php index 0cf6e6e..de7c823 100644 --- a/plugins/markdown/markdown.php +++ b/plugins/markdown/markdown.php @@ -14,18 +14,19 @@ define('NO_MD_TAG', 'nomarkdown'); /** * Parse linklist descriptions. * - * @param array $data linklist data. + * @param array $data linklist data. + * @param ConfigManager $conf instance. * * @return mixed linklist data parsed in markdown (and converted to HTML). */ -function hook_markdown_render_linklist($data) +function hook_markdown_render_linklist($data, $conf) { foreach ($data['links'] as &$value) { if (!empty($value['tags']) && noMarkdownTag($value['tags'])) { $value = stripNoMarkdownTag($value); continue; } - $value['description'] = process_markdown($value['description']); + $value['description'] = process_markdown($value['description'], $conf->get('security.markdown_escape', true)); } return $data; } @@ -34,17 +35,18 @@ function hook_markdown_render_linklist($data) * Parse feed linklist descriptions. * * @param array $data linklist data. + * @param ConfigManager $conf instance. * * @return mixed linklist data parsed in markdown (and converted to HTML). */ -function hook_markdown_render_feed($data) +function hook_markdown_render_feed($data, $conf) { foreach ($data['links'] as &$value) { if (!empty($value['tags']) && noMarkdownTag($value['tags'])) { $value = stripNoMarkdownTag($value); continue; } - $value['description'] = process_markdown($value['description']); + $value['description'] = process_markdown($value['description'], $conf->get('security.markdown_escape', true)); } return $data; @@ -53,11 +55,12 @@ function hook_markdown_render_feed($data) /** * Parse daily descriptions. * - * @param array $data daily data. + * @param array $data daily data. + * @param ConfigManager $conf instance. * * @return mixed daily data parsed in markdown (and converted to HTML). */ -function hook_markdown_render_daily($data) +function hook_markdown_render_daily($data, $conf) { // Manipulate columns data foreach ($data['cols'] as &$value) { @@ -66,7 +69,10 @@ function hook_markdown_render_daily($data) $value2 = stripNoMarkdownTag($value2); continue; } - $value2['formatedDescription'] = process_markdown($value2['formatedDescription']); + $value2['formatedDescription'] = process_markdown( + $value2['formatedDescription'], + $conf->get('security.markdown_escape', true) + ); } } @@ -250,7 +256,7 @@ function sanitize_html($description) $description); } $description = preg_replace( - '#(<[^>]+)on[a-z]*="[^"]*"#is', + '#(<[^>]+)on[a-z]*="?[^ "]*"?#is', '$1', $description); return $description; @@ -265,10 +271,11 @@ function sanitize_html($description) * 5. Wrap description in 'markdown' CSS class. * * @param string $description input description text. + * @param bool $escape escape HTML entities * * @return string HTML processed $description. */ -function process_markdown($description) +function process_markdown($description, $escape = true) { $parsedown = new Parsedown(); @@ -278,7 +285,7 @@ function process_markdown($description) $processedDescription = reverse_text2clickable($processedDescription); $processedDescription = unescape($processedDescription); $processedDescription = $parsedown - ->setMarkupEscaped(false) + ->setMarkupEscaped($escape) ->setBreaksEnabled(true) ->text($processedDescription); $processedDescription = sanitize_html($processedDescription); diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php index 4948fe5..17d1ba8 100644 --- a/tests/Updater/UpdaterTest.php +++ b/tests/Updater/UpdaterTest.php @@ -385,4 +385,69 @@ $GLOBALS[\'privateLinkByDefault\'] = true;'; $this->assertTrue($updater->updateMethodDatastoreIds()); $this->assertEquals($checksum, hash_file('sha1', self::$testDatastore)); } + + /** + * Test updateMethodEscapeMarkdown with markdown plugin enabled + * => setting markdown_escape set to false. + */ + public function testEscapeMarkdownSettingToFalse() + { + $sandboxConf = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); + $this->conf = new ConfigManager($sandboxConf); + + $this->conf->set('general.enabled_plugins', ['markdown']); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodEscapeMarkdown()); + $this->assertFalse($this->conf->get('security.markdown_escape')); + + // reload from file + $this->conf = new ConfigManager($sandboxConf); + $this->assertFalse($this->conf->get('security.markdown_escape')); + } + + /** + * Test updateMethodEscapeMarkdown with markdown plugin disabled + * => setting markdown_escape set to true. + */ + public function testEscapeMarkdownSettingToTrue() + { + $sandboxConf = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); + $this->conf = new ConfigManager($sandboxConf); + + $this->conf->set('general.enabled_plugins', []); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodEscapeMarkdown()); + $this->assertTrue($this->conf->get('security.markdown_escape')); + + // reload from file + $this->conf = new ConfigManager($sandboxConf); + $this->assertTrue($this->conf->get('security.markdown_escape')); + } + + /** + * Test updateMethodEscapeMarkdown with nothing to do (setting already enabled) + */ + public function testEscapeMarkdownSettingNothingToDoEnabled() + { + $sandboxConf = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); + $this->conf = new ConfigManager($sandboxConf); + $this->conf->set('security.markdown_escape', true); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodEscapeMarkdown()); + $this->assertTrue($this->conf->get('security.markdown_escape')); + } + + /** + * Test updateMethodEscapeMarkdown with nothing to do (setting already disabled) + */ + public function testEscapeMarkdownSettingNothingToDoDisabled() + { + $this->conf->set('security.markdown_escape', false); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodEscapeMarkdown()); + $this->assertFalse($this->conf->get('security.markdown_escape')); + } } diff --git a/tests/plugins/PluginMarkdownTest.php b/tests/plugins/PluginMarkdownTest.php index 17ef228..f1e1acf 100644 --- a/tests/plugins/PluginMarkdownTest.php +++ b/tests/plugins/PluginMarkdownTest.php @@ -13,12 +13,18 @@ require_once 'plugins/markdown/markdown.php'; */ class PluginMarkdownTest extends PHPUnit_Framework_TestCase { + /** + * @var ConfigManager instance. + */ + protected $conf; + /** * Reset plugin path */ function setUp() { PluginManager::$PLUGINS_PATH = 'plugins'; + $this->conf = new ConfigManager('tests/utils/config/configJson'); } /** @@ -36,7 +42,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase ), ); - $data = hook_markdown_render_linklist($data); + $data = hook_markdown_render_linklist($data, $this->conf); $this->assertNotFalse(strpos($data['links'][0]['description'], '

    ')); $this->assertNotFalse(strpos($data['links'][0]['description'], '

    ')); } @@ -61,7 +67,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase ), ); - $data = hook_markdown_render_daily($data); + $data = hook_markdown_render_daily($data, $this->conf); $this->assertNotFalse(strpos($data['cols'][0][0]['formatedDescription'], '

    ')); $this->assertNotFalse(strpos($data['cols'][0][0]['formatedDescription'], '

    ')); } @@ -110,6 +116,8 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase $output = escape($input); $input .= 'link'; $output .= 'link'; + $input .= 'link'; + $output .= 'link'; $this->assertEquals($output, sanitize_html($input)); // Do not touch escaped HTML. $input = escape($input); @@ -130,10 +138,10 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase )) ); - $processed = hook_markdown_render_linklist($data); + $processed = hook_markdown_render_linklist($data, $this->conf); $this->assertEquals($str, $processed['links'][0]['description']); - $processed = hook_markdown_render_feed($data); + $processed = hook_markdown_render_feed($data, $this->conf); $this->assertEquals($str, $processed['links'][0]['description']); $data = array( @@ -151,7 +159,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase ), ); - $data = hook_markdown_render_daily($data); + $data = hook_markdown_render_daily($data, $this->conf); $this->assertEquals($str, $data['cols'][0][0]['formatedDescription']); } @@ -169,7 +177,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase )) ); - $data = hook_markdown_render_feed($data); + $data = hook_markdown_render_feed($data, $this->conf); $this->assertContains('', $data['links'][0]['description']); } @@ -185,4 +193,41 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase $data = process_markdown($md); $this->assertEquals($html, $data); } + + /** + * Make sure that the HTML tags are escaped. + */ + public function testMarkdownWithHtmlEscape() + { + $md = '**strong** strong'; + $html = '

    strong <strong>strong</strong>

    '; + $data = array( + 'links' => array( + 0 => array( + 'description' => $md, + ), + ), + ); + $data = hook_markdown_render_linklist($data, $this->conf); + $this->assertEquals($html, $data['links'][0]['description']); + } + + /** + * Make sure that the HTML tags aren't escaped with the setting set to false. + */ + public function testMarkdownWithHtmlNoEscape() + { + $this->conf->set('security.markdown_escape', false); + $md = '**strong** strong'; + $html = '

    strong strong

    '; + $data = array( + 'links' => array( + 0 => array( + 'description' => $md, + ), + ), + ); + $data = hook_markdown_render_linklist($data, $this->conf); + $this->assertEquals($html, $data['links'][0]['description']); + } } diff --git a/tests/plugins/resources/markdown.html b/tests/plugins/resources/markdown.html index c0fbe7f..07a5a32 100644 --- a/tests/plugins/resources/markdown.html +++ b/tests/plugins/resources/markdown.html @@ -12,11 +12,11 @@
  • two
  • three
  • four
    • -
  • foo #foobar
    • +
  • foo <a href="?addtag=foobar" title="Hashtag foobar">#foobar</a>
    • -

    #foobar foo lol #foo #bar

    -

    fsdfs http://link.tld #foobar http://link.tld

    +

    <a href="?addtag=foobar" title="Hashtag foobar">#foobar</a> foo lol #foo <a href="?addtag=bar" title="Hashtag bar">#bar</a>

    +

    fsdfs http://link.tld <a href="?addtag=foobar" title="Hashtag foobar">#foobar</a> http://link.tld

    http://link.tld #foobar
 next #foo

    Block:

    From 6b7ddb487126fd8f5be22e729ec8e0a2b639891b Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sat, 4 Mar 2017 09:42:26 +0100 Subject: [PATCH 486/658] Bump version to 0.8.4 Signed-off-by: VirtualTam --- CHANGELOG.md | 5 +++++ index.php | 2 +- shaarli_version.php | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 502fdad..1340db5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Fixed +## [v0.8.4](https://github.com/shaarli/Shaarli/releases/tag/v0.8.4) - 2017-03-04 +### Security +- Markdown plugin: escape HTML entities by default + + ## [v0.8.3](https://github.com/shaarli/Shaarli/releases/tag/v0.8.3) - 2017-01-20 ### Fixed diff --git a/index.php b/index.php index 17fb4a2..b4ccd1b 100644 --- a/index.php +++ b/index.php @@ -1,6 +1,6 @@ + From 8868f3ca461011a8fb6dd9f90b60ed697ab52fc5 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sat, 4 Mar 2017 09:52:48 +0100 Subject: [PATCH 487/658] UpdaterTest: ensure PHP 5.3 compatibility Signed-off-by: VirtualTam --- tests/Updater/UpdaterTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php index 17d1ba8..a3e8a4d 100644 --- a/tests/Updater/UpdaterTest.php +++ b/tests/Updater/UpdaterTest.php @@ -396,8 +396,8 @@ $GLOBALS[\'privateLinkByDefault\'] = true;'; copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); $this->conf = new ConfigManager($sandboxConf); - $this->conf->set('general.enabled_plugins', ['markdown']); - $updater = new Updater([], [], $this->conf, true); + $this->conf->set('general.enabled_plugins', array('markdown')); + $updater = new Updater(array(), array(), $this->conf, true); $this->assertTrue($updater->updateMethodEscapeMarkdown()); $this->assertFalse($this->conf->get('security.markdown_escape')); @@ -416,8 +416,8 @@ $GLOBALS[\'privateLinkByDefault\'] = true;'; copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); $this->conf = new ConfigManager($sandboxConf); - $this->conf->set('general.enabled_plugins', []); - $updater = new Updater([], [], $this->conf, true); + $this->conf->set('general.enabled_plugins', array()); + $updater = new Updater(array(), array(), $this->conf, true); $this->assertTrue($updater->updateMethodEscapeMarkdown()); $this->assertTrue($this->conf->get('security.markdown_escape')); @@ -435,7 +435,7 @@ $GLOBALS[\'privateLinkByDefault\'] = true;'; copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); $this->conf = new ConfigManager($sandboxConf); $this->conf->set('security.markdown_escape', true); - $updater = new Updater([], [], $this->conf, true); + $updater = new Updater(array(), array(), $this->conf, true); $this->assertTrue($updater->updateMethodEscapeMarkdown()); $this->assertTrue($this->conf->get('security.markdown_escape')); } @@ -446,7 +446,7 @@ $GLOBALS[\'privateLinkByDefault\'] = true;'; public function testEscapeMarkdownSettingNothingToDoDisabled() { $this->conf->set('security.markdown_escape', false); - $updater = new Updater([], [], $this->conf, true); + $updater = new Updater(array(), array(), $this->conf, true); $this->assertTrue($updater->updateMethodEscapeMarkdown()); $this->assertFalse($this->conf->get('security.markdown_escape')); } From 94cddf7be4a168b923c254d20e02891dcb702b17 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sat, 4 Mar 2017 11:06:16 +0100 Subject: [PATCH 488/658] Update CHANGELOG.md Signed-off-by: VirtualTam --- CHANGELOG.md | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e98a5a..466c910 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,9 @@ configuration to enable URL rewriting, see: - versioned API endpoints: - `/api/v1/info`: get general information on the Shaarli instance - `/api/v1/links`: get a list of shaared links -- Allow selecting themes/templates from the configuration page +Theming: + - Introduce a new theme + - Allow selecting themes/templates from the configuration page - Add plugin placeholders to Atom/RSS feed templates - Add OpenSearch to feed templates - Add `campaign_` to the URL cleanup pattern list @@ -29,8 +31,10 @@ configuration to enable URL rewriting, see: ### Changed - Docker: enable nginx URL rewriting for the REST API -- Move `user.css` to the `data` folder -- Move default template files to a subfolder (`default`) +- Theming: + - Move `user.css` to the `data` folder + - Move default template files to a subfolder (`default`) + - Rename the legacy theme to `vintage` - Move PubSubHub to a dedicated plugin - Coding style: - explicit method visibility @@ -39,7 +43,6 @@ configuration to enable URL rewriting, see: - The updater now keeps custom theme preferences - Simplify the COPYING information - ### Removed - PHP < 5.5 compatibility @@ -51,15 +54,23 @@ configuration to enable URL rewriting, see: - Fix a fatal error during the install - Fix permalink image alignment in daily page - Fix the delete button in `editlink` +- Fix redirection after link deletion +- Do not access LinkDB links by ID before the Updater applies migrations +- Remove extra spaces in the bookmarklet's name + +### Security +- Markdown plugin: escape HTML entities by default + + +## [v0.8.4](https://github.com/shaarli/Shaarli/releases/tag/v0.8.4) - 2017-03-04 +### Security +- Markdown plugin: escape HTML entities by default ## [v0.8.3](https://github.com/shaarli/Shaarli/releases/tag/v0.8.3) - 2017-01-20 - ### Fixed - - PHP 7.1 compatibility: add ConfigManager parameter to anti-bruteforce function call in login template. ## [v0.8.2](https://github.com/shaarli/Shaarli/releases/tag/v0.8.2) - 2016-12-15 - ### Fixed - Editing a link created before the new ID system would change its permalink. From 3c66e56435359dc678048193e8ee239d06f79b64 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Fri, 3 Mar 2017 23:06:12 +0100 Subject: [PATCH 489/658] application: introduce the Shaarli\Config namespace Namespaces have been introduced with the REST API, and should be generalized to the whole codebase to manage object scope and benefit from autoloading. See: - https://secure.php.net/manual/en/language.namespaces.php - http://www.php-fig.org/psr/psr-4/ Signed-off-by: VirtualTam --- application/Updater.php | 2 ++ application/api/ApiMiddleware.php | 2 +- application/config/ConfigIO.php | 1 + application/config/ConfigJson.php | 5 +++-- application/config/ConfigManager.php | 16 ++++++---------- application/config/ConfigPhp.php | 3 ++- application/config/ConfigPlugin.php | 4 +++- composer.json | 3 ++- index.php | 3 +-- tests/ApplicationUtilsTest.php | 3 ++- tests/PluginManagerTest.php | 1 + tests/Updater/UpdaterTest.php | 4 +++- tests/api/ApiMiddlewareTest.php | 5 +++-- tests/api/controllers/GetLinkIdTest.php | 5 +++-- tests/api/controllers/GetLinksTest.php | 6 +++--- tests/api/controllers/InfoTest.php | 9 +++++---- tests/config/ConfigJsonTest.php | 11 +++++------ tests/config/ConfigManagerTest.php | 9 +++++---- tests/config/ConfigPhpTest.php | 5 ++--- tests/config/ConfigPluginTest.php | 6 ++++-- tests/plugins/PluginIssoTest.php | 1 + tests/plugins/PluginMarkdownTest.php | 1 + tests/plugins/PluginPubsubhubbubTest.php | 1 + tests/plugins/PluginQrcodeTest.php | 1 - tests/plugins/PluginReadityourselfTest.php | 1 + tests/plugins/PluginWallabagTest.php | 1 + 26 files changed, 62 insertions(+), 47 deletions(-) diff --git a/application/Updater.php b/application/Updater.php index f5ebf31..27cb2f0 100644 --- a/application/Updater.php +++ b/application/Updater.php @@ -1,4 +1,6 @@ conf = new \ConfigManager('tests/utils/config/configJson.json.php'); + $this->conf = new ConfigManager('tests/utils/config/configJson.json.php'); $this->conf->set('api.secret', 'NapoleonWasALizard'); $this->refDB = new \ReferenceLinkDB(); diff --git a/tests/api/controllers/GetLinkIdTest.php b/tests/api/controllers/GetLinkIdTest.php index 1b02050..45b18e6 100644 --- a/tests/api/controllers/GetLinkIdTest.php +++ b/tests/api/controllers/GetLinkIdTest.php @@ -2,6 +2,7 @@ namespace Shaarli\Api\Controllers; +use Shaarli\Config\ConfigManager; use Slim\Container; use Slim\Http\Environment; @@ -25,7 +26,7 @@ class GetLinkIdTest extends \PHPUnit_Framework_TestCase protected static $testDatastore = 'sandbox/datastore.php'; /** - * @var \ConfigManager instance + * @var ConfigManager instance */ protected $conf; @@ -54,7 +55,7 @@ class GetLinkIdTest extends \PHPUnit_Framework_TestCase */ public function setUp() { - $this->conf = new \ConfigManager('tests/utils/config/configJson'); + $this->conf = new ConfigManager('tests/utils/config/configJson'); $this->refDB = new \ReferenceLinkDB(); $this->refDB->write(self::$testDatastore); diff --git a/tests/api/controllers/GetLinksTest.php b/tests/api/controllers/GetLinksTest.php index da54fcf..10330cd 100644 --- a/tests/api/controllers/GetLinksTest.php +++ b/tests/api/controllers/GetLinksTest.php @@ -1,7 +1,7 @@ conf = new \ConfigManager('tests/utils/config/configJson'); + $this->conf = new ConfigManager('tests/utils/config/configJson'); $this->refDB = new \ReferenceLinkDB(); $this->refDB->write(self::$testDatastore); diff --git a/tests/api/controllers/InfoTest.php b/tests/api/controllers/InfoTest.php index 2916eed..4beef3f 100644 --- a/tests/api/controllers/InfoTest.php +++ b/tests/api/controllers/InfoTest.php @@ -1,7 +1,8 @@ conf = new \ConfigManager('tests/utils/config/configJson.json.php'); + $this->conf = new ConfigManager('tests/utils/config/configJson.json.php'); $this->refDB = new \ReferenceLinkDB(); $this->refDB->write(self::$testDatastore); @@ -84,7 +85,7 @@ class InfoTest extends \PHPUnit_Framework_TestCase $this->assertEquals('Shaarli', $data['settings']['title']); $this->assertEquals('?', $data['settings']['header_link']); $this->assertEquals('UTC', $data['settings']['timezone']); - $this->assertEquals(\ConfigManager::$DEFAULT_PLUGINS, $data['settings']['enabled_plugins']); + $this->assertEquals(ConfigManager::$DEFAULT_PLUGINS, $data['settings']['enabled_plugins']); $this->assertEquals(false, $data['settings']['default_private_links']); $title = 'My links'; diff --git a/tests/config/ConfigJsonTest.php b/tests/config/ConfigJsonTest.php index 07f6ab4..3527f83 100644 --- a/tests/config/ConfigJsonTest.php +++ b/tests/config/ConfigJsonTest.php @@ -1,11 +1,10 @@ empty array. * - * @expectedException Exception + * @expectedException \Exception * @expectedExceptionMessage An error occurred while parsing JSON file: error code #4 */ public function testReadInvalidJson() @@ -112,7 +111,7 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase /** * Write to invalid path. * - * @expectedException IOException + * @expectedException \IOException */ public function testWriteInvalidArray() { @@ -123,7 +122,7 @@ class ConfigJsonTest extends PHPUnit_Framework_TestCase /** * Write to invalid path. * - * @expectedException IOException + * @expectedException \IOException */ public function testWriteInvalidBlank() { diff --git a/tests/config/ConfigManagerTest.php b/tests/config/ConfigManagerTest.php index 436e3d6..b81be5b 100644 --- a/tests/config/ConfigManagerTest.php +++ b/tests/config/ConfigManagerTest.php @@ -1,4 +1,5 @@ Date: Sat, 7 Jan 2017 14:28:58 +0100 Subject: [PATCH 490/658] Improve autoLocale() detection - Creates arrays_combination function to cover all cases - add the underscore separator in the regex - add `utf8` encoding in addition to `UTF-8` --- application/Utils.php | 51 +++++++++++++++++++++++++++++++++++-------- tests/UtilsTest.php | 20 +++++++++++++++++ 2 files changed, 62 insertions(+), 9 deletions(-) diff --git a/application/Utils.php b/application/Utils.php index 35d6522..19fb711 100644 --- a/application/Utils.php +++ b/application/Utils.php @@ -216,22 +216,55 @@ function is_session_id_valid($sessionId) function autoLocale($headerLocale) { // Default if browser does not send HTTP_ACCEPT_LANGUAGE - $attempts = array('en_US'); + $attempts = array('en_US', 'en_US.utf8', 'en_US.UTF-8'); if (isset($headerLocale)) { // (It's a bit crude, but it works very well. Preferred language is always presented first.) - if (preg_match('/([a-z]{2})-?([a-z]{2})?/i', $headerLocale, $matches)) { - $loc = $matches[1] . (!empty($matches[2]) ? '_' . strtoupper($matches[2]) : ''); - $attempts = array( - $loc.'.UTF-8', $loc, str_replace('_', '-', $loc).'.UTF-8', str_replace('_', '-', $loc), - $loc . '_' . strtoupper($loc).'.UTF-8', $loc . '_' . strtoupper($loc), - $loc . '_' . $loc.'.UTF-8', $loc . '_' . $loc, $loc . '-' . strtoupper($loc).'.UTF-8', - $loc . '-' . strtoupper($loc), $loc . '-' . $loc.'.UTF-8', $loc . '-' . $loc - ); + if (preg_match('/([a-z]{2,3})[-_]?([a-z]{2})?/i', $headerLocale, $matches)) { + $first = [strtolower($matches[1]), strtoupper($matches[1])]; + $separators = ['_', '-']; + $encodings = ['utf8', 'UTF-8']; + if (!empty($matches[2])) { + $second = [strtoupper($matches[2]), strtolower($matches[2])]; + $attempts = arrays_combination([$first, $separators, $second, ['.'], $encodings]); + } else { + $attempts = arrays_combination([$first, $separators, $first, ['.'], $encodings]); + } } } setlocale(LC_ALL, $attempts); } +/** + * Combine multiple arrays of string to get all possible strings. + * The order is important because this doesn't shuffle the entries. + * + * Example: + * [['a'], ['b', 'c']] + * will generate: + * - ab + * - ac + * + * TODO PHP 5.6: use the `...` operator instead of an array of array. + * + * @param array $items array of array of string + * + * @return array Combined string from the input array. + */ +function arrays_combination($items) +{ + $out = ['']; + foreach ($items as $item) { + $add = []; + foreach ($item as $element) { + foreach ($out as $key => $existingEntry) { + $add[] = $existingEntry . $element; + } + } + $out = $add; + } + return $out; +} + /** * Generates a default API secret. * diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php index c885f55..b8f608b 100644 --- a/tests/UtilsTest.php +++ b/tests/UtilsTest.php @@ -282,4 +282,24 @@ class UtilsTest extends PHPUnit_Framework_TestCase $this->assertEquals('', normalize_spaces('')); $this->assertEquals(null, normalize_spaces(null)); } + + /** + * Test arrays_combine + */ + public function testArraysCombination() + { + $arr = [['ab', 'cd'], ['ef', 'gh'], ['ij', 'kl'], ['m']]; + $expected = [ + 'abefijm', + 'cdefijm', + 'abghijm', + 'cdghijm', + 'abefklm', + 'cdefklm', + 'abghklm', + 'cdghklm', + ]; + $this->assertEquals($expected, arrays_combination($arr)); + } + } From 52b503105d389d1796698114573ff618b2ad34a2 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 7 Jan 2017 14:30:42 +0100 Subject: [PATCH 491/658] Improve datetime display Use php-intl extension to display datetimes a bit more nicely, depending on the locale. What changes: * the day is no longer displayed * day number and month are ordered according to the locale * the timezone is more readable (UTC+1 instead of CET) --- application/Utils.php | 74 +++++++++++++++++++++--------- tests/UtilsTest.php | 46 ++++++++++++++----- tests/languages/bootstrap.php | 7 +++ tests/languages/de/UtilsDeTest.php | 25 ++++++++++ tests/languages/en/UtilsEnTest.php | 25 ++++++++++ tests/languages/fr/UtilsFrTest.php | 25 ++++++++++ tpl/default/linklist.html | 5 +- tpl/vintage/linklist.html | 4 +- 8 files changed, 175 insertions(+), 36 deletions(-) create mode 100644 tests/languages/bootstrap.php create mode 100644 tests/languages/de/UtilsDeTest.php create mode 100644 tests/languages/en/UtilsEnTest.php create mode 100644 tests/languages/fr/UtilsFrTest.php diff --git a/application/Utils.php b/application/Utils.php index 19fb711..a936b09 100644 --- a/application/Utils.php +++ b/application/Utils.php @@ -225,44 +225,46 @@ function autoLocale($headerLocale) $encodings = ['utf8', 'UTF-8']; if (!empty($matches[2])) { $second = [strtoupper($matches[2]), strtolower($matches[2])]; - $attempts = arrays_combination([$first, $separators, $second, ['.'], $encodings]); + $attempts = cartesian_product_generator([$first, $separators, $second, ['.'], $encodings]); } else { - $attempts = arrays_combination([$first, $separators, $first, ['.'], $encodings]); + $attempts = cartesian_product_generator([$first, $separators, $first, ['.'], $encodings]); } } } - setlocale(LC_ALL, $attempts); + setlocale(LC_ALL, implode('implode', iterator_to_array($attempts))); } /** - * Combine multiple arrays of string to get all possible strings. - * The order is important because this doesn't shuffle the entries. + * Build a Generator object representing the cartesian product from given $items. * * Example: * [['a'], ['b', 'c']] * will generate: - * - ab - * - ac - * - * TODO PHP 5.6: use the `...` operator instead of an array of array. + * [ + * ['a', 'b'], + * ['a', 'c'], + * ] * * @param array $items array of array of string * - * @return array Combined string from the input array. + * @return Generator representing the cartesian product of given array. + * + * @see https://en.wikipedia.org/wiki/Cartesian_product */ -function arrays_combination($items) +function cartesian_product_generator($items) { - $out = ['']; - foreach ($items as $item) { - $add = []; - foreach ($item as $element) { - foreach ($out as $key => $existingEntry) { - $add[] = $existingEntry . $element; - } - } - $out = $add; + if (empty($items)) { + yield []; + } + $subArray = array_pop($items); + if (empty($subArray)) { + return; + } + foreach (cartesian_product_generator($items) as $item) { + foreach ($subArray as $value) { + yield $item + [count($item) => $value]; + } } - return $out; } /** @@ -303,3 +305,33 @@ function normalize_spaces($string) { return preg_replace('/\s{2,}/', ' ', trim($string)); } + +/** + * Format the date according to the locale. + * + * Requires php-intl to display international datetimes, + * otherwise default format '%c' will be returned. + * + * @param DateTime $date to format. + * @param bool $intl Use international format if true. + * + * @return bool|string Formatted date, or false if the input is invalid. + */ +function format_date($date, $intl = true) +{ + if (! $date instanceof DateTime) { + return false; + } + + if (! $intl || ! class_exists('IntlDateFormatter')) { + return strftime('%c', $date->getTimestamp()); + } + + $formatter = new IntlDateFormatter( + setlocale(LC_TIME, 0), + IntlDateFormatter::LONG, + IntlDateFormatter::LONG + ); + + return $formatter->format($date); +} diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php index b8f608b..e70cc1a 100644 --- a/tests/UtilsTest.php +++ b/tests/UtilsTest.php @@ -23,7 +23,12 @@ class UtilsTest extends PHPUnit_Framework_TestCase // Expected log date format protected static $dateFormat = 'Y/m/d H:i:s'; - + + /** + * @var string Save the current timezone. + */ + protected static $defaultTimeZone; + /** * Assign reference data @@ -31,6 +36,17 @@ class UtilsTest extends PHPUnit_Framework_TestCase public static function setUpBeforeClass() { self::$sidHashes = ReferenceSessionIdHashes::getHashes(); + self::$defaultTimeZone = date_default_timezone_get(); + // Timezone without DST for test consistency + date_default_timezone_set('Africa/Nairobi'); + } + + /** + * Reset the timezone + */ + public static function tearDownAfterClass() + { + date_default_timezone_set(self::$defaultTimeZone); } /** @@ -286,20 +302,28 @@ class UtilsTest extends PHPUnit_Framework_TestCase /** * Test arrays_combine */ - public function testArraysCombination() + public function testCartesianProductGenerator() { $arr = [['ab', 'cd'], ['ef', 'gh'], ['ij', 'kl'], ['m']]; $expected = [ - 'abefijm', - 'cdefijm', - 'abghijm', - 'cdghijm', - 'abefklm', - 'cdefklm', - 'abghklm', - 'cdghklm', + ['ab', 'ef', 'ij', 'm'], + ['ab', 'ef', 'kl', 'm'], + ['ab', 'gh', 'ij', 'm'], + ['ab', 'gh', 'kl', 'm'], + ['cd', 'ef', 'ij', 'm'], + ['cd', 'ef', 'kl', 'm'], + ['cd', 'gh', 'ij', 'm'], + ['cd', 'gh', 'kl', 'm'], ]; - $this->assertEquals($expected, arrays_combination($arr)); + $this->assertEquals($expected, iterator_to_array(cartesian_product_generator($arr))); } + /** + * Test date_format() with invalid parameter. + */ + public function testDateFormatInvalid() + { + $this->assertFalse(format_date([])); + $this->assertFalse(format_date(null)); + } } diff --git a/tests/languages/bootstrap.php b/tests/languages/bootstrap.php new file mode 100644 index 0000000..9560921 --- /dev/null +++ b/tests/languages/bootstrap.php @@ -0,0 +1,7 @@ +assertRegExp('/1. Januar 2017 (um )?10:11:12 GMT\+0?3(:00)?/', format_date($date, true)); + } + + /** + * Test date_format() using builtin PHP function strftime. + */ + public function testDateFormatDefault() + { + $date = DateTime::createFromFormat('Ymd_His', '20170101_101112'); + $this->assertEquals('So 01 Jan 2017 10:11:12 EAT', format_date($date, false)); + } +} diff --git a/tests/languages/en/UtilsEnTest.php b/tests/languages/en/UtilsEnTest.php new file mode 100644 index 0000000..60bcb65 --- /dev/null +++ b/tests/languages/en/UtilsEnTest.php @@ -0,0 +1,25 @@ +assertRegExp('/January 1, 2017 (at )?10:11:12 AM GMT\+0?3(:00)?/', format_date($date, true)); + } + + /** + * Test date_format() using builtin PHP function strftime. + */ + public function testDateFormatDefault() + { + $date = DateTime::createFromFormat('Ymd_His', '20170101_101112'); + $this->assertEquals('Sun 01 Jan 2017 10:11:12 AM EAT', format_date($date, false)); + } +} diff --git a/tests/languages/fr/UtilsFrTest.php b/tests/languages/fr/UtilsFrTest.php new file mode 100644 index 0000000..890308d --- /dev/null +++ b/tests/languages/fr/UtilsFrTest.php @@ -0,0 +1,25 @@ +assertRegExp('/1 janvier 2017 (à )?10:11:12 UTC\+0?3(:00)?/', format_date($date)); + } + + /** + * Test date_format() using builtin PHP function strftime. + */ + public function testDateFormatDefault() + { + $date = DateTime::createFromFormat('Ymd_His', '20170101_101112'); + $this->assertEquals('dim. 01 janv. 2017 10:11:12 EAT', format_date($date, false)); + } +} diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index a971270..9bc3ba1 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -171,10 +171,11 @@
    {if="!$hide_timestamps || isLoggedIn()"} - {$updated=$value.updated_timestamp ? 'Edited: '. strftime('%c', $value.updated_timestamp) : 'Permalink'} + {$updated=$value.updated_timestamp ? 'Edited: '. format_date($value.updated) : 'Permalink'} - {function="strftime('%c', $value.timestamp)"}{if="$value.updated_timestamp"}*{/if} + {$value.created|format_date} + {if="$value.updated_timestamp"}*{/if} · {/if} diff --git a/tpl/vintage/linklist.html b/tpl/vintage/linklist.html index 5accc92..fc11666 100644 --- a/tpl/vintage/linklist.html +++ b/tpl/vintage/linklist.html @@ -99,11 +99,11 @@
    {if="$value.description"}
    {$value.description}
    {/if} {if="!$hide_timestamps || isLoggedIn()"} - {$updated=$value.updated_timestamp ? 'Edited: '. strftime('%c', $value.updated_timestamp) : 'Permalink'} + {$updated=$value.updated_timestamp ? 'Edited: '. format_date($value.updated) : 'Permalink'}     - {function="strftime('%c', $value.timestamp)"} + {$value.created|format_date} {if="$value.updated_timestamp"}*{/if} - permalink From 6c7d68645409cfad3858b5f252f5a49b148e3b53 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 15 Jan 2017 16:31:53 +0100 Subject: [PATCH 492/658] Run languages tests using PHPUnit test suites --- .travis.yml | 6 ++++++ Makefile | 16 ++++++++++++++-- composer.json | 3 ++- phpunit.xml | 20 ++++++++++++++++---- 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 03071a4..2a5ff5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,11 @@ sudo: false language: php +addons: + apt: + packages: + - locales + - language-pack-de + - language-pack-fr cache: directories: - $HOME/.composer/cache diff --git a/Makefile b/Makefile index f3065b7..1d8a73a 100644 --- a/Makefile +++ b/Makefile @@ -124,8 +124,20 @@ test: @echo "-------" @echo "PHPUNIT" @echo "-------" - @mkdir -p sandbox - @$(BIN)/phpunit tests + @mkdir -p sandbox coverage + @$(BIN)/phpunit --coverage-php coverage/main.cov --testsuite unit-tests + +locale_test_%: + @UT_LOCALE=$*.utf8 \ + $(BIN)/phpunit \ + --coverage-php coverage/$(firstword $(subst _, ,$*)).cov \ + --bootstrap tests/languages/bootstrap.php \ + --testsuite language-$(firstword $(subst _, ,$*)) + +all_tests: test locale_test_de_DE locale_test_en_US locale_test_fr_FR + @$(BIN)/phpcov merge --html coverage coverage + @# --text doesn't work with phpunit 4.* (v5 requires PHP 5.6) + @#$(BIN)/phpcov merge --text coverage/txt coverage ## # Custom release archive generation diff --git a/composer.json b/composer.json index b82acee..70b87bb 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,8 @@ "phpmd/phpmd" : "@stable", "phpunit/phpunit": "4.8.*", "sebastian/phpcpd": "*", - "squizlabs/php_codesniffer": "2.*" + "squizlabs/php_codesniffer": "2.*", + "phpunit/phpcov": "*" }, "autoload": { "psr-4": { diff --git a/phpunit.xml b/phpunit.xml index d6e01c3..8b66e6c 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -3,13 +3,25 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd" colors="true"> + + + tests + tests/languages + + + tests/languages/de + + + tests/languages/en + + + tests/languages/fr + + + application - - - - From 36c8fb1ef869c29e783f0dd5ebef2fb5566e2611 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 6 Mar 2017 20:34:02 +0100 Subject: [PATCH 493/658] Use all_tests target in Travis CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2a5ff5e..59b86c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,4 +20,4 @@ install: script: - make clean - make check_permissions - - make test + - make all_tests From 03b9cb600a85fed79b8afa72ccdad2725da5f3da Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 7 Mar 2017 19:27:17 +0100 Subject: [PATCH 494/658] Fix autoLocale error and cover it with unit tests --- application/Utils.php | 34 ++++++++----- tests/languages/de/UtilsDeTest.php | 76 ++++++++++++++++++++++++++++++ tests/languages/en/UtilsEnTest.php | 76 ++++++++++++++++++++++++++++++ tests/languages/fr/UtilsFrTest.php | 76 ++++++++++++++++++++++++++++++ 4 files changed, 249 insertions(+), 13 deletions(-) diff --git a/application/Utils.php b/application/Utils.php index a936b09..5c07745 100644 --- a/application/Utils.php +++ b/application/Utils.php @@ -216,22 +216,30 @@ function is_session_id_valid($sessionId) function autoLocale($headerLocale) { // Default if browser does not send HTTP_ACCEPT_LANGUAGE - $attempts = array('en_US', 'en_US.utf8', 'en_US.UTF-8'); - if (isset($headerLocale)) { - // (It's a bit crude, but it works very well. Preferred language is always presented first.) - if (preg_match('/([a-z]{2,3})[-_]?([a-z]{2})?/i', $headerLocale, $matches)) { - $first = [strtolower($matches[1]), strtoupper($matches[1])]; - $separators = ['_', '-']; - $encodings = ['utf8', 'UTF-8']; - if (!empty($matches[2])) { - $second = [strtoupper($matches[2]), strtolower($matches[2])]; - $attempts = cartesian_product_generator([$first, $separators, $second, ['.'], $encodings]); - } else { - $attempts = cartesian_product_generator([$first, $separators, $first, ['.'], $encodings]); + $locales = array('en_US', 'en_US.utf8', 'en_US.UTF-8'); + if (! empty($headerLocale)) { + if (preg_match_all('/([a-z]{2,3})[-_]?([a-z]{2})?,?/i', $headerLocale, $matches, PREG_SET_ORDER)) { + $attempts = []; + foreach ($matches as $match) { + $first = [strtolower($match[1]), strtoupper($match[1])]; + $separators = ['_', '-']; + $encodings = ['utf8', 'UTF-8']; + if (!empty($match[2])) { + $second = [strtoupper($match[2]), strtolower($match[2])]; + $items = [$first, $separators, $second, ['.'], $encodings]; + } else { + $items = [$first, $separators, $first, ['.'], $encodings]; + } + $attempts = array_merge($attempts, iterator_to_array(cartesian_product_generator($items))); + } + + if (! empty($attempts)) { + $locales = array_merge(array_map('implode', $attempts), $locales); } } } - setlocale(LC_ALL, implode('implode', iterator_to_array($attempts))); + + setlocale(LC_ALL, $locales); } /** diff --git a/tests/languages/de/UtilsDeTest.php b/tests/languages/de/UtilsDeTest.php index 8a74038..545fa57 100644 --- a/tests/languages/de/UtilsDeTest.php +++ b/tests/languages/de/UtilsDeTest.php @@ -22,4 +22,80 @@ class UtilsDeTest extends UtilsTest $date = DateTime::createFromFormat('Ymd_His', '20170101_101112'); $this->assertEquals('So 01 Jan 2017 10:11:12 EAT', format_date($date, false)); } + + /** + * Test autoLocale with a simple value + */ + public function testAutoLocaleValid() + { + $current = setlocale(LC_ALL, 0); + $header = 'en-us'; + autoLocale($header); + $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale with an alternative locale value + */ + public function testAutoLocaleValidAlternative() + { + $current = setlocale(LC_ALL, 0); + $header = 'en_us.UTF8'; + autoLocale($header); + $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale with multiples value, the first one is valid + */ + public function testAutoLocaleMultipleFirstValid() + { + $current = setlocale(LC_ALL, 0); + $header = 'en-us,de-de'; + autoLocale($header); + $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale with multiples value, the second one is valid + */ + public function testAutoLocaleMultipleSecondValid() + { + $current = setlocale(LC_ALL, 0); + $header = 'pt_BR,fr-fr'; + autoLocale($header); + $this->assertEquals('fr_FR.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale without value: defaults to en_US. + */ + public function testAutoLocaleBlank() + { + $current = setlocale(LC_ALL, 0); + autoLocale(''); + $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale with an invalid value: defaults to en_US. + */ + public function testAutoLocaleInvalid() + { + $current = setlocale(LC_ALL, 0); + autoLocale('pt_BR'); + $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } } diff --git a/tests/languages/en/UtilsEnTest.php b/tests/languages/en/UtilsEnTest.php index 60bcb65..7c829ac 100644 --- a/tests/languages/en/UtilsEnTest.php +++ b/tests/languages/en/UtilsEnTest.php @@ -22,4 +22,80 @@ class UtilsEnTest extends UtilsTest $date = DateTime::createFromFormat('Ymd_His', '20170101_101112'); $this->assertEquals('Sun 01 Jan 2017 10:11:12 AM EAT', format_date($date, false)); } + + /** + * Test autoLocale with a simple value + */ + public function testAutoLocaleValid() + { + $current = setlocale(LC_ALL, 0); + $header = 'de-de'; + autoLocale($header); + $this->assertEquals('de_DE.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale with an alternative locale value + */ + public function testAutoLocaleValidAlternative() + { + $current = setlocale(LC_ALL, 0); + $header = 'de_de.UTF8'; + autoLocale($header); + $this->assertEquals('de_DE.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale with multiples value, the first one is valid + */ + public function testAutoLocaleMultipleFirstValid() + { + $current = setlocale(LC_ALL, 0); + $header = 'de-de;en-us'; + autoLocale($header); + $this->assertEquals('de_DE.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale with multiples value, the second one is valid + */ + public function testAutoLocaleMultipleSecondValid() + { + $current = setlocale(LC_ALL, 0); + $header = 'pt_BR,fr-fr'; + autoLocale($header); + $this->assertEquals('fr_FR.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale without value: defaults to en_US. + */ + public function testAutoLocaleBlank() + { + $current = setlocale(LC_ALL, 0); + autoLocale(''); + $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale with an invalid value: defaults to en_US. + */ + public function testAutoLocaleInvalid() + { + $current = setlocale(LC_ALL, 0); + autoLocale('pt_BR'); + $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } } diff --git a/tests/languages/fr/UtilsFrTest.php b/tests/languages/fr/UtilsFrTest.php index 890308d..45996ee 100644 --- a/tests/languages/fr/UtilsFrTest.php +++ b/tests/languages/fr/UtilsFrTest.php @@ -22,4 +22,80 @@ class UtilsFrTest extends UtilsTest $date = DateTime::createFromFormat('Ymd_His', '20170101_101112'); $this->assertEquals('dim. 01 janv. 2017 10:11:12 EAT', format_date($date, false)); } + + /** + * Test autoLocale with a simple value + */ + public function testAutoLocaleValid() + { + $current = setlocale(LC_ALL, 0); + $header = 'de-de'; + autoLocale($header); + $this->assertEquals('de_DE.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale with an alternative locale value + */ + public function testAutoLocaleValidAlternative() + { + $current = setlocale(LC_ALL, 0); + $header = 'de_de.UTF8'; + autoLocale($header); + $this->assertEquals('de_DE.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale with multiples value, the first one is valid + */ + public function testAutoLocaleMultipleFirstValid() + { + $current = setlocale(LC_ALL, 0); + $header = 'de-de;en-us'; + autoLocale($header); + $this->assertEquals('de_DE.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale with multiples value, the second one is valid + */ + public function testAutoLocaleMultipleSecondValid() + { + $current = setlocale(LC_ALL, 0); + $header = 'pt_BR,de-de'; + autoLocale($header); + $this->assertEquals('de_DE.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale without value: defaults to en_US. + */ + public function testAutoLocaleBlank() + { + $current = setlocale(LC_ALL, 0); + autoLocale(''); + $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } + + /** + * Test autoLocale with an invalid value: defaults to en_US. + */ + public function testAutoLocaleInvalid() + { + $current = setlocale(LC_ALL, 0); + autoLocale('pt_BR'); + $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0)); + + setlocale(LC_ALL, $current); + } } From 2dd698fd79abc35f4f56fbf929d3fb0320c27bfe Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 8 Mar 2017 18:59:54 +0100 Subject: [PATCH 495/658] Submit editlink textarea using CTRL+Enter shortcut --- tpl/default/editlink.html | 2 +- tpl/default/js/shaarli.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index d6f81f9..2180c08 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html @@ -59,7 +59,7 @@
    - + {if="!$link_is_new"} diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index d47c257..f7de0a4 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js @@ -256,7 +256,14 @@ window.onload = function () { resize(); } + if (description != null) { init(); + // Submit editlink form with CTRL + Enter in the text area. + description.addEventListener('keydown', function (event) { + if (event.ctrlKey && event.keyCode === 13) { + document.getElementById('button-save-edit').click(); + } + }); } }; From 7c26f6626a47c7e3e902f6b00c7c9e640a18f22c Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 8 Mar 2017 19:57:15 +0100 Subject: [PATCH 496/658] Display private only filter as search parameter --- index.php | 1 + tpl/default/css/shaarli.css | 4 ++++ tpl/default/linklist.html | 8 +++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index 77857d2..064f43c 100644 --- a/index.php +++ b/index.php @@ -1681,6 +1681,7 @@ function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager) 'result_count' => count($linksToDisplay), 'search_term' => $searchterm, 'search_tags' => $searchtags, + 'visibility' => ! empty($_SESSION['privateonly']) ? 'private' : '', 'redirector' => $conf->get('redirector.url'), // Optional redirector URL. 'links' => $linkDisp, 'tags' => $LINKSDB->allTags(), diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index b937c59..d33e906 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -985,6 +985,10 @@ div.awesomplete > ul { margin: 0 0 0 5px; } +.search-result .label-private { + border: 1px solid white; +} + /** * TOOLS */ diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 9bc3ba1..9437020 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -89,7 +89,7 @@
    {'Nothing found.'|t}
    - {elseif="!empty($search_term) or !empty($search_tags)"} + {elseif="!empty($search_term) or !empty($search_tags) or !empty($visibility)"}
    @@ -106,6 +106,12 @@ {/loop} {/if} + {if="!empty($visibility)"} + {'with status'|t} + + {$visibility|t} + + {/if}
    {/if} From e6cd773f5a8bd757c9362524cfeb3f7cb7fa81c9 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 8 Mar 2017 19:59:00 +0100 Subject: [PATCH 497/658] Fix blocking namespace issue --- application/config/ConfigPlugin.php | 17 ++--------------- .../exception/PluginConfigOrderException.php | 17 +++++++++++++++++ composer.json | 3 ++- index.php | 1 + tests/config/ConfigPluginTest.php | 6 ++---- 5 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 application/config/exception/PluginConfigOrderException.php diff --git a/application/config/ConfigPlugin.php b/application/config/ConfigPlugin.php index 61a594d..b3d9752 100644 --- a/application/config/ConfigPlugin.php +++ b/application/config/ConfigPlugin.php @@ -1,5 +1,6 @@ message = 'An error occurred while trying to save plugins loading order.'; - } -} diff --git a/application/config/exception/PluginConfigOrderException.php b/application/config/exception/PluginConfigOrderException.php new file mode 100644 index 0000000..f9d6875 --- /dev/null +++ b/application/config/exception/PluginConfigOrderException.php @@ -0,0 +1,17 @@ +message = 'An error occurred while trying to save plugins loading order.'; + } +} diff --git a/composer.json b/composer.json index 70b87bb..57851e5 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,8 @@ "Shaarli\\Api\\": "application/api/", "Shaarli\\Api\\Controllers\\": "application/api/controllers", "Shaarli\\Api\\Exceptions\\": "application/api/exceptions", - "Shaarli\\Config\\": "application/config/" + "Shaarli\\Config\\": "application/config/", + "Shaarli\\Config\\Exception\\": "application/config/exception" } } } diff --git a/index.php b/index.php index 064f43c..3c2bb1d 100644 --- a/index.php +++ b/index.php @@ -62,6 +62,7 @@ require_once __DIR__ . '/vendor/autoload.php'; require_once 'application/ApplicationUtils.php'; require_once 'application/Cache.php'; require_once 'application/CachedPage.php'; +require_once 'application/config/ConfigPlugin.php'; require_once 'application/FeedBuilder.php'; require_once 'application/FileUtils.php'; require_once 'application/HttpUtils.php'; diff --git a/tests/config/ConfigPluginTest.php b/tests/config/ConfigPluginTest.php index 22ab927..deb02c9 100644 --- a/tests/config/ConfigPluginTest.php +++ b/tests/config/ConfigPluginTest.php @@ -1,9 +1,7 @@ Date: Wed, 8 Mar 2017 22:58:44 +0100 Subject: [PATCH 498/658] Add v0.7.1 to CHANGELOG.md Signed-off-by: VirtualTam --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 466c910..1a87a8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -160,6 +160,10 @@ Please use our release archives, or follow the - XSRF token now generated each time a page is rendered +## [v0.7.1](https://github.com/shaarli/Shaarli/releases/tag/v0.7.1) - 2017-03-08 +### Security +- Markdown plugin: escape HTML entities by default + ## [v0.7.0](https://github.com/shaarli/Shaarli/releases/tag/v0.7.0) - 2016-05-14 ### Added - Adds an option to encode redirector URL parameter From 5ba55f0cf287c583019bbb731ad98e04a14da972 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 8 Mar 2017 20:28:33 +0100 Subject: [PATCH 499/658] Move config exception to dedicated classes with proper namespace --- application/config/ConfigManager.php | 36 ++----------------- .../exception/MissingFieldConfigException.php | 23 ++++++++++++ .../exception/UnauthorizedConfigException.php | 18 ++++++++++ tests/config/ConfigManagerTest.php | 2 +- 4 files changed, 45 insertions(+), 34 deletions(-) create mode 100644 application/config/exception/MissingFieldConfigException.php create mode 100644 application/config/exception/UnauthorizedConfigException.php diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php index 679a75b..f209741 100644 --- a/application/config/ConfigManager.php +++ b/application/config/ConfigManager.php @@ -1,6 +1,9 @@ configIO = $configIO; } } - -/** - * Exception used if a mandatory field is missing in given configuration. - */ -class MissingFieldConfigException extends \Exception -{ - public $field; - - /** - * Construct exception. - * - * @param string $field field name missing. - */ - public function __construct($field) - { - $this->field = $field; - $this->message = 'Configuration value is required for '. $this->field; - } -} - -/** - * Exception used if an unauthorized attempt to edit configuration has been made. - */ -class UnauthorizedConfigException extends \Exception -{ - /** - * Construct exception. - */ - public function __construct() - { - $this->message = 'You are not authorized to alter config.'; - } -} diff --git a/application/config/exception/MissingFieldConfigException.php b/application/config/exception/MissingFieldConfigException.php new file mode 100644 index 0000000..6346c6a --- /dev/null +++ b/application/config/exception/MissingFieldConfigException.php @@ -0,0 +1,23 @@ +field = $field; + $this->message = 'Configuration value is required for '. $this->field; + } +} diff --git a/application/config/exception/UnauthorizedConfigException.php b/application/config/exception/UnauthorizedConfigException.php new file mode 100644 index 0000000..79672c1 --- /dev/null +++ b/application/config/exception/UnauthorizedConfigException.php @@ -0,0 +1,18 @@ +message = 'You are not authorized to alter config.'; + } +} diff --git a/tests/config/ConfigManagerTest.php b/tests/config/ConfigManagerTest.php index b81be5b..1ec447b 100644 --- a/tests/config/ConfigManagerTest.php +++ b/tests/config/ConfigManagerTest.php @@ -106,7 +106,7 @@ class ConfigManagerTest extends \PHPUnit_Framework_TestCase /** * Try to write the config without mandatory parameter (e.g. 'login'). * - * @expectedException Shaarli\Config\MissingFieldConfigException + * @expectedException Shaarli\Config\Exception\MissingFieldConfigException */ public function testWriteMissingParameter() { From 07b57cfef9e23a033e92cf4a7c3fbe6686229c3b Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 9 Mar 2017 19:39:13 +0100 Subject: [PATCH 500/658] Prevent git from messing with font files This should remove font related errors in browser debig consoles --- .gitattributes | 8 +- tpl/default/fonts/Fira-Sans-regular.woff | Bin 14119 -> 17100 bytes tpl/default/fonts/Fira-Sans-regular.woff2 | Bin 11464 -> 13836 bytes tpl/default/fonts/FontAwesome.otf | Bin 109687 -> 134808 bytes tpl/default/fonts/fontawesome-webfont.eot | Bin 70806 -> 165742 bytes tpl/default/fonts/fontawesome-webfont.svg | 3320 +++++++++++++++---- tpl/default/fonts/fontawesome-webfont.ttf | Bin 142049 -> 165548 bytes tpl/default/fonts/fontawesome-webfont.woff | Bin 83588 -> 98024 bytes tpl/default/fonts/fontawesome-webfont.woff2 | Bin 66623 -> 77160 bytes 9 files changed, 2675 insertions(+), 653 deletions(-) diff --git a/.gitattributes b/.gitattributes index 059fbb1..82f3760 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,10 +10,16 @@ *.php text diff=php Dockerfile text -# Do not alter images nor minified scripts +# Do not alter images nor minified scripts nor fonts *.ico binary *.jpg binary *.png binary +*.svg binary +*.otf binary +*.eot binary +*.woff binary +*.woff2 binary +*.ttf binary *.min.css binary *.min.js binary diff --git a/tpl/default/fonts/Fira-Sans-regular.woff b/tpl/default/fonts/Fira-Sans-regular.woff index 3ba3c8abb7daff1588d86173b6eee5ee7b61f87b..014ac3179e646ef000963392e01248856a2b5c1a 100644 GIT binary patch literal 17100 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 TojZ@}ulKD(znl~ee*gdgDph8D literal 14119 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 O)Ao{=wJ13W0000hZ*gk? literal 11464 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 diff --git a/tpl/default/fonts/FontAwesome.otf b/tpl/default/fonts/FontAwesome.otf index e8778ff2f742cc39e5d4c24ba414dd345803484f..401ec0f36e4f73b8efa40bd6f604fe80d286db70 100644 GIT binary patch delta 72678 zcmZ^L2|yFa`uGea8{EZkB#Rib30|lLZ@e!Auc}qlcwf{LFI0@Es05HZ+#5wi1QF|f zVm+$1_+AeyZMAKBS+!bwTW$NEc9KlM|2K*DUBAC8+1n;bwQY}g0h~IruOKa*E@AS-0y+=ghi`g zU5nqVGr_$ZAzyvsl2;e2cK-%_pM^qwzeFeq@a50KeLUQEOk8c=G%m8uHMln;#Q(DT z)lFU3`do!NA3gyZa7nMOUNS7OV+XiTL`czk?V9ywm>ATnHqSo+`vVF zD+1RAZVI#n<^&c6+5)Qr>jDo4o(eo4_-5ccfgc2Z8h9)4e&A1mzXkpo*c_w?5`uz* z+6ILObq?wt)Hi5IP+ZWspvgfqgBAoW4O$&!4%!lw8I&JX8dMRqH|Rjnv7m;aH-fGP zT?@Jq^m)*opznen2K_@9^FoUALW=W3it|E>^FoUALW=W38tH{J(hF&%7t%;Cq>)}o zBfXC_(hF#$7tlxs$TGV3NH3(3UPvRokVbkTjr2kq>4h}P3u%-W(kL&aQC>)+ypTqD zA&v4v8r6S6zk%N88RdmC$_r(b7s{wOwdb{r@`4#Ps$%kC9E$tNQ6cRuk9-hD{%8(b zfQnH$sz7zJ*?t%N@{&+Ap;hA^=UW^lQ5-!4Jcn3a>&*OLThxlXs8NQA0 z;~()K_$hYz7<@YTboPn&N%l$g$?)0lbJ*vc&-*?%eD3*t=kt@#?>^1GKE8pz-F@`^EW9^Ly2Ah2I*#6u&Kg7QafrdcR|SXZ_yt`@rwhR;^mav>MlHcB_I`C9P^& z9d32C)jO>|Z}oGlf3|YAddBQ;@8dtfKgNHw|9Jm+|F!;G{qy{b{44zT_`l|V%KwUglmAWsul?`)|Lp&`wW@VQ z>rt&2w_e>kwRLW5YwPmX2U?$R{rA=%Sz3S5`gZI4t$%3!xb+|E)@n)JN!?35R2{1x zqn@aqrk6|hN5 zO5oPO?STb>rGYyFs{_vjo(pUWychU12nDHw+6P4eM;sIs3mkD$kSS(N5A%)y~w;)h^T~ zYS(JhwAor&Tdl3v9@n1HUeaFGzNh^_`?2;*?Op8y?a$iB+9x6w)nb@vX)pE=qs77E zaB;LaL7Xbi5a)`C;%d<>ri+E*F0o!bAzl#wCcY=$5Wf(=5q}gPi%&#{*b?F!;uq37 zBsio^h(4rqNK{Dgkf9-CL#Bqz4_OkjDr94bB_t~(KcqNB4%sEX#FG)c%M>B0^~%e7 zMV3fEARj1CEgcbXWO`VOwu#p}8%+{nV!ooi=y$9Z3+|@q*~GnWYw+ zs>P;PG>Sz~6;i}Iv`ybjRQr%y$Gf!;RqJ@FRV|dv(&v&Yf)_S#+qPNYNFO4?(Z?us zl8gfFLq#~??g6h?CZtMwS1mQE(k$C8ImR4IahffI*r~-HN;pZDi_6N5Zr zF-m$z<2=5_v`o^gVrKIsTBUIjKi=rjs>pd><96E=np;%MY20KA4{f6)muU`bOEP$( zRjD0A=&$5g_Yi@L=7lKUAk3Fe2&&$^;NI@;1jlywb_bjt+bs^bfMdJRM=}UaJT(pB zg%e4K5``FehQSidSeVFG$Mmw~uu;=Qp4ghiIDR}gS~8AbDK&8d*N+#t;jnfjL!yl| z501uhyb=1G{Zz7&0-m&%2Jz#gBw-Lw?cC;VmDNUKTEPo_VG(=ukc1g9zwsRyJGjp@Ejlz7M zgmQL?=;x52p^prtoXAQN#Jf#;8s38!`|!dd$ttM2NkU`7x#a$B{KcqmC|FHxJ& zY!_oCmo_AYH)viXe@ZUKWbavJ*4560^Y7 z!#h=(ctNj19`ZGe_hM$#aNqzdB%x1S9J#=gT0msG>cOXY% zcPpM^N#-5)&v*e=KnqpGO6CdHZSas*I#0O8yKTS2@_65p!?sxxD*2T6C4uV#7v|a9^kxVh1Id#k*E`>Z4109v#--eUgF)rRVZ*3 z_Ye{Z7vv02esv6ql#F`UJq3yVi~5ZMtaAsH4r#Iz6a}ELgmFL3&!6rDT&I@vDd|!JS(<+LM7KluW|%HfwteP%Iq7Neo#o)F(Gs z>+9Rzl!Q1CEzcRa%aqIuApf+YV=#S09=Qk8S#;_U+LpF6&=4YS-n*vMoY8iD#uoEB zoflI$L3bYLQ>3b8M8y%UMEa7iBw1kNgQ1J1}$YlTL@80 z2CHhEWOUmcwj>z!6S@GeUAx-KJ34i;427C#@}uOogHjPKC@mG)ReN-M%Bm_VV6D0W zophIC09GDpB*2xj%L(u&G6!BZNrXyeo-F6fVLNvgm)eYbc2raq?LlssnyWO%A(Qy{&Syftm&YN8n(})C4mo zjC=_&eFB_x4r3E!JJU^t-{6@Ak}n++h^3L_2_VUs6chSO>R^Vdjy9x$P9y$g7dcCp zlGd8$7`@`4P`esbwla@0WdlhB8X>FQ2}cARneyZ=I!kX= z&E|@AYjup2n0$Dx;y_Kc;X9Qujt50nAhUS2>Xj?A-Y5G29k)4r`AT>{WEenW3ZD_w z)TBf~xp{L&a3~ItE3$Xsb`}wsTQ<|mL7S&$w^pz(AwsWSOQ;YVdzuR0e}9??c7xDj+5y8e zl?3L=PH^K9u)P8K6pT$~!VgdgDAZ-;C9+Ki=m5ed8FU=>V7BZsX!A0Y4k|YFjQt06 z^*i=gw}vjANrZAwwJ`ple8saJIK%>6!%m_>7qS6_XwWA~w69QARaQ}9box4eRoZN1 zEtyBMbix#go+WmkJW&Z`jKs7*t;+;LTF5WYE6*;^+Lg6CvyvLgrcer002&fd$s=AJ zK0wd)A)r)R9e%(KPi(X$CmTS+tjVmeHwYG@qAHN#G)DM4RZ;ylIyj6jr71LM$#|nM zchjQfD-9JXW$V}L=9#CwYBmTu+W*f;5^Zp{a3uQAhorwz;AlWZ1Pw4Y+X={={*uEk zfYdp{2z)vyh5|4=W+VyS_{1czbw2a(VnBL0Mp^{X$_o!wQ6T%a9W(DY2-bMkQFTH{ z7)t+ew=C9KRdgXaJ&^PlNG#o@+*DDMQ5#mVt61I%xWwMhzyBA=8PFb`X9-vi#6Z%C z!C@nY;ba25OM`HJ*~tY9mMvSb;N-IN=TDwI56`b73M*0M6NMo&qcAh<)dJxvuP&`9 z-c_k%76-#t4;H{{g^L|hKEn(q@N%T5!h=ua`UoDmW@&qIUWEnZK}B1r2hG&omfoP7 z=}Fq}pR^O{*G(WGctPZX;Pnb%;SR0%28n~&fY}otbJbXpYTLXs)i1qV&K6P~h&NC>wJWo;^Puf|5!5eX1fYvb zsI5)OlZ5w`` zP`j!dFf^h9#sGA{o?cL#BC4evkfT}h6&whtfr@(02Lo?xkg&jklc3qIqJ0FF!-p4S zTX9*LkORa(RRpjXFq5fMqsCCqvT62?q+G*h!7M5CF7QmmL#v9a9ed=xel1a@iCk7@C=;SV8qEP|kkImql6=dN1lKD{uWdz5VEr@X zhZS`LlcS8uIhf(%03Hp@Ig<(WY>;zyiw9BNyj3_!9FlNGVn&nz`dw#9=+1Xy!!*Hq zgF>Vd*7Bey3hT^U%o)av^`&d}ZWfFnn6_u?){{=OBQ*W%V8|Lwj(}a)C$~>n3LRfm zoW-c+6i`JpV>ALcR}#`JR!hn*i%?7M@L1TkV!3X4rJ#y~XNn;)0+pyCJ-uMlj3R)b)O>KG4wB6Tzp-fn9u&_d3V zX%!5`+cS$Y!vKe#PmeKIub+cxf&R%kW)yJC2*(M^^>xR#9S;McQ?+e#p;1s)7gkkz z3=4;np}!XN0-+wzZ7Efq;y|~117tNrT-t$-Vzg=!^v)PgaBD#w=sM&4iG{|)%guWQ zauoD*01qlQ^?O9ykm#A@O=08eO*4##H?OEk3=_g=C`E9Dg5h&!P2JMjOBT;wEU0Gi zO97ezbWu<|k~7wC24T{fMhKuRFwOu5BLG)cR8#?4f(!=ZBSxrA!B$!7-o?`3a}^>_ z7@@uh4Mgbg2t7quMtBFp6$n=%T!nBo!ZiptApAOn%aBiRRSWw;1_e zM~b#cF#sttk>UnYwnNG)r2HOnL5M3w+(*cdLw;$fl^<%QL#LQ3;F+yTEB!^A4lp~q>e}Gaul!?1r9(#@P9B0+Kz%(pXtiKJ)9&>0zqA;UCe$U%l{$cT|~7&0zGMi&a7g2Hd3c0EzM z&rtg))P6o{e+_l$i8|Dxj{d0QI@Iwt>i7_K@qaKe?PZjD}jCu`3y+1|0 zDT)q5eb=GB1*q?zsNWFOuMzd{h5Bzo{V$;biD;k;4VsDuZ$d*PG{l64WT2rO8hR29 zb)w87oJch1Dw-RI<^`g8jcA@5&9|Wik!Zm{v|tQcum&xV(SlFVg71)J!5?VB zGn7z_!e3+5iK2qmhM4IAE9N#(6X;lVjfDo zftGhe%hS>F@6d{HwBi<8xe=}EgjQ9e)&0@x8npUdwE8!c)Da~OMoE)U(jt_Ug_5qI zqz_Qi*Jw?9w5A-bvAm7eN@#5aT00D_or%_Aw2nvXwxQ&gQF1w2KLD*Cgw_v1>x8f>=Kmy8_J1CIe93z70O+Na_^x$Ey|mU^2$-(w zcXZen9UhAge~ylXp(E4K(Yfg8@90=BbnF*&{6}=M1f2>(r>>*Zozdwybb2E?eFUAp zfX-OvpfgU?FatHzqO-4|*YnUhKXkqeI=>rTkkExk=;A_j@dkS1Lv-mRx;z+NzKyPE z(UoK9&2gx43%Ys{{k=PSClI|;jozJ%-aU@qTZ-O0fv&xTu6>E#zlN??p{5G-K|cDh z5Pf(Zebg3xv=!Y*KsSz}PiCV}sx8Rg1=;_GJ{yNVdkcMz(dUoR7njhN2K42Z=&QBp z)YyIjFtui%&3#*1R{Vqd&?FkU|`dv+%~Hc+;;qbvoXXjJIauZ9Q-rhtn=#%XXaZ#u=w@)-;?|gtJ<3&IX)o#Cckr z|2{65g9`|@UdM%%xTrNQGUMV9T)Y>TjKd`lap@^so`%am#^qn*^6zo^Z@Aov<)heE zig#SY6>XN_iaxkv9IiNocXhzK%J8lec=z9NRSDj+2v_+adH>Z3-!p+|dr^s-mVQ z@Km~^z1}qz33I^R9dNgdfGbdVU*Xlw7Avtkdy)%SuI^W>qt6^RFjb4d1r*bpIp{|4 z>RL64=CN$*-?c*q@6tkah1#7q>*;SJu?j9Xg~_gF-|u@njS48!zweua6<^c;_q? z_}DX)?&ENy4!1(|KzkaxLj)lQjG!1E0v76879nA37BpQbHAqLRAUqJ0&dWdbUpHtp zZy+_&>Ffo`M$l{jlzL|5aD_8q~Qhv%&WB&6kKIlB#j!ZMxe) zs(8A49DSQs(TImsAgzqfUpUh0ArVM~k=k5>_^Jf%6gBAzYT{O}Ibs7hu|qq4BPjaK zHiCE-c19}chad)^5ST~U^D zc!dl>Ft_%_wVJ#J&LMJkmgF=k`hcsO+Gk1f*8@8*Y~Y)<@X{J!fuZ8R+QE~30bT_N z9)Pcvn#f=lDTdaw;IaR^2Kvwa&$jB?O1+{U%ku|?3?@E&bI0aR^bK+eE~%dC$;%RH zp)KIl(v#^@ef^GVh>7Zn-kIo3R908-sIS+l>9gV#EFT#ZXpbUok zk6~CV*7o1WeK97(tLc&hFpK>Xo7N5H)u%jVj`Qb1UFK9*d4s#mug;y}rx}`(0TqZ@ zH4MDOM`Kt-*62Y|?@$a$wf8&&xjmjFhzmRH(B-eTEDQoh79*9PcQ@e!+Ou*tEOI2#IfsQ|zactYM)T3>W zzj5mP@rHyUp?LmkW^pnyJLT~)!o^d-9_Lwc4;VOLZT;({rCr21YuDr$n(bW9+Jl#j zuCXp{%UD%&wCmb8{N;_48m5PVYi;_ZMYA^=N72Db`u<1qIzve74Gdv%4g`ICfxzAx z+SUkRylZglhUbyUddEd^=dS$Pw4HPf85in^N|njbF%$CO0f+{$oNVOVf&I;?VOh<< zxwMY6-l!&=wQz3+ns=GW2Rwa3&1=9Y2k!My>;T3xkcpj`zy~ES8D>;biA*FeNwy9% z>Ri%pYEo`4Oxw0Oj1J;9r&U%L8h3+HPUW|Ub?yR9>!E24wLzP0+fu`vChoL+{*VU^ zTs#nj4cO${yc{?@%tHF{uGV5*hPi4T#GD-_j*OSwCTdfWdk|-In?i|!cbFWez15`$ zGxoPtZ-R$`rG<%W2e_U%o;(1TUaAC>|DSA$|4x=5OQD&=K2ZAiA>=*7JGYMj7q*E$ z`3;65Ce^MAxuVoa|KX?|DAlI8U=6kG*Kq`gG!igvu`CkHxRVDbe)W)op`NH7meP3)22dRa+iO>9W_Z-CksN#NZBe7P>A z@bl^yo-rHrR1Fy)$-G|i57n8v`m+~xKw#sS@$$6To<7|rIXAX*n-@S}`Jpd!`M_%X zHprJ_U*bmcK%^7o$FY6-?U9bEi17F}!H10Gm18xRl?{(;o)WB6w^)wCG_lob^G%l2 z?q{AmMv`zVzY^EiU#}dq5ktWO-c!&=O(3YZfU3!48h?vCkw1-##Pj86apCxh96oZe zrMqOa6&1?{h~u^<4jnusyde zwib=((11kJs6af)BD8~OyF(k|y=c}_o7fC*!wK=_p_ja!nAnC+5~m3dC0fp@Rd{Yn zd#;w;&=iUX0QJK88;1h}XXBb}C=VEAv{Xpx8P@bn zslsO68TPZx@7!VC5k`8+e1(ntjofoOW zVzg^2%s+(W%HrrDklmvW2cD`WF2Iw~Urqj18bEEo!ke|U*DHU$w|fj!MB=W^E)QL|QVH@4hIb4qR)+ar|v{_O1g$Z_c(!DK!8*s+LwL1ps2 z#v%VcwqM|rf;uZZ8Veg6{X0Qnzn7BCuR*l|1exskJHnpD; zL}36a0U9Ww-2jIJNe~1M1xF~^>8yaXkrR6ECLr5jm+foreC5FtYmJ(Z-h=ZBZD# z$ieZm;eoI6U=Ype}l=UUJU2GdokSey1#~V*v2cyvL4TW)U{=vR2|SKh*^Yu z4u@Ug{XN0v1OZ|3gr_X{`LB8-;I_*w&gCJWIgDWwQlob38E3CCoE{KcwkGNd56a{yd44(*=ZJ|yR$n& zNd~H30^HmoHJc!M@FKGek{ih&m7}w}voek8@gFjxgD{c_R39z88HhOmzjSI{rXI435-yaSyDX&2IC24g7u=RmdIh??2Qf;kj+Zav8|wFtERI2gXdcI zYPM2ZU-B#@95~dU+z&qx3$@4xUl}(zSE3e@rrf`NMdk9a>yS(20zHgz?JS-s<;aO0du@`S^q~l8gDrNjgB)kYaGsf3HfjL^A^YGd zH1V2JW^9R|A_9?Yn%LPlo?MdaCU)(VFl+FtZV@_7JUvM^)6L{0fjk_wSAsrtMSGV- z{%+y|pP7<8YEoyP$&#EjX+Y~7{)j}DIj_P)fgW~xk}-OwL=;?EX;D$B@pRpVnk#$! zb{Fs5Ri&%mTA6CFTCI?q;NPCglO>Yj%oRy*3B2&KB7Twn8n0v;u@;m%?YNCBjL)t# zUurJE$eZHByQ;hiWtuPlJ*CWP=XUST&)sb-C@wB24wG3@pnNhuluhvc_*e`1S#sI{ zGXsDOK>TY}5Or__NykCk;K81vHX8tO!vO;2Cg7zTP2MFl_^P z>ou@{xlb9vK?%GNa+WDKzOH2~M0VDrEklk%?ek(iH}X?bFF9vJ;=);W(o5k`MbvtZ z^VM@xU(~U5fZwIIPBXVIZ=nQz4 z3_WcvehEDw*!HOY#C^T>% zbQ}zIz>iXGc|OGVFoNqxXJ^*GIn|j8{eesdL4U_V_rXv%{J=^QC_2D9pM(hDf?@93q}gVOc0-1jyxKI;0t1*q zn>54p%_JH|vB4;VKno`C@()3MeLhn33c#(0F8%67}5tR=FUN!9?D3^bAA+;NCc}$ z#{>fX&e4ugG6YIE@*^=V<7o$OHd#rBlA(0vWk1pZhU}oCD`(T8bm(ll(vNn4#vQoJ zbS1PHN>5*V<9imbd$px0%x5_&BMBgJ*cVVNiXA%P(#g+lyS`a^0r#~1n9;63DX=lhghRQ1|E^=lb?R{7A{%j|o(lnHG~V&P zNOGlSPyPB8yOlXDr@#>%j5jagow*M4PRY5?`J{?hQH9yOX@{FM zjQI68kS0fqxNgISb(HJY9nvdctkOB3w5w%nMYMUKNszv5DK^7WY}*ZPw<)UX%H1SH z-a2=7NIcJ7czyqwI%D0L!b=;@_<^Aa!b1LKZhK#_*5tr>;l51m>oYF`UzBIh8)eDk z$=N30wvZzdO`g2PA8k4c>?yhl?zG-(uwXD)fXAe!5ORudhE^glv9pjw0tI&10%8Y; z5vVoL!eMF#9TXawoSw7y{+RTlleaBkgfu=K;M(~n3nV^4YKqg`{MV@7!A|io`Z35r zbD00t+S~a5zm=sHrq1#h^CV|?SA$5}N6F6+OhMYslw2f?nEQZ$a7#n^*`_td= z`?*}rz766bxomz%?j68o#Uc69{BS%#zCAyp)jOa_c$8aNwP5BVCes;3b&}|Kx;!%> zfiAa^@dl>RbduarU_xDXOa`m#3v$^JWoWTEA@2Pc6enD?Z4l{$m9u6UKJtd z@N9BDNYc%r8S=Xe!j~Q3LHZ5^`)DOJaISjZ07Ugb;BHL3f{b+>1n$PPQ^;^#SfAV$ zME7QoxZSJ-Et+_wlMVdZN5%3yIk(I}qlrmbo}B?%=59M^VJ0p{o}ADj5@uv_M{^)c zl5-ZHGO$Eyr`8b-T;BxFIoPsOUwUS#!INk$*Ce#TvGVzZP8LWU1-tgItWnKcr#9q; zvy*MA07oZm;Q03vgXR$U{+Sc!#b%EDug8L8?certY*{rw=70Bc?B8COQ|H~wp-DVi zQqOjCbOg^MxXK$OS2VEzHonf&fZroX088i~lOol=8C#C;UKwE5(xc~prIf2^1MyqvzhQbVR1gb1F*Q#!U^ahUqmoiEYd#wv%+Xe=L z77TrAb3-T2p&j9}!434XajcK1ccg>CrDfKcAL5#|o@#KGu(n{(P#cRI*gW1*rZ%1R z&6hVUlr7Flkm|acY{hzI5ZO-rCC8z^^CX_cNwuFz?>o-@Otc@8J5m#~aU3>}+2HGn z2BhsIu?PUU?a7~=06`Wr4Ot?!*xa9p1T-Od3Q*2J5iRgw&JZYqTw^G*Q9yUCGgQ?? zv`XhqDz8{1Og<015pjvIVFEIS8$fC0Jg)RwhE?GAFad1O+1F`@r#iwXttqcqXQ)_L zz9vaWzU0~FkwXWwEC&ph16cfJ zpdS<}pjZ=|z-uz0%3GnC2vsax0-1$2k({JA$Yyt2vRg7-l3|^yHtDE($b70a(AFG&g{fUEcoeeTJi#_PqU$PMrrq6VH=Cu9JLpsjls$M$H#_;GD91 zo~8f4o<+W~w3n}DQe*kDHj5_J65r2e(N;#yq|#0KoANdrUN_fGnWuxU>$BHeQVhpe z?p-ujw{qLul=TK^^G3nJUQ5CGTp(&D)xMMZ_R33!vVFz->vS;Qm9#6#=M6=bg}WIn)8kFx@ATls-HiaT(K;=8%)eVUi-T9LgY{#PBwsju6-z;TAY(?pl3Oc4Qujliz0UJLfVakbHO0B z|EHVcd5zH(?Kpc3lo%~3c8>d*WRaa%E>29H#1ND@`l5XuX3+Y9!VC@*B)$TTfm_@e zO`nKl064dL(ojfRRn<$3E5gg;SYU|pO4!1of-JQ_+LI0d_w(fC1`F^SpkEmIK6qsu zPgoGdPG(9@({k{jOa^Bn_*$5$8S6EYN79ka;mzS=c&5HjlbqqsZ~|rIJ(dB_co#M^ zPYQH$YLBs4!V}nD3NfAeyT+_pdZx7A2v`IgRg9ntu4O5w?L0MScq4($f9i11IlM`i z4m*n-5v_KB?6YEEXdj-QeF%Fy-1d2VB*<@Xh*7JOC$9)s4wIbr{_@5Z9V}$u^`EMo zbHHoT;{Zt@GO!7oucL~5C+6j47v_}YmK2l~6&Dwm6_n?Bbva35&6J0RI zur4PP(i;o^c0+e5^@wG2m4R@(i2pe?u8Kr4{E0%4XKUGI(68{B+OEYXuOEc%JNJ@(_&%foj=JKo( zt8UiCl~&{Nt#$EM-Qgaj{Sm9KFu}UWqT80aWnHO(F1P_|rpZE5bl^z>cM>?2=t%>- zLUXvsN&P(H)$}&+9?p$eJ963pCXWY^emhbeTICADlz*p^g} zSI^`&L39XWePFhN#z$-_@1_t&A8g~Ofnw4|uQ=tvdY%}10k5G!MB5Hjc*RAcg&2XR zJY3T|T=renq5I_U)m!Qg8qe>0{i04&T6;VB)@>ch{+Jvi^GP?uyXQYYdgC>}e&NA#2q zx(uuzGHBk0SLf<9lf&f?R&`W50)VdMC#w!D^w5~=2@8uc0`O3oodd--8c4+2Y*%&p zuf4F~M$$fGN%k9?;AJ9v$yrp+_CL_Spc7&uiIfsxVnhRjj{L2P1YBtdyA>rXH zd8d=%OjhOon!N?@$*EE&>2l5SeKme`_+C2ZL-L01o5MFQUo~v6S@+fJPyL$Y%Thbb zw8LZi>*ysqb{rkP$#8J}{&{g73kD?XHdd}bQ*I#d`~h1K&XON>nhUT;%)PGV0gwel z@9g5dQXsVAQb6yryyBevT)!jB0sXUza!PZ`3d&20OG?V~OLI!I3$t?b{0`3-bMv+r z=alD^TjkQ?(h@nZB&#&bYT2HX>-YMrKuwv2S>;(}`L@!Ml2Tg%TxJ(#=H~jnoh;^O zXF}J^qU`dbvZ69uv7B$qE6d8y_Pd@VW@qJO8Zrv9O3QUXg*Jn&P|nHHy|Y6s%+Aiv z%+Ji<4veFqysXSt1XaK|{M4WpGVRWUVGT_dP}d-42Z3~vbdzIm^B==o=Y6ww)aist) zhiPigEE4_DbFcMv)f2l&z<&asW%yOlXo!YVNRJ^b8Vd6mBgxuz6T5kK(p~3kU16j( zCcT+543Rl4v+ARP4cV#LtqpUV=Yb->Op=S%_3#7z8|sOl{P%TTx=`EKutP~p6-2=# zSTKY*wO@Y?;m)%_n;*J50s+8Qv`4(`n;aKY4$kW1jJU+R*Z=XRehKX+aS4k__l+Q$In%l_t233Lk>toga-bp7$t4cClI{`qtjQG}6M za*R0yHu%G|G~J1I3=tQ3XUk@-Ng4p3KY;hDIWd#Q(P5AlJ|~R&#$G18QIm9GZ{gnJ zYQw8_=C?2E_LuFis5NNT43MkMdY_a5@*Czz;SqZ<_R#|<{>?mcX3~ZHZ3SDm>BiTN zZgJwm7JzzEsX;d97X|@ zmZ{*G(vK3fW$s@Xf!LZ$MdGva$<4j>j&fJSMDyT3~OqtZMb4AEl_Gso+48V{z-IX0))%8PbA>9C9X;^DaHbwr}ORt z4g&6zm6{9S=-ra4(~N~}3q5-h*zMUuT6+FKd?bhu!6k{}!53T(O;WSAfPW7}p3k{G-Nr>h`I1igi0EWkPU8=W$?^^T#0*Ch&aCo!c zFqUd945ebTB>Q<7jXeWANfgf#wqA@^S^!S%pTMaN4A8SGoqTcQ-KNRtdQgj=TZwD++;T{6X-eXqp^gC}ZSz+9Co@Q!=Aq3)L%mL5v*9V&%OA?!wnbaQ z=J4ProD5sq1IXy>#+^qi&K`q=N)QGAb-01AgX-?GF_8jBFc{@6HV|x?;8g-w|8qN? zXq)ZgMX+KO&ws$PWd_6dV23nEyUkbmW}Cwd zevUH|2QJIq}1Sb`H2gi@#lCz|H~mzWV^!7O*; zdfG~13D{C@ttXFDj3^FRdw5uwMxQRvPVa5m zhlU@Dy*kZ67ScsZ(^dQGFT*rZ>0j6nUA=1b>>$0`c;vG$;A17seZ}Sqf6S*kj%r90 z9oAqt(6IZBH_1VM{ABau1qL!{7#&aA&=p}s$!{y%TDZ+fqeix)J?NN5aCmdy^5IOG z!4G*~y^=f-+qAGe}lYt(Nv!DYH0#8mOC~)qxbh)T`d{a)?-l6v^Jft;iA>kQX zIkhcMM3!L#zDo`1>8(;RY6v767kmhU6cY&MzP3FEH_Jb6p9a4}vw93-3Ls35%@WRU z@$lv$T~Zt30I38iQIJCidDC;HX7~z#JDO_Qs=8rX4*LjsZLVJA(R)Hy6A$w#x7eQ7Iq5 z_iCb^sx()_8&#Tp;YW`Z9Sti`B`jVsbJ;w(Bs(M&YUW>PO1U2P&-?EaA7hbICAQ}@ zKH>7k?18~VU_oft7ox@|9axYiFi^%h`j@paUC09!xIxcC12$8r09BVXfX=E)t=wA8 z{JEUQFMXIN;2F`*h`j`R&3U@@23WT(9KdKWsEC17$$(x=5yw zPQ1J!KitxZZ%%RchC9e)*bZ1h9!QQ>Jc#9C{JX$Pf%hL)m6Yu+E;f)EWQMZ1cz0Pz z80pPveuEq{$Q!r43tByMwzt6ceXs|jRmyLq_Vz32DSvJFXa; zxPQ~wwd`i#bN&6wR~erfnNi>5>_rAcdgxBDSBij}b|s~t`o)t{Z>Tgz+(E8?Wf@a-~dpAIBUavTNbaJW0EBR3(` zzLYE_E>Z`&!BIUonk?1amQ{tFd~L)gcQ2IiWqCs3fVRL>z+!ToWhdCZdn5ZO$Jj3L+w;eG-eC4h^;7ij?b zy{H66C_|%W_zq3XMwq9=l*zCy4NAs)rpgK+6Xtof(=NcwAw~-dKu<}2qi86;Dm#lN zbaM71yXaujF?cVz>wHY^Xx5THTpdJuw`D!K%Yhp;NQCUbgyKj+vzCq?+GR|F5$?;2 zqozX&FfcvHAlBS`3-Sp;{6Yxd5PE}$oQOwI0M5n;vMPdX4ujlx#$-Sz`a5ob9|&td zgd|D{qN~rIN1>Oj+Ol@75dttWUy{!J{)HtS@ILueiD>kOng1ln6J_=+*Fu(5J_fSF z9HueyosxbbkPQqBehjPvH9@)EZ4$|6lH9#CvL92RTx?T`3l=Z^AW!~ucOqxp+rfdy zJ{d>P&_8Qf1eo!8&@S%-(_z`ES*3$J@0N_0q!%#&qw~6+t`Yxo{-;aeeWo_p125k% zUAGF>98k{0R3R|nwQIM48y>QbnOlKjsR;N1O^3xLG45Mht$NrWkpSqs(aoV zXbXCjDU$o&dxj=@WjJi;26jW_#xlu=bd~Rw^|zeiZROyRG+ce>>gl^-zuX~p(yp*d z@}6}2-Cx3fxed3KVY}e=4&2_ox@6ir#_a#c*qgvLarJG(8AvASxFM5JB$))<(Yl~m z*D5Y(m0CBfYu&d>wWuh#U?QLbVV}UDB7!@j;(|+Esnx2*wpOXN)+)AY7j3H+J(EnJ z-*tla?)^OP_x@fZ$t-8ioH=ur|8o7WlasUFVeHG*I-F5p)ewTUMQO!pMMcG_MGaeG zWC`IQ+u=5-4?I$RY{OH|2?@^tUq<~T7Ybzy0VbNF#+zV$wsDnJwAx^W*pSn=C)>tFDD-9A%wbElb1)s|BK$_Q*=-?!Ao^>`f}I$gA+`o! zxa%scU6-1=&U|R;^qrH8Yq|5IuUWSi=j0Vy+^vyZZmqQy7AI{5%z(Q#`uw0t)1zlC zwIKhrb?egBBA(ylj~GjOO&e?Q;s1L-RY%5Fw+ddH}{bmCFH)xvLzG+X(DcQh#mHzwAvT z^GsejKsM%eu)Z=NQQ$MJZTiPRABv<_Jv}^&<_Kt9>~qjRSzwK;br>+nr+CoNl};!} zl=DxS2f)9r8&?|x78A7FQ9@~@_D8%|st*8tkD*snLAwS7Nb-dMYBNd?Wu|-9|LoT4 zwY|;`_%_;HyMpB1xP(1GbE zl6|6zUQ-O$uJ+nDJ zY$1%AdPoy5w+RAdfXcya;vksz^)LZJE`dB^rzTw#7M)hc{rMNR{}cg7Q3@QwOcq0x zc&bw4V4dDC3Vo)OMTJ7wrp6L{(LPh9B{iNt6NSCfdW?g;6ho0C3jbk3E%mjVtXdnt zm+FjF2D`mfDX%muHKj^Sr6vMkG*Y9vDmMbdm=elHL{&o7;%{S9i6k+a_H0y?Mu{wq zBKkzF61hZ!;t>2KD*C7>l(aNT!|#2>;&w3_ge-*OdO$6=2_)-paDdq>n=h|z}#82h>AxLQ$qu(r-T~h@G7b( zBosd$Oemm5z=Wc)U^j=8%L9d4D+p|uIklJ-QS*@ z%C~S+SBwGFs!`lOcfn0wCdfwuPyXL>6DEMR$GSctF#yDl*=x;|lvU#rV?i9*1tKI~(Qjp6xQFObr3gC7R;Jp@=0(q7Si8PXw z>Kk%78yYcW4j54>k=VQYBd%8m$mO5Y>FyC^jtHv0BLIk!r|Hp|_52h$lsF8os)=-P zv$6#K4E=qS^{QgtL5% zO5RGE8?IR~WrmL$J%|qS*Un$~+AObAW*7#blAMwFF{ux^*BP#jIv+ky2tPmS8h}uB z<6Uuvp9Ws<8qImQV_`v>3C%qR>2MiJU?9~nk(a1I;wkS$X7#*>iccG`Z;{zJ6>S5P z+MmS70;9nY4>C27iuV}S857%%%m)Tj4mA)29BZdPH-nf6_LB?BZ6Mx&AcDr?a6A63 zv0(QyC)R8Z1-;yF5c*;;UP0Ijr39%|eI-*NBOw?~3@_Y2$qtDcE?pQPJPilh9=ZxO zW0+xq@Gz3PBFPlmcz#C1q3tp9{|AzVoIII0>T?^6ki{({TTOu#1(#v~mQ$4OhHdM% zt|>BCE*P>0OutmnisvYR>)@8=Iz>;wE*p7M{ASA#t_Qb3zbqHm022m`^9Iyg!+;;kaV zItmUODr90#sE^D;2_5$OS=KYt)|JAzC#wyPq?`ovP&&WYfZS1uVbQbNYZG#k8~|xO zqz_i}Dh;AwLXn0KQmJa8A^wxjS@RIj{GW8V#`^Li(nR1FhpC4CD<68Oa~42s!cba4 z|Ktu7F3mi;6;i+4?%Y5{IwRy>QG?;@-=%^9tR?I(Hnfc*%&>lN%V3YflIlFpwW1cZ zil7OSZA1@OxV(tyMM_?!2RaRXkB&Tt#e2m9b4UEUxP=u&ziut8Ce9KAKZO!Mub#YP z#=)gDSaT4^-=VRZB!DC5IerRRA@FzNtkz{q18P@j`PB$|m1xi_DG+e7A5s_PZ7AMG zrBlzno1V*;I}?2lG5q`PWqA904T{eirRDpIP8_;57iHjml~J@5q|UI6`&R+z?fGFS z0KW!BKmq=_{i~bfEN*`Uw|{waj5c~;o!KSc@(=Rqk2zPR`~A^E9V9*Umv#c2&R!M1^d8L3!NbZf6CttSp0<36bMgQy@7t0@$+09ysbO;@ju{eam_ZqVON|B zlACL;Ug6e>McV?HE8@v*UA!sd!Lw~iI;y=;FMt@keK6?H5ZnV`D8@hW@^&MD(hs%= zStB_pJu%vTm;q~R2nNv_w7?SVA?EN+YE%GSJl@x%(nr4bN9a3t2sMwO;qs3F88#F^ z##9%et3hG(3<^A8a#Ubtl@(KJS690@s6Oru+B%0TqcKB%8(@Q*Bj=^ z{a1VZN}C)(Hh+&;A&j55;q9-|E=6CG%Skr`dfLRNJ6aiGuAe(MB5iJ2Gi3+asU$9! zV)Nq)Ry4!KV&|RBy&9^-F*`%8D{Y%elCqQRgc*NZ?hfOQZEKbTV7&u}5;tp{jk+UC zcR2*ef9@l(dA zOZt#U@S~YDV@OxTc=+O8suPDaS}-% z^Q{yzdjM7x*u60Kc+;_V5=X|sGo}BP?vO#;9S#t1hXH_vk2#o{#(GS7*r0BoK_p2q zLtTR2><`;Mc|gr-+vJ}N31w>!9s&f>lS#jg19uKJKY5~Y{UQH>2$Y^bV8sIHL>)~t zm5%-og&%tQ*Yo~@tv1L1>uKLFtWMC~!JzE9dJ@+^ys-3L^P@)^>%Id?2aUKVFq&FY zOKLT4AL4Hyji)HweZ_2~njq|qPR7Y-fEA)cT_mhVC9PSig4w!>jrO!?O-T?^(Gj^8 zu!~VK3`&wODSrgb0o{#1AUj~nTPP0O)2?y7;1HF&aN}Y#|BGnb6Uy`vkL(FH9T2lK z9k~ej01}0r#=ulM4Q`$y*eDAyx$ha}O&OVol(uP#_=Dl(d#DHO_sT7Di?0^rN&~f5 zF)Xm;s<@@Jne{5^;mq_zX=T97k^$^^5D7AnIh=c7&q};Tz@U1AJ_c5z)x}WxwyHfptw11`?M9k zDJdRLOZ&HM`w6XmC>aQ&G;>Il_P*!q^oBuu3^~n6CiWL^vWv76U+nGM2E!!;4JtRZ zm2Hrq5v>hNgpIW2FS#H|sNnFestX-0j@j2dI8-1vAWx9)?6=3x{_q<-bu+j(&i4Fv zs#)o-mF&^4jxUFsrk-q%83)kaWiw5vs{w9X7bVJhtRAB$D{np<~s{BKg0DCGx0 z!Um*C6NWbQitoTx4$}s#8CC3Up$k`u&_ke`fLe`u32tgkRcBZZIC6`F-`J_2P3LDT z8d-g$D);a3QXHJlk+HO|1=Ct_Kzu(0EkY0NV=9%tBmeUQ5~5uAC1nqX13eA8n3rD& z;c+b?N2mdj{(3{ohOG2g2SZxI`h>OQD=xnv)v}6AS9+43%Jhx86=|!5ME+yy#v#5E=mNFqGhf5377U;@Ojvha75 zsU|j8IYN&3enOc}U+(Z(E{E%?!F|%J^v9+iIc0m;rDAEP}SKI=OD!wj=g! zOPYE3Y{EJ5Vp$;6f~KVDgws9k6DKs|=ZVkDI!!}sb+{k{Qo1LweG?6!XBh2gVFRDHg)Sv(VewzrNWkF5;rS?Par{tIYM6=gM>c z)$G@hVn8tUFcf@>DlA~^*b?U)TB-gp*g!((QA}} zA)M%Uy!VuLg4?=|j8KMwujB#gh+!B&RMMT=9txEZ9B52B@)0I=CTzJYa4zJMG7&vJ zOX;ZP$0#YzWqZZc%$c~Y53uybi8Z#2r`*HP?lO|R75Rr zN0wP^>XCB$A)}IsYp^e}ByR(G`^r|belr=@=|`pYejR^AtUZpXT8Bxi0)tN1kKZsx z3a)ZDMX+Oq4KT6L37I}DtI}7COFs^^((|x$*2Wm}AmFKAeqru)5LP~bC|bvJGyyMi z5O|*Ug3C<;gt~%Y0hV%*`#5hZ4ai?YN`fUmMU$@0%Omd#WR;fqaQ9txWCh29wVq6d zdr6SvMx_G5kCV z7El0JxuT~7Q4b71WHW3I*wACc9od7p9Y0aATqgM&vu5 zB2-2u^_S4LLMg55bNXkm%5#HuxLDRvvob4x5K9(uAQ+j?DZHmB&V;Ll!UE^?8;GPp z0#|dIauIHN7imn&n)*bul!O~xiAl4gkeY4w2yJO}1z@6c7k)Hv?nk@I_V3zV29Tf` z_5l>N9M*k3B<1qX2)H~Myy#UL2VUZJ zRFL=j=2>FNsao&2Z>EX6Pv08nrBki6C#I#CZE4x-9LD?&xkVc-r0h#KtCim-=P@`s z$avE4vm1oHapPCg|IQEO>Fu?#zB|c>f0BlS{=9f=#e+@XB|gl)yYk_Nuh%`y_~{|> z=4-`@GrbsDbe);Xu!kp{O=p^DR7DRVu0yLcvCE*=J+9c|O*(O6+9xH}qFj^uF=8Gk z$!{2ByH<``KMQ9H+EOQ(D;r6qDAT zs!> zD#7){q-|qQBdy{{EAvX?6ZwffV952p_Ia5)yOOcl-3T-mw8$J&d04!2&ZfRXx`I>g z)A>*?Ne0DaW(fSBVN_TFosj@by9YbW->LWx_7$@qSqNEwkg^aTgtgFLPk75hf?s?V znu$v8XgD*YeEj$sGscfEpK<0)dHET$JC#JkDn^nVGoM)Y$M0CNGkRxq!J-ZGbcb6f zP@6`8RZ%;Xq?xVF@$*(JipIZ1E9S-PX0}$69E#egsFkFI!>ujzHY_T@l{;7Lh~KZ9 z`NV;_NDY4Z1d??4iFw2Rf*m{YZ%4uY4Z6cmNKyi@#7;*oXLz1gv-Y`pEot%*VL~2+ zJW!ZjN|S6|P||L-DK2T)PZe zQc8Yeu0mwJKV4KT!3e$*vG$^{pahnqYS<<6^TfO?jMKjgmADSpPbz1blt4uH<|pRa zvdq@3)hTNd+>eoj1h=`+n*8gweAU2bPMEU4=&N>fd3h|5CZWiF2NX2j1f z6L{ZFO)WoB6#IzWE09lrd29>OZb{z~zcH!gWYMb4zT)Z6+o%hNU4AV7{Q2bOZLxIj zgpnUB+`0%I@29$?T0drGWa5|wX&FV1Jv!b?2N z{^{vT%mJH;8a*7erh!BaC=dB^NMpQ?7DPwq=RN^^TQTCR0Oqzh=c}jyh*9K?;jM_) zLYBCf8xqr$C8v~S3w8W>@zGZ;;ZRO;y+vg^AizL_a>aR&oP|DXx|-&dB#3*i2KnCn z5tN>CFcuLx;nD3P81dTG&qkp*<*q97P=G;5kH1iT4=0p5SbyCykUAZc1UY6j2X_LU z9W;2N;ziN&v{;Xnmcham~ zlWeoX0RwaLc6Rug370TUu~>h_0`kE~ZJ5~SnsMZC&K>G3Uq$U}^?4FlwPHN~BdO9> zg~hyJ#HNdRh02ZK8mg>=r9+TsRk~;4*VVF8sljoj+*yN6W^>~9Ydw8wFZ!FVCgw}x zeqP7@4D8PRYma=Q5mp0jN{0wmNQHVvym?*lnk0zidUq>b>Cm%yQOD1zKl3k3;pUv( zHmpt*v+1K$ox95_@hz*2EwJAn(6gm=vx!~=pg8zcfrS+sNP=Fm9 zsYM@_FChN9L8$KpSYl@mq#7W{fjc?_G4vl$=1AG`oiGrlG8itx(CMbhRd5Q&0QO}6 z^NRq|A0Lq9fXt)6(%-+fnpJQF5${g~LJthJw^8%~NWO*>?^Jah1#1)aB=!YBt)bmQ zCMpv&pl3u5faA{gKYVTHucRruIvfHq@cxl-SvFQ^oG$ZD@?q2W1JTbTE1=Ls|$-tiv2Jr zDm$t)wloLk&}#9$Z)fj)Br_8YF>e8fJ*~wWH*kos@A{}Qm|?xfH%~cnL(YIecHL#lr8*A+$*-p(Eg*t2ahKI4p;g4$vc*7Yt}Y zB6(_1ayKiplxPL)e`Ca7zKc{-vzOTSR_E6|JvWk+GvdNq5){Iv%Cu!vgNT9P8pB8P z2Pm&FguqZ1tPDBu-Oo}oR#@bfB_VarXhL>LRY zIT!|He}Ei4+B-COy}Mp>$CKBP;iwv=2K=M=X5UKmM9+GZr2mULkMXDK`%Um+kGV`* zQOldo#^>`l#Vy}=Hs*74r&{>q%QIGF#+&=5j9R@iVC99?H&e_w|M2^sUVOf2xjkQv zDd(_gzx_ji97ALI>x~XexYD}vdOJJFTE+MujNarsPAvMNk3W{PfN9~=!&An3Aim{f z9?V96qSk)>VHUGheD_XUe8=9I)SJN4{|%rP&S14W3cO!(lpFO z0+%lv`DJpQVcI3P4}kI#5m`6|C6W8o(;k-6cqf z6{&jQEcw2t@;%P%b`8+JJcEvV-|15*%j9iF?Em2PMw5kVi}FYgGgOnwDDs0vmYiir zH<3;-y~iKR_#BoFKVSI-=}w-MC6U+puT|oY4|;g{*hJ&Q9$xKiV&uaeUWhYrJ?u&k zcKo@MmqsN{!4LK_exA}=Nx1U~@g4RR(NNw;a?hk*UBPeX&qKqWU`S8OSYx&7`0XO| zOGhuhO6>GYdoS!w{3QU0+NHmQFx$mlzqEj;Q29$BwjciztSct-o%=}?bJ+0f0>Eb+ z2VLz?5bg?dIN`VNm^aZ9VrW~S|FLxvbe9MhDfb+}Eb9$(4|pu}^}c_ipU7bXwg}?N z$0lnfoeAa&&KgQw>2zp+9e1bSF>`H9-J)=e7Pb0U-|#g7%@5vUy+RqxLs=SdhB+8* zM^6ekU~TZtpM63tq+9+A;nW$Ri8vV7lyXCVf$v`waRzo-^?Mv2QZZ2QtKS1o&vO(B zrdDH96n<~++Y`eQJb;GYz@Vsmf<&UTIP&-A4SG@nH6_W!j%38x-+K#~i}i5mU@mrE z(URljxJJ22dSEUNoCqRJIy`= zYXTSh)GOnH+O8v2s!H$lyy z=pV?*55|&q@(a?=*Tl{z?fBzj;?uT%H*521R~QtF;*F1`eUDFWO^5$nJo|Kz4}TM0 zEz14X$3og6=1pw!tdkeU$G*>6fVPc18=rhR~NVj>t+CcIX60eA@g8y_xLbY8@N3 z=S8?y{_VTXUllTkBVSx&G?;Lp8+DSuT!8*Bf`<*ED}X^d4B4m>bv7OeUvLV$X*hsZ z39{h90iVM*7TN`Nj(W|4ue0Z4t z@MVr5f%i!kM>&oDI$eexox_}-o(9T??9$|7>joWChzZWDK%2YD-N~?V--$17T!?5r zZQ6o(o!s2@h9NC2Ej@r&2a26t`fznviZwYtWkt&BlvT+qb?66)pW096?t%uSQ+#TJ z4I6iE+_e$AKDx4NyRH;o+Be|Xh*Q&WTJ1>8P0CHA3B@(8R!v^=n9IF#K#~{Bi3eSF zUwRA=aqF*;zrLcR(L51{DZ?2>%vah5VB}g27psO8k#$H^NTk)CG_^MI3#GSLolShr zZKh0I0B80CN7=7*Wd-DM*29vn=-pKYG{Y+TnimKf#8^jy>RgEgnzpt|b{HtD4sb-T zf`oA`?ZFPuVw@f5HnMt*_$U)lLcs9o@%AX|kLQQ(8Tf(&-v|iX8%gs2S!@1(FEt<7 zkq-)llj!Aw^BB((1_fj1eej72fn|&x7&ENCdYYaFSQ+M(dYjs76#g|3bE<7}C~*GsFn?GX$|K zg_;m8p+8tGo$Ti7U2bxfHa}6aW_em?t7Y)3{1<#T6#0YcL$uWuz9z3CGv%L11|ypP z&TK+PaHONNL;asVT0HspDP0;_1-)t=lN-x?)8IJ=ljIi2G?|<H3n%$_Ub)^tw#^FOn|-rmC$5Xfe+4$%vfkQ^zJmj;TyKinpygc1rrhGFP5sI1zJX z{OH)(n?M2<32)@#h&Mk8SC`WyP{eUs+7L0ZHyLw(6>2s-%h z;}sm!%Zt1wDIC@d0(u!u6iTrJ>+GS$(zegvJ_{yGLB~H<5J;o>3Ivn_@VNgKMpFx; zg=hT(xNZ2yeQ_R(AT)-#jd&sufo`PnxMPLsSlt~$({+Rjq;iP7!la9+P#@w$gC6DY zVcL^-60Db-3+AFClFm<&vKlb{Okb&_0n^`yFT~o)8LKU+dG_4A0Gxc$fGGk1*-CO5 zDX$?jXvis;=g*NACZ#Vq#gP+2QOdTgLUZOODQ{DzF0)`ua)EK*&d>H)8Uw~b;e?R$ zV)WI}ozPQiP?j1N+m0iWUn8b{&=I&E+>Rp@;fvETI2}V-v9q?T4)co6N>{s!Wy42Cs9ODdjO9}`||%eE=4KN({<7+Sp8hcmr_+3xj*)V)|9 z7A3tFs22w?Oc*Qe+ED4WrcCpIE*zW;RXA8zZbEc#G#p0I3ZjL^N2M`MnU63EZTp3J z@yMiEde7Tg>pTF&ui_{(#{9v#$xw^4ATQZA_16)-jxwdmXDiOS4ED)%>;;J z9eQ4gtcS?M95HG4>Z_&K4NTk4wcPVSWx!`jTO%k?28;{}B=>}E=8Z4@M8IPk!nE07 zBs<7x(nkhnNV8fFa(A|yfw}mFQF-BJAO_h58T5%Bbh6pqm8F6oP^MCGR001=}U24Xz4Ig#kYY)>)onY5~ePL8MWJ5SFors0N z19)iO5JZ5OeFuDBDZ)l*c3P!M-3sH1Q~y9PwQ$*MN*m{Q)L~w^V`Djeh6q>!3N*y~27?~Y?9$)}XXa+Y#d?yPeTg^WZ_%p!;Sk*(&P zNs9_UGAatYY*p;CEK7y*ZkaN^K$(Kr{@+PsxB8fy)qPIZ9fb0>C%|K+I5yFrX~bA( zadHVp1LOJ)`FlUS)8pQUr8_}DH#ygN(j!d$K(wFl{=8&I$?aYH9v+I@8h4`P`kt># zN=mMz9J;!D&+T1@c3&y^e)qA}c^MnGAjUH3QTws3zf9^G`l&~ZcjBPCugu} z*fr9xfCTmWEKTaVbPVJ5(lcjW{Z+n=fxS3 zB2Y!-sWhMM+v{^!ycpM-J=c=$eoHpRZ8v+e+*W`ate`gtRJBztUP*5dsPa*fE&~ne zY4)@Gp2eZt0pOTW6~BQcq=rj zEqPcTIVp2RhK1K*4cpb}nh!Hq<`>gjX;eFl3-(!y3)dxVFk6>svJzHiFE_4CSeuZL zo1CA5_k|=IQZ&2QZ?-N8Aby}=NU(XYS(~tGz129+TDZq@>7$*y%1dUPjGpwa7O7QX zt1}Ze;-#omfubWl%V7~0YdpvA0Wx`T$HM6raQLkcXw5FkDo7|qcR)gG{>E%ao@K*Q zP5jEZb+NS6s=%2GcOA9R(>_Ob?LK5CUH#}`UACB-oMTD&NQ2U=yfW6VMF3-L!s?}# zeyH9OEj_AR>G|=Ja`MCiW62;x`L2>k! zixw5E*k;L3&CALYsph9rZCHXk;MW=-zaAw@Qu)}XeuNi6Qid2%jaZsgi9^2IjJxa0>{DN6 z5~x@V^*4w$&Z)n_fh~CR4$C#%z(=Lptu)3RPHi!yr>CZ)Bcds%!b8_qr9+!c!FE~- zS}Sd@DYU(!1*0YN3_N(A%~V}VDo)eChAmS@)8?G!IqijO)6)V{)9vZBgV@v48@7Tr zot|d)TueJrdYTUVX-48UsUOsjoR#uVUz{N;l%?=n$FzRj{~KTFXA>hd_~!30@`clm z3agMB2~4xMaA0du{+`kR6Z_-}4tuLgmln)0$F?qHj}&jlFsSYkW^#@hW|+8i^6V%x zRvc1AN6oQKFwzs!6oF~o$d^?u+=wL^a7bm7G6klk8r5i%5UKqR(;?5ySk#^~7BgdH zbW$%f6XJ`MkJ%eX=e{#Odj7;U7CuZZtu!+oI+1NYH~HNA=f<5oNhT>1KmFvV zt|U0=(=kK`Vu`Jkm_P~pbn3Z-UyVNREA2KjBemg!Ec3@dERt%?OtUdIo0nRr^HG|g z0s{2wJ{n$?n^?T zYm|ItTm2E7L;%s92j7R_QRsyjf_)#d-;f5&31d-?kzcXM0ZnS7d459Lo>SVMB5!DE z@uaXordPM=J`9=}mSdi)9ru|AuL8rcN)XQo^vYO@T1yXS! zIsrCNR@wp2FN=E8lM+l~Co<0O13Td=hxYnKr^tjb5a8_2Y@1_gzMAnh@f zz$;8=L-8lFN825Jta0kt9Xr=A-(o4oDV@r5Dr_l=?xoU&sZ^Wy9?CpmB>Sj&g2@NX2Bon=3`pc$paY8PM9jA0kQs~OV8wy)PP&lsgr zHC4qZrCPqf4T+no?rC#U5#qBZRnyje@C1ynIEsv8Cuf|@fkw0LRwH%&@z&aAM8*=VJX{25e( zC2~1wyOF#`?YQ!6@`md}@&>53^!zGkypxj~3Okn_ICbd2DYJ722{!OqM`x#hU|!B9 zty`azYFQCjnx;8hCSA0Uzm#Ak-nHz&Nt)Q?+6~I8(}Loqv8Ap_v>E%ckE{BjyF?cH_Lrdmeo(?v$^&V`^ zU4H-NV_g5pSDM?BvFOj%nAo?RjSSz%9hsdNlN`Os%#S{{u_YrgUT15hk6SSlSlKm9I$L^saZT{7Xo$SPYN#bA}oCtF?P-`)ib-G)lb-1||LgJQ{K&Y)-EUI`^L1Cx+i?q@-&#yxfNF zk8B&3rLDF#bHAzl4N|xqPQxF_m(sS_Ht3*T{7*_o>P`VCV{6>*j%<N&_I<^||%f zk(1*v^Jg46NeO+f47){tE&LtnP-~`z6}MHq+xeF(!)_>VfNY_ut~P~Lf)&HR%J{N` z_e`2-Lw$j0dHi#@`l2+0C-h}NbE4o&BiJ4MS*+*gpzD+fP9Svovz35FK##l&lFDA# zbw>81`@~_z?#mr_xhv)_$KU-wt{~YKUYiJ9-Tf| zYa`r4tRdHiX=5D=D#1G2bWj-nVlVCG{*9KthVAv6Q5#Jl#l$I#EO}>P+cI2tbWpdd) z6$>iDcG3Sb@s`5cGHn`763BBn3MZi~cWly`*p}*Ga~c8bp|m2HiS~yc2T1tzdhQX>ezL*@@;N87dF>cu zqt9Xd1l1bg`G~%f+O=Z>tN@Zg??1D(uwjG#<9KakjgW(yB9iye%cFgM?X_(s&?jLCMr5q|F z;!}x#E;t)G8xbtifK>zcZQSLd#_QqSPP#Kv@Ak|cxO}C6H<%mEOTg(3^Uh#_E-$P% zz#P_+!wQKj@V55jjr)C$3hlszTmPcLm~hVMkyy`A?=+3iQY&~X%3*?-*}pjQ99xH# z=N5Q&6l~-3+yX`|2bk*q$&>8iFt$?rgM)Oy`Uf6M++czK*5=Fra7bopc+$t5Cn)LE z$F|rb7Gy)5yP& zHg;q>GEV7oN2XtMth5B<1HNEHp#xPzP=QpEes@XOUCalSB#e=ocVfQj3VW^&UCC!F zX^0ouXe2OT+epJ+g!RoMEWG$160b_q;1JQtJ&87yG~~aCk(zX7Mng24-kAw*=o>Zw zeAmTQPzY_3qcbz#3km-2%naj8LKQZ_pv)!V$~ZE5pqXAdF@y>7;=-g=A&kFQXtIK6@OA{ zi|tyB0*#f%N;``?=}#C-TpnaeTdq#6RodY=&X|?$P6wQN6jV|d*%FW}*d)kee0EwI z%iGC9M$&a<#`r%K#maV%2>K4=z>3k0+ z5J)BIeh;P_LjR;@J(&Tz&SZv3{Yxw(P3p+D7t_=7w=iGLx3jfU5xVtXU;H=yRZ?~@X3{Jf3qF*gnZHTC6CnKEs`l)fl)=h* z!*^xyXKD|yfd6V~k}`wBvi#WT6R*xCEX;@K90F%c_BIe!fSK z9(Mrg`+xYsMKo1N2p+P2dAepN-~%0Y{!S0gJOKT0{?45{Jsvz*ARt5DKFH*}b;9D|XKrYwghTx}ix85xQJH)y7yy!C6|J`d+gs9@ zy|sg+$9);&do=&l^E4k%X*9T5eTj5(8a)6-aqeFvIM!@liIDu2xPq zEQJX(7?Gl5_O~hQu(H=IxYon`0gn2VYt61$kz@ryH-u3QE|D_BU{2-_+sfWo*q@ac zBc2Ylp9m9vGGp*f%aSRYf=T0Z->YY%U4~en-ekcZ%T-JdY}u}oGBW6U5<+}yEY|`x z{9IeBP9qdylk$cRB`HR%)nK^n=Ev)BA5yv;umoEa*{3tfpSpEe;_B5bSXv^r?9ceO z#nc!h_`N*tndK1KBVdZ70ke&P2BdxvEMO^3?$1nXeGD=NB@>`aCsCLU))>%NYD0zg zP6seHMH4-7NGa0o{!BBkd7MQ0Gkux;(whUAftc$&-Z2WbiRIQw)&WeLDS+?A04xgh zUJT&lg9Igp_I3MeZUrk%PbeniH7rLz8NK;;i|i}&8fD`k zP7aOZu*jne>+8A^v`l0CJb}wSB;SF|hz^6eDWKv)u2?|OpNv;V|7uop>c)419E+rG z4&}+F0huOE^^by-GLW(Oj~9wOCxJOa)4-nt#BcQM>4D4}+y?@UY*ESwaZ=4dCiwM1 z9Ma?IOzMlVH_@+<;dFt2CIt^-dXD(l6Uq)HX3&2GYe@ zc%tIfrxya{6{CTFhInfW{}?NmeY0%t74l3vFo@|C`RviN3#3B0@(n>)K`_<_=IKMD z2=oI+Sgak5XR6;t=e}Dpl5^GkD0IHAXg*eavYRcv{NeeTr!icM{-i1Q2eh5D6_Poe z3GpESb=7Js1I7FU!ZDuC8^|{f^psRX4Q`@`V9)a%0)tO7cwjOc8!-X`UMqwyY0e zs#KP*c0v3#^a(2}i?ICm>@(C=B;`w>0en)A@8s86`H|Q z@IJ{Ge*Rgb^i)DW;-n@+n2-=Sj;ZL1mv)acX%{#V-+_hytoh6A*453XOo4~885yn& z*WhRj#l6Nz9}QtTTkE^c39W*2G|llT(&{3+l#gW<@c~HNM&kRQ3GU5fB*u#BXDz;qg51u5TzQG z@XszNd<(coa7V(&h|vu?<4S?9$?nrotb*|G+;!dPEoRabVpt=r_gObS(58 z3C}s@ih(Pau22Xc`%Cb44SNXnh!xy$wnj^a!L6yp7!Y&-79z5QtsEUz`lfNEEoqI_ z5*GZ%WX0F0_`Y%CMlcBzE?(YHcFJTS3GfAa{D&w39c9TsHAg`?mP#p5d2=n0PF@T{ ze%_8%C!^NRU)y&~`iDAd5LNl4FF6{sU)r9#dv|UTf_|E*yaJ`-;mm4{%IJVCyZO7! zac?hGQ|bG6nU>yaRp-1BOn`TeDo`?xU|PLZfh=?jQx|3~cdT?IUq~rfe`w<750^#G ziVjO01|Ssg6Z0nrc*6l6Kh=o_^@h_s)wYEU_!iGs{Ex6BbgRWa748sIe$G&lZ@InPntB6 z2_B9ZhRqqp*^+cUW?!GoKI_*ctw~B;wsh{QnSjv2m^)3i>DH=8lP-X-S@2w@nzPC_wk0T_4(WwgFH`T82D z3}Hll2UIjZ)c$>L<;mcpZsY|A>t;%VIfL{wBoteB#BWEL)i5$2AC2dI!R3NuP|VWt zflQ>TNcv?ob5-LSM&4wk<71dvK8m9fzzMABCdUA1QVBYVNTzo$3hl7CTcZ0%QQ{_d zOg+O>=|fJA(b_q=WrSg#;GrCX^oHr1)gCO~QGOzT9Fwvm86MoPW z(AELeiM1q=lNoQ=AvGKaugE1JJ*Z3I)w3T$dOKuCi20tUe)aHp>Q`0c*`g`1PS=jn zs0EGbH5EX7cpU;DpO%CA{X6PfqT+ZW39Zr014Bxs4d>h3mJe-evryjEvf;kT0N#3 zdN-m84g}ei|-hl&qzNw&y6?rlg!J#DZ7MRWOrsT(;INN>$rFJG+ zkM|ZY`AlF2Fv-%G3Cz;)ctxXiE+$$7U)*cpxOQfMA9LhMtRpWq+gQE+^Qrv;Mot_5 zmd%{3<>T+I{bEvo5GOe^00xrLcV~PAc6Q(nr3Mq3O>l=iM{q^^O#-EabX8U14L+nJlk2&g z25r3!N;g2`_^m3C8P%9H4cJc#j~y%gM5hd0X#m|MWu3IRs_N8;kS7Z{k_xu6KVf(! z2Y(tZ}@P2&IgbbgMt-4(E^re`&zkypu}j0?v6Myh2Du=Qch_UukSh& zmIhO<6Smp6W^c35axwDT8gYNtfwBOC^@61Q_nC%PJjRtN0}l2vPMc<33P0P$n7z}+ z6^u1{0FiMNmPWNayy_5abN|ElI6RionCahFd|7;dR;St@S_Ra`ZmfF3Zr zx0g~I?yJ3Z+SruX|O7LUhu57us*H$Hc|QE3k23XNz;=cFN1n2^qos&CKeaVEsr z7`nWy-vxLnB{ZP#7A+dAgL;xqAE2}p&0Ei(Jtb|L!ZZt&InLdRt<{l4P2R!}vp+P> z;DWwr|HmB5u@%%S3>E}f5lN7RY+%=|u}9ki_`9p5hf^4P^Sh_$3vz<@+P#%b)=Vs% zf3hOr+J*C9Z`zo=4qzLk%bLpQ8{9qh_4rHSdGJl0l1isCt$R|k%G%D_ku%4SjyEem zzo}V0;k~uvQ0s6!(&6|wPi7ank>_3Nz4BiQl-I}hbs z5GJO{aHQwu222(@gI}HVXOzbB$rk z55`7qv&di97Hcl{+}pY}4U9tR2MbOshV)5Pve8iNY!a&a4!m(tM~1QIKH0qYm_^Q% zeKcR3F8}Us0Q7Dh(I}SYqehMBZ6-}*hb9x4@xlPoq|0AQlMQB~iwnM|G{6FH?fWUJ zMV6NCupZ=zhW~@87PbFY@ir>DcD)tNQj5}Lb%$1pPe5F{H7+X-*SQyIvX}9*aA{H6)v7f+u&kQAOmkW~UUt@4dE&j{ zYf|XBHPaM>duL(*@C9JaS)nN?-s#w7ym}!reA?0(A1t!CGu=%zE0#tlL>p^|u~TQ4 z9JN_3ZRA#~F63T_ztBw4$%{29VyeRtaQV#X%V&?znkbq7KgQkzEQ+grA9jH)?ji!q z5ZGmB>>7K)#9pJZS1gDXkd8=~y0oP&orR@$Y@nhd7!^fh5{)e?iBVsprY9PWB{{pC z#rL}h&HMg;-}k%z*LN-K%$%KaX6DrAxu5%f21T7l5p^)M3o~??V2+bNyL|fWm9r9{c3lC(i(MTBJdZxsB& zr`!b#)n8YD>X*L=lu7LvM6|+1h70n6My-4mM2559R!Y>(CcuaJo;PS8AF2~32T_Gk z(%p}dlh+SCKI|N)jETuek3kg_*QwkQ;w}_Nw+o+njk-1vwH0-?co#>Kdn7{BP%*e) zjpM=Wwar7oSktgqTknl(W6S-#3cQqZqEGS=1j}(>sDZ4hNj#9o3F#)0oa)Uz1q%d3 zzsOTCVk&*QCT^q0Dm?YA;97bFvjllSKyv*@ci3AAgq}kPW9}=C-U2{!M^7hD+N2a! zlxFE`Jq77bA4~HKa`4I#nT`tKYvwwz1_|2qgn#_V@ny~#^3 zP;f}E@)j%={Hgc#7A)q>F>)S@KsIYKmXm7|`n=hg&d@^Yflndee){X)g3-1xN6?#D z>@6~dY(GYJ0LiDf^briQPfDLd3Ndc-z;_|9&cz>-q@U*_m@P=sC;A9R4xJL3P<*xh zw=Zr=c*9a7+5PA7R1yuBO|&iS<}rpfBt||1Lg0e=f`92Pd#izhG=Xc}<7uzBo231YN^+eE^?Cbx(|u#L74*^7Ruzdzrsr zrJC)p>v5lbKX|(B%0O^>Xm&Hg9HK>-dcqZFQJMKe2>)5 zDF%E@Z}e{2bZVRR!Za#YbuVmH-0IRpVLdi1T)QW z(1I|*3^f8d3@*5P7YuJ-pZkwN98csgs4(zE{&r79!59ob5eH*pAa(~OMij>Rh)P2m zB1IwR%a%w>D}g=WnP30A4Fv}}2L>q2(Zf{eC1F=Yjb0|DVKnSNCjVhb;=LOD_~~sv zGGQ==<#K@Zjm{JXCT3?$K{EABxM1v17^GJNlYoC1h@s!K8ezq&VL=wY@uyAy+0`#x zFhGr6TWM>Fx>{SJcZ79JCv>8|J*x(*+W5;vKgB6qH5aIVTYSe)p-J$0M1yUT(I|4%|nkZ5x>%mV7N5Rqo+ zB&ew)24*5Y>z7G~s}N|QcZ?7yM@~?Y2`X->sY?vK5?;p_BmIVkqDt`eg1Qv+$!~VP z8O4}%xhnm(2!YBG9Lk6~9Z1%rZJR@;<53+b?~T0C=S2uMT7u(KSg$LuZ&bhm^;d*o ztQy64I}C+15NghUi(yF&6k6f7b-3+L-0LIzPU)N1_OQN^?^No7gkli<>)=z($j!^l zgWe8WP_aIxI3b_KR8c3)PD{;7#Rw7cyyzu~)QE{KgSd`&fA3U^{*fpG!a-jXDX=$# zHLE>RFk&h1^?~U|*BcbV8z;7-j3MlnKg&D}I_=+mnedMG0muT;qvQV-JpzuU8cI_*Q7dTx(ktq>0ZKKGD4f?}SAp|6w0S7hanQgT*r86_An5J_Q1yQd>jHuNM6EmkW& z{f_a4o3zT$VYiu4h#z~XUmwL+f^+)9D8UxX8af{8Wm6EfHD0BE8726|-k>43P#}J{ zMI#sC)a^#P3@zEEEGJ_kBJdX1i{qN-Y(d@$>N;}sdJN59~2`Pq=vAzVGh)b z!_XX}5OF+BzwV{+5TGo7ycB3(Itd-0024KyWHRs~45V;O(iWv@39tHSSYlYhOGDzj zmSj^UjUdB0>JP#uGGrK?@`%n?(z8^9&so|*umriyDl+d6;`|2(vN3a^>Fg44(Si&} zB_yBIDYT8Or>~X#3&JPalx)D#kZcf<&xk+fAEPm3YM#lx_2$Z%umQnGz>;NLjyykQhWUSGcXvyG-0$LGI)EX;+mk;c$PSd3-%w( zJ8<-HY>Tq|U%B-h@q(!^$|p9!*R#xB85ESJ+09jmt8^vRHHrfv4S|6nA%PJkkyS~o zNhyvG%8TG|GMuunom$YY_JHx9M_{>tvK|Edy3r~_mm7wbYow^r1{eGP zZ<-z2#Q{=GiO`&&UDc7WQq>bE5fCYWXn2IYo+9iJ{OL?xZ%=3FdUv|sL-|6D9m3Fc zg$?fRDpk=|9B$|$@hZ?=c8$PcLr}!vYw2~g{j5KmAW*4mRF##5C3;R@nqQew$%FPT zshZMuH~4`E1(u{$7>e2PE`4$D8hj^yyF>ibxXC@`LMKtP$mECNO|J}53m&*mOgwOt z;$G=-e*Nv_B@C^L4jI99ktP1-c->DJ+nkKU`-pn=o47LAjC)23R}^<{y{v@7(dEvQ zmx?(eHjWhHCy72ZQ2?@@jZzrloUzbfz_!Iiyf!^e6b!IHbD6B?k_1d&TmV-CosQl) zNiaf8lnBrwO8t%`!Px%$RJv4Pd9R3O(yL^jN?(-(ToslllLWK*R|xtBc*O*Ik|apz z#Rf$t3tYhz0J9?^=ybd_5ns>}*Y>9L^lkt=Il`s5+hxQo00w&#EEX?~+M8jRBV%A$iw`y7XnOAOs)FudK_k>6VgMg?%= z%pwQz!k(xRqG#;wm7QS{F;1nAn1F>-qnwr0Gm}ogO9js|pEwZ71TuR%S(o)V>sG!!xR}_0p>iQu!`#MzfQdW?60a|f2ihP-B7a1mn~pQYM30f*K|nOV zf*hhp9bSp(9dciYoi}C}R>4T}my;nwNj!UkBI)m>haLlx+Zp5@&QNm%=JE=0$B<)d zw>eYj6XENdJTPQL`1=XD^yii_CukpCghPp6w3lDJBt0cLGg%oNTGp7zC07UC4!#~u zEFE`q` zBMucFE>!lBzFIyg7(B?jwyR%8-vRvh(a>OkRz-|y=$s(08OU8YKQHfX^W0+ zJGSk5TKjR#TPHh^_nm14$ms-8@4L>L=Lj+wR(SEt2Zw(KzdqR3CeZa0e5R~j&hacU z!e5?#iZ?h!@i_8<&ux|rF7z?YOGwyxKV3cj{So(p^yv{hQE+3f12^#mvaYN4#?enX$`MXDZ|ruMALI(! z35D5o0+J=tx2@|Jw)e-KYd;Q~ujFgl5Rj5x0h-}m4Feby=7un^{z1Rng8aBfrKQed z5KTKjM{{T#!jO4%8GxTt)QH)|;6=QQGE=#vxSTyDiKNd|hqSzci~?nmF1IkBYx$(6 zwzf=CUe{85Sb42$`|7P;dsYTsO*0IYXiMw&_?E9zuJBF_jp5L8W@b}iTUklI>vs2pHm^(mr|XulyIk4X-j zN&co*c;*Qu1%+Ve(d)~DS%bN0iLh}S5r>jK3e#{j72^>sZB1WgC*>sPBs*qlMdiMq zZMuD;>xAoHyS|oaCzExfNFi&yYWk7U4kGjEC4-htPDs+S+Jq!cHcP%V#lrwNTdSz? z%}3;-zPKQ&KB8FyM+72pcOe725Ei`47J{jVzJ_FUF3ErL1?hi@SY86y!;ob-#-O3C z%%ac(dGd@IJa;^`VK*2Y&WniSm8sO6Gu;AipenX(4@)135)xCBG@PlkCqoz>T^_Jc zNvcJ~#re8??!v!>q>WGFOI)?F`;JPb;)x^eT#47##bUJ^I zPC4WG9CWaf1!Pn-%KKCWnOZ@H+$5vet7PD@=VZzmiLR+x*Q_in%g~f@`xAb0^;Lwf zr?V0~SWQTV`<^I?IzA#Jdh_Pu%}RA#L?$39G4aV;HIb6gDe)gTE1XL{sGq{-M;2}^ zkC!CsYcfkuohm-1tfdwX67KZry;pB2ZtTA5 zcA8C8g@j~!G=@m(LrVO86~6KQp`mPWNS1p;h~%h>ET)T@@``+n?VhTicA|+?DTr!4 zu^agmNB*gj+@5!Q)DXoGk5TjIvDl2)mumok{qIq*a}B+Z#%PCv>_E?sp!K0|4+NIC z-*q~f&Q{Rbi?GDze@|d#cwgH@x?oZzIv&`f!-$QjbvBSb>IlqikASAtLxV7;@yV-N#Xa*;FW@OP+P)~3}3CiLdkb{ zS^q_|ZUBu5 zAYB$JNPtM!uUP&OyJ*&|Np!LT#!1t@Pz)FsBf|XzvyO1%0LHicDX7Ln6CM;1 zl<%=G;?LQ4hn}Q;CBeFe*ak3ZWaSia%_S8r@y!zA^)F^&FK6a>I+lnfa>Ym-nHsSx zA}G&ee*{qsdr6(XpyMUMMfI_b%EE%IoI)I1-lA6bR(y2UOL6DEAQW=p#fEINoFxC2 zdv;dIH#vJmi_Q^V&)m&YENOH2aeP4(2;QoZjTCONrSRbzU^HrE;5e%W~Pe)#K ztCuu?Jhx)DQr_U}m!9I!o!WQ4`m=)0{Fc)xotjR!mh~wk)DygCu5UVZyzS)C)&99BZfg;!tmm{_&RhY*?C2r+!GQ% zme6w~ZM(}dOEb$d)Q(zlHXq}w)mje1YY^Th=AB&K>4=MNb&`B_d`_IQv?M2Ak3&z_ z)m#iaEg|OXsqi-KuapO9QZhBl;)Bikhm~^AQzsK6PH?BfKC7-fCF$OPfU(+yu#zxk zVp2wGB8R@-lD6-KLoF*V+c8s=!N(-ynsCtfr^5Nvd_5QDRS#cdFfeH7gIf zOTw!5s`n{tY75F>M*4s_z96gXh&xQ$)edqOvXjX6R}{Cz9(06UZR-<(;k{ptF3-#% z$AX^Ldf0Q^L;qoX`At#*odZBV4Mxc!w*Y7aq>)aWIq~Be+_L$uYp76>qVn0b|L`2> z1e3|%{-D18EqnP^=OrRlK+1(b9tYubi>2v39*pUZ=}t_HHn=>-k<6eo%3~U}<>iis zJBB+#;}Iu|Mkb~_SQ{O~o4OswkAJ-2+N8GOj<;?#Hjp?HS6-oQj44M*AD{|O7O9Ab zaS|>f%gl{`cjq&Q(hj&sMQhZ_G3-becghV`ET|v*xTrWQtB5TF(?d>a&GYK#HP0pa z2MZ9UZHP9_U^K}o8bpeN@t|m%XW=&Gv^k;PA8|>k>1i2B3EPslCTx??k)G6+E}?Uk zwC}w8L~^;6Slu~sHZ15Mmz|M^c>j#l;TxP4yGtVXUqAQzg)%i;)S^F;dsLEzF!O9h zUPMM3-9UxF)@_8L){=x1*TZa1ZCwsDizhsq3*(@<_vn}bIGOPH&97S?D0LO7>4jWH z%Gb1Sl!7cXRD*Fp0d3zV!%VU#frJ{W$qw5V;Ig-pJH!MV);;+*##kqd8_cGpO^I%5 z)}M~`r{nM~@k!oU7^tKUUg*{OkPj}yyff-MuC#uyZm;r6-j?;8F|}t1vk#E_#lb~v zo;s)y1m|{Cw0Z^Y!^!WZ=LqY`hZo_An67|ug#!i|sjR%s+b3P)!_m*y(-rgug(u)s z5ZKQk=kuF#li4J-m|DfmqiuAOa%*H$D`sTl?q?Tr@^4OL(#f6fc#6yD>XDrM6#W=8 z7;7*d^hZ(H&5PXdT~1+{UA+8gU0n30i{p`?K=CYL9|tQ1XF zigJs)pIb7Qyz%Ikj(7VT)0J-9{P`bTj%_-xF;p&fFs;ZGZrI|vA)Rwc zZ{Ko3X>bwI5`UqqW`~EXVqN==b8PQWoV;!_)PLHRcc`iGgyU_)go2|9$J8PF9qBMK z%fH2|*?q4g4MB9AJ}NRlLb-r$Wp-6Z9@HGt94SJv#%~)iQ@8JM%KgE-#^Rwc!qPE`3M)2Bk~p_ANOsdhlsx`)-bpIXH}L zbfD`DlfpVy)@%xP+!CseUtQ%!oaj#uRAZPDd~$WwmQcq{!7(fLZ6;+VHwRipUi+U| zRk}UUaZ5nr^5$(sO|LrC)g3H7q}=9_GdYr~ImjrDu$_SYCT_dIY&$~~D~tgPLa zkyp#*W##7NDGE%%-F?(`Y*S@(*`d;u6bHkqo=aE2wPa1Bgo*jZ8ojdOr_SPPt~fux zSg%l5jwaJ$Ax*yhdom9uJQ-OjDXA`~Z%{O()W=t|ECdxT|*nc1Cb`cyMrdZR3UTPS0cPG0*k2E=qozGnidvGSX8Dc=@$K#Kw4;Fb11Q z47T1gjyiW6(0Qj{%)1X8<}tV9yMnH>USaAT(c6+Fwd;%4t^uVu5c5kxptFZgBTF%R z+l`o*^(6AlnWQ}@*}V4Bw(4V&n$^pTmMiIb?3{+kxxpRO_URxHnf^%_S298gxS`!y zV)iHZ^mPZOih~t&J6VmO&ppJ<`!$>6tM&0!(3BNK2R>-hh)3Irl(^$u-0sA{ z^gu~TfL}ghuGI${i~P80!UlO4wqw>w8LyI!uS)7EFyvsw%9*RC(t{{Fz_0v(w* zQbK-s%><;bRR^-mLpCg#r`*1?ZvQS$-t}1%dH-qteTn>6j|syTj1HH?)+O!TtN86^ z%e`9mLfOf-`m>TF8_SljP>=^?Dl=00#ziFmYJ>{NRd|>fs%FR}gkBC)@xA1k?)Bs# z@LCrCHaIX_21W;@vSCTNJA8se3U?0-9ZlubD(Lq?yF-#fl-{`~>XW#Dynz*;kPE7u z!rVgLNotdPS+Vb6c>`Nh8C$2!%hP7(av4X{j~-PV&OTjskR`GUzkh-TnuvZ~G59oB z7Le_x_EGFi-yljs^r*rv2u>l91#mgO#EQxg+15RZBq}X2K1%U1nH%&;3hQ4JJ@?ZiZDl8wH8q)O zHC!Z-oa6@(O0of@tkp!u;0jGWVDO)QaK`27@7<86q4>3tji*>1jy zof)3#?_Ne-WqIvCFTC)x5&Pb^k2&wHs+JDkP6w<( zXCDKt4#dsG44~Gyk`!NC)inUPPDZ(gafhk)}D>)kHLRqAxWn`prAmGVV z)CK%93et#@T+&2hz9*n3*+|S{lTLG0X;nI11sbJ4912TQE8+?zS?TH7Y08Ou>QhUn z?54gx3*2bMFp1VRWS|dAyov2EozUo61Mb)RXJ4kG@jovecuG`y4~3PW;3vV%i{GeRwgl+c7(;4h5d z9JxKj@g+QR6Ujmkb%3{bfV(3?yC+eawthG zrC~ElT&p)XY;z=juMn0y@u2$=uhu|ESnL)Kq5f^bry@Jz9q*EeIGQAENNdb!Xl%%C zupAOcQtr_`9i^wL+8P~)U{p7OE^Iw`JblA_qd58@ zQ8}X&c|-c@5OKOmq-@-pl+~*g7$=3%Gl&^WhLHVe0E+ssbmV?!w@jN;A!W-xadXk>W>#H=%^dx$i$8_x}pv?r>s1uT-i|@;>wv;7>6@Uw=G_{ zaND&jU$$TS>Z|s}%UEMy`U^vyR#9%)c%S$A zKh!;K_>Q}C>sjYtV9>+E*#=IHC3F?fHP#6}#z5xRXwpwT?FDNQ3QdD|W#pbcPq9cb&6uB9B={f8X@AWksl`iYU+;?(0kr7!DO0;!z zN1!_waz0z*1B14uCdMbGB*jL@MaA!t9FE;p;iaT8ADQgwJlEW1)tk8!!;ur_+gXyp zO>5LKtCgXl*?D1H`--bux*~nm-YMRhl8v8#v+G-B*Nuj@i`>c}T;xz>agDfz}hOT&ZwUL z=)3q9J9wDzxcl0wwMyzZP)*IK1I0+&j5z-J{PVxcIS^MmkT;^-i0p`PqEuZ#XN&L? zuzEO~Bg9n)c@y6;{>koa!n(C7F3L&H2TCS$MT-~bEmmSIB#8=!yvhyn!{!SQeo~Nr z@BcwTWb*#|wBLjaQy=>Ek|;TopT+xl_gppXE$V4R4z)=os<35s)8E|w!s@zSN=iDP z*iC|kuAH~h;iKyXi$6i^trh@jC|pAG+RhlqTlRW4w$WbV*!}U*L|g2p_*~v2M9xvz&L#X_WZ;yTxu*s-0(?`+NllB*aPKAs-LTHYFU< zL-UUT)s(_1#eyRyq+)#5=}Yi@YAYcIF7!>*!E zb2xG2e8Z%I_-n0hlDdtg)E@67-xYWyjuinm&2q#?MGHjBU68M{897c zi3>NsF28oV?MwA9CHFo%^1Z~cP=tGShFgB6lz2D^-H8VPZrvhAm!?a}X9xX~S!}8@ z*ho$;rxt%sQBI-e!?!HsOjRbE%!EPXBq_a0V{g39OHG#yDrVhW7(v9;K}p}Eu&I4I zlLJ6TNCo$%e-T%dUR_*z^qfO+X?0F%g8JTS(q{%4Plb}Lmx;yj@08yWi{~dV!?Mpq z-|pZ0thBf~y*TdZ28ZIf^vJlx=_{#V2FBgOUSA_$ED#^b`x!47&B5ptnG=`r@w)ft z(Bar)r|XEZ3zTrWfyNW&y#*tFJ?hF~dL$9Rl5=|C7zgtqAQw6>%GOA~MIYL?HAeh5h{QTG0 zWP=CkmK^JN_S?fwu39K@voRF|Z8|jrH|bym2P^s!|Yf)g086<~4p_ z`>>kyEs3yyXnJ6n!YqbeErV`9P45fq5|~YB zq+gTGrSx01@E{Fm0Ii`Eo`!O&0dFf;nS6z(h@S?hVsU zp|RTJ!63qWRtA9P(PWCSM^A#8g@yn)Nk6PIEf*TXOrJ7~P8ASYR!&B4dbT4S@_Y7c z7@!6T$?P!3Q1R9I}>-aexR&PL3j{u9<{q6lCUPKo5jw z5T%2>3WGc?_{=dUbV$cAFEg$j*RoHM5ugF`FZwka%GZbQy9KDP-~= zQ*zVuaYK$Io~(SATuAz2bn~_q0}b%f(`eRssK^g;^?oOdqvR|zV#!C-SyPv2`Vz>H zENBDfcp>M1;Tx9+$_L+EXu1F_QyX=qC=_!IQ0*Cvk|Du2mf-st413+% z_CxqHzr6x~M%sI3TnS75imV&m&3GI`G5J$-f{tS@cWi z@FIU^#X`A}>qX+?jhLTomlGg0qSZTBPu_?kC5)F+Di1n^)NA1jThDjb?x-N zGaQ+Cl+K~!I6A>l!N`YD+o8kIDcB7C6CH@nix-e{Q-jCN=EYEI!*x$E<@X|}4oG?Q z)KW1iv51U`iDXSzMUgS()!e7z>hkhx)^Jr+T^_I0Q9ls*3Nk>68JGN$`pFL*nH6@2PHUtqB{a>rl2J=AYEVW~)+NeZ6cnA-|Yk2S?^yE=d zjVVmWz5TyFS3n#n8cb`4zf=w1Kel5AO9#5cug96(6x5xJp}>o<#@|K2RgQt>$lc&Z z*MshSU@K=@0PMp%#fx4A3^fpP=2F9K1lcn^zl&(!QJ91{ksE)Z1=v)?&G?D*bt8-t z53%p*dp|+lFA+vjdIPGpqhKNI%QHP7zQYs6hp)Oia*!e8Js}e~f!(rc@h-j$?f(R2 zXo4rS1jkRlxb$5ay7HK#V-4jD=Kn)pz^)@7(p!jL4nz2v{3TzA$l*6O2y=AdtK@bt zw{+L=FTXdSk-i=!A~#h}P(aoqN^=gv9bHfm_>#?Y8Q3*7UEw*8_!b4_;)N8i>04%= z+p1NpX_jb}+vi=xp$YQ?2hQX81$F2p<)sVt$B%PJ#010vnmLA54Ea_Hm}WN++z_2! zil|dGAOJ>oiK61rZe8(18lb;XadA;Bh#=l3l5>2e)j^U z{^Wm_T0XNpyQ3Ohg2*SJk2+Gs7pQMRFyfC%rUUEY;S#z+xx%IXxCcia{Q1nyJH6_2 z&M-^#`RUKQdNaBU@u?*3owBicK4_v;wdo7ewK#o`^J- zNt}E$AaM3-;)ihp%%s%MG?|spFerK~nROcPg%gxhS6zI(hLcyo#G!&*xi2YG82n7{ zk(;JbrokpBdfVh<@-!&vZNre8H+7X)c_feG-Yd9=HYv${7&C9DfZgJN4{-oJGH-*n zHjac@xt#QUNJbcbBev!S*I{br(590Sb?o}{ThH&j3aH>%KTO*f08?>@40=Qcv8`X7 z{p`X;NmW&Q>j6b$aCOM)_o;BZAB(qCTV-+;}D^$ku)RjH7{q~2S#>4ECnVXl9 ztK8SnxDT8tvx&l6`sSL*GbF%kEMQ#MM8_Hqwg3`sK&?`9-p@zAWGiAebcQH3Y3V6k z$ni~E6@ifv0dDHo%^Eh84A}K2<*rG}{oG5umFivT(TT+=g=t)6!d{=^C`na7ey|r^ z3;*ssirPN|J+Oj|U5kg2kyn?Lr_|~4ii?x7l5!xW999`|P~zK>-0=mh{!8nL<5_=o zS*b#oqt!Kk;mrL^K4~{ETRn zjWKHdjAy1lv9o2I5BvzY<*^Ga&MmG?*&-tISD{POO zc*Zo)MNz9x752?jfmD(sJt{OipkYTV;=-dt;Uq%19S-JsUEXc&8GtQ_s{&xcw=VqP z#i)Cxk~bAO2}_-XVrJ?CB2r5ow{4?l-_v1L)OMreld;tP3pzvzu1!9gUxzrErK%g3 zcW?WIol70{box_jwQZZj&#DJg9ZKR6oKj*G8ATvmluV@M%yL`@{5W$|hj;Dw0ZAtM z1f|`a|Rq&0gZ>=4bO{;I)>f-h@~sU;iXYzr>e4+ z1DtEX0AePNJKmOj64K$KlWm2i$2kfXg3hn{fU|79`0lNaKZ!`eQ%1aTF}#k0BAQ*F zE3c#wBkMx~aCbZdg}oo{2Sf?{wngs(y7b*$CLOe~y9XdHn~$uNTL}6bIv5{b$9XNv z|M2vR@Nfr>TBA+O*PPe^we2Epem?Y^t~=!CYl}4bJ5D%g@)NZh4QOf1`hrxaBhSILjC*`-(hlZF6dxmllt zlaS0Ajl2jz{(x+&G0f$ppcCVnFO7V}v@PF}N06rsQBpxOX3=6Q@T1Db1&fQ8uw{eG z1~d$n%&WW+eNB1oMnzX8*YKk3@3L2tqN@eht|<)13^N$RGLxA6ZCVq=n%)bgSLw|? zruU-hZx99BUchQJnaR1D%78+@oS^LZ(v+e? z3F-IiJ>XTQf-jektl?qzAZ0=gFrpTr*2A6h`j860p`?ySECoLv=$@lSl#L4})zG)G z>8+*wNS2>wJU|-*@ED}iP~3TP7O}kB#GeJP8FOb2vnwR_z(%7pzQ(!UxZq5$O|QlB zzt>`e9}{iD1i;Wc>c>^dV`DdYj4`r>p7=BI@sZm25*kO;aSoU@#l79;kpRQuOSIJ` zAQ%IH1;5Arvx#3yN>JhB@e7|$;{MqjMu(NeYa`?19r-iyzrNcv_;<^2$KYE<=ZlBH z2Ul49W|+ymP|=xWrUOE8W~vb{#$T22EX*_c4^sJcoRtq8>rJ9F`BkL+rQ(m_6S0P) zgm2<#2h)vnzxn3@Bi!-=>1KKciOA=MOG4uyk-?d7=zH7wI*e(y!Du&;jw}DYGv~ZJ zQ3GH1-udR6k)IRR*6{saBD!?(d`{;!GGXM=IBom$HyTi8fcD zCst^Sia>Jt2h;v=*_rLF3$HHRH*>;_2_1uPZ@9gYNDrTU#LFi3AzMrlOa%I>Dza=k z979XzjG{JkmSJje*3@@Y=ZyBhi0sRolI-Ba>$Hk3fKm2WlZDM+NVMlFa;~wtf3Ey` zYrCXrXW^>#3ays1yGq&ZSs{tTLnX(uYofG@P_K=f*91@T4E?sPqex#=R8*)bNYiEF zRwb&?SEw#SUmTNYF%MjN_b^*pT3?~dTSA0!WKv~Y1|%*r)AwG!si}6C6o+O9gekOc zIon;-?6Im2_})qq$|JOj@EyL+^BK}`P$o-pUHi43lWL7wp)@KCL^u<&1Ns-**{Ft069l#yFXbWemxfxgl(f z<+VgGRU7s$h73zg=#mX;{Ax&s)LuI2Yec;_E+Ksd2&AeqHv*ZDkE7MNiI6 zq2rEmP1IWWt4NEW`BE|l)3n``L*{$dh)kAx;ZQM=hyEDd5ScT@v6!Z%n}z`eoM9TO z0S+m1-tORu(NrGdFjQ>7z7R#wl7X0iKTxv;Kb$rUENGKV6pf_;Kt|7{ebm%aNsS_E zx#r9(&d@0)RgaUk-1W@Xu$s~PsodeED23cECEo~#i2UfF@NsdWW6~Y9)JjcbvstT6 z2+1T?t$&j#f1My!M@ipS{tt{S=G|kBk<5|&x@|1IEIyf;(yRtK$XAb<>fF7%!*l)O zfc_d%xQEr` z6m=lTOK_6DbgZbpwzjBQc`s-4QjR)`$s%Jg-$qgxGBD`}!}|NQ;BRAijbSb<(YrzU zMY@0Qe)*HZ;Vzn$NSu~-oT8~Dz?mGu5d4eyyHPC~pd}Gc^?;(d=Vs(&=4MKI7{f~@ zsU`JjI*O{eQhoEtkJqnCv;}m-MLL^ZZM0#usjk_9Y+T~*Fh8G~a}6B_Kf#Vp!b;OZ zhF-?N4ih74kMZ@YJ(FUoq)MVSiGBnA`zcGtrGJ+Ds*E_-k;!dj*p1V*=@&I8lFxai z?+8Sw%VU~kT2jrZkU;<2w21q?aDxx> z&LV(TUApjN2_izq30jUnX>+m&h7~>hDqPqzVY~2ImjSeP#6zk&JID8M=aKVdoI0QM zn?|grwNjPOItlr==@z4_OU;f7F-7*wa-!Y_E%7$K_M>M0v(l+}_Zy{?1qG4q5#urm zO*X7!$Poy5MMK65LS8hQ9-&8IAB_e;55in94z4*3va}?`-3P(jX^`TRkO>k~H^POrywG&KN_) zMAM&P_qT&D2vJ7=`?oEO4{!IS z;8)FRu-0cg*5}Khq?9n(%+7nel0YRqFq7aGyLR_F45V4HjcK-uA%qBw`I8 zGT&8%5SuA6^vmTAv>vuA{{PG6Ld$=k9yd%6;E-#|zY%uJ|jk(laqCz%eSY*yBJnSuwzYPWKbW z&MBrAca+E!u*T%e%cLF=OZ@+rm#376P@C_f9m#Y*x?(_Jbb?1^pxUuA@L0luO0wcF z2N%$_PA69Gd+z~$+==@e-+O6fVePV~A6&TNh_Vc)fnRSZDZY{A3rn9qTKlCV#hvut z5$@~-?c6&9t#8nMN1l^l#lQnm$BHWtI947=I38F*SN!dONP5_?w>Vj(kS%Idjq`?A zD0;VO6DILDs_3mM_#7%LNmnJg3H(V4xv_`b+yn1PWfbj_klWpp8Txn|{eBz1O%|^7 zDD4O{^^Kbiq^5(WyolIz*N=W|k_yj=5J&hDp*$~zXGNxy-SDE=(~IOH zEIIb%qVTv2GnA%~`$wRtc|FQDk(0?FW2b{Pi3CT{4`4c zVaXUouBW0X7S13JpBB%Tyje;En6&Ch{hqWvY3j(_J-Lxp>Z)AOdRiw`=jyA{swIZ& zm_x_b1>}dtgvV$C%EHRS4r=PkYs>Qw#?(oADvX^>{gI^8J`FzgZb_lup+34zheHpC zoYvJJk@P+ZY0p#!rweXzE%FNX4o=$G;Kl#Y;MI}T($LbVI~&p>0h=L|A^zka9g#e9 zS3}fyNP86|F*OLVNtg)w_G|wrhb+2Rn?_7+?54C8YFJx$SBDhgK-2Cwbv^@IBNGE zjaTLF%H1uR#>%}_`7P?Gy?hqYn;c@&>cUIIQ^Ql^!gIs(!fNAc^J?=-Yg20_P8M}< z7BQ)f!4<)&!J6pc{M~uMjnR$yjd>M~n!S>q(cLzTe8uMQmd$$aaPM%nTdh}(_bK&} z+Lqel(-B7`#(3by)2jF2*+=rv9#6k2zB;!mucT^JYPE!}B^oC3fP3Mth`@*x_v*mv zz}A!l)%$A-S|bmjWBcc$pPB-$Ei~;iz6Y?h?EUWNB|xTD8V?vM8OQf9FPqy0V#}!z+2!i2ogjK)PiI|njlxuDELfpS#VSEwcvNb zGr>!SUWv$JNOs?EMIyJ2?Q?2g%EvtP~r zFnbBvXqkC`b31cKbCvm6^Qq>Y=6B2=ng4A5%=|BNqj`^og@xF{%3_$sSc|C^GcD#? zEVNi|vD#vjg}a59MW98fMWjWHMW@Aei=Qo?2+f7|LWPhOP8H4*E)lK}t`WKlw+h3B z8lhJBx$uVY8=?B4NF*8~iWVh{vPDIr8d0O@py;ruRdiSMyXcwdm3W4Dxp0DSdOurX1UaIou!ARw`G83xMi$ml4Y9Ze#f>bJe0 zU%#M!;r-Mx{mS~a_4~Tt>wY~}Qmgl@lvcy6KC*JR3bl&2%C*v2l~`3%Xn3jkV2Cn`t(4Y}VQM+Qiso+f>=q+ceo6 zv1zqAWpmEvlFfaar#3Hb{)RX5-?k!KnXR=gW6RnOvK?+a+IE8NeA{)ln`{GY<8AY7 zOKhub_t_q`ZMVH(`-QFgs_jkN?`@yh5;-cloRbfckC2a%Pn6G-FOshUcapc$G9=>j4!i`31gy|cqWC(V=9>aOfz$g>0mB1Uo#JwpO`1i zEA(Lk`@Z)5?dA54_MH6?`}gg~+E22dVn5%0g}tl&HhWL|Ap2;0jeVYdiG8Jgo&7%h zX8WTz;T@cTfid`iS*!Wdr927vQh(Kz5UET&Gstz`bjAOF`!5{w_Ht0-{GaCE0smL? z@0>ir{{q$BkX7gE_+6)W2eCXAMENfNF4k@CjLGtmwes{Wnov}hC167kO4Gpk3O@+s;>b)?eRz!S6 z7f0-ZLG~n;EyVf6b8#-W|5DuRFQg0Rs*T9Va;Z!-Mk?Ek8xki=WqB&Sv|1(OS+Zn8 z4NyeMisam+d<`p`00&vZ3^?#Wup}en;l%45l0W%bD&wCi5rRIQbjlv9Oe%w13bLAf z4dCL+q~upBgO|x`zZB0VE=uO5;$+)!$AeTd&@_%!$#=hg zfeR(6p!^~mqq-uJt#8}jDf?mmZ9M9CK0V&m7zYHT%X8d?hg4Re;`0tvgG{s**>V^a zBz-apngLIqfRbty|Fm83v|aGDb=4=H7k;BmQp^6)*W#B@MI&#;(PTVh3_b&8Kit0k z11EdSJ{zP0551_5x$MeXJkJR#882{CCY6nsTH#2b6l9uw*0p1U%7i=qSjyk`I#owU zkyN&YpSXLgWRXxi=mYP_BB_j7hdQE0L6|gu{v_E(>C!FIQ8Lji+_N=|mBbY*dKGzy z=XJ$RCA+oe;zvFzSxvqw9q$^K79W$!U*Mo^8gh!m}Gk z9{)&ba{g0lfo~jPam1;u*QExy-K(PZap%`>kw)~d$@aOP5 z_0o8gol-=?J}1_!jOZGWBQaP5T?{UVq~twNh`X3vbZ{s8N>dQ!%}Y%9)WXBc^XQ{` z)JtV6@h;)(vzrH40xv~qa%qIcl3z2pTt|^FjZ;^$S3XqXY4=i$%6wEG;ieK~@GaYo zMlx!p?4Qu$n|xJ(iX2Q02sD;qF7b}v4Csx&R5D!(bS;tlg+RECqw`wXy{)CE&yao6 z6|2HMwm^zt2EfX;)KdwTFFx!u7GC&y!_+{D&+AlmcZt52PQ#Q@48k)Rlukh7C4;SO zC~qs1-I2Pw{*TIFcw5NH2)ts0moPs+S68TzAqeNfd7yNraY%K8)!^_a8@B(B&* zGQF^lo>$5~hNQUsDV@_GAqA?!XWSfhsWdS`o0z1M!E2Wi6Ahvn*+1u;1|RhSxUx~S z$d)TA*;15vnY|uWg%?1=!!^0QeYijf4WW@o$8T{*{3SJJ@DfN>rlZBUMS?FRpCHhV{oCZqT5mfen24*>eVp?(Mr8BTQJ0pA42};GXS}STX8)WJSadXi!O_; zkh!XicC^bCiDOkg({e#ySBvH6Dp?bWlLC=|$k$=CKZk%C#E$W`&0GfQsr`owe;71t zv=>aMQv+VStv0j(9x=^d{BPgz$V6;+wW-wVvWc%K%^W=LneGoqjeOT|z* zv22U2*dLY%k(GUzd0MeT3};JFoB?GZk`{*_wI>zr*!H>Y zR>x{jan^lDF6I87VK7h2<=*?=J9qB9AJ5nOzR&x6E<}o9AMdq0wFuu za`W?ZIRb`+Y@2P|Y!H^bL;7|bP$8@J1eIGB!d)6zk3SZe@;x{Nr|rN8cu%Je2jW~~ zU3ph)dsnv|^&D(z@37N9zLr-Xk=Hpq6R`;a37BEdJ}s|JbNO1T8mo54S5?(k?{v}E zV1r0(F3_YM42%fw#vq&f*Bbx@`j(-A#-RI6=zh9lgoYJvoC@^@PKVg|4P-&w?;uyq zn=WE;wTh|P+dp13cr19L3B8Apb#9Qm3|ffkkS!n>76g#GC-aZxI;lGnFYA{_lKlX7 zjMK?qBR4=uOaYozC8nX(FAN9_4tqqlH{_%SfR!}wo+?kOO}hfs4K=Tulct2-j}{o_ zpqeXxZDGDxvC3r*XTuo;Dq#@@l)PYj`2Qp@K1w0US$Zs~UC=Gh8uYpznJAV8h(4rUzEW>t?w(r3_*LLdI+3pF_siQ|vkrp=OuPkj%fnXb8 z)-?pQ*wO6V(d@0SsvRRUehMMbt21oTTLLZsJ4V92exq{9fQ<;WC}`qsZRJ2m;-VC4 zrwxfvibSbDp=!G#|$SV|Z+Nw~qB{FrOT zSf-^!9oIRK5h=zu1b1in5gary4|u`|o@r5LrkeJp`bRo_#AM}VCPbaX{D~-uN)vtJp;)4r?ymAHdQ%H zx4I31?Q2|F=0_Gf&Q_p&(n#pu+U0I_Zf-5{m2IKz!H(*7$2e98?J*Q8FvcPtdzpUQ z?CHUFzv2wO<5!YAXY?=#)K>gmaatM<2ht9F_uT;tDH7VdZmU7J>PPOm(*QBS_HrAx zNOL2GmM)77(A6+x)(YdxbS@xDhjNVn)AFwkV7baZo#67N83bRmv?mA_tQACZA4sQ` zrImDZte`-6VK_mze&*9@2!b)2eL0ut=DFZa0mboKTOpVYB>NUl4>40`>!WNK$zip# zjkIMtq4urxT!qE`>f4^<4y?Jn{^PzOS4(4aLt}k>uswiKuJSaI)R7I8nmU%SJLX9 zy1BJ$Yqx{$FqVUUIpm-GMn^j{2HRvB(n4JBgqo6p^SD2q zT`#cFe&gh^dPq*M{YIVOX8x!DJmq(=bwx}>%cSdl zY5YY_$AIcB1W3E8oh<mRM+rd26L^gUNsT3mQCfWRL>R{)VO%5BcKP z`tGl-vy&Xs)4!w?wiiIRCF+cDrbSME%uG0MCOObOLwEN>vUh>?{QwZzjX`|^CXZLA zzk1N}>>Hdzb->Igb{2VZ@K_UB5X z^6IS~k2BKaa8ia7*!N_n$P`+7wBQs)2u9n`v#HN1h1%EC)90e6OG!vrNjawOc%-;_&*Lrv z;>R;jJ3dhT%{zANLT?x(i|)@L0tZ3k5)_R}j=SAkiZ{559=dBynu8El(|{aa?t!4N zxS!?DO_z&oS-UJ_*J^vp_iyd=Qgu8cyw^a+Th;OkJPbQA6&lz~3|nNP3Zg}^FS>1@ zNvJV5L3XosgnDC>BmgSG`FTAV!M=!r8F?ezi%^qhCVoFlCOSRnj=F{VYWE#^;iDxqL&~7;Lhe80>i5l{oc`i3Sh5q!yK0%91EP~@@J}gp0g7Mw>VZ6 zX9V>TOIU>h)g|ZF$URK8U@Larr9-R$B9|y9)xdqoMJ#e7Zo#wzhGjKAHLYw3U!Xp~ z;}E7LLr`Z`JIS0?3^(-{bH0PjRCB~_cH6ht6PBjU#d5R`c@@c1+)#kPcanJ@XmSRy zM+zx!nmNbxPxHi`RY?u?wgdtjTZ&LiZd9~;bQoM~UIMc0A%n2QgLxjc#JwRJgZWQb zN->iVm<&VJlSM2iF8{>~jnkJd3H@?v(&bdFTBI}y3nGE-j?2Jf11FwV+zO2%xdp+) zEC^0^YlrfPJ`x&vbL4L$pN#xF_@@qKlRomtk(Wl^9(jM{vtV+kvT<_a*~Bv#;XIvq ziu#cWA)W}XZC4!11AMw?t}3oVwg@4?__H`==!4X4@2yG9z93>Fxf4Tq+3EO13@<2p zH8_8-lBx6u*Y8#G6*2JYUgZZ>nK|%6w^AD8xpaxYpkn89G`*CsEnYEu()d}#d&fWH z>xt(rmqe->y^jJ%-of9)y+l6qv(f9z-@$e2#5*GI@d#n%m+%fsitJZpglqE3`^LnV zIWFBVcMb2D$lSy`_?;8!$T{ZcjG|EKQ*kpTn#*~YAM}b8jVn4iZl#EMC%C9rNmH%~ zuIW{#dX`6OoL@p>el)F#d~ts?9gmg?Mbnc&BCkc$By8enG@T%v;vCvfiR0otAY?SH zh$Q9CXgWqDD33(CY#cg5|$aUD=PM^y>}FBhz-l40wN%7Rw;@iVv8jf zV)usp(nIb|+w{bko8+dL9?Y5DvyktZ1@F!M%Kz`m?#!8U&di*7&s(17JyTX0$UYPu zQ|$IBgpv&6Phv)m9UF7!%=F=ekPAd8|76V65z~p8bR$AV4$68@d8$|6oWAKZuzwT# zi@e>h_1>yJ;Nhk>Mr|Ymk8v7lR)~0RSdM;uo z_LB%{_3GLs+q!P>+cK39;cRbI5Z5hPyQ1^9MxwooW2LaA^>I3b)8E(^87P2sLkCww4$B78113{?Gfr?Ekj^2masr|K$INKllGL zz(2sTGaxe{C!j3gXu!#Ua{(6vY6ETt)aeYmLAqhOk-D+E>AECcitbh2JGu{bpX$C9 zJBz)=C&gjnC~=K=L#z{D6W*wkh>i6lL`cL!^0=owG4;&OYEO1m{LSSOx z)IfXSoWKQvCj)N=J|Fm9D`P85t4^(YwCdApkfYU@R?}L|Xf?mp(pE{W*0ws=>S8Nb zs}EbF54n0CI(5v+C^nLmn{X=Rc zg-KCTTd9lGTbd`WkTy!?(h2E|bY8k5eIPxQeh=~s5`!XwY(XP~#s*CfnisS>$gwVH zQ_$9+-9ec_H9^;dUJY^u-4FVqbztkT*6mt%Z{4T$6Rn4}9@TnW>s76@TNk!I+PbRs z-&()b`is^NTmRDfkJgRB{=q@P=HQOOeS!xD#|I|_PY$*RuM5rz&JR|C%Y)Aa|4;BI z!41J`a8rnXh#1m3#2C^h#1_&aq-)5qkclDF9U%)t)`V;e*%gu!SQW0`IgboZH7CI($eCXuRr$UoLcZHUOo(a7WdN1_t&<{dC4gD(gyU^dl zbYW3pwy-W?y~75E4GS9;HZkm}uvuZt!;-^xg%yS!3Og2dGORZ2rLgzIz6tv|tRc)D z))?M8Tn=}1437=(7d|k2X!xk`3E@-2XM`^ZUmCtTd_(x=@SWlN!ViQOhC9Q{!Yjki zh2IRn7yfGa2jQQGe-r*kxI4Vb;BU|yOosM`K87a@qYdK?Qw*~Wiwr9a>kOL=+YNgS zIR>ZUgyD>#)^OACoZ)4|8-}+G?-@Qed~SGXU`D~HUt}~G+Zbbv9gRJVeT@T*LyaSi z3C4-WX~y}+CB|f9s&SVw(|Ew>G?p1Fjn&38rdZmRdhD!}T6A|U0huQL275zydF6J;Q~V6xGNSYT;xVbvwOrmt|=rO%%sbTjG4VevK@d zJkAu_sK%Dn6S|OS*PBO7LT!KZdTPZi$bE!oipC_|8 zy`ky?wW&ru+e8g@UT1)ziW@~k9qX!9?J0ZgQ)EN=fy*+nN%VqzRURkXFov~1$a!oA z{aV%!Mn|KlG=y^33YobE$WrC5^6gU6x^+obTu9QovzKhlxSU>;r7kkJcaWtq=uPY| zOPAK2O_Gu*+lonSmA3CXB1`&Rco^Gv?b@z2-LAZ8jSO2TOBLKyzV)DWU*(=k$C1F& zU%wHudlvmsUs7r-IGBI1Ai8qN&wGzsOOG5nsvHYEevp~UE25>I)Z)$9cMMx_}T zk#+VV=J7rPg3zS*rv9O^(T3HEGbepKxZs9TA zXHt_kGFEOEwL7$NyGxcbXrZhPyB))B$FSEezCIH@Cb45OPkNg2Bo@!(S(0>gXGOa7 z580v;aj9H){d%3G$FoVsxG4eY9p!t+FPu0Y$cG=}34dp|qd!0Q*4;YmzT+D|s(lpr zhB7w2tz+i7u}?)O20(fP22jb=lS=(Yjbf7g?w2;VOTP~t zr{girqLx5XD|e9-@!XQmu9JGo4Duw2OJwO=h!*RO`@YLs6%;DP#rbX6+hS3!Gpk_# z9o{NRO-r68^Vh^NY_RTb&#hCg%`|hDICILfxm#^x_+TA>?VQ{+QRIH__W9E4c8OoU z`yKPMdB(BPG*~HV+aazLk~LJ8UZ?(&ege+(Q0983XKlZu(gWG*wX60r`DbeL+P(H& z)MK1S^&_a#*mjcRXSwj$?$V612=>3mfyL{R@2E-H!oXYW%eO_3Jd4U&7aX-`MdIW+IXLlop@h9GMeR6 ztH&k2BHMzWq^wrYmQyK?a%Xp0ieDqEuH!P~VyZ0h=lTCU&jR^C8y}|UZP^dFhxKx? zY-QL*G5?<#{CTsKz$iETz~gHI*=(xR*VszK9tv$8d+45wygeIbX?yvuN^AWvS<)33 z7dn+_DYa%<9 z`K32$Y3R>FM0+lCYeq)ywnMwy@X@RjOXGWB8+7UWr-!sQ(vjtvpTCuGV&*os`)Q*n>BztjN<} zYKK@FtB{lRi>WnnAgvd*J7X827<8qM9VO{z=@DH>5 zJmb!-GIO$UDrtSA-?m@$e`ibNaj(ql)kg#s7-o%+Dl`g269+kY5yOEVU81M z$|UMtsjiG-7CL86R0CCIuN=j0(gxb*-W*0{6$f>a{z;!%@|UH4@SW2Wh6bCs zeihS;-&59~6;Y``hV|fo=A~eEW@qQ-WZS%H+^O4>otfc?h8awzMMe1qMOHP9IdzAM zN)DGsTXc1-OqN#4vC)p-ID|`-n39=tubU5qe1zr3zRt&Gbw6@82KrDwW=pxf7S73AQ$j3jhwz9J%bMKHhCVZ^@N}9ol+C-(jnVEZSJb)Wn01L(V9KwxbP`go- zEXOUtUhmJ!vdx(@nkqNCbaV`cwuxg$AbJ>tIEhW5Ry9t4NzzqrPd$`sPEFmjeLL*A z+-88pYhlt%>mel}oqpjV($UN#j#5dNqbLUy^Wnn~(UIqI z`g@#`Ma@XT@LN0tCQ%bM+?7w-8X>h=S^KkcGTTUHyN~CUm9>%jv1eqzexsDISW}xA zwpdmp*)=|c1+g+#%U812hO?G{GfJ;m^K=s|TX$J?!VDcfQc_wfnR-*JLDk%*RN0mf zmG|Bo>z}l-*Z3Qzj01c3Wthi`d-s<(i>1E$rc>)TByKd36%INHMI1#l<$sSyJNkjfRsMo3(Bk#joK* zNq@S!`n2^I@pN_C2Ah;ek70tbTXHe0l(QVAHf_5E+nL(7Zu|BPao;Yu#R%dD|hOG?B(sWFI^u-sCaDQV&p6>3Z<4@qXv72s8TkQe- zZ~rBTFa$zkqge-h9HS++2)Yy3$e!Wb*>?U6o-I_%0GZcHUYJl06Dsl0pF6Wqsg_=n z*dV!CkLas#huf(Rliglvzpw})gV(8>c<00ApO~c^tDaf3Xw|Aki=J6^ zQ|LU(&dK$6W=+KTE9qHDZ*Wu*X7u8tH^gI0LNwDJpD}C<$1fivl{t>*m6o=-b*r>A z@3;dq!Ld7UYpJ8ntp%kxQdSBjFcjmjh^(bST3s5<-1wn|B_wMfs};c&p{ZQr#s-6rXM=2&qS6cLHi^s7&AxM*cWym(N$jv3DOKfJ#6SHl;#U^kBa@^Wp-Ny55sm11 z$S<8(h!tVw_Fd(b2sSV}634UB+&+%8>C5MTn!UwL*KT-}~NssH4_U+Bd%EIPWh_})0l;DtElG4rT zJ0xqPOO*J0JjZry7PCuiC3>jRw6T%75K}xwp&KMKkKzQMD4S%(6M+|`KY$6>b=Hkb zOKs;?ryY}60S(rbmL8F=*Xir7<1FGOWof@IjwHV=zy}3Fx&xmi1h6E~$4nw*6CsBP zxkSh(LIDwqh)_d>(?s}|_*sZwFXC5E{C*(*R^q>f_}?P_jU>QK0+y42%Orpk-3Fq& zMsyz#aTXDaiT*VbNJ(HZ2|Pvuuaj1@Nvmt5)enUBb`Y9R=vzb@K%^f?&{z`WAgu{$ zT|iowlGZK~{68cliG-v2Zjd%{q|GA|{WoG>NX*X?^XtT6en0?#TKW;o z3}RVGEc=P&II&zKmVXjChR8FCoJ-`3#5$f>i-|3m*d`I%Pb6kMiP=eF?vu8|N!xRz zT`+04mb819wEHJ%*Ff4Qkq(ih!{1292-5K~>GUk=JcxAum2|m5y3QtDuaa&8={ACN z+eKm>JxS~-68k@-dneL;CF#D0bbo>Lm`8dflOFd;&n(jGThcp(^yZ{*SJHPV>03kk zenI-pA^lz?aT1A3AaOsE{y&l@Mv^B-kte?)1FU4gI5ObxWZ)(;u$Bz`jtnxBK^bIl ze=_(U88Va%d4~*rj|@9YhTkCZmmFlobuu!Tj9frQK21h`O%i63gjYyHBN-P*#^sRl zMlwEvjE^GYqsjO;NurJQbL*|E&`FF{JPGn&;S(ro?ULgxTWYKxDcqUm~MixIJOGc0-$HQhJk= ze6n^5S-Xa;eV43@C+l7#>y2dnRsciyZNOH1-oP36y{EE~>lA4aB#_>EkHItk= zMoxW4PJcqq+#zQNlXGjxxsS=y)5-a^ zb>#1R$eRjz>n-w52l7r=^3Jd1-7kpidGcN;c`t>$cY?h45qbX`^1)2@2eY&83RtO9i0xt`#93=uh zD@f;rpzcD@>q2Xr(0ZZJ`tL&PMj<#&2pJ}Xwi80%7s7f9VTXk9HbQuU5WZ0e-z0=@ z7Q)X7h7p3Xk6v(!UIg_cMCJ*R6@s;uU|lEJMhLdUg6)D}dtR`; zFW9~iV)_X&HA3414x!!Ogm%9R?I#Nz<_R6R&~dEL@mHafEOeSKbSe}&Ju7q;gf3L* z@~+Trun=n%x~~#?tQ30I3%#<1-Vs9Y{X*}rg+7ynet|;2e+Y4Vg#La){~v@WM+#3i z3IlEm1Ji{;nZlq~gu%0gq5l$wxrE_UgyAcN;dg}Le+Z8FXdymXh<_lA$P-5VT^QL{ z7`Z_h`Jymto-oQGj2CXxSgUq$Q`6Re!TkZ+2~-^$u4L?@t@5M)Q zaEu1Uz{&N`r*8XDnhyZ+A-yD@Kc$fe`(!0<*v4*SsFf{}uVgJs1$2J-zIH?eJloIK zKW8gW5> zU{Bb%%M)grCBGtDgIU+SX20EI{DG>*#MQFL+35U`YJ5t@hv?tJ@#8g4a-$G&hjBHA z2Y|&2Er?Ui zBYhM>1rGdowGx>XYY3MXAp>q_VHyR5%G2rpc?8X8f>!xU-QX(L+9C$SvEJ`lXsX#$ zv%S*FEzI(X+}NS9Bfrh=d?NEO3yM0+tcf=9&R9_)Q3;`Tx}MHfSmc^ zY}f)c=7&%oTTOOsA*#bBj}@>v;TXTL3b zmy4P_=vJ+qw{^C8_PpcIth8}69=LbKbJ~Cmr~D&NYg6@}v?CkM+^O0{))5>Mcj}pw zs&=nE>UaF8_G6VrXZD;*K1a4K+flIFxre#9E9$?P zL^go(2G#Y1jF!s!v7IfQf%VvVgG*)&%&sphRZ5F&{5Q4g2{~C-ZjPNDFiU=!D#nDE zgtXEv#~s$}Lx*z?YhYpVAsfcYr8|DOw5mFq86(=GCuig`kb3g(GLPVjhbdUx~qa6mz9?j z+J~H>Juw1t_|qFQUX&Fzp}pUmvLcTg=h)?Iq@f}Z7Ywk`9}?Wq4xC*;JMfYC%11NP zGurm!FJq&zMcukxR{%`bv1zo?rDsNu>;F);-apZ?9m>b<&s>ms4A6HlA$sPDg-J

    }mE& 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

    ?uJ9<(J92>`6=W}7n06p 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 G*yFsbY~cLNXLP73aA74Mq6M9f^&YV`isWW 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

    (Gl|4NBCgSXiG)9FY=AL`JNUCk0Bf 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 diff --git a/tpl/default/fonts/fontawesome-webfont.woff b/tpl/default/fonts/fontawesome-webfont.woff index dc35ce3c2cf688c89b0bd0d4a82bc4be82b14c40..400014a4b06eee3d0c0d54402a47ab2601b2862b 100644 GIT binary patch literal 98024 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 SdSQM28?+M|D(2r_;{O0|uQ74} literal 83588 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�>=olG4!T4BYNCc4f{&*Kgc`m= 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 literal 66623 zcmV(@K-Rx^Pew8T0RR910R%t*4gdfE0xIYL0R!Lw1OWyB00000000000000000000 z0000#Mn+Uk92y`7U;u@35eN#0_8f+=H32pPBm62nVnrKX+wfW(HgQ z!I6O0K-P>G<)&^!fXB<6<#Yj5Ot;CQ^kxN!)^r`A$jGp90LJL4HT(bn|35uxh-~H3 zkzCt$Y#@RIRR4qQkYX0n71<#4F$ZSDx}G=GREJU13W|b66FWM;(5@0Om2B6(YIcaP zWzq-i(r%LvMTw{f-=J$XKJTMs4>wV%Y>IzEVU*kol6B&ET`u{Bi`MzTSCT`uhLOl5 zt~eBSBcJhkV6?(U6(2ESP2xC%nCPpZg{pVyJ$xt8l!7p(iBx>7@G>tPicRz-o?;TS zAc%BXBq6BEkdVU9HDh8E%$lNuTspY;0^V{*< zT0I?=4BFN;W95x&`CqzjGwkDxzT7BR$%FRokJR~({TJI#VP`7_uLYgoPv)q!Qo$#( z!p1d-hN3+`gy+Bi>und#soPAyh@A|i9y+kziz@VAR=x)E7vLBJ*YNz@dMkQkgE3$T zj8P+Mj2`SSl3FmLwh=9r!bX)6X@Oz|Mj|rLJViyts1xlw>+~XZKhd21+u7X|4jO{g zQrUr8>PS+t9YoXnw|J^qEDbe+RCK0xVic;JWzW3kSx$fJsdGk7L@NXT`t!H;^tSJ} zF$f6=hm{!5q+o!y*#X)_3n-E%Hez8=HYlKg)ff?2vo>c=SH?DLF4Z|*x~O&?AM2r- z>i?`HLuRygz;^l&ct8-aElRjxN3fUKchvrOTM*bmgTNFM1i0li18s9jJ^;o4&uQ=3 z&lB?)9&iQ2fJP`XVzs;47=B2}T}qW*l(A~vxvkvPM$Kj|ehWbS$MeM+`e$bkLZB_6 z1yp$MC8?@#Rn>K#jBRBH&Itx5zxuMe0UYAxJH`R%KsV40bOSwbPS6ADvicnlFJB*3 zIKY4nl<#ulhQRRubM~F{SUqRguY`ocNC*+2of_?k=#>^~lo4at*^ZFhpJdmQUomVt zF=>I~Nuab;lyZdEKBKy-?Z9?>M`GBvv8hxsD(~^qX4Ngtc-Jjy?Av>yj4=YtXuz<* zJ_OGwk?J$`Gl1bCq9nOG1R2{I6>8Of|L>dZ-#T??cF!L8mGY?w86}w%(Y+h$gu6en z46tOO5H%~Z6aoMDzh+hKdKIkFjacGX96ah{B|v6ENKe8zo5Ki?`f2&=N3Va4d&C5< zTh+4CO(Ua5T5AU)UzaBmZhQN0CXqL#v$Ru6?Sdg;!$I;D0G6^9#F|iQrFKE^=O>Bp z*z^FHmAB3Gw5`>DRZq~pm)TC2skxo02vPaQz=Y7tkAe5o`pWhy3m+mxeo!2ane3`C zrp(5-NlJ2PFZ8yfdJX`%8MU06L84F+A-l!-n`Ow0lyTvk@*rmTFvV zY-FT~!RYn81tK{T_w=S^yZ{QYh;(A@xtZh!_22qXZ?0Hk=+0L5j4 z)ac;E0U-whAO`{{jdhec<9`D(4Qfn-G6QlQ$aUmeaxAsZYR(xSB$r)XG~tAogd3jm z(O#Tg7&;qd_xGk+r2s{YwAN_nybq#T=knXiFUaxU|J}|1e>cGH21s=`KnVaT5ddYn zK}Z59&Hx~(Z8k}{brjcWv`*_aTIYxcWk89u1T{`t>!J%X<7^h}Wm^|So8=c|7vx6} zE}PBGU01KMXoHd2rH9%TLV-jG3BmGEdJxM3iX`c7GUo}b8(@F}KtkpJa5sQ|n#}Hl zRf5UJu~hFp@n3{V>*Gl8@sBhI-TTax^L z2`~U3PP>N#-~+9HH{kQ75mV^X%0Np1U@;iG2!rpQ15U3uYY@C&;m-kpMeSkjB)}}= z&#T7QzkdY$8%knBF~_JFfU2Ec9k#^}%|6`oPj3s-dTb!@@ zVDF5cGAKn~`~v%Ht%zb`uD#72=x{gsxdZ*bjJF6e$m%vb;H(>dcEJB{Tf}0w4%aZ;+rPsxd` z-jM874pGC@vE|ubCl;m5*h1%rzXh87|mf(IBA@oeGB zL~pxL)g#C}}arC5MF9cV!wjLDJQgya%j}N?jIBG-b4iAj4<4 zlEld6V)2wdYCw?`rrc#!cM5fS^8mGP$|KL;TU7~r zGdC(KMe+k?TMtAuM`}U)(V`6};X3c08ROF4%*puFg*dkSU{}8fMilXq9rI&rPcE9T zzB&S^amor%X-^m|wpP5=)2rRR^4@sm1T#x+H5Qbm7syI#!In%QdwX7_6wwi8vw6E+ zPhK656G5Iv(U!e{&jAe|=E(Cyny@f~eX+P$_egGmyN-FQG}UxU6cX)Y0VXB|d%#+M zbK^$0$;bPAa#)N;8#RfAw9C5QQ0j^mA7(ZDg1N2_4qpLk^Z*Ct+YVY2v1^#2?QSUP z@(J%8p7GI9bKE?YA4U0}C!9JW0$|BZ#Yg#+Ip_JjYii98Q$seK205hq5|klTUb<pH62cdHjPyA-yyO8WDliCYPmV}O>Z*bfIGH=i%hY&8~%-_ zq@A(auwN1)?L-bdpo_%LJnmB`EE)Z`1UC&YSOZ0rIGt{^z8^&^Kl7YC(^uF78k6{qCNO5CR_`RLNmIW?p;cTUQ>qM!jnq-G z)M-DPpgwEfJhBvztR0BSDlKaw=~@bXZRd?SzbK4~E_->*%#NwuknyMOC20Olk|j$s4B%)(ygq4GCl(9FtDjtP0i)u5UIbf5ZKkF+ediC9-9(gyn2Hxg}K&H6kDgRvavqjVanh~_ak zW}S>jwn%N0Wt)hVrnZb(NrE5>)ZhbC%5SC;8V*~T8mhsta#@VH*V>HwTtQ?hF_stw z_S=x`o$vJrtJ@e)7)o!=y8H4I0Ar9*X!e*PQ)xZ3^dIjGn+1)>*eww#yx>grdf|lT zOGFd|y@*2uI!$A(~ZAQzG#?NwLVKhKmk$yrF%^LlA+V}4 z`WLN8Cpy+i8ee7=$}H7G17f5BnVM>&L0qHGh_dxe;gqj2ASv0%NRqh%VVIc}wh4kg zuIruYPAFB$I}V$;vvIJ#o|W}%apTV6(UN34Xt3MSGhk;2tZRA@jv}ok<%QPgyvr!; z^EmwikXTsIjLb@F1z)dsvu|C~o}?Zi4+6Zm8cOLnVKmw{q$bxeGc!Ha1_e2u1u4pQ z%$~0Gz9!Pz%}P*K-u=uP%c3y)+gzA&tR$|ssYvSSSrCXZX|}#O{~j-yX`_9sw=^t& za-`F6)w_VEa?MxAbz;vIi1}&UofET0w6Rv&Twwj%)$YyCPM*ueQTT13i-(oa zuABu_$-UL%eaGoYdH%}Dkz6icEz=!q@UG18#&iF{bgC-O_%$SWj44gEFRSNd(P*dSWR(;J5~Dnbn-~(&xmc=Q6j{gMO~} zl0n%BZup%v+w!?sJK)IVEk>MhYGl*SFiqy3_2nW>JDsr_qHqgppD^{+|!QyxBPNU-f z-m+TlL&$YrIsORs79ECF4)p)nR4;j;|br2w8KMh7-DZFNw_NLngHvsG#5zrM4feTo4d5-gV#Wn0JMx zL{G~KCNZ~Gy4Y2CyKRT-SLp0q%HMyP0Qu962jA&?J z;%|0m?%w=_!CeTH&sqf$_6DI~!ZEND58>^mf6V!INbsh^z#aXWkG(~LIX=gD_QTglb*?L-|=f|(Y^*zn4hos%5!sh z=>8^@C<6kHNv?kwPrNvn+kg>MuW#!27i8qECv+kd7n_g!Y00zL0U*wq(KSEWH>H-* z?ZxRx5|>)kwC{#AlAzcC!aZ)xg7=pqi%MN)r)xO;$@Dhj(`T*-@CP&2;yj@P_5wgET?s42`zlFI*Isr7O895R!`z? zFV|&oT@&6NUL5k@bh3{!37u{ze3^2k2uC~y1c2Le%6RfL(;&{O0?MIiB!TGQM6sl} zlozT0>q+7H?NBj?Qgx|rHqDRTJX?79I8t|taT(*|bWus1q@H0Q3cfPJUsd~Bn3IVl z?p7d}@g81SM{?&513e3vo_Cx?-*rlQumRc}Ycsp7oKQsocCKKai!M)6I9&x9WC5>> zBu4Wad_MSWr$4n~cr~`8Qq>Xy6wc{u8!uo8f&xPk2Ae8phhP4`1Wv7(Ir<74>T2f> zJv2e8qeDYug7^<}gYNM(PO5JpM-T-T1)`jitTL6hDmdyC%5q8=X%>-BRzLHw+I5ar zPL*#^{>nqg-Nz9>drguDRlc@*-M z23+UdE?+z@`N;2JlB}^gbJ$A!UEKn{;!3!HPucu=q}ovpSJ>J7;gMDvr!o$~t$BGB z%lQfxolAW~o}Ab2UcGgTFh1fNg$p0{4n+|!_YZsXK3A|dFhCWvTVM}f*@OXv2@>@A zx>NlaUa&`xEs=HRsIlpJnPcN~X-jUCZMwE@^Y)0hI}{t`n+^9?9kS zZ~y$R;Kt`w9{jDzzKmjkz_JmA5f{Lc^MRHrM5X0V;w-z0^%SAtoqSv=j9m=(mw1$r zb~<+jnZ}=)_t0T?`sMPt+4l>TW5uE{146B4ef)Os1cn}PEm^-JBQXjx9;&j||KV*_ z?m*6!I|x+VE}qlbdCe26!f##Ml>H|O8XaxNv3dCq!HENz5d>jQJ2j^op-8{)K+XYH zvDHOBt!tZh1+9}k>DSwC6B^y1h?c6=g;IXG^DY?%4K8~=EJr3@1tADN)2;$boa`z1 zom|?~CrdTGi;5aFEtIrIduN_H4yi#xP^s^VDu^jbZlj@U7LW^rzW(60+9|N`OcK^cqFB(BFdwVd53rfo7?V^v#oT zjCx|ni8VW@@O#C4hv14j&5yR^4}8oRtTo_=>(Ux+MzhSu-6fR@vh{#+3&u!#SgW)! zv{7gy{ou#t&w!6=!|*j!gZ3iyUTV`)`rKQX(8J2 z&olrB`I#n`iv_l$FsCB3Bli8g?KqNaouYecD`%eCJD|;--&90;6*xHCn z;@Ix|Mn`BC9gmO(DTHFD`pOQ|qjKsf#4~y32Yb7h>G&kNmgp7VGdarJXKWQBR5Cld zV}$c$BaRSf%*OJzUpW@ynH-6kMBo|b9gTGN7%fM~)~UhNAB0sIQTg!jVYu0kk4SG} z=nsD%k{y&Y|ACw|gOK_cu))qNC*8j>zmujbRpi*rTT{9Ez1yPxHwiK*#e{`&Z!!%} zF{#a8uVY=x(9&?;qyG#(DsK)W=*&gN@#ys2+^goo*~bZ@x8dMynEF?Dv} z&=aR(?<&Z_#$xwjTk?OE1s7cKQH3^!AyGpJ`0U=E_nT%{@6oGe<%?F%u87oo9z;fNEsrGmD?E3gUl|eO!O;2#q_JNqA(41&Czwn{(m(KR z#Na$f&RgSD|Bos$_SXq9=i96&|2ED~vn0UhncnFMKw_=xosbKYSCa+yv`C71+mRr>a1|B1^}yuPw=v23o(6(`qNZ9YC# zUDpgBtXi=MbxGMYsS5XTze}QYF`twfo~3eGy^VO1Y0FKiS9Jg4Ia-OJ+S;AeYP)bHnrx&*yUXIPC)(k|=A* zCq9nVfefCjI;IGtF_y#l$i)Q{y4s*bf~LGWp(b|SViS3@;YSj;CMDLIFW_H{>?UF9K0EG@XYv^|DM$J0Qj?-;1x+bd>OM7U3;BqScXsP~2}%|!txi1wO|kcwmVzl# z>akH7u>h#6uLDl`1fuOS<>Ewn$bDN3>D7)-wJ z*PUmq35Iba{TZqv!~9yU%p5GyqlPjpLzCJ^UHjXsxPNe*xEpKVsXPmfjiQnsS7UxK z;DzPp{>s!=T2kXm%=cW9R|?njE#OMUZbKxi3X*ige#Hf^mdZJRXFlSH()_Q^yRxOocRngM`@#`g} zJGD#*azMLHbxTt4tOPq6%!~%y1u8)?TR`UeTQ(82gpO*Hk*@}fOx-s!4wbm zptv*1$&l1mo2^!t-a7B0QX%}n zMWi5w%7Fz;Y!X8;6&IUncN)wcBt0Wk5Yq78`=wdVtxx(O|pD>3hvBzr0!*R5eTB zkN|)UeXiuof#|*O32t5v-hR|N&JlHRD#7($;^-v^{OU_yGA;)O1G7Uq-Kx`X-&Is@ zq{S4e-=)ILKW}Cc{_*ZsVcoVeG3jUX^Oxt?%E3@b?4Ml9Zydh_Ft?4<1xwD9cQA*q zJN(sGZ}25MKBIC<0*-tkAp+{gO~Ymd@%RV?$1wYdLy%>nHwuP(RTLrqw+0Rok8=sh z*WIZfLJtWM5VZ|{h#&f?9wN4j#X>Q0oGMQ8xcq8_D>q&@UMAE;Lxs&O3O(xXWt!FygE01R0J2`H7AL-NEtR z6&FkxndSuZK;`HVIqIj8M0GZm~ zaM}F6s=bjYGr!W>sTwrzYU3#3ZW(*jby<93bkX;Zoxv#uCLP!~b5#P3Es@pm?ECZ? zoyb2bY+Ia14=+`5VbT5z23u<^C4G{~qhFe+epUpfB8Bl+WbIMAa{A+;v0NAl53$VEX1xx)tlklV;P{ zc1*_Yjhz(#5F>{i#b21!W{Q`ctrkYN# zaGj%{SY8aKGGn^NL>bv;pupJ-yr$)mXE(#Rba19%nMgs_YwG;s#R2kD*kU?Vp_l?2 zJ~Q9PC#lu7(L{4uUFxRi_oK~ANm}nY2E5ns(%I3+c5zEj%m>*kN$$Mdzg%OvF{9Nx zX?^X8(WUd}A%BT`xqxhn)>@|uRu<7(W8t#b3D3^rD!mBmaK8UCfV$E8GMD8NsDPg9 zd5S>)hQh`3mI>!2wS9{9_g~1w_FDLef;w++nxTXTO1UMNyRqqO7>%>maXwK#z zDJrIYmuJT5L#z*)d|?W*+|F6oXPk%u_0xWjNq8tl(>I&2<$(b^_lgXv5^PHRO$0EE(#ffDxXqHMV9IF2bF-*H0H3=O2iPhZ1U1KMSdMv&>p_MLU^0Rj^GtLApUEOb zVT1vo7LFL;45^Goh}{N+x+O|VMhZwUP8U)?WkE1Q9*O|l7_AS=`{m?8zcRqwZ#WHA z>LXfX&Rzmpl8u~)EWjfaw^)<{O?5#EQsZ6V9-uAc54Hm4FgHSfGmS|ek01^~)(8Lv z%*AT~!6JaZzr2_Nz9oekgl&f{#{e+6fXNOI7MdOAAW4Bm6dDG!{dHd2%)WzPMnmOY z#ZLWz4W7fg#*Q&xfalufpJu zw=MnYFBcHO(7Nh;b9@(P211l+dEeowuatnM@RK4+pXNg7n;G?ySVDwn7c zIZJ`IU?Q0q-ARm;?0q}YxG*|#9U4ItZK#rJ3zYowRi-OXRXT&%@Bx$uxnH#o`{MS5tNH(9mSz`CPz0#=qz;e$K(Zrf#D}h*Y`>v1KcP;xmzxw0WoT&kA%i( zE+?~8*B5F^XpPk%wqtC-z{tqWiuaOEn`uo9F)ba{|AG~CQ*f<(?=&D znUJk45rufdY7p~xF?a(7`-*Rbffaj}Y+u72DIlYl2P!0Nr3 zM;Qg0raX&X;X;$p=@yjKHZ>kV$U=HuGU6g%F`g=ck3Zyz5B7Ab2 za!IvM+vPRx20|~ZVtqjj|HOX!(NnOFkUV`F;Qq@tFMh1ZQe@WN)n+!tOi62m@wh2A zXGgE18qLSYFb^`+N}VD{9rgBjS~^p^n8o{TdHek{tx__} zky&JBUyo|PH!5ieAw@Ld$EB=4hmyn8jYK>UAqJiaU5due)Za<*TKS_UZ3P}rC9QVr z+|d$#kfXF*%>A&I%1zOm6W3=iQ_VvtpAY!iN~25&S;d2ILmP;;JmXG3i;+ismM*dB zaaPR3M$CV$JRpk7b8K|alawK`Va@2&$xy9*(_H82o734+PZm6Hy{0}opzc=Z1)&1R zlYhQJF?sdTg=e>w)2>MGc*F3bx}{pndki*CpYvQ_R(H3yg3blsGKeva;@KiVrigld) z(JC#~6`8d!(7-83&}>=DbNXy`h`Fv20miYEPg;Uex$Z1*DrL0HnWGWNMOt_)CODQA zB})?Iml$KxZs2NU?|0&5z8AQCE6a8LaGkffAcwV)9FN2EX21=!aS7+zqIJlX>% zv5|t`zo8N;RJbY>Lk30)=MZ=qOvS8sH$pEqn=E2LCE$^^`wf5 zVhl|kACO%Oqu>ttJ5=&+6Ts)|d_<&$uze9ryPpO4q?oVLaSmejIuYzAK^=&!3Q=;x zLzcxRKLOa?tes4v9m+!_5`2)=#)|*N_e@UoX{hj+WpT!aaJB5sOa_sV1ENu9JA{TF zPP1lSQj-!@VtVIZfzUqnAHtqwy}WWPFLp~$BLG%jVi%G2gBSbU-t$ML8XR$|pVJ?m z%uSxWUV;VF@;l|1b_)+H$u(Xz3{%3yD=TKUT;I5}0_F=h=O}nR0glME4k4;(DpZIV zrMzqnx(}lkD=0vU(}Y+mz%oL}`e-TyCLpz(+bnjU(nv40`j+V+P>Uc{QPc~l2dZ#+ z8RxeHZsZW@CYDyZMWLdsJzrV6VP1k+YO5BvB}?ixOi z#_BWD_U<=VGs2IwC3QJpGi5v}{xEnpxf({8_Z6^uil88z>QzO_(O3p`nPcsEP3vj1 zfV~OqV)%-0k+7NX-VI>cgmASWp18=&>el6;3kp?7YJeD}!RZkomXrHS<(Q)Il$2iw zEjy2#4Z*)fV#W(NTXa7g$ZXG<-#bcDkWdXQiHrSu4J{4HG&9AM_ZN{1B!vCFa#ngZ#5!)_*PX$+@e6FV5aW4l0NN@B7yq9F;M&4q&uO$&BW z)EGr`!o?)^%Q?rh^zVvtdsR6!h~YBg6W&S0*P@b?!V?TM`N`ZU46;r{1d&ChBGj#* zZ0Pa4(D!_#m(nfRYitu&O4l;8*h7BWX}bWmbRr)UBM6sj2(NWVZ?5RKpo7s5eCf~m zt&5BOL<8dQJg<<>Jf5Tej}8w1y@#REKVYO8M%t5Al`)Q<>qGU)NLh=dwBW-rMmkf* z%hHMYpOk0b$byzG%iht^{n+UXFv0QIiq(AZw!J#E+80CyVXaQVfT#TT)cSNz6u%$$Tm#ASYW%l)Vy~ zPY*<9tAH9@&VC`*B5{)h-KR5`)oX|^O4L}IvoQUoUm=%vzlIC6AAI420@na#wOW|i zw;pB8mEH0vzQ-MkGFuaQh*44y4S1sz^HoYOU^VQ;|eiYW^-Sy*n>UevI1m9_YSJi2af3Wje?idih zPU#g9=yuQbO&{7|pNB7&8NUrZcXEo#q7tF@;a7f~@++oeNX5RW1=m@hmZu#}!x%82 zcl?VuhX~^-n}0rgUO$nZGLL8l5v|EqF!&5TXbcE<0=c;bzOP)*=y|mU7Z|83a-P>H zr0r^d?#E>-$cR6q3z{*J^bw%4|BLb!}1XBZMn=ts(-jtsbTv0 zMCVmQ37SjC$BV}Gdby>qPjqn{d!?1*MqwtADP@?GFgH?hCh!N~@P-F^<6ZflQg0e} zXo10Wn(v`4snq(xT&E=z|%@>WKyz7A+UJd~t*WjenA@W%Q8l zd6+HgyiQG{Y)E=UDMwW+u6h90Lz)xxN$@Ggfyz_OhiYFh0P|1#5`3y+!ckP+1Vod0 z9iE5+`7_J}*ox;t&tbK0AcQA!?T9B`JDq<5K7McYU=cQwh@O0&&*G#mw>xc(ld?gf zl;?8E2(L7RRQe?~+KB9oAp~d^IHBW9MYW|coP>u_3?o6E!e~*0T zD#Z9n0~$)yA2+W9ZgfZ(p|rxdFtA{f0{k`u?lbzwQ5;QRcw!>_PGs`A+#PYGw?;o0 zfrqhr(=^hc$l zu2gGRm6A-H=m8|J%!lWVkQ2_Y$Z$0*AOVec<-v1lh+d)o5f&i+ z4VKa#d`=zD&(9NS&9;J?5I(y>2wddL8ht8m%&71MH!PKkO(kkvW5=i&u>kwXezvu% zRjxZc%qlB0lFj4~tU7YY45OeGQhE?D;X4gU{$Q=Efv3o8esJ$0J6=Ph1r93dn(Nbh z?d|eR53O}auP}qW2C*3Cn#g*2jR{MK;LJIrV(Lu6j#wA%ced0A@@)+zn(0;v*LINK zLL}^Ywspz(u=>+{b|hrkYG=f!GlCpvbqVb=4l;6*59H7DW64{)NDIq3yVgOBU~q4? znKr*AZ(6#?cSAwnuklIhVl)?-@7QMo)Mz(i#m4*jtQq#3Z_KBq?2Sm|6ZywCVTS&f zmPz&~;zfl%H<&asxexKKXi|qCYk5Km0#|7!3`dX9;2C%iB4H-aPE=5NKz(ZGCQ%sz z)pRCPR~k{B#B#^>sgX(HJUJHQb_lMRtAEllfw*iDrdbyTU@6u0Y{a|X_O>i6a5ry@ zl4A*1!5FWx8=F_>Sn_8s956M%!U7$08=&tsPt%lwlfQi9{z^*KS$e$T`RmXpP#*LF zMY+c_Rlb>Y2Fe;032Al2S2Z@YIfGvRlq1gl{=8&bCV`LLV}maTIJhxBtJZm8PyPFV z=$Ve7-D})Y!)3uz*kHKL&eNeY*~d{HMJ&|p;Ybp;J+Ej-dRR0wRSwtd9>+uC|^M1eyXSd4BKFX?MkhH93z@yY^~_0@eo~bQ?s@Z#$GbYL8xRg+e#N@i&+Ca6D=fYg|6;c$(W1-^>UMubg35U~gZG@= zi#wc3(2+<%Jzh{xCWOI2k~ZNi_klLxuEDc&%Emmg;4YK!8NmtPnKOSz=@ZcC0N4Io z%1{*NEDzQ~{p-vj6-U}NQj1>2_cbljzVFZ1bMtq{!LOB;}_t@bo%rzbEiW@TIlI=WvdCPTHEBB5l01rz? z=>6akKtYmlAw=kBjoF7u2`5_JrYk%IxM>XWX#k~yd8|!U6>y-KR`9NG_73-NC+W>33m2exY7eMp@4?+znQf58%h3umj8D}4O zzQeru3!gP8QuwKRTfNU9Cv1=#nnK@s13fqcU>#umg|;Q|!2FB182FYe=gC^}S8>P8 zU>N!(zCr(u--hY52er1=;7CMA?X9z;{ThG1yEwS{CTl%6+ZQ7Ig|NA{49Ko&Vqxwx%-aY!RfvzB5%8_?_RY|h1jK@Xd_mc8J^F?{*Rn=o17dTGemP`@mRgst%RQ+i650N zGHyfEEAtnQ&eifS+9j|4VA!mFhBnM{Dc7#K$eTFqXb`F;w^*HG6^VJgE_~(0x%=$V zxFmW-U*FM?<5F&ggI_W}I%=0-%QF}AsCIGa2a|=5n?IJ*g^K0j`RgJxgbBk8;tU^q zkFYcn!66JpBlp8`TE`V#M{l2h|9O}UYKbX~)tCh&9NqDjY}jdEK3BEH>PO7VR*=JC z4uuhgH#{N<%d&R?d{PabZ=D38lHuolwkc@zGTX4Hqe@sUgU~m+-x^1$N#$+k<-5d6 zfzTeVh&x}~xU6WI5HBS1(D#uo9ebTOZP;0L*v@9h6TRch`?KDSkvd38pacbCNy~J2 z$<1e^$1nZs%{wKaZE$KOIbsew(hPV4Qt-_Si@_O^88$~8g_O;<-60IbkbcgH14tZ5 zW2$hErpbObk8Rn8)y%lyV8u7ah%Uo4&036FKXvCuQ-A?;%#A&<2ibe?lNfuNIJN zP3m_|PlYgeXw|^FNn##Q;PkTvDc_V^w)xLt>N-g>4#r?CrUJ1w%DnTfp<;ES{}Rr}N>sG&f16qwBz~SR0Tp zp3Q=b+1%IpydY@Tw_?YH6X=ktCI`5ZOu`>QJ&M6|0wrbww~cIoHl~*DYDkTy78; zwwu>QG@2KU7PDtZm4f?WgLu!wN|%`($_n)xiOyXl#r`>cq$AkhEmiE?C@zya6AqfV4Vta?+st6(P~+N$qq*jaL;{nku9Q)xMBg7X6`t3NKOBB_<-)=jz-v&XHSX z*fG6z`PzDK0{IUNDkN%;@L%#?{1e6zjsU{csoSX{#OGym5)nKW! z$^o^&ReFhM+#$qe2xc+Exa+g)-h|XGe@Ow<%X*d*eY@d$$OeR{X zlAdU48%}XOik}~{o4lws8K@SR>Gw*wfoN+Tburny9&(Ht+I)|`_U65I98&yokLM9k zmzBn|BCpudd=DMywIugK!_gUZ@x=K#wicUivx32FkraEQLSJJ$6ieO;r(a_xE~s?x zuj8A%lz7%!mubGx^ZDbh97HNVa&eY>cIwR_}Pdk59R2-*aDy9StwHZjJ8`LOrI@+>oUB2b>krJD>& z_aQ?==l6U1H9nOeW1_&LN~NaH^O}Oh@(4zXi&6Q?9GhT3s%q_}IKCXVgtFU$y?Mxw0G%DJZ?Cp}IKNly3r zJ5=0u66_Xuls$}$aQ9el`!#*=R(3{sE-N0padctGWKg`c%#cFDlV$(Uit6GV3-oaF2komQ? z;TNumUAGEi7_?2+7_LbnzPd4dP3bPCT4bON@|O@*?LjM6(1Ul zk{qS9)-^qvw_+vyWHc5MNj&yCQ%)nts|2_jhzZ_6yfnY-peG*WFiRrq?6AhTkCkn7 zCS*@JZK1QyjP@pVG#E3VH`M4mT|X^>NFp2DD#lMSC5*>3faT@I9W%40CjOMU3Q_{# zljW1s<8mWiWb))>pzVoS1=lZ~+C%j(BX7n%!A0j!sGNKSL)UV6%Gai*2`gF$?-0It zSWUzUw1?^vV*I9+$%T+tj2Fl`okyPP-IMx>&bcSN-$CtAuykpYJ1|M#X2O8YlPw`c!GP-m^6aOIMYVU;pGCHk)atQ zi{|U;&wFuNSps9%+}GOl(lFxvsaXD%L%~Bj8k)-3RPW)J%V0{cuMru+{2;3Rw?z|4 z5*s5b?f``C-dchN_0nwPGvA*ixAE=CyN^%&?=+!Sai?IB!uXcz7ePmXwU4bgqif*9 z_;ncK>qJ-A*at>#?~dqIb-(I|8{btO8zMPVf}1cO!V;{F6r}CfCS@bF88-7bl?Kip zi<$f~8o=jIs&-nHlS@VdG*HQH>+Bak1ZrI?LEkgt0em zS&F6kSLBmiV!DvFF<3~MU%Aq)`8Rxt@t7vGMsD^S?zNJiE~H_vEUXl{(!pOg5zQ!S zuz%A%;N^_u+8b~!7^(ILYW78|3bA>!Kk{2-VF18}YY6QoV zDvf9P2-c(HfI^qz_$#xwc;398Ke2Zv?-yDVJU#PwHN!%yIk?hIxlgxe&gE#=g*IRA zC$kr%UTnMF420nL@Lx4;O6ab$$9NMa(qPPh~|6S0iXeHMY&%_)eXqcgsV`cozA0z*t@e%i0lI zKzjOJ3Y_(U63wt04h`Z>qjs;vPCucA)4Mhm$su}xFj6`h?gzV*V7G_|w%vztFr|rh ztk)^b%T{;g{u7~OOS_DCucYf5PCB>JRG>8XV}8o^<*MD^E$9Zl*`!)ZL+}TAZ&a!J_iV+Sydbv$)=B^Mq`qIWb|xd;4Z5GzmT%21CuY$O ztolbMD#zL3MRph!g$MXcoZO?`*@z*F*PMHhqUiTUjUY$+od2`{GV7VcidDIE%3>`A z+?Jf@IyTYMr%n_*-D26FO!#fjwoX=?8`lj?2U<_A&_`3@d72s?Ecyu=EQZ`-^&wJg z*q4%D_y8StM3dox)uX&;d-VXPJ2v-Km`qR zpDmvJI6tYlTMiuAALoi_ZAn!_I94}9R1ExQ{TRdbZi31EQt9vk((0)2ao%b|lnv%T zy=hvBVyP&m*qq};K4XOnF8OV8^PX!XXm~+WwdQnywL5mG9O{l8jo<71a}DS0k_on% zPS-ps%gTXt%E7uE!(u+-o5SH6No`JlOH@?Fo*G`gRuVtTU$D8fEl%I!pzx2I)}BUD2oj<#ouj? zZD{(ON4$;~9NMwRL5B>T$_~8o+)LY(uek9xyE=mz9!KEo+?GrPrJa!L3i1DKn})9= zO=$)>;*oMMML1dDg)>ON_~Abya|Tn*M|GC%RD{a%rE@*CX)1LRtDxJDtE`Z1)xLv| zs`s!_%%O?mH&YwaW^iWJBOfzE`n=djqv4GoUz;-*CO=_X?2sQu41#mwg|PZwJKB=( z053q$zZYDve>GQuYNIR%a7O@!0t*5TeCRV{_TKh~rB`v1>i1}1@5KiD7RRE8jXMh}Ohu#d5BH5!aCe`0 zhrd`!e{@;`-c;Wk+i)uI?2}N5V;Inv*VuC{mv!_haQ>vIwp4ruA;B_#w~ z=x?F#sbqUA+FAh3pl;m~z&NyP2q%u_R6Dh;is>o%c0VqaK|_8nXzz8+oIsdZrxY-e ziXaie;kLpS37j!I$yizHk=_S4(3EKKwbPCzS4PEM+91o=MDnLU?mZ|KJ6=X!o!H6A zp(%rr+#_nZ%dZRqB51&$gF^3GY#t*HNntnVWS}UiHC*Jqp`I`mt_Xk%Z?{&xUZstS}NKbPTiZ zh)!|CXwnWL45I}~YT<-*Gld*?Ifg_Bo2+Fu=9M3lpBimSE>OHuRn(~_BNzr{cyZ^; zUZ(PBQ(!6}sR({=sUj@!!-yrK=?*zuXJP3dqzJp|kui!$+myw)D~w?()}|BEfsYIB zqLzcey+?bqP`+u6DKOVgo;e{6unk)7IG6F*mXU2z)HKg4U1T}0r0oKMRXfz$%C-j< zH*V;K0<(`#!Vju+2tK6wo89iOx&zdx_|4_#nB-VKi7!9)OBIs8TG&Da;{KILGUIDW zwInxp;&E>i5v}i|$gS{trUY)Do%OXWh!alN0z0teOg;p}+GV!9{p_!GdP?lqOWUZ% z(AeVE-+cO)HU7-%;D zzH~N>?vxaUG~#vx;fLSL8kARv3x{>zyyOqf$idc3J59iqkP;~xgjIgNrCPLVMC;1( z>Y8&|bG4-*V|QPDzV)`jxTKjoQ5~9@GV80ZLbdU54PrvB6@lVWD)spj<8sqQi5vq$ zAy8nPbUxpsg?qnXP1;v{8zv`z^=4o4SG)@sf)}IW3NFm8uOHI+t89i;HqDS~R1Qmv z@W}@pF0vzT`!XTplq>Ohcm2AscM7rRoUmoYsg>7_S7Cn+J40|e*vV9hl12-eycaf_ z3YBUqGaPHs>2t{zhFcorPkd>3>+z@3^lp4>&?*e|_-ooP_{dOI{s*Me3vI}lan?t3 z_yu0>XE5YU?mWEGmV7iaI=`1=zS}!}`8ZNUOKdCTF6gpHn+EG6@vW?fPwZUTf?%ZN zotZq9GXqZANW4uU3if)Z*p0<}iM{Wz#{hhh&=yk~%xKx64LuU7gis)!t+T6%XC{hU zo!u+;f9q}oyDbSIVyA+t@Sttbx*b5W(r&XHYSiq;unY^redeK3Q#Gh!VL{yk(gv$u z(~!>45WY(TpTzFdMsYtP;@9a4m;M290qR}|H}g(dg=UpftB18&TRClfOZ9W^ZzWQd zwQS^_DbOeQ}~bpt9FYm)<+(g0kCMhO9`Da5<{J~b4J3SfJ2G`5r`i4tUR zm*!~}+%7)@tx{@YS2D8tpdnsQp`qT2Oat&Go_yW2=k-ASn5Bfuo(0_e`^H|XW zcoqA9HvEZX5`j)O(r6#vy_jtsw~i~4nlV0#SY>+5dQx55A>of<;oKA@)>4 zGLpL*m=k|$hAzr-7urqhR&D9`dzB~GPsuhSY8$%zFTwW^lNa`UbQ!^HS$3w z5+amL7)5R&6{5zey^@?^T~pmAFspMpnnKj|t_9x6 zbNcq*GRwneUk?X_GLhhF=$u%I?;(mg22-pKN> zV0tRnS6M(F@?~3bv75q&CC-4ny^%;rl!71Cbs0yOmKArOi%KY4th$L`JK8`&U8bO! z;@kCmFB@yONnf?}OKo#OYb#<+d#Bbr&bMq~(Fe)e3N4h7e0-B^tM-erXq3$W&rW5e zPE5@MUUY*;RKbUJt9&>4zCz+6DhE9F#i%kOjy4`Zb8vH0;1ztM3Y;}k`;Ubs{oYDj zd*KYm75d|*{uB&b4xj?vt0Mc()u&nyoAmipeQReK7xZU9=@X17dYL4<9a5GEdU46F=AlUrAQ z=LBN2-BQ<4#!axo%d_|DNikcus#lt(jw$e9EzuG6f<7KwL`sXrwJF#+O%!FJ>8@d2 z-I;n2c3eu-RvLB4kfCsJ*tuK=$5OhJ*Ofr*y@du03gkKEewaVmK#tCx4TC>ugN`P` zo_WBLqy@Y7`jmVCEY0s+QNom~J66O=S<2lzzj>W%t=;&bJjp&~Y}O&;?v8;@%66Tg zvHQY@bgXJKgoJ+zD=62R!|zfkR2!{Hbw~LqqYw~4ND(8mk(T1V|NS4|N-xSwA;J{q z0GP6tCys?k?mjAIh$;Wd*$;-73BZXn zmrqMD^XY>0} z0vw#m^@h1THX|OAmMk>ZEv!tXHju*N?a3g_4mHiSDnl+*1_2y=FW}h%rvE`-px_~M z&ytg=c%Elj^-iDMV|XXl$2VLqjm@Bowl8q@9M%<&I8LR_Xk+!l@mEKz<}Xjd90JA( zp?oC=AhL==aII%v?O+g7{6&m_Ked6;Wn8GCwqV?aIAeN03@KS$`@KlgX8ZXYgzvr^ z4kB;v{y!1evT6g_zSdaWgZHle~2@i%aqxo7WrYdYuA5a*RfA$oE|xkrj^;<{FtD3#dd(iRgTA{f zV@7&=G~{L^>-Tn==J!G&NBxRE;78?~s-<&>YaR<_(xyN(BdH>$KUkuUwfBoGs!(OY zP6`%%Qcr4+>cY3U1ukJ3@^U2+FFK7DB2l)sI#n~<;jcBWP_@Fz4tB$<&2%H81U`A< z+)4&(3uJJL=cTj$8|#1 zejA3+V-gn3o8tL%et@oZ_EkFeYb(&`?x9>XmHhwGApdH-I>sFv&O|;Lkx5O-3Jfl3 z+FVLWn*@qp{bM z{KqJd%Z!ClB9ATf+S+cShe2o60uctF#ZfSKCYj>TS%;=Nmq$(7$g*nmtBY{_=Ztt& z#mGYp#6jt)KjBYJdHCLGtd|msusBFDEEgcO+VLt}ZRU?n-1_GjVHMZ>M53?01bpb+ z09IplQ$x8|b}^3_LRS42E;!|M%{%ih=#y0^o^HuF%Ob1Rt{k@>cdy4b1m&pUqbL(7pA$LrUE~L%0^&Zk3lxi8~wFhxMS+gnrXr zRHsVL1vq*Bi~&BdEFq-O zaP}g1M&4#@@bO0Hie?q_=|YQ?kGmw!kIja3DNcti$AVYxwb6)u}k2RvSoIZ4E?HVfyj@LV)I9lgWv4rGd9kx2h8 z^NwV6B^X4#s5sE;Hj6CA2vhGjA7AIoMZ(91NRHCJ5TmXEHxZD| zxDT!4OK(C-Mym+h7G`XVN^;@=33h0x_3Xy&?lin-swnM`#+rxFS*=&{N8c?b9{zaB z_5vW+c9alIPfEe0D&qU`&mn@i)!E!l(}RN!<)tuDIL!{IT9!l*CuibT9U6Fe)XG4< zrKcH3tp#|#gF@{?5|mXeJZrT)@&~xxGAa-U5VJqO{XOKJA9@AG-i5W&;L)@4qWw2S z0bB6s%vcC}r<^L=HE6e&S5L#$;|O9Dw4|W`Ntgw_u9@t9PtOaRo0HyMI*^d;(rlYx&ZhwqRlZm6qIX92`AX zw0iPnbh((1R=u6*c5^kll&KDxT=0gJY9p3h8?TNVjx#asRcj7^ZAMtM*?Iob607|o z+-Xg;v9Lmu2;38iZ1T807CJHFoHn-w3#5h&!UTG|lpZ~d@nORY&ej-Lje#Ll?Q@&n zux(YS>gmOruZ$*e@5=eoES6R@OHBBvTmJchi%9ntie7`TKzV(MuYhTBQs~&Bi;x!% zL#d&%DK))2-m;ZcXb7&c7S4P|k^8z}3dhTPQBw?g{Q%>;YjB-ak!dcWTf4dJY`K!F zO+U}5pjy@V#E3G{J6Ir--8n(I!n9lZ+OdBN-mJ5C*U4NzJa@i636U#+fqlaosL z3mUt+0(Eyz5DAcGv?0|u(o&fqZn{%__f5E&WUD=ou?= zjehHV_;)&z-s_c7oy&_#@*9GTXV%p5ZXFUL*zDLOt5bxxgX8A0IARGgE| zusZ^VytGDz;_2~|@?Zgrrt$gq&35yp;N7Hc52xHNt0C0}>m27E1{2jhTBO_%1ZnOE zgCOb25BlD6-)Ni;cxaMvzb6*tnocvqul0R17@u%tsM&4bnc>vq;}mGz2ZKW4m)n9> z4g0n&QeDY0H*CGKHePFoyqquk%@~YzqohmY6yR2)5@tq}wPBkn*N1_pk>rL~`)-kZ zlPf`=TJFv(XBE|hizovS(xx#rc!t-vF_8bR#X}^&r+2kp**Bmtc%rabmW{C_d*zYa z4t?*v#`ICro#~kdPY7rq>vQ1-N*ZI?#!6v@8mlXRe4^y{xren!^0^x`sisGnlSpS2UkC-62aK1C*y9LQ8o>W=@rcZc#khTh-Mu6&y06t)r@O_5fh>FTsPa#aSl>79m^vzcRm1x5Qps>mLgs(P%!xiR z+M1L_@iU!rOQ(g{-=D1e=dpQlaAI`7o?+hfXFVw_Z<{!t9yP;e`E={{dheC9x_@Pq zR@Fh3Li*(`Ftpe;@oh7+IC(?L_+Hgu06N3)(3N9DZPx=SWpp(QHUIA^c+sTtaS7wZ zgK2%q@i!B(zjXCN8gu|T_BW}1KDbmZrq8`ti@h6Bj7r>&H{?xP8cfI3(KTr`{>7*i zymH4)XMuL9cvV(%d}eZxXcj8C-InGj>(uVyR3bWQ=k+6BWO;~gYR&CP8LZz7g%bWe zS5#fvz98R-iuMm-ugf0AjC-gjMdwDi*(LN;00lWiz;lA`K2JA!8B4$m-RNPvOmUr- ztCsx+m||YC^`*AUvi>9P&)ZC*?>1MW$)L3y^rP<3 z60Eyz<>iO9R7SW~9t1y3mF?eNDEO@UPo0fKJ6BSh1%u!imtN`l#rA1@%Dif>xqNs^ z5==gNiJ9t2!nk;WZn$enq}pe`+CybAQz@2#o!+Z)4JHmV05lwj`-?E6S-esTd(<|-8_+9>qjce~_kK~tZ@T|j{qS+Bmrol4`2*4Ys13(h)u zqgz+&YkL9Upm922Ic38PokqrL`PKqHjt@J!g*xp~UvQ0%Uo=9LKwJt-3qZBb%@3&8 z6%Mqq2T)-6Xi9BXP@%~bRvP*;-P~uLXk@P!Wd&O_4QN-$=+qj-G=T z(;aq%`r|s2F=kax<%qcchE#F;Q(AvZzfbc9UiKjr;=`6_f;G@yZUCLsYtdIpsM4qS z!+S2d*Ay_3OcIzZo_@bH*Q^Cmja$ zEq$zhW0v-zz0NeG>{kK7>*no zC)X8{(-afmqRVk&ycPb}rgg~;gSH6mJA^4mDgT+cK)s#WebRK4J%tU5ofuCnvIm~F z)E$FwcsC)|!HMKdbO=}t*+0G9b83ok==6gg88UCGm?~Cq^wipbx~X&<4-tw@0e|y0 zAf(=a^psUaRPB&0UdMr63sn{O72B}aN;m3?yy0QTmHi0tLKnw<;Y!q95OC$9fRN_A zAr7f!B|Aez`cOUyJ7+IvZ%U*0(-_L|<_r6+%tjtY3J3V2ni&&Ui}t{|r!_AY?Sr#t zFFQR!%MMV(L?M<>UGj8`^i=6?Hx*C%L}vt#;JbM!CbT+GkeW|vY^peK^^Bl*k(i64 z1&2&mw*={wSV4)MKW>qZ{Z5#K8D*@qdzo#bfYa>UG(-8P8eCqnxLEmOo`MxN{ZyF( z#>nw>b{Mkq@@>;Xhz9jrEH|A@oi3WojmCU$}GHX6t}!{)@* zAc=uj6|W&J87q2h!Jq_+-Y^=-a8KSeR%@`#=s$QA^oq37#~`(wnG=>~nn z9IgLUCVeJPFimGzHa|K-S)YQr49=dOMaUt!Z!wxK{({*hQkF@78{hN{`aNss69SEe$Zm4U1L8RB7;?t9{=w-LK3~^fYtgN+zzc8k;Xw zof5~;FS6ApYLjP_TEtdp@-8FX?z8If(89tl!AK?*?e1&%ol2x7yk(kPjw$h^dwpay zziVRpTtg@Y)gEkmV(Y@;+h1`%SerXl7MxkIDx9sSABD~=amjxxwl=(uej%zZxy1Lo zsI2`>?jM^Zn0HM53BXy@p`DAc6nT1w!&qB#^#)QJPDBN+nrVr~h(PresVVzzv=> zWGt$g*nM2b#h>5gPQ%l&k4-{sw7iX`hggdlw*=g8pD*s*X=8n zbpqr1u1%6L#hdm5{LJ)#I+3YwfWD+Z^oi!%pi)IhGmfLkRy_htlbRa1l@a3M-q9$S z^!(7*saT1Wt?(_cm^gILq5;zl*i#iHj~Zp<_@A3MGL+8vxOH%hDAt-*c}4A&yZIrI08C0$x|TMPypEmE@$Z^;CLVGZK}row!4jsc{jtz? zG<(T+hJoV_M)_%{CC$&zMLM7&rg8FM!*Qd;+ZR+-Q z)|eeHnnLJf-c0RK_LS|Evrv-Ce?+!_m5OT%4>43_LAT%4~J2N-T7mm_IYF> z**cN7%=3zH$3S?y0_+4I@uOxq?uYuloSr}J>BmuB4N+e<>ZO$t*OVE5Kt<*rTLmMJaVI_Q46}1uc~|z6 zll|n?RR`0O?+WUD+>MO#($1guV_g-L@)r^Bckkue!zI%AQ60I+aw*c=bq#i`+^bk| z|6dYztJb$DE40m5fcn~-Rf$IvzWT6TMLeZs9ZL4J4`iMm%sUDG7$cvc?A?&UbkNB) zG2IIyMz$E#d7sC?M0aW-kqAtxfFS~hG29^IHZJ$Wz6i`ZC6h}XusGQ`eyt-WTKYkA zQN5>qhf65u!^-ZG)N|eink&muW8n+aRmu?;3hQAHgdkQuF$ilKtw!hsaHt0`mfFb z%JqGH;%eI(uEFi<{rwYUqx<3G2b_Cym=aYLN%52#y4+lQ(I+eqc~Ruo@~S zi`iqvCb4qg7zMEQsKbTE#b^6OioC{9H=b zYb&R4W;Sw>t!jSN4zW~5`8=CUlaIzUwsN@NPU zJb1dU&`?OwVGLqsw`q{%TRwzVcvhkXD3VqeH30O$G_xci{#XSrp5vaH8UWelG&xZt z)dqo@<$D}0Lu)J(0kEtI1-eX9QrXeD?m75m03pp;gKsjg{CF2@-G_@NCvlk~eMp0W zBUnle5Fq_>J-w+)-!cs?GLjY;5HCO6@MImb_{^DNq+J89K^EJwHLQEma5z4m1M+|b zerJrYZ)|nf6{Y&ZV7`;nxr>bPb;)l4O-82zFqi^2GX(sZM-6~V^sb=_?fA`YaRb&_ zx9~6+{#J_hK-{yec04(CK&^mSX=yAhViu{@2tuYcG+as2xMO5`Sf+PB`^mSzRw6X+ z#e!IdzyE-nN8=u`a#sK3>8n@82_R3bBTN>k zx;8*B3twrU8IaCpWx0kMGTo)LHusLU8KkUXc$O=d6_9S9iLb=zLA>=|S)O(Ss%nV) z*&yu5de{rW-vIqcCL@HjE|iGOSt?|OAUYUJb+)ga>Qex9XdaX`oCUdnjvqfP5RK}# z7MJ%%FoH%D26T$nvW5Z)l$`1ToJsB48yy8xU zD8S%tq;LUvfm0&Q#yXqp7i{W+0fek&mnq&%-_s=i+=&8Y?X{K6u99i;?CpNEtb+3uR*@Y3@>H^*ZC1+HB)}<`K zZ~qKXL!*i|c|Cr)zkj;G*$<(A96D)i=1lWfttYi@S-lDmz1^KP{{hi?F3a{I9D*93 zKs5Db4kF-N8w*l1V9?5E{>g;V%k!io-(WVsPi;A6{9skNK)N1kuyVMo6AwGno!L87 ze`YHJws`hzS^9kIS7Y1H2mAK`c9;a65=O;gx|z^V=h*(c%j;T759wZ;wevf%s)yjR+iSpvJy7Q6pS+X&p(5f z02)+DLHgF~O6B#f3Tj{!0Jmus(vo39MW04fO&%&EjqOc-H?jZYq|jRnGcz&QA+=Zp zDxlF?J7M4^A|78JhL!3p9&99}M)|fq8R2NiEtYv35F4Jct_L49jj>VO~J-{%&^5}3k_??dzFd57PMo(XW6kA>p z<-|k~RO}1yzK^aGOd>>NPOKkt^Z^mtF8X56c!$FN^~G7^{1xah9`gua)$z8OTQ=>MSxwNw$gp8^ zE7I?Xq2}^nv_51!8D&0X?m2R)5Kw!scRTVMY!|@$7VXHQwM>+4S1&^GDl1wYmjN<5 z-qg*|folaph@@T6*Dr-Oz8i`IKpv!dDUtiUD2paGJoAibczkZgQgb}DPpy~acCa9f?L*FH`#ys!43k#K{+^4&2`H zfo7ve=h+ov03o{oU*rgMNZewvPOOC1QDP4yWcbsJy7z&JiPLkRFR*kL|@fTZ<*c$g-D_q1hi_C3J{0}50U8@(auYnw+a(m zWj74)F$<0yVk*tAGC4Wly{&c5(9`G2oYZB+=e~s*F6t~leI}2rnP!;qLq2Tf`bar0 zXWr>E<|MLZ%(%JwLza^qXN zA97~9mG~K~rqQW1H}A>-{c3VM?Z{FqFd;(a;98{P8}$CS7RwK$t45XkeqAcYVGTDa;L+L zG;j$l!NUcu3KTjWTUr_mk$S}A&o(}OZ{z_%^aZqG z<)>Y{ra}ZY$7ipNWKW$Fm+A|%9I zru^lf+ztv!;~RV@D-XR>TV4wes4+kPh$`t$vy6MJcyh+`tzDbRbA`DUNXzFN0utk3 z2`r}uV^B(gU-Ow@17!G!>f7G(Au$AnXyNePc{0uOKFRI~9fdxu++46d4PgLZMFjXZ($U ze7ha(SQjYvX@`+_*7opVIF71)GdajJ;5vf`ktc$lnl&0l0R&zXvC2I<%(Xh$nW{V; z7V^k{l79X~e~Rx=aq5t0!Z^ler?yQ&Hx6jBh0E5MJI+A)Iu+~;12A#TSqYMEmIm5x zP_55F4jXfa$Drd0KS8azM)g3CdfRM&%sq zFbT6nNT4Dh;V?aM35?4CsL_zG24bB!Nbo39D_6_Et9ZiN$KL>MhYbc9oAaH{pxE@* zUcNCAlq_P6l_FKUH@gIEU}VE)Ob^h?jJ#~frPQ?UwO8r@s+ro~kC&GK`U_qn(9rKD zhWUavp!i;;5IUSOVud_h~t$DJsjTd$1eG2q>1EJ6~N(hQrr*cWBd z3`Kn{=n~0^XkK=puS+9(toJL*{R6~NYbnL!-u6Y?7d1wOW`7T$mYd>6&$qWF^pAZ<2Zy&A4Gq)P^ARy408CX426-Ru zQ0t+hE^k-N%$3H`A+T`Ptnc284HhysyvFF=`!3(Wfxf%sYr0MagHDkc#=N}|SI+a# z@AT)NOJCnt`FF4LR+7LMktV&CZZYN(&g=a8TJU;>a7U+%uU_`>*oA|Dd&x+Y{PnrB zzVy2-C!(W6e8Fk)@f-%3k#k&p75F;E6q|KNT~M*yEpARM-J005`hiVqKaS?mNJywi zj}bS4pk`%7#rXIL4OS|33p&UyLZVabdv<3fLExy2#5X>qIq=jXn*c>=Nf6$I?$Z6F zRxH{-#Z5{gaer8ql45T^P?iRIB<_b8BqB$IH>_@(egkYqqO8k?^-4k6d*;?>#&yF5 zA0DgKhiPuzwIl5Emg+9gSeJq_BzEH_NpOyvg4`PHrzgWJ$g!c)Xs9@(+vTW5!L)YI z2NB6?HJP@;9MU5~f9aEGgydWMy;28SPa5>*8ug`J4XbAVesRU>)$8>1Iyy9YP>R;m z$T}UFCMRn6W};N00~)e6^;X=KZCK{X(LgGvT}k&PJG5JlQXC!ouaS61LDQi}xxJ0b#8e>0BM z@_}dhia)g)Q4WE%rrBylYm}3))<%5Hc7XO=$(E;xsQ?g9rDg;!BA9686*}*rd4$Jr z-!4Al^>boz1ISGu?x!S^bb=WO^3?)d0!lW9``K!+XW$aS3F3!06Uj&UZ!u(|4LK=^ zYy)L$x$ag4aW;7sE;)%zBae?ge?EhI2yT@PE-ob2M!Y-_c#SR~}KxP<9i+Ry22#|zCBFU3uU!$-C0F7H2jy2IO3!@#(h;@&j-v42$R;U_5n5-vcwtptFo2No z`mj|*K5sRe07yjBGM!~bGEpQafR@$MD>d?Zy5+BdTqKki$eo z&k~7@h6OkUk);L5dwN(PYj1!*ZxKBP8E2doB1k8KptJ`R1pu28> z<7~VAM?M|4ZomugJ2yYwekuZAUq8S7VDE6dTU+y>ysfQn_rAN9#>TYfLf!BV!f^vv z&2s*2$lFfvh&WkkOkc)V3^Uh<>9co5@5E3G>;3yy#&1nkKHb&Bu$%++B0!cw42qt1WamLKDStxP~qrrI^Xr>I^=?aE%#$< zW@c)z`<1Gc6%|UX%Mm+~Q^)h$Som#=j%Q8-`k9d6Fo63NNuSa?@o<(4mp%?^UF}rG ziVwQ5^!=N^W}I<|7)C=Ye80z?j3w&ieY&se@)mm!zBz$FM@Atz3BzdZ_0%h1hkuxt zIyOG5cQpE^dZE$JG0#`pKiz)tVPNYuRQmh!xx$(8LhrmdpB=m1;s6M?oPI(F6YiSgAjIP!`C{gkN62Hcr-(AIc|Ku5_503dIHhS`aU(} zb{j_UP*zXst&5fLXLEYrggZOQxp?pWR{QCL$8Y|(Fs{Tt?$z(Ns;$$B&`tdHamp){ ze)MhEP%!9rhg6^xcd=I?n0VDe43Nt}?H-s>P#e?ZkHhsLGPz|Kai0t<(Oe4ISmr~I#^`rUvt>64ax+e~33t&85(3l^H5epeIJBU($ z<8{`M{UUdoUPUK)0hl`}oP@H4kO>$Jp)!n&B^#B&K;&%^3^F zihbLJzP>4wtU6<0qr0krFyPJRG5`D-!^R{|IJ*>PTM<6#th4O-{W|=jVb0mOagNwP zcx?2}7?w5_D4*T)&@+$aWs#J^LE4#COfty4b8%DiwTE&gkZd(zVYL5X6`2_%E25X8 zQz{9Pd7ul5$81E62w>XK7Nw>9f6w+ifo zSouaKIjgIy&5g&(lUNN#g=cduPaE4A5+EqV9D6o za~2qy2UkcHUIExlR7PgMZPZCGENv=Qrq`oM=+ap56DrKxWEyXJrE%D9i)&JaY)wl0=ZDg^85;lS zD5^44aWyQ1k*1uqta57Wi4SDcByB{fsOS*)zG; z^p#KUDQd?gU!le++L`4<$PSAFJ$tA7ozj%2J?q^oTnVI;kJX5;u~|@7ONa~j z-JRth*A8*JtI~WjX7k3!0T$^JlxYJ;_mp2(=+<1Oy@)J$7EP3^Bng_<+XCjVxt}g^ z(Y?1jR@F*9x=un1WXJb7wOLk8Dj8`RVT!AvN@{eJ+Anu}Ja5(~BdwauCUe@MIR7lH ztI9}fDR=tf5tY>vWEP-b2#^RBu4<2YkNncUeVafRDl96S;N;ATcGCC?0S&bRpu(zU zsRw>>pTxa^B~W;!nC8_`v!eK{28#%b20}V&sCgI1q3~h}+#4jjPM_xZu)XKz)H^GW z?J$ng>?lC(McN~UAJEVZg1B!}%f<}5$w)A~9!xeC8VaY<$oBTvz!sABK4jBUuZ6!} z+S`L4>fRoI`^Q}bmt84f)BJgy5Lg(W<20P~cJ2DXO|@NuN_h5LI1^s+w#`NLV%D>A z)1C4wn(Nt=_S!^B{FKCf+5OZP#vm4EBZ_=AvUn{G8!u#nN-z!@sJXZnkcgB}zLk-Q zkz-|sj9gX-X#!^b!GpcM2@lv{M=;3H21Jj5MAmh5<-h8}$)qR~QSdG5K2bY&wR6nQX?$--m33Q346ky;#c62dWc*}LmVBb8 zt}^U3r0V7G3x-%2`fKoz^1$HdjiDb0*nWk9lJdxZf@_zw$m&-2;oPqp|vc0MaB zY3JD3#h>^lEFi0K0qYTjcqw6JAMcSETxd$fd-)msa4;=+{@&3@g?>d6RE>hFV)8%0 zK7xebE_tGR_RMcsL$owZCO8lJ8k$EN;OTGe!#r{bEX%5{0LWJ%XnN=Ssh(mr#wnasb@=?cNu`z0&D6)!T8+*V$!zPuQ7LuKwZ0z>+H@YOI$#n44@MmiJ6{G zT?7Qc0D%m^qaCA(aSn4&!Nuf)-QTBbLV_{gmFFHA#X6E?WEKJiF|qnC$5I_K0@tn$ z%rLtcouQBJLiCs#jfOcnuh}$RGHmS2U1kr3VA+BzDtn8tnc(1=Fv%A}UmFb@GQ^IK z!y-a1`FEu3oII8)or7N05(!`b@$PZ2qJ5?-U5*~lcXsE&wy&{MB3F5=FCh%gRw3EW z(Qu|mbiXXoLsUDGeE6bal~c!=GaY@3>>|7(*r_}(BGnLt{qfCUQ+ya-Fz@W*`u#uZ zUw<9CN2hNt?jO#c`B?X#)4djtS27fUI^hJv+p}EuLc^EUW z0ryPAd4{Wp5If0yfQTA4VRYmd6y&d9Ku3vejLB+}K+o{zp#~F^hTS)z8Ykjv z6Gs#Yq78j`cX8jo#TyR+rjRK3Flq6&Q!;J-NYx{adi;LFhR2@y@P4&?&tP=J4H3s9 zem)+HjOM$-UBjz&JnhS_uxKJ{WOm9MV&R8=LGGU($=zO66ilrfm;`o{uwij=VOXjX=Hv*weIyVt^uYW3 z6eg)AB2EJYvdbSI1@pAmq}~3+!sOPHl!PJrZkI0|gFhqZZOZZ4E)EL5JfW7D=ymzx zxjSJqiA59Ly*D~~wD9$w?qNh+>A}g>L-+^Iwo(svBAsu=>}j~5=8Jja2b^F& zw{O8btvLaTgi$jNEIwS-r9;h0TP{bJS}Ot_QtHdSnj4$sl}p7>O9vG^$fL^;_E; zU0!^&b(LIjfrMraKkbFe^NdJ8>wp-Ny%CHu>FfH;%fAI=(HH#6^KdWCKPq|`HTJWm zwmN!ZP!ID&)L-JBt3Q|n7zWsPoxGiMCUj==6+2v!r$3%>5JDMI64zUQyqm6lYs0Z> zbMwc?@^|0Sun5^vVLf1aFGxgC9Al$c!FHLBC1f*h(#aO{|4O@0%7DqU4EXd!wujV~ z-QPbeD*D!Mhj8&Y>1*_$vx{j@9 z?*09W#5F2I2sxbicpB;2VHDy`!$M~`^NI|R7KJ$fJ#eN#LWn}SaO4cao{<3%IKTr3 z{v|2?7LgPam!#rti{xHb=x@6@W~KQS?Ll_fFJ^~Q{G?pX2K&Rr&uKkfX?!knSqcvf z2IBv|tFQ#4vZ=IUCT`bGC|IFee+St!r~+eu!Gg@4MLHE3AexvOj--uJpZ(J-ZnRI; zhP(=*6}u(->Lo$6FQD{y(Jh7<{wb*_NVvd}w#Cdly-6J*_H5OX#^%nL;lVcDz@dc@ z#wSru_&?-yS!rK(ZP``tN1J_BGz{qcQxCd`UaiH!F4m6Z(QrS#@!@00J7L)4y8 zC@N>9e;Gg)f&5E}J9?csN+g#SO5Tq=4Lk(tE7W#OFO-^#~IyF(*ZrSTjnX8kQu zz+Q~8J_-5;cPdEG4YhzEJ)lQ_&`m(nNDCb2nG#%<9*71r?>7UJgJhVsuP{sz23*(} z2Dpqo;-C~i3=G2}{ljqh^LyNB{E@<5s21<>?qnwmqR!U0}Z6r<!|?lX9d#mTGMq#*C3rv!%KCtn!nRf15RTy zT`EZ+M+49oypv6%igkQ-Q*Qe@KWV<}cpA-!M`M@}qMuDJb<&jcRrgUXzp15Ysy$%b!z^?ht_^LeR%AvK?gFom$n3Ky(nXKNZO20x6`>g|V zPhCqXuu6?){0O)Di$zIwXMD9Rg3A3}Q9pF^SCuVLh7xc8Y7rA<8L0t`#33>vqd!}9qbG8!aSvlN2^`yA0sL!&A&pT`EUn$Wt9=G? zZlgR1Ma{j*3s61JYxE{l*?Q%Bi8jxwCH<&Yq*VUS(a0;WDH9PoQGZ zSIV#9(xE}Aw6;zfcm0O!ZAg$OOhxszGTF_WBXKhsP%CJrR#v8)eC32byGz9_cEA1<+*FkxqND@Qq%-N>eJUU5cRIeAQ z>X*QhAsO4Q?@FD(xhs7e)T&x#5}K-CFH%G)+z}VkJ=iLf`m?Wb6l2MuVm0$n%Y7X7 zQXS)&!10I(>UrqbDyF7{W{ENxkJkk$_1W_mp zm)+ex)O*C9^U+~p(^X1&0EpIyw;E{RC6Hi_S8du<)tQ;;J8V!|zH#dD)2YqnrKxF? zCfG$JdNM6NCMu_3aI_#lGSauz@RJ;p$sp+`4riQfE4L-}Oium^Pmv~ag%63+vNCDn z4Gt$$1vC>!Fig|G3dVQR%4+gA)3b}n@odsS8Pz&^_B6BUIv%YuMBlo?((*EaQc@;& z%u4FGSXJ_N#+&7QpuP~tPg|qp!b~Zj z%9cvJIDrOgdioZI+b%c`6PoX1)tRxGg>K+!iV3`QgcsS_R4|f$t`#SCsN74CCR@Z^ z1b|xaAAAlM`6yG4wX55jkkm>urg5?3s8KAso^B>OEJNLL9N{M<*O#+HSs{r+Cd>am zvK-Da&-L2Cf3K_O1e8#+a(-p;y<&X?xLABcxtP%Fy6$}q23=&2M&UiPVb96J*L=!_ z&CA<`kcb#%eeE45PApgjM3e)w44$C1q5HS$k>e%s3dEAzEttLGNr+ClUW(S!1Fz7Q zs0Pnycdg1hDKFlpZ2C9jAVa)hW2~MEGlY_dB3Vvm)0wc_AbH%PVI;i91Sd!92VF}L z7|A~o^<9n2(Y2@_utk{2P0o-oL=;?LUql+(S?N{n9VVhjT2!0HZi+r*&??Vv+6C6s zok6nsfCp=R5pt@va3)<@Z;wa_jQNn0$6TdZUCZN~ae7SxL^X3xP6Y)+;;5}G{@@bZG_$6mR-2^@S`7%1))3_dZ4X^%{)i(7 zX7=`90X8%BYHn6x=IHdZm53&p-hTB~V)g1`r}(V6w(Fj9(xsB6{T$};rBTz0^XDr} z-341=vlfSDDbJ`;L=Q$P?V$G zk*O5?<`^tA%NJM2GvYX`{r+x3*xFxBO@#w+#uP6o$Bwc0=8KD>X;ovk?@Rjv28vqq z4Qjf&CrrQO3)1i8)-;IQcg7JOm)X@FU+vwjDabM_9&Q*n02J>A0i1$DnkKd&LO+8& zI^MYUDdj1O9q_ArsgIG%JbC|~QL70wC3aB-1>N18wC54|vANM#{b5rX4Tm>|(J7>X znns;&PXc0sf&v~;7uEPlGcwYoe=4&YllIv@${_w|TGW5$QL){VuHCWbZx{0@Q=v)H zX;+<|qf%`T1J(D`(=lNhIC}Oy(L3HB`T28Xe-VI?GY6b^G!q#;OYgf&*IsQF#`_T! zmdRe?@re4u?d=@>@I^FjW*NnoDkxkw%CyqA#~#39-u;_Fz=(!wn7i>%jx>K<5u^+v z%ghg-6-J{YClT}_c-7lNz%iP8Uuw8_W!nr23z>#8#@9Irl3g|5>2RU>iY;;wY0NN@ zQAV?T4a}~Z@=b(a~A*x}b85BB)pwG#PDt3Z38;%Bd0V&1VNp_gT`B>1BglFa$!PCFKboRM&9E0mPWcNs4aG4Xo;?6U zVg=dknDxEu)e|NIuM`w%aHvV0wIQce8yXo_?)Tosxu?gOws_LY`?+0Mtbe*OVXDvS z(s`Ppn!xvtVdbHb+MLo2nTdM_N{>Tl6$pv;1R1k*#sk2j>M|P`U1$vb4KlhEG}&Pl z+=Rw9P}sOMq-^#~8S}~&@u-+Cg`#U!S9FI-9gyXPgl-T#j)s*GIv9_MhXw-^D)>OWb|#^ff4lsk*fi3^+o-uE;+SuF1Q$+;XUvl8^47{J0f()d>3}ZmUAjPxB;N2D! zPV5Z#i^M6UW~@8?V(PBjj4+~AArfftXVPZA7AboAVY1?iKxCu*kRUk3WLw)BLzT(J zY^>&Koy=^9A)UwjfrXHgg(%;m@up+PHi5lMZT$i^r?;+9z}g**=oYeuxNc8?b~mQZ z$e~~-f3f^y>5KCrUb9Y{yqHz2LV{(J(bcf5gQZ?tr1pn$*ADe2X~cF0I5(sX*oHNk z1O;@alSeFFjoW|>Yfoxc;u1@?LS+1eb*6K4pDoiZ?3YxEa>ee$)gFx$knt5ex2^aP zDKPDO#X;_Hpp)RLEISTIf~tUx4gkebU>6B**o zwR@}{yKWFn3?tO7a}#40^=2OiaTLSYu1w~PCXaSF69rHF42m~@TN_DLmInby#tfwY;P+EPwPeCXmWghkBW zBojfydmA9to8ty|z|G^rW}#c6f2hz&eomoV-M0LdX{M3b+vVour;5)0(iWRGT^|L$ZUi z$y4E#s<_gC3A^>i8I56*$n|Ixe%vxdYX|E2Vk;S)9S5L6%`zcd#-41b?cQ1KHi_pM z?K96f-lMwWYZDnQD$$^4J6gI+8n8H(=rDiJ^ly4LI7fAq425awqXwxlYSa$1Zc1l( zekKVDuV4DuxtS(KmBDIRP0%YrXH3Z_#~--qP7(4*@(vVob1hvo&_203iV zGnT|CPHO{`eA7My-lx}{YJVL54j`_!X}t4oomFf{#x4PwpzbgGrax{RxM=2uVaV(c zd-iTO4t^jS&Z8pHupJ%4X!h<6QrXWE!k_4EY z5QmHcpMrmUi3ojI?15jL4Cc%az{ZP=62k1idq--oH}DJJ`%^``lDnm!Gktdkrtg2< zl<<4$nII)5!zr&|{#Zz@(7(*lP5UJtezC7wH^&ZwrtIo4lKHS=JdsPD|CMW7ViTHU zl#m|s4&C9?l6}K?$&7dJqt7@COV5Ru1WNtu=SouAK0kj6XmBg-oaxn+Q;Ukj2QTi` zzf&@QuQ+1x%E@0UMm$$I6jsAUOPAaIryY+FEQfwF&p8@WK%)el8Sty!r#BzYk5OLw z7kb^e%uiv;LEyNXUfU#*b?Z*6aN_{}`(qThHA!@ebFh>f(~FKQoxem^bLty+c>|#D z@=CUeDIj!OU$E^e0l-`$ zfXZz%6cm7uA9I6oTL}avYk8J)vnTTF7c#)A}ybQ zFiAy&-}f&`nRZIZD$;4P5E}!+!Epl}pFo@JS}9V9mAj^>P$g+nYJK)dMc`s$(sXTE z^&z8UIIK@NEN+hk>?r^*i8I4}Vsc_*W%9fHT?Lr=xW%op5ZM zj_JDkK55#$3*Yn7oQn`B4c(vR z_gjU#8c!Hqv-o-Z2HZW&4D!#9W+g>Ldxbl=OuPBtyPKSsG7=?)@{2pGGlPB8M4<^G zk?w`0cT%@??{9xTLOo%RiG_+vusC@ctjrK0JCO4O7OMuhPbF~y&kaPq!AOuY84P>( zc>&!77tL`=VqvVCfP6(rb}nAyYCo=rB21e#VRH?=!)3G(XEM8wEO3i0Oq9e`B}+YQ zW1$BGug3zhV$`yk-Fyy)g~I^$m5B8DJE20%dhA7bz_X3@kX9wj#f6EnZe&3pne7}R zqlH6nZJ&c-F&wz%s6y;C??vcG#@c#FldFJ0gfvfGcn>VwKnuW|f=v%BU3gDfi-z)s z{1bH9kP*Wg4D|B(0463Y%PpsbEI5ESWS5txL2ua>BvmMs)S^@NwoUX!ZjH%m_P1}7 zq)CZHbVobgo_Dp^6%_$D>Xfss3UCml(Uw(5qzQjHVS<$pT|s& z{V7~f-~bnH)~@)|&=1r!5p*Q9szaT!J1tewk4#n5^r88UFaJGr(iE-!A=N$f6PF;HM zHR&+h>r!U=yl3~C9;o!T$g+5OoOa&Xr1zkOMSdm{mXqOU--bDQd3oPfV}RPs+!DS8 z-~u%1SYX>8KxH-{J4s%q+p3}M)32x5(vu;SQ_g2k0y^@|pK@TPQb`CZL!u{AQ>)jm z-LVKDWUnp^vMh-306IFMqWp7aCM)^(H6!Mo^-y{?4{|GcxiB=(+6HHk16xMSf3IdG zXJ)psiMUGxSt6)peijL`oT^ktd2uxeKR?Y86 zrE}Ho2~aDo3CH|R2f6~aYIi%By!Ge5HCbY#HE5W2t#?PlM- zo3+cHL@u>W8pz_b=k!vRmQwVtL2;w&oZN-`?Lw|he9BW_7&-q->!9`*p#I?hu()>s zB+T)_MjXR^D@V5%=oboEf>SKry`-8b!CdensI zyx@sP9nw+%mO*3ebUHgK%(06R41a5ySutb5o#k%(TWkiWXei@tn`Or$PCqBVZ3Z_9 zZg&hSogK+=&=%I#1;!g1>2Lo?4sQ-K9(m@&bW>9l3%STt?FC+whgfr)d5%ZTinnNC zRG2rhNbe`{elZ2YiwFqzLO2Rjxa5)qR}yp)UkZLxN0g2AkWI`n2Ztx@hE0#*O{ePo z@~$I0*4r8t1RB3$f`#W08+z@G@<^tJjXuR^TkFtHPv=Bmefh^v&I3N@R_DP{m;+zT z8qb3h>*C>PbR#$Y_(#+KJ~+JCU)@5eNULpMIx;9)AJ4E=sAI*q9APv}BVpB!4MTfi zXv`)I8iYHN+KwYFLK(pfR+U2Wf=!r@9 zl?3bfGKGj_xJDF2zxr5M9dDN^@?!FcDj?X&It`A(OcGXKo1Map?`EVv>Mp}qi`$lv%)>Av{W22DAKQ-Txta6{czr&xFfKPPbVsqPB9=oxn7rx5Uj;Bd}Mgb%kMvj z28VfKfc6Lk=$|uB4a*1b-LLc}1CRvVNP9Xk@Zg5ZzEW#c*&#zMRHT`|Ft;(X2*du6 zF4L(;N%5_crvOAP>AU^!9HMAxF<^;Yn%0vRu!*!G)vb0bfci!%n$?xYYknP&oR8ey zItc-55Hn`4ifW&`M&_ebkGF!aG~@m+Lo=E)shPoctH0uff-@IYm zF;^_)ik1iC0y(Q!eD)ONs%B5XGli!aSwI!SwuR4mUV2%tixl+WApl}84MYKHG@54x zzGj~)@G$moWT<{n0de?|k1B)f>=jrT5G-=?Rr@Oz?C-JMgl`2g9j@J8XzUAns3NO)E?>W)l)c%iBj2p_V# zJuzo0ds%P(^knZqIsV}gfWHg(UC!7S-6CUB_;CEhLXD>&`46Up0AhUZTPisCzOKou zEQ36Ekxy_Fh#7?vtT$DX#KcN#YF9X^p6Fa(pe{fNl>lx-Q(M~fem0$C7l8c$dfN*l zxS)esD6?Bd;kb~30sxCx@~xhJT|2WQfapL$2+phMmKoLvBQ__%I^Kdl3Gj9#I(z?g zT3ge46u_=Pv_Jg{>Ya)8r0_0krL~x-B&|0Upv253kWZw$NG~tt6;%H|Jdz58l)m2R zL`MBx=JDjcTLpBsfbH?pPdpJc5#qP2CQoRYZAR;eH>V5W1Q;BSO(%Hg_Bf|3S~2vP z?DxVg|1qr=Q+^yXB-@(pp5Qp22nws`dYnkx9_%4*=CkR9NRT1U*yuO64Qw8JgEJ5N zYqyzvJ>O$X3mj`cl;0eq4^R9Zv)uOS0;uje7= zHKD7K!d78qArsm~*@>b&6V_zKxy5C;r%)q5MAqLiMl-?GqR1A*q3v*zDSc&EVA$~zG$2w0$98#B!~EYnYC z4|k_*PT(t)?~(45&dG(og1Hdc*OVZMlil$$|MuuS8pzDd_-+kwmZf(8yJx@oN1S8N zufs6F=)Gr0r_o2t4W6SZJGamv~}lqR^MTIFQ0bA15umV~(F z5l!SWpfNm_ZKxX@K8=yqPY?y&*X67(!#&xRsla$YglVFX{|M67Bh(Mh&MC*zs_=MHG<8e%HdX)gDSnUs@vkjqWR$Ys56K-u

    Zyy?jnb_ccv=zaPhZfbd!rr3?|dfSizcVf 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 TR62 Date: Thu, 9 Feb 2017 20:54:56 +0100 Subject: [PATCH 501/658] Link imports are now logged in `data/` folder, and can be debug using `dev.debug=true` setting related to #741 and #681 --- CHANGELOG.md | 1 + application/NetscapeBookmarkUtils.php | 33 +++++++++++---- index.php | 2 +- .../BookmarkImportTest.php | 41 +++++++++++-------- tests/utils/config/configJson.json.php | 2 +- 5 files changed, 51 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a87a8c..44ac06f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ Theming: - Add OpenSearch to feed templates - Add `campaign_` to the URL cleanup pattern list - Add an AUTHORS file and Makefile target to list authors from Git commit data +- Link imports are now logged in `data/` folder, and can be debug using `dev.debug=true` setting. ### Changed - Docker: enable nginx URL rewriting for the REST API diff --git a/application/NetscapeBookmarkUtils.php b/application/NetscapeBookmarkUtils.php index e7148d0..f467a07 100644 --- a/application/NetscapeBookmarkUtils.php +++ b/application/NetscapeBookmarkUtils.php @@ -1,7 +1,12 @@ get('resource.data_dir') // log path, will be overridden ); + $logger = new Logger( + $conf->get('resource.data_dir'), + ! $conf->get('dev.debug') ? LogLevel::INFO : LogLevel::DEBUG, + [ + 'prefix' => 'import.', + 'extension' => 'log', + ] + ); + $parser->setLogger($logger); $bookmarks = $parser->parseString($data); $importCount = 0; @@ -179,7 +194,7 @@ class NetscapeBookmarkUtils $importCount++; } - $linkDb->save($pagecache); + $linkDb->save($conf->get('resource.page_cache')); return self::importStatus( $filename, $filesize, diff --git a/index.php b/index.php index 3c2bb1d..cc7f3ca 100644 --- a/index.php +++ b/index.php @@ -1528,7 +1528,7 @@ function renderPage($conf, $pluginManager, $LINKSDB) $_POST, $_FILES, $LINKSDB, - $conf->get('resource.page_cache') + $conf ); echo ''; diff --git a/tests/NetscapeBookmarkUtils/BookmarkImportTest.php b/tests/NetscapeBookmarkUtils/BookmarkImportTest.php index 0ca07ea..36425d8 100644 --- a/tests/NetscapeBookmarkUtils/BookmarkImportTest.php +++ b/tests/NetscapeBookmarkUtils/BookmarkImportTest.php @@ -42,6 +42,11 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase */ protected $pagecache = 'tests'; + /** + * @var ConfigManager instance. + */ + protected $conf; + /** * @var string Save the current timezone. */ @@ -65,6 +70,8 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase // start with an empty datastore file_put_contents(self::$testDatastore, ''); $this->linkDb = new LinkDB(self::$testDatastore, true, false); + $this->conf = new ConfigManager('tests/utils/config/configJson'); + $this->conf->set('resource.page_cache', $this->pagecache); } public static function tearDownAfterClass() @@ -81,7 +88,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File empty.htm (0 bytes) has an unknown file format.' .' Nothing was imported.', - NetscapeBookmarkUtils::import(NULL, $files, NULL, NULL) + NetscapeBookmarkUtils::import(NULL, $files, NULL, $this->conf) ); $this->assertEquals(0, count($this->linkDb)); } @@ -94,7 +101,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $files = file2array('no_doctype.htm'); $this->assertEquals( 'File no_doctype.htm (350 bytes) has an unknown file format. Nothing was imported.', - NetscapeBookmarkUtils::import(NULL, $files, NULL, NULL) + NetscapeBookmarkUtils::import(NULL, $files, NULL, $this->conf) ); $this->assertEquals(0, count($this->linkDb)); } @@ -108,7 +115,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File internet_explorer_encoding.htm (356 bytes) was successfully processed:' .' 1 links imported, 0 links overwritten, 0 links skipped.', - NetscapeBookmarkUtils::import(array(), $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import(array(), $files, $this->linkDb, $this->conf) ); $this->assertEquals(1, count($this->linkDb)); $this->assertEquals(0, count_private($this->linkDb)); @@ -137,7 +144,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File netscape_nested.htm (1337 bytes) was successfully processed:' .' 8 links imported, 0 links overwritten, 0 links skipped.', - NetscapeBookmarkUtils::import(array(), $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import(array(), $files, $this->linkDb, $this->conf) ); $this->assertEquals(8, count($this->linkDb)); $this->assertEquals(2, count_private($this->linkDb)); @@ -259,7 +266,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File netscape_basic.htm (482 bytes) was successfully processed:' .' 2 links imported, 0 links overwritten, 0 links skipped.', - NetscapeBookmarkUtils::import(array(), $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import(array(), $files, $this->linkDb, $this->conf) ); $this->assertEquals(2, count($this->linkDb)); @@ -304,7 +311,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File netscape_basic.htm (482 bytes) was successfully processed:' .' 2 links imported, 0 links overwritten, 0 links skipped.', - NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->conf) ); $this->assertEquals(2, count($this->linkDb)); $this->assertEquals(1, count_private($this->linkDb)); @@ -348,7 +355,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File netscape_basic.htm (482 bytes) was successfully processed:' .' 2 links imported, 0 links overwritten, 0 links skipped.', - NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->conf) ); $this->assertEquals(2, count($this->linkDb)); $this->assertEquals(0, count_private($this->linkDb)); @@ -372,7 +379,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File netscape_basic.htm (482 bytes) was successfully processed:' .' 2 links imported, 0 links overwritten, 0 links skipped.', - NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->conf) ); $this->assertEquals(2, count($this->linkDb)); $this->assertEquals(2, count_private($this->linkDb)); @@ -398,7 +405,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File netscape_basic.htm (482 bytes) was successfully processed:' .' 2 links imported, 0 links overwritten, 0 links skipped.', - NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->conf) ); $this->assertEquals(2, count($this->linkDb)); $this->assertEquals(2, count_private($this->linkDb)); @@ -418,7 +425,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File netscape_basic.htm (482 bytes) was successfully processed:' .' 2 links imported, 2 links overwritten, 0 links skipped.', - NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->conf) ); $this->assertEquals(2, count($this->linkDb)); $this->assertEquals(0, count_private($this->linkDb)); @@ -444,7 +451,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File netscape_basic.htm (482 bytes) was successfully processed:' .' 2 links imported, 0 links overwritten, 0 links skipped.', - NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->conf) ); $this->assertEquals(2, count($this->linkDb)); $this->assertEquals(0, count_private($this->linkDb)); @@ -465,7 +472,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File netscape_basic.htm (482 bytes) was successfully processed:' .' 2 links imported, 2 links overwritten, 0 links skipped.', - NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->conf) ); $this->assertEquals(2, count($this->linkDb)); $this->assertEquals(2, count_private($this->linkDb)); @@ -489,7 +496,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File netscape_basic.htm (482 bytes) was successfully processed:' .' 2 links imported, 0 links overwritten, 0 links skipped.', - NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->conf) ); $this->assertEquals(2, count($this->linkDb)); $this->assertEquals(0, count_private($this->linkDb)); @@ -499,7 +506,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File netscape_basic.htm (482 bytes) was successfully processed:' .' 0 links imported, 0 links overwritten, 2 links skipped.', - NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->conf) ); $this->assertEquals(2, count($this->linkDb)); $this->assertEquals(0, count_private($this->linkDb)); @@ -518,7 +525,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File netscape_basic.htm (482 bytes) was successfully processed:' .' 2 links imported, 0 links overwritten, 0 links skipped.', - NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->conf) ); $this->assertEquals(2, count($this->linkDb)); $this->assertEquals(0, count_private($this->linkDb)); @@ -545,7 +552,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File netscape_basic.htm (482 bytes) was successfully processed:' .' 2 links imported, 0 links overwritten, 0 links skipped.', - NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import($post, $files, $this->linkDb, $this->conf) ); $this->assertEquals(2, count($this->linkDb)); $this->assertEquals(0, count_private($this->linkDb)); @@ -570,7 +577,7 @@ class BookmarkImportTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'File same_date.htm (453 bytes) was successfully processed:' .' 3 links imported, 0 links overwritten, 0 links skipped.', - NetscapeBookmarkUtils::import(array(), $files, $this->linkDb, $this->pagecache) + NetscapeBookmarkUtils::import(array(), $files, $this->linkDb, $this->conf) ); $this->assertEquals(3, count($this->linkDb)); $this->assertEquals(0, count_private($this->linkDb)); diff --git a/tests/utils/config/configJson.json.php b/tests/utils/config/configJson.json.php index 13d38c6..9c9288f 100644 --- a/tests/utils/config/configJson.json.php +++ b/tests/utils/config/configJson.json.php @@ -24,7 +24,7 @@ }, "resource": { "datastore": "tests\/utils\/config\/datastore.php", - "data_dir": "tests\/utils\/config", + "data_dir": "sandbox/", "raintpl_tpl": "tpl/" }, "plugins": { From c31f3ce0485f42439433e91e86bf14b8fb7375ab Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 9 Mar 2017 19:54:48 +0100 Subject: [PATCH 502/658] Upgrade netscape-bookmark-parser dependency to v2.x --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 57851e5..792c43d 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "keywords": ["bookmark", "link", "share", "web"], "require": { "php": ">=5.5", - "shaarli/netscape-bookmark-parser": "1.*", + "shaarli/netscape-bookmark-parser": "^2.0", "erusev/parsedown": "1.6", "slim/slim": "^3.0", "pubsubhubbub/publisher": "dev-master" From 87e9631e4aa7c9f535ee9f97ba3db595117350ab Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 10 Mar 2017 18:49:53 +0100 Subject: [PATCH 503/658] Fix namespace issue --- application/NetscapeBookmarkUtils.php | 1 + tests/NetscapeBookmarkUtils/BookmarkImportTest.php | 1 + 2 files changed, 2 insertions(+) diff --git a/application/NetscapeBookmarkUtils.php b/application/NetscapeBookmarkUtils.php index f467a07..ab346f8 100644 --- a/application/NetscapeBookmarkUtils.php +++ b/application/NetscapeBookmarkUtils.php @@ -1,6 +1,7 @@ Date: Thu, 9 Mar 2017 20:51:28 +0100 Subject: [PATCH 504/658] Fix #773: set Piwik URL protocol --- application/Updater.php | 17 +++++++++++++++ plugins/piwik/piwik.html | 15 +++++++++++++ plugins/piwik/piwik.php | 23 ++++++-------------- tests/Updater/UpdaterTest.php | 41 +++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 16 deletions(-) create mode 100644 plugins/piwik/piwik.html diff --git a/application/Updater.php b/application/Updater.php index 27cb2f0..fd7e207 100644 --- a/application/Updater.php +++ b/application/Updater.php @@ -1,6 +1,7 @@ conf->exists('plugins.PIWIK_URL') || startsWith($this->conf->get('plugins.PIWIK_URL'), 'http')) { + return true; + } + + $this->conf->set('plugins.PIWIK_URL', 'http://'. $this->conf->get('plugins.PIWIK_URL')); + $this->conf->write($this->isLoggedIn); + return true; + } } /** diff --git a/plugins/piwik/piwik.html b/plugins/piwik/piwik.html new file mode 100644 index 0000000..0881d7c --- /dev/null +++ b/plugins/piwik/piwik.html @@ -0,0 +1,15 @@ + + +

    + \ No newline at end of file diff --git a/plugins/piwik/piwik.php b/plugins/piwik/piwik.php index 7c44909..4a2b48a 100644 --- a/plugins/piwik/piwik.php +++ b/plugins/piwik/piwik.php @@ -50,22 +50,13 @@ function hook_piwik_render_footer($data, $conf) } // Free elements at the end of the page. - $data['endofpage'][] = '' . -'' . -'' . -''; + $data['endofpage'][] = sprintf( + file_get_contents(PluginManager::$PLUGINS_PATH . '/piwik/piwik.html'), + $piwikUrl, + $piwikSiteid, + $piwikUrl, + $piwikSiteid + ); return $data; } - diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php index 448405a..b522d61 100644 --- a/tests/Updater/UpdaterTest.php +++ b/tests/Updater/UpdaterTest.php @@ -574,4 +574,45 @@ $GLOBALS[\'privateLinkByDefault\'] = true;'; $this->assertTrue($updater->updateMethodEscapeMarkdown()); $this->assertFalse($this->conf->get('security.markdown_escape')); } + + /** + * Test updateMethodPiwikUrl with valid data + */ + public function testUpdatePiwikUrlValid() + { + $sandboxConf = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); + $this->conf = new ConfigManager($sandboxConf); + $url = 'mypiwik.tld'; + $this->conf->set('plugins.PIWIK_URL', $url); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodPiwikUrl()); + $this->assertEquals('http://'. $url, $this->conf->get('plugins.PIWIK_URL')); + + // reload from file + $this->conf = new ConfigManager($sandboxConf); + $this->assertEquals('http://'. $url, $this->conf->get('plugins.PIWIK_URL')); + } + + /** + * Test updateMethodPiwikUrl without setting + */ + public function testUpdatePiwikUrlEmpty() + { + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodPiwikUrl()); + $this->assertEmpty($this->conf->get('plugins.PIWIK_URL')); + } + + /** + * Test updateMethodPiwikUrl: valid URL, nothing to do + */ + public function testUpdatePiwikUrlNothingToDo() + { + $url = 'https://mypiwik.tld'; + $this->conf->set('plugins.PIWIK_URL', $url); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodPiwikUrl()); + $this->assertEquals($url, $this->conf->get('plugins.PIWIK_URL')); + } } From 792b26789fe9f6245a155e47aea0273917ac33d7 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 11 Mar 2017 13:47:07 +0100 Subject: [PATCH 505/658] Fixes #657: use data-autofirst parameter for awesomeplete data-autofirst automatically selects the first item of the list of choice automatically. You just have to press enter to use it. --- tpl/default/linklist.html | 2 +- tpl/default/page.header.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 9437020..57ef456 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -34,7 +34,7 @@ {if="!empty($search_tags)"} value="{$search_tags}" {/if} - autocomplete="off" data-multiple data-minChars="1" + autocomplete="off" data-multiple data-autofirst data-minChars="1" data-list="{loop="$tags"}{$key}, {/loop}" > diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index b76fc03..dcc0d5a 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html @@ -114,7 +114,7 @@ {if="!empty($search_tags)"} value="{$search_tags}" {/if} - autocomplete="off" data-multiple data-minChars="1" + autocomplete="off" data-multiple data-autofirst data-minChars="1" data-list="{loop="$tags"}{$key}, {/loop}" > From 2ea89aba4faa5509ca68c7e9b6b9ab71c1929935 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 11 Mar 2017 14:11:06 +0100 Subject: [PATCH 506/658] Fixes #304: use atom feed as default RSS feed is still available with the setting set to false --- application/PageBuilder.php | 3 +- application/Updater.php | 16 ++++++++++ application/config/ConfigManager.php | 2 +- tests/Updater/UpdaterTest.php | 45 ++++++++++++++++++++++++++++ tpl/default/page.header.html | 4 +-- 5 files changed, 66 insertions(+), 4 deletions(-) diff --git a/application/PageBuilder.php b/application/PageBuilder.php index 544aba7..b133dee 100644 --- a/application/PageBuilder.php +++ b/application/PageBuilder.php @@ -75,7 +75,8 @@ class PageBuilder } $this->tpl->assign('shaarlititle', $this->conf->get('general.title', 'Shaarli')); $this->tpl->assign('openshaarli', $this->conf->get('security.open_shaarli', false)); - $this->tpl->assign('showatom', $this->conf->get('feed.show_atom', false)); + $this->tpl->assign('showatom', $this->conf->get('feed.show_atom', true)); + $this->tpl->assign('feed_type', $this->conf->get('feed.show_atom', true) !== false ? 'atom' : 'rss'); $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false)); $this->tpl->assign('token', getToken($this->conf)); // To be removed with a proper theme configuration. diff --git a/application/Updater.php b/application/Updater.php index fd7e207..efbfc83 100644 --- a/application/Updater.php +++ b/application/Updater.php @@ -378,6 +378,22 @@ class Updater $this->conf->set('plugins.PIWIK_URL', 'http://'. $this->conf->get('plugins.PIWIK_URL')); $this->conf->write($this->isLoggedIn); + + return true; + } + + /** + * Use ATOM feed as default. + */ + public function updateMethodAtomDefault() + { + if (!$this->conf->exists('feed.show_atom') || $this->conf->get('feed.show_atom') === true) { + return true; + } + + $this->conf->set('feed.show_atom', true); + $this->conf->write($this->isLoggedIn); + return true; } } diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php index f209741..c5eeda0 100644 --- a/application/config/ConfigManager.php +++ b/application/config/ConfigManager.php @@ -317,7 +317,7 @@ class ConfigManager $this->setEmpty('updates.check_updates_interval', 86400); $this->setEmpty('feed.rss_permalinks', true); - $this->setEmpty('feed.show_atom', false); + $this->setEmpty('feed.show_atom', true); $this->setEmpty('privacy.default_private_links', false); $this->setEmpty('privacy.hide_public_links', false); diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php index b522d61..11b6444 100644 --- a/tests/Updater/UpdaterTest.php +++ b/tests/Updater/UpdaterTest.php @@ -615,4 +615,49 @@ $GLOBALS[\'privateLinkByDefault\'] = true;'; $this->assertTrue($updater->updateMethodPiwikUrl()); $this->assertEquals($url, $this->conf->get('plugins.PIWIK_URL')); } + + /** + * Test updateMethodAtomDefault with show_atom set to false + * => update to true. + */ + public function testUpdateMethodAtomDefault() + { + $sandboxConf = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); + $this->conf = new ConfigManager($sandboxConf); + $this->conf->set('feed.show_atom', false); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodAtomDefault()); + $this->assertTrue($this->conf->get('feed.show_atom')); + // reload from file + $this->conf = new ConfigManager($sandboxConf); + $this->assertTrue($this->conf->get('feed.show_atom')); + } + /** + * Test updateMethodAtomDefault with show_atom not set. + * => nothing to do + */ + public function testUpdateMethodAtomDefaultNoExist() + { + $sandboxConf = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); + $this->conf = new ConfigManager($sandboxConf); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodAtomDefault()); + $this->assertTrue($this->conf->get('feed.show_atom')); + } + /** + * Test updateMethodAtomDefault with show_atom set to true. + * => nothing to do + */ + public function testUpdateMethodAtomDefaultAlreadyTrue() + { + $sandboxConf = 'sandbox/config'; + copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); + $this->conf = new ConfigManager($sandboxConf); + $this->conf->set('feed.show_atom', true); + $updater = new Updater([], [], $this->conf, true); + $this->assertTrue($updater->updateMethodAtomDefault()); + $this->assertTrue($this->conf->get('feed.show_atom')); + } } diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index b76fc03..04f33ea 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html @@ -48,7 +48,7 @@ {/loop}
  • - {'RSS Feed'|t} + {'RSS Feed'|t}
    • {if="isLoggedIn()"}
  • @@ -70,7 +70,7 @@
  • - +
    • From 6fcb44378725dcfeac8160b2bcfe37a6da5106c1 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 11 Mar 2017 14:19:04 +0100 Subject: [PATCH 507/658] Fixes #793: display the star logo on mobile instead of home logo --- tpl/default/page.header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index b76fc03..cbef6f7 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html @@ -2,7 +2,7 @@
    - + {$shaarlititle} From 3252fbb3ccaf8f6df757d400754a3c0e27e66011 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 11 Mar 2017 20:27:35 +0100 Subject: [PATCH 508/658] Shaarli demo moved to shaarli.org --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21062b9..db1b901 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ _It is designed to be personal (single-user), fast and handy._ - [Bugs/Feature requests/Discussion](https://github.com/shaarli/Shaarli/issues/) ### Demo -You can use this [public demo instance of Shaarli](http://shaarlidemo.tuxfamily.org/Shaarli). +You can use this [public demo instance of Shaarli](https://demo.shaarli.org). It runs the latest development version of Shaarli and is updated/reset daily. Login: `demo`; Password: `demo` From b9b41d25e319f44f9fb8259a0237a8ee81ad394b Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 12 Mar 2017 12:45:32 +0100 Subject: [PATCH 509/658] Remove inline JS and add LibreJS headers in JS files Fixes #33 (wow!) Relates to #395 --- COPYING | 4 + inc/awesomplete-multiple-tags.js | 28 ++++++ inc/plugin_admin.js | 28 ++++++ plugins/piwik/piwik.html | 28 ++++++ plugins/playvideos/youtube_playlist.js | 28 ++++++ plugins/qrcode/shaarli-qrcode.js | 28 ++++++ tpl/default/configure.html | 13 --- tpl/default/editlink.html | 28 ++---- tpl/default/install.html | 13 --- tpl/default/js/shaarli.js | 130 ++++++++++++++++++++++++- tpl/default/loginform.html | 11 +-- tpl/default/picwall.html | 5 - tpl/default/pluginsadmin.html | 10 +- tpl/default/tools.html | 42 ++------ 14 files changed, 286 insertions(+), 110 deletions(-) diff --git a/COPYING b/COPYING index 4bbdf2b..0520215 100644 --- a/COPYING +++ b/COPYING @@ -46,6 +46,10 @@ Files: plugins/wallabag/wallabag.png License: MIT License (http://opensource.org/licenses/MIT) Copyright: (C) 2015 Nicolas Lœuillet - https://github.com/wallabag/wallabag +Files: tpl/default/sad_star.png +License: MIT License (http://opensource.org/licenses/MIT) +Copyright: (C) 2015 kalvn - https://github.com/kalvn/Shaarli-Material + ---------------------------------------------------- ZLIB/LIBPNG LICENSE diff --git a/inc/awesomplete-multiple-tags.js b/inc/awesomplete-multiple-tags.js index faecb41..c38dc38 100644 --- a/inc/awesomplete-multiple-tags.js +++ b/inc/awesomplete-multiple-tags.js @@ -1,3 +1,31 @@ +/** @licstart The following is the entire license notice for the + * JavaScript code in this page. + * + * Copyright: (c) 2011-2015 Sébastien SAUVAGE + * (c) 2011-2017 The Shaarli Community, see AUTHORS + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software + * in a product, an acknowledgment in the product documentation would + * be appreciated but is not required. + * + * 2. Altered source versions must be plainly marked as such, and must + * not be misrepresented as being the original software. + * + * 3. This notice may not be removed or altered from any source distribution. + * + * @licend The above is the entire license notice + * for the JavaScript code in this page. + */ + var awp = Awesomplete.$; var autocompleteFields = document.querySelectorAll('input[data-multiple]'); [].forEach.call(autocompleteFields, function(autocompleteField) { diff --git a/inc/plugin_admin.js b/inc/plugin_admin.js index 055ac28..4b55e0f 100644 --- a/inc/plugin_admin.js +++ b/inc/plugin_admin.js @@ -1,3 +1,31 @@ +/** @licstart The following is the entire license notice for the + * JavaScript code in this page. + * + * Copyright: (c) 2011-2015 Sébastien SAUVAGE + * (c) 2011-2017 The Shaarli Community, see AUTHORS + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software + * in a product, an acknowledgment in the product documentation would + * be appreciated but is not required. + * + * 2. Altered source versions must be plainly marked as such, and must + * not be misrepresented as being the original software. + * + * 3. This notice may not be removed or altered from any source distribution. + * + * @licend The above is the entire license notice + * for the JavaScript code in this page. + */ + /** * Change the position counter of a row. * diff --git a/plugins/piwik/piwik.html b/plugins/piwik/piwik.html index 0881d7c..f4bc358 100644 --- a/plugins/piwik/piwik.html +++ b/plugins/piwik/piwik.html @@ -1,5 +1,33 @@ diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index 2180c08..491f1da 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html @@ -4,11 +4,7 @@ {include="includes"} - {if="$source !== 'firefoxsocialapi' && $source !== 'bookmarklet'"} - {include="page.header"} - {else} -
    Shaare to: {$shaarlititle}
    - {/if} + {include="page.header"}
    @@ -21,25 +17,25 @@
    - +
    - +
    - +
    -
    @@ -74,18 +70,6 @@ {/if}
    - {if="$source !== 'firefoxsocialapi' && $source !== 'bookmarklet'"} - {include="page.footer"} - {/if} - + {include="page.footer"} diff --git a/tpl/default/install.html b/tpl/default/install.html index 0bd8a63..33f8a45 100644 --- a/tpl/default/install.html +++ b/tpl/default/install.html @@ -105,18 +105,5 @@
    {include="page.footer"} - diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index f7de0a4..30d8ed6 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js @@ -1,3 +1,31 @@ +/** @licstart The following is the entire license notice for the + * JavaScript code in this page. + * + * Copyright: (c) 2011-2015 Sébastien SAUVAGE + * (c) 2011-2017 The Shaarli Community, see AUTHORS + * + * This software is provided 'as-is', without any express or implied warranty. + * In no event will the authors be held liable for any damages arising from + * the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software + * in a product, an acknowledgment in the product documentation would + * be appreciated but is not required. + * + * 2. Altered source versions must be plainly marked as such, and must + * not be misrepresented as being the original software. + * + * 3. This notice may not be removed or altered from any source distribution. + * + * @licend The above is the entire license notice + * for the JavaScript code in this page. + */ + window.onload = function () { /** @@ -185,9 +213,13 @@ window.onload = function () { /** * Autofocus text fields */ - var autofocusElements = document.querySelector('.autofocus'); - if (autofocusElements != null) { - autofocusElements.focus(); + // ES6 syntax + let autofocusElements = document.querySelectorAll('.autofocus'); + for (let autofocusElement of autofocusElements) { + if (autofocusElement.value == '') { + autofocusElement.focus(); + break; + } } /** @@ -266,4 +298,96 @@ window.onload = function () { } }); } + + /** + * TimeZome select + * FIXME! way too hackish + */ + var toRemove = document.getElementById('timezone-remove'); + if (toRemove != null) { + var firstSelect = toRemove.getElementsByTagName('select')[0]; + var secondSelect = toRemove.getElementsByTagName('select')[1]; + toRemove.parentNode.removeChild(toRemove); + var toAdd = document.getElementById('timezone-add'); + var newTimezone = 'Continent ' + firstSelect.outerHTML + ''; + newTimezone += ' Country ' + secondSelect.outerHTML + ''; + toAdd.innerHTML = newTimezone; + } + + /** + * Awesomplete trigger. + */ + var tags = document.getElementById('lf_tags'); + if (tags != null) { + awesompleteUniqueTag('#lf_tags'); + } + + /** + * bLazy trigger + */ + var picwall = document.getElementById('picwall_container'); + if (picwall != null) { + var bLazy = new Blazy(); + } + + /** + * Bookmarklet alert + */ + var bookmarkletLinks = document.querySelectorAll('.bookmarklet-link'); + var bkmMessage = document.getElementById('bookmarklet-alert'); + [].forEach.call(bookmarkletLinks, function(link) { + link.addEventListener('click', function(event) { + event.preventDefault(); + alert(bkmMessage.value); + }); + }); + + /** + * Firefox Social + */ + var ffButton = document.getElementById('ff-social-button'); + if (ffButton != null) { + ffButton.addEventListener('click', function(event) { + activateFirefoxSocial(event.target); + }); + } + + /** + * Plugin admin order + */ + var orderPA = document.querySelectorAll('.order'); + [].forEach.call(orderPA, function(link) { + link.addEventListener('click', function(event) { + event.preventDefault(); + if (event.target.classList.contains('order-up')) { + return orderUp(event.target.parentNode.parentNode.getAttribute('data-order')); + } else if (event.target.classList.contains('order-down')) { + return orderDown(event.target.parentNode.parentNode.getAttribute('data-order')); + } + }); + }); }; + +function activateFirefoxSocial(node) { + var loc = location.href; + var baseURL = loc.substring(0, loc.lastIndexOf("/")); + + // Keeping the data separated (ie. not in the DOM) so that it's maintainable and diffable. + var data = { + name: "{$shaarlititle}", + description: "The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community.", + author: "Shaarli", + version: "1.0.0", + + iconURL: baseURL + "/images/favicon.ico", + icon32URL: baseURL + "/images/favicon.ico", + icon64URL: baseURL + "/images/favicon.ico", + + shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi{/noparse}", + homepageURL: baseURL + }; + node.setAttribute("data-service", JSON.stringify(data)); + + var activate = new CustomEvent("ActivateSocialFeature"); + node.dispatchEvent(activate); +} diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html index 2ad3fe9..eb6d837 100644 --- a/tpl/default/loginform.html +++ b/tpl/default/loginform.html @@ -26,7 +26,7 @@ {if="!empty($username)"}value="{$username}"{/if} class="autofocus" tabindex="20">
    - +
    - {if="ban_canLogin($conf) && ! empty($username)"} - // Focus password on load if the username is set. - var passwords = document.getElementsByName('password'); - if (passwords.length == 2) { - passwords[1].focus(); - } - {/if} - diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index b9ae2f2..248e56d 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html @@ -40,11 +40,6 @@ {include="page.footer"} - diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html index 92af2ee..5cc1802 100644 --- a/tpl/default/pluginsadmin.html +++ b/tpl/default/pluginsadmin.html @@ -48,14 +48,8 @@
    {if="count($enabledPlugins)>1"} - - ▲ - - - ▼ - + ▲ + ▼ {/if} diff --git a/tpl/default/tools.html b/tpl/default/tools.html index b9df32d..baa033a 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html @@ -67,7 +67,7 @@
    + href="?private=1&post=" + class="bookmarklet-link"> ✚ {'Add Note'|t}
    @@ -103,7 +103,7 @@
    + id="ff-social-button"> ✚ {'Add to'|t} Firefox Social
    @@ -142,38 +142,8 @@
    {include="page.footer"} - - + From 15162272f46a3ae6e93a9f405173e0c770219fff Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 12 Mar 2017 13:28:37 +0100 Subject: [PATCH 510/658] Fixes #806: display overflow for awesomplete list --- tpl/default/css/shaarli.css | 4 ++++ tpl/default/editlink.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index d33e906..4886dda 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -908,6 +908,10 @@ div.awesomplete > ul { color: black; } +form[name="linkform"].page-form { + overflow: visible; +} + @media screen and (max-width: 64em) { .page-form-complete .form-label { height: inherit; diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index 491f1da..354499a 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html @@ -36,7 +36,7 @@
    + data-list="{loop="$tags"}{$key}, {/loop}" data-multiple data-autofirst autocomplete="off" >
    From 7cea7c7a9a6ab22bb4aa6e81ed111681779eb264 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 12 Mar 2017 13:41:49 +0100 Subject: [PATCH 511/658] Theme: Vertical align theme select in configure Fixes #807 --- tpl/default/configure.html | 2 +- tpl/default/css/shaarli.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tpl/default/configure.html b/tpl/default/configure.html index f24ac43..d6536d4 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html @@ -55,7 +55,7 @@

    Upgrade and migration

    Preparation

    +

    Note your current version

    +

    If anything goes wrong, it's important for us to know which version you're upgrading from.
    +The current version is present in the version.php file.

    Backup your data

    Shaarli stores all user data under the data directory:

    • data/config.php - main configuration file
    • data/datastore.php - bookmarked links
    • data/ipbans.php - banned IP addresses
      • +
    • data/updates.txt - contains all automatic update to the configuration and datastore files already run

    See Shaarli configuration for more information about Shaarli resources.

    It is recommended to backup this repository before starting updating/upgrading Shaarli:

    @@ -125,15 +131,11 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
  • check or restore the data directory
    • -

    Upgrading from release archives

    +

    All tagged revisions can be downloaded as tarballs or ZIP archives from the releases page.

    -

    We recommend using the releases from the stable branch, which are available as:

    - -

    Once downloaded, extract the archive locally and update your remote installation (e.g. via FTP) -be sure you keep the contents of the data directory!

    -

    After upgrading, access your fresh Shaarli installation from a web browser; the configuration will then be automatically updated, and new settings added to data/config.php (see Shaarli configuration for more details).

    +

    We recommend that you use the latest release tarball with the -full suffix. It contains the dependencies, please read Download and installation for git complete instructions.

    +

    Once downloaded, extract the archive locally and update your remote installation (e.g. via FTP) -be sure you keep the content of the data directory!

    +

    After upgrading, access your fresh Shaarli installation from a web browser; the configuration and data store will then be automatically updated, and new settings added to data/config.json.php (see Shaarli configuration for more details).

    Upgrading with Git

    Updating a community Shaarli

    If you have installed Shaarli from the community Git repository, simply pull new changes from your local clone:

    @@ -149,7 +151,7 @@ $ git pull tests/Url/UrlTest.php | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)

    Shaarli >= v0.8.x: install/update third-party PHP dependencies using Composer:

    -
    $ composer update --no-dev
+
    $ composer install --no-dev
 
 Loading composer repositories with package information
 Updating dependencies
@@ -214,7 +216,7 @@ $ git branch -vv
   master 029f75f [sebsauvage/master] Update README.md[](.html)
 * stable 890afc3 [origin/stable] Merge pull request #509 from ArthurHoaro/v0.6.5[](.html)
    
 
    Shaarli >= v0.8.x: install/update third-party PHP dependencies using Composer:
    
-
    $ composer update --no-dev
+
    $ composer install --no-dev
 
 Loading composer repositories with package information
 Updating dependencies
@@ -238,5 +240,20 @@ $ git gc
 Total 3317 (delta 2050), reused 3301 (delta 2034)to
    
 
    Step 3: configuration
    
 
    After migrating, access your fresh Shaarli installation from a web browser; the configuration will then be automatically updated, and new settings added to data/config.php (see Shaarli configuration for more details).
    
+
    Troubleshooting
    
+
    If the solutions provided here doesn't work, please open an issue specifying which version you're upgrading from and to.
    
+
    You must specify an integer as a key
    
+
    In v0.8.1 we changed how link keys are handled (from timestamps to incremental integers).
    
+Take a look at data/updates.txt content.
    
+
    updates.txt contains updateMethodDatastoreIds
    
+
    Try to delete it and refresh your page while being logged in.
    
+
    updates.txt doesn't exists or doesn't contain updateMethodDatastoreIds
    
+
      
+
    1. Create data/updates.txt if it doesn't exist.
      2. 
+
    2. Paste this string in the update file ;updateMethodRenameDashTags;
      3. 
+
    3. Login to Shaarli.
      4. 
+
    4. Delete the update file.
      5. 
+
    5. Refresh.
      6. 
+
    
 
 
diff --git a/doc/Upgrade-and-migration.md b/doc/Upgrade-and-migration.md
index 0bc3382..d36eb86 100644
--- a/doc/Upgrade-and-migration.md
+++ b/doc/Upgrade-and-migration.md
@@ -1,11 +1,17 @@
 #Upgrade and migration
 ## Preparation
+### Note your current version
+
+If anything goes wrong, it's important for us to know which version you're upgrading from.  
+The current version is present in the `version.php` file.
+
 ### Backup your data
 
 Shaarli stores all user data under the `data` directory:
 - `data/config.php` - main configuration file
 - `data/datastore.php` - bookmarked links
 - `data/ipbans.php` - banned IP addresses
+- `data/updates.txt` - contains all automatic update to the configuration and datastore files already run
 
 See [Shaarli configuration](Shaarli-configuration.html) for more information about Shaarli resources.
 
@@ -22,16 +28,14 @@ As all user data is kept under `data`, this is the only directory you need to wo
     - update - see the following sections
 - check or restore the `data` directory
 
-## Upgrading from release archives
+## Recommended : Upgrading from release archives
 All tagged revisions can be downloaded as tarballs or ZIP archives from the [releases](https://github.com/shaarli/Shaarli/releases) page.[](.html)
 
-We _recommend_ using the releases from the `stable` branch, which are available as:
-- gzipped tarball - https://github.com/shaarli/Shaarli/archive/stable.tar.gz
-- ZIP archive - https://github.com/shaarli/Shaarli/archive/stable.zip
+We recommend that you use the latest release tarball with the `-full` suffix. It contains the dependencies, please read [Download and installation](Download-and-installation.html) for `git` complete instructions.
 
-Once downloaded, extract the archive locally and update your remote installation (e.g. via FTP) -be sure you keep the contents of the `data` directory!
+Once downloaded, extract the archive locally and update your remote installation (e.g. via FTP) -be sure you keep the content of the `data` directory!
 
-After upgrading, access your fresh Shaarli installation from a web browser; the configuration will then be automatically updated, and new settings added to `data/config.php` (see [Shaarli configuration](Shaarli-configuration.html) for more details).
+After upgrading, access your fresh Shaarli installation from a web browser; the configuration and data store will then be automatically updated, and new settings added to `data/config.json.php` (see [Shaarli configuration](Shaarli-configuration.html) for more details).
 
 ## Upgrading with Git
 ### Updating a community Shaarli
@@ -54,7 +58,7 @@ Fast-forward
 Shaarli >= `v0.8.x`: install/update third-party PHP dependencies using [Composer](https://getcomposer.org/):[](.html)
 
 ```bash
-$ composer update --no-dev
+$ composer install --no-dev
 
 Loading composer repositories with package information
 Updating dependencies
@@ -129,7 +133,7 @@ $ git branch -vv
 Shaarli >= `v0.8.x`: install/update third-party PHP dependencies using [Composer](https://getcomposer.org/):[](.html)
 
 ```bash
-$ composer update --no-dev
+$ composer install --no-dev
 
 Loading composer repositories with package information
 Updating dependencies
@@ -159,3 +163,24 @@ Total 3317 (delta 2050), reused 3301 (delta 2034)to
 
 #### Step 3: configuration
 After migrating, access your fresh Shaarli installation from a web browser; the configuration will then be automatically updated, and new settings added to `data/config.php` (see [Shaarli configuration](Shaarli-configuration.html) for more details).
+
+## Troubleshooting
+
+If the solutions provided here doesn't work, please open an issue specifying which version you're upgrading from and to.
+
+### You must specify an integer as a key
+
+In `v0.8.1` we changed how link keys are handled (from timestamps to incremental integers).
+Take a look at `data/updates.txt` content.
+
+#### `updates.txt` contains `updateMethodDatastoreIds`
+
+Try to delete it and refresh your page while being logged in.
+
+#### `updates.txt` doesn't exists or doesn't contain `updateMethodDatastoreIds`
+
+  1. Create `data/updates.txt` if it doesn't exist.
+  2. Paste this string in the update file `;updateMethodRenameDashTags;`
+  3. Login to Shaarli.
+  4. Delete the update file.
+  5. Refresh.
diff --git a/doc/Usage.html b/doc/Usage.html
index 63f21d9..b585588 100644
--- a/doc/Usage.html
+++ b/doc/Usage.html
@@ -32,6 +32,7 @@
 
  • Browsing and Searching
    • 
 
  • Firefox share
    • 
 
  • RSS feeds
    • 
+
  • REST API
    • 
 
 
  • How To
 
      
@@ -50,6 +51,7 @@
 
    • 3rd party libraries
      • 
 
    • Plugin System
      • 
 
    • Release Shaarli
      • 
+
    • Versioning and Branches
      • 
 
    • Security
      • 
 
    • Static analysis
      • 
 
    • Theming
      • 
diff --git a/doc/Versioning-and-Branches.html b/doc/Versioning-and-Branches.html
new file mode 100644
index 0000000..4dfe4a9
--- /dev/null
+++ b/doc/Versioning-and-Branches.html
@@ -0,0 +1,156 @@
+
+
+
+  
+  
+  
+  Shaarli – Versioning and Branches
+  
+  
+  
+  
+
+
+
+
      Versioning and Branches
      
+
      [WORK IN PROGRESS][](.html)
      
+
      It's important to understand how Shaarli branches work, especially if you're maintaining a 3rd party tools for Shaarli (theme, plugin, etc.), to be sure stay compatible.
      
+
      master branch
      
+
      The master branch is the development branch. Any new change MUST go through this branch using Pull Requests.
      
+
      Remarks:
      
+
        
+
      • This branch shouldn't be used for production as it isn't necessary stable.
        • 
+
      • 3rd party aren't required to be compatible with the latest changes.
        • 
+
      • Official plugins, themes and libraries (contained within Shaarli organization repos) must be compatible with the master branch.
        • 
+
      • The version in this branch is always dev.
        • 
+
      
+
      v0.x branch
      
+
      This v0.x branch, points to the latest v0.x.y release.
      
+
      Explanation:
      
+
      When a new version is released, it might contains a major bug which isn't detected right away. For example, a new PHP version is released, containing backward compatibility issue which doesn't work with Shaarli.
      
+
      In this case, the issue is fixed in the master branch, and the fix is backported the to the v0.x branch. Then a new release is made from the v0.x branch.
      
+
      This workflow allow us to fix any major bug detected, without having to release bleeding edge feature too soon.
      
+
      latest branch
      
+
      This branch point the latest release. It recommended to use it to get the latest tested changes.
      
+
      stable branch
      
+
      The stable branch doesn't contain any major bug, and is one major digit version behind the latest release.
      
+
      For example, the current latest release is v0.8.3, the stable branch is an alias to the latest v0.7.x release. When the v0.9.0 version will be released, the stable will move to the latest v0.8.x release.
      
+
      Remarks:
      
+
        
+
      • Shaarli release pace isn't fast, and the stable branch might be a few months behind the latest release.
        • 
+
      
+
      Releases
      
+
      Releases are always made from the latest v0.x branch.
      
+
      Note that for every release, we manually generate a tarball which contains all Shaarli dependencies, making Shaarli's installation only one step.
      
+
      Advices on 3rd party git repos workflow
      
+
      Versioning
      
+
      Any time a new Shaarli release is published, you should publish a new release of your repo if the changes affected you since the latest release (take a look at the changelog (Draft means not released yet) and the commit log (like tpl folder for themes)). You can either:
      
+
        
+
      • use the Shaarli version number, with your repo version. For example, if Shaarli v0.8.3 is released, publish a v0.8.3-1 release, where v0.8.3 states Shaarli compatibility and -1 is your own version digit for the current Shaarli version.
        • 
+
      • use your own versioning scheme, and state Shaarli compatibility in the release description.
        • 
+
      
+
      Using this, any user will be able to pick the release matching his own Shaarli version.
      
+
      Major bugfix backport releases
      
+
      To be able to support backported fixes, it recommended to use our workflow:
      
+
      # In master, fix the major bug
+git commit -m "Katastrophe"
+git push origin master
+# Get your commit hash
+git log --format="%H" -n 1
+# Create a new branch from your latest release, let's say v0.8.2-1 (the tag name)
+git checkout -b katastrophe v0.8.2-1
+# Backport the fix commit to your brand new branch
+git cherry-pick <fix commit hash>
+git push origin katastrophe
+# Then you just have to make a new release from the `katastrophe` branch tagged `v0.8.3-1`
      
+
+
diff --git a/doc/Versioning-and-Branches.md b/doc/Versioning-and-Branches.md
new file mode 100644
index 0000000..bbc7719
--- /dev/null
+++ b/doc/Versioning-and-Branches.md
@@ -0,0 +1,76 @@
+#Versioning and Branches
+[**WORK IN PROGRESS**][](.html)
+
+It's important to understand how Shaarli branches work, especially if you're maintaining a 3rd party tools for Shaarli (theme, plugin, etc.), to be sure stay compatible.
+
+## `master` branch
+
+The `master` branch is the development branch. Any new change MUST go through this branch using Pull Requests.
+
+Remarks:
+
+  * This branch shouldn't be used for production as it isn't necessary stable.
+  * 3rd party aren't required to be compatible with the latest changes.
+  * Official plugins, themes and libraries (contained within Shaarli organization repos) must be compatible with the master branch.
+  * The version in this branch is always `dev`.
+
+## `v0.x` branch
+
+This `v0.x` branch, points to the latest `v0.x.y` release.
+
+Explanation:
+
+When a new version is released, it might contains a major bug which isn't detected right away. For example, a new PHP version is released, containing backward compatibility issue which doesn't work with Shaarli.
+
+In this case, the issue is fixed in the `master` branch, and the fix is backported the to the `v0.x` branch. Then a new release is made from the `v0.x` branch.
+
+This workflow allow us to fix any major bug detected, without having to release bleeding edge feature too soon.
+
+## `latest` branch
+
+This branch point the latest release. It recommended to use it to get the latest tested changes.
+
+## `stable` branch
+
+The `stable` branch doesn't contain any major bug, and is one major digit version behind the latest release.
+
+For example, the current latest release is `v0.8.3`, the stable branch is an alias to the latest `v0.7.x` release. When the `v0.9.0` version will be released, the stable will move to the latest `v0.8.x` release.
+
+Remarks:
+
+  * Shaarli release pace isn't fast, and the stable branch might be a few months behind the latest release.
+
+## Releases
+
+Releases are always made from the latest `v0.x` branch.
+
+Note that for every release, we manually generate a tarball which contains all Shaarli dependencies, making Shaarli's installation only one step.
+
+## Advices on 3rd party git repos workflow
+
+### Versioning
+
+Any time a new Shaarli release is published, you should publish a new release of your repo if the changes affected you since the latest release (take a look at the [changelog](https://github.com/shaarli/Shaarli/releases) (*Draft* means not released yet) and the commit log (like [`tpl` folder](https://github.com/shaarli/Shaarli/commits/master/tpl/default) for themes)). You can either:[](.html)
+
+   - use the Shaarli version number, with your repo version. For example, if Shaarli `v0.8.3` is released, publish a `v0.8.3-1` release, where `v0.8.3` states Shaarli compatibility and `-1` is your own version digit for the current Shaarli version.
+   - use your own versioning scheme, and state Shaarli compatibility in the release description.
+
+Using this, any user will be able to pick the release matching his own Shaarli version.
+
+### Major bugfix backport releases
+
+To be able to support backported fixes, it recommended to use our workflow:
+
+```bash
+# In master, fix the major bug
+git commit -m "Katastrophe"
+git push origin master
+# Get your commit hash
+git log --format="%H" -n 1
+# Create a new branch from your latest release, let's say v0.8.2-1 (the tag name)
+git checkout -b katastrophe v0.8.2-1
+# Backport the fix commit to your brand new branch
+git cherry-pick 
+git push origin katastrophe
+# Then you just have to make a new release from the `katastrophe` branch tagged `v0.8.3-1`
+```
diff --git a/doc/_Footer.html b/doc/_Footer.html
index e8a62d2..09473a3 100644
--- a/doc/_Footer.html
+++ b/doc/_Footer.html
@@ -32,6 +32,7 @@
 
    • Browsing and Searching
      • 
 
    • Firefox share
      • 
 
    • RSS feeds
      • 
+
    • REST API
      • 
 
    • 
 
  • How To
 
    • 
 
  • How To
 
    • 
 
  • How To
 
      
@@ -100,6 +103,7 @@
 
    • 3rd party libraries
      • 
 
    • Plugin System
      • 
 
    • Release Shaarli
      • 
+
    • Versioning and Branches
      • 
 
    • Security
      • 
 
    • Static analysis
      • 
 
    • Theming
      • 
diff --git a/doc/_Sidebar.md b/doc/_Sidebar.md
index 1778e3a..8df2e56 100644
--- a/doc/_Sidebar.md
+++ b/doc/_Sidebar.md
@@ -14,6 +14,7 @@
     - [Browsing and Searching](Browsing-and-Searching.html)
     - [Firefox share](Firefox-share.html)
     - [RSS feeds](RSS-feeds.html)
+    - [REST API](REST-API.html)
 - How To
     - [Backup, restore, import and export](Backup,-restore,-import-and-export.html)
     - [Copy an existing installation over SSH and serve it locally](Copy-an-existing-installation-over-SSH-and-serve-it-locally.html)
@@ -28,6 +29,7 @@
     - [3rd party libraries](3rd-party-libraries.html)
     - [Plugin System](Plugin-System.html)
     - [Release Shaarli](Release-Shaarli.html)
+    - [Versioning and Branches](Versioning-and-Branches.html)
     - [Security](Security.html)
     - [Static analysis](Static-analysis.html)
     - [Theming](Theming.html)
diff --git a/doc/sidebar.html b/doc/sidebar.html
index 4dad016..478840d 100644
--- a/doc/sidebar.html
+++ b/doc/sidebar.html
@@ -18,6 +18,7 @@
 
    • Browsing and Searching
      • 
 
    • Firefox share
      • 
 
    • RSS feeds
      • 
+
    • REST API
      • 
 
    • 
 
  • How To
 
      
@@ -36,6 +37,7 @@
 
    • 3rd party libraries
      • 
 
    • Plugin System
      • 
 
    • Release Shaarli
      • 
+
    • Versioning and Branches
      • 
 
    • Security
      • 
 
    • Static analysis
      • 
 
    • Theming
      • 

From 54c8e8d2998c5ab5ffd08ae8f1fa11276773c16c Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Sun, 7 May 2017 18:48:39 +0200
Subject: [PATCH 554/658] Bump version to v0.9.0

Signed-off-by: ArthurHoaro 
---
 shaarli_version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shaarli_version.php b/shaarli_version.php
index 9167b43..2b5d355 100644
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-
+

From bf67ac345f588130e98e784b4ee4740b0dad83fc Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Sun, 7 May 2017 19:02:17 +0200
Subject: [PATCH 555/658] Update Github badges

Signed-off-by: ArthurHoaro 
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d57f520..7633b2c 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,10 @@ _Do you want to share the links you discover?_
 _Shaarli is a minimalist delicious clone that you can install on your own server._
 _It is designed to be personal (single-user), fast and handy._
 
-[![](https://img.shields.io/badge/stable-v0.7.1-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.7.1)
+[![](https://img.shields.io/badge/stable-v0.8.4-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.8.4)
 [![](https://img.shields.io/travis/shaarli/Shaarli/stable.svg?label=stable)](https://travis-ci.org/shaarli/Shaarli)
 •
-[![](https://img.shields.io/badge/latest-v0.8.4-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.8.4)
+[![](https://img.shields.io/badge/latest-v0.9.0-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.9.0)
 [![](https://img.shields.io/travis/shaarli/Shaarli/latest.svg?label=latest)](https://travis-ci.org/shaarli/Shaarli)
 •
 [![](https://img.shields.io/badge/master-v0.9.x-blue.svg)](https://github.com/shaarli/Shaarli)

From 29a837f347f53f751b723d466a2cd05fd92fd34e Mon Sep 17 00:00:00 2001
From: ArthurHoaro 
Date: Sun, 12 Mar 2017 19:03:50 +0100
Subject: [PATCH 556/658] Bulk deletion

  * Add a checkboxes in linklist which display a sub-header containing action buttons
  * Strongly rely on JS
  * Requires a modern browser (ES6 syntax support)
  * Checkboxes are hidden if the browser is old or JS disabled
---
 index.php                    | 19 ++++++----
 tpl/default/css/shaarli.css  | 13 +++++++
 tpl/default/js/shaarli.js    | 73 +++++++++++++++++++++++++++++++++++-
 tpl/default/linklist.html    |  5 ++-
 tpl/default/page.header.html |  7 ++++
 5 files changed, 106 insertions(+), 11 deletions(-)

diff --git a/index.php b/index.php
index ab1e30d..5e61cbb 100644
--- a/index.php
+++ b/index.php
@@ -1329,18 +1329,21 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history)
     // -------- User clicked the "Delete" button when editing a link: Delete link from database.
     if ($targetPage == Router::$PAGE_DELETELINK)
     {
-        // We do not need to ask for confirmation:
-        // - confirmation is handled by JavaScript
-        // - we are protected from XSRF by the token.
-
         if (! tokenOk($_GET['token'])) {
             die('Wrong token.');
         }
 
-        $id = intval(escape($_GET['lf_linkdate']));
-        $link = $LINKSDB[$id];
-        $pluginManager->executeHooks('delete_link', $link);
-        unset($LINKSDB[$id]);
+        if (strpos($_GET['lf_linkdate'], ' ') !== false) {
+            $ids = array_values(array_filter(preg_split('/\s+/', escape($_GET['lf_linkdate']))));
+        } else {
+            $ids = [$_GET['lf_linkdate']];
+        }
+        foreach ($ids as $id) {
+            $id = (int) escape($id);
+            $link = $LINKSDB[$id];
+            $pluginManager->executeHooks('delete_link', $link);
+            unset($LINKSDB[$id]);
+        }
         $LINKSDB->save($conf->get('resource.page_cache')); // save to disk
         $history->deleteLink($link);
 
diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css
index 73fade5..efdf06d 100644
--- a/tpl/default/css/shaarli.css
+++ b/tpl/default/css/shaarli.css
@@ -275,6 +275,19 @@ body, .pure-g [class*="pure-u"] {
     }
 }
 
+.subheader-form a.button {
+    color: #f5f5f5;
+    font-weight: bold;
+    text-decoration: none;
+    border: 2px solid #f5f5f5;
+    border-radius: 5px;
+    padding: 3px 10px;
+}
+
+.linklist-item-editbuttons .delete-checkbox {
+    display: none;
+}
+
 #header-login-form input[type="text"], #header-login-form input[type="password"] {
     width: 200px;
 }
diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js
index 4d47fcd..7abd20b 100644
--- a/tpl/default/js/shaarli.js
+++ b/tpl/default/js/shaarli.js
@@ -357,11 +357,64 @@ window.onload = function () {
     var continent = document.getElementById('continent');
     var city = document.getElementById('city');
     if (continent != null && city != null) {
-        continent.addEventListener('change', function(event) {
+        continent.addEventListener('change', function (event) {
             hideTimezoneCities(city, continent.options[continent.selectedIndex].value, true);
         });
         hideTimezoneCities(city, continent.options[continent.selectedIndex].value, false);
     }
+
+    /**
+     * Bulk actions
+     *
+     * Note: Requires a modern browser.
+     */
+    if (testEs6Compatibility()) {
+        let linkCheckboxes = document.querySelectorAll('.delete-checkbox');
+        for(let checkbox of linkCheckboxes) {
+            checkbox.style.display = 'block';
+            checkbox.addEventListener('click', function(event) {
+                let count = 0;
+                for(let checkbox of linkCheckboxes) {
+                    count = checkbox.checked ? count + 1 : count;
+                }
+                let bar = document.getElementById('actions');
+                if (count == 0 && bar.classList.contains('open')) {
+                    bar.classList.toggle('open');
+                } else if (count > 0 && ! bar.classList.contains('open')) {
+                    bar.classList.toggle('open');
+                }
+            });
+        }
+
+        let deleteButton = document.getElementById('actions-delete');
+        let token = document.querySelector('input[type="hidden"][name="token"]');
+        if (deleteButton != null && token != null) {
+            deleteButton.addEventListener('click', function(event) {
+                event.preventDefault();
+
+                let links = [];
+                for(let checkbox of linkCheckboxes) {
+                    if (checkbox.checked) {
+                        links.push({
+                            'id': checkbox.value,
+                            'title': document.querySelector('.linklist-item[data-id="'+ checkbox.value +'"] .linklist-link').innerHTML
+                        });
+                    }
+                }
+
+                let message = 'Are you sure you want to delete '+ links.length +' links?\n';
+                message += 'This action is IRREVERSIBLE!\n\nTitles:\n';
+                let ids = '';
+                for (let item of links) {
+                    message += '  - '+ item['title'] +'\n';
+                    ids += item['id'] +'+';
+                }
+                if (window.confirm(message)) {
+                    window.location = '?delete_link&lf_linkdate='+ ids +'&token='+ token.value;
+                }
+            });
+        }
+    }
 };
 
 function activateFirefoxSocial(node) {
@@ -397,7 +450,7 @@ function activateFirefoxSocial(node) {
  */
 function hideTimezoneCities(cities, currentContinent, reset = false) {
     var first = true;
-    [].forEach.call(cities, function(option) {
+    [].forEach.call(cities, function (option) {
         if (option.getAttribute('data-continent') != currentContinent) {
             option.className = 'hidden';
         } else {
@@ -409,3 +462,19 @@ function hideTimezoneCities(cities, currentContinent, reset = false) {
         }
     });
 }
+
+/**
+ * Check if the browser is compatible with ECMAScript 6 syntax
+ *
+ * Source: http://stackoverflow.com/a/29046739/1484919
+ *
+ * @returns {boolean}
+ */
+function testEs6Compatibility()
+{
+    "use strict";
+
+    try { eval("var foo = (x)=>x+1"); }
+    catch (e) { return false; }
+    return true;
+}
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index 57ef456..6a4e14a 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -15,6 +15,8 @@
   {/if}
 
    • 
 
+
+

    Block:

    lorem ipsum #foobar http://link.tld
-#foobar http://link.tld
    \ No newline at end of file +#foobar http://link.tld +

    link
    +link
    +link
    +link
    +link
    +link
    +link
    +link
    +link

    \ No newline at end of file diff --git a/tests/plugins/resources/markdown.md b/tests/plugins/resources/markdown.md index 0b8be7c..b8ebd93 100644 --- a/tests/plugins/resources/markdown.md +++ b/tests/plugins/resources/markdown.md @@ -21,4 +21,14 @@ Block: ``` lorem ipsum #foobar http://link.tld #foobar http://link.tld -``` \ No newline at end of file +``` + +[link](?123456) +![link](/img/train.png) +[link](test.tld/path/?query=value#hash) +[link](http://test.tld/path/?query=value#hash) +[link](https://test.tld/path/?query=value#hash) +[link](ftp://test.tld/path/?query=value#hash) +[link](magnet:test.tld/path/?query=value#hash) +[link](javascript:alert('xss')) +[link](other://test.tld/path/?query=value#hash) \ No newline at end of file From 986a52106766e7497322951c2bf3a3cbd0b42bf9 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 25 Mar 2017 15:54:18 +0100 Subject: [PATCH 565/658] Add an endpoint to refresh the token Useful for AJAX requests which burns the token --- application/Router.php | 6 ++++++ index.php | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/application/Router.php b/application/Router.php index c9a5191..f6896b1 100644 --- a/application/Router.php +++ b/application/Router.php @@ -45,6 +45,8 @@ class Router public static $PAGE_SAVE_PLUGINSADMIN = 'save_pluginadmin'; + public static $GET_TOKEN = 'token'; + /** * Reproducing renderPage() if hell, to avoid regression. * @@ -142,6 +144,10 @@ class Router return self::$PAGE_SAVE_PLUGINSADMIN; } + if (startsWith($query, 'do='. self::$GET_TOKEN)) { + return self::$GET_TOKEN; + } + return self::$PAGE_LINKLIST; } } diff --git a/index.php b/index.php index 40539a0..9566fb0 100644 --- a/index.php +++ b/index.php @@ -1582,6 +1582,13 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) exit; } + // Get a fresh token + if ($targetPage == Router::$GET_TOKEN) { + header('Content-Type:text/plain'); + echo getToken($conf); + exit; + } + // -------- Otherwise, simply display search form and links: showLinkList($PAGE, $LINKSDB, $conf, $pluginManager); exit; From 5893529cf429f859485bccc88eff47f77fdd770a Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 25 Mar 2017 15:57:30 +0100 Subject: [PATCH 566/658] Move tagcloud template file to tag.cloud --- index.php | 2 +- tpl/default/{tagcloud.html => tag.cloud.html} | 4 ++++ tpl/vintage/{tagcloud.html => tag.cloud.html} | 0 3 files changed, 5 insertions(+), 1 deletion(-) rename tpl/default/{tagcloud.html => tag.cloud.html} (97%) rename tpl/vintage/{tagcloud.html => tag.cloud.html} (100%) diff --git a/index.php b/index.php index 9566fb0..de098ab 100644 --- a/index.php +++ b/index.php @@ -835,7 +835,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) $PAGE->assign($key, $value); } - $PAGE->renderPage('tagcloud'); + $PAGE->renderPage('tag.cloud'); exit; } diff --git a/tpl/default/tagcloud.html b/tpl/default/tag.cloud.html similarity index 97% rename from tpl/default/tagcloud.html rename to tpl/default/tag.cloud.html index efe6e93..59aa2ee 100644 --- a/tpl/default/tagcloud.html +++ b/tpl/default/tag.cloud.html @@ -6,6 +6,8 @@ {include="page.header"} +{include="tag.sort"} +
    @@ -54,6 +56,8 @@
    +{include="tag.sort"} + {include="page.footer"} diff --git a/tpl/vintage/tagcloud.html b/tpl/vintage/tag.cloud.html similarity index 100% rename from tpl/vintage/tagcloud.html rename to tpl/vintage/tag.cloud.html From bc988eb0420156219fdeb7af684fff37c8b33f4b Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 25 Mar 2017 15:58:30 +0100 Subject: [PATCH 567/658] Add a token available everywhere --- tpl/default/page.footer.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html index 77fc65d..02fc764 100644 --- a/tpl/default/page.footer.html +++ b/tpl/default/page.footer.html @@ -16,6 +16,9 @@
    + + + {loop="$plugins_footer.endofpage"} {$value} {/loop} From aa4797ba3679b847adc895e2f817ac058779a171 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 25 Mar 2017 15:59:01 +0100 Subject: [PATCH 568/658] Adds a taglist view with edit/delete buttons * The tag list can be sort alphabetically or by most used tag * Edit/Delete are perform using AJAX, or fallback to 'do=changetag' page * New features aren't backported to vintage theme --- application/Router.php | 6 ++ application/Utils.php | 31 ++++++++ index.php | 40 +++++++---- tests/UtilsTest.php | 112 +++++++++++++++++++++++++++++ tpl/default/changetag.html | 4 +- tpl/default/css/shaarli.css | 50 ++++++++++++- tpl/default/js/shaarli.js | 136 +++++++++++++++++++++++++++++++++++- tpl/default/tag.list.html | 82 ++++++++++++++++++++++ tpl/default/tag.sort.html | 8 +++ 9 files changed, 453 insertions(+), 16 deletions(-) create mode 100644 tpl/default/tag.list.html create mode 100644 tpl/default/tag.sort.html diff --git a/application/Router.php b/application/Router.php index f6896b1..4df0387 100644 --- a/application/Router.php +++ b/application/Router.php @@ -13,6 +13,8 @@ class Router public static $PAGE_TAGCLOUD = 'tagcloud'; + public static $PAGE_TAGLIST = 'taglist'; + public static $PAGE_DAILY = 'daily'; public static $PAGE_FEED_ATOM = 'atom'; @@ -79,6 +81,10 @@ class Router return self::$PAGE_TAGCLOUD; } + if (startsWith($query, 'do='. self::$PAGE_TAGLIST)) { + return self::$PAGE_TAGLIST; + } + if (startsWith($query, 'do='. self::$PAGE_OPENSEARCH)) { return self::$PAGE_OPENSEARCH; } diff --git a/application/Utils.php b/application/Utils.php index ab463af..9d0ebc5 100644 --- a/application/Utils.php +++ b/application/Utils.php @@ -435,3 +435,34 @@ function get_max_upload_size($limitPost, $limitUpload, $format = true) $maxsize = min($size1, $size2); return $format ? human_bytes($maxsize) : $maxsize; } + +/** + * Sort the given array alphabetically using php-intl if available. + * Case sensitive. + * + * Note: doesn't support multidimensional arrays + * + * @param array $data Input array, passed by reference + * @param bool $reverse Reverse sort if set to true + * @param bool $byKeys Sort the array by keys if set to true, by value otherwise. + */ +function alphabetical_sort(&$data, $reverse = false, $byKeys = false) +{ + $callback = function($a, $b) use ($reverse) { + // Collator is part of PHP intl. + if (class_exists('Collator')) { + $collator = new Collator(setlocale(LC_COLLATE, 0)); + if (!intl_is_failure(intl_get_error_code())) { + return $collator->compare($a, $b) * ($reverse ? -1 : 1); + } + } + + return strcasecmp($a, $b) * ($reverse ? -1 : 1); + }; + + if ($byKeys) { + uksort($data, $callback); + } else { + usort($data, $callback); + } +} diff --git a/index.php b/index.php index de098ab..61b7112 100644 --- a/index.php +++ b/index.php @@ -791,7 +791,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) if ($targetPage == Router::$PAGE_TAGCLOUD) { $visibility = ! empty($_SESSION['privateonly']) ? 'private' : 'all'; - $filteringTags = isset($_GET['searchtags']) ? explode(' ', $_GET['searchtags']) : array(); + $filteringTags = isset($_GET['searchtags']) ? explode(' ', $_GET['searchtags']) : []; $tags = $LINKSDB->linksCountPerTag($filteringTags, $visibility); // We sort tags alphabetically, then choose a font size according to count. @@ -801,17 +801,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) $maxcount = max($maxcount, $value); } - // Sort tags alphabetically: case insensitive, support locale if available. - uksort($tags, function($a, $b) { - // Collator is part of PHP intl. - if (class_exists('Collator')) { - $c = new Collator(setlocale(LC_COLLATE, 0)); - if (!intl_is_failure(intl_get_error_code())) { - return $c->compare($a, $b); - } - } - return strcasecmp($a, $b); - }); + alphabetical_sort($tags, true, true); $tagList = array(); foreach($tags as $key => $value) { @@ -839,6 +829,31 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) exit; } + // -------- Tag cloud + if ($targetPage == Router::$PAGE_TAGLIST) + { + $visibility = ! empty($_SESSION['privateonly']) ? 'private' : 'all'; + $filteringTags = isset($_GET['searchtags']) ? explode(' ', $_GET['searchtags']) : []; + $tags = $LINKSDB->linksCountPerTag($filteringTags, $visibility); + + if (! empty($_GET['sort']) && $_GET['sort'] === 'alpha') { + alphabetical_sort($tags, false, true); + } + + $data = [ + 'search_tags' => implode(' ', $filteringTags), + 'tags' => $tags, + ]; + $pluginManager->executeHooks('render_taglist', $data, ['loggedin' => isLoggedIn()]); + + foreach ($data as $key => $value) { + $PAGE->assign($key, $value); + } + + $PAGE->renderPage('tag.list'); + exit; + } + // Daily page. if ($targetPage == Router::$PAGE_DAILY) { showDaily($PAGE, $LINKSDB, $conf, $pluginManager); @@ -1152,6 +1167,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) if ($targetPage == Router::$PAGE_CHANGETAG) { if (empty($_POST['fromtag']) || (empty($_POST['totag']) && isset($_POST['renametag']))) { + $PAGE->assign('fromtag', ! empty($_GET['fromtag']) ? escape($_GET['fromtag']) : ''); $PAGE->renderPage('changetag'); exit; } diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php index d6a0aad..3d1aa65 100644 --- a/tests/UtilsTest.php +++ b/tests/UtilsTest.php @@ -417,4 +417,116 @@ class UtilsTest extends PHPUnit_Framework_TestCase $this->assertEquals('1048576', get_max_upload_size('1m', '2m', false)); $this->assertEquals('100', get_max_upload_size(100, 100, false)); } + + /** + * Test alphabetical_sort by value, not reversed, with php-intl. + */ + public function testAlphabeticalSortByValue() + { + $arr = [ + 'zZz', + 'éee', + 'éae', + 'eee', + 'A', + 'a', + 'zzz', + ]; + $expected = [ + 'a', + 'A', + 'éae', + 'eee', + 'éee', + 'zzz', + 'zZz', + ]; + + alphabetical_sort($arr); + $this->assertEquals($expected, $arr); + } + + /** + * Test alphabetical_sort by value, reversed, with php-intl. + */ + public function testAlphabeticalSortByValueReversed() + { + $arr = [ + 'zZz', + 'éee', + 'éae', + 'eee', + 'A', + 'a', + 'zzz', + ]; + $expected = [ + 'zZz', + 'zzz', + 'éee', + 'eee', + 'éae', + 'A', + 'a', + ]; + + alphabetical_sort($arr, true); + $this->assertEquals($expected, $arr); + } + + /** + * Test alphabetical_sort by keys, not reversed, with php-intl. + */ + public function testAlphabeticalSortByKeys() + { + $arr = [ + 'zZz' => true, + 'éee' => true, + 'éae' => true, + 'eee' => true, + 'A' => true, + 'a' => true, + 'zzz' => true, + ]; + $expected = [ + 'a' => true, + 'A' => true, + 'éae' => true, + 'eee' => true, + 'éee' => true, + 'zzz' => true, + 'zZz' => true, + ]; + + alphabetical_sort($arr, true, true); + $this->assertEquals($expected, $arr); + } + + /** + * Test alphabetical_sort by keys, reversed, with php-intl. + */ + public function testAlphabeticalSortByKeysReversed() + { + $arr = [ + 'zZz' => true, + 'éee' => true, + 'éae' => true, + 'eee' => true, + 'A' => true, + 'a' => true, + 'zzz' => true, + ]; + $expected = [ + 'zZz' => true, + 'zzz' => true, + 'éee' => true, + 'eee' => true, + 'éae' => true, + 'A' => true, + 'a' => true, + ]; + + alphabetical_sort($arr, true, true); + $this->assertEquals($expected, $arr); + } } diff --git a/tpl/default/changetag.html b/tpl/default/changetag.html index 8d263a1..49dd20d 100644 --- a/tpl/default/changetag.html +++ b/tpl/default/changetag.html @@ -11,7 +11,7 @@

    {"Manage tags"|t}

    - {loop="$tags"}{/loop} @@ -31,6 +31,8 @@
    + +

    You can also edit tags in the tag list.

    {include="page.footer"} diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index 4415a1b..2eda5df 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -751,10 +751,11 @@ body, .pure-g [class*="pure-u"] { .page-form a { color: #1b926c; font-weight: bold; + text-decoration: none; } .page-form p { - padding: 0 10px; + padding: 5px 10px; margin: 0; } @@ -1070,7 +1071,7 @@ form[name="linkform"].page-form { } #cloudtag, #cloudtag a { - color: #000; + color: #252525; text-decoration: none; } @@ -1078,6 +1079,38 @@ form[name="linkform"].page-form { color: #7f7f7f; } +/** + * TAG LIST + */ +#taglist { + padding: 0 10px; +} + +#taglist a { + color: #252525; + text-decoration: none; +} + +#taglist .count { + display: inline-block; + width: 35px; + text-align: right; + color: #7f7f7f; +} + +#taglist .delete-tag { + color: #ac2925; + display: none; +} + +#taglist .rename-tag { + color: #0b5ea6; +} + +#taglist .validate-rename-tag { + color: #1b926c; +} + /** * Picture wall CSS */ @@ -1227,3 +1260,16 @@ form[name="linkform"].page-form { .pure-button { -moz-user-select: auto; } + +.tag-sort { + margin-top: 30px; + text-align: center; +} + +.tag-sort a { + display: inline-block; + margin: 0 15px; + color: white; + text-decoration: none; + font-weight: bold; +} diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index ceb1d1b..e19e900 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js @@ -412,8 +412,139 @@ window.onload = function () { } }); } + + /** + * Tag list operations + * + * TODO: support error code in the backend for AJAX requests + */ + // Display/Hide rename form + var renameTagButtons = document.querySelectorAll('.rename-tag'); + [].forEach.call(renameTagButtons, function(rename) { + rename.addEventListener('click', function(event) { + event.preventDefault(); + var block = findParent(event.target, 'div', {'class': 'tag-list-item'}); + var form = block.querySelector('.rename-tag-form'); + form.style.display = form.style.display == 'none' ? 'block' : 'none'; + }); + }); + + // Rename a tag with an AJAX request + var renameTagSubmits = document.querySelectorAll('.validate-rename-tag'); + [].forEach.call(renameTagSubmits, function(rename) { + rename.addEventListener('click', function(event) { + event.preventDefault(); + var block = findParent(event.target, 'div', {'class': 'tag-list-item'}); + var input = block.querySelector('.rename-tag-input'); + var totag = input.value.replace('/"/g', '\\"'); + if (totag.trim() == '') { + return; + } + var fromtag = block.getAttribute('data-tag'); + var token = document.getElementById('token').value; + + xhr = new XMLHttpRequest(); + xhr.open('POST', '?do=changetag'); + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); + xhr.onload = function() { + if (xhr.status !== 200) { + alert('An error occurred. Return code: '+ xhr.status); + location.reload(); + } else { + block.setAttribute('data-tag', totag); + input.setAttribute('name', totag); + input.setAttribute('value', totag); + input.parentNode.style.display = 'none'; + block.querySelector('a.tag-link').innerHTML = htmlEntities(totag); + block.querySelector('a.tag-link').setAttribute('href', '?searchtags='+ encodeURIComponent(totag)); + block.querySelector('a.rename-tag').setAttribute('href', '?do=changetag&fromtag='+ encodeURIComponent(totag)); + } + }; + xhr.send('renametag=1&fromtag='+ encodeURIComponent(fromtag) +'&totag='+ encodeURIComponent(totag) +'&token='+ token); + refreshToken(); + }); + }); + + // Validate input with enter key + var renameTagInputs = document.querySelectorAll('.rename-tag-input'); + [].forEach.call(renameTagInputs, function(rename) { + rename.addEventListener('keypress', function(event) { + if (event.keyCode === 13) { // enter + findParent(event.target, 'div', {'class': 'tag-list-item'}).querySelector('.validate-rename-tag').click(); + } + }); + }); + + // Delete a tag with an AJAX query (alert popup confirmation) + var deleteTagButtons = document.querySelectorAll('.delete-tag'); + [].forEach.call(deleteTagButtons, function(rename) { + rename.style.display = 'inline'; + rename.addEventListener('click', function(event) { + event.preventDefault(); + var block = findParent(event.target, 'div', {'class': 'tag-list-item'}); + var tag = block.getAttribute('data-tag'); + var token = document.getElementById('token').value; + + if (confirm('Are you sure you want to delete the tag "'+ tag +'"?')) { + xhr = new XMLHttpRequest(); + xhr.open('POST', '?do=changetag'); + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); + xhr.onload = function() { + block.remove(); + }; + xhr.send(encodeURI('deletetag=1&fromtag='+ tag +'&token='+ token)); + refreshToken(); + } + }); + }); }; +function findParent(element, tagName, attributes) +{ + while (element) { + if (element.tagName.toLowerCase() == tagName) { + var match = true; + for (var key in attributes) { + if (! element.hasAttribute(key) + || (attributes[key] != '' && element.getAttribute(key).indexOf(attributes[key]) == -1) + ) { + match = false; + break; + } + } + + if (match) { + return element; + } + } + element = element.parentElement; + } + return null; +} + +function refreshToken() +{ + var xhr = new XMLHttpRequest(); + xhr.open('GET', '?do=token'); + xhr.onload = function() { + var token = document.getElementById('token'); + token.setAttribute('value', xhr.responseText); + }; + xhr.send(); +} + +/** + * html_entities in JS + * + * @see http://stackoverflow.com/questions/18749591/encode-html-entities-in-javascript + */ +function htmlEntities(str) +{ + return str.replace(/[\u00A0-\u9999<>\&]/gim, function(i) { + return '&#'+i.charCodeAt(0)+';'; + }); +} + function activateFirefoxSocial(node) { var loc = location.href; var baseURL = loc.substring(0, loc.lastIndexOf("/")); @@ -445,8 +576,11 @@ function activateFirefoxSocial(node) { * @param currentContinent Current selected continent * @param reset Set to true to reset the selected value */ -function hideTimezoneCities(cities, currentContinent, reset = false) { +function hideTimezoneCities(cities, currentContinent) { var first = true; + if (reset == null) { + reset = false; + } [].forEach.call(cities, function (option) { if (option.getAttribute('data-continent') != currentContinent) { option.className = 'hidden'; diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html new file mode 100644 index 0000000..9897105 --- /dev/null +++ b/tpl/default/tag.list.html @@ -0,0 +1,82 @@ + + + + {include="includes"} + + +{include="page.header"} + +{include="tag.sort"} + +
    +
    +
    + {$countTags=count($tags)} +

    {'Tag list'|t} - {$countTags} {'tags'|t}

    + +
    +
    +
    +
    + + + +
    +
    +
    +
    + +
    + {loop="$plugin_start_zone"} + {$value} + {/loop} +
    + +
    + {loop="tags"} +
    +
    + {if="isLoggedIn()===true"} +    + + + + {/if} + + {$value} + {$key} + + {loop="$value.tag_plugin"} + {$value} + {/loop} +
    + {if="isLoggedIn()===true"} + + {/if} +
    + {/loop} +
    + +
    + {loop="$plugin_end_zone"} + {$value} + {/loop} +
    +
    +
    + +{include="tag.sort"} + +{include="page.footer"} + + + diff --git a/tpl/default/tag.sort.html b/tpl/default/tag.sort.html new file mode 100644 index 0000000..89acda0 --- /dev/null +++ b/tpl/default/tag.sort.html @@ -0,0 +1,8 @@ +
    +
    + {'Sort by:'|t} + {'Cloud'|t} · + {'Most used'|t} · + {'Alphabetical'|t} +
    +
    \ No newline at end of file From 82e3bb5f06dc531ee1080a0313833791a1c1f3c7 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 28 Mar 2017 20:11:07 +0200 Subject: [PATCH 569/658] Tag list: use awesomplete for tag auto completion --- tpl/default/css/shaarli.css | 4 +++ tpl/default/js/shaarli.js | 62 +++++++++++++++++++++++++++++++++++-- tpl/default/tag.list.html | 6 +++- 3 files changed, 69 insertions(+), 3 deletions(-) diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index 2eda5df..2892064 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -1098,6 +1098,10 @@ form[name="linkform"].page-form { color: #7f7f7f; } +#taglist .rename-tag-form { + display: none; +} + #taglist .delete-tag { color: #ac2925; display: none; diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index e19e900..4ebb781 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js @@ -418,6 +418,9 @@ window.onload = function () { * * TODO: support error code in the backend for AJAX requests */ + var existingTags = document.querySelector('input[name="taglist"]').value.split(' '); + var awesomepletes = []; + // Display/Hide rename form var renameTagButtons = document.querySelectorAll('.rename-tag'); [].forEach.call(renameTagButtons, function(rename) { @@ -425,7 +428,12 @@ window.onload = function () { event.preventDefault(); var block = findParent(event.target, 'div', {'class': 'tag-list-item'}); var form = block.querySelector('.rename-tag-form'); - form.style.display = form.style.display == 'none' ? 'block' : 'none'; + if (form.style.display == 'none' || form.style.display == '') { + form.style.display = 'block'; + } else { + form.style.display = 'none'; + } + block.querySelector('input').focus(); }); }); @@ -454,10 +462,18 @@ window.onload = function () { block.setAttribute('data-tag', totag); input.setAttribute('name', totag); input.setAttribute('value', totag); - input.parentNode.style.display = 'none'; + findParent(input, 'div', {'class': 'rename-tag-form'}).style.display = 'none'; block.querySelector('a.tag-link').innerHTML = htmlEntities(totag); block.querySelector('a.tag-link').setAttribute('href', '?searchtags='+ encodeURIComponent(totag)); block.querySelector('a.rename-tag').setAttribute('href', '?do=changetag&fromtag='+ encodeURIComponent(totag)); + + // Refresh awesomplete values + for (var key in existingTags) { + if (existingTags[key] == fromtag) { + existingTags[key] = totag; + } + } + awesomepletes = updateAwesompleteList('.rename-tag-input', existingTags, awesomepletes); } }; xhr.send('renametag=1&fromtag='+ encodeURIComponent(fromtag) +'&totag='+ encodeURIComponent(totag) +'&token='+ token); @@ -468,6 +484,7 @@ window.onload = function () { // Validate input with enter key var renameTagInputs = document.querySelectorAll('.rename-tag-input'); [].forEach.call(renameTagInputs, function(rename) { + rename.addEventListener('keypress', function(event) { if (event.keyCode === 13) { // enter findParent(event.target, 'div', {'class': 'tag-list-item'}).querySelector('.validate-rename-tag').click(); @@ -497,8 +514,19 @@ window.onload = function () { } }); }); + + updateAwesompleteList('.rename-tag-input', document.querySelector('input[name="taglist"]').value.split(' '), awesomepletes); }; +/** + * Find a parent element according to its tag and its attributes + * + * @param element Element where to start the search + * @param tagName Expected parent tag name + * @param attributes Associative array of expected attributes (name=>value). + * + * @returns Found element or null. + */ function findParent(element, tagName, attributes) { while (element) { @@ -522,6 +550,9 @@ function findParent(element, tagName, attributes) return null; } +/** + * Ajax request to refresh the CSRF token. + */ function refreshToken() { var xhr = new XMLHttpRequest(); @@ -533,6 +564,33 @@ function refreshToken() xhr.send(); } +/** + * Update awesomplete list of tag for all elements matching the given selector + * + * @param selector CSS selector + * @param tags Array of tags + * @param instances List of existing awesomplete instances + */ +function updateAwesompleteList(selector, tags, instances) +{ + // First load: create Awesomplete instances + if (instances.length == 0) { + var elements = document.querySelectorAll(selector); + [].forEach.call(elements, function (element) { + instances.push(new Awesomplete( + element, + {'list': tags} + )); + }); + } else { + // Update awesomplete tag list + for (var key in instances) { + instances[key].list = tags; + } + } + return instances; +} + /** * html_entities in JS * diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html index 9897105..62e2e7c 100644 --- a/tpl/default/tag.list.html +++ b/tpl/default/tag.list.html @@ -57,7 +57,7 @@ {/loop} {if="isLoggedIn()===true"} - +{if="isLoggedIn()===true"} + Date: Mon, 27 Mar 2017 14:01:06 +0200 Subject: [PATCH 570/658] Add Note bookmarklet #580 --- tpl/default/tools.html | 13 ++++++++++--- tpl/vintage/tools.html | 10 +++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/tpl/default/tools.html b/tpl/default/tools.html index baa033a..6951ad2 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html @@ -86,8 +86,16 @@
    + class="bookmarklet-link" + href="javascript:( + function(){ + window.open( + '{$pageabsaddr}?private=1&post='+ + '&description='%20+%20encodeURIComponent(document.getSelection())+ + '&source=bookmarklet','_blank','menubar=no,height=800,width=600,toolbar=no,scrollbars=yes,status=no,dialog=1' + ); + } + )();"> ✚ {'Add Note'|t}
    @@ -146,4 +154,3 @@ value="{'Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link'|t}"> - diff --git a/tpl/vintage/tools.html b/tpl/vintage/tools.html index c36aa5b..6968980 100644 --- a/tpl/vintage/tools.html +++ b/tpl/vintage/tools.html @@ -39,7 +39,15 @@

    ✚Add Note + href="javascript:( + function(){ + window.open( + '{$pageabsaddr}?private=1&post='+ + '&description='%20+%20encodeURIComponent(document.getSelection())+ + '&source=bookmarklet','_blank','menubar=no,height=800,width=600,toolbar=no,scrollbars=yes,status=no,dialog=1' + ); + } + )();">✚Add Note ⇐ Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).
    From 7d86f40bdb2135655b5b4fe8cbcc1ac102114f86 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 1 Apr 2017 12:17:37 +0200 Subject: [PATCH 571/658] Empty tag search will look for not tagged links Fixes #784 From now, searching for tags with an empty value will return only not tagged links, with the search bar showing `x results [not tagged]`. Note that using the api, the searchtags request parameter must be set to `false` to get the same result. - [ ] Update API doc --- application/FeedBuilder.php | 5 +++++ application/LinkDB.php | 27 +++++------------------ application/LinkFilter.php | 30 ++++++++++++++++++++++++++ application/Utils.php | 4 ++++ index.php | 18 +++++++++++++--- tests/LinkDBTest.php | 2 +- tests/LinkFilterTest.php | 19 +++++++++++++--- tests/api/controllers/GetLinksTest.php | 4 ++-- tests/api/controllers/InfoTest.php | 4 ++-- tests/utils/ReferenceLinkDB.php | 26 +++++++++++++++++++++- tpl/default/linklist.html | 6 +++++- tpl/vintage/linklist.html | 6 +++++- 12 files changed, 115 insertions(+), 36 deletions(-) diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php index a1f4da4..7377bce 100644 --- a/application/FeedBuilder.php +++ b/application/FeedBuilder.php @@ -97,6 +97,11 @@ class FeedBuilder */ public function buildData() { + // Search for untagged links + if (isset($this->userInput['searchtags']) && empty($this->userInput['searchtags'])) { + $this->userInput['searchtags'] = false; + } + // Optionally filter the results: $linksToDisplay = $this->linkDB->filterSearch($this->userInput); diff --git a/application/LinkDB.php b/application/LinkDB.php index 4cee2af..a03c2c0 100644 --- a/application/LinkDB.php +++ b/application/LinkDB.php @@ -450,29 +450,12 @@ You use the community supported version of the original Shaarli project, by Seba public function filterSearch($filterRequest = array(), $casesensitive = false, $visibility = 'all') { // Filter link database according to parameters. - $searchtags = !empty($filterRequest['searchtags']) ? escape($filterRequest['searchtags']) : ''; - $searchterm = !empty($filterRequest['searchterm']) ? escape($filterRequest['searchterm']) : ''; + $searchtags = isset($filterRequest['searchtags']) ? escape($filterRequest['searchtags']) : ''; + $searchterm = isset($filterRequest['searchterm']) ? escape($filterRequest['searchterm']) : ''; - // Search tags + fullsearch. - if (! empty($searchtags) && ! empty($searchterm)) { - $type = LinkFilter::$FILTER_TAG | LinkFilter::$FILTER_TEXT; - $request = array($searchtags, $searchterm); - } - // Search by tags. - elseif (! empty($searchtags)) { - $type = LinkFilter::$FILTER_TAG; - $request = $searchtags; - } - // Fulltext search. - elseif (! empty($searchterm)) { - $type = LinkFilter::$FILTER_TEXT; - $request = $searchterm; - } - // Otherwise, display without filtering. - else { - $type = ''; - $request = ''; - } + // Search tags + fullsearch - blank string parameter will return all links. + $type = LinkFilter::$FILTER_TAG | LinkFilter::$FILTER_TEXT; + $request = [$searchtags, $searchterm]; $linkFilter = new LinkFilter($this); return $linkFilter->filter($type, $request, $casesensitive, $visibility); diff --git a/application/LinkFilter.php b/application/LinkFilter.php index 81832a4..0e887d3 100644 --- a/application/LinkFilter.php +++ b/application/LinkFilter.php @@ -253,6 +253,9 @@ class LinkFilter { // Implode if array for clean up. $tags = is_array($tags) ? trim(implode(' ', $tags)) : $tags; + if ($tags === false) { + return $this->filterUntagged($visibility); + } if (empty($tags)) { return $this->noFilter($visibility); } @@ -295,6 +298,33 @@ class LinkFilter return $filtered; } + /** + * Return only links without any tag. + * + * @param string $visibility return only all/private/public links. + * + * @return array filtered links. + */ + public function filterUntagged($visibility) + { + $filtered = []; + foreach ($this->links as $key => $link) { + if ($visibility !== 'all') { + if (! $link['private'] && $visibility === 'private') { + continue; + } else if ($link['private'] && $visibility === 'public') { + continue; + } + } + + if (empty(trim($link['tags']))) { + $filtered[$key] = $link; + } + } + + return $filtered; + } + /** * Returns the list of articles for a given day, chronologically sorted * diff --git a/application/Utils.php b/application/Utils.php index 5c07745..87e5cc8 100644 --- a/application/Utils.php +++ b/application/Utils.php @@ -91,6 +91,10 @@ function endsWith($haystack, $needle, $case = true) */ function escape($input) { + if (is_bool($input)) { + return $input; + } + if (is_array($input)) { $out = array(); foreach($input as $key => $value) { diff --git a/index.php b/index.php index 5c21c2f..c96d013 100644 --- a/index.php +++ b/index.php @@ -1609,7 +1609,15 @@ function renderPage($conf, $pluginManager, $LINKSDB) function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager) { // Used in templates - $searchtags = !empty($_GET['searchtags']) ? escape(normalize_spaces($_GET['searchtags'])) : ''; + if (isset($_GET['searchtags'])) { + if (! empty($_GET['searchtags'])) { + $searchtags = escape(normalize_spaces($_GET['searchtags'])); + } else { + $searchtags = false; + } + } else { + $searchtags = ''; + } $searchterm = !empty($_GET['searchterm']) ? escape(normalize_spaces($_GET['searchterm'])) : ''; // Smallhash filter @@ -1624,7 +1632,11 @@ function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager) } else { // Filter links according search parameters. $visibility = ! empty($_SESSION['privateonly']) ? 'private' : 'all'; - $linksToDisplay = $LINKSDB->filterSearch($_GET, false, $visibility); + $request = [ + 'searchtags' => $searchtags, + 'searchterm' => $searchterm, + ]; + $linksToDisplay = $LINKSDB->filterSearch($request, false, $visibility); } // ---- Handle paging. @@ -1671,7 +1683,7 @@ function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager) } // Compute paging navigation - $searchtagsUrl = empty($searchtags) ? '' : '&searchtags=' . urlencode($searchtags); + $searchtagsUrl = $searchtags === '' ? '' : '&searchtags=' . urlencode($searchtags); $searchtermUrl = empty($searchterm) ? '' : '&searchterm=' . urlencode($searchterm); $previous_page_url = ''; if ($i != count($keys)) { diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php index 1f62a34..6fbf597 100644 --- a/tests/LinkDBTest.php +++ b/tests/LinkDBTest.php @@ -448,7 +448,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase public function testReorderLinksDesc() { self::$privateLinkDB->reorder('ASC'); - $linkIds = array(42, 4, 1, 0, 7, 6, 8, 41); + $linkIds = array(42, 4, 9, 1, 0, 7, 6, 8, 41); $cpt = 0; foreach (self::$privateLinkDB as $key => $value) { $this->assertEquals($linkIds[$cpt++], $key); diff --git a/tests/LinkFilterTest.php b/tests/LinkFilterTest.php index 37d5ca3..7416235 100644 --- a/tests/LinkFilterTest.php +++ b/tests/LinkFilterTest.php @@ -63,6 +63,12 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, '')) ); + // Untagged only + $this->assertEquals( + self::$refDB->countUntaggedLinks(), + count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, false)) + ); + $this->assertEquals( ReferenceLinkDB::$NB_LINKS_TOTAL, count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '')) @@ -146,7 +152,7 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase public function testFilterDay() { $this->assertEquals( - 3, + 4, count(self::$linkFilter->filter(LinkFilter::$FILTER_DAY, '20121206')) ); } @@ -339,7 +345,7 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase ); $this->assertEquals( - 7, + ReferenceLinkDB::$NB_LINKS_TOTAL - 1, count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '-revolution')) ); } @@ -399,7 +405,7 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase ); $this->assertEquals( - 7, + ReferenceLinkDB::$NB_LINKS_TOTAL - 1, count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, '-free')) ); } @@ -425,6 +431,13 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase array('', $terms) )) ); + $this->assertEquals( + 1, + count(self::$linkFilter->filter( + LinkFilter::$FILTER_TAG | LinkFilter::$FILTER_TEXT, + array(false, 'PSR-2') + )) + ); $this->assertEquals( 1, count(self::$linkFilter->filter( diff --git a/tests/api/controllers/GetLinksTest.php b/tests/api/controllers/GetLinksTest.php index 10330cd..f1b262b 100644 --- a/tests/api/controllers/GetLinksTest.php +++ b/tests/api/controllers/GetLinksTest.php @@ -94,7 +94,7 @@ class GetLinksTest extends \PHPUnit_Framework_TestCase $this->assertEquals($this->refDB->countLinks(), count($data)); // Check order - $order = [41, 8, 6, 7, 0, 1, 4, 42]; + $order = [41, 8, 6, 7, 0, 1, 9, 4, 42]; $cpt = 0; foreach ($data as $link) { $this->assertEquals(self::NB_FIELDS_LINK, count($link)); @@ -163,7 +163,7 @@ class GetLinksTest extends \PHPUnit_Framework_TestCase $data = json_decode((string) $response->getBody(), true); $this->assertEquals($this->refDB->countLinks(), count($data)); // Check order - $order = [41, 8, 6, 7, 0, 1, 4, 42]; + $order = [41, 8, 6, 7, 0, 1, 9, 4, 42]; $cpt = 0; foreach ($data as $link) { $this->assertEquals(self::NB_FIELDS_LINK, count($link)); diff --git a/tests/api/controllers/InfoTest.php b/tests/api/controllers/InfoTest.php index 4beef3f..5d6a232 100644 --- a/tests/api/controllers/InfoTest.php +++ b/tests/api/controllers/InfoTest.php @@ -80,7 +80,7 @@ class InfoTest extends \PHPUnit_Framework_TestCase $this->assertEquals(200, $response->getStatusCode()); $data = json_decode((string) $response->getBody(), true); - $this->assertEquals(8, $data['global_counter']); + $this->assertEquals(\ReferenceLinkDB::$NB_LINKS_TOTAL, $data['global_counter']); $this->assertEquals(2, $data['private_counter']); $this->assertEquals('Shaarli', $data['settings']['title']); $this->assertEquals('?', $data['settings']['header_link']); @@ -103,7 +103,7 @@ class InfoTest extends \PHPUnit_Framework_TestCase $this->assertEquals(200, $response->getStatusCode()); $data = json_decode((string) $response->getBody(), true); - $this->assertEquals(8, $data['global_counter']); + $this->assertEquals(\ReferenceLinkDB::$NB_LINKS_TOTAL, $data['global_counter']); $this->assertEquals(2, $data['private_counter']); $this->assertEquals($title, $data['settings']['title']); $this->assertEquals($headerLink, $data['settings']['header_link']); diff --git a/tests/utils/ReferenceLinkDB.php b/tests/utils/ReferenceLinkDB.php index 36d58c6..29d63fa 100644 --- a/tests/utils/ReferenceLinkDB.php +++ b/tests/utils/ReferenceLinkDB.php @@ -4,7 +4,7 @@ */ class ReferenceLinkDB { - public static $NB_LINKS_TOTAL = 8; + public static $NB_LINKS_TOTAL = 9; private $_links = array(); private $_publicCount = 0; @@ -37,6 +37,16 @@ class ReferenceLinkDB 'ut' ); + $this->addLink( + 9, + 'PSR-2: Coding Style Guide', + 'http://www.php-fig.org/psr/psr-2/', + 'This guide extends and expands on PSR-1, the basic coding standard.', + 0, + DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, '20121206_152312'), + '' + ); + $this->addLink( 8, 'Free as in Freedom 2.0 @website', @@ -161,6 +171,20 @@ class ReferenceLinkDB return $this->_privateCount; } + /** + * Returns the number of links without tag + */ + public function countUntaggedLinks() + { + $cpt = 0; + foreach ($this->_links as $link) { + if (empty($link['tags'])) { + ++$cpt; + } + } + return $cpt; + } + public function getLinks() { return $this->_links; diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 57ef456..3d6be52 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -89,7 +89,7 @@
    {'Nothing found.'|t}
    - {elseif="!empty($search_term) or !empty($search_tags) or !empty($visibility)"} + {elseif="!empty($search_term) or $search_tags !== '' or !empty($visibility)"}
    @@ -105,6 +105,10 @@ {$value} {/loop} + {elseif="$search_tags === false"} + + {'untagged'|t} + {/if} {if="!empty($visibility)"} {'with status'|t} diff --git a/tpl/vintage/linklist.html b/tpl/vintage/linklist.html index fc11666..8458caa 100644 --- a/tpl/vintage/linklist.html +++ b/tpl/vintage/linklist.html @@ -55,7 +55,7 @@ {if="count($links)==0"}
    Nothing found.
    - {elseif="!empty($search_term) or !empty($search_tags)"} + {elseif="!empty($search_term) or $search_tags !== ''"}
    {$result_count} results {if="!empty($search_term)"} @@ -69,6 +69,10 @@ {$value} x {/loop} + {elseif="$search_tags === false"} + + untagged x + {/if}
    {/if} From acadb0801fea760c63dffba069be9241bd8e7a6e Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 25 May 2017 16:30:37 +0200 Subject: [PATCH 572/658] Display visited links in grey Fixes #244 --- tpl/default/css/shaarli.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index 2892064..3391fa0 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -539,8 +539,8 @@ body, .pure-g [class*="pure-u"] { color: #1b926c; } -.linklist-item-title .linklist-link:visited { - color: #1b926c; +.linklist-item-title a:visited .linklist-link { + color: #555555; } .linklist-item-title a:hover, .linklist-item-title .linklist-link:hover{ From d6aec9e60b5dad7b6e64b62dc4aa8a9f403634dc Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 25 May 2017 16:45:08 +0200 Subject: [PATCH 573/658] Selection is now limited to 2k characters using bookmarklets to avoid having too large URL Fixes #528 --- tpl/default/tools.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tpl/default/tools.html b/tpl/default/tools.html index 6951ad2..bf6b6ca 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html @@ -75,7 +75,7 @@ window.open( '{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+ '&title='%20+%20encodeURIComponent(title)+ - '&description='%20+%20encodeURIComponent(document.getSelection())+ + '&description='%20+%20encodeURIComponent(document.getSelection().toString().substr(0, 2000))+ '&source=bookmarklet','_blank','menubar=no,height=800,width=600,toolbar=no,scrollbars=yes,status=no,dialog=1' ); } @@ -91,7 +91,7 @@ function(){ window.open( '{$pageabsaddr}?private=1&post='+ - '&description='%20+%20encodeURIComponent(document.getSelection())+ + '&description='%20+%20encodeURIComponent(document.getSelection().toString().substr(0, 2000))+ '&source=bookmarklet','_blank','menubar=no,height=800,width=600,toolbar=no,scrollbars=yes,status=no,dialog=1' ); } From e2bcb9d915fdda15253dd730a6d172323a8e8564 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 28 May 2017 13:04:31 +0200 Subject: [PATCH 574/658] Bookmarklet size limit: increase to 4500 chars and add an alert warning --- tpl/default/tools.html | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tpl/default/tools.html b/tpl/default/tools.html index bf6b6ca..35173d1 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html @@ -72,10 +72,15 @@ function(){ var%20url%20=%20location.href; var%20title%20=%20document.title%20||%20url; + var%20desc=document.getSelection().toString(); + if(desc.length>4000){ + desc=desc.substr(0,4000)+'...'; + alert('{function="str_replace(' ', '%20', t('The selected text is too long, it will be truncated.'))"}'); + } window.open( '{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+ '&title='%20+%20encodeURIComponent(title)+ - '&description='%20+%20encodeURIComponent(document.getSelection().toString().substr(0, 2000))+ + '&description='%20+%20encodeURIComponent(desc)+ '&source=bookmarklet','_blank','menubar=no,height=800,width=600,toolbar=no,scrollbars=yes,status=no,dialog=1' ); } @@ -89,9 +94,14 @@ class="bookmarklet-link" href="javascript:( function(){ + var%20desc=document.getSelection().toString(); + if(desc.length>4000){ + desc=desc.substr(0,4000)+'...'; + alert("{function="str_replace(' ', '%20', t('The selected text is too long, it will be truncated.'))"}"); + } window.open( '{$pageabsaddr}?private=1&post='+ - '&description='%20+%20encodeURIComponent(document.getSelection().toString().substr(0, 2000))+ + '&description='%20+%20encodeURIComponent(desc)+ '&source=bookmarklet','_blank','menubar=no,height=800,width=600,toolbar=no,scrollbars=yes,status=no,dialog=1' ); } From 807cade64c571929dc19afe3d44787c5abe84f57 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 31 May 2017 17:50:11 +0200 Subject: [PATCH 575/658] Add creation date when editing a link Also, alter the title on edition Fixes #431 --- index.php | 2 +- tpl/default/css/shaarli.css | 8 ++++++++ tpl/default/editlink.html | 9 +++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index 92eb443..cb0afbd 100644 --- a/index.php +++ b/index.php @@ -1431,7 +1431,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) 'url' => $url, 'description' => $description, 'tags' => $tags, - 'private' => $private + 'private' => $private, ); } else { $link['linkdate'] = $link['created']->format(LinkDB::LINK_DATE_FORMAT); diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index 2892064..8b86bce 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -992,6 +992,14 @@ form[name="linkform"].page-form { color: #3f3f3f; } +/** + * EDIT LINK + */ +#editlinkform .created-date { + color: #767676; + margin-bottom: 10px; +} + /** * LOGIN */ diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index 354499a..d03fd72 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html @@ -8,11 +8,15 @@
    -

    {'Shaare'|t}

    +

    + {if="!$link_is_new"}{'Edit'|t}{/if} + {'Shaare'|t} +

    {if="isset($link.id)"} {/if} + {if="!$link_is_new"}
    {'Created:'|t} {$link.created|format_date}
    {/if}
    @@ -55,7 +59,8 @@
    - + {if="!$link_is_new"} From 4c970f099f2210ac91cccdca1d0c3564a8f79c1a Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 31 May 2017 18:24:21 +0200 Subject: [PATCH 576/658] Make sure that the tag exists before altering/removing it Fixes #886 --- index.php | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/index.php b/index.php index 2ff2505..39230c8 100644 --- a/index.php +++ b/index.php @@ -1176,6 +1176,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) die('Wrong token.'); } + $count = 0; // Delete a tag: if (isset($_POST['deletetag']) && !empty($_POST['fromtag'])) { $needle = trim($_POST['fromtag']); @@ -1184,13 +1185,16 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) 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; - $history->updateLink($LINKSDB[$key]); + if (($pos = array_search($needle,$tags)) !== false) { + unset($tags[$pos]); // Remove tag. + $value['tags']=trim(implode(' ',$tags)); + $LINKSDB[$key]=$value; + $history->updateLink($LINKSDB[$key]); + ++$count; + } } $LINKSDB->save($conf->get('resource.page_cache')); - echo ''; + echo ''; exit; } @@ -1202,13 +1206,16 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) foreach($linksToAlter as $key=>$value) { $tags = preg_split('/\s+/', trim($value['tags'])); // Replace tags value. - $tags[array_search($needle, $tags)] = trim($_POST['totag']); - $value['tags'] = implode(' ', array_unique($tags)); - $LINKSDB[$key] = $value; - $history->updateLink($LINKSDB[$key]); + if (($pos = array_search($needle,$tags)) !== false) { + $tags[$pos] = trim($_POST['totag']); + $value['tags'] = implode(' ', array_unique($tags)); + $LINKSDB[$key] = $value; + $history->updateLink($LINKSDB[$key]); + ++$count; + } } $LINKSDB->save($conf->get('resource.page_cache')); // Save to disk. - echo ''; + echo ''; exit; } } From d99aef535fa209c27c46a97dee4187ac21c84d4d Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Wed, 31 May 2017 18:36:35 +0200 Subject: [PATCH 577/658] Refactoring of CHANGETAG part to avoid duplicated code --- index.php | 61 ++++++++++++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/index.php b/index.php index 39230c8..eb6b17d 100644 --- a/index.php +++ b/index.php @@ -1176,48 +1176,41 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) die('Wrong token.'); } - $count = 0; - // Delete a tag: if (isset($_POST['deletetag']) && !empty($_POST['fromtag'])) { - $needle = trim($_POST['fromtag']); - // True for case-sensitive tag search. - $linksToAlter = $LINKSDB->filterSearch(array('searchtags' => $needle), true); - foreach($linksToAlter as $key=>$value) - { - $tags = explode(' ',trim($value['tags'])); - if (($pos = array_search($needle,$tags)) !== false) { - unset($tags[$pos]); // Remove tag. - $value['tags']=trim(implode(' ',$tags)); - $LINKSDB[$key]=$value; - $history->updateLink($LINKSDB[$key]); - ++$count; - } - } - $LINKSDB->save($conf->get('resource.page_cache')); - echo ''; + $delete = true; + } else if (isset($_POST['renametag']) && !empty($_POST['fromtag']) && !empty($_POST['totag'])) { + $delete = false; + } else { + $PAGE->renderPage('changetag'); exit; } - // Rename a tag: - if (isset($_POST['renametag']) && !empty($_POST['fromtag']) && !empty($_POST['totag'])) { - $needle = trim($_POST['fromtag']); - // True for case-sensitive tag search. - $linksToAlter = $LINKSDB->filterSearch(array('searchtags' => $needle), true); - foreach($linksToAlter as $key=>$value) { - $tags = preg_split('/\s+/', trim($value['tags'])); - // Replace tags value. - if (($pos = array_search($needle,$tags)) !== false) { + $count = 0; + $needle = trim($_POST['fromtag']); + // True for case-sensitive tag search. + $linksToAlter = $LINKSDB->filterSearch(array('searchtags' => $needle), true); + foreach($linksToAlter as $key => $value) + { + $tags = explode(' ',trim($value['tags'])); + if (($pos = array_search($needle,$tags)) !== false) { + if ($delete) { + unset($tags[$pos]); // Remove tag. + } else { $tags[$pos] = trim($_POST['totag']); - $value['tags'] = implode(' ', array_unique($tags)); - $LINKSDB[$key] = $value; - $history->updateLink($LINKSDB[$key]); - ++$count; } + $value['tags'] = trim(implode(' ', array_unique($tags))); + $LINKSDB[$key]=$value; + $history->updateLink($LINKSDB[$key]); + ++$count; } - $LINKSDB->save($conf->get('resource.page_cache')); // Save to disk. - echo ''; - exit; } + $LINKSDB->save($conf->get('resource.page_cache')); + $redirect = $delete ? 'do=changetag' : 'searchtags='. urlencode(escape($_POST['totag'])); + $alert = $delete + ? sprintf(t('The tag was removed from %d links.'), $count) + : sprintf(t('The tag was renamed in %d links.'), $count); + echo ''; + exit; } // -------- User wants to add a link without using the bookmarklet: Show form. From 9bf82f4fa14a871fcda1e14e07767d788540c8e3 Mon Sep 17 00:00:00 2001 From: Lucas Cimon Date: Wed, 7 Jun 2017 16:08:35 +0200 Subject: [PATCH 578/658] Fixing "Uncaught TypeError" in shaarli.js - fix #893 --- tpl/default/js/shaarli.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index 4ebb781..b120c91 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js @@ -418,7 +418,8 @@ window.onload = function () { * * TODO: support error code in the backend for AJAX requests */ - var existingTags = document.querySelector('input[name="taglist"]').value.split(' '); + var tagList = document.querySelector('input[name="taglist"]'); + var existingTags = tagList ? tagList.value.split(' ') : []; var awesomepletes = []; // Display/Hide rename form @@ -515,7 +516,7 @@ window.onload = function () { }); }); - updateAwesompleteList('.rename-tag-input', document.querySelector('input[name="taglist"]').value.split(' '), awesomepletes); + updateAwesompleteList('.rename-tag-input', existingTags, awesomepletes); }; /** From 49cc8e5d747e6c3504803cf4fa1589fa204e32b5 Mon Sep 17 00:00:00 2001 From: Lucas Cimon Date: Fri, 2 Jun 2017 17:58:26 +0200 Subject: [PATCH 579/658] Tagcloud/list improvments --- index.php | 10 +++++++++- tpl/default/tag.cloud.html | 7 ++++++- tpl/default/tag.list.html | 5 ++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index 2ff2505..85486eb 100644 --- a/index.php +++ b/index.php @@ -805,6 +805,9 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) $tagList = array(); foreach($tags as $key => $value) { + if (in_array($key, $filteringTags)) { + continue; + } // Tag font size scaling: // default 15 and 30 logarithm bases affect scaling, // 22 and 6 are arbitrary font sizes for max and min sizes. @@ -829,12 +832,17 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) exit; } - // -------- Tag cloud + // -------- Tag list if ($targetPage == Router::$PAGE_TAGLIST) { $visibility = ! empty($_SESSION['privateonly']) ? 'private' : 'all'; $filteringTags = isset($_GET['searchtags']) ? explode(' ', $_GET['searchtags']) : []; $tags = $LINKSDB->linksCountPerTag($filteringTags, $visibility); + foreach ($filteringTags as $tag) { + if (array_key_exists($tag, $tags)) { + unset($tags[$tag]); + } + } if (! empty($_GET['sort']) && $_GET['sort'] === 'alpha') { alphabetical_sort($tags, false, true); diff --git a/tpl/default/tag.cloud.html b/tpl/default/tag.cloud.html index 59aa2ee..96b357a 100644 --- a/tpl/default/tag.cloud.html +++ b/tpl/default/tag.cloud.html @@ -13,6 +13,11 @@
    {$countTags=count($tags)}

    {'Tag cloud'|t} - {$countTags} {'tags'|t}

    + {if="!empty($search_tags)"} +

    + {'List all links with those tags'|t} +

    + {/if}
    @@ -40,7 +45,7 @@
    {loop="tags"} - {$key}{$key}{$value.count} {loop="$value.tag_plugin"} {$value} diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html index 62e2e7c..81d6e5a 100644 --- a/tpl/default/tag.list.html +++ b/tpl/default/tag.list.html @@ -13,6 +13,9 @@
    {$countTags=count($tags)}

    {'Tag list'|t} - {$countTags} {'tags'|t}

    +

    + {'List all links with those tags'|t} +

    @@ -50,7 +53,7 @@ {/if} {$value} - {$key} + {$key} {loop="$value.tag_plugin"} {$value} From 8eb6bac137d31b36ff2da5970f1ac398cf574435 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 11 Jun 2017 14:09:42 +0200 Subject: [PATCH 580/658] Fix Firefox Social button in the default theme is no longer required since the JS function is now in . Also, include the trailing slash in the post URL. Fixes #895 --- tpl/default/js/shaarli.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index b120c91..4f49aff 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js @@ -606,7 +606,7 @@ function htmlEntities(str) function activateFirefoxSocial(node) { var loc = location.href; - var baseURL = loc.substring(0, loc.lastIndexOf("/")); + var baseURL = loc.substring(0, loc.lastIndexOf("/") + 1); // Keeping the data separated (ie. not in the DOM) so that it's maintainable and diffable. var data = { @@ -619,7 +619,7 @@ function activateFirefoxSocial(node) { icon32URL: baseURL + "/images/favicon.ico", icon64URL: baseURL + "/images/favicon.ico", - shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi{/noparse}", + shareURL: baseURL + "?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi", homepageURL: baseURL }; node.setAttribute("data-service", JSON.stringify(data)); From 53ed6d7d1e678d7486337ce67a2f17b30bac21ac Mon Sep 17 00:00:00 2001 From: nodiscc Date: Thu, 26 Jan 2017 18:52:54 +0100 Subject: [PATCH 581/658] Generate HTML documentation using MkDocs (WIP) MkDocs is a static site generator geared towards building project documentation. Documentation source files are written in Markdown, and configured with a single YAML file. * http://www.mkdocs.org/ * http://www.mkdocs.org/user-guide/configuration/ Ref. #312 * remove pandoc-generated HTML documentation * move markdown doc to doc/md/, * mkdocs.yml: * generate HTML doc in doc/html * add pages TOC/ordering * use index.md as index page * Makefile: remove execute permissions from generated files * Makefile: rewrite htmlpages GFM to markdown conversion using sed: awk expression aslo matched '][' which causes invalid output on complex links with images or code blocks * Add mkdocs.yml to .gitattributes, exclude this file from release archives * Makefile: rename: htmldoc -> doc_html target * run make doc: pull latest markdown documentation from wiki * run make htmlpages: update html documentation --- .gitattributes | 1 + Makefile | 50 +- doc/3rd-party-libraries.html | 88 - doc/Backup,-restore,-import-and-export.html | 152 -- doc/Browsing-and-searching.html | 83 - doc/Coding-guidelines.html | 75 - doc/Community-&-Related-software.html | 131 -- ...llation-over-SSH-and-serve-it-locally.html | 165 -- ...te-and-serve-multiple-Shaarlis-(farm).html | 159 -- doc/Datastore-hacks.html | 124 -- doc/Development.html | 112 -- doc/Development.md | 35 - doc/Directory-structure.html | 135 -- doc/Docker.html | 245 --- ...Download-CSS-styles-from-an-OPML-list.html | 257 --- doc/Download-and-Installation.html | 172 -- ...e-patch---add-new-via-field-for-links.html | 254 --- doc/FAQ.html | 107 -- doc/Firefox-share.html | 95 -- doc/GnuPG-signature.html | 175 -- doc/Home.html | 76 - doc/Plugin-System.html | 634 ------- doc/Plugins.html | 155 -- doc/REST-API.html | 169 -- doc/RSS-feeds.html | 99 -- doc/Release-Shaarli.html | 224 --- doc/Security.html | 135 -- doc/Server-configuration.html | 459 ----- doc/Server-requirements.html | 195 --- doc/Server-security.html | 175 -- doc/Shaarli-configuration.html | 298 ---- doc/Sharing-button.html | 94 - doc/Static-analysis.html | 82 - doc/Theming.html | 182 -- doc/Troubleshooting.html | 202 --- doc/Unit-tests.html | 226 --- doc/Upgrade-and-migration.html | 259 --- doc/Usage.html | 95 -- doc/Versioning-and-Branches.html | 156 -- doc/_Footer.html | 70 - doc/_Sidebar.html | 119 -- doc/html/3rd-party-libraries/index.html | 369 ++++ .../index.html | 411 +++++ doc/html/Bookmarklet/index.html | 375 ++++ doc/html/Browsing-and-searching/index.html | 362 ++++ doc/html/Coding-guidelines/index.html | 348 ++++ .../Community-&-Related-software/index.html | 419 +++++ .../Continuous-integration-tools/index.html | 367 ++++ .../index.html | 403 +++++ .../index.html | 396 +++++ doc/html/Datastore-hacks/index.html | 369 ++++ doc/html/Development-guidelines/index.html | 352 ++++ doc/html/Directory-structure/index.html | 371 ++++ doc/html/Docker-101/index.html | 410 +++++ doc/html/Docker-resources/index.html | 370 ++++ .../index.html | 496 ++++++ doc/html/Download-and-Installation/index.html | 444 +++++ doc/html/FAQ/index.html | 388 +++++ doc/html/Features/index.html | 371 ++++ doc/html/Firefox-share/index.html | 368 ++++ doc/html/GnuPG-signature/index.html | 439 +++++ doc/html/Plugin-System/index.html | 968 +++++++++++ doc/html/Plugins/index.html | 414 +++++ doc/html/REST-API/index.html | 431 +++++ doc/html/RSS-feeds/index.html | 367 ++++ doc/html/Release-Shaarli/index.html | 529 ++++++ .../Reverse-proxy-configuration/index.html | 350 ++++ doc/html/Security/index.html | 386 +++++ doc/html/Server-configuration/index.html | 747 ++++++++ doc/html/Server-requirements/index.html | 475 ++++++ doc/html/Server-security/index.html | 429 +++++ doc/html/Shaarli-configuration/index.html | 563 ++++++ doc/html/Shaarli-images/index.html | 425 +++++ doc/html/Static-analysis/index.html | 359 ++++ doc/html/Theming/index.html | 435 +++++ doc/html/Troubleshooting/index.html | 441 +++++ doc/html/Unit-tests/index.html | 492 ++++++ doc/html/Upgrade-and-migration/index.html | 534 ++++++ doc/html/Versioning-and-Branches/index.html | 418 +++++ doc/{ => html}/config.json | 0 doc/html/css/highlight.css | 124 ++ doc/html/css/theme.css | 12 + doc/html/css/theme_extra.css | 193 +++ doc/html/fonts/fontawesome-webfont.eot | Bin 0 -> 37405 bytes doc/html/fonts/fontawesome-webfont.svg | 399 +++++ doc/html/fonts/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes doc/html/fonts/fontawesome-webfont.woff | Bin 0 -> 43572 bytes doc/{ => html}/github-markdown.css | 0 doc/{ => html}/images/bookmarklet.png | Bin doc/{ => html}/images/doc-logo.png | Bin doc/{ => html}/images/doc-logo.svg | 0 doc/{ => html}/images/firefoxshare.png | Bin doc/{ => html}/images/rss-filter-1.png | Bin doc/{ => html}/images/rss-filter-2.png | Bin doc/html/img/favicon.ico | Bin 0 -> 1150 bytes doc/html/index.html | 344 ++++ doc/html/js/highlight.pack.js | 2 + doc/html/js/jquery-2.1.1.min.js | 4 + doc/html/js/modernizr-2.8.3.min.js | 1 + doc/html/js/theme.js | 82 + doc/html/mkdocs/js/lunr.min.js | 7 + doc/html/mkdocs/js/mustache.min.js | 1 + doc/html/mkdocs/js/require.js | 36 + .../js/search-results-template.mustache | 4 + doc/html/mkdocs/js/search.js | 88 + doc/html/mkdocs/js/text.js | 390 +++++ doc/html/mkdocs/search_index.json | 1519 +++++++++++++++++ doc/html/search.html | 324 ++++ doc/html/sitemap.xml | 266 +++ doc/{ => md}/3rd-party-libraries.md | 13 +- .../Backup,-restore,-import-and-export.md | 23 +- doc/{Sharing-button.md => md/Bookmarklet.md} | 7 +- doc/{ => md}/Browsing-and-searching.md | 7 +- doc/{ => md}/Coding-guidelines.md | 6 +- doc/{ => md}/Community-&-Related-software.md | 73 +- doc/md/Continuous-integration-tools.md | 24 + ...tallation-over-SSH-and-serve-it-locally.md | 7 +- ...eate-and-serve-multiple-Shaarlis-(farm).md | 21 +- doc/{ => md}/Datastore-hacks.md | 3 +- doc/md/Development-guidelines.md | 9 + doc/{ => md}/Directory-structure.md | 3 +- doc/md/Docker-101.md | 62 + doc/md/Docker-resources.md | 19 + .../Download-CSS-styles-from-an-OPML-list.md | 13 +- doc/{ => md}/Download-and-Installation.md | 15 +- ...ple-patch---add-new-via-field-for-links.md | 97 +- doc/{ => md}/FAQ.md | 15 +- doc/{Usage.md => md/Features.md} | 3 +- doc/{ => md}/Firefox-share.md | 3 +- doc/{ => md}/GnuPG-signature.md | 25 +- doc/{ => md}/Plugin-System.md | 89 +- doc/{ => md}/Plugins.md | 15 +- doc/md/REST-API.md | 104 ++ doc/{ => md}/RSS-feeds.md | 3 +- doc/{ => md}/Release-Shaarli.md | 77 +- doc/md/Reverse-proxy-configuration.md | 6 + doc/{ => md}/Security.md | 1 - doc/{ => md}/Server-configuration.md | 55 +- doc/{ => md}/Server-requirements.md | 32 +- doc/{ => md}/Server-security.md | 11 +- doc/{ => md}/Shaarli-configuration.md | 29 +- doc/md/Shaarli-images.md | 72 + doc/{ => md}/Static-analysis.md | 11 +- doc/{ => md}/Theming.md | 35 +- doc/{ => md}/Troubleshooting.md | 38 +- doc/{ => md}/Unit-tests.md | 17 +- doc/{ => md}/Upgrade-and-migration.md | 50 +- doc/md/Versioning-and-Branches.md | 75 + doc/{ => md}/_Footer.md | 3 +- doc/md/_Sidebar.md | 45 + doc/md/config.json | 6 + doc/md/github-markdown.css | 287 ++++ doc/md/images/bookmarklet.png | Bin 0 -> 53346 bytes doc/md/images/doc-logo.png | Bin 0 -> 19543 bytes doc/md/images/doc-logo.svg | 522 ++++++ doc/md/images/firefoxshare.png | Bin 0 -> 757 bytes doc/md/images/rss-filter-1.png | Bin 0 -> 18682 bytes doc/md/images/rss-filter-2.png | Bin 0 -> 15604 bytes doc/{Home.md => md/index.md} | 11 +- doc/sidebar.html | 52 - mkdocs.yml | 53 + tpl/default/page.footer.html | 10 + 162 files changed, 22127 insertions(+), 7136 deletions(-) delete mode 100644 doc/3rd-party-libraries.html delete mode 100644 doc/Backup,-restore,-import-and-export.html delete mode 100644 doc/Browsing-and-searching.html delete mode 100644 doc/Coding-guidelines.html delete mode 100644 doc/Community-&-Related-software.html delete mode 100644 doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html delete mode 100644 doc/Create-and-serve-multiple-Shaarlis-(farm).html delete mode 100644 doc/Datastore-hacks.html delete mode 100644 doc/Development.html delete mode 100644 doc/Development.md delete mode 100644 doc/Directory-structure.html delete mode 100644 doc/Docker.html delete mode 100644 doc/Download-CSS-styles-from-an-OPML-list.html delete mode 100644 doc/Download-and-Installation.html delete mode 100644 doc/Example-patch---add-new-via-field-for-links.html delete mode 100644 doc/FAQ.html delete mode 100644 doc/Firefox-share.html delete mode 100644 doc/GnuPG-signature.html delete mode 100644 doc/Home.html delete mode 100644 doc/Plugin-System.html delete mode 100644 doc/Plugins.html delete mode 100644 doc/REST-API.html delete mode 100644 doc/RSS-feeds.html delete mode 100644 doc/Release-Shaarli.html delete mode 100644 doc/Security.html delete mode 100644 doc/Server-configuration.html delete mode 100644 doc/Server-requirements.html delete mode 100644 doc/Server-security.html delete mode 100644 doc/Shaarli-configuration.html delete mode 100644 doc/Sharing-button.html delete mode 100644 doc/Static-analysis.html delete mode 100644 doc/Theming.html delete mode 100644 doc/Troubleshooting.html delete mode 100644 doc/Unit-tests.html delete mode 100644 doc/Upgrade-and-migration.html delete mode 100644 doc/Usage.html delete mode 100644 doc/Versioning-and-Branches.html delete mode 100644 doc/_Footer.html delete mode 100644 doc/_Sidebar.html create mode 100644 doc/html/3rd-party-libraries/index.html create mode 100644 doc/html/Backup,-restore,-import-and-export/index.html create mode 100644 doc/html/Bookmarklet/index.html create mode 100644 doc/html/Browsing-and-searching/index.html create mode 100644 doc/html/Coding-guidelines/index.html create mode 100644 doc/html/Community-&-Related-software/index.html create mode 100644 doc/html/Continuous-integration-tools/index.html create mode 100644 doc/html/Copy-an-existing-installation-over-SSH-and-serve-it-locally/index.html create mode 100644 doc/html/Create-and-serve-multiple-Shaarlis-(farm)/index.html create mode 100644 doc/html/Datastore-hacks/index.html create mode 100644 doc/html/Development-guidelines/index.html create mode 100644 doc/html/Directory-structure/index.html create mode 100644 doc/html/Docker-101/index.html create mode 100644 doc/html/Docker-resources/index.html create mode 100644 doc/html/Download-CSS-styles-from-an-OPML-list/index.html create mode 100644 doc/html/Download-and-Installation/index.html create mode 100644 doc/html/FAQ/index.html create mode 100644 doc/html/Features/index.html create mode 100644 doc/html/Firefox-share/index.html create mode 100644 doc/html/GnuPG-signature/index.html create mode 100644 doc/html/Plugin-System/index.html create mode 100644 doc/html/Plugins/index.html create mode 100644 doc/html/REST-API/index.html create mode 100644 doc/html/RSS-feeds/index.html create mode 100644 doc/html/Release-Shaarli/index.html create mode 100644 doc/html/Reverse-proxy-configuration/index.html create mode 100644 doc/html/Security/index.html create mode 100644 doc/html/Server-configuration/index.html create mode 100644 doc/html/Server-requirements/index.html create mode 100644 doc/html/Server-security/index.html create mode 100644 doc/html/Shaarli-configuration/index.html create mode 100644 doc/html/Shaarli-images/index.html create mode 100644 doc/html/Static-analysis/index.html create mode 100644 doc/html/Theming/index.html create mode 100644 doc/html/Troubleshooting/index.html create mode 100644 doc/html/Unit-tests/index.html create mode 100644 doc/html/Upgrade-and-migration/index.html create mode 100644 doc/html/Versioning-and-Branches/index.html rename doc/{ => html}/config.json (100%) create mode 100644 doc/html/css/highlight.css create mode 100644 doc/html/css/theme.css create mode 100644 doc/html/css/theme_extra.css create mode 100644 doc/html/fonts/fontawesome-webfont.eot create mode 100644 doc/html/fonts/fontawesome-webfont.svg create mode 100644 doc/html/fonts/fontawesome-webfont.ttf create mode 100644 doc/html/fonts/fontawesome-webfont.woff rename doc/{ => html}/github-markdown.css (100%) rename doc/{ => html}/images/bookmarklet.png (100%) rename doc/{ => html}/images/doc-logo.png (100%) rename doc/{ => html}/images/doc-logo.svg (100%) rename doc/{ => html}/images/firefoxshare.png (100%) rename doc/{ => html}/images/rss-filter-1.png (100%) rename doc/{ => html}/images/rss-filter-2.png (100%) create mode 100644 doc/html/img/favicon.ico create mode 100644 doc/html/index.html create mode 100644 doc/html/js/highlight.pack.js create mode 100644 doc/html/js/jquery-2.1.1.min.js create mode 100644 doc/html/js/modernizr-2.8.3.min.js create mode 100644 doc/html/js/theme.js create mode 100644 doc/html/mkdocs/js/lunr.min.js create mode 100644 doc/html/mkdocs/js/mustache.min.js create mode 100644 doc/html/mkdocs/js/require.js create mode 100644 doc/html/mkdocs/js/search-results-template.mustache create mode 100644 doc/html/mkdocs/js/search.js create mode 100644 doc/html/mkdocs/js/text.js create mode 100644 doc/html/mkdocs/search_index.json create mode 100644 doc/html/search.html create mode 100644 doc/html/sitemap.xml rename doc/{ => md}/3rd-party-libraries.md (73%) rename doc/{ => md}/Backup,-restore,-import-and-export.md (87%) rename doc/{Sharing-button.md => md/Bookmarklet.md} (76%) rename doc/{ => md}/Browsing-and-searching.md (83%) rename doc/{ => md}/Coding-guidelines.md (64%) rename doc/{ => md}/Community-&-Related-software.md (64%) create mode 100644 doc/md/Continuous-integration-tools.md rename doc/{ => md}/Copy-an-existing-installation-over-SSH-and-serve-it-locally.md (88%) rename doc/{ => md}/Create-and-serve-multiple-Shaarlis-(farm).md (77%) rename doc/{ => md}/Datastore-hacks.md (98%) create mode 100644 doc/md/Development-guidelines.md rename doc/{ => md}/Directory-structure.md (98%) create mode 100644 doc/md/Docker-101.md create mode 100644 doc/md/Docker-resources.md rename doc/{ => md}/Download-CSS-styles-from-an-OPML-list.md (92%) rename doc/{ => md}/Download-and-Installation.md (88%) rename doc/{ => md}/Example-patch---add-new-via-field-for-links.md (80%) rename doc/{ => md}/FAQ.md (89%) rename doc/{Usage.md => md/Features.md} (96%) rename doc/{ => md}/Firefox-share.md (86%) rename doc/{ => md}/GnuPG-signature.md (87%) rename doc/{ => md}/Plugin-System.md (88%) rename doc/{ => md}/Plugins.md (86%) create mode 100644 doc/md/REST-API.md rename doc/{ => md}/RSS-feeds.md (93%) rename doc/{ => md}/Release-Shaarli.md (74%) create mode 100644 doc/md/Reverse-proxy-configuration.md rename doc/{ => md}/Security.md (99%) rename doc/{ => md}/Server-configuration.md (92%) rename doc/{ => md}/Server-requirements.md (73%) rename doc/{ => md}/Server-security.md (93%) rename doc/{ => md}/Shaarli-configuration.md (90%) create mode 100644 doc/md/Shaarli-images.md rename doc/{ => md}/Static-analysis.md (68%) rename doc/{ => md}/Theming.md (79%) rename doc/{ => md}/Troubleshooting.md (92%) rename doc/{ => md}/Unit-tests.md (96%) rename doc/{ => md}/Upgrade-and-migration.md (83%) create mode 100644 doc/md/Versioning-and-Branches.md rename doc/{ => md}/_Footer.md (69%) create mode 100644 doc/md/_Sidebar.md create mode 100644 doc/md/config.json create mode 100644 doc/md/github-markdown.css create mode 100644 doc/md/images/bookmarklet.png create mode 100644 doc/md/images/doc-logo.png create mode 100644 doc/md/images/doc-logo.svg create mode 100644 doc/md/images/firefoxshare.png create mode 100644 doc/md/images/rss-filter-1.png create mode 100644 doc/md/images/rss-filter-2.png rename doc/{Home.md => md/index.md} (89%) delete mode 100644 doc/sidebar.html create mode 100644 mkdocs.yml diff --git a/.gitattributes b/.gitattributes index 82f3760..dd0e573 100644 --- a/.gitattributes +++ b/.gitattributes @@ -33,5 +33,6 @@ doc/**/*.md export-ignore docker/ export-ignore Doxyfile export-ignore Makefile export-ignore +mkdocs.yml export-ignore phpunit.xml export-ignore tests/ export-ignore diff --git a/Makefile b/Makefile index 1d8a73a..1ddd60f 100644 --- a/Makefile +++ b/Makefile @@ -194,42 +194,28 @@ doxygen: clean ### update the local copy of the documentation doc: clean - @rm -rf doc - @git clone https://github.com/shaarli/Shaarli.wiki.git doc - @rm -rf doc/.git - -### Generate a custom sidebar -# -# Sidebar content: -# - convert GitHub-flavoured relative links to standard Markdown -# - trim HTML, only keep the list (
      [...]
    ) part -htmlsidebar: - @echo '
    ' > doc/sidebar.html - @awk 'BEGIN { FS = "[\\[\\]]{2}" }'\ - 'm = /\[/ { t=$$2; gsub(/ /, "-", $$2); print $$1"["t"]("$$2".html)"$$3 }'\ - '!m { print $$0 }' doc/_Sidebar.md > doc/tmp.md - @pandoc -f markdown -t html5 -s doc/tmp.md | awk '/(ul>|li>)/' >> doc/sidebar.html - @echo '
    ' >> doc/sidebar.html - @rm doc/tmp.md + @rm -rf doc/md/ + @git clone https://github.com/shaarli/Shaarli.wiki.git doc/md + mv doc/md/Home.md doc/md/index.md + @rm -rf doc/md/.git ### Convert local markdown documentation to HTML # # For all pages: -# - infer title from the file name # - convert GitHub-flavoured relative links to standard Markdown -# - insert the sidebar menu +# - generate html documentation with mkdocs htmlpages: - @for file in `find doc/ -maxdepth 1 -name "*.md"`; do \ - base=`basename $$file .md`; \ - sed -i "1i #$${base//-/ }" $$file; \ - awk 'BEGIN { FS = "[\\[\\]]{2}" }'\ - 'm = /\[/ { t=$$2; gsub(/ /, "-", $$2); print $$1"["t"]("$$2".html)"$$3 }'\ - '!m { print $$0 }' $$file > doc/tmp.md; \ - mv doc/tmp.md $$file; \ - pandoc -f markdown_github -t html5 -s \ - -c "github-markdown.css" \ - -T Shaarli -M pagetitle:"$${base//-/ }" -B doc/sidebar.html \ - -o doc/$$base.html $$file; \ - done; + # Rename local [[links]] to regular links. + @for file in `find doc/md/ -maxdepth 1 -name "*.md"`; do \ + sed -e "s/\[\[\(.*\)\]\]/[\1](\1)/g" "$$file" > doc/md/tmp.md; \ + mv doc/md/tmp.md $$file; \ + done -htmldoc: authors doc htmlsidebar htmlpages + python3 -m venv venv/ + bash -c 'source venv/bin/activate; \ + pip install mkdocs; \ + mkdocs build' + find doc/html/ -type f -exec chmod a-x '{}' \; + rm -r venv + +doc_html: authors doc htmlpages diff --git a/doc/3rd-party-libraries.html b/doc/3rd-party-libraries.html deleted file mode 100644 index 50aba6c..0000000 --- a/doc/3rd-party-libraries.html +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - Shaarli – 3rd party libraries - - - - - - -

    3rd party libraries

    -

    CSS

    -
      -
    • Yahoo UI CSS Reset -
        -
      • resets default CSS properties for all HTML elements (overriding browsers' default values)
        • -
      • ensures custom CSS stylessheets will provide the same results on all browsers
        • -
      • -
    -

    Javascript

    - -

    PHP

    - - - diff --git a/doc/Backup,-restore,-import-and-export.html b/doc/Backup,-restore,-import-and-export.html deleted file mode 100644 index 3c16882..0000000 --- a/doc/Backup,-restore,-import-and-export.html +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - Shaarli – Backup, restore, import and export - - - - - - - -

    Backup, restore, import and export

    - -
    -

    Backup and restore the datastore file

    -

    Backup the file data/datastore.php (by FTP or SSH). Restore by putting the file back in place.

    -

    Example command:

    -
    rsync -avzP my.server.com:/var/www/shaarli/data/datastore.php datastore-$(date +%Y-%m-%d_%H%M).php
    - -

    To export links as an HTML file, under Tools > Export, choose:

    -
      -
    • Export all to export both public and private links
      • -
    • Export public to export public links only
      • -
    • Export private to export private links only
      • -
    -

    Restore by using the Import feature.

    - -

    Example command:

    -
    ./export-bookmarks.py --url=https://my.server.com/shaarli --username=myusername --password=mysupersecretpassword --download-dir=./ --type=all
    - -

    Diigo

    -

    If you export your bookmark from Diigo, make sure you use the Delicious export, not the Netscape export. (Their Netscape export is broken, and they don't seem to be interested in fixing it.)

    -

    Mister Wong

    -

    See this issue for import tweaks.

    -

    SemanticScuttle

    -

    To correctly import the tags from a SemanticScuttle HTML export, edit the HTML file before importing and replace all occurences of tags= (lowercase) to TAGS= (uppercase).

    -

    Scuttle

    -

    Shaarli cannot import data directly from Scuttle. However, you can use this third party tool: https://github.com/q2apro/scuttle-to-shaarli to export the Scuttle database to the Netscape HTML format compatible with the Shaarli importer.

    - -
      -
    • Export your Shaarli links as described above.
      • -
    • For compatibility reasons, check Prepend note permalinks with this Shaarli instance's URL (useful to import bookmarks in a web browser)
      • -
    • In Firefox, open the bookmark manager (not the sidebar! Bookmarks menu > Show all bookmarks or Ctrl+Shift+B)
      • -
    • Select Import and Backup > Import bookmarks in HTML format
      • -
    -

    Your bookmarks will be imported in Firefox, ready to use, with tags and descriptions retained. "Self" (notes) shaares will still point to the Shaarli instance you exported them from, but the note text can be viewed directly in the bookmark properties inside your browser. Depending on the number of bookmarks, the import can take some time.

    -

    You may be interested in these Firefox addons to manage links imported from Shaarli

    - - - diff --git a/doc/Browsing-and-searching.html b/doc/Browsing-and-searching.html deleted file mode 100644 index ef5b524..0000000 --- a/doc/Browsing-and-searching.html +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - Shaarli – Browsing and searching - - - - - - -

    Browsing and searching

    -

    Browsing and Searching

    -

    -

    Plain text search

    -

    Use the Search text field to search in any of the fields of all links (Title, URL, Description...)

    -

    Exclude text/tags: Use the - operator before a word or tag (example -uninteresting) to prevent entries containing (or tagged) uninteresting from showing up in the search results.

    -

    Exact text search: Use double-quotes (example "exact search") to search for the exact expression.

    -

    Both exclude patterns and exact searches can be combined with normal searches (example "exact search" term otherterm -notthis "very exact" stuff -notagain)

    - -

    Use the Filter by tags field to restrict displayed links to entries tagged with one or multiple tags (use space to separate tags).

    -

    Hidden tags: Tags starting with a dot . (example .secret) are private. They can only be seen and searched when logged in.

    -

    Alternatively you can use the Tag cloud to discover all tags and click on any of them to display related links.

    -

    To search for links that are not tagged, enter "" in the tag search field.

    -

    Filtering RSS feeds/Picture wall

    -

    RSS feeds can also be restricted to only return items matching a text/tag search: see RSS feeds.

    - - diff --git a/doc/Coding-guidelines.html b/doc/Coding-guidelines.html deleted file mode 100644 index 8df1218..0000000 --- a/doc/Coding-guidelines.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - Shaarli – Coding guidelines - - - - - - -

    Coding guidelines

    -

    WIP

    -

    This topic is currently being discussed here:

    - - - diff --git a/doc/Community-&-Related-software.html b/doc/Community-&-Related-software.html deleted file mode 100644 index 28b9618..0000000 --- a/doc/Community-&-Related-software.html +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - Shaarli – Community & Related software - - - - - - -

    Community & Related software

    -

    Unofficial but related work on Shaarli. If you maintain one of these, please get in touch with us to help us find a way to adapt your work to our fork.

    -

    TODO: contact repos owners to see if they'd like to standardize their work with the community fork.

    -

    Community

    - -

    Articles and social media discussions

    - -

    Third party plugins

    - -

    Themes

    -

    See Theming for the list of community-contributed themes, and an installation guide.

    -

    Server apps

    -
      -
    • shaarchiver - Archive your Shaarli bookmarks and their content
      • -
    • shaarli-river - An aggregator for shaarlis with many features
      • -
    • Shaarlo - An aggregator for shaarlis with many features (a very popular running instance among french shaarliers: shaarli.fr)
      • -
    • Shaarlimages - An image-oriented aggregator for Shaarlis
      • -
    • mknexen/shaarli-api - A REST API for Shaarli
      • -
    • Self dead link - Detect dead links on shaarli. This version use the database of shaarli. Another version, can be used for other shaarli instances (but is more resource consuming).
      • -
    -

    Mobile Apps

    - -

    Integration with other platforms

    - -

    Alternatives to Shaarli

    - - - diff --git a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html deleted file mode 100644 index d6b76ad..0000000 --- a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - Shaarli – Copy an existing installation over SSH and serve it locally - - - - - - - -

    Copy an existing installation over SSH and serve it locally

    -

    Example bash script:

    -
    #!/bin/bash
-#Description: Copy a Shaarli installation over SSH/SCP, serve it locally with php-cli
-#Will create a local-shaarli/ directory when you run it, backup your Shaarli there, and serve it locally.
-#Will NOT download linked pages. It's just a directly usable backup/copy/mirror of your Shaarli
-#Requires: ssh, scp and a working SSH access to the server where your Shaarli is installed
-#Usage: ./local-shaarli.sh
-#Author: nodiscc (nodiscc@gmail.com)
-#License: MIT (http://opensource.org/licenses/MIT)
-set -o errexit
-set -o nounset
-
-##### CONFIG #################
-#The port used by php's local server
-php_local_port=7431
-
-#Name of the SSH server and path where Shaarli is installed
-#TODO: pass these as command-line arguments
-remotehost="my.ssh.server"
-remote_shaarli_dir="/var/www/shaarli"
-
-
-###### FUNCTIONS #############
-_main() {
-    _CBSyncShaarli
-    _CBServeShaarli
-}
-
-_CBSyncShaarli() {
-    remote_temp_dir=$(ssh $remotehost mktemp -d)
-    remote_ssh_user=$(ssh $remotehost whoami)
-    ssh -t "$remotehost" sudo cp -r "$remote_shaarli_dir" "$remote_temp_dir"
-    ssh -t "$remotehost" sudo chown -R "$remote_ssh_user":"$remote_ssh_user" "$remote_temp_dir"
-    scp -rq "$remotehost":"$remote_temp_dir" local-shaarli
-    ssh "$remotehost" rm -r "$remote_temp_dir"
-}
-
-_CBServeShaarli() {
-    #TODO: allow serving a previously downloaded Shaarli
-    #TODO: ask before overwriting local copy, if it exists
-    cd local-shaarli/
-    php -S localhost:${php_local_port}
-    echo "Please go to http://localhost:${php_local_port}"
-}
-
-
-##### MAIN #################
-
-_main
    -

    This outputs:

    -
    $ ./local-shaarli.sh
-PHP 5.6.0RC4 Development Server started at Mon Sep  1 21:56:19 2014
-Listening on http://localhost:7431
-Document root is /home/user/local-shaarli/shaarli
-Press Ctrl-C to quit.
-
-[Mon Sep  1 21:56:27 2014] ::1:57868 [200]: /[](.html)
-[Mon Sep  1 21:56:27 2014] ::1:57869 [200]: /index.html[](.html)
-[Mon Sep  1 21:56:37 2014] ::1:57881 [200]: /...[](.html)
    - - diff --git a/doc/Create-and-serve-multiple-Shaarlis-(farm).html b/doc/Create-and-serve-multiple-Shaarlis-(farm).html deleted file mode 100644 index 0be81d5..0000000 --- a/doc/Create-and-serve-multiple-Shaarlis-(farm).html +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - Shaarli – Create and serve multiple Shaarlis (farm) - - - - - - - -

    Create and serve multiple Shaarlis (farm)

    -

    Example bash script (creates multiple shaarli instances and generates an HTML index of them)

    -
    #!/bin/bash
-set -o errexit
-set -o nounset
-
-#config
-shaarli_base_dir='/var/www/shaarli'
-accounts='bob john whatever username'
-shaarli_repo_url='https://github.com/shaarli/Shaarli'
-ref="master"
-
-#clone multiple shaarli instances
-if [ ! -d "$shaarli_base_dir" ]; then mkdir "$shaarli_base_dir"; fi[](.html)
-   
-for account in $accounts; do
-    if [ -d "$shaarli_base_dir/$account" ];[](.html)
-    then echo "[info] account $account already exists, skipping";[](.html)
-    else echo "[info] creating new account $account ..."; git clone --quiet "$shaarli_repo_url" -b "$ref" "$shaarli_base_dir/$account"; fi[](.html)
-done
-
-#generate html index of shaarlis
-htmlhead='<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<!-- Minimal html template thanks to http://www.sitepoint.com/a-minimal-html-document/ -->
-<html lang="en">
-    <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8">
-        <title>My Shaarli farm</title>
-        <style>body {font-family: "Open Sans"}</style>
-    </head>
-    <body>
-    <div>
-    <h1>My Shaarli farm</h1>
-    <ul style="list-style-type: none;">'
-
-accountlinks=''
-    
-htmlfooter='
-    </ul>
-    </div>
-    </body>
-</html>'    
-    
-
-
-for account in $accounts; do accountlinks="$accountlinks\n<li><a href=\"$account\">$account</a></li>"; done
-if [ -d "$shaarli_base_dir/index.html" ]; then echo "[removing old index.html]"; rm "$shaarli_base_dir/index.html" ]; fi[](.html)
-echo "[info] generating new index of shaarlis"[](.html)
-echo -e "$htmlhead $accountlinks $htmlfooter" > "$shaarli_base_dir/index.html"
-echo '[info] done.'[](.html)
-echo "[info] list of accounts: $accounts"[](.html)
-echo "[info] contents of $shaarli_base_dir:"[](.html)
-tree -a -L 1 "$shaarli_base_dir"
    -

    This script just serves as an example. More precise or complex (applying custom configuration, etc) automation is possible using configuration management software like Ansible

    - - diff --git a/doc/Datastore-hacks.html b/doc/Datastore-hacks.html deleted file mode 100644 index ef3e17b..0000000 --- a/doc/Datastore-hacks.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - Shaarli – Datastore hacks - - - - - - - -

    Datastore hacks

    -

    Decode datastore content

    -

    To display the array representing the data saved in data/datastore.php, use the following snippet:

    -
    $data = "tZNdb9MwFIb... <Commented content inside datastore.php>";
-$out = unserialize(gzinflate(base64_decode($data)));
-echo "<pre>"; // Pretty printing is love, pretty printing is life
-print_r($out);
-echo "</pre>";
-exit;
    -

    This will output the internal representation of the datastore, "unobfuscated" (if this can really be considered obfuscation).

    -

    Alternatively, you can transform to JSON format (and pretty-print if you have jq installed):

    -
    php -r 'print(json_encode(unserialize(gzinflate(base64_decode(preg_replace("!.*/\* (.+) \*/.*!", "$1", file_get_contents("data/datastore.php")))))));' | jq .
    - -
      -
    • Look for <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> in tpl/editlink.tpl (line 14)
      • -
    • Replace type="hidden" with type="text" from this line
      • -
    • A new date/time field becomes available in the edit/new link dialog.
      • -
    • You can set the timestamp manually by entering it in the format YYYMMDD_HHMMS.
      • -
    - - diff --git a/doc/Development.html b/doc/Development.html deleted file mode 100644 index 8a2be41..0000000 --- a/doc/Development.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - Shaarli – Development - - - - - - -

    Development

    -

    Guidelines

    -

    Please have a look at the following pages:

    - -

    Continuous integration tools

    -

    Local development

    -

    A Makefile is available to perform project-related operations:

    -
      -
    • Documentation - generate a local HTML copy of the GitHub wiki
      • -
    • Static analysis - check that the code is compliant to PHP conventions
      • -
    • Unit tests - ensure there are no regressions introduced by new commits
      • -
    -

    Automatic builds

    -

    Travis CI is a Continuous Integration build server, that runs a build:

    -
      -
    • each time a commit is merged to the mainline (master branch)
      • -
    • each time a Pull Request is submitted or updated
      • -
    -

    A build is composed of several jobs: one for each supported PHP version (see Server requirements).

    -

    Each build job:

    -
      -
    • updates Composer
      • -
    • installs 3rd-party test dependencies with Composer
      • -
    • runs Unit tests
      • -
    -

    After all jobs have finished, Travis returns the results to GitHub:

    -
      -
    • a status icon represents the result for the master branch: (https://api.travis-ci.org/shaarli/Shaarli.svg)
      • -
    • Pull Requests are updated with the Travis result -
        -
      • Green: all tests have passed
        • -
      • Red: some tests failed
        • -
      • Orange: tests are pending
        • -
      • -
    - - diff --git a/doc/Development.md b/doc/Development.md deleted file mode 100644 index 6cfcb68..0000000 --- a/doc/Development.md +++ /dev/null @@ -1,35 +0,0 @@ -#Development -## Guidelines -Please have a look at the following pages: -- [Contributing to Shaarli](https://github.com/shaarli/Shaarli/tree/master/CONTRIBUTING.md)[](.html) -- [Static analysis](Static-analysis.html) - patches should try to stick to the [PHP Standard Recommendations](http://www.php-fig.org/psr/) (PSR), especially: - - [PSR-1](http://www.php-fig.org/psr/psr-1/) - Basic Coding Standard[](.html) - - [PSR-2](http://www.php-fig.org/psr/psr-2/) - Coding Style Guide[](.html) -- [Unit tests](Unit-tests.html) -- [GnuPG signature](GnuPG-signature.html) for tags/releases - -## Continuous integration tools -### Local development -A [`Makefile`](https://github.com/shaarli/Shaarli/blob/master/Makefile) is available to perform project-related operations:[](.html) -- Documentation - generate a local HTML copy of the GitHub wiki -- [Static analysis](Static-analysis.html) - check that the code is compliant to PHP conventions -- [Unit tests](Unit-tests.html) - ensure there are no regressions introduced by new commits - -### Automatic builds -[Travis CI](http://docs.travis-ci.com/) is a Continuous Integration build server, that runs a build:[](.html) -- each time a commit is merged to the mainline (`master` branch) -- each time a Pull Request is submitted or updated - -A build is composed of several jobs: one for each supported PHP version (see [Server requirements](Server-requirements.html)). - -Each build job: -- updates Composer -- installs 3rd-party test dependencies with Composer -- runs [Unit tests](Unit-tests.html) - -After all jobs have finished, Travis returns the results to GitHub: -- a status icon represents the result for the `master` branch: [![(https://api.travis-ci.org/shaarli/Shaarli.svg)](https://travis-ci.org/shaarli/Shaarli)]((https://api.travis-ci.org/shaarli/Shaarli.svg)](https://travis-ci.org/shaarli/Shaarli).html) -- Pull Requests are updated with the Travis result - - Green: all tests have passed - - Red: some tests failed - - Orange: tests are pending diff --git a/doc/Directory-structure.html b/doc/Directory-structure.html deleted file mode 100644 index 3f75db8..0000000 --- a/doc/Directory-structure.html +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - Shaarli – Directory structure - - - - - - - -

    Directory structure

    -

    Here is the directory structure of Shaarli and the purpose of the different files:

    -
        index.php        # Main program
-    application/     # Shaarli classes
-        ├── LinkDB.php
-        └── Utils.php
-    tests/       # Shaarli unitary & functional tests
-        ├── LinkDBTest.php
-        ├── utils  # utilities to ease testing
-        │   └── ReferenceLinkDB.php
-        └── UtilsTest.php
-    COPYING          # Shaarli license
-    inc/             # static assets and 3rd party libraries
-        ├── awesomplete.*          # tags autocompletion library
-        ├── blazy.*                # picture wall lazy image loading library
-        ├── shaarli.css, reset.css # Shaarli stylesheet.
-        ├── qr.*                   # qr code generation library
-        └──rain.tpl.class.php      # RainTPL templating library
-    tpl/             # RainTPL templates for Shaarli. They are used to build the pages.
-    images/          # Images and icons used in Shaarli
-    data/            # data storage: bookmark database, configuration, logs, banlist…
-        ├── config.php             # Shaarli configuration (login, password, timezone, title…)
-        ├── datastore.php          # Your link database (compressed).
-        ├── ipban.php              # IP address ban system data
-        ├── lastupdatecheck.txt    # Update check timestamp file
-        └──log.txt                 # login/IPban log.
-    cache/           # thumbnails cache
-                     # This directory is automatically created. You can erase it anytime you want.
-    tmp/             # Temporary directory for compiled RainTPL templates.
-                     # This directory is automatically created. You can erase it anytime you want.
    - - diff --git a/doc/Docker.html b/doc/Docker.html deleted file mode 100644 index fd0dec4..0000000 --- a/doc/Docker.html +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - - Shaarli – Docker - - - - - - - -

    Docker

    - -

    Docker usage

    -

    Basics

    -

    Install Docker, by following the instructions relevant
    -to your OS / distribution, and start the service.

    -

    Search an image on DockerHub

    -
    $ docker search debian
-
-NAME            DESCRIPTION                                     STARS   OFFICIAL   AUTOMATED
-ubuntu          Ubuntu is a Debian-based Linux operating s...   2065    [OK][](.html)
-debian          Debian is a Linux distribution that's comp...   603     [OK][](.html)
-google/debian                                                   47                 [OK][](.html)
    -

    Show available tags for a repository

    -
    $ curl https://index.docker.io/v1/repositories/debian/tags | python -m json.tool
-
-% Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
-Dload  Upload   Total   Spent    Left  Speed
-100  1283    0  1283    0     0    433      0 --:--:--  0:00:02 --:--:--   433
    -

    Sample output:

    -
    [[](.html)
-    {
-        "layer": "85a02782",
-        "name": "stretch"
-    },
-    {
-        "layer": "59abecbc",
-        "name": "testing"
-    },
-    {
-        "layer": "bf0fd686",
-        "name": "unstable"
-    },
-    {
-        "layer": "60c52dbe",
-        "name": "wheezy"
-    },
-    {
-        "layer": "c5b806fe",
-        "name": "wheezy-backports"
-    }
-]
    -

    Pull an image from DockerHub

    -
    $ docker pull repository[:tag][](.html)
-
-$ docker pull debian:wheezy
-wheezy: Pulling from debian
-4c8cbfd2973e: Pull complete
-60c52dbe9d91: Pull complete
-Digest: sha256:c584131da2ac1948aa3e66468a4424b6aea2f33acba7cec0b631bdb56254c4fe
-Status: Downloaded newer image for debian:wheezy
    -

    Get and run a Shaarli image

    -

    DockerHub repository

    -

    The images can be found in the shaarli/shaarli
    -repository.

    -

    Available image tags

    -
      -
    • latest: master branch (tarball release)
      • -
    • stable: stable branch (tarball release)
      • -
    • dev: master branch (Git clone)
      • -
    -

    All images rely on:

    - -

    Download from DockerHub

    -
    $ docker pull shaarli/shaarli
-latest: Pulling from shaarli/shaarli
-32716d9fcddb: Pull complete
-84899d045435: Pull complete
-4b6ad7444763: Pull complete
-e0345ef7a3e0: Pull complete
-5c1dd344094f: Pull complete
-6422305a200b: Pull complete
-7d63f861dbef: Pull complete
-3eb97210645c: Pull complete
-869319d746ff: Already exists
-869319d746ff: Pulling fs layer
-902b87aaaec9: Already exists
-Digest: sha256:f836b4627b958b3f83f59c332f22f02fcd495ace3056f2be2c4912bd8704cc98
-Status: Downloaded newer image for shaarli/shaarli:latest
    -

    Create and start a new container from the image

    -
    # map the host's :8000 port to the container's :80 port
-$ docker create -p 8000:80 shaarli/shaarli
-d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
-
-# launch the container in the background
-$ docker start d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
-d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
-
-# list active containers
-$ docker ps
-CONTAINER ID  IMAGE            COMMAND               CREATED         STATUS        PORTS                 NAMES
-d40b7af693d6  shaarli/shaarli  /usr/bin/supervisor  15 seconds ago  Up 4 seconds  0.0.0.0:8000->80/tcp  backstabbing_galileo
    -

    Stop and destroy a container

    -
    $ docker stop backstabbing_galileo  # those docker guys are really rude to physicists!
-backstabbing_galileo
-
-# check the container is stopped
-$ docker ps
-CONTAINER ID  IMAGE            COMMAND               CREATED         STATUS        PORTS                 NAMES
-
-# list ALL containers
-$ docker ps -a
-CONTAINER ID        IMAGE               COMMAND                CREATED             STATUS                      PORTS               NAMES
-d40b7af693d6        shaarli/shaarli     /usr/bin/supervisor   5 minutes ago       Exited (0) 48 seconds ago                       backstabbing_galileo
-
-# destroy the container
-$ docker rm backstabbing_galileo  # let's put an end to these barbarian practices
-backstabbing_galileo
-
-$ docker ps -a
-CONTAINER ID  IMAGE            COMMAND               CREATED         STATUS        PORTS                 NAMES
    -

    Resources

    -

    Docker

    - -

    DockerHub

    - -

    Service management

    - - - diff --git a/doc/Download-CSS-styles-from-an-OPML-list.html b/doc/Download-CSS-styles-from-an-OPML-list.html deleted file mode 100644 index 18cc5d9..0000000 --- a/doc/Download-CSS-styles-from-an-OPML-list.html +++ /dev/null @@ -1,257 +0,0 @@ - - - - - - - Shaarli – Download CSS styles from an OPML list - - - - - - - -

    Download CSS styles from an OPML list

    -

    Download CSS styles for shaarlis listed in an opml file

    -

    Example php script:

    -
    <!---- ?php -->
-<!---- Copyright (c) 2014 Nicolas Delsaux (https://github.com/Riduidel) -->
-<!---- License: zlib (http://www.gzip.org/zlib/zlib_license.html) -->
-
-/**
- * Source: https://github.com/Riduidel
- * Download css styles for shaarlis listed in an opml file
- */
-define("SHAARLI_RSS_OPML", "https://www.ecirtam.net/shaarlirss/custom/people.opml");
-
-define("THEMES_TEMP_FOLDER", "new_themes");
-
-if(!file_exists(THEMES_TEMP_FOLDER)) {
-    mkdir(THEMES_TEMP_FOLDER);
-}
-
-function siteUrl($pathInSite) {
-    $indexPos = strpos($pathInSite, "index.php");
-    if(!$indexPos) {
-        return $pathInSite;
-    } else {
-        return substr($pathInSite, 0, $indexPos);
-    }
-}
-
-function createShaarliHashFromOPMLL($opmlFile) {
-    $result = array();
-    $opml = file_get_contents($opmlFile);
-    $opmlXml = simplexml_load_string($opml);
-    $outlineElements = $opmlXml->xpath("body/outline");
-    foreach($outlineElements as $site) {
-        $siteUrl = siteUrl((string) $site['htmlUrl']);[](.html)
-        $result[$siteUrl]=((string) $site['text']);[](.html)
-    }
-    return $result;
-}
-
-function getSiteFolder($url) {
-    $domain = parse_url($url,  PHP_URL_HOST);
-    return THEMES_TEMP_FOLDER."/".str_replace(".", "_", $domain);
-}
-
-function get_http_response_code($theURL) {
-     $headers = get_headers($theURL);
-     return substr($headers[0], 9, 3);[](.html)
-}
-
-/**
- * This makes the code PHP-5 only (particularly the call to "get_headers")
- */
-function copyUserStyleFrom($url, $name, $knownStyles) {
-    $userStyle = $url."inc/user.css";
-    if(in_array($url, $knownStyles)) {
-        // TODO add log message
-    } else {
-        $statusCode = get_http_response_code($userStyle);
-        if(intval($statusCode)<300) {
-            $styleSheet = file_get_contents($userStyle);
-            $siteFolder = getSiteFolder($url);
-            if(!file_exists($siteFolder)) {
-                mkdir($siteFolder);
-            }
-            if(!file_exists($siteFolder.'/user.css')) {
-                // Copy stylesheet
-                file_put_contents($siteFolder.'/user.css', $styleSheet);
-            }
-            if(!file_exists($siteFolder.'/README.md')) {
-                // Then write a readme.md file
-                file_put_contents($siteFolder.'/README.md', 
-                    "User style from ".$name."\n"
-                    ."============================="
-                    ."\n\n"
-                    ."This stylesheet was downloaded from ".$userStyle." on ".date(DATE_RFC822)
-                    );
-            }
-            if(!file_exists($siteFolder.'/config.ini')) {
-                // Write a config file containing useful informations
-                file_put_contents($siteFolder.'/config.ini', 
-                    "site_url=".$url."\n"
-                    ."site_name=".$name."\n"
-                    );
-            }
-            if(!file_exists($siteFolder.'/home.png')) {
-                // And finally copy generated thumbnail
-                $homeThumb = $siteFolder.'/home.png';
-                file_put_contents($siteFolder.'/home.png', file_get_contents(getThumbnailUrl($url)));
-            }
-            echo 'Theme have been downloaded from  <a href="'.$url.'">'.$url.'</a> into '.$siteFolder
-                .'. It looks like <img src="'.$homeThumb.'"><br/>';
-        }
-    }
-}
-
-function getThumbnailUrl($url) {
-    return 'http://api.webthumbnail.org/?url='.$url;
-}
-
-function copyUserStylesFrom($urlToNames, $knownStyles) {
-    foreach($urlToNames as $url => $name) {
-        copyUserStyleFrom($url, $name, $knownStyles);
-    }
-}
-
-/**
- * Reading directory list, courtesy of http://www.laughing-buddha.net/php/dirlist/
- * @param directory the directory we want to list files of
- * @return a simple array containing the list of absolute file paths. Notice that current file (".") and parent one("..")
- * are not listed here
- */
-function getDirectoryList ($directory)  {
-    $realPath = realpath($directory);
-    // create an array to hold directory list
-    $results = array();
-    // create a handler for the directory
-    $handler = opendir($directory);
-    // open directory and walk through the filenames
-    while ($file = readdir($handler)) {
-        // if file isn't this directory or its parent, add it to the results
-        if ($file != "." && $file != "..") {
-            $results[ = realpath($realPath . "/" . $file);](-=-realpath($realPath-.-"/"-.-$file);.html)
-        }
-    }
-    // tidy up: close the handler
-    closedir($handler);
-    // done!
-    return $results;
-}
-
-/**
- * Start in themes folder and look in all subfolders for config.ini files. 
- * These config.ini files allow us not to download styles again and again
- */
-function findKnownStyles() {
-    $result = array();
-    $subFolders = getDirectoryList("themes");
-    foreach($subFolders as $folder) {
-        $configFile = $folder."/config.ini";
-        if(file_exists($configFile)) {
-            $iniParameters = parse_ini_file($configFile);
-            array_push($result, $iniParameters['site_url']);[](.html)
-        }
-    }
-    return $result;
-}
-
-$knownStyles = findKnownStyles();
-copyUserStylesFrom(createShaarliHashFromOPMLL(SHAARLI_RSS_OPML), $knownStyles);
-
-<!--- ? ---->
    - - diff --git a/doc/Download-and-Installation.html b/doc/Download-and-Installation.html deleted file mode 100644 index 2c5b3be..0000000 --- a/doc/Download-and-Installation.html +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - Shaarli – Download and Installation - - - - - - - -

    Download and Installation

    -

    Get Shaarli!

    -

    To install Shaarli, simply place the files in a directory under your webserver's Document Root (or directly at the document root). Make sure your server is properly configured.

    -

    Several releases are available:

    -
    - -

    Download as an archive

    -

    Get the latest released version from the releases page.

    -

    Download our shaarli-full archive to include dependencies.

    -

    The current latest released version is v0.8.4

    -

    Or in command lines:

    -
    $ wget https://github.com/shaarli/Shaarli/releases/download/v0.8.4/shaarli-v0.8.4-full.zip
-$ unzip shaarli-v0.8.4-full.zip
-$ mv Shaarli /path/to/shaarli/
    - ---- - - - - - - - - -
    !In most cases, download Shaarli from the releases page. Cloning using git or downloading Github branches as zip files requires additional steps (see below).
    -

    Using git

    -
    mkdir -p /path/to/shaarli && cd /path/to/shaarli/
-git clone -b v0.8 https://github.com/shaarli/Shaarli.git .
-composer install --no-dev
    -
    -

    Stable version

    -

    The stable version has been experienced by Shaarli users, and will receive security updates.

    -

    Download as an archive

    -

    As a .zip archive:

    -
    $ wget https://github.com/shaarli/Shaarli/archive/stable.zip
-$ unzip stable.zip
-$ mv Shaarli-stable /path/to/shaarli/
    -

    As a .tar.gz archive :

    -
    $ wget https://github.com/shaarli/Shaarli/archive/stable.tar.gz
-$ tar xvf stable.tar.gz
-$ mv Shaarli-stable /path/to/shaarli/
    -

    Clone with Git

    -

    Composer is required to build a functional Shaarli installation when pulling from git.

    -
    $ git clone https://github.com/shaarli/Shaarli.git -b stable /path/to/shaarli/
-# install/update third-party dependencies
-$ cd /path/to/shaarli/
-$ composer install --no-dev
    -
    -

    Development version (mainline)

    -

    Use at your own risk!

    -

    To get the latest changes from the master branch:

    -
    # clone the repository  
-$ git clone https://github.com/shaarli/Shaarli.git -b master /path/to/shaarli/
-# install/update third-party dependencies
-$ cd /path/to/shaarli
-$ composer install --no-dev
    -
    -

    Finish Installation

    -

    Once Shaarli is downloaded and files have been placed at the correct location, open it this location your favorite browser.

    -

    install screenshot

    -

    Setup your Shaarli installation, and it's ready to use!

    -
    -

    Updating Shaarli

    -

    See Upgrade and Migration

    - - diff --git a/doc/Example-patch---add-new-via-field-for-links.html b/doc/Example-patch---add-new-via-field-for-links.html deleted file mode 100644 index 49036a7..0000000 --- a/doc/Example-patch---add-new-via-field-for-links.html +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - - Shaarli – Example patch add new via field for links - - - - - - -

    Example patch add new via field for links

    -

    Example patch to add a new field ("via") for links, an input field to set the "via" property from the "edit link" dialog, and display the "via" field in the link list display. Untested, use at your own risk

    -

    Thanks to @Knah-Tsaeb in https://github.com/sebsauvage/Shaarli/pull/158

    -
    From e0f363c18e8fe67990ed2bb1a08652e24e70bbcb Mon Sep 17 00:00:00 2001
-From: Knah Tsaeb <knah-tsaeb@knah-tsaeb.org>
-Date: Fri, 11 Oct 2013 15:18:37 +0200
-Subject: [PATCH] Add a "via"/origin property for links, add new input in "edit link" dialog[](.html)
-Thanks to:
-* https://github.com/Knah-Tsaeb/Shaarli/commit/040eb18ec8cdabd5ea855e108f81f97fbf0478c4
-* https://github.com/Knah-Tsaeb/Shaarli/commit/4123658eae44d7564d1128ce52ddd5689efee813
-* https://github.com/Knah-Tsaeb/Shaarli/commit/f1a8ca9cc8fe49b119d51b2d8382cc1a34542f96
-
----
- index.php         | 43 ++++++++++++++++++++++++++++++++-----------
- tpl/editlink.html |  1 +
- tpl/linklist.html |  1 +
- 3 files changed, 34 insertions(+), 11 deletions(-)
-
-diff --git a/index.php b/index.php
-index 6fae2f8..53f798e 100644
---- a/index.php
-+++ b/index.php
-@@ -436,6 +436,12 @@ if (isset($_POST['login']))[](.html)
- // ------------------------------------------------------------------------------------------
- // Misc utility functions:
- 
-+// Try to get just domain for @via
-+function getJustDomain($url){
-+    $parts = parse_url($url);   
-+    return trim($parts['host']);[](.html)
-+    }
-+
- // Returns the server URL (including port and http/https), without path.
- // e.g. "http://myserver.com:8080"
- // You can append $_SERVER['SCRIPT_NAME'] to get the current script URL.[](.html)
-@@ -799,7 +805,8 @@ class linkdb implements Iterator, Countable, ArrayAccess
-             $found=   (strpos(strtolower($l['title']),$s)!==false)[](.html)
-                    || (strpos(strtolower($l['description']),$s)!==false)[](.html)
-                    || (strpos(strtolower($l['url']),$s)!==false)[](.html)
--                   || (strpos(strtolower($l['tags']),$s)!==false);[](.html)
-+                   || (strpos(strtolower($l['tags']),$s)!==false)[](.html)
-+                   || (!empty($l['via']) && (strpos(strtolower($l['via']),$s)!==false));[](.html)
-             if ($found) $filtered[$l['linkdate'[ = $l;](-=-$l;.html)
-         }
-         krsort($filtered);
-@@ -814,7 +821,7 @@ class linkdb implements Iterator, Countable, ArrayAccess
-         $t = str_replace(',',' ',($casesensitive?$tags:strtolower($tags)));
-         $searchtags=explode(' ',$t);
-         $filtered=array();
--        foreach($this->links as $l)
-+        foreach($this-> links as $l)
-         {
-             $linktags = explode(' ',($casesensitive?$l['tags']:strtolower($l['tags'])));[](.html)
-             if (count(array_intersect($linktags,$searchtags)) == count($searchtags))
-@@ -905,7 +912,7 @@ function showRSS()
-     else $linksToDisplay = $LINKSDB;
-     $nblinksToDisplay = 50;  // Number of links to display.
-     if (!empty($_GET['nb']))  // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.[](.html)
--    { 
-+    {
-         $nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ;[](.html)
-     }
- 
-@@ -944,7 +951,12 @@ function showRSS()
-         // If user wants permalinks first, put the final link in description
-         if ($usepermalinks===true) $descriptionlink = '(<a href="'.$absurl.'">Link</a>)';
-         if (strlen($link['description'])>0) $descriptionlink = '<br>'.$descriptionlink;[](.html)
--        echo '<description><![CDATA['.nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description'])))).$descriptionlink.'[></description>'."\n</item>\n";](></description>'."\n</item>\n";.html)
-+        if(!empty($link['via'])){[](.html)
-+          $via = '<br>Origine => <a href="'.htmlspecialchars($link['via']).'">'.htmlspecialchars(getJustDomain($link['via'])).'</a>';[](.html)
-+        } else {
-+         $via = '';
-+        }
-+        echo '<description><![CDATA['.nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description'])))).$via.$descriptionlink.'[></description>'."\n</item>\n";](></description>'."\n</item>\n";.html)
-         $i++;
-     }
-     echo '</channel></rss><!-- Cached version of '.htmlspecialchars(pageUrl()).' -->';
-@@ -980,7 +992,7 @@ function showATOM()
-     else $linksToDisplay = $LINKSDB;
-     $nblinksToDisplay = 50;  // Number of links to display.
-     if (!empty($_GET['nb']))  // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.[](.html)
--    { 
-+    {
-         $nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ;[](.html)
-     }
- 
-@@ -1006,11 +1018,16 @@ function showATOM()
- 
-         // Add permalink in description
-         $descriptionlink = htmlspecialchars('(<a href="'.$guid.'">Permalink</a>)');
-+        if(isset($link['via']) && !empty($link['via'])){[](.html)
-+          $via = htmlspecialchars('</br> Origine => <a href="'.$link['via'].'">'.getJustDomain($link['via']).'</a>');[](.html)
-+        } else {
-+          $via = '';
-+        }
-         // If user wants permalinks first, put the final link in description
-         if ($usepermalinks===true) $descriptionlink = htmlspecialchars('(<a href="'.$absurl.'">Link</a>)');
-         if (strlen($link['description'])>0) $descriptionlink = '&lt;br&gt;'.$descriptionlink;[](.html)
- 
--        $entries.='<content type="html">'.htmlspecialchars(nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))))).$descriptionlink."</content>\n";[](.html)
-+        $entries.='<content type="html">'.htmlspecialchars(nl2br(keepMultipleSpaces(text2clickable(htmlspecialchars($link['description']))))).$descriptionlink.$via."</content>\n";[](.html)
-         if ($link['tags']!='') // Adding tags to each ATOM entry (as mentioned in ATOM specification)[](.html)
-         {
-             foreach(explode(' ',$link['tags']) as $tag)[](.html)
-@@ -1478,7 +1495,7 @@ function renderPage()
-         if (!startsWith($url,'http:') && !startsWith($url,'https:') && !startsWith($url,'ftp:') && !startsWith($url,'magnet:') && !startsWith($url,'?'))
-             $url = 'http://'.$url;
-         $link = array('title'=>trim($_POST['lf_title']),'url'=>$url,'description'=>trim($_POST['lf_description']),'private'=>(isset($_POST['lf_private']) ? 1 : 0),[](.html)
--                      'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags));
-+                      'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags), 'via'=>trim($_POST['lf_via']));[](.html)
-         if ($link['title']=='') $link['title']=$link['url']; // If title is empty, use the URL as title.[](.html)
-         $LINKSDB[$linkdate] = $link;[](.html)
-         $LINKSDB->savedb(); // Save to disk.
-@@ -1556,7 +1573,8 @@ function renderPage()
-             $title = (empty($_GET['title']) ? '' : $_GET['title'] ); // Get title if it was provided in URL (by the bookmarklet).[](.html)
-             $description = (empty($_GET['description']) ? '' : $_GET['description']); // Get description if it was provided in URL (by the bookmarklet). [Bronco added that][](.html)
-             $tags = (empty($_GET['tags']) ? '' : $_GET['tags'] ); // Get tags if it was provided in URL[](.html)
--            $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); // Get private if it was provided in URL [](.html)
-+            $via = (empty($_GET['via']) ? '' : $_GET['via'] );[](.html)
-+            $private = (!empty($_GET['private']) && $_GET['private'] === "1" ? 1 : 0); // Get private if it was provided in URL[](.html)
-             if (($url!='') && parse_url($url,PHP_URL_SCHEME)=='') $url = 'http://'.$url;
-             // If this is an HTTP link, we try go get the page to extract the title (otherwise we will to straight to the edit form.)
-             if (empty($title) && parse_url($url,PHP_URL_SCHEME)=='http')
-@@ -1567,7 +1585,7 @@ function renderPage()
-                     {
-                         // Look for charset in html header.
-                        preg_match('#<meta .*charset=.*>#Usi', $data, $meta);
-- 
-+
-                        // If found, extract encoding.
-                        if (!empty($meta[0]))[](.html)
-                        {
-@@ -1577,7 +1595,7 @@ function renderPage()
-                            $html_charset = (!empty($enc[1])) ? strtolower($enc[1]) : 'utf-8';[](.html)
-                        }
-                        else { $html_charset = 'utf-8'; }
-- 
-+
-                        // Extract title
-                        $title = html_extract_title($data);
-                        if (!empty($title))
-@@ -1592,7 +1610,7 @@ function renderPage()
-                 $url='?'.smallHash($linkdate);
-                 $title='Note: ';
-             }
--            $link = array('linkdate'=>$linkdate,'title'=>$title,'url'=>$url,'description'=>$description,'tags'=>$tags,'private'=>$private);
-+            $link = array('linkdate'=>$linkdate,'title'=>$title,'url'=>$url,'description'=>$description,'tags'=>$tags,'via' => $via,'private'=>$private);
-         }
- 
-         $PAGE = new pageBuilder;
-@@ -1842,6 +1860,9 @@ function buildLinkList($PAGE,$LINKSDB)
-         $taglist = explode(' ',$link['tags']);[](.html)
-         uasort($taglist, 'strcasecmp');
-         $link['taglist']=$taglist;[](.html)
-+        if(!empty($link['via'])){[](.html)
-+          $link['via']=htmlspecialchars($link['via']);[](.html)
-+        }
-         $linkDisp[$keys[$i[ = $link;](-=-$link;.html)
-         $i++;
-     }
-diff --git a/tpl/editlink.html b/tpl/editlink.html
-index 4a2c30c..14d4f9c 100644
---- a/tpl/editlink.html
-+++ b/tpl/editlink.html
-@@ -16,6 +16,7 @@
-            <i>Title</i><br><input type="text" name="lf_title" value="{$link.title|htmlspecialchars}" style="width:100%"><br>
-            <i>Description</i><br><textarea name="lf_description" rows="4" cols="25" style="width:100%">{$link.description|htmlspecialchars}</textarea><br>
-            <i>Tags</i><br><input type="text" id="lf_tags" name="lf_tags" value="{$link.tags|htmlspecialchars}" style="width:100%"><br>
-+           <i>Origine</i><br><input type="text" name="lf_via" value="{$link.via|htmlspecialchars}" style="width:100%"><br>
-            {if condition="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}[](.html)
-             <input type="checkbox" checked="checked" name="lf_private" id="lf_private">
-             &nbsp;<label for="lf_private"><i>Private</i></label><br>
-diff --git a/tpl/linklist.html b/tpl/linklist.html
-index ddc38cb..0a8475f 100644
---- a/tpl/linklist.html
-+++ b/tpl/linklist.html
-@@ -43,6 +43,7 @@
-                 <span class="linktitle"><a href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a></span>
-                 <br>
-                 {if="$value.description"}<div class="linkdescription"{if condition="$search_type=='permalink'"} style="max-height:none !important;"{/if}>{$value.description}</div>{/if}
-+                {if condition="isset($value.via) && !empty($value.via)"}<div><a href="{$value.via}">Origine => {$value.via|getJustDomain}</a></div>{/if}
-                 {if="!$GLOBALS['config'['HIDE_TIMESTAMPS'] || isLoggedIn()"}]('HIDE_TIMESTAMPS']-||-isLoggedIn()"}.html)
-                     <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{$value.localdate|htmlspecialchars} - permalink</a> - </span>
-                 {else}
--- 
-2.1.1
    - - diff --git a/doc/FAQ.html b/doc/FAQ.html deleted file mode 100644 index 25584f2..0000000 --- a/doc/FAQ.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - Shaarli – FAQ - - - - - - -

    FAQ

    -

    Why did you create Shaarli ?

    -

    I was a StumbleUpon user. Then I got fed up with they big toolbar. I switched to delicious, which was lighter, faster and more beautiful. Until Yahoo bought it. Then the export API broke all the time, delicious became slow and was ditched by Yahoo. I switched to Diigo, which is not bad, but does too much. And Diigo is sslllooooowww and their Firefox extension a bit buggy. And… oh… their Firefox addon sends to Diigo every single URL you visit (Don't believe me ? Use Tamper Data and open any page).

    -

    Enough is enough. Saving simple links should not be a complicated heavy thing. I ditched them all and wrote my own: Shaarli. It's simple, but it does the job and does it well. And my data is not hosted on a foreign server, but on my server.

    -

    Why use Shaarli and not Delicious/Diigo ?

    -

    With Shaarli:

    -
      -
    • The data is yours: It's hosted on your server.
      • -
    • Never fear of having your data locked-in.
      • -
    • Never fear to have your data sold to third party.
      • -
    • Your private links are not hosted on a third party server.
      • -
    • You are not tracked by browser addons (like Diigo does)
      • -
    • You can change the look and feel of the pages if you want.
      • -
    • You can change the behaviour of the program.
      • -
    • It's magnitude faster than most bookmarking services.
      • -
    -

    What does Shaarli mean?

    -

    Shaarli is for shaaring your links.

    -

    My Shaarli is broken!

    -

    First of all, ensure that both the web server and Shaarli are correctly configured, and that your installation is supported.

    -

    If everything looks right but the issue(s) remain(s), please:

    -
      -
    • take a look at the troubleshooting section
      • -
    • come chat with us on Gitter, we'll be happy to help ;-)
      • -
    • browse active issues and Pull Requests -
        -
      • if you find one that is related to the issue, feel free to comment and provide additional details (host/Shaarli setup)
        • -
      • else, open a new issue, and provide information about the problem: -
          -
        • what happens? - display glitches, invalid data, security flaws...
          • -
        • what is your configuration? - OS, server version, activated extensions, web browser...
          • -
        • is it reproducible?
          • -
        • -
      • -
    -

    Why not use a real database? Files are slow!

    -

    Does browsing this page feel slow? Try browsing older pages, too.

    -

    It's not slow at all, is it? And don't forget the database contains more than 16000 links, and it's on a shared host, with 32000 visitors/day for my website alone. And it's still damn fast. Why?

    -

    The data file is only 3.7 Mb. It's read 99% of the time, and is probably already in the operation system disk cache. So generating a page involves no I/O at all most of the time.

    - - diff --git a/doc/Firefox-share.html b/doc/Firefox-share.html deleted file mode 100644 index 707119a..0000000 --- a/doc/Firefox-share.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - Shaarli – Firefox share - - - - - - -

    Firefox share

    -

    Add Shaarli as a sharing service to Firefox

    -
      -
    • Open your Shaarli and Login
      • -
    • Click the Tools button in the top bar
      • -
    • Click the ✚Add to Firefox social button and accept the activation.
      • -
    - -
      -
    • Add the sharing service as described above
      • -
    • When you are visiting a webpage you would like to share with Shaarli, click the Firefox Share button images/firefoxshare.png
      • -
    • You can edit your link before and after saving, just like the bookmarklet above.
      • -
    - ---- - - - - - - - - -
    Your Shaarli instance must be hosted on an HTTPS (SSL/TLS secure connection) enabled server for Firefox Share to work. Firefox Share will not work over plain HTTP connections.
    - - diff --git a/doc/GnuPG-signature.html b/doc/GnuPG-signature.html deleted file mode 100644 index 182a71d..0000000 --- a/doc/GnuPG-signature.html +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - Shaarli – GnuPG signature - - - - - - - -

    GnuPG signature

    -

    Introduction

    -

    PGP and GPG

    -

    Gnu Privacy Guard (GnuPG) is an Open Source implementation of the Pretty Good [](.html)
    -Privacy     (OpenPGP) specification. Its main purposes are digital authentication,
    -signature and encryption.

    -

    It is often used by the FLOSS community to verify:

    - -

    Trust

    -

    To quote Phil Pennock (the author of the SKS key server - http://sks.spodhuis.org/):

    -
    -

    You MUST understand that presence of data in the keyserver (pools) in no way connotes trust. Anyone can generate a key, with any name or email address, and upload it. All security and trust comes from evaluating security at the “object level”, via PGP Web-Of-Trust signatures. This keyserver makes it possible to retrieve keys, looking them up via various indices, but the collection of keys in this public pool is KNOWN to contain malicious and fraudulent keys. It is the common expectation of server operators that users understand this and use software which, like all known common OpenPGP implementations, evaluates trust accordingly. This expectation is so common that it is not normally explicitly stated.

    -
    -

    Trust can be gained by having your key signed by other people (and signing their key back, too :) ), for instance during key signing parties, see:

    - -

    Generate a GPG key

    - -

    gpg - provide identity information

    -
    $ gpg --gen-key
-
-gpg (GnuPG) 2.1.6; Copyright (C) 2015 Free Software Foundation, Inc.
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-
-Note: Use "gpg2 --full-gen-key" for a full featured key generation dialog.
-
-GnuPG needs to construct a user ID to identify your key.
-
-Real name: Marvin the Paranoid Android
-Email address: marvin@h2g2.net
-You selected this USER-ID:
-    "Marvin the Paranoid Android <marvin@h2g2.net>"
-
-Change (N)ame, (E)mail, or (O)kay/(Q)uit? o
-We need to generate a lot of random bytes. It is a good idea to perform
-some other action (type on the keyboard, move the mouse, utilize the
-disks) during the prime generation; this gives the random number
-generator a better chance to gain enough entropy.
    -

    gpg - entropy interlude

    -

    At this point, you will:

    -
      -
    • be prompted for a secure password to protect your key (the input method will depend on your Desktop Environment and configuration)
      • -
    • be asked to use your machine's input devices (mouse, keyboard, etc.) to generate random entropy; this step may take some time
      • -
    -

    gpg - key creation confirmation

    -
    gpg: key A9D53A3E marked as ultimately trusted
-public and secret key created and signed.
-
-gpg: checking the trustdb
-gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model
-gpg: depth: 0  valid:   2  signed:   0  trust: 0-, 0q, 0n, 0m, 0f, 2u
-pub   rsa2048/A9D53A3E 2015-07-31
-      Key fingerprint = AF2A 5381 E54B 2FD2 14C4  A9A3 0E35 ACA4 A9D5 3A3E
-uid       [ultimate] Marvin the Paranoid Android <marvin@h2g2.net>[](.html)
-sub   rsa2048/8C0EACF1 2015-07-31
    -

    gpg - submit your public key to a PGP server (Optional)

    -
    $ gpg --keyserver pgp.mit.edu --send-keys A9D53A3E
-gpg: sending key A9D53A3E to hkp server pgp.mit.edu
    -

    Create and push a GPG-signed tag

    -

    See Release Shaarli.

    - - diff --git a/doc/Home.html b/doc/Home.html deleted file mode 100644 index 7f51b93..0000000 --- a/doc/Home.html +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - Shaarli – Home - - - - - - -

    Home

    -

    Shaarli wiki

    -

    Welcome to the Shaarli wiki

    -

    Here you can find some info on how to use, configure, tweak and solve problems with your Shaarli.

    -

    For general info, read the README.

    -

    If you have any questions or ideas, please join the chat (also reachable via IRC), post them in our general discussion (archive) or read the current issues. If you've found a bug, please create a new issue.

    -

    If you would like a feature added to Shaarli, check the issues labeled feature, enhancement, and plugin.

    -

    Note: This documentation is available online at https://github.com/shaarli/Shaarli/wiki, and locally in the doc/ directory of your Shaarli installation.

    - - diff --git a/doc/Plugin-System.html b/doc/Plugin-System.html deleted file mode 100644 index 123bf10..0000000 --- a/doc/Plugin-System.html +++ /dev/null @@ -1,634 +0,0 @@ - - - - - - - Shaarli – Plugin System - - - - - - - -

    Plugin System

    -

    I am a developer. Developer API.

    -

    I am a template designer. Guide for template designer.

    -

    Developer API

    -

    What can I do with plugins?

    -

    The plugin system let you:

    -
      -
    • insert content into specific places across templates.
      • -
    • alter data before templates rendering.
      • -
    • alter data before saving new links.
      • -
    -

    How can I create a plugin for Shaarli?

    -

    First, chose a plugin name, such as demo_plugin.

    -

    Under plugin folder, create a folder named with your plugin name. Then create a .php file in that folder.

    -

    You should have the following tree view:

    -
    | index.php
-| plugins/
-|---| demo_plugin/
-|   |---| demo_plugin.php
    -

    Plugin initialization

    -

    At the beginning of Shaarli execution, all enabled plugins are loaded. At this point, the plugin system looks for an init() function to execute and run it if it exists. This function must be named this way, and takes the ConfigManager as parameter.

    -
    <plugin_name>_init($conf)
    -

    This function can be used to create initial data, load default settings, etc. But also to set plugin errors. If the initialization function returns an array of strings, they will be understand as errors, and displayed in the header to logged in users.

    -

    Understanding hooks

    -

    A plugin is a set of functions. Each function will be triggered by the plugin system at certain point in Shaarli execution.

    -

    These functions need to be named with this pattern:

    -
    hook_<plugin_name>_<hook_name>($data, $conf)
    -

    Parameters:

    - -

    For exemple, if my plugin want to add data to the header, this function is needed:

    -
    hook_demo_plugin_render_header
    -

    If this function is declared, and the plugin enabled, it will be called every time Shaarli is rendering the header.

    -

    Plugin's data

    -

    Parameters

    -

    Every hook function has a $data parameter. Its content differs for each hooks.

    -

    This parameter needs to be returned every time, otherwise data is lost.

    -
    return $data;
    -

    Filling templates placeholder

    -

    Template placeholders are displayed in template in specific places.

    -

    RainTPL displays every element contained in the placeholder's array. These element can be added by plugins.

    -

    For example, let's add a value in the placeholder top_placeholder which is displayed at the top of my page:

    -
    $data['top_placeholder'[] = 'My content';](]-=-'My-content';.html)
-# OR
-array_push($data['top_placeholder'], 'My', 'content');[](.html)
-
-return $data;
    -

    Data manipulation

    -

    When a page is displayed, every variable send to the template engine is passed to plugins before that in $data.

    -

    The data contained by this array can be altered before template rendering.

    -

    For exemple, in linklist, it is possible to alter every title:

    -
    // mind the reference if you want $data to be altered
-foreach ($data['links'] as &$value) {[](.html)
-    // String reverse every title.
-    $value['title'] = strrev($value['title']);[](.html)
-}
-
-return $data;
    -

    Metadata

    -

    Every plugin needs a <plugin_name>.meta file, which is in fact an .ini file (KEY="VALUE"), to be listed in plugin administration.

    -

    Each file contain two keys:

    -
      -
    • description: plugin description
      • -
    • parameters: user parameter names, separated by a ;.
      • -
    • parameter.<PARAMETER_NAME>: add a text description the specified parameter.
      • -
    -
    -

    Note: In PHP, parse_ini_file() seems to want strings to be between by quotes " in the ini file.

    -
    -

    It's not working!

    -

    Use demo_plugin as a functional example. It covers most of the plugin system features.

    -

    If it's still not working, please open an issue.

    -

    Hooks

    - ---- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    HooksDescription
    render_headerAllow plugin to add content in page headers.
    render_includesAllow plugin to include their own CSS files.
    render_footerAllow plugin to add content in page footer and include their own JS files.
    render_linklistIt allows to add content at the begining and end of the page, after every link displayed and to alter link data.
    render_editlinkAllow to add fields in the form, or display elements.
    render_toolsAllow to add content at the end of the page.
    render_picwallAllow to add content at the top and bottom of the page.
    render_tagcloudAllow to add content at the top and bottom of the page, and after all tags.
    render_taglistAllow to add content at the top and bottom of the page, and after all tags.
    render_dailyAllow to add content at the top and bottom of the page, the bottom of each link and to alter data.
    render_feedAllow to do add tags in RSS and ATOM feeds.
    save_linkAllow to alter the link being saved in the datastore.
    delete_linkAllow to do an action before a link is deleted from the datastore.
    -

    render_header

    -

    Triggered on every page.

    -

    Allow plugin to add content in page headers.

    -
    Data
    -

    $data is an array containing:

    -
      -
    • _PAGE_: current target page (eg: linklist, picwall, etc.).
      • -
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • -
    -
    Template placeholders
    -

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    -

    List of placeholders:

    -
      -
    • buttons_toolbar: after the list of buttons in the header.
      • -
    -

    buttons_toolbar_example

    -
      -
    • fields_toolbar: after search fields in the header.
      • -
    -
    -

    Note: This will only be called in linklist.

    -
    -

    fields_toolbar_example

    -

    render_includes

    -

    Triggered on every page.

    -

    Allow plugin to include their own CSS files.

    -
    Data
    -

    $data is an array containing:

    -
      -
    • _PAGE_: current target page (eg: linklist, picwall, etc.).
      • -
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • -
    -
    Template placeholders
    -

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    -

    List of placeholders:

    -
      -
    • css_files: called after loading default CSS.
      • -
    -
    -

    Note: only add the path of the CSS file. E.g: plugins/demo_plugin/custom_demo.css.

    -
    - -

    Triggered on every page.

    -

    Allow plugin to add content in page footer and include their own JS files.

    -
    Data
    -

    $data is an array containing:

    -
      -
    • _PAGE_: current target page (eg: linklist, picwall, etc.).
      • -
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • -
    -
    Template placeholders
    -

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    -

    List of placeholders:

    -
      -
    • text: called after the end of the footer text.
      • -
    • endofpage: called at the end of the page.
      • -
    -

    text_example

    -
      -
    • js_files: called at the end of the page, to include custom JS scripts.
      • -
    -
    -

    Note: only add the path of the JS file. E.g: plugins/demo_plugin/custom_demo.js.

    -
    - -

    Triggered when linklist is displayed (list of links, permalink, search, tag filtered, etc.).

    -

    It allows to add content at the begining and end of the page, after every link displayed and to alter link data.

    -
    Data
    -

    $data is an array containing:

    -
      -
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • -
    • All templates data, including links.
      • -
    -
    Template placeholders
    -

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    -

    List of placeholders:

    -
      -
    • action_plugin: next to the button "private only" at the top and bottom of the page.
      • -
    -

    action_plugin_example

    -
      -
    • link_plugin: for every link, between permalink and link URL.
      • -
    -

    link_plugin_example

    -
      -
    • plugin_start_zone: before displaying the template content.
      • -
    -

    plugin_start_zone_example

    -
      -
    • plugin_end_zone: after displaying the template content.
      • -
    -

    plugin_end_zone_example

    - -

    Triggered when the link edition form is displayed.

    -

    Allow to add fields in the form, or display elements.

    -
    Data
    -

    $data is an array containing:

    -
      -
    • All templates data.
      • -
    -
    Template placeholders
    -

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    -

    List of placeholders:

    -
      -
    • edit_link_plugin: after tags field.
      • -
    -

    edit_link_plugin_example

    -

    render_tools

    -

    Triggered when the "tools" page is displayed.

    -

    Allow to add content at the end of the page.

    -
    Data
    -

    $data is an array containing:

    -
      -
    • All templates data.
      • -
    -
    Template placeholders
    -

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    -

    List of placeholders:

    -
      -
    • tools_plugin: at the end of the page.
      • -
    -

    tools_plugin_example

    -

    render_picwall

    -

    Triggered when picwall is displayed.

    -

    Allow to add content at the top and bottom of the page.

    -
    Data
    -

    $data is an array containing:

    -
      -
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • -
    • All templates data.
      • -
    -
    Template placeholders
    -

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    -

    List of placeholders:

    -
      -

    • plugin_start_zone: before displaying the template content.

      • -

    • plugin_end_zone: after displaying the template content.

      • -
    -

    plugin_start_end_zone_example

    -

    render_tagcloud

    -

    Triggered when tagcloud is displayed.

    -

    Allow to add content at the top and bottom of the page.

    -
    Data
    -

    $data is an array containing:

    -
      -
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • -
    • All templates data.
      • -
    -
    Template placeholders
    -

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    -

    List of placeholders:

    -
      -

    • plugin_start_zone: before displaying the template content.

      • -

    • plugin_end_zone: after displaying the template content.

      • -
    -

    For each tag, the following placeholder can be used:

    -
      -
    • tag_plugin: after each tag
      • -
    -

    plugin_start_end_zone_example

    -

    render_taglist

    -

    Triggered when taglist is displayed.

    -

    Allow to add content at the top and bottom of the page.

    -
    Data
    -

    $data is an array containing:

    -
      -
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • -
    • All templates data.
      • -
    -
    Template placeholders
    -

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    -

    List of placeholders:

    -
      -

    • plugin_start_zone: before displaying the template content.

      • -

    • plugin_end_zone: after displaying the template content.

      • -
    -

    For each tag, the following placeholder can be used:

    -
      -
    • tag_plugin: after each tag
      • -
    -

    render_daily

    -

    Triggered when tagcloud is displayed.

    -

    Allow to add content at the top and bottom of the page, the bottom of each link and to alter data.

    -
    Data
    -

    $data is an array containing:

    -
      -
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • -
    • All templates data, including links.
      • -
    -
    Template placeholders
    -

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    -

    List of placeholders:

    -
      -
    • link_plugin: used at bottom of each link.
      • -
    -

    link_plugin_example

    -
      -

    • plugin_start_zone: before displaying the template content.

      • -

    • plugin_end_zone: after displaying the template content.

      • -
    -

    render_feed

    -

    Triggered when the ATOM or RSS feed is displayed.

    -

    Allow to add tags in the feed, either in the header or for each items. Items (links) can also be altered before being rendered.

    -
    Data
    -

    $data is an array containing:

    -
      -
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • -
    • _PAGE_: containing either rss or atom.
      • -
    • All templates data, including links.
      • -
    -
    Template placeholders
    -

    Tags can be added in feeds by adding an entry in $data['<placeholder>'] array.

    -

    List of placeholders:

    -
      -
    • feed_plugins_header: used as a header tag in the feed.
      • -
    -

    For each links:

    -
      -
    • feed_plugins: additional tag for every link entry.
      • -
    - -

    Triggered when a link is save (new link or edit).

    -

    Allow to alter the link being saved in the datastore.

    -
    Data
    -

    $data is an array containing the link being saved:

    -
      -
    • id
      • -
    • title
      • -
    • url
      • -
    • shorturl
      • -
    • description
      • -
    • private
      • -
    • tags
      • -
    • created
      • -
    • updated
      • -
    - -

    Triggered when a link is deleted.

    -

    Allow to execute any action before the link is actually removed from the datastore

    -
    Data
    -

    $data is an array containing the link being saved:

    -
      -
    • id
      • -
    • title
      • -
    • url
      • -
    • shorturl
      • -
    • description
      • -
    • private
      • -
    • tags
      • -
    • created
      • -
    • updated
      • -
    -

    Guide for template designer

    -

    Plugin administration

    -

    Your theme must include a plugin administration page: pluginsadmin.html.

    -
    -

    Note: repo's template link needs to be added when the PR is merged.

    -
    -

    Use the default one as an example.

    -

    Aside from classic RainTPL loops, plugins order is handle by JavaScript. You can just include plugin_admin.js, only if:

    -
      -
    • you're using a table.
      • -
    • you call orderUp() and orderUp() onclick on arrows.
      • -
    • you add data-line and data-order to your rows.
      • -
    -

    Otherwise, you can use your own JS as long as this field is send by the form:

    -

    -

    Placeholder system

    -

    In order to make plugins work with every custom themes, you need to add variable placeholder in your templates.

    -

    It's a RainTPL loop like this:

    -
    {loop="$plugin_variable"}
-    {$value}
-{/loop}
    -

    You should enable demo_plugin for testing purpose, since it uses every placeholder available.

    -

    List of placeholders

    -

    page.header.html

    -

    At the end of the menu:

    -
    {loop="$plugins_header.buttons_toolbar"}
-    {$value}
-{/loop}
    -

    At the end of file, before clearing floating blocks:

    -
    {if="!empty($plugin_errors) && isLoggedIn()"}
-    <ul class="errors">
-        {loop="plugin_errors"}
-            <li>{$value}</li>
-        {/loop}
-    </ul>
-{/if}
    -

    includes.html

    -

    At the end of the file:

    -
    {loop="$plugins_includes.css_files"}
-<link type="text/css" rel="stylesheet" href="{$value}#"/>
-{/loop}
    -

    page.footer.html

    -

    At the end of your footer notes:

    -
    {loop="$plugins_footer.text"}
-     {$value}
-{/loop}
    -

    At the end of file:

    -
    {loop="$plugins_footer.js_files"}
-     <script src="{$value}#"></script>
-{/loop}
    -

    linklist.html

    -

    After search fields:

    -
    {loop="$plugins_header.fields_toolbar"}
-     {$value}
-{/loop}
    -

    Before displaying the link list (after paging):

    -
    {loop="$plugin_start_zone"}
-     {$value}
-{/loop}
    -

    For every links (icons):

    -
    {loop="$value.link_plugin"}
-    <span>{$value}</span>
-{/loop}
    -

    Before end paging:

    -
    {loop="$plugin_end_zone"}
-     {$value}
-{/loop}
    -

    linklist.paging.html

    -

    After the "private only" icon:

    -
    {loop="$action_plugin"}
-     {$value}
-{/loop}
    -

    editlink.html

    -

    After tags field:

    -
    {loop="$edit_link_plugin"}
-     {$value}
-{/loop}
    -

    tools.html

    -

    After the last tool:

    -
    {loop="$tools_plugin"}
-     {$value}
-{/loop}
    -

    picwall.html

    -

    Top:

    -
    <div id="plugin_zone_start_picwall" class="plugin_zone">
-    {loop="$plugin_start_zone"}
-        {$value}
-    {/loop}
-</div>
    -

    Bottom:

    -
    <div id="plugin_zone_end_picwall" class="plugin_zone">
-    {loop="$plugin_end_zone"}
-        {$value}
-    {/loop}
-</div>
    -

    tagcloud.html

    -

    Top:

    -
       <div id="plugin_zone_start_tagcloud" class="plugin_zone">
-        {loop="$plugin_start_zone"}
-            {$value}
-        {/loop}
-    </div>
    -

    Bottom:

    -
        <div id="plugin_zone_end_tagcloud" class="plugin_zone">
-        {loop="$plugin_end_zone"}
-            {$value}
-        {/loop}
-    </div>
    -

    daily.html

    -

    Top:

    -
    <div id="plugin_zone_start_picwall" class="plugin_zone">
-     {loop="$plugin_start_zone"}
-         {$value}
-     {/loop}
-</div>
    -

    After every link:

    -
    <div class="dailyEntryFooter">
-     {loop="$link.link_plugin"}
-          {$value}
-     {/loop}
-</div>
    -

    Bottom:

    -
    <div id="plugin_zone_end_picwall" class="plugin_zone">
-    {loop="$plugin_end_zone"}
-        {$value}
-    {/loop}
-</div>
    -

    feed.atom.xml and feed.rss.xml:

    -

    In headers tags section:

    -
    {loop="$feed_plugins_header"}
-  {$value}
-{/loop}
    -

    After each entry:

    -
    {loop="$value.feed_plugins"}
-  {$value}
-{/loop}
    - - diff --git a/doc/Plugins.html b/doc/Plugins.html deleted file mode 100644 index 08ce8a8..0000000 --- a/doc/Plugins.html +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - Shaarli – Plugins - - - - - - - -

    Plugins

    -

    Plugin installation

    -

    There is a bunch of plugins shipped with Shaarli, where there is nothing to do to install them.

    -

    If you want to install a third party plugin:

    -
      -
    • Download it.
      • -
    • Put it in the plugins directory in Shaarli's installation folder.
      • -
    • Make sure you put it correctly:
      • -
    -
    | index.php
-| plugins/
-|---| custom_plugin/
-|   |---| custom_plugin.php
-|   |---| ...
-
    -
      -
    • Make sure your webserver can read and write the files in your plugin folder.
      • -
    -

    Plugin configuration

    -

    In Shaarli's administration page (Tools link), go to Plugin administration.

    -

    Here you can enable and disable all plugins available, and configure them.

    -

    administration screenshot

    -

    Plugin order

    -

    In the plugin administration page, you can move enabled plugins to the top or bottom of the list. The first plugins in the list will be processed first.

    -

    This is important in case plugins are depending on each other. Read plugins README details for more information.

    -

    Use case: The (non existent) plugin shaares_footer adds a footer to every shaare in Markdown syntax. It needs to be processed before (higher in the list) the Markdown plugin. Otherwise its syntax won't be translated in HTML.

    -

    File mode

    -

    Enabled plugin are stored in your config.php parameters file, under the array:

    -
    $GLOBALS['config'['ENABLED_PLUGINS']]('ENABLED_PLUGINS'].html)
    -

    You can edit them manually here.
    -Example:

    -
    $GLOBALS['config'['ENABLED_PLUGINS'] = array(]('ENABLED_PLUGINS']-=-array(.html)
-    'qrcode', 
-    'archiveorg',
-    'wallabag',
-    'markdown',
-);
    -

    Plugin usage

    -

    Official plugins

    -

    Usage of each plugin is documented in it's README file:

    -
      -
    • addlink-toolbar: Adds the addlink input on the linklist page
      • -
    • archiveorg: For each link, add an Archive.org icon
      • -
    • markdown: Render shaare description with Markdown syntax.
      • -
    • playvideos: Add a button in the toolbar allowing to watch all videos.
      • -
    • qrcode: For each link, add a QRCode icon.
      • -
    • wallabag: For each link, add a Wallabag icon to save it in your instance.
      • -
    -

    Third party plugins

    -

    See Community & related software

    - - diff --git a/doc/REST-API.html b/doc/REST-API.html deleted file mode 100644 index d14c98c..0000000 --- a/doc/REST-API.html +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - Shaarli – REST API - - - - - - - -

    REST API

    -

    Usage

    -

    See the REST API documentation.

    -

    Authentication

    -

    All requests to Shaarli's API must include a JWT token to verify their authenticity.

    -

    This token has to be included as an HTTP header called Authentication: Bearer <jwt token>.

    -

    JWT resources :

    - -

    Shaarli JWT Token

    -

    JWT tokens are composed by three parts, separated by a dot . and encoded in base64:

    -
    [header].[payload].[signature][](.html)
    - -

    Shaarli only allow one hash algorithm, so the header will always be the same:

    -
    {
-    "typ": "JWT",
-    "alg": "HS512"
-}
    -

    Encoded in base64, it gives:

    -
    ewogICAgICAgICJ0eXAiOiAiSldUIiwKICAgICAgICAiYWxnIjogIkhTNTEyIgogICAgfQ==
    -

    Payload

    -

    Validity duration

    -

    To avoid infinite token validity, JWT tokens must include their creation date in UNIX timestamp format (timezone independant - UTC) under the key iat (issued at). This token will be accepted during 9 minutes.

    -
    {
-    "iat": 1468663519
-}
    -

    See RFC reference.

    -

    Signature

    -

    The signature authenticate the token validity. It contains the base64 of the header and the body, separated by a dot ., hashed in SHA512 with the API secret available in Shaarli administration page.

    -

    Signature example with PHP:

    -
    $content = base64_encode($header) . '.' . base64_encode($payload);
-$signature = hash_hmac('sha512', $content, $secret);
    -

    Complete example

    -

    PHP

    -
    function generateToken($secret) {
-    $header = base64_encode('{
-        "typ": "JWT",
-        "alg": "HS512"
-    }');
-    $payload = base64_encode('{
-        "iat": '. time() .'
-    }');
-    $signature = hash_hmac('sha512', $header .'.'. $payload , $secret);
-    return $header .'.'. $payload .'.'. $signature;
-}
-
-$secret = 'mysecret';
-$token = generateToken($secret);
-echo $token;
    -
    -

    ewogICAgICAgICJ0eXAiOiAiSldUIiwKICAgICAgICAiYWxnIjogIkhTNTEyIgogICAgfQ==.ewogICAgICAgICJpYXQiOiAxNDY4NjY3MDQ3CiAgICB9.1d2c54fa947daf594fdbf7591796195652c8bc63bffad7f6a6db2a41c313f495a542cbfb595acade79e83f3810d709b4251d7b940bbc10b531a6e6134af63a68

    -
    -
    $options = [[](.html)
-    'http' => [[](.html)
-        'method' => 'GET',
-        'jwt' => $token,
-    ],
-];
-$context = stream_context_create($options);
-file_get_contents($apiEndpoint, false, $context);
    - - diff --git a/doc/RSS-feeds.html b/doc/RSS-feeds.html deleted file mode 100644 index 0ebfecc..0000000 --- a/doc/RSS-feeds.html +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - Shaarli – RSS feeds - - - - - - -

    RSS feeds

    -

    Feeds options

    -

    Feeds are available in ATOM with ?do=atom and RSS with do=RSS.

    -

    Options:

    -
      -
    • You can use permalinks in the feed URL to get permalink to Shaares instead of direct link to shaared URL. -
        -
      • E.G. https://my.shaarli.domain/?do=atom&permalinks.
        • -
      • -
    • You can use nb parameter in the feed URL to specify the number of Shaares you want in a feed (default if not specified: 50). The keyword all is available if you want everything. -
        -
      • https://my.shaarli.domain/?do=atom&permalinks&nb=42
        • -
      • https://my.shaarli.domain/?do=atom&permalinks&nb=all
        • -
      • -
    -

    RSS Feeds or Picture Wall for a specific search/tag

    -

    It is possible to filter RSS/ATOM feeds and Picture Wall on a Shaarli to only display results of a specific search, or for a specific tag.

    -

    For example, if you want to subscribe only to links tagged photography:

    -
      -
    • Go to the desired Shaarli instance.
      • -
    • Search for the photography tag in the Filter by tag box. Links tagged photography are displayed.
      • -
    • Click on the RSS Feed button.
      • -
    • You are presented with an RSS feed showing only these links. Subscribe to it to receive only updates with this tag.
      • -
    • The same method also works for a full-text search (Search box) and for the Picture Wall (want to only see pictures about nature?)
      • -
    • You can also build the URLs manually: -
        -
      • https://my.shaarli.domain/?do=rss&searchtags=nature
        • -
      • https://my.shaarli.domain/links/?do=picwall&searchterm=poney
        • -
      • -
    -

    (images/rss-filter-2.png)

    - - diff --git a/doc/Release-Shaarli.html b/doc/Release-Shaarli.html deleted file mode 100644 index fa690c7..0000000 --- a/doc/Release-Shaarli.html +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - Shaarli – Release Shaarli - - - - - - - -

    Release Shaarli

    -

    See Git - Maintaining a project - Tagging your [](.html)
    -releases    .

    -

    Prerequisites

    -

    This guide assumes that you have:

    -
      -
    • a GPG key matching your GitHub authentication credentials -
        -
      • i.e., the email address identified by the GPG key is the same as the one in your ~/.gitconfig
        • -
      • -
    • a GitHub fork of Shaarli
      • -
    • a local clone of your Shaarli fork, with the following remotes: -
        -
      • origin pointing to your GitHub fork
        • -
      • upstream pointing to the main Shaarli repository
        • -
      • -
    • maintainer permissions on the main Shaarli repository, to: -
        -
      • push the signed tag
        • -
      • create a new release
        • -
      • -
    • Composer and Pandoc need to be installed
      • -
    -

    GitHub release draft and CHANGELOG.md

    -

    See http://keepachangelog.com/en/0.3.0/ for changelog formatting.

    -

    GitHub release draft

    -

    GitHub allows drafting the release note for the upcoming release, from the Releases page. This way, the release note can be drafted while contributions are merged to master.

    -

    CHANGELOG.md

    -

    This file should contain the same information as the release note draft for the upcoming version.

    -

    Update it to:

    -
      -
    • add new entries (additions, fixes, etc.)
      • -
    • mark the current version as released by setting its date and link
      • -
    • add a new section for the future unreleased version
      • -
    -
    $ cd /path/to/shaarli
-
-$ nano CHANGELOG.md
-
-[...][](.html)
-## vA.B.C - UNRELEASED
-TBA
-
-## [vX.Y.Z](https://github.com/shaarli/Shaarli/releases/tag/vX.Y.Z) - YYYY-MM-DD[](.html)
-[...][](.html)
    -

    Increment the version code, create and push a signed tag

    -

    Bump Shaarli's version

    -
    $ cd /path/to/shaarli
-
-# create a new branch
-$ git fetch upstream
-$ git checkout upstream/master -b v0.5.0
-
-# bump the version number
-$ vim index.php shaarli_version.php
-
-# rebuild the documentation from the wiki
-$ make htmldoc
-
-# commit the changes
-$ git add index.php shaarli_version.php doc
-$ git commit -s -m "Bump version to v0.5.0"
-
-# push the commit on your GitHub fork
-$ git push origin v0.5.0
    -

    Create and merge a Pull Request

    -

    This one is pretty straightforward ;-)

    -

    Create and push a signed tag

    -
    # update your local copy
-$ git checkout master
-$ git fetch upstream
-$ git pull upstream master
-
-# create a signed tag
-$ git tag -s -m "Release v0.5.0" v0.5.0
-
-# push it to "upstream"
-$ git push --tags upstream
    -

    Verify a signed tag

    -

    v0.5.0 is the first GPG-signed tag pushed on the Community Shaarli.

    -

    Let's have a look at its signature!

    -
    $ cd /path/to/shaarli
-$ git fetch upstream
-
-# get the SHA1 reference of the tag
-$ git show-ref tags/v0.5.0
-f7762cf803f03f5caf4b8078359a63783d0090c1 refs/tags/v0.5.0
-
-# verify the tag signature information
-$ git verify-tag f7762cf803f03f5caf4b8078359a63783d0090c1
-gpg: Signature made Thu 30 Jul 2015 11:46:34 CEST using RSA key ID 4100DF6F
-gpg: Good signature from "VirtualTam <virtualtam@flibidi.net>" [ultimate][](.html)
    -

    Publish the GitHub release

    -

    Update release badges

    -

    Update README.md so version badges display and point to the newly released Shaarli version(s).

    -

    Create a GitHub release from a Git tag

    -

    From the previously drafted release:

    -
      -
    • edit the release notes (if needed)
      • -
    • specify the appropriate Git tag
      • -
    • publish the release
      • -
    • profit!
      • -
    -

    Generate and upload all-in-one release archives

    -

    Users with a shared hosting may have:

    -
      -
    • no SSH access
      • -
    • no possibility to install PHP packages or server extensions
      • -
    • no possibility to run scripts
      • -
    -

    To ease Shaarli installations, it is possible to generate and upload additional release archives,
    -that will contain Shaarli code plus all required third-party libraries:

    -
    $ make release_archive
    -

    This will create the following archives:

    -
      -
    • shaarli-vX.Y.Z-full.tar
      • -
    • shaarli-vX.Y.Z-full.zip
      • -
    -

    The archives need to be manually uploaded on the previously created GitHub release.

    - - diff --git a/doc/Security.html b/doc/Security.html deleted file mode 100644 index 12b46fa..0000000 --- a/doc/Security.html +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - Shaarli – Security - - - - - - - -

    Security

    -

    Client browser

    -
      -
    • Shaarli relies on HTTP_REFERER for some functions (like redirects and clicking on tags). If you have disabled or masqueraded HTTP_REFERER in your browser, some features of Shaarli may not work
      • -
    -

    PHP

    -
      -
    • magic_quotes is an horrible option of PHP which is often activated on servers. No serious developer should rely on this horror to secure their code against SQL injections. You should disable it (and Shaarli expects this option to be disabled). Nevertheless, I have added code to cope with magic_quotes on, so you should not be bothered even on crappy hosts.
      • -
    -

    Server and sessions

    -
      -
    • Directories are protected using .htaccess files
      • -
    • Forms are protected against XSRF (Cross-site requests forgery):
      • -
    • Forms which act on data (save,delete…) contain a token generated by the server.
      • -
    • Any posted form which does not contain a valid token is rejected.
      • -
    • Any token can only be used once.
      • -
    • Tokens are attached to the session and cannot be reused in another session.
      • -
    • Sessions automatically expire after 60 minutes.
      • -
    • Sessions are protected against hijacking: the session ID cannot be used from a different IP address.
      • -
    -

    Shaarli datastore and configuration

    -
      -
    • The password is salted, hashed and stored in the data subdirectory, in a PHP file, and protected by htaccess. Even if the webserver does not support htaccess, the hash is not readable by URL. Even if the .php file is stolen, the password cannot deduced from the hash. The salt prevents rainbow-tables attacks.
      • -
    • Links are stored as an associative array which is serialized, compressed (with deflate), base64-encoded and saved as a comment in a .php file.
      • -
    • Even if the server does not support .htaccess files, the data file will still not be readable by URL.
      • -

    • The database looks like this:

      -
      <?php /* zP1ZjxxJtiYIvvevEPJ2lDOaLrZv7o...
-...ka7gaco/Z+TFXM2i7BlfMf8qxpaSSYfKlvqv/x8= */ ?>
      • -

    • Small hashes are used to make a link to an entry in Shaarli. They are unique. In fact, the date of the items (eg. 20110923_150523) is hashed with CRC32, then converted to base64 and some characters are replaced. They are always 6 characters longs and use only A-Z a-z 0-9 - _ and @.

      • -
    - - diff --git a/doc/Server-configuration.html b/doc/Server-configuration.html deleted file mode 100644 index 0e6b220..0000000 --- a/doc/Server-configuration.html +++ /dev/null @@ -1,459 +0,0 @@ - - - - - - - Shaarli – Server configuration - - - - - - - -

    Server configuration

    -

    Example virtual host configurations for popular web servers

    - -

    Prerequisites

    -

    Shaarli

    -
      -
    • Shaarli is installed in a directory readable/writeable by the user
      • -
    • the correct read/write permissions have been granted to the web server user and/or group
      • -
    • for HTTPS / SSL:
      • -
    • a key pair (public, private) and a certificate have been generated
      • -
    • the appropriate server SSL extension is installed and active
      • -
    -

    HTTPS, TLS and self-signed certificates

    -

    Related guides:

    - -

    Proxies

    -

    If Shaarli is served behind a proxy (i.e. there is a proxy server between clients and the web server hosting Shaarli), please refer to the proxy server documentation for proper configuration. In particular, you have to ensure that the following server variables are properly set:

    -
      -
    • X-Forwarded-Proto;
      • -
    • X-Forwarded-Host;
      • -
    • X-Forwarded-For.
      • -
    -

    See also proxy-related issues.

    -

    Apache

    -

    Minimal

    -
    <VirtualHost *:80>
-    ServerName   shaarli.my-domain.org
-    DocumentRoot /absolute/path/to/shaarli/
-</VirtualHost>
    -

    Debug - Log all the things!

    -

    This configuration will log both Apache and PHP errors, which may prove useful to identify server configuration errors.

    -

    See:

    - -
    <VirtualHost *:80>
-    ServerName   shaarli.my-domain.org
-    DocumentRoot /absolute/path/to/shaarli/
-
-    LogLevel  warn
-    ErrorLog  /var/log/apache2/shaarli-error.log
-    CustomLog /var/log/apache2/shaarli-access.log combined
-
-    php_flag  log_errors on
-    php_flag  display_errors on
-    php_value error_reporting 2147483647
-    php_value error_log /var/log/apache2/shaarli-php-error.log
-</VirtualHost>
    -

    Standard - Keep access and error logs

    -
    <VirtualHost *:80>
-    ServerName   shaarli.my-domain.org
-    DocumentRoot /absolute/path/to/shaarli/
-
-    LogLevel  warn
-    ErrorLog  /var/log/apache2/shaarli-error.log
-    CustomLog /var/log/apache2/shaarli-access.log combined
-</VirtualHost>
    -

    Paranoid - Redirect HTTP (:80) to HTTPS (:443)

    -

    See Server-side TLS (Mozilla).

    -
    <VirtualHost *:443>
-    ServerName   shaarli.my-domain.org
-    DocumentRoot /absolute/path/to/shaarli/
-
-    SSLEngine             on
-    SSLCertificateFile    /absolute/path/to/the/website/certificate.pem
-    SSLCertificateKeyFile /absolute/path/to/the/website/key.key
-
-    <Directory /absolute/path/to/shaarli/>
-        AllowOverride All
-        Options Indexes FollowSymLinks MultiViews
-        Order allow,deny
-        allow from all
-    </Directory>
-
-    LogLevel  warn
-    ErrorLog  /var/log/apache2/shaarli-error.log
-    CustomLog /var/log/apache2/shaarli-access.log combined
-</VirtualHost>
-<VirtualHost *:80>
-    ServerName   shaarli.my-domain.org
-    Redirect 301 / https://shaarli.my-domain.org
-
-    LogLevel  warn
-    ErrorLog  /var/log/apache2/shaarli-error.log
-    CustomLog /var/log/apache2/shaarli-access.log combined
-</VirtualHost>
    -

    .htaccess

    -

    Shaarli use .htaccess Apache files to deny access to files that shouldn't be directly accessed (datastore, config, etc.). You need the directive AllowOverride All in your virtual host configuration for them to work.

    -

    Warning: If you use Apache 2.2 or lower, you need mod_version to be installed and enabled.

    -

    Apache module mod_rewrite must be enabled to use the REST API. URL rewriting rules for the Slim microframework are stated in the root .htaccess file.

    -

    LightHttpd

    -

    Nginx

    -

    Foreword

    -

    Nginx does not natively interpret PHP scripts; to this effect, we will run a FastCGI service, to which Nginx's FastCGI module will proxy all requests to PHP resources.

    -

    Required packages:

    - -

    Official documentation:

    - -

    Community resources:

    - -

    Common setup

    -

    Once Nginx and PHP-FPM are installed, we need to ensure:

    -
      -
    • Nginx and PHP-FPM are running using the same user and group
      • -
    • both these user and group have -
        -
      • read permissions for Shaarli resources
        • -
      • execute permissions for Shaarli directories AND their parent directories
        • -
      • -
    -

    On a production server:

    -
      -
    • user:group will likely be http:http, www:www or www-data:www-data
      • -
    • files will be located under /var/www, /var/http or /usr/share/nginx
      • -
    -

    On a development server:

    -
      -
    • files may be located in a user's home directory
      • -
    • in this case, make sure both Nginx and PHP-FPM are running as the local user/group!
      • -
    -

    For all following configuration examples, this user/group pair will be used:

    -
      -
    • user:group = john:users,
      • -
    -

    which corresponds to the following service configuration:

    -
    ; /etc/php/php-fpm.conf
-user = john
-group = users
-
-[...][](.html)
-listen.owner = john
-listen.group = users
    -
    # /etc/nginx/nginx.conf
-user john users;
-
-http {
-    [...][](.html)
-}
    -

    (Optional) Increase the maximum file upload size

    -

    Some bookmark dumps generated by web browsers can be huge due to the presence of Base64-encoded images and favicons, as well as extra verbosity when nesting links in (sub-)folders.

    -

    To increase upload size, you will need to modify both nginx and PHP configuration:

    -
    # /etc/nginx/nginx.conf
-
-http {
-    [...][](.html)
-
-    client_max_body_size 10m;
-
-    [...][](.html)
-}
    -
    # /etc/php5/fpm/php.ini
-
-[...][](.html)
-post_max_size = 10M
-[...][](.html)
-upload_max_filesize = 10M
    -

    Minimal

    -

    WARNING: Use for development only!

    -
    user john users;
-worker_processes  1;
-events {
-    worker_connections  1024;
-}
-
-http {
-    include            mime.types;
-    default_type       application/octet-stream;
-    keepalive_timeout  20;
-
-    index index.html index.php;
-
-    server {
-        listen       80;
-        server_name  localhost;
-        root         /home/john/web;
-
-        access_log  /var/log/nginx/access.log;
-        error_log   /var/log/nginx/error.log;
-
-        location /shaarli/ {
-            try_files $uri /shaarli/index.php$is_args$args;
-            access_log  /var/log/nginx/shaarli.access.log;
-            error_log   /var/log/nginx/shaarli.error.log;
-        }
-
-        location ~ (index)\.php$ {
-            try_files $uri =404;
-            fastcgi_split_path_info ^(.+\.php)(/.+)$;
-            fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
-            fastcgi_index  index.php;
-            include        fastcgi.conf;
-        }
-    }
-}
    -

    Modular

    -

    The previous setup is sufficient for development purposes, but has several major caveats:

    -
      -
    • every content that does not match the PHP rule will be sent to client browsers: -
        -
      • dotfiles - in our case, .htaccess
        • -
      • temporary files, e.g. Vim or Emacs files: index.php~
        • -
      • -
    • asset / static resource caching is not optimized
      • -
    • if serving several PHP sites, there will be a lot of duplication: location /shaarli/, location /mysite/, etc.
      • -
    -

    To solve this, we will split Nginx configuration in several parts, that will be included when needed:

    -
    # /etc/nginx/deny.conf
-location ~ /\. {
-    # deny access to dotfiles
-    access_log off;
-    log_not_found off;
-    deny all;
-}
-
-location ~ ~$ {
-    # deny access to temp editor files, e.g. "script.php~"
-    access_log off;
-    log_not_found off;
-    deny all;
-}
    -
    # /etc/nginx/php.conf
-location ~ (index)\.php$ {
-    # Slim - split URL path into (script_filename, path_info)
-    try_files $uri =404;
-    fastcgi_split_path_info ^(.+\.php)(/.+)$;
-
-    # filter and proxy PHP requests to PHP-FPM
-    fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
-    fastcgi_index  index.php;
-    include        fastcgi.conf;
-}
-
-location ~ \.php$ {
-    # deny access to all other PHP scripts
-    deny all;
-}
    -
    # /etc/nginx/static_assets.conf
-location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
-    expires    max;
-    add_header Pragma public;
-    add_header Cache-Control "public, must-revalidate, proxy-revalidate";
-}
    -
    # /etc/nginx/nginx.conf
-[...][](.html)
-
-http {
-    [...][](.html)
-
-    root        /home/john/web;
-    access_log  /var/log/nginx/access.log;
-    error_log   /var/log/nginx/error.log;
-
-    server {
-        # virtual host for a first domain
-        listen       80;
-        server_name  my.first.domain.org;
-
-        location /shaarli/ {
-            # Slim - rewrite URLs
-            try_files $uri /shaarli/index.php$is_args$args;
-
-            access_log  /var/log/nginx/shaarli.access.log;
-            error_log   /var/log/nginx/shaarli.error.log;
-        }
-
-        location = /shaarli/favicon.ico {
-            # serve the Shaarli favicon from its custom location
-            alias /var/www/shaarli/images/favicon.ico;
-        }
-
-        include deny.conf;
-        include static_assets.conf;
-        include php.conf;
-    }
-
-    server {
-        # virtual host for a second domain
-        listen       80;
-        server_name  second.domain.com;
-
-        location /minigal/ {
-            access_log  /var/log/nginx/minigal.access.log;
-            error_log   /var/log/nginx/minigal.error.log;
-        }
-
-        include deny.conf;
-        include static_assets.conf;
-        include php.conf;
-    }
-}
    -

    Redirect HTTP to HTTPS

    -

    Assuming you have generated a (self-signed) key and certificate, and they are located under /home/john/ssl/localhost.{key,crt}, it is pretty straightforward to set an HTTP (:80) to HTTPS (:443) redirection to force SSL/TLS usage.

    -
    # /etc/nginx/nginx.conf
-[...][](.html)
-
-http {
-    [...][](.html)
-
-    index index.html index.php;
-
-    root        /home/john/web;
-    access_log  /var/log/nginx/access.log;
-    error_log   /var/log/nginx/error.log;
-
-    server {
-        listen       80;
-        server_name  localhost;
-
-        return 301 https://localhost$request_uri;
-    }
-
-    server {
-        listen       443 ssl;
-        server_name  localhost;
-
-        ssl_certificate      /home/john/ssl/localhost.crt;
-        ssl_certificate_key  /home/john/ssl/localhost.key;
-
-        location /shaarli/ {
-            # Slim - rewrite URLs
-            try_files $uri /index.php$is_args$args;
-
-            access_log  /var/log/nginx/shaarli.access.log;
-            error_log   /var/log/nginx/shaarli.error.log;
-        }
-
-        location = /shaarli/favicon.ico {
-            # serve the Shaarli favicon from its custom location
-            alias /var/www/shaarli/images/favicon.ico;
-        }
-
-        include deny.conf;
-        include static_assets.conf;
-        include php.conf;
-    }
-}
    - - diff --git a/doc/Server-requirements.html b/doc/Server-requirements.html deleted file mode 100644 index 79d7411..0000000 --- a/doc/Server-requirements.html +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - - Shaarli – Server requirements - - - - - - -

    Server requirements

    -

    PHP

    -

    Release information

    - -

    Supported versions

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    VersionStatusShaarli compatibility
    7.1Supported (v0.9.x)✅
    7.0Supported✅
    5.6Supported✅
    5.5EOL: 2016-07-10✅
    5.4EOL: 2015-09-14✅ (up to Shaarli 0.8.x)
    5.3EOL: 2014-08-14✅ (up to Shaarli 0.8.x)
    -

    See also:

    - -

    Dependency management

    -

    Starting with Shaarli v0.8.x, Composer is used to resolve,
    -download and install third-party PHP dependencies.

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    LibraryRequired?Usage
    shaarli/netscape-bookmark-parserAllImport bookmarks from Netscape files
    erusev/parsedownAllParse MarkDown syntax for the MarkDown plugin
    slim/slimAllHandle routes and middleware for the REST API
    -

    Extensions

    - ----- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    ExtensionRequired?Usage
    opensslAllOpenSSL, HTTPS
    php-mbstringCentOS, Fedora, RHEL, Windowsmultibyte (Unicode) string support
    php-gdoptionalthumbnail resizing
    php-intloptionallocalized text sorting (e.g. e->è->f)
    php-curloptionalusing cURL for fetching webpages and thumbnails in a more robust way
    - - diff --git a/doc/Server-security.html b/doc/Server-security.html deleted file mode 100644 index 4f7ff46..0000000 --- a/doc/Server-security.html +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - Shaarli – Server security - - - - - - - -

    Server security

    -

    php.ini

    -

    PHP settings are defined in:

    -
      -
    • a main configuration file, usually found under /etc/php5/php.ini; some distributions provide different configuration environments, e.g. -
        -
      • /etc/php5/php.ini - used when running console scripts
        • -
      • /etc/php5/apache2/php.ini - used when a client requests PHP resources from Apache
        • -
      • /etc/php5/php-fpm.conf - used when PHP requests are proxied to PHP-FPM
        • -
      • -
    • additional configuration files/entries, depending on the installed/enabled extensions: -
        -
      • /etc/php/conf.d/xdebug.ini
        • -
      • -
    -

    Locate .ini files

    -

    Console environment

    -
    $ php --ini
-Configuration File (php.ini) Path: /etc/php
-Loaded Configuration File:         /etc/php/php.ini
-Scan for additional .ini files in: /etc/php/conf.d
-Additional .ini files parsed:      /etc/php/conf.d/xdebug.ini
    -

    Server environment

    -
      -
    • create a phpinfo.php script located in a path supported by the web server, e.g. -
        -
      • Apache (with user dirs enabled): /home/myself/public_html/phpinfo.php
        • -
      • /var/www/test/phpinfo.php
        • -
      • -
    • make sure the script is readable by the web server user/group (usually, www, www-data or httpd)
      • -
    • access the script from a web browser
      • -

    • look at the Loaded Configuration File and Scan this dir for additional .ini files entries

      -
      <?php phpinfo(); ?>
      • -
    -

    fail2ban

    -

    fail2ban is an intrusion prevention framework that reads server (Apache, SSH, etc.) and uses iptables profiles to block brute-force attempts:

    - -

    Read Shaarli logs to ban IPs

    -

    Example configuration:

    -
      -
    • allow 3 login attempts per IP address
      • -
    • after 3 failures, permanently ban the corresponding IP adddress
      • -
    -

    /etc/fail2ban/jail.local

    -
    [shaarli-auth][](.html)
-enabled  = true
-port     = https,http
-filter   = shaarli-auth
-logpath  = /var/www/path/to/shaarli/data/log.txt
-maxretry = 3
-bantime = -1
    -

    /etc/fail2ban/filter.d/shaarli-auth.conf

    -
    [INCLUDES][](.html)
-before = common.conf
-[Definition][](.html)
-failregex = \s-\s<HOST>\s-\sLogin failed for user.*$
-ignoreregex =
    -

    Robots - Restricting search engines and web crawler traffic

    -

    Creating a robots.txt with the following contents at the root of your Shaarli installation will prevent honest web crawlers from indexing each and every link and Daily page from a Shaarli instance, thus getting rid of a certain amount of unsollicited network traffic.

    -
    User-agent: *
-Disallow: /
    -

    See:

    - - - diff --git a/doc/Shaarli-configuration.html b/doc/Shaarli-configuration.html deleted file mode 100644 index c696c97..0000000 --- a/doc/Shaarli-configuration.html +++ /dev/null @@ -1,298 +0,0 @@ - - - - - - - Shaarli – Shaarli configuration - - - - - - - -

    Shaarli configuration

    -

    Shaarli configuration

    -

    Foreword

    -

    Do not edit configuration options in index.php! Your changes would be lost.

    -

    Once your Shaarli instance is installed, the file data/config.json.php is generated:

    -
      -
    • it contains all settings in JSON format, and can be edited to customize values
      • -
    • it defines which plugins are enabled(.html)
      • -
    • its values override those defined in index.php
      • -
    • it is wrap in a PHP comment to prevent anyone accessing it, regardless of server configuration
      • -
    -

    File and directory permissions

    -

    The server process running Shaarli must have:

    -
      -
    • read access to the following resources: -
        -
      • PHP scripts: index.php, application/*.php, plugins/*.php
        • -
      • 3rd party PHP and Javascript libraries: inc/*.php, inc/*.js
        • -
      • static assets: -
          -
        • CSS stylesheets: inc/*.css
          • -
        • images/*
          • -
        • -
      • RainTPL templates: tpl/*.html
        • -
      • -
    • read, write and execution access to the following directories: -
        -
      • cache - thumbnail cache
        • -
      • data - link data store, configuration options
        • -
      • pagecache - Atom/RSS feed cache
        • -
      • tmp - RainTPL page cache
        • -
      • -
    -

    On a Linux distribution:

    -
      -
    • the web server user will likely be www or http (for Apache2)
      • -
    • it will be a member of a group of the same name: www:www, http:http
      • -
    • to give it access to Shaarli, either: -
        -
      • unzip Shaarli in the default web server location (usually /var/www/) and set the web server user as the owner
        • -
      • put users in the same group as the web server, and set the appropriate access rights
        • -
      • -
    • if you have a domain / subdomain to serve Shaarli, configure the server accordingly(.html)
      • -
    -

    Configuration

    -

    In data/config.json.php.

    -

    See also Plugin System.

    -

    Credentials

    -
    -

    You shouldn't edit those.

    -
    -

    login: Login username.
    -hash: Generated password hash.
    -salt: Password salt.

    -

    General

    -

    title: Shaarli's instance title.
    -header_link: Link to the homepage.
    -links_per_page: Number of shaares displayed per page.
    -timezone: See the list of supported timezones.
    -enabled_plugins: List of enabled plugins.

    -

    Security

    -

    session_protection_disabled: Disable session cookie hijacking protection (not recommended).
    -It might be useful if your IP adress often changes.
    -ban_after: Failed login attempts before being IP banned.
    -ban_duration: IP ban duration in seconds.
    -open_shaarli: Anyone can add a new link while logged out if enabled.
    -trusted_proxies: List of trusted IP which won't be banned after failed login attemps. Useful if Shaarli is behind a reverse proxy.

    -

    Resources

    -

    data_dir: Data directory.
    -datastore: Shaarli's links database file path.
    -history: Shaarli's operation history file path.
    -updates: File path for the ran updates file.
    -log: Log file path.
    -update_check: Last update check file path.
    -raintpl_tpl: Templates directory.
    -raintpl_tmp: Template engine cache directory.
    -thumbnails_cache: Thumbnails cache directory.
    -page_cache: Shaarli's internal cache directory.
    -ban_file: Banned IP file path.

    -

    Updates

    -

    check_updates: Enable or disable update check to the git repository.
    -check_updates_branch: Git branch used to check updates (e.g. stable or master).
    -check_updates_interval: Look for new version every N seconds (default: every day).

    -

    Privacy

    -

    default_private_links: Check the private checkbox by default for every new link.
    -hide_public_links: All links are hidden while logged out.
    -hide_timestamps: Timestamps are hidden.

    -

    Feed

    -

    rss_permalinks: Enable this to redirect RSS links to Shaarli's permalinks instead of shaared URL.
    -show_atom: Display ATOM feed button.

    -

    Thumbnail

    -

    enable_thumbnails: Enable or disable thumbnail display.
    -enable_localcache: Enable or disable local cache.

    -

    Redirector

    -

    url: Redirector URL, such as anonym.to.
    -encode_url: Enable this if the redirector needs encoded URL to work properly.

    -

    Configuration file example

    -
    <?php /*
-{
-    "credentials": {
-        "login": "<login>",
-        "hash": "<password hash>",
-        "salt": "<password salt>"
-    },
-    "security": {
-        "ban_after": 4,
-        "session_protection_disabled": false,
-        "ban_duration": 1800,
-        "trusted_proxies": [[](.html)
-            "1.2.3.4",
-            "5.6.7.8"
-        ]
-    },
-    "resources": {
-        "data_dir": "data",
-        "config": "data\/config.php",
-        "datastore": "data\/datastore.php",
-        "ban_file": "data\/ipbans.php",
-        "updates": "data\/updates.txt",
-        "log": "data\/log.txt",
-        "update_check": "data\/lastupdatecheck.txt",
-        "raintpl_tmp": "tmp\/",
-        "raintpl_tpl": "tpl\/",
-        "thumbnails_cache": "cache",
-        "page_cache": "pagecache"
-    },
-    "general": {
-        "check_updates": true,
-        "rss_permalinks": true,
-        "links_per_page": 20,
-        "default_private_links": true,
-        "enable_thumbnails": true,
-        "enable_localcache": true,
-        "check_updates_branch": "stable",
-        "check_updates_interval": 86400,
-        "enabled_plugins": [[](.html)
-            "markdown",
-            "wallabag",
-            "archiveorg"
-        ],
-        "timezone": "Europe\/Paris",
-        "title": "My Shaarli",
-        "header_link": "?"
-    },
-    "extras": {
-        "show_atom": false,
-        "hide_public_links": false,
-        "hide_timestamps": false,
-        "open_shaarli": false,
-        "redirector": "http://anonym.to/?",
-        "redirector_encode_url": false
-    },
-    "general": {
-        "header_link": "?",
-        "links_per_page": 20,
-        "enabled_plugins": [[](.html)
-            "markdown",
-            "wallabag"
-        ],
-        "timezone": "Europe\/Paris",
-        "title": "My Shaarli"
-    },
-    "updates": {
-        "check_updates": true,
-        "check_updates_branch": "stable",
-        "check_updates_interval": 86400
-    },
-    "feed": {
-        "rss_permalinks": true,
-        "show_atom": false
-    },
-    "privacy": {
-        "default_private_links": true,
-        "hide_public_links": false,
-        "hide_timestamps": false
-    },
-    "thumbnail": {
-        "enable_thumbnails": true,
-        "enable_localcache": true
-    },
-    "redirector": {
-        "url": "http://anonym.to/?",
-        "encode_url": false
-    },
-    "plugins": {
-        "WALLABAG_URL": "http://demo.wallabag.org",
-        "WALLABAG_VERSION": "1"
-    }
-} ?>
    -

    Additional configuration

    -

    The playvideos plugin may require that you adapt your server's
    -Content Security Policy
    -configuration to work properly.(.html)

    - - diff --git a/doc/Sharing-button.html b/doc/Sharing-button.html deleted file mode 100644 index f3682f8..0000000 --- a/doc/Sharing-button.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - Shaarli – Sharing button - - - - - - -

    Sharing button

    -

    Add the sharing button (bookmarklet) to your browser

    -
      -
    • Open your Shaarli and Login
      • -
    • Click the Tools button in the top bar
      • -
    • Drag the ✚Shaare link button, and drop it to your browser's bookmarks bar.
      • -
    -

    This bookmarklet button is compatible with Firefox, Opera, Chrome and Safari. Under Opera, you can't drag'n drop the button: You have to right-click on it and add a bookmark to your personal toolbar.

    -

    - -
      -
    • When you are visiting a webpage you would like to share with Shaarli, click the bookmarklet you just added.
      • -
    • A window opens.
      • -
    • You can freely edit title, description, tags... to find it later using the text search or tag filtering.
      • -
    • You will be able to edit this link later using the
      • -
    • You can also check the “Private” box so that the link is saved but only visible to you.
      • -
    • Click Save.Voilà! Your link is now shared.
      • -
    -

    Troubleshooting: The bookmarklet doesn't work with a few website (e.g. Github.com)

    -

    Websites which enforce Content Security Policy (CSP), such as github.com, disallow usage of bookmarklets. Unfortunatly, there is nothing Shaarli can do about it.

    -

    See #196.

    -

    There is an open bug for both Firefox and Chromium:

    - - - diff --git a/doc/Static-analysis.html b/doc/Static-analysis.html deleted file mode 100644 index a95d195..0000000 --- a/doc/Static-analysis.html +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - Shaarli – Static analysis - - - - - - -

    Static analysis

    -

    WIP

    -

    This topic is currently being discussed here:

    - -

    Usage

    -

    Static analysis tools can be installed with Composer, and used through Shaarli's Makefile.

    -

    For an overview of the available features, see:

    - - - diff --git a/doc/Theming.html b/doc/Theming.html deleted file mode 100644 index 6b5dac3..0000000 --- a/doc/Theming.html +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - Shaarli – Theming - - - - - - - -

    Theming

    -

    Foreword

    -

    There are two ways of customizing how Shaarli looks:

    -
      -
    1. by using a custom CSS to override Shaarli's CSS
      2. -
    2. by using a full theme that provides its own RainTPL templates, CSS and Javascript resources
      3. -
    -

    Custom CSS

    -

    Shaarli's appearance can be modified by adding CSS rules to:

    -
      -
    • Shaarli < v0.9.0: inc/user.css
      • -
    • Shaarli >= v0.9.0: data/user.css
      • -
    -

    This file allows overriding rules defined in the template CSS files (only add changed rules), or define a whole new theme.

    -

    Note: Do not edit tpl/default/css/shaarli.css! Your changes would be overridden when updating Shaarli.

    -

    See also Download CSS styles from an OPML list

    -

    Themes

    -

    WARNING - This feature is currently being worked on and will be improved in the next releases. Experimental.

    -

    Installation:

    -
      -
    • find a theme you'd like to install
      • -
    • copy or clone the theme folder under tpl/<a_sweet_theme>
      • -
    • enable the theme: -
        -
      • Shaarli < v0.9.0: edit data/config.json.php and set the value of raintpl_tpl to the new theme name:
        -"raintpl_tpl": "tpl\/my-template\/"
        • -
      • Shaarli >= v0.9.0: select the theme through the Tools page
        • -
      • -
    -

    Community CSS & themes

    -

    Custom CSS

    - -

    Themes

    - -

    Shaarli forks

    - -

    Example installation: AlbinoMouse theme

    -

    With the following configuration:

    -
      -
    • Apache 2 / PHP 5.6
      • -
    • user sites are enabled, e.g. /home/user/public_html/somedir is served as http://localhost/~user/somedir
      • -
    • http is the name of the Apache user
      • -
    -
    $ cd ~/public_html
-
-# clone repositories
-$ git clone https://github.com/shaarli/Shaarli.git shaarli
-$ pushd shaarli/tpl
-$ git clone https://github.com/alexisju/albinomouse-template.git
-$ popd
-
-# set access rights for Apache
-$ chgrp -R http shaarli
-$ chmod g+rwx shaarli shaarli/cache shaarli/data shaarli/pagecache shaarli/tmp
    -

    Get config written:

    -
      -
    • go to the freshly installed site
      • -
    • fill the install form
      • -
    • log in to Shaarli
      • -
    -

    Edit Shaarli's configuration|Shaarli configuration:

    -
    # the file should be owned by Apache, thus not writeable => sudo
-$ sudo sed -i s=tpl=tpl/albinomouse-template=g shaarli/data/config.php
    - - diff --git a/doc/Troubleshooting.html b/doc/Troubleshooting.html deleted file mode 100644 index f43e6ed..0000000 --- a/doc/Troubleshooting.html +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - - Shaarli – Troubleshooting - - - - - - - -

    Troubleshooting

    -

    Browser

    -

    Redirection issues (HTTP Referer)

    -

    Depending on its configuration and installed plugins, the browser may remove or alter (spoof) HTTP referers, thus preventing Shaarli from properly redirecting between pages.

    -

    See:

    - -

    Firefox HTTP Referer options

    -

    HTTP settings are available by browsing about:config, here are the available settings and their values.

    -

    network.http.sendRefererHeader - determines when to send the Referer HTTP header

    -
      -
    • 0: Never send the referring URL -
        -
      • not recommended, may break some sites
        • -
      • -
    • 1: Send only on clicked links
      • -
    • 2 (default): Send for links and images
      • -
    -

    network.http.referer.XOriginPolicy - Cross-domain origin policy

    -
      -
    • 0 (default): Always send
      • -
    • 1: Send if base domains match
      • -
    • 2: Send if hosts match
      • -
    -

    network.http.referer.spoofSource - Referer spoofing (~faking)

    -
      -
    • false (default): real referer
      • -
    • true: spoof referer (use target URI as referer)
      • -
    • known to break some functionality in Shaarli
      • -
    -

    network.http.referer.trimmingPolicy - trim the URI not to send a full Referer

    -
      -
    • 0 (default): send full URI
      • -
    • 1: scheme+host+port+path
      • -
    • 2: scheme+host+port
      • -
    -

    Firefox, localhost and redirections

    -

    localhost is not a proper Fully Qualified Domain Name (FQDN); if Firefox has been set up to spoof referers, or only accept requests from the same base domain/host, Shaarli redirections will not work properly.

    -

    To solve this, assign a local domain to your host, e.g.

    -
    127.0.0.1 localhost desktop localhost.lan
-::1       localhost desktop localhost.lan
    -

    and browse Shaarli at http://localhost.lan/.

    -

    Related threads:

    - -

    Login

    -

    I forgot my password!

    -

    Delete the file data/config.php and display the page again. You will be asked for a new login/password.

    -

    I'm locked out - Login bruteforce protection

    -

    Login form is protected against brute force attacks: 4 failed logins will ban the IP address from login for 30 minutes. Banned IPs can still browse links.

    -

    To remove the current IP bans, delete the file data/ipbans.php

    -

    List of all login attempts

    -

    The file data/log.txt shows all logins (successful or failed) and bans/lifted bans.
    -Search for failed in this file to look for unauthorized login attempts.

    -

    Hosting problems

    -

    Old PHP versions

    -
      -
    • On free.fr : free.fr now support php 5.6.x(link)and so support now the tag autocompletion but you have to do the following : At the root of your webspace create a sessions directory and a .htaccess file containing:
      • -
    -
    <IfDefine Free>
-php56 1
-</IfDefine>
    -
      -
    • If you have an error such as: Parse error: syntax error, unexpected '=', expecting '(' in /links/index.php on line xxx, it means that your host is using php4, not php5. Shaarli requires php 5.1. Try changing the file extension to .php5
      • -
    • On 1and1 : If you add the link from the page (and not from the bookmarklet), Shaarli will no be able to get the title of the page. You will have to enter it manually. (Because they have disabled the ability to download a file through HTTP).
      • -
    • If you have the error Warning: file_get_contents() [function.file-get-contents]: URL file-access is disabled in the server configuration in /…/index.php on line xxx, it means that your host has disabled the ability to fetch a file by HTTP in the php config (Typically in 1and1 hosting). Bad host. Change host. Or comment the following lines:
      • -
    -
    //list($status,$headers,$data) = getHTTP($url,4); // Short timeout to keep the application responsive.
-// FIXME: Decode charset according to charset specified in either 1) HTTP response headers or 2) <head> in html 
-//if (strpos($status,'200 OK')) $title=html_extract_title($data);
    -
      -
    • On hosts which forbid outgoing HTTP requests (such as free.fr), some thumbnails will not work.
      • -
    • On lost-oasis, RSS doesn't work correctly, because of this message at the begining of the RSS/ATOM feed : <? // tout ce qui est charge ici (generalement des includes et require) est charge en permanence. ?>. To fix this, remove this message from php-include/prepend.php
      • -
    -

    Dates are not properly formatted

    -

    Shaarli tries to sniff the language of the browser (using HTTP_ACCEPT_LANGUAGE headers) and choose a date format accordingly. But Shaarli can only use the date formats (and more generaly speaking, the locales) provided by the webserver. So even if you have a browser in French, you may end up with dates in US format (it's the case on sebsauvage.net :-( )

    -

    Problems on CentOS servers

    -

    On CentOS/RedHat derivatives, you may need to install the php-mbstring package.

    -

    My session expires! I can't stay logged in

    -

    This can be caused by several things:

    -
      -
    • Your php installation may not have a proper directory setup for session files. (eg. on Free.fr you need to create a session directory on the root of your website.) You may need to create the session directory of set it up.
      • -
    • Most hosts regularly clean the temporary and session directories. Your host may be cleaning those directories too aggressively (eg.OVH hosts), forcing an expire of the session. You may want to set the session directory in your web root. (eg. Create the sessions subdirectory and add ini_set('session.save_path', $_SERVER['DOCUMENT_ROOT'].'/../sessions');. Make sure this directory is not browsable !)
      • -
    • If your IP address changes during surfing, Shaarli will force expire your session for security reasons (to prevent session cookie hijacking). This can happen when surfing from WiFi or 3G (you may have switched WiFi/3G access point), or in some corporate/university proxies which use load balancing (and may have proxies with several external IP addresses).
      • -
    • Some browser addons may interfer with HTTP headers (ipfuck/ipflood/GreaseMonkey…). Try disabling those.
      • -
    • You may be using OperaTurbo or OperaMini, which use their own proxies which may change from time to time.
      • -
    • If you have another application on the same webserver where Shaarli is installed, these application may forcefully expire php sessions.
      • -
    -

    Sessions do not seem to work correctly on your server

    -

    Follow the instructions in the error message. Make sure you are accessing shaarli via a direct IP address or a proper hostname. If you have no dots in the hostname (e.g. localhost or http://my-webserver/shaarli/), some browsers will not store cookies at all (this respects the HTTP cookie specification).

    -

    pubsubhubbub support

    -

    Download publisher.php at the root of your Shaarli installation and set $GLOBALS['config'['PUBSUBHUB_URL'] in your config.php]('PUBSUBHUB_URL']-in-your-config.php`.html)

    - - diff --git a/doc/Unit-tests.html b/doc/Unit-tests.html deleted file mode 100644 index 0961146..0000000 --- a/doc/Unit-tests.html +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - Shaarli – Unit tests - - - - - - - -

    Unit tests

    -

    Setup your environment for tests

    -

    The framework used is PHPUnit; it can be installed with Composer, which is a dependency management tool.

    -

    Regarding Composer, you can either use:

    -
      -
    • a system-wide version, e.g. installed through your distro's package manager
      • -
    • a local version, downloadable here
      • -
    -

    Sample usage

    -
    # system-wide version
-$ composer install
-$ composer update
-
-# local version
-$ php composer.phar self-update
-$ php composer.phar install
-$ php composer.phar update
    -

    Install Shaarli dev dependencies

    -
    $ cd /path/to/shaarli
-$ composer update
    -

    Install and enable Xdebug to generate PHPUnit coverage reports

    -

    For Debian-based distros:

    -
    $ aptitude install php5-xdebug
    -

    For ArchLinux:

    -
    $ pacman -S xdebug
    -

    Then add the following line to /etc/php/php.ini:

    -
    zend_extension=xdebug.so
    -

    Run unit tests

    -

    Successful test suite:

    -
    $ make test
-
--------
-PHPUNIT
--------
-PHPUnit 4.6.9 by Sebastian Bergmann and contributors.
-
-Configuration read from /home/virtualtam/public_html/shaarli/phpunit.xml
-
-....................................
-
-Time: 759 ms, Memory: 8.25Mb
-
-OK (36 tests, 65 assertions)
    -

    Test suite with failures and errors:

    -
    $ make test
--------
-PHPUNIT
--------
-PHPUnit 4.6.9 by Sebastian Bergmann and contributors.
-
-Configuration read from /home/virtualtam/public_html/shaarli/phpunit.xml
-
-E..FF...............................
-
-Time: 802 ms, Memory: 8.25Mb
-
-There was 1 error:
-
-1) LinkDBTest::testConstructLoggedIn
-Missing argument 2 for LinkDB::__construct(), called in /home/virtualtam/public_html/shaarli/tests/Link\
-DBTest.php on line 79 and defined
-
-/home/virtualtam/public_html/shaarli/application/LinkDB.php:58
-/home/virtualtam/public_html/shaarli/tests/LinkDBTest.php:79
-
---
-
-There were 2 failures:
-
-1) LinkDBTest::testCheckDBNew
-Failed asserting that two strings are equal.
---- Expected
-+++ Actual
-@@ @@
--'e3edea8ea7bb50be4bcb404df53fbb4546a7156e'
-+'85eab0c610d4f68025f6ed6e6b6b5fabd4b55834'
-
-/home/virtualtam/public_html/shaarli/tests/LinkDBTest.php:121
-
-2) LinkDBTest::testCheckDBLoad
-Failed asserting that two strings are equal.
---- Expected
-+++ Actual
-@@ @@
--'e3edea8ea7bb50be4bcb404df53fbb4546a7156e'
-+'85eab0c610d4f68025f6ed6e6b6b5fabd4b55834'
-
-/home/virtualtam/public_html/shaarli/tests/LinkDBTest.php:133
-
-FAILURES!
-Tests: 36, Assertions: 63, Errors: 1, Failures: 2.
    -

    Test results and coverage

    -

    By default, PHPUnit will run all suitable tests found under the tests directory.

    -

    Each test has 3 possible outcomes:

    -
      -
    • . - success
      • -
    • F - failure: the test was run but its results are invalid
      • -
    • the code does not behave as expected
      • -
    • dependencies to external elements: globals, session, cache...
      • -
    • E - error: something went wrong and the tested code has crashed
      • -
    • typos in the code, or in the test code
      • -
    • dependencies to missing external elements
      • -
    -

    If Xdebug has been installed and activated, two coverage reports will be generated:

    -
      -
    • a summary in the console
      • -
    • a detailed HTML report with metrics for tested code
      • -
    • to open it in a web browser: firefox coverage/index.html &
      • -
    -

    Executing specific tests

    -

    Add a @group annotation in a test class or method comment:

    -
    /**
- * Netscape bookmark import
- * @group WIP
- */
-class BookmarkImportTest extends PHPUnit_Framework_TestCase
-{
-   [...][](.html)
-}
    -

    To run all tests annotated with @group WIP:

    -
    $ vendor/bin/phpunit --group WIP tests/
    - - diff --git a/doc/Upgrade-and-migration.html b/doc/Upgrade-and-migration.html deleted file mode 100644 index 667215a..0000000 --- a/doc/Upgrade-and-migration.html +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - Shaarli – Upgrade and migration - - - - - - - -

    Upgrade and migration

    -

    Preparation

    -

    Note your current version

    -

    If anything goes wrong, it's important for us to know which version you're upgrading from.
    -The current version is present in the version.php file.

    -

    Backup your data

    -

    Shaarli stores all user data under the data directory:

    -
      -
    • data/config.php - main configuration file
      • -
    • data/datastore.php - bookmarked links
      • -
    • data/ipbans.php - banned IP addresses
      • -
    • data/updates.txt - contains all automatic update to the configuration and datastore files already run
      • -
    -

    See Shaarli configuration for more information about Shaarli resources.

    -

    It is recommended to backup this repository before starting updating/upgrading Shaarli:

    -
      -
    • users with SSH access: copy or archive the directory to a temporary location
      • -
    • users with FTP access: download a local copy of your Shaarli installation using your favourite client
      • -
    -

    Migrating data from a previous installation

    -

    As all user data is kept under data, this is the only directory you need to worry about when migrating to a new installation, which corresponds to the following steps:

    -
      -
    • backup the data directory
      • -
    • install or update Shaarli: -
      • -
    • check or restore the data directory
      • -
    - -

    All tagged revisions can be downloaded as tarballs or ZIP archives from the releases page.

    -

    We recommend that you use the latest release tarball with the -full suffix. It contains the dependencies, please read Download and installation for git complete instructions.

    -

    Once downloaded, extract the archive locally and update your remote installation (e.g. via FTP) -be sure you keep the content of the data directory!

    -

    After upgrading, access your fresh Shaarli installation from a web browser; the configuration and data store will then be automatically updated, and new settings added to data/config.json.php (see Shaarli configuration for more details).

    -

    Upgrading with Git

    -

    Updating a community Shaarli

    -

    If you have installed Shaarli from the community Git repository, simply pull new changes from your local clone:

    -
    $ cd /path/to/shaarli
-$ git pull
-
-From github.com:shaarli/Shaarli
- * branch            master     -> FETCH_HEAD
-Updating ebd67c6..521f0e6
-Fast-forward
- application/Url.php   | 1 +
- shaarli_version.php   | 2 +-
- tests/Url/UrlTest.php | 1 +
- 3 files changed, 3 insertions(+), 1 deletion(-)
    -

    Shaarli >= v0.8.x: install/update third-party PHP dependencies using Composer:

    -
    $ composer install --no-dev
-
-Loading composer repositories with package information
-Updating dependencies
-  - Installing shaarli/netscape-bookmark-parser (v1.0.1)
-    Downloading: 100%
    -

    Migrating and upgrading from Sebsauvage's repository

    -

    If you have installed Shaarli from Sebsauvage's original Git repository, you can use Git remotes to update your working copy.

    -

    The following guide assumes that:

    -
      -
    • you have a basic knowledge of Git branching and remote repositories
      • -
    • the default remote is named origin and points to Sebsauvage's repository
      • -
    • the current branch is master -
        -
      • if you have personal branches containing customizations, you will need to rebase them after the upgrade; beware though, a lot of changes have been made since the community fork has been created, so things are very likely to break
        • -
      • -
    • the working copy is clean: -
        -
      • no versioned file has been locally modified
        • -
      • no untracked files are present
        • -
      • -
    -

    Step 0: show repository information

    -
    $ cd /path/to/shaarli
-
-$ git remote -v
-origin  https://github.com/sebsauvage/Shaarli (fetch)
-origin  https://github.com/sebsauvage/Shaarli (push)
-
-$ git branch -vv
-* master 029f75f [origin/master] Update README.md[](.html)
-
-$ git status
-On branch master
-Your branch is up-to-date with 'origin/master'.
-nothing to commit, working directory clean
    -

    Step 1: update Git remotes

    -
    $ git remote rename origin sebsauvage
-$ git remote -v
-sebsauvage  https://github.com/sebsauvage/Shaarli (fetch)
-sebsauvage  https://github.com/sebsauvage/Shaarli (push)
-
-$ git remote add origin https://github.com/shaarli/Shaarli
-$ git fetch origin
-
-remote: Counting objects: 3015, done.
-remote: Compressing objects: 100% (19/19), done.
-remote: Total 3015 (delta 446), reused 457 (delta 446), pack-reused 2550
-Receiving objects: 100% (3015/3015), 2.59 MiB | 918.00 KiB/s, done.
-Resolving deltas: 100% (1899/1899), completed with 48 local objects.
-From https://github.com/shaarli/Shaarli
- * [new branch]      master     -> origin/master[](.html)
- * [new branch]      stable     -> origin/stable[](.html)
-[...][](.html)
- * [new tag]         v0.6.4     -> v0.6.4[](.html)
- * [new tag]         v0.7.0     -> v0.7.0[](.html)
    -

    Step 2: use the stable community branch

    -
    $ git checkout origin/stable -b stable
-Branch stable set up to track remote branch stable from origin.
-Switched to a new branch 'stable'
-
-$ git branch -vv
-  master 029f75f [sebsauvage/master] Update README.md[](.html)
-* stable 890afc3 [origin/stable] Merge pull request #509 from ArthurHoaro/v0.6.5[](.html)
    -

    Shaarli >= v0.8.x: install/update third-party PHP dependencies using Composer:

    -
    $ composer install --no-dev
-
-Loading composer repositories with package information
-Updating dependencies
-  - Installing shaarli/netscape-bookmark-parser (v1.0.1)
-    Downloading: 100%
    -

    Optionally, you can delete information related to the legacy version:

    -
    $ git branch -D master
-Deleted branch master (was 029f75f).
-
-$ git remote remove sebsauvage
-
-$ git remote -v
-origin  https://github.com/shaarli/Shaarli (fetch)
-origin  https://github.com/shaarli/Shaarli (push)
-
-$ git gc
-Counting objects: 3317, done.
-Delta compression using up to 8 threads.
-Compressing objects: 100% (1237/1237), done.
-Writing objects: 100% (3317/3317), done.
-Total 3317 (delta 2050), reused 3301 (delta 2034)to
    -

    Step 3: configuration

    -

    After migrating, access your fresh Shaarli installation from a web browser; the configuration will then be automatically updated, and new settings added to data/config.php (see Shaarli configuration for more details).

    -

    Troubleshooting

    -

    If the solutions provided here doesn't work, please open an issue specifying which version you're upgrading from and to.

    -

    You must specify an integer as a key

    -

    In v0.8.1 we changed how link keys are handled (from timestamps to incremental integers).
    -Take a look at data/updates.txt content.

    -

    updates.txt contains updateMethodDatastoreIds

    -

    Try to delete it and refresh your page while being logged in.

    -

    updates.txt doesn't exists or doesn't contain updateMethodDatastoreIds

    -
      -
    1. Create data/updates.txt if it doesn't exist.
      2. -
    2. Paste this string in the update file ;updateMethodRenameDashTags;
      3. -
    3. Login to Shaarli.
      4. -
    4. Delete the update file.
      5. -
    5. Refresh.
      6. -
    - - diff --git a/doc/Usage.html b/doc/Usage.html deleted file mode 100644 index b585588..0000000 --- a/doc/Usage.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - Shaarli – Usage - - - - - - -

    Usage

    -

    Main features

    -

    Shaarli is intended:

    -
      -
    • to share, comment and save interesting links and news
      • -
    • to bookmark useful/frequent personal links (as private links) and share them between computers
      • -
    • as a minimal blog/microblog/writing platform (no character limit)
      • -
    • as a read-it-later list (for example items tagged readlater)
      • -
    • to draft and save articles/ideas
      • -
    • to keep code snippets
      • -
    • to keep notes and documentation
      • -
    • as a shared clipboard between machines
      • -
    • as a todo list
      • -
    • to store playlists (e.g. with the music or video tags)
      • -
    • to keep extracts/comments from webpages that may disappear
      • -
    • to keep track of ongoing discussions (for example items tagged discussion)
      • -
    • to feed RSS aggregators (planets) with specific tags
      • -
    • to feed other social networks, blogs... using RSS feeds and external services (dlvr.it, ifttt.com ...)
      • -
    -

    Using Shaarli as a blog, notepad, pastebin...

    -
      -
    • Go to your Shaarli setup and log in
      • -
    • Click the Add Link button
      • -
    • To share text only, do not enter any URL in the corresponding input field and click Add Link
      • -
    • Pick a title and enter your article, or note, in the description field; add a few tags; optionally check Private then click Save
      • -
    • Voilà! Your article is now published (privately if you selected that option) and accessible using its permalink.
      • -
    - - diff --git a/doc/Versioning-and-Branches.html b/doc/Versioning-and-Branches.html deleted file mode 100644 index 4dfe4a9..0000000 --- a/doc/Versioning-and-Branches.html +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - Shaarli – Versioning and Branches - - - - - - - -

    Versioning and Branches

    -

    [WORK IN PROGRESS][](.html)

    -

    It's important to understand how Shaarli branches work, especially if you're maintaining a 3rd party tools for Shaarli (theme, plugin, etc.), to be sure stay compatible.

    -

    master branch

    -

    The master branch is the development branch. Any new change MUST go through this branch using Pull Requests.

    -

    Remarks:

    -
      -
    • This branch shouldn't be used for production as it isn't necessary stable.
      • -
    • 3rd party aren't required to be compatible with the latest changes.
      • -
    • Official plugins, themes and libraries (contained within Shaarli organization repos) must be compatible with the master branch.
      • -
    • The version in this branch is always dev.
      • -
    -

    v0.x branch

    -

    This v0.x branch, points to the latest v0.x.y release.

    -

    Explanation:

    -

    When a new version is released, it might contains a major bug which isn't detected right away. For example, a new PHP version is released, containing backward compatibility issue which doesn't work with Shaarli.

    -

    In this case, the issue is fixed in the master branch, and the fix is backported the to the v0.x branch. Then a new release is made from the v0.x branch.

    -

    This workflow allow us to fix any major bug detected, without having to release bleeding edge feature too soon.

    -

    latest branch

    -

    This branch point the latest release. It recommended to use it to get the latest tested changes.

    -

    stable branch

    -

    The stable branch doesn't contain any major bug, and is one major digit version behind the latest release.

    -

    For example, the current latest release is v0.8.3, the stable branch is an alias to the latest v0.7.x release. When the v0.9.0 version will be released, the stable will move to the latest v0.8.x release.

    -

    Remarks:

    -
      -
    • Shaarli release pace isn't fast, and the stable branch might be a few months behind the latest release.
      • -
    -

    Releases

    -

    Releases are always made from the latest v0.x branch.

    -

    Note that for every release, we manually generate a tarball which contains all Shaarli dependencies, making Shaarli's installation only one step.

    -

    Advices on 3rd party git repos workflow

    -

    Versioning

    -

    Any time a new Shaarli release is published, you should publish a new release of your repo if the changes affected you since the latest release (take a look at the changelog (Draft means not released yet) and the commit log (like tpl folder for themes)). You can either:

    -
      -
    • use the Shaarli version number, with your repo version. For example, if Shaarli v0.8.3 is released, publish a v0.8.3-1 release, where v0.8.3 states Shaarli compatibility and -1 is your own version digit for the current Shaarli version.
      • -
    • use your own versioning scheme, and state Shaarli compatibility in the release description.
      • -
    -

    Using this, any user will be able to pick the release matching his own Shaarli version.

    -

    Major bugfix backport releases

    -

    To be able to support backported fixes, it recommended to use our workflow:

    -
    # In master, fix the major bug
-git commit -m "Katastrophe"
-git push origin master
-# Get your commit hash
-git log --format="%H" -n 1
-# Create a new branch from your latest release, let's say v0.8.2-1 (the tag name)
-git checkout -b katastrophe v0.8.2-1
-# Backport the fix commit to your brand new branch
-git cherry-pick <fix commit hash>
-git push origin katastrophe
-# Then you just have to make a new release from the `katastrophe` branch tagged `v0.8.3-1`
    - - diff --git a/doc/_Footer.html b/doc/_Footer.html deleted file mode 100644 index 09473a3..0000000 --- a/doc/_Footer.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - Shaarli – _Footer - - - - - - -

    _Footer
    -Shaarli, the personal, minimalist, super-fast, database-free bookmarking service

    - - diff --git a/doc/_Sidebar.html b/doc/_Sidebar.html deleted file mode 100644 index d3f9456..0000000 --- a/doc/_Sidebar.html +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - Shaarli – _Sidebar - - - - - - -

    _Sidebar

    - - - diff --git a/doc/html/3rd-party-libraries/index.html b/doc/html/3rd-party-libraries/index.html new file mode 100644 index 0000000..c54c45f --- /dev/null +++ b/doc/html/3rd-party-libraries/index.html @@ -0,0 +1,369 @@ + + + + + + + + + + + 3rd party libraries - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    CSS

    +
      +
    • Yahoo UI CSS Reset
        +
      • resets default CSS properties for all HTML elements (overriding browsers' default values)
        • +
      • ensures custom CSS stylessheets will provide the same results on all browsers
        • +
      +
      • +
    +

    Javascript

    + +

    PHP

    + + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Backup,-restore,-import-and-export/index.html b/doc/html/Backup,-restore,-import-and-export/index.html new file mode 100644 index 0000000..ceb8017 --- /dev/null +++ b/doc/html/Backup,-restore,-import-and-export/index.html @@ -0,0 +1,411 @@ + + + + + + + + + + + Backup, restore, import and export - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    +
      +
    • Docs »
      • + + + +
    • How To »
      • + + + +
    • Backup, restore, import and export
      • +
    • + + Edit on GitHub + +
      • +
    +
    +
    +
    +
    + + +
    +

    Backup and restore the datastore file

    +

    Backup the file data/datastore.php (by FTP or SSH). Restore by putting the file back in place.

    +

    Example command:

    +
    rsync -avzP my.server.com:/var/www/shaarli/data/datastore.php datastore-$(date +%Y-%m-%d_%H%M).php
+
    + + +

    To export links as an HTML file, under Tools > Export, choose: +- Export all to export both public and private links +- Export public to export public links only +- Export private to export private links only

    +

    Restore by using the Import feature. +* This can be done using the shaarchiver tool.

    +

    Example command:

    +
    ./export-bookmarks.py --url=https://my.server.com/shaarli --username=myusername --password=mysupersecretpassword --download-dir=./ --type=all
+
    + + +

    Diigo

    +

    If you export your bookmark from Diigo, make sure you use the Delicious export, not the Netscape export. (Their Netscape export is broken, and they don't seem to be interested in fixing it.)

    +

    Mister Wong

    +

    See this issue for import tweaks.

    +

    SemanticScuttle

    +

    To correctly import the tags from a SemanticScuttle HTML export, edit the HTML file before importing and replace all occurences of tags= (lowercase) to TAGS= (uppercase).

    +

    Scuttle

    +

    Shaarli cannot import data directly from Scuttle. However, you can use this third party tool: https://github.com/q2apro/scuttle-to-shaarli to export the Scuttle database to the Netscape HTML format compatible with the Shaarli importer.

    + +
      +
    • Export your Shaarli links as described above.
      • +
    • For compatibility reasons, check Prepend note permalinks with this Shaarli instance's URL (useful to import bookmarks in a web browser)
      • +
    • In Firefox, open the bookmark manager (not the sidebar! Bookmarks menu > Show all bookmarks or Ctrl+Shift+B)
      • +
    • Select Import and Backup > Import bookmarks in HTML format
      • +
    +

    Your bookmarks will be imported in Firefox, ready to use, with tags and descriptions retained. "Self" (notes) shaares will still point to the Shaarli instance you exported them from, but the note text can be viewed directly in the bookmark properties inside your browser. Depending on the number of bookmarks, the import can take some time.

    +

    You may be interested in these Firefox addons to manage links imported from Shaarli

    + + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Bookmarklet/index.html b/doc/html/Bookmarklet/index.html new file mode 100644 index 0000000..e7a370b --- /dev/null +++ b/doc/html/Bookmarklet/index.html @@ -0,0 +1,375 @@ + + + + + + + + + + + Bookmarklet - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Add the sharing button (bookmarklet) to your browser

    +
      +
    • Open your Shaarli and Login
      • +
    • Click the Tools button in the top bar
      • +
    • Drag the ✚Shaare link button, and drop it to your browser's bookmarks bar.
      • +
    +

    This bookmarklet button is compatible with Firefox, Opera, Chrome and Safari. Under Opera, you can't drag'n drop the button: You have to right-click on it and add a bookmark to your personal toolbar.

    +

    + +
      +
    • When you are visiting a webpage you would like to share with Shaarli, click the bookmarklet you just added.
      • +
    • A window opens.
      • +
    • You can freely edit title, description, tags... to find it later using the text search or tag filtering.
      • +
    • You will be able to edit this link later using the edit button.
      • +
    • You can also check the “Private” box so that the link is saved but only visible to you.
      • +
    • Click Save.Voilà! Your link is now shared.
      • +
    +

    Troubleshooting: The bookmarklet doesn't work with a few website (e.g. Github.com)

    +

    Websites which enforce Content Security Policy (CSP), such as github.com, disallow usage of bookmarklets. Unfortunatly, there is nothing Shaarli can do about it.

    +

    See #196.

    +

    There is an open bug for both Firefox and Chromium:

    +
      +
    • https://bugzilla.mozilla.org/show_bug.cgi?id=866522
      • +
    • https://code.google.com/p/chromium/issues/detail?id=233903
      • +
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Browsing-and-searching/index.html b/doc/html/Browsing-and-searching/index.html new file mode 100644 index 0000000..459f07c --- /dev/null +++ b/doc/html/Browsing-and-searching/index.html @@ -0,0 +1,362 @@ + + + + + + + + + + + Browsing and searching - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Plain text search

    +

    Use the Search text field to search in any of the fields of all links (Title, URL, Description...)

    +

    Exclude text/tags: Use the - operator before a word or tag (example -uninteresting) to prevent entries containing (or tagged) uninteresting from showing up in the search results.

    +

    Exact text search: Use double-quotes (example "exact search") to search for the exact expression.

    +

    Both exclude patterns and exact searches can be combined with normal searches (example "exact search" term otherterm -notthis "very exact" stuff -notagain)

    + +

    Use the Filter by tags field to restrict displayed links to entries tagged with one or multiple tags (use space to separate tags).

    +

    Hidden tags: Tags starting with a dot . (example .secret) are private. They can only be seen and searched when logged in.

    +

    Alternatively you can use the Tag cloud to discover all tags and click on any of them to display related links.

    +

    To search for links that are not tagged, enter "" in the tag search field.

    +

    Filtering RSS feeds/Picture wall

    +

    RSS feeds can also be restricted to only return items matching a text/tag search: see RSS feeds.

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Coding-guidelines/index.html b/doc/html/Coding-guidelines/index.html new file mode 100644 index 0000000..be2bf7e --- /dev/null +++ b/doc/html/Coding-guidelines/index.html @@ -0,0 +1,348 @@ + + + + + + + + + + + Coding guidelines - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    WIP

    +

    This topic is currently being discussed here: +- Fix coding style (static analysis) (#95) +- Continuous Integration tools & features (#130)

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Community-&-Related-software/index.html b/doc/html/Community-&-Related-software/index.html new file mode 100644 index 0000000..1de704a --- /dev/null +++ b/doc/html/Community-&-Related-software/index.html @@ -0,0 +1,419 @@ + + + + + + + + + + + Community & Related software - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Unofficial but related work on Shaarli. If you maintain one of these, please get in touch with us to help us find a way to adapt your work to our fork.

    +

    TODO: contact repos owners to see if they'd like to standardize their work with the community fork.

    +

    Community

    + +

    Articles and social media discussions

    + +

    Third party plugins

    + +

    Themes

    +

    See Theming for the list of community-contributed themes, and an installation guide.

    +

    Server apps

    +
      +
    • shaarchiver - Archive your Shaarli bookmarks and their content
      • +
    • shaarli-river - An aggregator for shaarlis with many features
      • +
    • Shaarlo - An aggregator for shaarlis with many features (a very popular running instance among french shaarliers: shaarli.fr)
      • +
    • Shaarlimages - An image-oriented aggregator for Shaarlis
      • +
    • mknexen/shaarli-api - A REST API for Shaarli
      • +
    • Self dead link - Detect dead links on shaarli. This version use the database of shaarli. Another version, can be used for other shaarli instances (but is more resource consuming).
      • +
    • Bookmark Archiver - Save an archived copy of all websites starred using browser bookmarks/Shaarli/Delicious/Instapaper/Unmark.it/Pocket/Pinboard. Outputs browseable html.
      • +
    +

    Mobile Apps

    + +

    Integration with other platforms

    + +

    Alternatives to Shaarli

    +

    See the bookmarks & link sharing section on awesome-selfhosted.

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + +
    + + + + diff --git a/doc/html/Continuous-integration-tools/index.html b/doc/html/Continuous-integration-tools/index.html new file mode 100644 index 0000000..c889a96 --- /dev/null +++ b/doc/html/Continuous-integration-tools/index.html @@ -0,0 +1,367 @@ + + + + + + + + + + + Continuous integration tools - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    +
      +
    • Docs »
      • + + + +
    • Development »
      • + + + +
    • Continuous integration tools
      • +
    • + + Edit on GitHub + +
      • +
    +
    +
    +
    +
    + +

    Local development

    +

    A Makefile is available to perform project-related operations: +- Documentation - generate a local HTML copy of the GitHub wiki +- Static analysis - check that the code is compliant to PHP conventions +- Unit tests - ensure there are no regressions introduced by new commits

    +

    Automatic builds

    +

    Travis CI is a Continuous Integration build server, that runs a build: +- each time a commit is merged to the mainline (master branch) +- each time a Pull Request is submitted or updated

    +

    A build is composed of several jobs: one for each supported PHP version (see Server requirements).

    +

    Each build job: +- updates Composer +- installs 3rd-party test dependencies with Composer +- runs Unit tests

    +

    After all jobs have finished, Travis returns the results to GitHub: +- a status icon represents the result for the master branch: +- Pull Requests are updated with the Travis result + - Green: all tests have passed + - Red: some tests failed + - Orange: tests are pending

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Copy-an-existing-installation-over-SSH-and-serve-it-locally/index.html b/doc/html/Copy-an-existing-installation-over-SSH-and-serve-it-locally/index.html new file mode 100644 index 0000000..4aea480 --- /dev/null +++ b/doc/html/Copy-an-existing-installation-over-SSH-and-serve-it-locally/index.html @@ -0,0 +1,403 @@ + + + + + + + + + + + Copy an existing installation over SSH and serve it locally - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    +
      +
    • Docs »
      • + + + +
    • How To »
      • + + + +
    • Copy an existing installation over SSH and serve it locally
      • +
    • + + Edit on GitHub + +
      • +
    +
    +
    +
    +
    + +

    Example bash script:

    +
    #!/bin/bash
+#Description: Copy a Shaarli installation over SSH/SCP, serve it locally with php-cli
+#Will create a local-shaarli/ directory when you run it, backup your Shaarli there, and serve it locally.
+#Will NOT download linked pages. It's just a directly usable backup/copy/mirror of your Shaarli
+#Requires: ssh, scp and a working SSH access to the server where your Shaarli is installed
+#Usage: ./local-shaarli.sh
+#Author: nodiscc (nodiscc@gmail.com)
+#License: MIT (http://opensource.org/licenses/MIT)
+set -o errexit
+set -o nounset
+
+##### CONFIG #################
+#The port used by php's local server
+php_local_port=7431
+
+#Name of the SSH server and path where Shaarli is installed
+#TODO: pass these as command-line arguments
+remotehost="my.ssh.server"
+remote_shaarli_dir="/var/www/shaarli"
+
+
+###### FUNCTIONS #############
+_main() {
+    _CBSyncShaarli
+    _CBServeShaarli
+}
+
+_CBSyncShaarli() {
+    remote_temp_dir=$(ssh $remotehost mktemp -d)
+    remote_ssh_user=$(ssh $remotehost whoami)
+    ssh -t "$remotehost" sudo cp -r "$remote_shaarli_dir" "$remote_temp_dir"
+    ssh -t "$remotehost" sudo chown -R "$remote_ssh_user":"$remote_ssh_user" "$remote_temp_dir"
+    scp -rq "$remotehost":"$remote_temp_dir" local-shaarli
+    ssh "$remotehost" rm -r "$remote_temp_dir"
+}
+
+_CBServeShaarli() {
+    #TODO: allow serving a previously downloaded Shaarli
+    #TODO: ask before overwriting local copy, if it exists
+    cd local-shaarli/
+    php -S localhost:${php_local_port}
+    echo "Please go to http://localhost:${php_local_port}"
+}
+
+
+##### MAIN #################
+
+_main
+
    + +

    This outputs:

    +
    $ ./local-shaarli.sh
+PHP 5.6.0RC4 Development Server started at Mon Sep  1 21:56:19 2014
+Listening on http://localhost:7431
+Document root is /home/user/local-shaarli/shaarli
+Press Ctrl-C to quit.
+
+[Mon Sep  1 21:56:27 2014] ::1:57868 [200]: /
+[Mon Sep  1 21:56:27 2014] ::1:57869 [200]: /index.html
+[Mon Sep  1 21:56:37 2014] ::1:57881 [200]: /...
+
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Create-and-serve-multiple-Shaarlis-(farm)/index.html b/doc/html/Create-and-serve-multiple-Shaarlis-(farm)/index.html new file mode 100644 index 0000000..98d8992 --- /dev/null +++ b/doc/html/Create-and-serve-multiple-Shaarlis-(farm)/index.html @@ -0,0 +1,396 @@ + + + + + + + + + + + Create and serve multiple Shaarlis (farm) - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    +
      +
    • Docs »
      • + + + +
    • How To »
      • + + + +
    • Create and serve multiple Shaarlis (farm)
      • +
    • + + Edit on GitHub + +
      • +
    +
    +
    +
    +
    + +

    Example bash script (creates multiple shaarli instances and generates an HTML index of them)

    +
    #!/bin/bash
+set -o errexit
+set -o nounset
+
+#config
+shaarli_base_dir='/var/www/shaarli'
+accounts='bob john whatever username'
+shaarli_repo_url='https://github.com/shaarli/Shaarli'
+ref="master"
+
+#clone multiple shaarli instances
+if [ ! -d "$shaarli_base_dir" ]; then mkdir "$shaarli_base_dir"; fi
+
+for account in $accounts; do
+    if [ -d "$shaarli_base_dir/$account" ];
+    then echo "[info] account $account already exists, skipping";
+    else echo "[info] creating new account $account ..."; git clone --quiet "$shaarli_repo_url" -b "$ref" "$shaarli_base_dir/$account"; fi
+done
+
+#generate html index of shaarlis
+htmlhead='<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!-- Minimal html template thanks to http://www.sitepoint.com/a-minimal-html-document/ -->
+<html lang="en">
+    <head>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8">
+        <title>My Shaarli farm</title>
+        <style>body {font-family: "Open Sans"}</style>
+    </head>
+    <body>
+    <div>
+    <h1>My Shaarli farm</h1>
+    <ul style="list-style-type: none;">'
+
+accountlinks=''
+
+htmlfooter='
+    </ul>
+    </div>
+    </body>
+</html>'    
+
+
+
+for account in $accounts; do accountlinks="$accountlinks\n<li><a href=\"$account\">$account</a></li>"; done
+if [ -d "$shaarli_base_dir/index.html" ]; then echo "[removing old index.html]"; rm "$shaarli_base_dir/index.html" ]; fi
+echo "[info] generating new index of shaarlis"
+echo -e "$htmlhead $accountlinks $htmlfooter" > "$shaarli_base_dir/index.html"
+echo '[info] done.'
+echo "[info] list of accounts: $accounts"
+echo "[info] contents of $shaarli_base_dir:"
+tree -a -L 1 "$shaarli_base_dir"
+
    + +

    This script just serves as an example. More precise or complex (applying custom configuration, etc) automation is possible using configuration management software like Ansible

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Datastore-hacks/index.html b/doc/html/Datastore-hacks/index.html new file mode 100644 index 0000000..b3d8d97 --- /dev/null +++ b/doc/html/Datastore-hacks/index.html @@ -0,0 +1,369 @@ + + + + + + + + + + + Datastore hacks - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Decode datastore content

    +

    To display the array representing the data saved in data/datastore.php, use the following snippet:

    +
    $data = "tZNdb9MwFIb... <Commented content inside datastore.php>";
+$out = unserialize(gzinflate(base64_decode($data)));
+echo "<pre>"; // Pretty printing is love, pretty printing is life
+print_r($out);
+echo "</pre>";
+exit;
+
    + +

    This will output the internal representation of the datastore, "unobfuscated" (if this can really be considered obfuscation).

    +

    Alternatively, you can transform to JSON format (and pretty-print if you have jq installed):

    +
    php -r 'print(json_encode(unserialize(gzinflate(base64_decode(preg_replace("!.*/\* (.+) \*/.*!", "$1", file_get_contents("data/datastore.php")))))));' | jq .
+
    + + +
      +
    • Look for <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> in tpl/editlink.tpl (line 14)
      • +
    • Replace type="hidden" with type="text" from this line
      • +
    • A new date/time field becomes available in the edit/new link dialog.
      • +
    • You can set the timestamp manually by entering it in the format YYYMMDD_HHMMS.
      • +
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Development-guidelines/index.html b/doc/html/Development-guidelines/index.html new file mode 100644 index 0000000..747d53a --- /dev/null +++ b/doc/html/Development-guidelines/index.html @@ -0,0 +1,352 @@ + + + + + + + + + + + Development guidelines - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Development guidelines

    +

    Please have a look at the following pages: +- Contributing to Shaarli +- Static analysis - patches should try to stick to the PHP Standard Recommendations (PSR), especially: + - PSR-1 - Basic Coding Standard + - PSR-2 - Coding Style Guide +- Unit tests +- GnuPG signature for tags/releases

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Directory-structure/index.html b/doc/html/Directory-structure/index.html new file mode 100644 index 0000000..8297977 --- /dev/null +++ b/doc/html/Directory-structure/index.html @@ -0,0 +1,371 @@ + + + + + + + + + + + Directory structure - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Here is the directory structure of Shaarli and the purpose of the different files:

    +
        index.php        # Main program
+    application/     # Shaarli classes
+        ├── LinkDB.php
+        └── Utils.php
+    tests/       # Shaarli unitary & functional tests
+        ├── LinkDBTest.php
+        ├── utils  # utilities to ease testing
+        │   └── ReferenceLinkDB.php
+        └── UtilsTest.php
+    COPYING          # Shaarli license
+    inc/             # static assets and 3rd party libraries
+        ├── awesomplete.*          # tags autocompletion library
+        ├── blazy.*                # picture wall lazy image loading library
+        ├── shaarli.css, reset.css # Shaarli stylesheet.
+        ├── qr.*                   # qr code generation library
+        └──rain.tpl.class.php      # RainTPL templating library
+    tpl/             # RainTPL templates for Shaarli. They are used to build the pages.
+    images/          # Images and icons used in Shaarli
+    data/            # data storage: bookmark database, configuration, logs, banlist…
+        ├── config.php             # Shaarli configuration (login, password, timezone, title…)
+        ├── datastore.php          # Your link database (compressed).
+        ├── ipban.php              # IP address ban system data
+        ├── lastupdatecheck.txt    # Update check timestamp file
+        └──log.txt                 # login/IPban log.
+    cache/           # thumbnails cache
+                     # This directory is automatically created. You can erase it anytime you want.
+    tmp/             # Temporary directory for compiled RainTPL templates.
+                     # This directory is automatically created. You can erase it anytime you want.
+
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Docker-101/index.html b/doc/html/Docker-101/index.html new file mode 100644 index 0000000..5b4f645 --- /dev/null +++ b/doc/html/Docker-101/index.html @@ -0,0 +1,410 @@ + + + + + + + + + + + Docker 101 - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Basics

    +

    Install Docker, by following the instructions relevant +to your OS / distribution, and start the service.

    +

    Search an image on DockerHub

    +
    $ docker search debian
+
+NAME            DESCRIPTION                                     STARS   OFFICIAL   AUTOMATED
+ubuntu          Ubuntu is a Debian-based Linux operating s...   2065    [OK]
+debian          Debian is a Linux distribution that's comp...   603     [OK]
+google/debian                                                   47                 [OK]
+
    + +

    Show available tags for a repository

    +
    $ curl https://index.docker.io/v1/repositories/debian/tags | python -m json.tool
+
+% Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
+Dload  Upload   Total   Spent    Left  Speed
+100  1283    0  1283    0     0    433      0 --:--:--  0:00:02 --:--:--   433
+
    + +

    Sample output:

    +
    [
+    {
+        "layer": "85a02782",
+        "name": "stretch"
+    },
+    {
+        "layer": "59abecbc",
+        "name": "testing"
+    },
+    {
+        "layer": "bf0fd686",
+        "name": "unstable"
+    },
+    {
+        "layer": "60c52dbe",
+        "name": "wheezy"
+    },
+    {
+        "layer": "c5b806fe",
+        "name": "wheezy-backports"
+    }
+]
+
+
    + +

    Pull an image from DockerHub

    +
    $ docker pull repository[:tag]
+
+$ docker pull debian:wheezy
+wheezy: Pulling from debian
+4c8cbfd2973e: Pull complete
+60c52dbe9d91: Pull complete
+Digest: sha256:c584131da2ac1948aa3e66468a4424b6aea2f33acba7cec0b631bdb56254c4fe
+Status: Downloaded newer image for debian:wheezy
+
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Docker-resources/index.html b/doc/html/Docker-resources/index.html new file mode 100644 index 0000000..7bd7067 --- /dev/null +++ b/doc/html/Docker-resources/index.html @@ -0,0 +1,370 @@ + + + + + + + + + + + Docker resources - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    + + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Download-CSS-styles-from-an-OPML-list/index.html b/doc/html/Download-CSS-styles-from-an-OPML-list/index.html new file mode 100644 index 0000000..e697b39 --- /dev/null +++ b/doc/html/Download-CSS-styles-from-an-OPML-list/index.html @@ -0,0 +1,496 @@ + + + + + + + + + + + Download CSS styles from an OPML list - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    +
      +
    • Docs »
      • + + + +
    • How To »
      • + + + +
    • Download CSS styles from an OPML list
      • +
    • + + Edit on GitHub + +
      • +
    +
    +
    +
    +
    + +

    Download CSS styles for shaarlis listed in an opml file

    +

    Example php script:

    +
    <!---- ?php -->
+<!---- Copyright (c) 2014 Nicolas Delsaux (https://github.com/Riduidel) -->
+<!---- License: zlib (http://www.gzip.org/zlib/zlib_license.html) -->
+
+/**
+ * Source: https://github.com/Riduidel
+ * Download css styles for shaarlis listed in an opml file
+ */
+define("SHAARLI_RSS_OPML", "https://www.ecirtam.net/shaarlirss/custom/people.opml");
+
+define("THEMES_TEMP_FOLDER", "new_themes");
+
+if(!file_exists(THEMES_TEMP_FOLDER)) {
+    mkdir(THEMES_TEMP_FOLDER);
+}
+
+function siteUrl($pathInSite) {
+    $indexPos = strpos($pathInSite, "index.php");
+    if(!$indexPos) {
+        return $pathInSite;
+    } else {
+        return substr($pathInSite, 0, $indexPos);
+    }
+}
+
+function createShaarliHashFromOPMLL($opmlFile) {
+    $result = array();
+    $opml = file_get_contents($opmlFile);
+    $opmlXml = simplexml_load_string($opml);
+    $outlineElements = $opmlXml->xpath("body/outline");
+    foreach($outlineElements as $site) {
+        $siteUrl = siteUrl((string) $site['htmlUrl']);
+        $result[$siteUrl]=((string) $site['text']);
+    }
+    return $result;
+}
+
+function getSiteFolder($url) {
+    $domain = parse_url($url,  PHP_URL_HOST);
+    return THEMES_TEMP_FOLDER."/".str_replace(".", "_", $domain);
+}
+
+function get_http_response_code($theURL) {
+     $headers = get_headers($theURL);
+     return substr($headers[0], 9, 3);
+}
+
+/**
+ * This makes the code PHP-5 only (particularly the call to "get_headers")
+ */
+function copyUserStyleFrom($url, $name, $knownStyles) {
+    $userStyle = $url."inc/user.css";
+    if(in_array($url, $knownStyles)) {
+        // TODO add log message
+    } else {
+        $statusCode = get_http_response_code($userStyle);
+        if(intval($statusCode)<300) {
+            $styleSheet = file_get_contents($userStyle);
+            $siteFolder = getSiteFolder($url);
+            if(!file_exists($siteFolder)) {
+                mkdir($siteFolder);
+            }
+            if(!file_exists($siteFolder.'/user.css')) {
+                // Copy stylesheet
+                file_put_contents($siteFolder.'/user.css', $styleSheet);
+            }
+            if(!file_exists($siteFolder.'/README.md')) {
+                // Then write a readme.md file
+                file_put_contents($siteFolder.'/README.md', 
+                    "User style from ".$name."\n"
+                    ."============================="
+                    ."\n\n"
+                    ."This stylesheet was downloaded from ".$userStyle." on ".date(DATE_RFC822)
+                    );
+            }
+            if(!file_exists($siteFolder.'/config.ini')) {
+                // Write a config file containing useful informations
+                file_put_contents($siteFolder.'/config.ini', 
+                    "site_url=".$url."\n"
+                    ."site_name=".$name."\n"
+                    );
+            }
+            if(!file_exists($siteFolder.'/home.png')) {
+                // And finally copy generated thumbnail
+                $homeThumb = $siteFolder.'/home.png';
+                file_put_contents($siteFolder.'/home.png', file_get_contents(getThumbnailUrl($url)));
+            }
+            echo 'Theme have been downloaded from  <a href="'.$url.'">'.$url.'</a> into '.$siteFolder
+                .'. It looks like <img src="'.$homeThumb.'"><br/>';
+        }
+    }
+}
+
+function getThumbnailUrl($url) {
+    return 'http://api.webthumbnail.org/?url='.$url;
+}
+
+function copyUserStylesFrom($urlToNames, $knownStyles) {
+    foreach($urlToNames as $url => $name) {
+        copyUserStyleFrom($url, $name, $knownStyles);
+    }
+}
+
+/**
+ * Reading directory list, courtesy of http://www.laughing-buddha.net/php/dirlist/
+ * @param directory the directory we want to list files of
+ * @return a simple array containing the list of absolute file paths. Notice that current file (".") and parent one("..")
+ * are not listed here
+ */
+function getDirectoryList ($directory)  {
+    $realPath = realpath($directory);
+    // create an array to hold directory list
+    $results = array();
+    // create a handler for the directory
+    $handler = opendir($directory);
+    // open directory and walk through the filenames
+    while ($file = readdir($handler)) {
+        // if file isn't this directory or its parent, add it to the results
+        if ($file != "." && $file != "..") {
+            $results[] = realpath($realPath . "/" . $file);
+        }
+    }
+    // tidy up: close the handler
+    closedir($handler);
+    // done!
+    return $results;
+}
+
+/**
+ * Start in themes folder and look in all subfolders for config.ini files. 
+ * These config.ini files allow us not to download styles again and again
+ */
+function findKnownStyles() {
+    $result = array();
+    $subFolders = getDirectoryList("themes");
+    foreach($subFolders as $folder) {
+        $configFile = $folder."/config.ini";
+        if(file_exists($configFile)) {
+            $iniParameters = parse_ini_file($configFile);
+            array_push($result, $iniParameters['site_url']);
+        }
+    }
+    return $result;
+}
+
+$knownStyles = findKnownStyles();
+copyUserStylesFrom(createShaarliHashFromOPMLL(SHAARLI_RSS_OPML), $knownStyles);
+
+<!--- ? ---->
+
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Download-and-Installation/index.html b/doc/html/Download-and-Installation/index.html new file mode 100644 index 0000000..1ede1d6 --- /dev/null +++ b/doc/html/Download-and-Installation/index.html @@ -0,0 +1,444 @@ + + + + + + + + + + + Download and Installation - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    To install Shaarli, simply place the files in a directory under your webserver's Document Root (or directly at the document root). Make sure your server is properly configured.

    +

    Several releases are available:

    +
    + +

    Download as an archive

    +

    Get the latest released version from the releases page.

    +

    Download our shaarli-full archive to include dependencies.

    +

    The current latest released version is v0.8.4

    +

    Or in command lines:

    +
    $ wget https://github.com/shaarli/Shaarli/releases/download/v0.8.4/shaarli-v0.8.4-full.zip
+$ unzip shaarli-v0.8.4-full.zip
+$ mv Shaarli /path/to/shaarli/
+
    + + + + + + + + + +
    !In most cases, download Shaarli from the releases page. Cloning using git or downloading Github branches as zip files requires additional steps (see below).
    +

    Using git

    +
    mkdir -p /path/to/shaarli && cd /path/to/shaarli/
+git clone -b v0.8 https://github.com/shaarli/Shaarli.git .
+composer install --no-dev
+
    + +
    +

    Stable version

    +

    The stable version has been experienced by Shaarli users, and will receive security updates.

    +

    Download as an archive

    +

    As a .zip archive:

    +
    $ wget https://github.com/shaarli/Shaarli/archive/stable.zip
+$ unzip stable.zip
+$ mv Shaarli-stable /path/to/shaarli/
+
    + +

    As a .tar.gz archive :

    +
    $ wget https://github.com/shaarli/Shaarli/archive/stable.tar.gz
+$ tar xvf stable.tar.gz
+$ mv Shaarli-stable /path/to/shaarli/
+
    + +

    Clone with Git

    +

    Composer is required to build a functional Shaarli installation when pulling from git.

    +
    $ git clone https://github.com/shaarli/Shaarli.git -b stable /path/to/shaarli/
+# install/update third-party dependencies
+$ cd /path/to/shaarli/
+$ composer install --no-dev
+
    + +
    +

    Development version (mainline)

    +

    Use at your own risk!

    +

    To get the latest changes from the master branch:

    +
    # clone the repository  
+$ git clone https://github.com/shaarli/Shaarli.git -b master /path/to/shaarli/
+# install/update third-party dependencies
+$ cd /path/to/shaarli
+$ composer install --no-dev
+
    + +
    +

    Finish Installation

    +

    Once Shaarli is downloaded and files have been placed at the correct location, open it this location your favorite browser.

    +

    install screenshot

    +

    Setup your Shaarli installation, and it's ready to use!

    +
    +

    Updating Shaarli

    +

    See Upgrade and Migration

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/FAQ/index.html b/doc/html/FAQ/index.html new file mode 100644 index 0000000..c48e11f --- /dev/null +++ b/doc/html/FAQ/index.html @@ -0,0 +1,388 @@ + + + + + + + + + + + FAQ - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Why did you create Shaarli ?

    +

    I was a StumbleUpon user. Then I got fed up with they big toolbar. I switched to delicious, which was lighter, faster and more beautiful. Until Yahoo bought it. Then the export API broke all the time, delicious became slow and was ditched by Yahoo. I switched to Diigo, which is not bad, but does too much. And Diigo is sslllooooowww and their Firefox extension a bit buggy. And… oh… their Firefox addon sends to Diigo every single URL you visit (Don't believe me ? Use Tamper Data and open any page).

    +

    Enough is enough. Saving simple links should not be a complicated heavy thing. I ditched them all and wrote my own: Shaarli. It's simple, but it does the job and does it well. And my data is not hosted on a foreign server, but on my server.

    +

    Why use Shaarli and not Delicious/Diigo ?

    +

    With Shaarli:

    +
      +
    • The data is yours: It's hosted on your server.
      • +
    • Never fear of having your data locked-in.
      • +
    • Never fear to have your data sold to third party.
      • +
    • Your private links are not hosted on a third party server.
      • +
    • You are not tracked by browser addons (like Diigo does)
      • +
    • You can change the look and feel of the pages if you want.
      • +
    • You can change the behaviour of the program.
      • +
    • It's magnitude faster than most bookmarking services.
      • +
    +

    What does Shaarli mean?

    +

    Shaarli is for shaaring your links.

    +

    My Shaarli is broken!

    +

    First of all, ensure that both the web server and Shaarli are correctly configured, and that your installation is supported.

    +

    If everything looks right but the issue(s) remain(s), please: +- take a look at the troubleshooting section +- come chat with us on Gitter, we'll be happy to help ;-) +- browse active issues and Pull Requests + - if you find one that is related to the issue, feel free to comment and provide additional details (host/Shaarli setup) + - else, open a new issue, and provide information about the problem: + - what happens? - display glitches, invalid data, security flaws... + - what is your configuration? - OS, server version, activated extensions, web browser... + - is it reproducible?

    +

    Why not use a real database? Files are slow!

    +

    Does browsing this page feel slow? Try browsing older pages, too.

    +

    It's not slow at all, is it? And don't forget the database contains more than 16000 links, and it's on a shared host, with 32000 visitors/day for my website alone. And it's still damn fast. Why?

    +

    The data file is only 3.7 Mb. It's read 99% of the time, and is probably already in the operation system disk cache. So generating a page involves no I/O at all most of the time.

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Features/index.html b/doc/html/Features/index.html new file mode 100644 index 0000000..453f189 --- /dev/null +++ b/doc/html/Features/index.html @@ -0,0 +1,371 @@ + + + + + + + + + + + Features - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Main features

    +

    Shaarli is intended: + * to share, comment and save interesting links and news + * to bookmark useful/frequent personal links (as private links) and share them between computers + * as a minimal blog/microblog/writing platform (no character limit) + * as a read-it-later list (for example items tagged readlater) + * to draft and save articles/ideas + * to keep code snippets + * to keep notes and documentation + * as a shared clipboard between machines + * as a todo list + * to store playlists (e.g. with the music or video tags) + * to keep extracts/comments from webpages that may disappear + * to keep track of ongoing discussions (for example items tagged discussion) + * to feed RSS aggregators (planets) with specific tags + * to feed other social networks, blogs... using RSS feeds and external services (dlvr.it, ifttt.com ...)

    +

    Using Shaarli as a blog, notepad, pastebin...

    +
      +
    • Go to your Shaarli setup and log in
      • +
    • Click the Add Link button
      • +
    • To share text only, do not enter any URL in the corresponding input field and click Add Link
      • +
    • Pick a title and enter your article, or note, in the description field; add a few tags; optionally check Private then click Save
      • +
    • Voilà! Your article is now published (privately if you selected that option) and accessible using its permalink.
      • +
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Firefox-share/index.html b/doc/html/Firefox-share/index.html new file mode 100644 index 0000000..c0aaf4b --- /dev/null +++ b/doc/html/Firefox-share/index.html @@ -0,0 +1,368 @@ + + + + + + + + + + + Firefox share - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Add Shaarli as a sharing service to Firefox

    +
      +
    • Open your Shaarli and Login
      • +
    • Click the Tools button in the top bar
      • +
    • Click the ✚Add to Firefox social button and accept the activation.
      • +
    + +
      +
    • Add the sharing service as described above
      • +
    • When you are visiting a webpage you would like to share with Shaarli, click the Firefox Share button images/firefoxshare.png
      • +
    • You can edit your link before and after saving, just like the bookmarklet above.
      • +
    + + + + + + + + +
    Your Shaarli instance must be hosted on an HTTPS (SSL/TLS secure connection) enabled server for Firefox Share to work. Firefox Share will not work over plain HTTP connections.
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/GnuPG-signature/index.html b/doc/html/GnuPG-signature/index.html new file mode 100644 index 0000000..781ccd2 --- /dev/null +++ b/doc/html/GnuPG-signature/index.html @@ -0,0 +1,439 @@ + + + + + + + + + + + GnuPG signature - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Introduction

    +

    PGP and GPG

    +

    Gnu Privacy Guard (GnuPG) is an Open Source implementation of the Pretty Good +Privacy (OpenPGP) specification. Its main purposes are digital authentication, +signature and encryption.

    +

    It is often used by the FLOSS community to verify: +- Linux package signatures: Debian SecureApt, ArchLinux Master +Keys +- SCM releases & maintainer identity

    +

    Trust

    +

    To quote Phil Pennock (the author of the SKS key server - http://sks.spodhuis.org/):

    +
    +

    You MUST understand that presence of data in the keyserver (pools) in no way connotes trust. Anyone can generate a key, with any name or email address, and upload it. All security and trust comes from evaluating security at the “object level”, via PGP Web-Of-Trust signatures. This keyserver makes it possible to retrieve keys, looking them up via various indices, but the collection of keys in this public pool is KNOWN to contain malicious and fraudulent keys. It is the common expectation of server operators that users understand this and use software which, like all known common OpenPGP implementations, evaluates trust accordingly. This expectation is so common that it is not normally explicitly stated.

    +
    +

    Trust can be gained by having your key signed by other people (and signing their key back, too :) ), for instance during key signing parties, see: +- The Keysigning party HOWTO +- Web of trust

    +

    Generate a GPG key

    + +

    gpg - provide identity information

    +
    $ gpg --gen-key
+
+gpg (GnuPG) 2.1.6; Copyright (C) 2015 Free Software Foundation, Inc.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
+Note: Use "gpg2 --full-gen-key" for a full featured key generation dialog.
+
+GnuPG needs to construct a user ID to identify your key.
+
+Real name: Marvin the Paranoid Android
+Email address: marvin@h2g2.net
+You selected this USER-ID:
+    "Marvin the Paranoid Android <marvin@h2g2.net>"
+
+Change (N)ame, (E)mail, or (O)kay/(Q)uit? o
+We need to generate a lot of random bytes. It is a good idea to perform
+some other action (type on the keyboard, move the mouse, utilize the
+disks) during the prime generation; this gives the random number
+generator a better chance to gain enough entropy.
+
    + +

    gpg - entropy interlude

    +

    At this point, you will: +- be prompted for a secure password to protect your key (the input method will depend on your Desktop Environment and configuration) +- be asked to use your machine's input devices (mouse, keyboard, etc.) to generate random entropy; this step may take some time

    +

    gpg - key creation confirmation

    +
    gpg: key A9D53A3E marked as ultimately trusted
+public and secret key created and signed.
+
+gpg: checking the trustdb
+gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model
+gpg: depth: 0  valid:   2  signed:   0  trust: 0-, 0q, 0n, 0m, 0f, 2u
+pub   rsa2048/A9D53A3E 2015-07-31
+      Key fingerprint = AF2A 5381 E54B 2FD2 14C4  A9A3 0E35 ACA4 A9D5 3A3E
+uid       [ultimate] Marvin the Paranoid Android <marvin@h2g2.net>
+sub   rsa2048/8C0EACF1 2015-07-31
+
    + +

    gpg - submit your public key to a PGP server (Optional)

    +
    $ gpg --keyserver pgp.mit.edu --send-keys A9D53A3E
+gpg: sending key A9D53A3E to hkp server pgp.mit.edu
+
    + +

    Create and push a GPG-signed tag

    +

    See Release Shaarli.

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Plugin-System/index.html b/doc/html/Plugin-System/index.html new file mode 100644 index 0000000..5ee0f6c --- /dev/null +++ b/doc/html/Plugin-System/index.html @@ -0,0 +1,968 @@ + + + + + + + + + + + Plugin System - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    I am a developer. Developer API.

    +

    I am a template designer. Guide for template designer.

    +

    Developer API

    +

    What can I do with plugins?

    +

    The plugin system let you:

    +
      +
    • insert content into specific places across templates.
      • +
    • alter data before templates rendering.
      • +
    • alter data before saving new links.
      • +
    +

    How can I create a plugin for Shaarli?

    +

    First, chose a plugin name, such as demo_plugin.

    +

    Under plugin folder, create a folder named with your plugin name. Then create a .php file in that folder.

    +

    You should have the following tree view:

    +
    | index.php
+| plugins/
+|---| demo_plugin/
+|   |---| demo_plugin.php
+
    + +

    Plugin initialization

    +

    At the beginning of Shaarli execution, all enabled plugins are loaded. At this point, the plugin system looks for an init() function to execute and run it if it exists. This function must be named this way, and takes the ConfigManager as parameter.

    +
    <plugin_name>_init($conf)
+
    +

    This function can be used to create initial data, load default settings, etc. But also to set plugin errors. If the initialization function returns an array of strings, they will be understand as errors, and displayed in the header to logged in users.

    +

    Understanding hooks

    +

    A plugin is a set of functions. Each function will be triggered by the plugin system at certain point in Shaarli execution.

    +

    These functions need to be named with this pattern:

    +
    hook_<plugin_name>_<hook_name>($data, $conf)
+
    + +

    Parameters:

    + +

    For exemple, if my plugin want to add data to the header, this function is needed:

    +
    hook_demo_plugin_render_header
+
    +

    If this function is declared, and the plugin enabled, it will be called every time Shaarli is rendering the header.

    +

    Plugin's data

    +

    Parameters

    +

    Every hook function has a $data parameter. Its content differs for each hooks.

    +

    This parameter needs to be returned every time, otherwise data is lost.

    +
    return $data;
+
    +

    Filling templates placeholder

    +

    Template placeholders are displayed in template in specific places.

    +

    RainTPL displays every element contained in the placeholder's array. These element can be added by plugins.

    +

    For example, let's add a value in the placeholder top_placeholder which is displayed at the top of my page:

    +
    $data['top_placeholder'][] = 'My content';
+# OR
+array_push($data['top_placeholder'], 'My', 'content');
+
+return $data;
+
    + +

    Data manipulation

    +

    When a page is displayed, every variable send to the template engine is passed to plugins before that in $data.

    +

    The data contained by this array can be altered before template rendering.

    +

    For exemple, in linklist, it is possible to alter every title:

    +
    // mind the reference if you want $data to be altered
+foreach ($data['links'] as &$value) {
+    // String reverse every title.
+    $value['title'] = strrev($value['title']);
+}
+
+return $data;
+
    + +

    Metadata

    +

    Every plugin needs a <plugin_name>.meta file, which is in fact an .ini file (KEY="VALUE"), to be listed in plugin administration.

    +

    Each file contain two keys:

    +
      +
    • description: plugin description
      • +
    • parameters: user parameter names, separated by a ;.
      • +
    • parameter.<PARAMETER_NAME>: add a text description the specified parameter.
      • +
    +
    +

    Note: In PHP, parse_ini_file() seems to want strings to be between by quotes " in the ini file.

    +
    +

    It's not working!

    +

    Use demo_plugin as a functional example. It covers most of the plugin system features.

    +

    If it's still not working, please open an issue.

    +

    Hooks

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    HooksDescription
    render_headerAllow plugin to add content in page headers.
    render_includesAllow plugin to include their own CSS files.
    render_footerAllow plugin to add content in page footer and include their own JS files.
    render_linklistIt allows to add content at the begining and end of the page, after every link displayed and to alter link data.
    render_editlinkAllow to add fields in the form, or display elements.
    render_toolsAllow to add content at the end of the page.
    render_picwallAllow to add content at the top and bottom of the page.
    render_tagcloudAllow to add content at the top and bottom of the page, and after all tags.
    render_taglistAllow to add content at the top and bottom of the page, and after all tags.
    render_dailyAllow to add content at the top and bottom of the page, the bottom of each link and to alter data.
    render_feedAllow to do add tags in RSS and ATOM feeds.
    save_linkAllow to alter the link being saved in the datastore.
    delete_linkAllow to do an action before a link is deleted from the datastore.
    +

    render_header

    +

    Triggered on every page.

    +

    Allow plugin to add content in page headers.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _PAGE_: current target page (eg: linklist, picwall, etc.).
      • +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • buttons_toolbar: after the list of buttons in the header.
      • +
    +

    buttons_toolbar_example

    +
      +
    • fields_toolbar: after search fields in the header.
      • +
    +
    +

    Note: This will only be called in linklist.

    +
    +

    fields_toolbar_example

    +

    render_includes

    +

    Triggered on every page.

    +

    Allow plugin to include their own CSS files.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _PAGE_: current target page (eg: linklist, picwall, etc.).
      • +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • css_files: called after loading default CSS.
      • +
    +
    +

    Note: only add the path of the CSS file. E.g: plugins/demo_plugin/custom_demo.css.

    +
    + +

    Triggered on every page.

    +

    Allow plugin to add content in page footer and include their own JS files.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _PAGE_: current target page (eg: linklist, picwall, etc.).
      • +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • text: called after the end of the footer text.
      • +
    • endofpage: called at the end of the page.
      • +
    +

    text_example

    +
      +
    • js_files: called at the end of the page, to include custom JS scripts.
      • +
    +
    +

    Note: only add the path of the JS file. E.g: plugins/demo_plugin/custom_demo.js.

    +
    + +

    Triggered when linklist is displayed (list of links, permalink, search, tag filtered, etc.).

    +

    It allows to add content at the begining and end of the page, after every link displayed and to alter link data.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    • All templates data, including links.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • action_plugin: next to the button "private only" at the top and bottom of the page.
      • +
    +

    action_plugin_example

    +
      +
    • link_plugin: for every link, between permalink and link URL.
      • +
    +

    link_plugin_example

    +
      +
    • plugin_start_zone: before displaying the template content.
      • +
    +

    plugin_start_zone_example

    +
      +
    • plugin_end_zone: after displaying the template content.
      • +
    +

    plugin_end_zone_example

    + +

    Triggered when the link edition form is displayed.

    +

    Allow to add fields in the form, or display elements.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • All templates data.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • edit_link_plugin: after tags field.
      • +
    +

    edit_link_plugin_example

    +

    render_tools

    +

    Triggered when the "tools" page is displayed.

    +

    Allow to add content at the end of the page.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • All templates data.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • tools_plugin: at the end of the page.
      • +
    +

    tools_plugin_example

    +

    render_picwall

    +

    Triggered when picwall is displayed.

    +

    Allow to add content at the top and bottom of the page.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    • All templates data.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • +

      plugin_start_zone: before displaying the template content.

      +
      • +
    • +

      plugin_end_zone: after displaying the template content.

      +
      • +
    +

    plugin_start_end_zone_example

    +

    render_tagcloud

    +

    Triggered when tagcloud is displayed.

    +

    Allow to add content at the top and bottom of the page.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    • All templates data.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • +

      plugin_start_zone: before displaying the template content.

      +
      • +
    • +

      plugin_end_zone: after displaying the template content.

      +
      • +
    +

    For each tag, the following placeholder can be used:

    +
      +
    • tag_plugin: after each tag
      • +
    +

    plugin_start_end_zone_example

    +

    render_taglist

    +

    Triggered when taglist is displayed.

    +

    Allow to add content at the top and bottom of the page.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    • All templates data.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • +

      plugin_start_zone: before displaying the template content.

      +
      • +
    • +

      plugin_end_zone: after displaying the template content.

      +
      • +
    +

    For each tag, the following placeholder can be used:

    +
      +
    • tag_plugin: after each tag
      • +
    +

    render_daily

    +

    Triggered when tagcloud is displayed.

    +

    Allow to add content at the top and bottom of the page, the bottom of each link and to alter data.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    • All templates data, including links.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • link_plugin: used at bottom of each link.
      • +
    +

    link_plugin_example

    +
      +
    • +

      plugin_start_zone: before displaying the template content.

      +
      • +
    • +

      plugin_end_zone: after displaying the template content.

      +
      • +
    +

    render_feed

    +

    Triggered when the ATOM or RSS feed is displayed.

    +

    Allow to add tags in the feed, either in the header or for each items. Items (links) can also be altered before being rendered.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    • _PAGE_: containing either rss or atom.
      • +
    • All templates data, including links.
      • +
    +
    Template placeholders
    +

    Tags can be added in feeds by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • feed_plugins_header: used as a header tag in the feed.
      • +
    +

    For each links:

    +
      +
    • feed_plugins: additional tag for every link entry.
      • +
    + +

    Triggered when a link is save (new link or edit).

    +

    Allow to alter the link being saved in the datastore.

    +
    Data
    +

    $data is an array containing the link being saved:

    +
      +
    • id
      • +
    • title
      • +
    • url
      • +
    • shorturl
      • +
    • description
      • +
    • private
      • +
    • tags
      • +
    • created
      • +
    • updated
      • +
    + +

    Triggered when a link is deleted.

    +

    Allow to execute any action before the link is actually removed from the datastore

    +
    Data
    +

    $data is an array containing the link being saved:

    +
      +
    • id
      • +
    • title
      • +
    • url
      • +
    • shorturl
      • +
    • description
      • +
    • private
      • +
    • tags
      • +
    • created
      • +
    • updated
      • +
    +

    Guide for template designer

    +

    Plugin administration

    +

    Your theme must include a plugin administration page: pluginsadmin.html.

    +
    +

    Note: repo's template link needs to be added when the PR is merged.

    +
    +

    Use the default one as an example.

    +

    Aside from classic RainTPL loops, plugins order is handle by JavaScript. You can just include plugin_admin.js, only if:

    +
      +
    • you're using a table.
      • +
    • you call orderUp() and orderUp() onclick on arrows.
      • +
    • you add data-line and data-order to your rows.
      • +
    +

    Otherwise, you can use your own JS as long as this field is send by the form:

    +

    +

    Placeholder system

    +

    In order to make plugins work with every custom themes, you need to add variable placeholder in your templates.

    +

    It's a RainTPL loop like this:

    +
    {loop="$plugin_variable"}
+    {$value}
+{/loop}
+
    +

    You should enable demo_plugin for testing purpose, since it uses every placeholder available.

    +

    List of placeholders

    +

    page.header.html

    +

    At the end of the menu:

    +
    {loop="$plugins_header.buttons_toolbar"}
+    {$value}
+{/loop}
+
    +

    At the end of file, before clearing floating blocks:

    +
    {if="!empty($plugin_errors) && isLoggedIn()"}
+    <ul class="errors">
+        {loop="plugin_errors"}
+            <li>{$value}</li>
+        {/loop}
+    </ul>
+{/if}
+
    +

    includes.html

    +

    At the end of the file:

    +
    {loop="$plugins_includes.css_files"}
+<link type="text/css" rel="stylesheet" href="{$value}#"/>
+{/loop}
+
    + +

    page.footer.html

    +

    At the end of your footer notes:

    +
    {loop="$plugins_footer.text"}
+     {$value}
+{/loop}
+
    + +

    At the end of file:

    +
    {loop="$plugins_footer.js_files"}
+     <script src="{$value}#"></script>
+{/loop}
+
    + +

    linklist.html

    +

    After search fields:

    +
    {loop="$plugins_header.fields_toolbar"}
+     {$value}
+{/loop}
+
    + +

    Before displaying the link list (after paging):

    +
    {loop="$plugin_start_zone"}
+     {$value}
+{/loop}
+
    + +

    For every links (icons):

    +
    {loop="$value.link_plugin"}
+    <span>{$value}</span>
+{/loop}
+
    + +

    Before end paging:

    +
    {loop="$plugin_end_zone"}
+     {$value}
+{/loop}
+
    + +

    linklist.paging.html

    +

    After the "private only" icon:

    +
    {loop="$action_plugin"}
+     {$value}
+{/loop}
+
    + +

    editlink.html

    +

    After tags field:

    +
    {loop="$edit_link_plugin"}
+     {$value}
+{/loop}
+
    + +

    tools.html

    +

    After the last tool:

    +
    {loop="$tools_plugin"}
+     {$value}
+{/loop}
+
    + +

    picwall.html

    +

    Top:

    +
    <div id="plugin_zone_start_picwall" class="plugin_zone">
+    {loop="$plugin_start_zone"}
+        {$value}
+    {/loop}
+</div>
+
    + +

    Bottom:

    +
    <div id="plugin_zone_end_picwall" class="plugin_zone">
+    {loop="$plugin_end_zone"}
+        {$value}
+    {/loop}
+</div>
+
    + +

    tagcloud.html

    +

    Top:

    +
       <div id="plugin_zone_start_tagcloud" class="plugin_zone">
+        {loop="$plugin_start_zone"}
+            {$value}
+        {/loop}
+    </div>
+
    + +

    Bottom:

    +
        <div id="plugin_zone_end_tagcloud" class="plugin_zone">
+        {loop="$plugin_end_zone"}
+            {$value}
+        {/loop}
+    </div>
+
    + +

    daily.html

    +

    Top:

    +
    <div id="plugin_zone_start_picwall" class="plugin_zone">
+     {loop="$plugin_start_zone"}
+         {$value}
+     {/loop}
+</div>
+
    + +

    After every link:

    +
    <div class="dailyEntryFooter">
+     {loop="$link.link_plugin"}
+          {$value}
+     {/loop}
+</div>
+
    + +

    Bottom:

    +
    <div id="plugin_zone_end_picwall" class="plugin_zone">
+    {loop="$plugin_end_zone"}
+        {$value}
+    {/loop}
+</div>
+
    + +

    feed.atom.xml and feed.rss.xml:

    +

    In headers tags section:

    +
    {loop="$feed_plugins_header"}
+  {$value}
+{/loop}
+
    + +

    After each entry:

    +
    {loop="$value.feed_plugins"}
+  {$value}
+{/loop}
+
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Plugins/index.html b/doc/html/Plugins/index.html new file mode 100644 index 0000000..3a30e93 --- /dev/null +++ b/doc/html/Plugins/index.html @@ -0,0 +1,414 @@ + + + + + + + + + + + Plugins - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Plugin installation

    +

    There is a bunch of plugins shipped with Shaarli, where there is nothing to do to install them.

    +

    If you want to install a third party plugin:

    +
      +
    • Download it.
      • +
    • Put it in the plugins directory in Shaarli's installation folder.
      • +
    • Make sure you put it correctly:
      • +
    +
    | index.php
+| plugins/
+|---| custom_plugin/
+|   |---| custom_plugin.php
+|   |---| ...
+
+
    + +
      +
    • Make sure your webserver can read and write the files in your plugin folder.
      • +
    +

    Plugin configuration

    +

    In Shaarli's administration page (Tools link), go to Plugin administration.

    +

    Here you can enable and disable all plugins available, and configure them.

    +

    administration screenshot

    +

    Plugin order

    +

    In the plugin administration page, you can move enabled plugins to the top or bottom of the list. The first plugins in the list will be processed first.

    +

    This is important in case plugins are depending on each other. Read plugins README details for more information.

    +

    Use case: The (non existent) plugin shaares_footer adds a footer to every shaare in Markdown syntax. It needs to be processed before (higher in the list) the Markdown plugin. Otherwise its syntax won't be translated in HTML.

    +

    File mode

    +

    Enabled plugin are stored in your config.php parameters file, under the array:

    +
    $GLOBALS['config']['ENABLED_PLUGINS']
+
    + +

    You can edit them manually here. +Example:

    +
    $GLOBALS['config']['ENABLED_PLUGINS'] = array(
+    'qrcode', 
+    'archiveorg',
+    'wallabag',
+    'markdown',
+);
+
    + +

    Plugin usage

    +

    Official plugins

    +

    Usage of each plugin is documented in it's README file:

    +
      +
    • addlink-toolbar: Adds the addlink input on the linklist page
      • +
    • archiveorg: For each link, add an Archive.org icon
      • +
    • markdown: Render shaare description with Markdown syntax.
      • +
    • playvideos: Add a button in the toolbar allowing to watch all videos.
      • +
    • qrcode: For each link, add a QRCode icon.
      • +
    • wallabag: For each link, add a Wallabag icon to save it in your instance.
      • +
    +

    Third party plugins

    +

    See Community & related software

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/REST-API/index.html b/doc/html/REST-API/index.html new file mode 100644 index 0000000..2c244bc --- /dev/null +++ b/doc/html/REST-API/index.html @@ -0,0 +1,431 @@ + + + + + + + + + + + REST API - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Usage

    +

    See the REST API documentation.

    +

    Authentication

    +

    All requests to Shaarli's API must include a JWT token to verify their authenticity.

    +

    This token has to be included as an HTTP header called Authentication: Bearer <jwt token>.

    +

    JWT resources :

    +
      +
    • jwt.io (including a list of client per language).
      • +
    • RFC : https://tools.ietf.org/html/rfc7519
      • +
    • https://float-middle.com/json-web-tokens-jwt-vs-sessions/
      • +
    • HackerNews thread: https://news.ycombinator.com/item?id=11929267
      • +
    +

    Shaarli JWT Token

    +

    JWT tokens are composed by three parts, separated by a dot . and encoded in base64:

    +
    [header].[payload].[signature]
+
    + + +

    Shaarli only allow one hash algorithm, so the header will always be the same:

    +
    {
+    "typ": "JWT",
+    "alg": "HS512"
+}
+
    + +

    Encoded in base64, it gives:

    +
    ewogICAgICAgICJ0eXAiOiAiSldUIiwKICAgICAgICAiYWxnIjogIkhTNTEyIgogICAgfQ==
+
    + +

    Payload

    +

    Validity duration

    +

    To avoid infinite token validity, JWT tokens must include their creation date in UNIX timestamp format (timezone independant - UTC) under the key iat (issued at). This token will be accepted during 9 minutes.

    +
    {
+    "iat": 1468663519
+}
+
    + +

    See RFC reference.

    +

    Signature

    +

    The signature authenticate the token validity. It contains the base64 of the header and the body, separated by a dot ., hashed in SHA512 with the API secret available in Shaarli administration page.

    +

    Signature example with PHP:

    +
    $content = base64_encode($header) . '.' . base64_encode($payload);
+$signature = hash_hmac('sha512', $content, $secret);
+
    + +

    Complete example

    +

    PHP

    +
    function generateToken($secret) {
+    $header = base64_encode('{
+        "typ": "JWT",
+        "alg": "HS512"
+    }');
+    $payload = base64_encode('{
+        "iat": '. time() .'
+    }');
+    $signature = hash_hmac('sha512', $header .'.'. $payload , $secret);
+    return $header .'.'. $payload .'.'. $signature;
+}
+
+$secret = 'mysecret';
+$token = generateToken($secret);
+echo $token;
+
    + +
    +

    ewogICAgICAgICJ0eXAiOiAiSldUIiwKICAgICAgICAiYWxnIjogIkhTNTEyIgogICAgfQ==.ewogICAgICAgICJpYXQiOiAxNDY4NjY3MDQ3CiAgICB9.1d2c54fa947daf594fdbf7591796195652c8bc63bffad7f6a6db2a41c313f495a542cbfb595acade79e83f3810d709b4251d7b940bbc10b531a6e6134af63a68

    +
    +
    $options = [
+    'http' => [
+        'method' => 'GET',
+        'jwt' => $token,
+    ],
+];
+$context = stream_context_create($options);
+file_get_contents($apiEndpoint, false, $context);
+
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/RSS-feeds/index.html b/doc/html/RSS-feeds/index.html new file mode 100644 index 0000000..bb6e412 --- /dev/null +++ b/doc/html/RSS-feeds/index.html @@ -0,0 +1,367 @@ + + + + + + + + + + + RSS feeds - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Feeds options

    +

    Feeds are available in ATOM with ?do=atom and RSS with do=RSS.

    +

    Options: +- You can use permalinks in the feed URL to get permalink to Shaares instead of direct link to shaared URL. + - E.G. https://my.shaarli.domain/?do=atom&permalinks. +- You can use nb parameter in the feed URL to specify the number of Shaares you want in a feed (default if not specified: 50). The keyword all is available if you want everything. + - https://my.shaarli.domain/?do=atom&permalinks&nb=42 + - https://my.shaarli.domain/?do=atom&permalinks&nb=all

    +

    RSS Feeds or Picture Wall for a specific search/tag

    +

    It is possible to filter RSS/ATOM feeds and Picture Wall on a Shaarli to only display results of a specific search, or for a specific tag.

    +

    For example, if you want to subscribe only to links tagged photography: +- Go to the desired Shaarli instance. +- Search for the photography tag in the Filter by tag box. Links tagged photography are displayed. +- Click on the RSS Feed button. +- You are presented with an RSS feed showing only these links. Subscribe to it to receive only updates with this tag. +- The same method also works for a full-text search (Search box) and for the Picture Wall (want to only see pictures about nature?) +- You can also build the URLs manually: + - https://my.shaarli.domain/?do=rss&searchtags=nature + - https://my.shaarli.domain/links/?do=picwall&searchterm=poney

    +

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Release-Shaarli/index.html b/doc/html/Release-Shaarli/index.html new file mode 100644 index 0000000..cf5fcee --- /dev/null +++ b/doc/html/Release-Shaarli/index.html @@ -0,0 +1,529 @@ + + + + + + + + + + + Release Shaarli - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    See Git - Maintaining a project - Tagging your +releases.

    +

    Prerequisites

    +

    This guide assumes that you have: +- a GPG key matching your GitHub authentication credentials + - i.e., the email address identified by the GPG key is the same as the one in your ~/.gitconfig +- a GitHub fork of Shaarli +- a local clone of your Shaarli fork, with the following remotes: + - origin pointing to your GitHub fork + - upstream pointing to the main Shaarli repository +- maintainer permissions on the main Shaarli repository, to: + - push the signed tag + - create a new release +- Composer and Pandoc need to be installed

    +

    GitHub release draft and CHANGELOG.md

    +

    See http://keepachangelog.com/en/0.3.0/ for changelog formatting.

    +

    GitHub release draft

    +

    GitHub allows drafting the release note for the upcoming release, from the Releases page. This way, the release note can be drafted while contributions are merged to master.

    +

    CHANGELOG.md

    +

    This file should contain the same information as the release note draft for the upcoming version.

    +

    Update it to: +- add new entries (additions, fixes, etc.) +- mark the current version as released by setting its date and link +- add a new section for the future unreleased version

    +
    $ cd /path/to/shaarli
+
+$ nano CHANGELOG.md
+
+[...]
+## vA.B.C - UNRELEASED
+TBA
+
+## [vX.Y.Z](https://github.com/shaarli/Shaarli/releases/tag/vX.Y.Z) - YYYY-MM-DD
+[...]
+
    + +

    Increment the version code, updated docs, create and push a signed tag

    +

    Generate documentation

    +
    $ cd /path/to/shaarli
+
+# create a new branch
+$ git fetch upstream
+$ git checkout upstream/master -b v0.5.0
+
+# rebuild the documentation from the wiki
+$ make htmldoc
+
+# commit the changes
+$ git add doc
+$ git commit -s -m "Generate documentation for v0.5.0"
+
+# push the commit on your GitHub fork
+$ git push origin v0.5.0
+
    + +

    Create and merge a Pull Request

    +

    This one is pretty straightforward ;-)

    +

    Bump Shaarli version to v0.x branch

    +
    $ git checkout master
+$ git fetch upstream
+$ git pull upstream master
+
+# IF the branch doesn't exists
+$ git checkout -b v0.5
+# OR if the branch already exists
+$ git checkout v0.5
+$ git rebase upstream/master
+
+# Bump shaarli version from dev to 0.5.0, **without the `v`**
+$ vim shaarli_version.php
+$ git add shaarli_version
+$ git commit -s -m "Bump Shaarli version to v0.5.0"
+$ git push upstream v0.5
+
    + +

    Create and push a signed tag

    +
    # update your local copy
+$ git checkout v0.5
+$ git fetch upstream
+$ git pull upstream v0.5
+
+# create a signed tag
+$ git tag -s -m "Release v0.5.0" v0.5.0
+
+# push it to "upstream"
+$ git push --tags upstream
+
    + +

    Verify a signed tag

    +

    v0.5.0 is the first GPG-signed tag pushed on the Community Shaarli.

    +

    Let's have a look at its signature!

    +
    $ cd /path/to/shaarli
+$ git fetch upstream
+
+# get the SHA1 reference of the tag
+$ git show-ref tags/v0.5.0
+f7762cf803f03f5caf4b8078359a63783d0090c1 refs/tags/v0.5.0
+
+# verify the tag signature information
+$ git verify-tag f7762cf803f03f5caf4b8078359a63783d0090c1
+gpg: Signature made Thu 30 Jul 2015 11:46:34 CEST using RSA key ID 4100DF6F
+gpg: Good signature from "VirtualTam <virtualtam@flibidi.net>" [ultimate]
+
    + +

    Publish the GitHub release

    +

    Update release badges

    +

    Update README.md so version badges display and point to the newly released Shaarli version(s), in the master branch.

    +

    Create a GitHub release from a Git tag

    +

    From the previously drafted release: +- edit the release notes (if needed) +- specify the appropriate Git tag +- publish the release +- profit!

    +

    Generate and upload all-in-one release archives

    +

    Users with a shared hosting may have: +- no SSH access +- no possibility to install PHP packages or server extensions +- no possibility to run scripts

    +

    To ease Shaarli installations, it is possible to generate and upload additional release archives, +that will contain Shaarli code plus all required third-party libraries.

    +

    From the v0.5 branch:

    +
    $ make release_archive
+
    + +

    This will create the following archives: +- shaarli-vX.Y.Z-full.tar +- shaarli-vX.Y.Z-full.zip

    +

    The archives need to be manually uploaded on the previously created GitHub release.

    +

    Update stable and latest branches

    +
    $ git checkout latest
+# latest release
+$ git merge v0.5.0
+# fix eventual conflicts
+$ make test
+$ git push upstream latest
+$ git checkout stable
+# latest previous major
+$ git merge v0.4.5 
+# fix eventual conflicts
+$ make test
+$ git push upstream stable
+
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Reverse-proxy-configuration/index.html b/doc/html/Reverse-proxy-configuration/index.html new file mode 100644 index 0000000..bebd663 --- /dev/null +++ b/doc/html/Reverse-proxy-configuration/index.html @@ -0,0 +1,350 @@ + + + + + + + + + + + Reverse proxy configuration - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    TODO, see https://github.com/shaarli/Shaarli/issues/888

    +

    HAProxy

    +

    Nginx

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Security/index.html b/doc/html/Security/index.html new file mode 100644 index 0000000..19b569e --- /dev/null +++ b/doc/html/Security/index.html @@ -0,0 +1,386 @@ + + + + + + + + + + + Security - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Client browser

    +
      +
    • Shaarli relies on HTTP_REFERER for some functions (like redirects and clicking on tags). If you have disabled or masqueraded HTTP_REFERER in your browser, some features of Shaarli may not work
      • +
    +

    PHP

    +
      +
    • magic_quotes is an horrible option of PHP which is often activated on servers. No serious developer should rely on this horror to secure their code against SQL injections. You should disable it (and Shaarli expects this option to be disabled). Nevertheless, I have added code to cope with magic_quotes on, so you should not be bothered even on crappy hosts.
      • +
    +

    Server and sessions

    +
      +
    • Directories are protected using .htaccess files
      • +
    • Forms are protected against XSRF (Cross-site requests forgery):
      • +
    • Forms which act on data (save,delete…) contain a token generated by the server.
      • +
    • Any posted form which does not contain a valid token is rejected.
      • +
    • Any token can only be used once.
      • +
    • Tokens are attached to the session and cannot be reused in another session.
      • +
    • Sessions automatically expire after 60 minutes.
      • +
    • Sessions are protected against hijacking: the session ID cannot be used from a different IP address.
      • +
    +

    Shaarli datastore and configuration

    +
      +
    • The password is salted, hashed and stored in the data subdirectory, in a PHP file, and protected by htaccess. Even if the webserver does not support htaccess, the hash is not readable by URL. Even if the .php file is stolen, the password cannot deduced from the hash. The salt prevents rainbow-tables attacks.
      • +
    • Links are stored as an associative array which is serialized, compressed (with deflate), base64-encoded and saved as a comment in a .php file.
      • +
    • Even if the server does not support .htaccess files, the data file will still not be readable by URL.
      • +
    • The database looks like this:
      • +
    +
    <?php /* zP1ZjxxJtiYIvvevEPJ2lDOaLrZv7o...
+...ka7gaco/Z+TFXM2i7BlfMf8qxpaSSYfKlvqv/x8= */ ?>
+
    + +
      +
    • Small hashes are used to make a link to an entry in Shaarli. They are unique. In fact, the date of the items (eg. 20110923_150523) is hashed with CRC32, then converted to base64 and some characters are replaced. They are always 6 characters longs and use only A-Z a-z 0-9 - _ and @.
      • +
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Server-configuration/index.html b/doc/html/Server-configuration/index.html new file mode 100644 index 0000000..beb8cd0 --- /dev/null +++ b/doc/html/Server-configuration/index.html @@ -0,0 +1,747 @@ + + + + + + + + + + + Server configuration - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Example virtual host configurations for popular web servers

    + +

    Prerequisites

    +

    Shaarli

    +
      +
    • Shaarli is installed in a directory readable/writeable by the user
      • +
    • the correct read/write permissions have been granted to the web server user and/or group
      • +
    • for HTTPS / SSL:
      • +
    • a key pair (public, private) and a certificate have been generated
      • +
    • the appropriate server SSL extension is installed and active
      • +
    +

    HTTPS, TLS and self-signed certificates

    +

    Related guides: + How to Create Self-Signed SSL Certificates with OpenSSL + How do I create my own Certificate Authority? +* Generate a self-signed certificate (will trigger browser warnings) with apache2: make-ssl-cert generate-default-snakeoil --force-overwrite will create /etc/ssl/certs/ssl-cert-snakeoil.pem and /etc/ssl/private/ssl-cert-snakeoil.key

    +

    Proxies

    +

    If Shaarli is served behind a proxy (i.e. there is a proxy server between clients and the web server hosting Shaarli), please refer to the proxy server documentation for proper configuration. In particular, you have to ensure that the following server variables are properly set: +- X-Forwarded-Proto; +- X-Forwarded-Host; +- X-Forwarded-For.

    +

    See also proxy-related issues.

    +

    Apache

    +

    Minimal

    +
    <VirtualHost *:80>
+    ServerName   shaarli.my-domain.org
+    DocumentRoot /absolute/path/to/shaarli/
+</VirtualHost>
+
    + +

    Debug - Log all the things!

    +

    This configuration will log both Apache and PHP errors, which may prove useful to identify server configuration errors.

    +

    See: + Apache/PHP - error log per VirtualHost (StackOverflow) + PHP: php_value vs php_admin_value and the use of php_flag explained

    +
    <VirtualHost *:80>
+    ServerName   shaarli.my-domain.org
+    DocumentRoot /absolute/path/to/shaarli/
+
+    LogLevel  warn
+    ErrorLog  /var/log/apache2/shaarli-error.log
+    CustomLog /var/log/apache2/shaarli-access.log combined
+
+    php_flag  log_errors on
+    php_flag  display_errors on
+    php_value error_reporting 2147483647
+    php_value error_log /var/log/apache2/shaarli-php-error.log
+</VirtualHost>
+
    + +

    Standard - Keep access and error logs

    +
    <VirtualHost *:80>
+    ServerName   shaarli.my-domain.org
+    DocumentRoot /absolute/path/to/shaarli/
+
+    LogLevel  warn
+    ErrorLog  /var/log/apache2/shaarli-error.log
+    CustomLog /var/log/apache2/shaarli-access.log combined
+</VirtualHost>
+
    + +

    Paranoid - Redirect HTTP (:80) to HTTPS (:443)

    +

    See Server-side TLS (Mozilla).

    +
    <VirtualHost *:443>
+    ServerName   shaarli.my-domain.org
+    DocumentRoot /absolute/path/to/shaarli/
+
+    SSLEngine             on
+    SSLCertificateFile    /absolute/path/to/the/website/certificate.pem
+    SSLCertificateKeyFile /absolute/path/to/the/website/key.key
+
+    <Directory /absolute/path/to/shaarli/>
+        AllowOverride All
+        Options Indexes FollowSymLinks MultiViews
+        Order allow,deny
+        allow from all
+    </Directory>
+
+    LogLevel  warn
+    ErrorLog  /var/log/apache2/shaarli-error.log
+    CustomLog /var/log/apache2/shaarli-access.log combined
+</VirtualHost>
+<VirtualHost *:80>
+    ServerName   shaarli.my-domain.org
+    Redirect 301 / https://shaarli.my-domain.org
+
+    LogLevel  warn
+    ErrorLog  /var/log/apache2/shaarli-error.log
+    CustomLog /var/log/apache2/shaarli-access.log combined
+</VirtualHost>
+
    + +

    .htaccess

    +

    Shaarli use .htaccess Apache files to deny access to files that shouldn't be directly accessed (datastore, config, etc.). You need the directive AllowOverride All in your virtual host configuration for them to work.

    +

    Warning: If you use Apache 2.2 or lower, you need mod_version to be installed and enabled.

    +

    Apache module mod_rewrite must be enabled to use the REST API. URL rewriting rules for the Slim microframework are stated in the root .htaccess file.

    +

    LightHttpd

    +

    Nginx

    +

    Foreword

    +

    Nginx does not natively interpret PHP scripts; to this effect, we will run a FastCGI service, to which Nginx's FastCGI module will proxy all requests to PHP resources.

    +

    Required packages: +- nginx +- php-fpm - PHP FastCGI Process Manager

    +

    Official documentation: +- Beginner's guide +- ngx_http_fastcgi_module +- Pitfalls

    +

    Community resources: +- Server-side TLS (Nginx) (Mozilla) +- PHP configuration examples (Karl Blessing)

    +

    Common setup

    +

    Once Nginx and PHP-FPM are installed, we need to ensure: +- Nginx and PHP-FPM are running using the same user and group +- both these user and group have + - read permissions for Shaarli resources + - execute permissions for Shaarli directories AND their parent directories

    +

    On a production server: +- user:group will likely be http:http, www:www or www-data:www-data +- files will be located under /var/www, /var/http or /usr/share/nginx

    +

    On a development server: +- files may be located in a user's home directory +- in this case, make sure both Nginx and PHP-FPM are running as the local user/group!

    +

    For all following configuration examples, this user/group pair will be used: +- user:group = john:users,

    +

    which corresponds to the following service configuration:

    +
    ; /etc/php/php-fpm.conf
+user = john
+group = users
+
+[...]
+listen.owner = john
+listen.group = users
+
    + +
    # /etc/nginx/nginx.conf
+user john users;
+
+http {
+    [...]
+}
+
    + +

    (Optional) Increase the maximum file upload size

    +

    Some bookmark dumps generated by web browsers can be huge due to the presence of Base64-encoded images and favicons, as well as extra verbosity when nesting links in (sub-)folders.

    +

    To increase upload size, you will need to modify both nginx and PHP configuration:

    +
    # /etc/nginx/nginx.conf
+
+http {
+    [...]
+
+    client_max_body_size 10m;
+
+    [...]
+}
+
    + +
    # /etc/php5/fpm/php.ini
+
+[...]
+post_max_size = 10M
+[...]
+upload_max_filesize = 10M
+
    + +

    Minimal

    +

    WARNING: Use for development only!

    +
    user john users;
+worker_processes  1;
+events {
+    worker_connections  1024;
+}
+
+http {
+    include            mime.types;
+    default_type       application/octet-stream;
+    keepalive_timeout  20;
+
+    index index.html index.php;
+
+    server {
+        listen       80;
+        server_name  localhost;
+        root         /home/john/web;
+
+        access_log  /var/log/nginx/access.log;
+        error_log   /var/log/nginx/error.log;
+
+        location /shaarli/ {
+            try_files $uri /shaarli/index.php$is_args$args;
+            access_log  /var/log/nginx/shaarli.access.log;
+            error_log   /var/log/nginx/shaarli.error.log;
+        }
+
+        location ~ (index)\.php$ {
+            try_files $uri =404;
+            fastcgi_split_path_info ^(.+\.php)(/.+)$;
+            fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
+            fastcgi_index  index.php;
+            include        fastcgi.conf;
+        }
+    }
+}
+
    + +

    Modular

    +

    The previous setup is sufficient for development purposes, but has several major caveats: +- every content that does not match the PHP rule will be sent to client browsers: + - dotfiles - in our case, .htaccess + - temporary files, e.g. Vim or Emacs files: index.php~ +- asset / static resource caching is not optimized +- if serving several PHP sites, there will be a lot of duplication: location /shaarli/, location /mysite/, etc.

    +

    To solve this, we will split Nginx configuration in several parts, that will be included when needed:

    +
    # /etc/nginx/deny.conf
+location ~ /\. {
+    # deny access to dotfiles
+    access_log off;
+    log_not_found off;
+    deny all;
+}
+
+location ~ ~$ {
+    # deny access to temp editor files, e.g. "script.php~"
+    access_log off;
+    log_not_found off;
+    deny all;
+}
+
    + +
    # /etc/nginx/php.conf
+location ~ (index)\.php$ {
+    # Slim - split URL path into (script_filename, path_info)
+    try_files $uri =404;
+    fastcgi_split_path_info ^(.+\.php)(/.+)$;
+
+    # filter and proxy PHP requests to PHP-FPM
+    fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
+    fastcgi_index  index.php;
+    include        fastcgi.conf;
+}
+
+location ~ \.php$ {
+    # deny access to all other PHP scripts
+    deny all;
+}
+
    + +
    # /etc/nginx/static_assets.conf
+location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
+    expires    max;
+    add_header Pragma public;
+    add_header Cache-Control "public, must-revalidate, proxy-revalidate";
+}
+
    + +
    # /etc/nginx/nginx.conf
+[...]
+
+http {
+    [...]
+
+    root        /home/john/web;
+    access_log  /var/log/nginx/access.log;
+    error_log   /var/log/nginx/error.log;
+
+    server {
+        # virtual host for a first domain
+        listen       80;
+        server_name  my.first.domain.org;
+
+        location /shaarli/ {
+            # Slim - rewrite URLs
+            try_files $uri /shaarli/index.php$is_args$args;
+
+            access_log  /var/log/nginx/shaarli.access.log;
+            error_log   /var/log/nginx/shaarli.error.log;
+        }
+
+        location = /shaarli/favicon.ico {
+            # serve the Shaarli favicon from its custom location
+            alias /var/www/shaarli/images/favicon.ico;
+        }
+
+        include deny.conf;
+        include static_assets.conf;
+        include php.conf;
+    }
+
+    server {
+        # virtual host for a second domain
+        listen       80;
+        server_name  second.domain.com;
+
+        location /minigal/ {
+            access_log  /var/log/nginx/minigal.access.log;
+            error_log   /var/log/nginx/minigal.error.log;
+        }
+
+        include deny.conf;
+        include static_assets.conf;
+        include php.conf;
+    }
+}
+
    + +

    Redirect HTTP to HTTPS

    +

    Assuming you have generated a (self-signed) key and certificate, and they are located under /home/john/ssl/localhost.{key,crt}, it is pretty straightforward to set an HTTP (:80) to HTTPS (:443) redirection to force SSL/TLS usage.

    +
    # /etc/nginx/nginx.conf
+[...]
+
+http {
+    [...]
+
+    index index.html index.php;
+
+    root        /home/john/web;
+    access_log  /var/log/nginx/access.log;
+    error_log   /var/log/nginx/error.log;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        return 301 https://localhost$request_uri;
+    }
+
+    server {
+        listen       443 ssl;
+        server_name  localhost;
+
+        ssl_certificate      /home/john/ssl/localhost.crt;
+        ssl_certificate_key  /home/john/ssl/localhost.key;
+
+        location /shaarli/ {
+            # Slim - rewrite URLs
+            try_files $uri /index.php$is_args$args;
+
+            access_log  /var/log/nginx/shaarli.access.log;
+            error_log   /var/log/nginx/shaarli.error.log;
+        }
+
+        location = /shaarli/favicon.ico {
+            # serve the Shaarli favicon from its custom location
+            alias /var/www/shaarli/images/favicon.ico;
+        }
+
+        include deny.conf;
+        include static_assets.conf;
+        include php.conf;
+    }
+}
+
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Server-requirements/index.html b/doc/html/Server-requirements/index.html new file mode 100644 index 0000000..ab1b0d3 --- /dev/null +++ b/doc/html/Server-requirements/index.html @@ -0,0 +1,475 @@ + + + + + + + + + + + Server requirements - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    PHP

    +

    Release information

    + +

    Supported versions

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    VersionStatusShaarli compatibility
    7.1Supported (v0.9.x):white_check_mark:
    7.0Supported:white_check_mark:
    5.6Supported:white_check_mark:
    5.5EOL: 2016-07-10:white_check_mark:
    5.4EOL: 2015-09-14:white_check_mark: (up to Shaarli 0.8.x)
    5.3EOL: 2014-08-14:white_check_mark: (up to Shaarli 0.8.x)
    +

    See also: +- Travis configuration

    +

    Dependency management

    +

    Starting with Shaarli v0.8.x, Composer is used to resolve, +download and install third-party PHP dependencies.

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    LibraryRequired?Usage
    shaarli/netscape-bookmark-parserAllImport bookmarks from Netscape files
    erusev/parsedownAllParse MarkDown syntax for the MarkDown plugin
    slim/slimAllHandle routes and middleware for the REST API
    +

    Extensions

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ExtensionRequired?Usage
    opensslAllOpenSSL, HTTPS
    php-mbstringCentOS, Fedora, RHEL, Windowsmultibyte (Unicode) string support
    php-gdoptionalthumbnail resizing
    php-intloptionallocalized text sorting (e.g. e->è->f)
    php-curloptionalusing cURL for fetching webpages and thumbnails in a more robust way
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Server-security/index.html b/doc/html/Server-security/index.html new file mode 100644 index 0000000..dbe9951 --- /dev/null +++ b/doc/html/Server-security/index.html @@ -0,0 +1,429 @@ + + + + + + + + + + + Server security - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    php.ini

    +

    PHP settings are defined in: +- a main configuration file, usually found under /etc/php5/php.ini; some distributions provide different configuration environments, e.g. + - /etc/php5/php.ini - used when running console scripts + - /etc/php5/apache2/php.ini - used when a client requests PHP resources from Apache + - /etc/php5/php-fpm.conf - used when PHP requests are proxied to PHP-FPM +- additional configuration files/entries, depending on the installed/enabled extensions: + - /etc/php/conf.d/xdebug.ini

    +

    Locate .ini files

    +

    Console environment

    +
    $ php --ini
+Configuration File (php.ini) Path: /etc/php
+Loaded Configuration File:         /etc/php/php.ini
+Scan for additional .ini files in: /etc/php/conf.d
+Additional .ini files parsed:      /etc/php/conf.d/xdebug.ini
+
    + +

    Server environment

    +
      +
    • create a phpinfo.php script located in a path supported by the web server, e.g.
        +
      • Apache (with user dirs enabled): /home/myself/public_html/phpinfo.php
        • +
      • /var/www/test/phpinfo.php
        • +
      +
      • +
    • make sure the script is readable by the web server user/group (usually, www, www-data or httpd)
      • +
    • access the script from a web browser
      • +
    • look at the Loaded Configuration File and Scan this dir for additional .ini files entries
      • +
    +
    <?php phpinfo(); ?>
+
    + +

    fail2ban

    +

    fail2ban is an intrusion prevention framework that reads server (Apache, SSH, etc.) and uses iptables profiles to block brute-force attempts: +- Official website +- Source code

    +

    Read Shaarli logs to ban IPs

    +

    Example configuration: +- allow 3 login attempts per IP address +- after 3 failures, permanently ban the corresponding IP adddress

    +

    /etc/fail2ban/jail.local

    +
    [shaarli-auth]
+enabled  = true
+port     = https,http
+filter   = shaarli-auth
+logpath  = /var/www/path/to/shaarli/data/log.txt
+maxretry = 3
+bantime = -1
+
    + +

    /etc/fail2ban/filter.d/shaarli-auth.conf

    +
    [INCLUDES]
+before = common.conf
+[Definition]
+failregex = \s-\s<HOST>\s-\sLogin failed for user.*$
+ignoreregex = 
+
    + +

    Robots - Restricting search engines and web crawler traffic

    +

    Creating a robots.txt with the following contents at the root of your Shaarli installation will prevent honest web crawlers from indexing each and every link and Daily page from a Shaarli instance, thus getting rid of a certain amount of unsollicited network traffic.

    +
    User-agent: *
+Disallow: /
+
    + +

    See: +- http://www.robotstxt.org/ +- http://www.robotstxt.org/robotstxt.html +- http://www.robotstxt.org/meta.html

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Shaarli-configuration/index.html b/doc/html/Shaarli-configuration/index.html new file mode 100644 index 0000000..95a487d --- /dev/null +++ b/doc/html/Shaarli-configuration/index.html @@ -0,0 +1,563 @@ + + + + + + + + + + + Shaarli configuration - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Foreword

    +

    Do not edit configuration options in index.php! Your changes would be lost.

    +

    Once your Shaarli instance is installed, the file data/config.json.php is generated: + it contains all settings in JSON format, and can be edited to customize values + it defines which plugins are enabled + its values override those defined in index.php + it is wrap in a PHP comment to prevent anyone accessing it, regardless of server configuration

    +

    File and directory permissions

    +

    The server process running Shaarli must have: +- read access to the following resources: + - PHP scripts: index.php, application/*.php, plugins/*.php + - 3rd party PHP and Javascript libraries: inc/*.php, inc/*.js + - static assets: + - CSS stylesheets: inc/*.css + - images/* + - RainTPL templates: tpl/*.html +- read, write and execution access to the following directories: + - cache - thumbnail cache + - data - link data store, configuration options + - pagecache - Atom/RSS feed cache + - tmp - RainTPL page cache

    +

    On a Linux distribution: +- the web server user will likely be www or http (for Apache2) +- it will be a member of a group of the same name: www:www, http:http +- to give it access to Shaarli, either: + - unzip Shaarli in the default web server location (usually /var/www/) and set the web server user as the owner + - put users in the same group as the web server, and set the appropriate access rights +- if you have a domain / subdomain to serve Shaarli, configure the server accordingly

    +

    Configuration

    +

    In data/config.json.php.

    +

    See also Plugin System.

    +

    Credentials

    +
    +

    You shouldn't edit those.

    +
    +

    login: Login username.
    +hash: Generated password hash.
    +salt: Password salt.

    +

    General

    +

    title: Shaarli's instance title.
    +header_link: Link to the homepage.
    +links_per_page: Number of shaares displayed per page.
    +timezone: See the list of supported timezones.
    +enabled_plugins: List of enabled plugins.

    +

    Security

    +

    session_protection_disabled: Disable session cookie hijacking protection (not recommended). +It might be useful if your IP adress often changes.
    +ban_after: Failed login attempts before being IP banned.
    +ban_duration: IP ban duration in seconds.
    +open_shaarli: Anyone can add a new link while logged out if enabled.
    +trusted_proxies: List of trusted IP which won't be banned after failed login attemps. Useful if Shaarli is behind a reverse proxy.
    +allowed_protocols: List of allowed protocols in shaare URLs or markdown-rendered descriptions. Useful if you want to store javascript: links (bookmarklets) in Shaarli (default: ["ftp", "ftps", "magnet"]).

    +

    Resources

    +

    data_dir: Data directory.
    +datastore: Shaarli's links database file path.
    +history: Shaarli's operation history file path. +updates: File path for the ran updates file.
    +log: Log file path.
    +update_check: Last update check file path.
    +raintpl_tpl: Templates directory.
    +raintpl_tmp: Template engine cache directory.
    +thumbnails_cache: Thumbnails cache directory.
    +page_cache: Shaarli's internal cache directory.
    +ban_file: Banned IP file path.

    +

    Updates

    +

    check_updates: Enable or disable update check to the git repository.
    +check_updates_branch: Git branch used to check updates (e.g. stable or master).
    +check_updates_interval: Look for new version every N seconds (default: every day).

    +

    Privacy

    +

    default_private_links: Check the private checkbox by default for every new link.
    +hide_public_links: All links are hidden while logged out.
    +hide_timestamps: Timestamps are hidden.

    +

    Feed

    +

    rss_permalinks: Enable this to redirect RSS links to Shaarli's permalinks instead of shaared URL.
    +show_atom: Display ATOM feed button.

    +

    Thumbnail

    +

    enable_thumbnails: Enable or disable thumbnail display.
    +enable_localcache: Enable or disable local cache.

    +

    Redirector

    +

    url: Redirector URL, such as anonym.to.
    +encode_url: Enable this if the redirector needs encoded URL to work properly.

    +

    Configuration file example

    +
    <?php /*
+{
+    "credentials": {
+        "login": "<login>",
+        "hash": "<password hash>",
+        "salt": "<password salt>"
+    },
+    "security": {
+        "ban_after": 4,
+        "session_protection_disabled": false,
+        "ban_duration": 1800,
+        "trusted_proxies": [
+            "1.2.3.4",
+            "5.6.7.8"
+        ],
+        "allowed_protocols": [
+            "ftp",
+            "ftps",
+            "magnet"
+        ]
+    },
+    "resources": {
+        "data_dir": "data",
+        "config": "data\/config.php",
+        "datastore": "data\/datastore.php",
+        "ban_file": "data\/ipbans.php",
+        "updates": "data\/updates.txt",
+        "log": "data\/log.txt",
+        "update_check": "data\/lastupdatecheck.txt",
+        "raintpl_tmp": "tmp\/",
+        "raintpl_tpl": "tpl\/",
+        "thumbnails_cache": "cache",
+        "page_cache": "pagecache"
+    },
+    "general": {
+        "check_updates": true,
+        "rss_permalinks": true,
+        "links_per_page": 20,
+        "default_private_links": true,
+        "enable_thumbnails": true,
+        "enable_localcache": true,
+        "check_updates_branch": "stable",
+        "check_updates_interval": 86400,
+        "enabled_plugins": [
+            "markdown",
+            "wallabag",
+            "archiveorg"
+        ],
+        "timezone": "Europe\/Paris",
+        "title": "My Shaarli",
+        "header_link": "?"
+    },
+    "extras": {
+        "show_atom": false,
+        "hide_public_links": false,
+        "hide_timestamps": false,
+        "open_shaarli": false,
+        "redirector": "http://anonym.to/?",
+        "redirector_encode_url": false
+    },
+    "general": {
+        "header_link": "?",
+        "links_per_page": 20,
+        "enabled_plugins": [
+            "markdown",
+            "wallabag"
+        ],
+        "timezone": "Europe\/Paris",
+        "title": "My Shaarli"
+    },
+    "updates": {
+        "check_updates": true,
+        "check_updates_branch": "stable",
+        "check_updates_interval": 86400
+    },
+    "feed": {
+        "rss_permalinks": true,
+        "show_atom": false
+    },
+    "privacy": {
+        "default_private_links": true,
+        "hide_public_links": false,
+        "hide_timestamps": false
+    },
+    "thumbnail": {
+        "enable_thumbnails": true,
+        "enable_localcache": true
+    },
+    "redirector": {
+        "url": "http://anonym.to/?",
+        "encode_url": false
+    },
+    "plugins": {
+        "WALLABAG_URL": "http://demo.wallabag.org",
+        "WALLABAG_VERSION": "1"
+    }
+} ?>
+
    + +

    Additional configuration

    +

    The playvideos plugin may require that you adapt your server's +Content Security Policy +configuration to work properly.

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Shaarli-images/index.html b/doc/html/Shaarli-images/index.html new file mode 100644 index 0000000..0fa93ca --- /dev/null +++ b/doc/html/Shaarli-images/index.html @@ -0,0 +1,425 @@ + + + + + + + + + + + Shaarli images - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Get and run a Shaarli image

    +

    DockerHub repository

    +

    The images can be found in the shaarli/shaarli +repository.

    +

    Available image tags

    +
      +
    • latest: master branch (tarball release)
      • +
    • stable: stable branch (tarball release)
      • +
    • dev: master branch (Git clone)
      • +
    +

    All images rely on: +- Debian 8 Jessie +- PHP5-FPM +- Nginx

    +

    Download from DockerHub

    +
    $ docker pull shaarli/shaarli
+latest: Pulling from shaarli/shaarli
+32716d9fcddb: Pull complete
+84899d045435: Pull complete
+4b6ad7444763: Pull complete
+e0345ef7a3e0: Pull complete
+5c1dd344094f: Pull complete
+6422305a200b: Pull complete
+7d63f861dbef: Pull complete
+3eb97210645c: Pull complete
+869319d746ff: Already exists
+869319d746ff: Pulling fs layer
+902b87aaaec9: Already exists
+Digest: sha256:f836b4627b958b3f83f59c332f22f02fcd495ace3056f2be2c4912bd8704cc98
+Status: Downloaded newer image for shaarli/shaarli:latest
+
    + +

    Create and start a new container from the image

    +
    # map the host's :8000 port to the container's :80 port
+$ docker create -p 8000:80 shaarli/shaarli
+d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
+
+# launch the container in the background
+$ docker start d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
+d40b7af693d678958adedfb88f87d6ea0237186c23de5c4102a55a8fcb499101
+
+# list active containers
+$ docker ps
+CONTAINER ID  IMAGE            COMMAND               CREATED         STATUS        PORTS                 NAMES
+d40b7af693d6  shaarli/shaarli  /usr/bin/supervisor  15 seconds ago  Up 4 seconds  0.0.0.0:8000->80/tcp  backstabbing_galileo
+
    + +

    Stop and destroy a container

    +
    $ docker stop backstabbing_galileo  # those docker guys are really rude to physicists!
+backstabbing_galileo
+
+# check the container is stopped
+$ docker ps
+CONTAINER ID  IMAGE            COMMAND               CREATED         STATUS        PORTS                 NAMES
+
+# list ALL containers
+$ docker ps -a
+CONTAINER ID        IMAGE               COMMAND                CREATED             STATUS                      PORTS               NAMES
+d40b7af693d6        shaarli/shaarli     /usr/bin/supervisor   5 minutes ago       Exited (0) 48 seconds ago                       backstabbing_galileo
+
+# destroy the container
+$ docker rm backstabbing_galileo  # let's put an end to these barbarian practices
+backstabbing_galileo
+
+$ docker ps -a
+CONTAINER ID  IMAGE            COMMAND               CREATED         STATUS        PORTS                 NAMES
+
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Static-analysis/index.html b/doc/html/Static-analysis/index.html new file mode 100644 index 0000000..0dfb551 --- /dev/null +++ b/doc/html/Static-analysis/index.html @@ -0,0 +1,359 @@ + + + + + + + + + + + Static analysis - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    WIP

    +

    This topic is currently being discussed here: +- Fix coding style (static analysis) (#95) +- Continuous Integration tools & features (#130)

    +

    Usage

    +

    Static analysis tools can be installed with Composer, and used through Shaarli's Makefile.

    +

    For an overview of the available features, see: +- Code quality: Makefile to run static code checkers (#124) +- Run PHPCS against different coding standards (#276)

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Theming/index.html b/doc/html/Theming/index.html new file mode 100644 index 0000000..70a36dd --- /dev/null +++ b/doc/html/Theming/index.html @@ -0,0 +1,435 @@ + + + + + + + + + + + Theming - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Foreword

    +

    There are two ways of customizing how Shaarli looks:

    +
      +
    1. by using a custom CSS to override Shaarli's CSS
      2. +
    2. by using a full theme that provides its own RainTPL templates, CSS and Javascript resources
      3. +
    +

    Custom CSS

    +

    Shaarli's appearance can be modified by adding CSS rules to: +- Shaarli < v0.9.0: inc/user.css +- Shaarli >= v0.9.0: data/user.css

    +

    This file allows overriding rules defined in the template CSS files (only add changed rules), or define a whole new theme.

    +

    Note: Do not edit tpl/default/css/shaarli.css! Your changes would be overridden when updating Shaarli.

    +

    See also Download CSS styles from an OPML list

    +

    Themes

    +

    WARNING - This feature is currently being worked on and will be improved in the next releases. Experimental.

    +

    Installation: +- find a theme you'd like to install +- copy or clone the theme folder under tpl/<a_sweet_theme> +- enable the theme: + - Shaarli < v0.9.0: edit data/config.json.php and set the value of raintpl_tpl to the new theme name: + "raintpl_tpl": "tpl\/my-template\/" + - Shaarli >= v0.9.0: select the theme through the Tools page

    +

    Community CSS & themes

    +

    Custom CSS

    + +

    Themes

    + +

    Shaarli forks

    + +

    Example installation: AlbinoMouse theme

    +

    With the following configuration: +- Apache 2 / PHP 5.6 +- user sites are enabled, e.g. /home/user/public_html/somedir is served as http://localhost/~user/somedir +- http is the name of the Apache user

    +
    $ cd ~/public_html
+
+# clone repositories
+$ git clone https://github.com/shaarli/Shaarli.git shaarli
+$ pushd shaarli/tpl
+$ git clone https://github.com/alexisju/albinomouse-template.git
+$ popd
+
+# set access rights for Apache
+$ chgrp -R http shaarli
+$ chmod g+rwx shaarli shaarli/cache shaarli/data shaarli/pagecache shaarli/tmp
+
    + +

    Get config written: +- go to the freshly installed site +- fill the install form +- log in to Shaarli

    +

    Edit Shaarli's configuration|Shaarli configuration:

    +
    # the file should be owned by Apache, thus not writeable => sudo
+$ sudo sed -i s=tpl=tpl/albinomouse-template=g shaarli/data/config.php
+
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Troubleshooting/index.html b/doc/html/Troubleshooting/index.html new file mode 100644 index 0000000..ed1c433 --- /dev/null +++ b/doc/html/Troubleshooting/index.html @@ -0,0 +1,441 @@ + + + + + + + + + + + Troubleshooting - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Troubleshooting

    +

    Browser

    +

    Redirection issues (HTTP Referer)

    +

    Depending on its configuration and installed plugins, the browser may remove or alter (spoof) HTTP referers, thus preventing Shaarli from properly redirecting between pages.

    +

    See: +- HTTP referer (Wikipedia) +- Improve online privacy by controlling referrer information +- Better security, privacy and anonymity in Firefox

    +

    Firefox HTTP Referer options

    +

    HTTP settings are available by browsing about:config, here are the available settings and their values.

    +

    network.http.sendRefererHeader - determines when to send the Referer HTTP header +- 0: Never send the referring URL + - not recommended, may break some sites +- 1: Send only on clicked links +- 2 (default): Send for links and images

    +

    network.http.referer.XOriginPolicy - Cross-domain origin policy +- 0 (default): Always send +- 1: Send if base domains match +- 2: Send if hosts match

    +

    network.http.referer.spoofSource - Referer spoofing (~faking) +- false (default): real referer +- true: spoof referer (use target URI as referer) + - known to break some functionality in Shaarli

    +

    network.http.referer.trimmingPolicy - trim the URI not to send a full Referer +- 0 (default): send full URI +- 1: scheme+host+port+path +- 2: scheme+host+port

    +

    Firefox, localhost and redirections

    +

    localhost is not a proper Fully Qualified Domain Name (FQDN); if Firefox has been set up to spoof referers, or only accept requests from the same base domain/host, Shaarli redirections will not work properly.

    +

    To solve this, assign a local domain to your host, e.g.

    +
    127.0.0.1 localhost desktop localhost.lan
+::1       localhost desktop localhost.lan
+
    + +

    and browse Shaarli at http://localhost.lan/.

    +

    Related threads: +- What is localhost.localdomain for? +- Stop returning to the first page after editing a bookmark from another page

    +

    Login

    +

    I forgot my password!

    +

    Delete the file data/config.php and display the page again. You will be asked for a new login/password.

    +

    I'm locked out - Login bruteforce protection

    +

    Login form is protected against brute force attacks: 4 failed logins will ban the IP address from login for 30 minutes. Banned IPs can still browse links.

    +

    To remove the current IP bans, delete the file data/ipbans.php

    +

    List of all login attempts

    +

    The file data/log.txt shows all logins (successful or failed) and bans/lifted bans. +Search for failed in this file to look for unauthorized login attempts.

    +

    Hosting problems

    +

    Old PHP versions

    +
      +
    • On free.fr : free.fr now support php 5.6.x(link)and so support now the tag autocompletion but you have to do the following : At the root of your webspace create a sessions directory and a .htaccess file containing:
      • +
    +
    <IfDefine Free>
+php56 1
+</IfDefine>
+
    + +
      +
    • If you have an error such as: Parse error: syntax error, unexpected '=', expecting '(' in /links/index.php on line xxx, it means that your host is using php4, not php5. Shaarli requires php 5.1. Try changing the file extension to .php5
      • +
    • On 1and1 : If you add the link from the page (and not from the bookmarklet), Shaarli will no be able to get the title of the page. You will have to enter it manually. (Because they have disabled the ability to download a file through HTTP).
      • +
    • If you have the error Warning: file_get_contents() [function.file-get-contents]: URL file-access is disabled in the server configuration in /…/index.php on line xxx, it means that your host has disabled the ability to fetch a file by HTTP in the php config (Typically in 1and1 hosting). Bad host. Change host. Or comment the following lines:
      • +
    +
    //list($status,$headers,$data) = getHTTP($url,4); // Short timeout to keep the application responsive.
+// FIXME: Decode charset according to charset specified in either 1) HTTP response headers or 2) <head> in html 
+//if (strpos($status,'200 OK')) $title=html_extract_title($data);
+
    + +
      +
    • On hosts which forbid outgoing HTTP requests (such as free.fr), some thumbnails will not work.
      • +
    • On lost-oasis, RSS doesn't work correctly, because of this message at the begining of the RSS/ATOM feed : <? // tout ce qui est charge ici (generalement des includes et require) est charge en permanence. ?>. To fix this, remove this message from php-include/prepend.php
      • +
    +

    Dates are not properly formatted

    +

    Shaarli tries to sniff the language of the browser (using HTTP_ACCEPT_LANGUAGE headers) and choose a date format accordingly. But Shaarli can only use the date formats (and more generaly speaking, the locales) provided by the webserver. So even if you have a browser in French, you may end up with dates in US format (it's the case on sebsauvage.net :-( )

    +

    Problems on CentOS servers

    +

    On CentOS/RedHat derivatives, you may need to install the php-mbstring package.

    +

    My session expires! I can't stay logged in

    +

    This can be caused by several things:

    +
      +
    • Your php installation may not have a proper directory setup for session files. (eg. on Free.fr you need to create a session directory on the root of your website.) You may need to create the session directory of set it up.
      • +
    • Most hosts regularly clean the temporary and session directories. Your host may be cleaning those directories too aggressively (eg.OVH hosts), forcing an expire of the session. You may want to set the session directory in your web root. (eg. Create the sessions subdirectory and add ini_set('session.save_path', $_SERVER['DOCUMENT_ROOT'].'/../sessions');. Make sure this directory is not browsable !)
      • +
    • If your IP address changes during surfing, Shaarli will force expire your session for security reasons (to prevent session cookie hijacking). This can happen when surfing from WiFi or 3G (you may have switched WiFi/3G access point), or in some corporate/university proxies which use load balancing (and may have proxies with several external IP addresses).
      • +
    • Some browser addons may interfer with HTTP headers (ipfuck/ipflood/GreaseMonkey…). Try disabling those.
      • +
    • You may be using OperaTurbo or OperaMini, which use their own proxies which may change from time to time.
      • +
    • If you have another application on the same webserver where Shaarli is installed, these application may forcefully expire php sessions.
      • +
    +

    Sessions do not seem to work correctly on your server

    +

    Follow the instructions in the error message. Make sure you are accessing shaarli via a direct IP address or a proper hostname. If you have no dots in the hostname (e.g. localhost or http://my-webserver/shaarli/), some browsers will not store cookies at all (this respects the HTTP cookie specification).

    +

    pubsubhubbub support

    +

    Download publisher.php at the root of your Shaarli installation and set $GLOBALS['config']['PUBSUBHUB_URL'] in your config.php

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Unit-tests/index.html b/doc/html/Unit-tests/index.html new file mode 100644 index 0000000..84580db --- /dev/null +++ b/doc/html/Unit-tests/index.html @@ -0,0 +1,492 @@ + + + + + + + + + + + Unit tests - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Setup your environment for tests

    +

    The framework used is PHPUnit; it can be installed with Composer, which is a dependency management tool.

    +

    Regarding Composer, you can either use: + a system-wide version, e.g. installed through your distro's package manager + a local version, downloadable here

    +

    Sample usage

    +
    # system-wide version
+$ composer install
+$ composer update
+
+# local version
+$ php composer.phar self-update
+$ php composer.phar install
+$ php composer.phar update
+
    + +

    Install Shaarli dev dependencies

    +
    $ cd /path/to/shaarli
+$ composer update
+
    + +

    Install and enable Xdebug to generate PHPUnit coverage reports

    +

    For Debian-based distros:

    +
    $ aptitude install php5-xdebug
+
    + +

    For ArchLinux:

    +
    $ pacman -S xdebug
+
    + +

    Then add the following line to /etc/php/php.ini:

    +
    zend_extension=xdebug.so
+
    + +

    Run unit tests

    +

    Successful test suite:

    +
    $ make test
+
+-------
+PHPUNIT
+-------
+PHPUnit 4.6.9 by Sebastian Bergmann and contributors.
+
+Configuration read from /home/virtualtam/public_html/shaarli/phpunit.xml
+
+....................................
+
+Time: 759 ms, Memory: 8.25Mb
+
+OK (36 tests, 65 assertions)
+
    + +

    Test suite with failures and errors:

    +
    $ make test
+-------
+PHPUNIT
+-------
+PHPUnit 4.6.9 by Sebastian Bergmann and contributors.
+
+Configuration read from /home/virtualtam/public_html/shaarli/phpunit.xml
+
+E..FF...............................
+
+Time: 802 ms, Memory: 8.25Mb
+
+There was 1 error:
+
+1) LinkDBTest::testConstructLoggedIn
+Missing argument 2 for LinkDB::__construct(), called in /home/virtualtam/public_html/shaarli/tests/Link\
+DBTest.php on line 79 and defined
+
+/home/virtualtam/public_html/shaarli/application/LinkDB.php:58
+/home/virtualtam/public_html/shaarli/tests/LinkDBTest.php:79
+
+--
+
+There were 2 failures:
+
+1) LinkDBTest::testCheckDBNew
+Failed asserting that two strings are equal.
+--- Expected
++++ Actual
+@@ @@
+-'e3edea8ea7bb50be4bcb404df53fbb4546a7156e'
++'85eab0c610d4f68025f6ed6e6b6b5fabd4b55834'
+
+/home/virtualtam/public_html/shaarli/tests/LinkDBTest.php:121
+
+2) LinkDBTest::testCheckDBLoad
+Failed asserting that two strings are equal.
+--- Expected
++++ Actual
+@@ @@
+-'e3edea8ea7bb50be4bcb404df53fbb4546a7156e'
++'85eab0c610d4f68025f6ed6e6b6b5fabd4b55834'
+
+/home/virtualtam/public_html/shaarli/tests/LinkDBTest.php:133
+
+FAILURES!
+Tests: 36, Assertions: 63, Errors: 1, Failures: 2.
+
    + +

    Test results and coverage

    +

    By default, PHPUnit will run all suitable tests found under the tests directory.

    +

    Each test has 3 possible outcomes: + . - success + F - failure: the test was run but its results are invalid + * the code does not behave as expected + * dependencies to external elements: globals, session, cache... +* E - error: something went wrong and the tested code has crashed + * typos in the code, or in the test code + * dependencies to missing external elements

    +

    If Xdebug has been installed and activated, two coverage reports will be generated: + a summary in the console + a detailed HTML report with metrics for tested code + * to open it in a web browser: firefox coverage/index.html &

    +

    Executing specific tests

    +

    Add a @group annotation in a test class or method comment:

    +
    /**
+ * Netscape bookmark import
+ * @group WIP
+ */
+class BookmarkImportTest extends PHPUnit_Framework_TestCase
+{
+   [...]
+}
+
    + +

    To run all tests annotated with @group WIP:

    +
    $ vendor/bin/phpunit --group WIP tests/
+
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Upgrade-and-migration/index.html b/doc/html/Upgrade-and-migration/index.html new file mode 100644 index 0000000..642942b --- /dev/null +++ b/doc/html/Upgrade-and-migration/index.html @@ -0,0 +1,534 @@ + + + + + + + + + + + Upgrade and migration - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Preparation

    +

    Note your current version

    +

    If anything goes wrong, it's important for us to know which version you're upgrading from.
    +The current version is present in the version.php file.

    +

    Backup your data

    +

    Shaarli stores all user data under the data directory: +- data/config.php - main configuration file +- data/datastore.php - bookmarked links +- data/ipbans.php - banned IP addresses +- data/updates.txt - contains all automatic update to the configuration and datastore files already run

    +

    See Shaarli configuration for more information about Shaarli resources.

    +

    It is recommended to backup this repository before starting updating/upgrading Shaarli: +- users with SSH access: copy or archive the directory to a temporary location +- users with FTP access: download a local copy of your Shaarli installation using your favourite client

    +

    Migrating data from a previous installation

    +

    As all user data is kept under data, this is the only directory you need to worry about when migrating to a new installation, which corresponds to the following steps:

    +
      +
    • backup the data directory
      • +
    • install or update Shaarli: +
      • +
    • check or restore the data directory
      • +
    + +

    All tagged revisions can be downloaded as tarballs or ZIP archives from the releases page.

    +

    We recommend that you use the latest release tarball with the -full suffix. It contains the dependencies, please read Download and installation for git complete instructions.

    +

    Once downloaded, extract the archive locally and update your remote installation (e.g. via FTP) -be sure you keep the content of the data directory!

    +

    After upgrading, access your fresh Shaarli installation from a web browser; the configuration and data store will then be automatically updated, and new settings added to data/config.json.php (see Shaarli configuration for more details).

    +

    Upgrading with Git

    +

    Updating a community Shaarli

    +

    If you have installed Shaarli from the community Git repository, simply pull new changes from your local clone:

    +
    $ cd /path/to/shaarli
+$ git pull
+
+From github.com:shaarli/Shaarli
+ * branch            master     -> FETCH_HEAD
+Updating ebd67c6..521f0e6
+Fast-forward
+ application/Url.php   | 1 +
+ shaarli_version.php   | 2 +-
+ tests/Url/UrlTest.php | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
    + +

    Shaarli >= v0.8.x: install/update third-party PHP dependencies using Composer:

    +
    $ composer install --no-dev
+
+Loading composer repositories with package information
+Updating dependencies
+  - Installing shaarli/netscape-bookmark-parser (v1.0.1)
+    Downloading: 100%
+
    + +

    Migrating and upgrading from Sebsauvage's repository

    +

    If you have installed Shaarli from Sebsauvage's original Git repository, you can use Git remotes to update your working copy.

    +

    The following guide assumes that: +- you have a basic knowledge of Git branching and remote repositories +- the default remote is named origin and points to Sebsauvage's repository +- the current branch is master + - if you have personal branches containing customizations, you will need to rebase them after the upgrade; beware though, a lot of changes have been made since the community fork has been created, so things are very likely to break! +- the working copy is clean: + - no versioned file has been locally modified + - no untracked files are present

    +

    Step 0: show repository information

    +
    $ cd /path/to/shaarli
+
+$ git remote -v
+origin  https://github.com/sebsauvage/Shaarli (fetch)
+origin  https://github.com/sebsauvage/Shaarli (push)
+
+$ git branch -vv
+* master 029f75f [origin/master] Update README.md
+
+$ git status
+On branch master
+Your branch is up-to-date with 'origin/master'.
+nothing to commit, working directory clean
+
    + +

    Step 1: update Git remotes

    +
    $ git remote rename origin sebsauvage
+$ git remote -v
+sebsauvage  https://github.com/sebsauvage/Shaarli (fetch)
+sebsauvage  https://github.com/sebsauvage/Shaarli (push)
+
+$ git remote add origin https://github.com/shaarli/Shaarli
+$ git fetch origin
+
+remote: Counting objects: 3015, done.
+remote: Compressing objects: 100% (19/19), done.
+remote: Total 3015 (delta 446), reused 457 (delta 446), pack-reused 2550
+Receiving objects: 100% (3015/3015), 2.59 MiB | 918.00 KiB/s, done.
+Resolving deltas: 100% (1899/1899), completed with 48 local objects.
+From https://github.com/shaarli/Shaarli
+ * [new branch]      master     -> origin/master
+ * [new branch]      stable     -> origin/stable
+[...]
+ * [new tag]         v0.6.4     -> v0.6.4
+ * [new tag]         v0.7.0     -> v0.7.0
+
    + +

    Step 2: use the stable community branch

    +
    $ git checkout origin/stable -b stable
+Branch stable set up to track remote branch stable from origin.
+Switched to a new branch 'stable'
+
+$ git branch -vv
+  master 029f75f [sebsauvage/master] Update README.md
+* stable 890afc3 [origin/stable] Merge pull request #509 from ArthurHoaro/v0.6.5
+
    + +

    Shaarli >= v0.8.x: install/update third-party PHP dependencies using Composer:

    +
    $ composer install --no-dev
+
+Loading composer repositories with package information
+Updating dependencies
+  - Installing shaarli/netscape-bookmark-parser (v1.0.1)
+    Downloading: 100%
+
    + +

    Optionally, you can delete information related to the legacy version:

    +
    $ git branch -D master
+Deleted branch master (was 029f75f).
+
+$ git remote remove sebsauvage
+
+$ git remote -v
+origin  https://github.com/shaarli/Shaarli (fetch)
+origin  https://github.com/shaarli/Shaarli (push)
+
+$ git gc
+Counting objects: 3317, done.
+Delta compression using up to 8 threads.
+Compressing objects: 100% (1237/1237), done.
+Writing objects: 100% (3317/3317), done.
+Total 3317 (delta 2050), reused 3301 (delta 2034)to
+
    + +

    Step 3: configuration

    +

    After migrating, access your fresh Shaarli installation from a web browser; the configuration will then be automatically updated, and new settings added to data/config.php (see Shaarli configuration for more details).

    +

    Troubleshooting

    +

    If the solutions provided here doesn't work, please open an issue specifying which version you're upgrading from and to.

    +

    You must specify an integer as a key

    +

    In v0.8.1 we changed how link keys are handled (from timestamps to incremental integers). +Take a look at data/updates.txt content.

    +

    updates.txt contains updateMethodDatastoreIds

    +

    Try to delete it and refresh your page while being logged in.

    +

    updates.txt doesn't exists or doesn't contain updateMethodDatastoreIds

    +
      +
    1. Create data/updates.txt if it doesn't exist.
      2. +
    2. Paste this string in the update file ;updateMethodRenameDashTags;
      3. +
    3. Login to Shaarli.
      4. +
    4. Delete the update file.
      5. +
    5. Refresh.
      6. +
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/html/Versioning-and-Branches/index.html b/doc/html/Versioning-and-Branches/index.html new file mode 100644 index 0000000..406ad7f --- /dev/null +++ b/doc/html/Versioning-and-Branches/index.html @@ -0,0 +1,418 @@ + + + + + + + + + + + Versioning and Branches - Shaarli Documentation + + + + + + + + + + + + + + + + + +
    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    WORK IN PROGRESS

    +

    It's important to understand how Shaarli branches work, especially if you're maintaining a 3rd party tools for Shaarli (theme, plugin, etc.), to be sure stay compatible.

    +

    master branch

    +

    The master branch is the development branch. Any new change MUST go through this branch using Pull Requests.

    +

    Remarks:

    +
      +
    • This branch shouldn't be used for production as it isn't necessary stable.
      • +
    • 3rd party aren't required to be compatible with the latest changes.
      • +
    • Official plugins, themes and libraries (contained within Shaarli organization repos) must be compatible with the master branch.
      • +
    • The version in this branch is always dev.
      • +
    +

    v0.x branch

    +

    This v0.x branch, points to the latest v0.x.y release.

    +

    Explanation:

    +

    When a new version is released, it might contains a major bug which isn't detected right away. For example, a new PHP version is released, containing backward compatibility issue which doesn't work with Shaarli.

    +

    In this case, the issue is fixed in the master branch, and the fix is backported the to the v0.x branch. Then a new release is made from the v0.x branch.

    +

    This workflow allow us to fix any major bug detected, without having to release bleeding edge feature too soon.

    +

    latest branch

    +

    This branch point the latest release. It recommended to use it to get the latest tested changes.

    +

    stable branch

    +

    The stable branch doesn't contain any major bug, and is one major digit version behind the latest release.

    +

    For example, the current latest release is v0.8.3, the stable branch is an alias to the latest v0.7.x release. When the v0.9.0 version will be released, the stable will move to the latest v0.8.x release.

    +

    Remarks:

    +
      +
    • Shaarli release pace isn't fast, and the stable branch might be a few months behind the latest release.
      • +
    +

    Releases

    +

    Releases are always made from the latest v0.x branch.

    +

    Note that for every release, we manually generate a tarball which contains all Shaarli dependencies, making Shaarli's installation only one step.

    +

    Advices on 3rd party git repos workflow

    +

    Versioning

    +

    Any time a new Shaarli release is published, you should publish a new release of your repo if the changes affected you since the latest release (take a look at the changelog (Draft means not released yet) and the commit log (like tpl folder for themes)). You can either:

    +
      +
    • use the Shaarli version number, with your repo version. For example, if Shaarli v0.8.3 is released, publish a v0.8.3-1 release, where v0.8.3 states Shaarli compatibility and -1 is your own version digit for the current Shaarli version.
      • +
    • use your own versioning scheme, and state Shaarli compatibility in the release description.
      • +
    +

    Using this, any user will be able to pick the release matching his own Shaarli version.

    +

    Major bugfix backport releases

    +

    To be able to support backported fixes, it recommended to use our workflow:

    +
    # In master, fix the major bug
+git commit -m "Katastrophe"
+git push origin master
+# Get your commit hash
+git log --format="%H" -n 1
+# Create a new branch from your latest release, let's say v0.8.2-1 (the tag name)
+git checkout -b katastrophe v0.8.2-1
+# Backport the fix commit to your brand new branch
+git cherry-pick <fix commit hash>
+git push origin katastrophe
+# Then you just have to make a new release from the `katastrophe` branch tagged `v0.8.3-1`
+
    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + « Previous + + + Next » + + +
    + + + + diff --git a/doc/config.json b/doc/html/config.json similarity index 100% rename from doc/config.json rename to doc/html/config.json diff --git a/doc/html/css/highlight.css b/doc/html/css/highlight.css new file mode 100644 index 0000000..0ae40a7 --- /dev/null +++ b/doc/html/css/highlight.css @@ -0,0 +1,124 @@ +/* +This is the GitHub theme for highlight.js + +github.com style (c) Vasily Polovnyov + +*/ + +.hljs { + display: block; + overflow-x: auto; + color: #333; + -webkit-text-size-adjust: none; +} + +.hljs-comment, +.diff .hljs-header, +.hljs-javadoc { + color: #998; + font-style: italic; +} + +.hljs-keyword, +.css .rule .hljs-keyword, +.hljs-winutils, +.nginx .hljs-title, +.hljs-subst, +.hljs-request, +.hljs-status { + color: #333; + font-weight: bold; +} + +.hljs-number, +.hljs-hexcolor, +.ruby .hljs-constant { + color: #008080; +} + +.hljs-string, +.hljs-tag .hljs-value, +.hljs-phpdoc, +.hljs-dartdoc, +.tex .hljs-formula { + color: #d14; +} + +.hljs-title, +.hljs-id, +.scss .hljs-preprocessor { + color: #900; + font-weight: bold; +} + +.hljs-list .hljs-keyword, +.hljs-subst { + font-weight: normal; +} + +.hljs-class .hljs-title, +.hljs-type, +.vhdl .hljs-literal, +.tex .hljs-command { + color: #458; + font-weight: bold; +} + +.hljs-tag, +.hljs-tag .hljs-title, +.hljs-rule .hljs-property, +.django .hljs-tag .hljs-keyword { + color: #000080; + font-weight: normal; +} + +.hljs-attribute, +.hljs-variable, +.lisp .hljs-body, +.hljs-name { + color: #008080; +} + +.hljs-regexp { + color: #009926; +} + +.hljs-symbol, +.ruby .hljs-symbol .hljs-string, +.lisp .hljs-keyword, +.clojure .hljs-keyword, +.scheme .hljs-keyword, +.tex .hljs-special, +.hljs-prompt { + color: #990073; +} + +.hljs-built_in { + color: #0086b3; +} + +.hljs-preprocessor, +.hljs-pragma, +.hljs-pi, +.hljs-doctype, +.hljs-shebang, +.hljs-cdata { + color: #999; + font-weight: bold; +} + +.hljs-deletion { + background: #fdd; +} + +.hljs-addition { + background: #dfd; +} + +.diff .hljs-change { + background: #0086b3; +} + +.hljs-chunk { + color: #aaa; +} diff --git a/doc/html/css/theme.css b/doc/html/css/theme.css new file mode 100644 index 0000000..099a2d8 --- /dev/null +++ b/doc/html/css/theme.css @@ -0,0 +1,12 @@ +/* + * This file is copied from the upstream ReadTheDocs Sphinx + * theme. To aid upgradability this file should *not* be edited. + * modifications we need should be included in theme_extra.css. + * + * https://github.com/rtfd/readthedocs.org/blob/master/readthedocs/core/static/core/css/theme.css + */ + +*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}[hidden]{display:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:hover,a:active{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}blockquote{margin:0}dfn{font-style:italic}ins{background:#ff9;color:#000;text-decoration:none}mark{background:#ff0;color:#000;font-style:italic;font-weight:bold}pre,code,.rst-content tt,kbd,samp{font-family:monospace,serif;_font-family:"courier new",monospace;font-size:1em}pre{white-space:pre}q{quotes:none}q:before,q:after{content:"";content:none}small{font-size:85%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}ul,ol,dl{margin:0;padding:0;list-style:none;list-style-image:none}li{list-style:none}dd{margin:0}img{border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;max-width:100%}svg:not(:root){overflow:hidden}figure{margin:0}form{margin:0}fieldset{border:0;margin:0;padding:0}label{cursor:pointer}legend{border:0;*margin-left:-7px;padding:0;white-space:normal}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;*overflow:visible}button[disabled],input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;*width:13px;*height:13px}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top;resize:vertical}table{border-collapse:collapse;border-spacing:0}td{vertical-align:top}.chromeframe{margin:0.2em 0;background:#ccc;color:#000;padding:0.2em 0}.ir{display:block;border:0;text-indent:-999em;overflow:hidden;background-color:transparent;background-repeat:no-repeat;text-align:left;direction:ltr;*line-height:0}.ir br{display:none}.hidden{display:none !important;visibility:hidden}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.relative{position:relative}big,small{font-size:100%}@media print{html,body,section{background:none !important}*{box-shadow:none !important;text-shadow:none !important;filter:none !important;-ms-filter:none !important}a,a:visited{text-decoration:underline}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:0.5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}.fa:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before,.icon:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.rst-content .seealso,.rst-content .admonition-todo,.btn,input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"],select,textarea,.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a,.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a,.wy-nav-top a{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}/*! + * Font Awesome 4.1.0 by @davegandy - http://fontawesome.io - @fontawesome + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) + */@font-face{font-family:'FontAwesome';src:url("../fonts/fontawesome-webfont.eot?v=4.1.0");src:url("../fonts/fontawesome-webfont.eot?#iefix&v=4.1.0") format("embedded-opentype"),url("../fonts/fontawesome-webfont.woff?v=4.1.0") format("woff"),url("../fonts/fontawesome-webfont.ttf?v=4.1.0") format("truetype"),url("../fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular") format("svg");font-weight:normal;font-style:normal}.fa,.rst-content .admonition-title,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.icon{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333em;line-height:0.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14286em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14286em;width:2.14286em;top:0.14286em;text-align:center}.fa-li.fa-lg{left:-1.85714em}.fa-border{padding:.2em .25em .15em;border:solid 0.08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left,.rst-content .pull-left.admonition-title,.rst-content h1 .pull-left.headerlink,.rst-content h2 .pull-left.headerlink,.rst-content h3 .pull-left.headerlink,.rst-content h4 .pull-left.headerlink,.rst-content h5 .pull-left.headerlink,.rst-content h6 .pull-left.headerlink,.rst-content dl dt .pull-left.headerlink,.pull-left.icon{margin-right:.3em}.fa.pull-right,.rst-content .pull-right.admonition-title,.rst-content h1 .pull-right.headerlink,.rst-content h2 .pull-right.headerlink,.rst-content h3 .pull-right.headerlink,.rst-content h4 .pull-right.headerlink,.rst-content h5 .pull-right.headerlink,.rst-content h6 .pull-right.headerlink,.rst-content dl dt .pull-right.headerlink,.pull-right.icon{margin-left:.3em}.fa-spin{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0);-webkit-transform:scale(-1, 1);-moz-transform:scale(-1, 1);-ms-transform:scale(-1, 1);-o-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:scale(1, -1);-moz-transform:scale(1, -1);-ms-transform:scale(1, -1);-o-transform:scale(1, -1);transform:scale(1, -1)}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:""}.fa-music:before{content:""}.fa-search:before,.icon-search:before{content:""}.fa-envelope-o:before{content:""}.fa-heart:before{content:""}.fa-star:before{content:""}.fa-star-o:before{content:""}.fa-user:before{content:""}.fa-film:before{content:""}.fa-th-large:before{content:""}.fa-th:before{content:""}.fa-th-list:before{content:""}.fa-check:before{content:""}.fa-times:before{content:""}.fa-search-plus:before{content:""}.fa-search-minus:before{content:""}.fa-power-off:before{content:""}.fa-signal:before{content:""}.fa-gear:before,.fa-cog:before{content:""}.fa-trash-o:before{content:""}.fa-home:before,.icon-home:before{content:""}.fa-file-o:before{content:""}.fa-clock-o:before{content:""}.fa-road:before{content:""}.fa-download:before{content:""}.fa-arrow-circle-o-down:before{content:""}.fa-arrow-circle-o-up:before{content:""}.fa-inbox:before{content:""}.fa-play-circle-o:before{content:""}.fa-rotate-right:before,.fa-repeat:before{content:""}.fa-refresh:before{content:""}.fa-list-alt:before{content:""}.fa-lock:before{content:""}.fa-flag:before{content:""}.fa-headphones:before{content:""}.fa-volume-off:before{content:""}.fa-volume-down:before{content:""}.fa-volume-up:before{content:""}.fa-qrcode:before{content:""}.fa-barcode:before{content:""}.fa-tag:before{content:""}.fa-tags:before{content:""}.fa-book:before,.icon-book:before{content:""}.fa-bookmark:before{content:""}.fa-print:before{content:""}.fa-camera:before{content:""}.fa-font:before{content:""}.fa-bold:before{content:""}.fa-italic:before{content:""}.fa-text-height:before{content:""}.fa-text-width:before{content:""}.fa-align-left:before{content:""}.fa-align-center:before{content:""}.fa-align-right:before{content:""}.fa-align-justify:before{content:""}.fa-list:before{content:""}.fa-dedent:before,.fa-outdent:before{content:""}.fa-indent:before{content:""}.fa-video-camera:before{content:""}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:""}.fa-pencil:before{content:""}.fa-map-marker:before{content:""}.fa-adjust:before{content:""}.fa-tint:before{content:""}.fa-edit:before,.fa-pencil-square-o:before{content:""}.fa-share-square-o:before{content:""}.fa-check-square-o:before{content:""}.fa-arrows:before{content:""}.fa-step-backward:before{content:""}.fa-fast-backward:before{content:""}.fa-backward:before{content:""}.fa-play:before{content:""}.fa-pause:before{content:""}.fa-stop:before{content:""}.fa-forward:before{content:""}.fa-fast-forward:before{content:""}.fa-step-forward:before{content:""}.fa-eject:before{content:""}.fa-chevron-left:before{content:""}.fa-chevron-right:before{content:""}.fa-plus-circle:before{content:""}.fa-minus-circle:before{content:""}.fa-times-circle:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before{content:""}.fa-check-circle:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before{content:""}.fa-question-circle:before{content:""}.fa-info-circle:before{content:""}.fa-crosshairs:before{content:""}.fa-times-circle-o:before{content:""}.fa-check-circle-o:before{content:""}.fa-ban:before{content:""}.fa-arrow-left:before{content:""}.fa-arrow-right:before{content:""}.fa-arrow-up:before{content:""}.fa-arrow-down:before{content:""}.fa-mail-forward:before,.fa-share:before{content:""}.fa-expand:before{content:""}.fa-compress:before{content:""}.fa-plus:before{content:""}.fa-minus:before{content:""}.fa-asterisk:before{content:""}.fa-exclamation-circle:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.rst-content .admonition-title:before{content:""}.fa-gift:before{content:""}.fa-leaf:before{content:""}.fa-fire:before,.icon-fire:before{content:""}.fa-eye:before{content:""}.fa-eye-slash:before{content:""}.fa-warning:before,.fa-exclamation-triangle:before{content:""}.fa-plane:before{content:""}.fa-calendar:before{content:""}.fa-random:before{content:""}.fa-comment:before{content:""}.fa-magnet:before{content:""}.fa-chevron-up:before{content:""}.fa-chevron-down:before{content:""}.fa-retweet:before{content:""}.fa-shopping-cart:before{content:""}.fa-folder:before{content:""}.fa-folder-open:before{content:""}.fa-arrows-v:before{content:""}.fa-arrows-h:before{content:""}.fa-bar-chart-o:before{content:""}.fa-twitter-square:before{content:""}.fa-facebook-square:before{content:""}.fa-camera-retro:before{content:""}.fa-key:before{content:""}.fa-gears:before,.fa-cogs:before{content:""}.fa-comments:before{content:""}.fa-thumbs-o-up:before{content:""}.fa-thumbs-o-down:before{content:""}.fa-star-half:before{content:""}.fa-heart-o:before{content:""}.fa-sign-out:before{content:""}.fa-linkedin-square:before{content:""}.fa-thumb-tack:before{content:""}.fa-external-link:before{content:""}.fa-sign-in:before{content:""}.fa-trophy:before{content:""}.fa-github-square:before{content:""}.fa-upload:before{content:""}.fa-lemon-o:before{content:""}.fa-phone:before{content:""}.fa-square-o:before{content:""}.fa-bookmark-o:before{content:""}.fa-phone-square:before{content:""}.fa-twitter:before{content:""}.fa-facebook:before{content:""}.fa-github:before,.icon-github:before{content:""}.fa-unlock:before{content:""}.fa-credit-card:before{content:""}.fa-rss:before{content:""}.fa-hdd-o:before{content:""}.fa-bullhorn:before{content:""}.fa-bell:before{content:""}.fa-certificate:before{content:""}.fa-hand-o-right:before{content:""}.fa-hand-o-left:before{content:""}.fa-hand-o-up:before{content:""}.fa-hand-o-down:before{content:""}.fa-arrow-circle-left:before,.icon-circle-arrow-left:before{content:""}.fa-arrow-circle-right:before,.icon-circle-arrow-right:before{content:""}.fa-arrow-circle-up:before{content:""}.fa-arrow-circle-down:before{content:""}.fa-globe:before{content:""}.fa-wrench:before{content:""}.fa-tasks:before{content:""}.fa-filter:before{content:""}.fa-briefcase:before{content:""}.fa-arrows-alt:before{content:""}.fa-group:before,.fa-users:before{content:""}.fa-chain:before,.fa-link:before,.icon-link:before{content:""}.fa-cloud:before{content:""}.fa-flask:before{content:""}.fa-cut:before,.fa-scissors:before{content:""}.fa-copy:before,.fa-files-o:before{content:""}.fa-paperclip:before{content:""}.fa-save:before,.fa-floppy-o:before{content:""}.fa-square:before{content:""}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:""}.fa-list-ul:before{content:""}.fa-list-ol:before{content:""}.fa-strikethrough:before{content:""}.fa-underline:before{content:""}.fa-table:before{content:""}.fa-magic:before{content:""}.fa-truck:before{content:""}.fa-pinterest:before{content:""}.fa-pinterest-square:before{content:""}.fa-google-plus-square:before{content:""}.fa-google-plus:before{content:""}.fa-money:before{content:""}.fa-caret-down:before,.wy-dropdown .caret:before,.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.fa-caret-left:before{content:""}.fa-caret-right:before{content:""}.fa-columns:before{content:""}.fa-unsorted:before,.fa-sort:before{content:""}.fa-sort-down:before,.fa-sort-desc:before{content:""}.fa-sort-up:before,.fa-sort-asc:before{content:""}.fa-envelope:before{content:""}.fa-linkedin:before{content:""}.fa-rotate-left:before,.fa-undo:before{content:""}.fa-legal:before,.fa-gavel:before{content:""}.fa-dashboard:before,.fa-tachometer:before{content:""}.fa-comment-o:before{content:""}.fa-comments-o:before{content:""}.fa-flash:before,.fa-bolt:before{content:""}.fa-sitemap:before{content:""}.fa-umbrella:before{content:""}.fa-paste:before,.fa-clipboard:before{content:""}.fa-lightbulb-o:before{content:""}.fa-exchange:before{content:""}.fa-cloud-download:before{content:""}.fa-cloud-upload:before{content:""}.fa-user-md:before{content:""}.fa-stethoscope:before{content:""}.fa-suitcase:before{content:""}.fa-bell-o:before{content:""}.fa-coffee:before{content:""}.fa-cutlery:before{content:""}.fa-file-text-o:before{content:""}.fa-building-o:before{content:""}.fa-hospital-o:before{content:""}.fa-ambulance:before{content:""}.fa-medkit:before{content:""}.fa-fighter-jet:before{content:""}.fa-beer:before{content:""}.fa-h-square:before{content:""}.fa-plus-square:before{content:""}.fa-angle-double-left:before{content:""}.fa-angle-double-right:before{content:""}.fa-angle-double-up:before{content:""}.fa-angle-double-down:before{content:""}.fa-angle-left:before{content:""}.fa-angle-right:before{content:""}.fa-angle-up:before{content:""}.fa-angle-down:before{content:""}.fa-desktop:before{content:""}.fa-laptop:before{content:""}.fa-tablet:before{content:""}.fa-mobile-phone:before,.fa-mobile:before{content:""}.fa-circle-o:before{content:""}.fa-quote-left:before{content:""}.fa-quote-right:before{content:""}.fa-spinner:before{content:""}.fa-circle:before{content:""}.fa-mail-reply:before,.fa-reply:before{content:""}.fa-github-alt:before{content:""}.fa-folder-o:before{content:""}.fa-folder-open-o:before{content:""}.fa-smile-o:before{content:""}.fa-frown-o:before{content:""}.fa-meh-o:before{content:""}.fa-gamepad:before{content:""}.fa-keyboard-o:before{content:""}.fa-flag-o:before{content:""}.fa-flag-checkered:before{content:""}.fa-terminal:before{content:""}.fa-code:before{content:""}.fa-mail-reply-all:before,.fa-reply-all:before{content:""}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:""}.fa-location-arrow:before{content:""}.fa-crop:before{content:""}.fa-code-fork:before{content:""}.fa-unlink:before,.fa-chain-broken:before{content:""}.fa-question:before{content:""}.fa-info:before{content:""}.fa-exclamation:before{content:""}.fa-superscript:before{content:""}.fa-subscript:before{content:""}.fa-eraser:before{content:""}.fa-puzzle-piece:before{content:""}.fa-microphone:before{content:""}.fa-microphone-slash:before{content:""}.fa-shield:before{content:""}.fa-calendar-o:before{content:""}.fa-fire-extinguisher:before{content:""}.fa-rocket:before{content:""}.fa-maxcdn:before{content:""}.fa-chevron-circle-left:before{content:""}.fa-chevron-circle-right:before{content:""}.fa-chevron-circle-up:before{content:""}.fa-chevron-circle-down:before{content:""}.fa-html5:before{content:""}.fa-css3:before{content:""}.fa-anchor:before{content:""}.fa-unlock-alt:before{content:""}.fa-bullseye:before{content:""}.fa-ellipsis-h:before{content:""}.fa-ellipsis-v:before{content:""}.fa-rss-square:before{content:""}.fa-play-circle:before{content:""}.fa-ticket:before{content:""}.fa-minus-square:before{content:""}.fa-minus-square-o:before{content:""}.fa-level-up:before{content:""}.fa-level-down:before{content:""}.fa-check-square:before{content:""}.fa-pencil-square:before{content:""}.fa-external-link-square:before{content:""}.fa-share-square:before{content:""}.fa-compass:before{content:""}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:""}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:""}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:""}.fa-euro:before,.fa-eur:before{content:""}.fa-gbp:before{content:""}.fa-dollar:before,.fa-usd:before{content:""}.fa-rupee:before,.fa-inr:before{content:""}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:""}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:""}.fa-won:before,.fa-krw:before{content:""}.fa-bitcoin:before,.fa-btc:before{content:""}.fa-file:before{content:""}.fa-file-text:before{content:""}.fa-sort-alpha-asc:before{content:""}.fa-sort-alpha-desc:before{content:""}.fa-sort-amount-asc:before{content:""}.fa-sort-amount-desc:before{content:""}.fa-sort-numeric-asc:before{content:""}.fa-sort-numeric-desc:before{content:""}.fa-thumbs-up:before{content:""}.fa-thumbs-down:before{content:""}.fa-youtube-square:before{content:""}.fa-youtube:before{content:""}.fa-xing:before{content:""}.fa-xing-square:before{content:""}.fa-youtube-play:before{content:""}.fa-dropbox:before{content:""}.fa-stack-overflow:before{content:""}.fa-instagram:before{content:""}.fa-flickr:before{content:""}.fa-adn:before{content:""}.fa-bitbucket:before,.icon-bitbucket:before{content:""}.fa-bitbucket-square:before{content:""}.fa-tumblr:before{content:""}.fa-tumblr-square:before{content:""}.fa-long-arrow-down:before{content:""}.fa-long-arrow-up:before{content:""}.fa-long-arrow-left:before{content:""}.fa-long-arrow-right:before{content:""}.fa-apple:before{content:""}.fa-windows:before{content:""}.fa-android:before{content:""}.fa-linux:before{content:""}.fa-dribbble:before{content:""}.fa-skype:before{content:""}.fa-foursquare:before{content:""}.fa-trello:before{content:""}.fa-female:before{content:""}.fa-male:before{content:""}.fa-gittip:before{content:""}.fa-sun-o:before{content:""}.fa-moon-o:before{content:""}.fa-archive:before{content:""}.fa-bug:before{content:""}.fa-vk:before{content:""}.fa-weibo:before{content:""}.fa-renren:before{content:""}.fa-pagelines:before{content:""}.fa-stack-exchange:before{content:""}.fa-arrow-circle-o-right:before{content:""}.fa-arrow-circle-o-left:before{content:""}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:""}.fa-dot-circle-o:before{content:""}.fa-wheelchair:before{content:""}.fa-vimeo-square:before{content:""}.fa-turkish-lira:before,.fa-try:before{content:""}.fa-plus-square-o:before{content:""}.fa-space-shuttle:before{content:""}.fa-slack:before{content:""}.fa-envelope-square:before{content:""}.fa-wordpress:before{content:""}.fa-openid:before{content:""}.fa-institution:before,.fa-bank:before,.fa-university:before{content:""}.fa-mortar-board:before,.fa-graduation-cap:before{content:""}.fa-yahoo:before{content:""}.fa-google:before{content:""}.fa-reddit:before{content:""}.fa-reddit-square:before{content:""}.fa-stumbleupon-circle:before{content:""}.fa-stumbleupon:before{content:""}.fa-delicious:before{content:""}.fa-digg:before{content:""}.fa-pied-piper-square:before,.fa-pied-piper:before{content:""}.fa-pied-piper-alt:before{content:""}.fa-drupal:before{content:""}.fa-joomla:before{content:""}.fa-language:before{content:""}.fa-fax:before{content:""}.fa-building:before{content:""}.fa-child:before{content:""}.fa-paw:before{content:""}.fa-spoon:before{content:""}.fa-cube:before{content:""}.fa-cubes:before{content:""}.fa-behance:before{content:""}.fa-behance-square:before{content:""}.fa-steam:before{content:""}.fa-steam-square:before{content:""}.fa-recycle:before{content:""}.fa-automobile:before,.fa-car:before{content:""}.fa-cab:before,.fa-taxi:before{content:""}.fa-tree:before{content:""}.fa-spotify:before{content:""}.fa-deviantart:before{content:""}.fa-soundcloud:before{content:""}.fa-database:before{content:""}.fa-file-pdf-o:before{content:""}.fa-file-word-o:before{content:""}.fa-file-excel-o:before{content:""}.fa-file-powerpoint-o:before{content:""}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:""}.fa-file-zip-o:before,.fa-file-archive-o:before{content:""}.fa-file-sound-o:before,.fa-file-audio-o:before{content:""}.fa-file-movie-o:before,.fa-file-video-o:before{content:""}.fa-file-code-o:before{content:""}.fa-vine:before{content:""}.fa-codepen:before{content:""}.fa-jsfiddle:before{content:""}.fa-life-bouy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:""}.fa-circle-o-notch:before{content:""}.fa-ra:before,.fa-rebel:before{content:""}.fa-ge:before,.fa-empire:before{content:""}.fa-git-square:before{content:""}.fa-git:before{content:""}.fa-hacker-news:before{content:""}.fa-tencent-weibo:before{content:""}.fa-qq:before{content:""}.fa-wechat:before,.fa-weixin:before{content:""}.fa-send:before,.fa-paper-plane:before{content:""}.fa-send-o:before,.fa-paper-plane-o:before{content:""}.fa-history:before{content:""}.fa-circle-thin:before{content:""}.fa-header:before{content:""}.fa-paragraph:before{content:""}.fa-sliders:before{content:""}.fa-share-alt:before{content:""}.fa-share-alt-square:before{content:""}.fa-bomb:before{content:""}.fa,.rst-content .admonition-title,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.icon,.wy-dropdown .caret,.wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-info .wy-input-context{font-family:inherit}.fa:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before,.icon:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before{font-family:"FontAwesome";display:inline-block;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa,a .rst-content .admonition-title,.rst-content a .admonition-title,a .rst-content h1 .headerlink,.rst-content h1 a .headerlink,a .rst-content h2 .headerlink,.rst-content h2 a .headerlink,a .rst-content h3 .headerlink,.rst-content h3 a .headerlink,a .rst-content h4 .headerlink,.rst-content h4 a .headerlink,a .rst-content h5 .headerlink,.rst-content h5 a .headerlink,a .rst-content h6 .headerlink,.rst-content h6 a .headerlink,a .rst-content dl dt .headerlink,.rst-content dl dt a .headerlink,a .icon{display:inline-block;text-decoration:inherit}.btn .fa,.btn .rst-content .admonition-title,.rst-content .btn .admonition-title,.btn .rst-content h1 .headerlink,.rst-content h1 .btn .headerlink,.btn .rst-content h2 .headerlink,.rst-content h2 .btn .headerlink,.btn .rst-content h3 .headerlink,.rst-content h3 .btn .headerlink,.btn .rst-content h4 .headerlink,.rst-content h4 .btn .headerlink,.btn .rst-content h5 .headerlink,.rst-content h5 .btn .headerlink,.btn .rst-content h6 .headerlink,.rst-content h6 .btn .headerlink,.btn .rst-content dl dt .headerlink,.rst-content dl dt .btn .headerlink,.btn .icon,.nav .fa,.nav .rst-content .admonition-title,.rst-content .nav .admonition-title,.nav .rst-content h1 .headerlink,.rst-content h1 .nav .headerlink,.nav .rst-content h2 .headerlink,.rst-content h2 .nav .headerlink,.nav .rst-content h3 .headerlink,.rst-content h3 .nav .headerlink,.nav .rst-content h4 .headerlink,.rst-content h4 .nav .headerlink,.nav .rst-content h5 .headerlink,.rst-content h5 .nav .headerlink,.nav .rst-content h6 .headerlink,.rst-content h6 .nav .headerlink,.nav .rst-content dl dt .headerlink,.rst-content dl dt .nav .headerlink,.nav .icon{display:inline}.btn .fa.fa-large,.btn .rst-content .fa-large.admonition-title,.rst-content .btn .fa-large.admonition-title,.btn .rst-content h1 .fa-large.headerlink,.rst-content h1 .btn .fa-large.headerlink,.btn .rst-content h2 .fa-large.headerlink,.rst-content h2 .btn .fa-large.headerlink,.btn .rst-content h3 .fa-large.headerlink,.rst-content h3 .btn .fa-large.headerlink,.btn .rst-content h4 .fa-large.headerlink,.rst-content h4 .btn .fa-large.headerlink,.btn .rst-content h5 .fa-large.headerlink,.rst-content h5 .btn .fa-large.headerlink,.btn .rst-content h6 .fa-large.headerlink,.rst-content h6 .btn .fa-large.headerlink,.btn .rst-content dl dt .fa-large.headerlink,.rst-content dl dt .btn .fa-large.headerlink,.btn .fa-large.icon,.nav .fa.fa-large,.nav .rst-content .fa-large.admonition-title,.rst-content .nav .fa-large.admonition-title,.nav .rst-content h1 .fa-large.headerlink,.rst-content h1 .nav .fa-large.headerlink,.nav .rst-content h2 .fa-large.headerlink,.rst-content h2 .nav .fa-large.headerlink,.nav .rst-content h3 .fa-large.headerlink,.rst-content h3 .nav .fa-large.headerlink,.nav .rst-content h4 .fa-large.headerlink,.rst-content h4 .nav .fa-large.headerlink,.nav .rst-content h5 .fa-large.headerlink,.rst-content h5 .nav .fa-large.headerlink,.nav .rst-content h6 .fa-large.headerlink,.rst-content h6 .nav .fa-large.headerlink,.nav .rst-content dl dt .fa-large.headerlink,.rst-content dl dt .nav .fa-large.headerlink,.nav .fa-large.icon{line-height:0.9em}.btn .fa.fa-spin,.btn .rst-content .fa-spin.admonition-title,.rst-content .btn .fa-spin.admonition-title,.btn .rst-content h1 .fa-spin.headerlink,.rst-content h1 .btn .fa-spin.headerlink,.btn .rst-content h2 .fa-spin.headerlink,.rst-content h2 .btn .fa-spin.headerlink,.btn .rst-content h3 .fa-spin.headerlink,.rst-content h3 .btn .fa-spin.headerlink,.btn .rst-content h4 .fa-spin.headerlink,.rst-content h4 .btn .fa-spin.headerlink,.btn .rst-content h5 .fa-spin.headerlink,.rst-content h5 .btn .fa-spin.headerlink,.btn .rst-content h6 .fa-spin.headerlink,.rst-content h6 .btn .fa-spin.headerlink,.btn .rst-content dl dt .fa-spin.headerlink,.rst-content dl dt .btn .fa-spin.headerlink,.btn .fa-spin.icon,.nav .fa.fa-spin,.nav .rst-content .fa-spin.admonition-title,.rst-content .nav .fa-spin.admonition-title,.nav .rst-content h1 .fa-spin.headerlink,.rst-content h1 .nav .fa-spin.headerlink,.nav .rst-content h2 .fa-spin.headerlink,.rst-content h2 .nav .fa-spin.headerlink,.nav .rst-content h3 .fa-spin.headerlink,.rst-content h3 .nav .fa-spin.headerlink,.nav .rst-content h4 .fa-spin.headerlink,.rst-content h4 .nav .fa-spin.headerlink,.nav .rst-content h5 .fa-spin.headerlink,.rst-content h5 .nav .fa-spin.headerlink,.nav .rst-content h6 .fa-spin.headerlink,.rst-content h6 .nav .fa-spin.headerlink,.nav .rst-content dl dt .fa-spin.headerlink,.rst-content dl dt .nav .fa-spin.headerlink,.nav .fa-spin.icon{display:inline-block}.btn.fa:before,.rst-content .btn.admonition-title:before,.rst-content h1 .btn.headerlink:before,.rst-content h2 .btn.headerlink:before,.rst-content h3 .btn.headerlink:before,.rst-content h4 .btn.headerlink:before,.rst-content h5 .btn.headerlink:before,.rst-content h6 .btn.headerlink:before,.rst-content dl dt .btn.headerlink:before,.btn.icon:before{opacity:0.5;-webkit-transition:opacity 0.05s ease-in;-moz-transition:opacity 0.05s ease-in;transition:opacity 0.05s ease-in}.btn.fa:hover:before,.rst-content .btn.admonition-title:hover:before,.rst-content h1 .btn.headerlink:hover:before,.rst-content h2 .btn.headerlink:hover:before,.rst-content h3 .btn.headerlink:hover:before,.rst-content h4 .btn.headerlink:hover:before,.rst-content h5 .btn.headerlink:hover:before,.rst-content h6 .btn.headerlink:hover:before,.rst-content dl dt .btn.headerlink:hover:before,.btn.icon:hover:before{opacity:1}.btn-mini .fa:before,.btn-mini .rst-content .admonition-title:before,.rst-content .btn-mini .admonition-title:before,.btn-mini .rst-content h1 .headerlink:before,.rst-content h1 .btn-mini .headerlink:before,.btn-mini .rst-content h2 .headerlink:before,.rst-content h2 .btn-mini .headerlink:before,.btn-mini .rst-content h3 .headerlink:before,.rst-content h3 .btn-mini .headerlink:before,.btn-mini .rst-content h4 .headerlink:before,.rst-content h4 .btn-mini .headerlink:before,.btn-mini .rst-content h5 .headerlink:before,.rst-content h5 .btn-mini .headerlink:before,.btn-mini .rst-content h6 .headerlink:before,.rst-content h6 .btn-mini .headerlink:before,.btn-mini .rst-content dl dt .headerlink:before,.rst-content dl dt .btn-mini .headerlink:before,.btn-mini .icon:before{font-size:14px;vertical-align:-15%}.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.rst-content .seealso,.rst-content .admonition-todo{padding:12px;line-height:24px;margin-bottom:24px;background:#e7f2fa}.wy-alert-title,.rst-content .admonition-title{color:#fff;font-weight:bold;display:block;color:#fff;background:#6ab0de;margin:-12px;padding:6px 12px;margin-bottom:12px}.wy-alert.wy-alert-danger,.rst-content .wy-alert-danger.note,.rst-content .wy-alert-danger.attention,.rst-content .wy-alert-danger.caution,.rst-content .danger,.rst-content .error,.rst-content .wy-alert-danger.hint,.rst-content .wy-alert-danger.important,.rst-content .wy-alert-danger.tip,.rst-content .wy-alert-danger.warning,.rst-content .wy-alert-danger.seealso,.rst-content .wy-alert-danger.admonition-todo{background:#fdf3f2}.wy-alert.wy-alert-danger .wy-alert-title,.rst-content .wy-alert-danger.note .wy-alert-title,.rst-content .wy-alert-danger.attention .wy-alert-title,.rst-content .wy-alert-danger.caution .wy-alert-title,.rst-content .danger .wy-alert-title,.rst-content .error .wy-alert-title,.rst-content .wy-alert-danger.hint .wy-alert-title,.rst-content .wy-alert-danger.important .wy-alert-title,.rst-content .wy-alert-danger.tip .wy-alert-title,.rst-content .wy-alert-danger.warning .wy-alert-title,.rst-content .wy-alert-danger.seealso .wy-alert-title,.rst-content .wy-alert-danger.admonition-todo .wy-alert-title,.wy-alert.wy-alert-danger .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-danger .admonition-title,.rst-content .wy-alert-danger.note .admonition-title,.rst-content .wy-alert-danger.attention .admonition-title,.rst-content .wy-alert-danger.caution .admonition-title,.rst-content .danger .admonition-title,.rst-content .error .admonition-title,.rst-content .wy-alert-danger.hint .admonition-title,.rst-content .wy-alert-danger.important .admonition-title,.rst-content .wy-alert-danger.tip .admonition-title,.rst-content .wy-alert-danger.warning .admonition-title,.rst-content .wy-alert-danger.seealso .admonition-title,.rst-content .wy-alert-danger.admonition-todo .admonition-title{background:#f29f97}.wy-alert.wy-alert-warning,.rst-content .wy-alert-warning.note,.rst-content .attention,.rst-content .caution,.rst-content .wy-alert-warning.danger,.rst-content .wy-alert-warning.error,.rst-content .wy-alert-warning.hint,.rst-content .wy-alert-warning.important,.rst-content .wy-alert-warning.tip,.rst-content .warning,.rst-content .wy-alert-warning.seealso,.rst-content .admonition-todo{background:#ffedcc}.wy-alert.wy-alert-warning .wy-alert-title,.rst-content .wy-alert-warning.note .wy-alert-title,.rst-content .attention .wy-alert-title,.rst-content .caution .wy-alert-title,.rst-content .wy-alert-warning.danger .wy-alert-title,.rst-content .wy-alert-warning.error .wy-alert-title,.rst-content .wy-alert-warning.hint .wy-alert-title,.rst-content .wy-alert-warning.important .wy-alert-title,.rst-content .wy-alert-warning.tip .wy-alert-title,.rst-content .warning .wy-alert-title,.rst-content .wy-alert-warning.seealso .wy-alert-title,.rst-content .admonition-todo .wy-alert-title,.wy-alert.wy-alert-warning .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-warning .admonition-title,.rst-content .wy-alert-warning.note .admonition-title,.rst-content .attention .admonition-title,.rst-content .caution .admonition-title,.rst-content .wy-alert-warning.danger .admonition-title,.rst-content .wy-alert-warning.error .admonition-title,.rst-content .wy-alert-warning.hint .admonition-title,.rst-content .wy-alert-warning.important .admonition-title,.rst-content .wy-alert-warning.tip .admonition-title,.rst-content .warning .admonition-title,.rst-content .wy-alert-warning.seealso .admonition-title,.rst-content .admonition-todo .admonition-title{background:#f0b37e}.wy-alert.wy-alert-info,.rst-content .note,.rst-content .wy-alert-info.attention,.rst-content .wy-alert-info.caution,.rst-content .wy-alert-info.danger,.rst-content .wy-alert-info.error,.rst-content .wy-alert-info.hint,.rst-content .wy-alert-info.important,.rst-content .wy-alert-info.tip,.rst-content .wy-alert-info.warning,.rst-content .seealso,.rst-content .wy-alert-info.admonition-todo{background:#e7f2fa}.wy-alert.wy-alert-info .wy-alert-title,.rst-content .note .wy-alert-title,.rst-content .wy-alert-info.attention .wy-alert-title,.rst-content .wy-alert-info.caution .wy-alert-title,.rst-content .wy-alert-info.danger .wy-alert-title,.rst-content .wy-alert-info.error .wy-alert-title,.rst-content .wy-alert-info.hint .wy-alert-title,.rst-content .wy-alert-info.important .wy-alert-title,.rst-content .wy-alert-info.tip .wy-alert-title,.rst-content .wy-alert-info.warning .wy-alert-title,.rst-content .seealso .wy-alert-title,.rst-content .wy-alert-info.admonition-todo .wy-alert-title,.wy-alert.wy-alert-info .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-info .admonition-title,.rst-content .note .admonition-title,.rst-content .wy-alert-info.attention .admonition-title,.rst-content .wy-alert-info.caution .admonition-title,.rst-content .wy-alert-info.danger .admonition-title,.rst-content .wy-alert-info.error .admonition-title,.rst-content .wy-alert-info.hint .admonition-title,.rst-content .wy-alert-info.important .admonition-title,.rst-content .wy-alert-info.tip .admonition-title,.rst-content .wy-alert-info.warning .admonition-title,.rst-content .seealso .admonition-title,.rst-content .wy-alert-info.admonition-todo .admonition-title{background:#6ab0de}.wy-alert.wy-alert-success,.rst-content .wy-alert-success.note,.rst-content .wy-alert-success.attention,.rst-content .wy-alert-success.caution,.rst-content .wy-alert-success.danger,.rst-content .wy-alert-success.error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .wy-alert-success.warning,.rst-content .wy-alert-success.seealso,.rst-content .wy-alert-success.admonition-todo{background:#dbfaf4}.wy-alert.wy-alert-success .wy-alert-title,.rst-content .wy-alert-success.note .wy-alert-title,.rst-content .wy-alert-success.attention .wy-alert-title,.rst-content .wy-alert-success.caution .wy-alert-title,.rst-content .wy-alert-success.danger .wy-alert-title,.rst-content .wy-alert-success.error .wy-alert-title,.rst-content .hint .wy-alert-title,.rst-content .important .wy-alert-title,.rst-content .tip .wy-alert-title,.rst-content .wy-alert-success.warning .wy-alert-title,.rst-content .wy-alert-success.seealso .wy-alert-title,.rst-content .wy-alert-success.admonition-todo .wy-alert-title,.wy-alert.wy-alert-success .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-success .admonition-title,.rst-content .wy-alert-success.note .admonition-title,.rst-content .wy-alert-success.attention .admonition-title,.rst-content .wy-alert-success.caution .admonition-title,.rst-content .wy-alert-success.danger .admonition-title,.rst-content .wy-alert-success.error .admonition-title,.rst-content .hint .admonition-title,.rst-content .important .admonition-title,.rst-content .tip .admonition-title,.rst-content .wy-alert-success.warning .admonition-title,.rst-content .wy-alert-success.seealso .admonition-title,.rst-content .wy-alert-success.admonition-todo .admonition-title{background:#1abc9c}.wy-alert.wy-alert-neutral,.rst-content .wy-alert-neutral.note,.rst-content .wy-alert-neutral.attention,.rst-content .wy-alert-neutral.caution,.rst-content .wy-alert-neutral.danger,.rst-content .wy-alert-neutral.error,.rst-content .wy-alert-neutral.hint,.rst-content .wy-alert-neutral.important,.rst-content .wy-alert-neutral.tip,.rst-content .wy-alert-neutral.warning,.rst-content .wy-alert-neutral.seealso,.rst-content .wy-alert-neutral.admonition-todo{background:#f3f6f6}.wy-alert.wy-alert-neutral .wy-alert-title,.rst-content .wy-alert-neutral.note .wy-alert-title,.rst-content .wy-alert-neutral.attention .wy-alert-title,.rst-content .wy-alert-neutral.caution .wy-alert-title,.rst-content .wy-alert-neutral.danger .wy-alert-title,.rst-content .wy-alert-neutral.error .wy-alert-title,.rst-content .wy-alert-neutral.hint .wy-alert-title,.rst-content .wy-alert-neutral.important .wy-alert-title,.rst-content .wy-alert-neutral.tip .wy-alert-title,.rst-content .wy-alert-neutral.warning .wy-alert-title,.rst-content .wy-alert-neutral.seealso .wy-alert-title,.rst-content .wy-alert-neutral.admonition-todo .wy-alert-title,.wy-alert.wy-alert-neutral .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-neutral .admonition-title,.rst-content .wy-alert-neutral.note .admonition-title,.rst-content .wy-alert-neutral.attention .admonition-title,.rst-content .wy-alert-neutral.caution .admonition-title,.rst-content .wy-alert-neutral.danger .admonition-title,.rst-content .wy-alert-neutral.error .admonition-title,.rst-content .wy-alert-neutral.hint .admonition-title,.rst-content .wy-alert-neutral.important .admonition-title,.rst-content .wy-alert-neutral.tip .admonition-title,.rst-content .wy-alert-neutral.warning .admonition-title,.rst-content .wy-alert-neutral.seealso .admonition-title,.rst-content .wy-alert-neutral.admonition-todo .admonition-title{color:#404040;background:#e1e4e5}.wy-alert.wy-alert-neutral a,.rst-content .wy-alert-neutral.note a,.rst-content .wy-alert-neutral.attention a,.rst-content .wy-alert-neutral.caution a,.rst-content .wy-alert-neutral.danger a,.rst-content .wy-alert-neutral.error a,.rst-content .wy-alert-neutral.hint a,.rst-content .wy-alert-neutral.important a,.rst-content .wy-alert-neutral.tip a,.rst-content .wy-alert-neutral.warning a,.rst-content .wy-alert-neutral.seealso a,.rst-content .wy-alert-neutral.admonition-todo a{color:#2980B9}.wy-alert p:last-child,.rst-content .note p:last-child,.rst-content .attention p:last-child,.rst-content .caution p:last-child,.rst-content .danger p:last-child,.rst-content .error p:last-child,.rst-content .hint p:last-child,.rst-content .important p:last-child,.rst-content .tip p:last-child,.rst-content .warning p:last-child,.rst-content .seealso p:last-child,.rst-content .admonition-todo p:last-child{margin-bottom:0}.wy-tray-container{position:fixed;bottom:0px;left:0;z-index:600}.wy-tray-container li{display:block;width:300px;background:transparent;color:#fff;text-align:center;box-shadow:0 5px 5px 0 rgba(0,0,0,0.1);padding:0 24px;min-width:20%;opacity:0;height:0;line-height:56px;overflow:hidden;-webkit-transition:all 0.3s ease-in;-moz-transition:all 0.3s ease-in;transition:all 0.3s ease-in}.wy-tray-container li.wy-tray-item-success{background:#27AE60}.wy-tray-container li.wy-tray-item-info{background:#2980B9}.wy-tray-container li.wy-tray-item-warning{background:#E67E22}.wy-tray-container li.wy-tray-item-danger{background:#E74C3C}.wy-tray-container li.on{opacity:1;height:56px}@media screen and (max-width: 768px){.wy-tray-container{bottom:auto;top:0;width:100%}.wy-tray-container li{width:100%}}button{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;cursor:pointer;line-height:normal;-webkit-appearance:button;*overflow:visible}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}button[disabled]{cursor:default}.btn{display:inline-block;border-radius:2px;line-height:normal;white-space:nowrap;text-align:center;cursor:pointer;font-size:100%;padding:6px 12px 8px 12px;color:#fff;border:1px solid rgba(0,0,0,0.1);background-color:#27AE60;text-decoration:none;font-weight:normal;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:0px 1px 2px -1px rgba(255,255,255,0.5) inset,0px -2px 0px 0px rgba(0,0,0,0.1) inset;outline-none:false;vertical-align:middle;*display:inline;zoom:1;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transition:all 0.1s linear;-moz-transition:all 0.1s linear;transition:all 0.1s linear}.btn-hover{background:#2e8ece;color:#fff}.btn:hover{background:#2cc36b;color:#fff}.btn:focus{background:#2cc36b;outline:0}.btn:active{box-shadow:0px -1px 0px 0px rgba(0,0,0,0.05) inset,0px 2px 0px 0px rgba(0,0,0,0.1) inset;padding:8px 12px 6px 12px}.btn:visited{color:#fff}.btn:disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn-disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn-disabled:hover,.btn-disabled:focus,.btn-disabled:active{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn::-moz-focus-inner{padding:0;border:0}.btn-small{font-size:80%}.btn-info{background-color:#2980B9 !important}.btn-info:hover{background-color:#2e8ece !important}.btn-neutral{background-color:#f3f6f6 !important;color:#404040 !important}.btn-neutral:hover{background-color:#e5ebeb !important;color:#404040}.btn-neutral:visited{color:#404040 !important}.btn-success{background-color:#27AE60 !important}.btn-success:hover{background-color:#295 !important}.btn-danger{background-color:#E74C3C !important}.btn-danger:hover{background-color:#ea6153 !important}.btn-warning{background-color:#E67E22 !important}.btn-warning:hover{background-color:#e98b39 !important}.btn-invert{background-color:#222}.btn-invert:hover{background-color:#2f2f2f !important}.btn-link{background-color:transparent !important;color:#2980B9;box-shadow:none;border-color:transparent !important}.btn-link:hover{background-color:transparent !important;color:#409ad5 !important;box-shadow:none}.btn-link:active{background-color:transparent !important;color:#409ad5 !important;box-shadow:none}.btn-link:visited{color:#9B59B6}.wy-btn-group .btn,.wy-control .btn{vertical-align:middle}.wy-btn-group{margin-bottom:24px;*zoom:1}.wy-btn-group:before,.wy-btn-group:after{display:table;content:""}.wy-btn-group:after{clear:both}.wy-dropdown{position:relative;display:inline-block}.wy-dropdown-menu{position:absolute;left:0;display:none;float:left;top:100%;min-width:100%;background:#fcfcfc;z-index:100;border:solid 1px #cfd7dd;box-shadow:0 2px 2px 0 rgba(0,0,0,0.1);padding:12px}.wy-dropdown-menu>dd>a{display:block;clear:both;color:#404040;white-space:nowrap;font-size:90%;padding:0 12px;cursor:pointer}.wy-dropdown-menu>dd>a:hover{background:#2980B9;color:#fff}.wy-dropdown-menu>dd.divider{border-top:solid 1px #cfd7dd;margin:6px 0}.wy-dropdown-menu>dd.search{padding-bottom:12px}.wy-dropdown-menu>dd.search input[type="search"]{width:100%}.wy-dropdown-menu>dd.call-to-action{background:#e3e3e3;text-transform:uppercase;font-weight:500;font-size:80%}.wy-dropdown-menu>dd.call-to-action:hover{background:#e3e3e3}.wy-dropdown-menu>dd.call-to-action .btn{color:#fff}.wy-dropdown.wy-dropdown-up .wy-dropdown-menu{bottom:100%;top:auto;left:auto;right:0}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu{background:#fcfcfc;margin-top:2px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a{padding:6px 12px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a:hover{background:#2980B9;color:#fff}.wy-dropdown.wy-dropdown-left .wy-dropdown-menu{right:0;text-align:right}.wy-dropdown-arrow:before{content:" ";border-bottom:5px solid #f5f5f5;border-left:5px solid transparent;border-right:5px solid transparent;position:absolute;display:block;top:-4px;left:50%;margin-left:-3px}.wy-dropdown-arrow.wy-dropdown-arrow-left:before{left:11px}.wy-form-stacked select{display:block}.wy-form-aligned input,.wy-form-aligned textarea,.wy-form-aligned select,.wy-form-aligned .wy-help-inline,.wy-form-aligned label{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-form-aligned .wy-control-group>label{display:inline-block;vertical-align:middle;width:10em;margin:6px 12px 0 0;float:left}.wy-form-aligned .wy-control{float:left}.wy-form-aligned .wy-control label{display:block}.wy-form-aligned .wy-control select{margin-top:6px}fieldset{border:0;margin:0;padding:0}legend{display:block;width:100%;border:0;padding:0;white-space:normal;margin-bottom:24px;font-size:150%;*margin-left:-7px}label{display:block;margin:0 0 0.3125em 0;color:#999;font-size:90%}input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}.wy-control-group{margin-bottom:24px;*zoom:1;max-width:68em;margin-left:auto;margin-right:auto;*zoom:1}.wy-control-group:before,.wy-control-group:after{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group:before,.wy-control-group:after{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group.wy-control-group-required>label:after{content:" *";color:#E74C3C}.wy-control-group .wy-form-full,.wy-control-group .wy-form-halves,.wy-control-group .wy-form-thirds{padding-bottom:12px}.wy-control-group .wy-form-full select,.wy-control-group .wy-form-halves select,.wy-control-group .wy-form-thirds select{width:100%}.wy-control-group .wy-form-full input[type="text"],.wy-control-group .wy-form-full input[type="password"],.wy-control-group .wy-form-full input[type="email"],.wy-control-group .wy-form-full input[type="url"],.wy-control-group .wy-form-full input[type="date"],.wy-control-group .wy-form-full input[type="month"],.wy-control-group .wy-form-full input[type="time"],.wy-control-group .wy-form-full input[type="datetime"],.wy-control-group .wy-form-full input[type="datetime-local"],.wy-control-group .wy-form-full input[type="week"],.wy-control-group .wy-form-full input[type="number"],.wy-control-group .wy-form-full input[type="search"],.wy-control-group .wy-form-full input[type="tel"],.wy-control-group .wy-form-full input[type="color"],.wy-control-group .wy-form-halves input[type="text"],.wy-control-group .wy-form-halves input[type="password"],.wy-control-group .wy-form-halves input[type="email"],.wy-control-group .wy-form-halves input[type="url"],.wy-control-group .wy-form-halves input[type="date"],.wy-control-group .wy-form-halves input[type="month"],.wy-control-group .wy-form-halves input[type="time"],.wy-control-group .wy-form-halves input[type="datetime"],.wy-control-group .wy-form-halves input[type="datetime-local"],.wy-control-group .wy-form-halves input[type="week"],.wy-control-group .wy-form-halves input[type="number"],.wy-control-group .wy-form-halves input[type="search"],.wy-control-group .wy-form-halves input[type="tel"],.wy-control-group .wy-form-halves input[type="color"],.wy-control-group .wy-form-thirds input[type="text"],.wy-control-group .wy-form-thirds input[type="password"],.wy-control-group .wy-form-thirds input[type="email"],.wy-control-group .wy-form-thirds input[type="url"],.wy-control-group .wy-form-thirds input[type="date"],.wy-control-group .wy-form-thirds input[type="month"],.wy-control-group .wy-form-thirds input[type="time"],.wy-control-group .wy-form-thirds input[type="datetime"],.wy-control-group .wy-form-thirds input[type="datetime-local"],.wy-control-group .wy-form-thirds input[type="week"],.wy-control-group .wy-form-thirds input[type="number"],.wy-control-group .wy-form-thirds input[type="search"],.wy-control-group .wy-form-thirds input[type="tel"],.wy-control-group .wy-form-thirds input[type="color"]{width:100%}.wy-control-group .wy-form-full{float:left;display:block;margin-right:2.35765%;width:100%;margin-right:0}.wy-control-group .wy-form-full:last-child{margin-right:0}.wy-control-group .wy-form-halves{float:left;display:block;margin-right:2.35765%;width:48.82117%}.wy-control-group .wy-form-halves:last-child{margin-right:0}.wy-control-group .wy-form-halves:nth-of-type(2n){margin-right:0}.wy-control-group .wy-form-halves:nth-of-type(2n+1){clear:left}.wy-control-group .wy-form-thirds{float:left;display:block;margin-right:2.35765%;width:31.76157%}.wy-control-group .wy-form-thirds:last-child{margin-right:0}.wy-control-group .wy-form-thirds:nth-of-type(3n){margin-right:0}.wy-control-group .wy-form-thirds:nth-of-type(3n+1){clear:left}.wy-control-group.wy-control-group-no-input .wy-control{margin:6px 0 0 0;font-size:90%}.wy-control-no-input{display:inline-block;margin:6px 0 0 0;font-size:90%}.wy-control-group.fluid-input input[type="text"],.wy-control-group.fluid-input input[type="password"],.wy-control-group.fluid-input input[type="email"],.wy-control-group.fluid-input input[type="url"],.wy-control-group.fluid-input input[type="date"],.wy-control-group.fluid-input input[type="month"],.wy-control-group.fluid-input input[type="time"],.wy-control-group.fluid-input input[type="datetime"],.wy-control-group.fluid-input input[type="datetime-local"],.wy-control-group.fluid-input input[type="week"],.wy-control-group.fluid-input input[type="number"],.wy-control-group.fluid-input input[type="search"],.wy-control-group.fluid-input input[type="tel"],.wy-control-group.fluid-input input[type="color"]{width:100%}.wy-form-message-inline{display:inline-block;padding-left:0.3em;color:#666;vertical-align:middle;font-size:90%}.wy-form-message{display:block;color:#999;font-size:70%;margin-top:0.3125em;font-style:italic}input{line-height:normal}input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;*overflow:visible}input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"]{-webkit-appearance:none;padding:6px;display:inline-block;border:1px solid #ccc;font-size:80%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:inset 0 1px 3px #ddd;border-radius:0;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}input[type="datetime-local"]{padding:0.34375em 0.625em}input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0;margin-right:0.3125em;*height:13px;*width:13px}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}input[type="text"]:focus,input[type="password"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus{outline:0;outline:thin dotted \9;border-color:#333}input.no-focus:focus{border-color:#ccc !important}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:1px auto #129FEA}input[type="text"][disabled],input[type="password"][disabled],input[type="email"][disabled],input[type="url"][disabled],input[type="date"][disabled],input[type="month"][disabled],input[type="time"][disabled],input[type="datetime"][disabled],input[type="datetime-local"][disabled],input[type="week"][disabled],input[type="number"][disabled],input[type="search"][disabled],input[type="tel"][disabled],input[type="color"][disabled]{cursor:not-allowed;background-color:#f3f6f6;color:#cad2d3}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#E74C3C;border:1px solid #E74C3C}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#E74C3C}input[type="file"]:focus:invalid:focus,input[type="radio"]:focus:invalid:focus,input[type="checkbox"]:focus:invalid:focus{outline-color:#E74C3C}input.wy-input-large{padding:12px;font-size:100%}textarea{overflow:auto;vertical-align:top;width:100%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif}select,textarea{padding:0.5em 0.625em;display:inline-block;border:1px solid #ccc;font-size:80%;box-shadow:inset 0 1px 3px #ddd;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}select{border:1px solid #ccc;background-color:#fff}select[multiple]{height:auto}select:focus,textarea:focus{outline:0}select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#fff;color:#cad2d3;border-color:transparent}.wy-checkbox,.wy-radio{margin:6px 0;color:#404040;display:block}.wy-checkbox input,.wy-radio input{vertical-align:baseline}.wy-form-message-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-input-prefix,.wy-input-suffix{white-space:nowrap}.wy-input-prefix .wy-input-context,.wy-input-suffix .wy-input-context{padding:6px;display:inline-block;font-size:80%;background-color:#f3f6f6;border:solid 1px #ccc;color:#999}.wy-input-suffix .wy-input-context{border-left:0}.wy-input-prefix .wy-input-context{border-right:0}.wy-control-group.wy-control-group-error .wy-form-message,.wy-control-group.wy-control-group-error>label{color:#E74C3C}.wy-control-group.wy-control-group-error input[type="text"],.wy-control-group.wy-control-group-error input[type="password"],.wy-control-group.wy-control-group-error input[type="email"],.wy-control-group.wy-control-group-error input[type="url"],.wy-control-group.wy-control-group-error input[type="date"],.wy-control-group.wy-control-group-error input[type="month"],.wy-control-group.wy-control-group-error input[type="time"],.wy-control-group.wy-control-group-error input[type="datetime"],.wy-control-group.wy-control-group-error input[type="datetime-local"],.wy-control-group.wy-control-group-error input[type="week"],.wy-control-group.wy-control-group-error input[type="number"],.wy-control-group.wy-control-group-error input[type="search"],.wy-control-group.wy-control-group-error input[type="tel"],.wy-control-group.wy-control-group-error input[type="color"]{border:solid 1px #E74C3C}.wy-control-group.wy-control-group-error textarea{border:solid 1px #E74C3C}.wy-inline-validate{white-space:nowrap}.wy-inline-validate .wy-input-context{padding:0.5em 0.625em;display:inline-block;font-size:80%}.wy-inline-validate.wy-inline-validate-success .wy-input-context{color:#27AE60}.wy-inline-validate.wy-inline-validate-danger .wy-input-context{color:#E74C3C}.wy-inline-validate.wy-inline-validate-warning .wy-input-context{color:#E67E22}.wy-inline-validate.wy-inline-validate-info .wy-input-context{color:#2980B9}.rotate-90{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.rotate-180{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.rotate-270{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.mirror{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1);-o-transform:scaleX(-1);transform:scaleX(-1)}.mirror.rotate-90{-webkit-transform:scaleX(-1) rotate(90deg);-moz-transform:scaleX(-1) rotate(90deg);-ms-transform:scaleX(-1) rotate(90deg);-o-transform:scaleX(-1) rotate(90deg);transform:scaleX(-1) rotate(90deg)}.mirror.rotate-180{-webkit-transform:scaleX(-1) rotate(180deg);-moz-transform:scaleX(-1) rotate(180deg);-ms-transform:scaleX(-1) rotate(180deg);-o-transform:scaleX(-1) rotate(180deg);transform:scaleX(-1) rotate(180deg)}.mirror.rotate-270{-webkit-transform:scaleX(-1) rotate(270deg);-moz-transform:scaleX(-1) rotate(270deg);-ms-transform:scaleX(-1) rotate(270deg);-o-transform:scaleX(-1) rotate(270deg);transform:scaleX(-1) rotate(270deg)}@media only screen and (max-width: 480px){.wy-form button[type="submit"]{margin:0.7em 0 0}.wy-form input[type="text"],.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0.3em;display:block}.wy-form label{margin-bottom:0.3em;display:block}.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0}.wy-form-aligned .wy-control-group label{margin-bottom:0.3em;text-align:left;display:block;width:100%}.wy-form-aligned .wy-control{margin:1.5em 0 0 0}.wy-form .wy-help-inline,.wy-form-message-inline,.wy-form-message{display:block;font-size:80%;padding:6px 0}}@media screen and (max-width: 768px){.tablet-hide{display:none}}@media screen and (max-width: 480px){.mobile-hide{display:none}}.float-left{float:left}.float-right{float:right}.full-width{width:100%}.wy-table,.rst-content table.docutils,.rst-content table.field-list{border-collapse:collapse;border-spacing:0;empty-cells:show;margin-bottom:24px}.wy-table caption,.rst-content table.docutils caption,.rst-content table.field-list caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.wy-table td,.rst-content table.docutils td,.rst-content table.field-list td,.wy-table th,.rst-content table.docutils th,.rst-content table.field-list th{font-size:90%;margin:0;overflow:visible;padding:8px 16px}.wy-table td:first-child,.rst-content table.docutils td:first-child,.rst-content table.field-list td:first-child,.wy-table th:first-child,.rst-content table.docutils th:first-child,.rst-content table.field-list th:first-child{border-left-width:0}.wy-table thead,.rst-content table.docutils thead,.rst-content table.field-list thead{color:#000;text-align:left;vertical-align:bottom;white-space:nowrap}.wy-table thead th,.rst-content table.docutils thead th,.rst-content table.field-list thead th{font-weight:bold;border-bottom:solid 2px #e1e4e5}.wy-table td,.rst-content table.docutils td,.rst-content table.field-list td{background-color:transparent;vertical-align:middle}.wy-table td p,.rst-content table.docutils td p,.rst-content table.field-list td p{line-height:18px}.wy-table td p:last-child,.rst-content table.docutils td p:last-child,.rst-content table.field-list td p:last-child{margin-bottom:0}.wy-table .wy-table-cell-min,.rst-content table.docutils .wy-table-cell-min,.rst-content table.field-list .wy-table-cell-min{width:1%;padding-right:0}.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox],.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox]{margin:0}.wy-table-secondary{color:gray;font-size:90%}.wy-table-tertiary{color:gray;font-size:80%}.wy-table-odd td,.wy-table-striped tr:nth-child(2n-1) td,.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td{background-color:#f3f6f6}.wy-table-backed{background-color:#f3f6f6}.wy-table-bordered-all,.rst-content table.docutils{border:1px solid #e1e4e5}.wy-table-bordered-all td,.rst-content table.docutils td{border-bottom:1px solid #e1e4e5;border-left:1px solid #e1e4e5}.wy-table-bordered-all tbody>tr:last-child td,.rst-content table.docutils tbody>tr:last-child td{border-bottom-width:0}.wy-table-bordered{border:1px solid #e1e4e5}.wy-table-bordered-rows td{border-bottom:1px solid #e1e4e5}.wy-table-bordered-rows tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal td,.wy-table-horizontal th{border-width:0 0 1px 0;border-bottom:1px solid #e1e4e5}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-responsive{margin-bottom:24px;max-width:100%;overflow:auto}.wy-table-responsive table{margin-bottom:0 !important}.wy-table-responsive table td,.wy-table-responsive table th{white-space:nowrap}a{color:#2980B9;text-decoration:none}a:hover{color:#3091d1}a:visited{color:#9B59B6}html{height:100%;overflow-x:hidden}body{font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;font-weight:normal;color:#404040;min-height:100%;overflow-x:hidden;background:#edf0f2}.wy-text-left{text-align:left}.wy-text-center{text-align:center}.wy-text-right{text-align:right}.wy-text-large{font-size:120%}.wy-text-normal{font-size:100%}.wy-text-small,small{font-size:80%}.wy-text-strike{text-decoration:line-through}.wy-text-warning{color:#E67E22 !important}a.wy-text-warning:hover{color:#eb9950 !important}.wy-text-info{color:#2980B9 !important}a.wy-text-info:hover{color:#409ad5 !important}.wy-text-success{color:#27AE60 !important}a.wy-text-success:hover{color:#36d278 !important}.wy-text-danger{color:#E74C3C !important}a.wy-text-danger:hover{color:#ed7669 !important}.wy-text-neutral{color:#404040 !important}a.wy-text-neutral:hover{color:#595959 !important}h1,h2,h3,h4,h5,h6,legend{margin-top:0;font-weight:700;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif}p{line-height:24px;margin:0;font-size:16px;margin-bottom:24px}h1{font-size:175%}h2{font-size:150%}h3{font-size:125%}h4{font-size:115%}h5{font-size:110%}h6{font-size:100%}hr{display:block;height:1px;border:0;border-top:1px solid #e1e4e5;margin:24px 0;padding:0}code,.rst-content tt{white-space:nowrap;max-width:100%;background:#fff;border:solid 1px #e1e4e5;font-size:75%;padding:0 5px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;color:#E74C3C;overflow-x:auto}code.code-large,.rst-content tt.code-large{font-size:90%}.wy-plain-list-disc,.rst-content .section ul,.rst-content .toctree-wrapper ul,article ul{list-style:disc;line-height:24px;margin-bottom:24px}.wy-plain-list-disc li,.rst-content .section ul li,.rst-content .toctree-wrapper ul li,article ul li{list-style:disc;margin-left:24px}.wy-plain-list-disc li p:last-child,.rst-content .section ul li p:last-child,.rst-content .toctree-wrapper ul li p:last-child,article ul li p:last-child{margin-bottom:0}.wy-plain-list-disc li ul,.rst-content .section ul li ul,.rst-content .toctree-wrapper ul li ul,article ul li ul{margin-bottom:0}.wy-plain-list-disc li li,.rst-content .section ul li li,.rst-content .toctree-wrapper ul li li,article ul li li{list-style:circle}.wy-plain-list-disc li li li,.rst-content .section ul li li li,.rst-content .toctree-wrapper ul li li li,article ul li li li{list-style:square}.wy-plain-list-disc li ol li,.rst-content .section ul li ol li,.rst-content .toctree-wrapper ul li ol li,article ul li ol li{list-style:decimal}.wy-plain-list-decimal,.rst-content .section ol,.rst-content ol.arabic,article ol{list-style:decimal;line-height:24px;margin-bottom:24px}.wy-plain-list-decimal li,.rst-content .section ol li,.rst-content ol.arabic li,article ol li{list-style:decimal;margin-left:24px}.wy-plain-list-decimal li p:last-child,.rst-content .section ol li p:last-child,.rst-content ol.arabic li p:last-child,article ol li p:last-child{margin-bottom:0}.wy-plain-list-decimal li ul,.rst-content .section ol li ul,.rst-content ol.arabic li ul,article ol li ul{margin-bottom:0}.wy-plain-list-decimal li ul li,.rst-content .section ol li ul li,.rst-content ol.arabic li ul li,article ol li ul li{list-style:disc}.codeblock-example{border:1px solid #e1e4e5;border-bottom:none;padding:24px;padding-top:48px;font-weight:500;background:#fff;position:relative}.codeblock-example:after{content:"Example";position:absolute;top:0px;left:0px;background:#9B59B6;color:#fff;padding:6px 12px}.codeblock-example.prettyprint-example-only{border:1px solid #e1e4e5;margin-bottom:24px}.codeblock,pre.literal-block,.rst-content .literal-block,.rst-content pre.literal-block,div[class^='highlight']{border:1px solid #e1e4e5;padding:0px;overflow-x:auto;background:#fff;margin:1px 0 24px 0}.codeblock div[class^='highlight'],pre.literal-block div[class^='highlight'],.rst-content .literal-block div[class^='highlight'],div[class^='highlight'] div[class^='highlight']{border:none;background:none;margin:0}div[class^='highlight'] td.code{width:100%}.linenodiv pre{border-right:solid 1px #e6e9ea;margin:0;padding:12px 12px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;font-size:12px;line-height:1.5;color:#d9d9d9}div[class^='highlight'] pre{white-space:pre;margin:0;padding:12px 12px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;font-size:12px;line-height:1.5;display:block;overflow:auto;color:#404040}@media print{.codeblock,pre.literal-block,.rst-content .literal-block,.rst-content pre.literal-block,div[class^='highlight'],div[class^='highlight'] pre{white-space:pre-wrap}}.hll{background-color:#ffc;margin:0 -12px;padding:0 12px;display:block}.c{color:#998;font-style:italic}.err{color:#a61717;background-color:#e3d2d2}.k{font-weight:bold}.o{font-weight:bold}.cm{color:#998;font-style:italic}.cp{color:#999;font-weight:bold}.c1{color:#998;font-style:italic}.cs{color:#999;font-weight:bold;font-style:italic}.gd{color:#000;background-color:#fdd}.gd .x{color:#000;background-color:#faa}.ge{font-style:italic}.gr{color:#a00}.gh{color:#999}.gi{color:#000;background-color:#dfd}.gi .x{color:#000;background-color:#afa}.go{color:#888}.gp{color:#555}.gs{font-weight:bold}.gu{color:purple;font-weight:bold}.gt{color:#a00}.kc{font-weight:bold}.kd{font-weight:bold}.kn{font-weight:bold}.kp{font-weight:bold}.kr{font-weight:bold}.kt{color:#458;font-weight:bold}.m{color:#099}.s{color:#d14}.n{color:#333}.na{color:teal}.nb{color:#0086b3}.nc{color:#458;font-weight:bold}.no{color:teal}.ni{color:purple}.ne{color:#900;font-weight:bold}.nf{color:#900;font-weight:bold}.nn{color:#555}.nt{color:navy}.nv{color:teal}.ow{font-weight:bold}.w{color:#bbb}.mf{color:#099}.mh{color:#099}.mi{color:#099}.mo{color:#099}.sb{color:#d14}.sc{color:#d14}.sd{color:#d14}.s2{color:#d14}.se{color:#d14}.sh{color:#d14}.si{color:#d14}.sx{color:#d14}.sr{color:#009926}.s1{color:#d14}.ss{color:#990073}.bp{color:#999}.vc{color:teal}.vg{color:teal}.vi{color:teal}.il{color:#099}.gc{color:#999;background-color:#EAF2F5}.wy-breadcrumbs li{display:inline-block}.wy-breadcrumbs li.wy-breadcrumbs-aside{float:right}.wy-breadcrumbs li a{display:inline-block;padding:5px}.wy-breadcrumbs li a:first-child{padding-left:0}.wy-breadcrumbs-extra{margin-bottom:0;color:#b3b3b3;font-size:80%;display:inline-block}@media screen and (max-width: 480px){.wy-breadcrumbs-extra{display:none}.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}@media print{.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}.wy-affix{position:fixed;top:1.618em}.wy-menu a:hover{text-decoration:none}.wy-menu-horiz{*zoom:1}.wy-menu-horiz:before,.wy-menu-horiz:after{display:table;content:""}.wy-menu-horiz:after{clear:both}.wy-menu-horiz ul,.wy-menu-horiz li{display:inline-block}.wy-menu-horiz li:hover{background:rgba(255,255,255,0.1)}.wy-menu-horiz li.divide-left{border-left:solid 1px #404040}.wy-menu-horiz li.divide-right{border-right:solid 1px #404040}.wy-menu-horiz a{height:32px;display:inline-block;line-height:32px;padding:0 16px}.wy-menu-vertical header{height:32px;display:inline-block;line-height:32px;padding:0 1.618em;display:block;font-weight:bold;text-transform:uppercase;font-size:80%;color:#2980B9;white-space:nowrap}.wy-menu-vertical ul{margin-bottom:0}.wy-menu-vertical li.divide-top{border-top:solid 1px #404040}.wy-menu-vertical li.divide-bottom{border-bottom:solid 1px #404040}.wy-menu-vertical li.current{background:#e3e3e3}.wy-menu-vertical li.current a{color:gray;border-right:solid 1px #c9c9c9;padding:0.4045em 2.427em}.wy-menu-vertical li.current a:hover{background:#d6d6d6}.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a{color:#404040;padding:0.4045em 1.618em;font-weight:bold;position:relative;background:#fcfcfc;border:none;border-bottom:solid 1px #c9c9c9;border-top:solid 1px #c9c9c9;padding-left:1.618em -4px}.wy-menu-vertical li.on a:hover,.wy-menu-vertical li.current>a:hover{background:#fcfcfc}.wy-menu-vertical li.toctree-l2.current>a{background:#c9c9c9;padding:0.4045em 2.427em}.wy-menu-vertical li.current ul{display:block}.wy-menu-vertical li ul{margin-bottom:0;display:none}.wy-menu-vertical .local-toc li ul{display:block}.wy-menu-vertical li ul li a{margin-bottom:0;color:#b3b3b3;font-weight:normal}.wy-menu-vertical a{display:inline-block;line-height:18px;padding:0.4045em 1.618em;display:block;position:relative;font-size:90%;color:#b3b3b3}.wy-menu-vertical a:hover{background-color:#4e4a4a;cursor:pointer}.wy-menu-vertical a:active{background-color:#2980B9;cursor:pointer;color:#fff}.wy-side-nav-search{z-index:200;background-color:#2980B9;text-align:center;padding:0.809em;display:block;color:#fcfcfc;margin-bottom:0.809em}.wy-side-nav-search input[type=text]{width:100%;border-radius:50px;padding:6px 12px;border-color:#2472a4}.wy-side-nav-search img{display:block;margin:auto auto 0.809em auto;height:45px;width:45px;background-color:#2980B9;padding:5px;border-radius:100%}.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a{color:#fcfcfc;font-size:100%;font-weight:bold;display:inline-block;padding:4px 6px;margin-bottom:0.809em}.wy-side-nav-search>a:hover,.wy-side-nav-search .wy-dropdown>a:hover{background:rgba(255,255,255,0.1)}.wy-nav .wy-menu-vertical header{color:#2980B9}.wy-nav .wy-menu-vertical a{color:#b3b3b3}.wy-nav .wy-menu-vertical a:hover{background-color:#2980B9;color:#fff}[data-menu-wrap]{-webkit-transition:all 0.2s ease-in;-moz-transition:all 0.2s ease-in;transition:all 0.2s ease-in;position:absolute;opacity:1;width:100%;opacity:0}[data-menu-wrap].move-center{left:0;right:auto;opacity:1}[data-menu-wrap].move-left{right:auto;left:-100%;opacity:0}[data-menu-wrap].move-right{right:-100%;left:auto;opacity:0}.wy-body-for-nav{background:left repeat-y #fcfcfc;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOERBMTRGRDBFMUUxMUUzODUwMkJCOThDMEVFNURFMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxOERBMTRGRTBFMUUxMUUzODUwMkJCOThDMEVFNURFMCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE4REExNEZCMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE4REExNEZDMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+EwrlwAAAAA5JREFUeNpiMDU0BAgwAAE2AJgB9BnaAAAAAElFTkSuQmCC);background-size:300px 1px}.wy-grid-for-nav{position:absolute;width:100%;height:100%}.wy-nav-side{position:absolute;top:0;left:0;width:300px;overflow:hidden;min-height:100%;background:#343131;z-index:200}.wy-nav-top{display:none;background:#2980B9;color:#fff;padding:0.4045em 0.809em;position:relative;line-height:50px;text-align:center;font-size:100%;*zoom:1}.wy-nav-top:before,.wy-nav-top:after{display:table;content:""}.wy-nav-top:after{clear:both}.wy-nav-top a{color:#fff;font-weight:bold}.wy-nav-top img{margin-right:12px;height:45px;width:45px;background-color:#2980B9;padding:5px;border-radius:100%}.wy-nav-top i{font-size:30px;float:left;cursor:pointer}.wy-nav-content-wrap{margin-left:300px;background:#fcfcfc;min-height:100%}.wy-nav-content{padding:1.618em 3.236em;height:100%;max-width:800px;margin:auto}.wy-body-mask{position:fixed;width:100%;height:100%;background:rgba(0,0,0,0.2);display:none;z-index:499}.wy-body-mask.on{display:block}footer{color:#999}footer p{margin-bottom:12px}.rst-footer-buttons{*zoom:1}.rst-footer-buttons:before,.rst-footer-buttons:after{display:table;content:""}.rst-footer-buttons:after{clear:both}#search-results .search li{margin-bottom:24px;border-bottom:solid 1px #e1e4e5;padding-bottom:24px}#search-results .search li:first-child{border-top:solid 1px #e1e4e5;padding-top:24px}#search-results .search li a{font-size:120%;margin-bottom:12px;display:inline-block}#search-results .context{color:gray;font-size:90%}@media screen and (max-width: 768px){.wy-body-for-nav{background:#fcfcfc}.wy-nav-top{display:block}.wy-nav-side{left:-300px}.wy-nav-side.shift{width:85%;left:0}.wy-nav-content-wrap{margin-left:0}.wy-nav-content-wrap .wy-nav-content{padding:1.618em}.wy-nav-content-wrap.shift{position:fixed;min-width:100%;left:85%;top:0;height:100%;overflow:hidden}}@media screen and (min-width: 1400px){.wy-nav-content-wrap{background:rgba(0,0,0,0.05)}.wy-nav-content{margin:0;background:#fcfcfc}}@media print{.rst-versions,footer,.wy-nav-side{display:none}.wy-nav-content-wrap{margin-left:0}}nav.stickynav{position:fixed;top:0}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa,.rst-versions .rst-current-version .rst-content .admonition-title,.rst-content .rst-versions .rst-current-version .admonition-title,.rst-versions .rst-current-version .rst-content h1 .headerlink,.rst-content h1 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h2 .headerlink,.rst-content h2 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h3 .headerlink,.rst-content h3 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h4 .headerlink,.rst-content h4 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h5 .headerlink,.rst-content h5 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h6 .headerlink,.rst-content h6 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content dl dt .headerlink,.rst-content dl dt .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .icon{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}.rst-content img{max-width:100%;height:auto !important}.rst-content div.figure{margin-bottom:24px}.rst-content div.figure.align-center{text-align:center}.rst-content .section>img{margin-bottom:24px}.rst-content blockquote{margin-left:24px;line-height:24px;margin-bottom:24px}.rst-content .note .last,.rst-content .attention .last,.rst-content .caution .last,.rst-content .danger .last,.rst-content .error .last,.rst-content .hint .last,.rst-content .important .last,.rst-content .tip .last,.rst-content .warning .last,.rst-content .seealso .last,.rst-content .admonition-todo .last{margin-bottom:0}.rst-content .admonition-title:before{margin-right:4px}.rst-content .admonition table{border-color:rgba(0,0,0,0.1)}.rst-content .admonition table td,.rst-content .admonition table th{background:transparent !important;border-color:rgba(0,0,0,0.1) !important}.rst-content .section ol.loweralpha,.rst-content .section ol.loweralpha li{list-style:lower-alpha}.rst-content .section ol.upperalpha,.rst-content .section ol.upperalpha li{list-style:upper-alpha}.rst-content .section ol p,.rst-content .section ul p{margin-bottom:12px}.rst-content .line-block{margin-left:24px}.rst-content .topic-title{font-weight:bold;margin-bottom:12px}.rst-content .toc-backref{color:#404040}.rst-content .align-right{float:right;margin:0px 0px 24px 24px}.rst-content .align-left{float:left;margin:0px 24px 24px 0px}.rst-content .align-center{margin:auto;display:block}.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink{display:none;visibility:hidden;font-size:14px}.rst-content h1 .headerlink:after,.rst-content h2 .headerlink:after,.rst-content h3 .headerlink:after,.rst-content h4 .headerlink:after,.rst-content h5 .headerlink:after,.rst-content h6 .headerlink:after,.rst-content dl dt .headerlink:after{visibility:visible;content:"";font-family:FontAwesome;display:inline-block}.rst-content h1:hover .headerlink,.rst-content h2:hover .headerlink,.rst-content h3:hover .headerlink,.rst-content h4:hover .headerlink,.rst-content h5:hover .headerlink,.rst-content h6:hover .headerlink,.rst-content dl dt:hover .headerlink{display:inline-block}.rst-content .sidebar{float:right;width:40%;display:block;margin:0 0 24px 24px;padding:24px;background:#f3f6f6;border:solid 1px #e1e4e5}.rst-content .sidebar p,.rst-content .sidebar ul,.rst-content .sidebar dl{font-size:90%}.rst-content .sidebar .last{margin-bottom:0}.rst-content .sidebar .sidebar-title{display:block;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif;font-weight:bold;background:#e1e4e5;padding:6px 12px;margin:-24px;margin-bottom:24px;font-size:100%}.rst-content .highlighted{background:#F1C40F;display:inline-block;font-weight:bold;padding:0 6px}.rst-content .footnote-reference,.rst-content .citation-reference{vertical-align:super;font-size:90%}.rst-content table.docutils.citation,.rst-content table.docutils.footnote{background:none;border:none;color:#999}.rst-content table.docutils.citation td,.rst-content table.docutils.citation tr,.rst-content table.docutils.footnote td,.rst-content table.docutils.footnote tr{border:none;background-color:transparent !important;white-space:normal}.rst-content table.docutils.citation td.label,.rst-content table.docutils.footnote td.label{padding-left:0;padding-right:0;vertical-align:top}.rst-content table.field-list{border:none}.rst-content table.field-list td{border:none;padding-top:5px}.rst-content table.field-list td>strong{display:inline-block;margin-top:3px}.rst-content table.field-list .field-name{padding-right:10px;text-align:left;white-space:nowrap}.rst-content table.field-list .field-body{text-align:left;padding-left:0}.rst-content tt{color:#000}.rst-content tt big,.rst-content tt em{font-size:100% !important;line-height:normal}.rst-content tt .xref,a .rst-content tt{font-weight:bold}.rst-content a tt{color:#2980B9}.rst-content dl{margin-bottom:24px}.rst-content dl dt{font-weight:bold}.rst-content dl p,.rst-content dl table,.rst-content dl ul,.rst-content dl ol{margin-bottom:12px !important}.rst-content dl dd{margin:0 0 12px 24px}.rst-content dl:not(.docutils){margin-bottom:24px}.rst-content dl:not(.docutils) dt{display:inline-block;margin:6px 0;font-size:90%;line-height:normal;background:#e7f2fa;color:#2980B9;border-top:solid 3px #6ab0de;padding:6px;position:relative}.rst-content dl:not(.docutils) dt:before{color:#6ab0de}.rst-content dl:not(.docutils) dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl:not(.docutils) dl dt{margin-bottom:6px;border:none;border-left:solid 3px #ccc;background:#f0f0f0;color:gray}.rst-content dl:not(.docutils) dl dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl:not(.docutils) dt:first-child{margin-top:0}.rst-content dl:not(.docutils) tt{font-weight:bold}.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) tt.descclassname{background-color:transparent;border:none;padding:0;font-size:100% !important}.rst-content dl:not(.docutils) tt.descname{font-weight:bold}.rst-content dl:not(.docutils) .optional{display:inline-block;padding:0 4px;color:#000;font-weight:bold}.rst-content dl:not(.docutils) .property{display:inline-block;padding-right:8px}.rst-content .viewcode-link,.rst-content .viewcode-back{display:inline-block;color:#27AE60;font-size:80%;padding-left:24px}.rst-content .viewcode-back{display:block;float:right}.rst-content p.rubric{margin-bottom:12px;font-weight:bold}@media screen and (max-width: 480px){.rst-content .sidebar{width:100%}}span[id*='MathJax-Span']{color:#404040}.math{text-align:center} diff --git a/doc/html/css/theme_extra.css b/doc/html/css/theme_extra.css new file mode 100644 index 0000000..e53d320 --- /dev/null +++ b/doc/html/css/theme_extra.css @@ -0,0 +1,193 @@ +/* + * Sphinx doesn't have support for section dividers like we do in + * MkDocs, this styles the section titles in the nav + * + * https://github.com/mkdocs/mkdocs/issues/175 + */ +.wy-menu-vertical span { + line-height: 18px; + padding: 0.4045em 1.618em; + display: block; + position: relative; + font-size: 90%; + color: #838383; +} + +.wy-menu-vertical .subnav a { + padding: 0.4045em 2.427em; +} + +/* + * Long navigations run off the bottom of the screen as the nav + * area doesn't scroll. + * + * https://github.com/mkdocs/mkdocs/pull/202 + * + * Builds upon pull 202 https://github.com/mkdocs/mkdocs/pull/202 + * to make toc scrollbar end before navigations buttons to not be overlapping. + */ +.wy-nav-side { + height: calc(100% - 45px); + overflow-y: auto; + min-height: 0; +} + +.rst-versions{ + border-top: 0; + height: 45px; +} + +@media screen and (max-width: 768px) { + .wy-nav-side { + height: 100%; + } +} + +/* + * readthedocs theme hides nav items when the window height is + * too small to contain them. + * + * https://github.com/mkdocs/mkdocs/issues/#348 + */ +.wy-menu-vertical ul { + margin-bottom: 2em; +} + +/* + * Wrap inline code samples otherwise they shoot of the side and + * can't be read at all. + * + * https://github.com/mkdocs/mkdocs/issues/313 + * https://github.com/mkdocs/mkdocs/issues/233 + * https://github.com/mkdocs/mkdocs/issues/834 + */ +code { + white-space: pre-wrap; + word-wrap: break-word; + padding: 2px 5px; +} + +/** + * Make code blocks display as blocks and give them the appropriate + * font size and padding. + * + * https://github.com/mkdocs/mkdocs/issues/855 + * https://github.com/mkdocs/mkdocs/issues/834 + * https://github.com/mkdocs/mkdocs/issues/233 + */ +pre code { + white-space: pre; + word-wrap: normal; + display: block; + padding: 12px; + font-size: 12px; +} + +/* + * Fix link colors when the link text is inline code. + * + * https://github.com/mkdocs/mkdocs/issues/718 + */ +a code { + color: #2980B9; +} +a:hover code { + color: #3091d1; +} +a:visited code { + color: #9B59B6; +} + +/* + * The CSS classes from highlight.js seem to clash with the + * ReadTheDocs theme causing some code to be incorrectly made + * bold and italic. + * + * https://github.com/mkdocs/mkdocs/issues/411 + */ +pre .cs, pre .c { + font-weight: inherit; + font-style: inherit; +} + +/* + * Fix some issues with the theme and non-highlighted code + * samples. Without and highlighting styles attached the + * formatting is broken. + * + * https://github.com/mkdocs/mkdocs/issues/319 + */ +.no-highlight { + display: block; + padding: 0.5em; + color: #333; +} + + +/* + * Additions specific to the search functionality provided by MkDocs + */ + +.search-results article { + margin-top: 23px; + border-top: 1px solid #E1E4E5; + padding-top: 24px; +} + +.search-results article:first-child { + border-top: none; +} + +form .search-query { + width: 100%; + border-radius: 50px; + padding: 6px 12px; /* csslint allow: box-model */ + border-color: #D1D4D5; +} + +.wy-menu-vertical li ul { + display: inherit; +} + +.wy-menu-vertical li ul.subnav ul.subnav{ + padding-left: 1em; +} + +.wy-menu-vertical .subnav li.current > a { + padding-left: 2.42em; +} +.wy-menu-vertical .subnav li.current > ul li a { + padding-left: 3.23em; +} + +/* + * Improve inline code blocks within admonitions. + * + * https://github.com/mkdocs/mkdocs/issues/656 + */ + .admonition code { + color: #404040; + border: 1px solid #c7c9cb; + border: 1px solid rgba(0, 0, 0, 0.2); + background: #f8fbfd; + background: rgba(255, 255, 255, 0.7); +} + +/* + * Account for wide tables which go off the side. + * Override borders to avoid wierdness on narrow tables. + * + * https://github.com/mkdocs/mkdocs/issues/834 + * https://github.com/mkdocs/mkdocs/pull/1034 + */ +.rst-content .section .docutils { + width: 100%; + overflow: auto; + display: block; + border: none; +} + +td, th { + border: 1px solid #e1e4e5 !important; /* csslint allow: important */ + border-collapse: collapse; +} diff --git a/doc/html/fonts/fontawesome-webfont.eot b/doc/html/fonts/fontawesome-webfont.eot new file mode 100644 index 0000000000000000000000000000000000000000..0662cb96bfb78cb2603df4bc9995314bd6806312 GIT binary patch literal 37405 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�-A&iY%khEsGVMaq&$BJA^QAs8x>7-g_ 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 k3oQ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/html/fonts/fontawesome-webfont.ttf b/doc/html/fonts/fontawesome-webfont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..d3659246915cacb0c9204271f1f9fc5f77049eac GIT binary patch literal 79076 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 literal 0 HcmV?d00001 diff --git a/doc/github-markdown.css b/doc/html/github-markdown.css similarity index 100% rename from doc/github-markdown.css rename to doc/html/github-markdown.css diff --git a/doc/images/bookmarklet.png b/doc/html/images/bookmarklet.png similarity index 100% rename from doc/images/bookmarklet.png rename to doc/html/images/bookmarklet.png diff --git a/doc/images/doc-logo.png b/doc/html/images/doc-logo.png similarity index 100% rename from doc/images/doc-logo.png rename to doc/html/images/doc-logo.png diff --git a/doc/images/doc-logo.svg b/doc/html/images/doc-logo.svg similarity index 100% rename from doc/images/doc-logo.svg rename to doc/html/images/doc-logo.svg diff --git a/doc/images/firefoxshare.png b/doc/html/images/firefoxshare.png similarity index 100% rename from doc/images/firefoxshare.png rename to doc/html/images/firefoxshare.png diff --git a/doc/images/rss-filter-1.png b/doc/html/images/rss-filter-1.png similarity index 100% rename from doc/images/rss-filter-1.png rename to doc/html/images/rss-filter-1.png diff --git a/doc/images/rss-filter-2.png b/doc/html/images/rss-filter-2.png similarity index 100% rename from doc/images/rss-filter-2.png rename to doc/html/images/rss-filter-2.png diff --git a/doc/html/img/favicon.ico b/doc/html/img/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..e85006a3ce1c6fd81faa6d5a13095519c4a6fc96 GIT binary patch literal 1150 zcmd6lF-yZh9L1kl>(HSEK`2y^4yB6->f+$wD)=oNY!UheIt03Q=;qj=;8*Bap_4*& za8yAl;wmmx5Yyi^7dXN-WYdJ-{qNqpcez|5t#Fr0qTSYcPTG`I2PBk8r$~4kg^0zN zCJe(rhix3do!L$bZ+IuZ{i08x=JR3=e+M4pv0KsKA??{u_*EFfo|`p&t`Vf=jn{)F z1fKk9hWsmYwqWAP^JO*5u*R;*L&dX3H$%S7oB$f0{ISh{QVXuncnzN67WQH2`lip7 zhX+VI$6x$1+$8gMjh4+1l0N#8_0Fh=N#EwpKk{SeE!)SHFB@xQFX3y+8sF#_@!bDW eIdI-IC`$c%>bk?KbPeN9RHtL<1^)v~#xMt8oB^@` literal 0 HcmV?d00001 diff --git a/doc/html/index.html b/doc/html/index.html new file mode 100644 index 0000000..a9b0c7b --- /dev/null +++ b/doc/html/index.html @@ -0,0 +1,344 @@ + + + + + + + + + + + Home - Shaarli Documentation + + + + + + + + + + + + + + + + + +

    + + + + +
    + + + + + +
    +
    +
    + +
    +
    +
    +
    + +

    Welcome to the Shaarli wiki!

    +

    Here you can find some info on how to use, configure, tweak and solve problems with your Shaarli.

    +

    For general info, read the README.

    +

    If you have any questions or ideas, please join the chat (also reachable via IRC), post them in our general discussion (archive) or read the current issues. If you've found a bug, please create a new issue.

    +

    If you would like a feature added to Shaarli, check the issues labeled feature, enhancement, and plugin.

    +

    Note: This documentation is available online at https://github.com/shaarli/Shaarli/wiki, and locally in the doc/ directory of your Shaarli installation.

    + +
    +
    + + +
    +
    + +
    + +
    + +
    + + + GitHub + + + + Next » + + +
    + + + + + + diff --git a/doc/html/js/highlight.pack.js b/doc/html/js/highlight.pack.js new file mode 100644 index 0000000..a5818df --- /dev/null +++ b/doc/html/js/highlight.pack.js @@ -0,0 +1,2 @@ +!function(e){"undefined"!=typeof exports?e(exports):(window.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return window.hljs}))}(function(e){function n(e){return e.replace(/&/gm,"&").replace(//gm,">")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0==t.index}function a(e){var n=(e.className+" "+(e.parentNode?e.parentNode.className:"")).split(/\s+/);return n=n.map(function(e){return e.replace(/^lang(uage)?-/,"")}),n.filter(function(e){return N(e)||/no(-?)highlight|plain|text/.test(e)})[0]}function i(e,n){var t,r={};for(t in e)r[t]=e[t];if(n)for(t in n)r[t]=n[t];return r}function o(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3==i.nodeType?a+=i.nodeValue.length:1==i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function u(e,r,a){function i(){return e.length&&r.length?e[0].offset!=r[0].offset?e[0].offset"}function u(e){l+=""}function c(e){("start"==e.event?o:u)(e.node)}for(var s=0,l="",f=[];e.length||r.length;){var g=i();if(l+=n(a.substr(s,g[0].offset-s)),s=g[0].offset,g==e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g==e&&g.length&&g[0].offset==s);f.reverse().forEach(o)}else"start"==g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return l+n(a.substr(s))}function c(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,o){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var u={},c=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");u[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?c("keyword",a.k):Object.keys(a.k).forEach(function(e){c(e,a.k[e])}),a.k=u}a.lR=t(a.l||/\b\w+\b/,!0),o&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&o.tE&&(a.tE+=(a.e?"|":"")+o.tE)),a.i&&(a.iR=t(a.i)),void 0===a.r&&(a.r=1),a.c||(a.c=[]);var s=[];a.c.forEach(function(e){e.v?e.v.forEach(function(n){s.push(i(e,n))}):s.push("self"==e?a:e)}),a.c=s,a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,o);var l=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=l.length?t(l.join("|"),!0):{exec:function(){return null}}}}r(e)}function s(e,t,a,i){function o(e,n){for(var t=0;t";return i+=e+'">',i+n+o}function d(){if(!L.k)return n(y);var e="",t=0;L.lR.lastIndex=0;for(var r=L.lR.exec(y);r;){e+=n(y.substr(t,r.index-t));var a=g(L,r);a?(B+=a[1],e+=p(a[0],n(r[0]))):e+=n(r[0]),t=L.lR.lastIndex,r=L.lR.exec(y)}return e+n(y.substr(t))}function h(){if(L.sL&&!w[L.sL])return n(y);var e=L.sL?s(L.sL,y,!0,M[L.sL]):l(y);return L.r>0&&(B+=e.r),"continuous"==L.subLanguageMode&&(M[L.sL]=e.top),p(e.language,e.value,!1,!0)}function b(){return void 0!==L.sL?h():d()}function v(e,t){var r=e.cN?p(e.cN,"",!0):"";e.rB?(k+=r,y=""):e.eB?(k+=n(t)+r,y=""):(k+=r,y=t),L=Object.create(e,{parent:{value:L}})}function m(e,t){if(y+=e,void 0===t)return k+=b(),0;var r=o(t,L);if(r)return k+=b(),v(r,t),r.rB?0:t.length;var a=u(L,t);if(a){var i=L;i.rE||i.eE||(y+=t),k+=b();do L.cN&&(k+=""),B+=L.r,L=L.parent;while(L!=a.parent);return i.eE&&(k+=n(t)),y="",a.starts&&v(a.starts,""),i.rE?0:t.length}if(f(t,L))throw new Error('Illegal lexeme "'+t+'" for mode "'+(L.cN||"")+'"');return y+=t,t.length||1}var E=N(e);if(!E)throw new Error('Unknown language: "'+e+'"');c(E);var R,L=i||E,M={},k="";for(R=L;R!=E;R=R.parent)R.cN&&(k=p(R.cN,"",!0)+k);var y="",B=0;try{for(var C,j,I=0;;){if(L.t.lastIndex=I,C=L.t.exec(t),!C)break;j=m(t.substr(I,C.index-I),C[0]),I=C.index+j}for(m(t.substr(I)),R=L;R.parent;R=R.parent)R.cN&&(k+="");return{r:B,value:k,language:e,top:L}}catch(S){if(-1!=S.message.indexOf("Illegal"))return{r:0,value:n(t)};throw S}}function l(e,t){t=t||x.languages||Object.keys(w);var r={r:0,value:n(e)},a=r;return t.forEach(function(n){if(N(n)){var t=s(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}}),a.language&&(r.second_best=a),r}function f(e){return x.tabReplace&&(e=e.replace(/^((<[^>]+>|\t)+)/gm,function(e,n){return n.replace(/\t/g,x.tabReplace)})),x.useBR&&(e=e.replace(/\n/g,"
    ")),e}function g(e,n,t){var r=n?E[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function p(e){var n=a(e);if(!/no(-?)highlight|plain|text/.test(n)){var t;x.useBR?(t=document.createElementNS("http://www.w3.org/1999/xhtml","div"),t.innerHTML=e.innerHTML.replace(/\n/g,"").replace(//g,"\n")):t=e;var r=t.textContent,i=n?s(n,r,!0):l(r),c=o(t);if(c.length){var p=document.createElementNS("http://www.w3.org/1999/xhtml","div");p.innerHTML=i.value,i.value=u(c,o(p),r)}i.value=f(i.value),e.innerHTML=i.value,e.className=g(e.className,n,i.language),e.result={language:i.language,re:i.r},i.second_best&&(e.second_best={language:i.second_best.language,re:i.second_best.r})}}function d(e){x=i(x,e)}function h(){if(!h.called){h.called=!0;var e=document.querySelectorAll("pre code");Array.prototype.forEach.call(e,p)}}function b(){addEventListener("DOMContentLoaded",h,!1),addEventListener("load",h,!1)}function v(n,t){var r=w[n]=t(e);r.aliases&&r.aliases.forEach(function(e){E[e]=n})}function m(){return Object.keys(w)}function N(e){return w[e]||w[E[e]]}var x={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},w={},E={};return e.highlight=s,e.highlightAuto=l,e.fixMarkup=f,e.highlightBlock=p,e.configure=d,e.initHighlighting=h,e.initHighlightingOnLoad=b,e.registerLanguage=v,e.listLanguages=m,e.getLanguage=N,e.inherit=i,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="\\b(0[xX][a-fA-F0-9]+|(\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e});hljs.registerLanguage("objectivec",function(e){var t={cN:"built_in",b:"(AV|CA|CF|CG|CI|MK|MP|NS|UI)\\w+"},i={keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},o=/[a-zA-Z@][a-zA-Z0-9_]*/,n="@interface @class @protocol @implementation";return{aliases:["m","mm","objc","obj-c"],k:i,l:o,i:""}]}]},{cN:"class",b:"("+n.split(" ").join("|")+")\\b",e:"({|$)",eE:!0,k:n,l:o,c:[e.UTM]},{cN:"variable",b:"\\."+e.UIR,r:0}]}});hljs.registerLanguage("sql",function(e){var t=e.C("--","$");return{cI:!0,i:/[<>]/,c:[{cN:"operator",bK:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate savepoint release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke",e:/;/,eW:!0,k:{keyword:"abs absolute acos action add adddate addtime aes_decrypt aes_encrypt after aggregate all allocate alter analyze and any are as asc ascii asin assertion at atan atan2 atn2 authorization authors avg backup before begin benchmark between bin binlog bit_and bit_count bit_length bit_or bit_xor both by cache call cascade cascaded case cast catalog ceil ceiling chain change changed char_length character_length charindex charset check checksum checksum_agg choose close coalesce coercibility collate collation collationproperty column columns columns_updated commit compress concat concat_ws concurrent connect connection connection_id consistent constraint constraints continue contributors conv convert convert_tz corresponding cos cot count count_big crc32 create cross cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime data database databases datalength date_add date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts datetimeoffsetfromparts day dayname dayofmonth dayofweek dayofyear deallocate declare decode default deferrable deferred degrees delayed delete des_decrypt des_encrypt des_key_file desc describe descriptor diagnostics difference disconnect distinct distinctrow div do domain double drop dumpfile each else elt enclosed encode encrypt end end-exec engine engines eomonth errors escape escaped event eventdata events except exception exec execute exists exp explain export_set extended external extract fast fetch field fields find_in_set first first_value floor flush for force foreign format found found_rows from from_base64 from_days from_unixtime full function get get_format get_lock getdate getutcdate global go goto grant grants greatest group group_concat grouping grouping_id gtid_subset gtid_subtract handler having help hex high_priority hosts hour ident_current ident_incr ident_seed identified identity if ifnull ignore iif ilike immediate in index indicator inet6_aton inet6_ntoa inet_aton inet_ntoa infile initially inner innodb input insert install instr intersect into is is_free_lock is_ipv4 is_ipv4_compat is_ipv4_mapped is_not is_not_null is_used_lock isdate isnull isolation join key kill language last last_day last_insert_id last_value lcase lead leading least leaves left len lenght level like limit lines ln load load_file local localtime localtimestamp locate lock log log10 log2 logfile logs low_priority lower lpad ltrim make_set makedate maketime master master_pos_wait match matched max md5 medium merge microsecond mid min minute mod mode module month monthname mutex name_const names national natural nchar next no no_write_to_binlog not now nullif nvarchar oct octet_length of old_password on only open optimize option optionally or ord order outer outfile output pad parse partial partition password patindex percent_rank percentile_cont percentile_disc period_add period_diff pi plugin position pow power pragma precision prepare preserve primary prior privileges procedure procedure_analyze processlist profile profiles public publishingservername purge quarter query quick quote quotename radians rand read references regexp relative relaylog release release_lock rename repair repeat replace replicate reset restore restrict return returns reverse revoke right rlike rollback rollup round row row_count rows rpad rtrim savepoint schema scroll sec_to_time second section select serializable server session session_user set sha sha1 sha2 share show sign sin size slave sleep smalldatetimefromparts snapshot some soname soundex sounds_like space sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sql_variant_property sqlstate sqrt square start starting status std stddev stddev_pop stddev_samp stdev stdevp stop str str_to_date straight_join strcmp string stuff subdate substr substring subtime subtring_index sum switchoffset sysdate sysdatetime sysdatetimeoffset system_user sysutcdatetime table tables tablespace tan temporary terminated tertiary_weights then time time_format time_to_sec timediff timefromparts timestamp timestampadd timestampdiff timezone_hour timezone_minute to to_base64 to_days to_seconds todatetimeoffset trailing transaction translation trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse ucase uncompress uncompressed_length unhex unicode uninstall union unique unix_timestamp unknown unlock update upgrade upped upper usage use user user_resources using utc_date utc_time utc_timestamp uuid uuid_short validate_password_strength value values var var_pop var_samp variables variance varp version view warnings week weekday weekofyear weight_string when whenever where with work write xml xor year yearweek zon",literal:"true false null",built_in:"array bigint binary bit blob boolean char character date dec decimal float int integer interval number numeric real serial smallint varchar varying int8 serial8 text"},c:[{cN:"string",b:"'",e:"'",c:[e.BE,{b:"''"}]},{cN:"string",b:'"',e:'"',c:[e.BE,{b:'""'}]},{cN:"string",b:"`",e:"`",c:[e.BE]},e.CNM,e.CBCM,t]},e.CBCM,t]}});hljs.registerLanguage("javascript",function(e){return{aliases:["js"],k:{keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as await",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},c:[{cN:"pi",r:10,v:[{b:/^\s*('|")use strict('|")/},{b:/^\s*('|")use asm('|")/}]},e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},e.CLCM,e.CBCM,{cN:"number",b:"\\b(0[xXbBoO][a-fA-F0-9]+|(\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",r:0},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{b:/\s*[);\]]/,r:0,sL:"xml"}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,c:[e.CLCM,e.CBCM],i:/["'\(]/}],i:/\[|%/},{b:/\$[(.]/},{b:"\\."+e.IR,r:0},{bK:"import",e:"[;$]",k:"import from as",c:[e.ASM,e.QSM]},{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]}]}});hljs.registerLanguage("scss",function(e){{var t="[a-zA-Z-][a-zA-Z0-9_-]*",i={cN:"variable",b:"(\\$"+t+")\\b"},r={cN:"function",b:t+"\\(",rB:!0,eE:!0,e:"\\("},o={cN:"hexcolor",b:"#[0-9A-Fa-f]+"};({cN:"attribute",b:"[A-Z\\_\\.\\-]+",e:":",eE:!0,i:"[^\\s]",starts:{cN:"value",eW:!0,eE:!0,c:[r,o,e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"important",b:"!important"}]}})}return{cI:!0,i:"[=/|']",c:[e.CLCM,e.CBCM,r,{cN:"id",b:"\\#[A-Za-z0-9_-]+",r:0},{cN:"class",b:"\\.[A-Za-z0-9_-]+",r:0},{cN:"attr_selector",b:"\\[",e:"\\]",i:"$"},{cN:"tag",b:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",r:0},{cN:"pseudo",b:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"},{cN:"pseudo",b:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"},i,{cN:"attribute",b:"\\b(z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background-blend-mode|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b",i:"[^\\s]"},{cN:"value",b:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"},{cN:"value",b:":",e:";",c:[r,i,o,e.CSSNM,e.QSM,e.ASM,{cN:"important",b:"!important"}]},{cN:"at_rule",b:"@",e:"[{;]",k:"mixin include extend for if else each while charset import debug media page content font-face namespace warn",c:[r,i,e.QSM,e.ASM,o,e.CSSNM,{cN:"preprocessor",b:"\\s[A-Za-z0-9_.-]+",r:0}]}]}});hljs.registerLanguage("mel",function(e){return{k:"int float string vector matrix if else switch case default while do for in break continue global proc return about abs addAttr addAttributeEditorNodeHelp addDynamic addNewShelfTab addPP addPanelCategory addPrefixToName advanceToNextDrivenKey affectedNet affects aimConstraint air alias aliasAttr align alignCtx alignCurve alignSurface allViewFit ambientLight angle angleBetween animCone animCurveEditor animDisplay animView annotate appendStringArray applicationName applyAttrPreset applyTake arcLenDimContext arcLengthDimension arclen arrayMapper art3dPaintCtx artAttrCtx artAttrPaintVertexCtx artAttrSkinPaintCtx artAttrTool artBuildPaintMenu artFluidAttrCtx artPuttyCtx artSelectCtx artSetPaintCtx artUserPaintCtx assignCommand assignInputDevice assignViewportFactories attachCurve attachDeviceAttr attachSurface attrColorSliderGrp attrCompatibility attrControlGrp attrEnumOptionMenu attrEnumOptionMenuGrp attrFieldGrp attrFieldSliderGrp attrNavigationControlGrp attrPresetEditWin attributeExists attributeInfo attributeMenu attributeQuery autoKeyframe autoPlace bakeClip bakeFluidShading bakePartialHistory bakeResults bakeSimulation basename basenameEx batchRender bessel bevel bevelPlus binMembership bindSkin blend2 blendShape blendShapeEditor blendShapePanel blendTwoAttr blindDataType boneLattice boundary boxDollyCtx boxZoomCtx bufferCurve buildBookmarkMenu buildKeyframeMenu button buttonManip CBG cacheFile cacheFileCombine cacheFileMerge cacheFileTrack camera cameraView canCreateManip canvas capitalizeString catch catchQuiet ceil changeSubdivComponentDisplayLevel changeSubdivRegion channelBox character characterMap characterOutlineEditor characterize chdir checkBox checkBoxGrp checkDefaultRenderGlobals choice circle circularFillet clamp clear clearCache clip clipEditor clipEditorCurrentTimeCtx clipSchedule clipSchedulerOutliner clipTrimBefore closeCurve closeSurface cluster cmdFileOutput cmdScrollFieldExecuter cmdScrollFieldReporter cmdShell coarsenSubdivSelectionList collision color colorAtPoint colorEditor colorIndex colorIndexSliderGrp colorSliderButtonGrp colorSliderGrp columnLayout commandEcho commandLine commandPort compactHairSystem componentEditor compositingInterop computePolysetVolume condition cone confirmDialog connectAttr connectControl connectDynamic connectJoint connectionInfo constrain constrainValue constructionHistory container containsMultibyte contextInfo control convertFromOldLayers convertIffToPsd convertLightmap convertSolidTx convertTessellation convertUnit copyArray copyFlexor copyKey copySkinWeights cos cpButton cpCache cpClothSet cpCollision cpConstraint cpConvClothToMesh cpForces cpGetSolverAttr cpPanel cpProperty cpRigidCollisionFilter cpSeam cpSetEdit cpSetSolverAttr cpSolver cpSolverTypes cpTool cpUpdateClothUVs createDisplayLayer createDrawCtx createEditor createLayeredPsdFile createMotionField createNewShelf createNode createRenderLayer createSubdivRegion cross crossProduct ctxAbort ctxCompletion ctxEditMode ctxTraverse currentCtx currentTime currentTimeCtx currentUnit curve curveAddPtCtx curveCVCtx curveEPCtx curveEditorCtx curveIntersect curveMoveEPCtx curveOnSurface curveSketchCtx cutKey cycleCheck cylinder dagPose date defaultLightListCheckBox defaultNavigation defineDataServer defineVirtualDevice deformer deg_to_rad delete deleteAttr deleteShadingGroupsAndMaterials deleteShelfTab deleteUI deleteUnusedBrushes delrandstr detachCurve detachDeviceAttr detachSurface deviceEditor devicePanel dgInfo dgdirty dgeval dgtimer dimWhen directKeyCtx directionalLight dirmap dirname disable disconnectAttr disconnectJoint diskCache displacementToPoly displayAffected displayColor displayCull displayLevelOfDetail displayPref displayRGBColor displaySmoothness displayStats displayString displaySurface distanceDimContext distanceDimension doBlur dolly dollyCtx dopeSheetEditor dot dotProduct doubleProfileBirailSurface drag dragAttrContext draggerContext dropoffLocator duplicate duplicateCurve duplicateSurface dynCache dynControl dynExport dynExpression dynGlobals dynPaintEditor dynParticleCtx dynPref dynRelEdPanel dynRelEditor dynamicLoad editAttrLimits editDisplayLayerGlobals editDisplayLayerMembers editRenderLayerAdjustment editRenderLayerGlobals editRenderLayerMembers editor editorTemplate effector emit emitter enableDevice encodeString endString endsWith env equivalent equivalentTol erf error eval evalDeferred evalEcho event exactWorldBoundingBox exclusiveLightCheckBox exec executeForEachObject exists exp expression expressionEditorListen extendCurve extendSurface extrude fcheck fclose feof fflush fgetline fgetword file fileBrowserDialog fileDialog fileExtension fileInfo filetest filletCurve filter filterCurve filterExpand filterStudioImport findAllIntersections findAnimCurves findKeyframe findMenuItem findRelatedSkinCluster finder firstParentOf fitBspline flexor floatEq floatField floatFieldGrp floatScrollBar floatSlider floatSlider2 floatSliderButtonGrp floatSliderGrp floor flow fluidCacheInfo fluidEmitter fluidVoxelInfo flushUndo fmod fontDialog fopen formLayout format fprint frameLayout fread freeFormFillet frewind fromNativePath fwrite gamma gauss geometryConstraint getApplicationVersionAsFloat getAttr getClassification getDefaultBrush getFileList getFluidAttr getInputDeviceRange getMayaPanelTypes getModifiers getPanel getParticleAttr getPluginResource getenv getpid glRender glRenderEditor globalStitch gmatch goal gotoBindPose grabColor gradientControl gradientControlNoAttr graphDollyCtx graphSelectContext graphTrackCtx gravity grid gridLayout group groupObjectsByName HfAddAttractorToAS HfAssignAS HfBuildEqualMap HfBuildFurFiles HfBuildFurImages HfCancelAFR HfConnectASToHF HfCreateAttractor HfDeleteAS HfEditAS HfPerformCreateAS HfRemoveAttractorFromAS HfSelectAttached HfSelectAttractors HfUnAssignAS hardenPointCurve hardware hardwareRenderPanel headsUpDisplay headsUpMessage help helpLine hermite hide hilite hitTest hotBox hotkey hotkeyCheck hsv_to_rgb hudButton hudSlider hudSliderButton hwReflectionMap hwRender hwRenderLoad hyperGraph hyperPanel hyperShade hypot iconTextButton iconTextCheckBox iconTextRadioButton iconTextRadioCollection iconTextScrollList iconTextStaticLabel ikHandle ikHandleCtx ikHandleDisplayScale ikSolver ikSplineHandleCtx ikSystem ikSystemInfo ikfkDisplayMethod illustratorCurves image imfPlugins inheritTransform insertJoint insertJointCtx insertKeyCtx insertKnotCurve insertKnotSurface instance instanceable instancer intField intFieldGrp intScrollBar intSlider intSliderGrp interToUI internalVar intersect iprEngine isAnimCurve isConnected isDirty isParentOf isSameObject isTrue isValidObjectName isValidString isValidUiName isolateSelect itemFilter itemFilterAttr itemFilterRender itemFilterType joint jointCluster jointCtx jointDisplayScale jointLattice keyTangent keyframe keyframeOutliner keyframeRegionCurrentTimeCtx keyframeRegionDirectKeyCtx keyframeRegionDollyCtx keyframeRegionInsertKeyCtx keyframeRegionMoveKeyCtx keyframeRegionScaleKeyCtx keyframeRegionSelectKeyCtx keyframeRegionSetKeyCtx keyframeRegionTrackCtx keyframeStats lassoContext lattice latticeDeformKeyCtx launch launchImageEditor layerButton layeredShaderPort layeredTexturePort layout layoutDialog lightList lightListEditor lightListPanel lightlink lineIntersection linearPrecision linstep listAnimatable listAttr listCameras listConnections listDeviceAttachments listHistory listInputDeviceAxes listInputDeviceButtons listInputDevices listMenuAnnotation listNodeTypes listPanelCategories listRelatives listSets listTransforms listUnselected listerEditor loadFluid loadNewShelf loadPlugin loadPluginLanguageResources loadPrefObjects localizedPanelLabel lockNode loft log longNameOf lookThru ls lsThroughFilter lsType lsUI Mayatomr mag makeIdentity makeLive makePaintable makeRoll makeSingleSurface makeTubeOn makebot manipMoveContext manipMoveLimitsCtx manipOptions manipRotateContext manipRotateLimitsCtx manipScaleContext manipScaleLimitsCtx marker match max memory menu menuBarLayout menuEditor menuItem menuItemToShelf menuSet menuSetPref messageLine min minimizeApp mirrorJoint modelCurrentTimeCtx modelEditor modelPanel mouse movIn movOut move moveIKtoFK moveKeyCtx moveVertexAlongDirection multiProfileBirailSurface mute nParticle nameCommand nameField namespace namespaceInfo newPanelItems newton nodeCast nodeIconButton nodeOutliner nodePreset nodeType noise nonLinear normalConstraint normalize nurbsBoolean nurbsCopyUVSet nurbsCube nurbsEditUV nurbsPlane nurbsSelect nurbsSquare nurbsToPoly nurbsToPolygonsPref nurbsToSubdiv nurbsToSubdivPref nurbsUVSet nurbsViewDirectionVector objExists objectCenter objectLayer objectType objectTypeUI obsoleteProc oceanNurbsPreviewPlane offsetCurve offsetCurveOnSurface offsetSurface openGLExtension openMayaPref optionMenu optionMenuGrp optionVar orbit orbitCtx orientConstraint outlinerEditor outlinerPanel overrideModifier paintEffectsDisplay pairBlend palettePort paneLayout panel panelConfiguration panelHistory paramDimContext paramDimension paramLocator parent parentConstraint particle particleExists particleInstancer particleRenderInfo partition pasteKey pathAnimation pause pclose percent performanceOptions pfxstrokes pickWalk picture pixelMove planarSrf plane play playbackOptions playblast plugAttr plugNode pluginInfo pluginResourceUtil pointConstraint pointCurveConstraint pointLight pointMatrixMult pointOnCurve pointOnSurface pointPosition poleVectorConstraint polyAppend polyAppendFacetCtx polyAppendVertex polyAutoProjection polyAverageNormal polyAverageVertex polyBevel polyBlendColor polyBlindData polyBoolOp polyBridgeEdge polyCacheMonitor polyCheck polyChipOff polyClipboard polyCloseBorder polyCollapseEdge polyCollapseFacet polyColorBlindData polyColorDel polyColorPerVertex polyColorSet polyCompare polyCone polyCopyUV polyCrease polyCreaseCtx polyCreateFacet polyCreateFacetCtx polyCube polyCut polyCutCtx polyCylinder polyCylindricalProjection polyDelEdge polyDelFacet polyDelVertex polyDuplicateAndConnect polyDuplicateEdge polyEditUV polyEditUVShell polyEvaluate polyExtrudeEdge polyExtrudeFacet polyExtrudeVertex polyFlipEdge polyFlipUV polyForceUV polyGeoSampler polyHelix polyInfo polyInstallAction polyLayoutUV polyListComponentConversion polyMapCut polyMapDel polyMapSew polyMapSewMove polyMergeEdge polyMergeEdgeCtx polyMergeFacet polyMergeFacetCtx polyMergeUV polyMergeVertex polyMirrorFace polyMoveEdge polyMoveFacet polyMoveFacetUV polyMoveUV polyMoveVertex polyNormal polyNormalPerVertex polyNormalizeUV polyOptUvs polyOptions polyOutput polyPipe polyPlanarProjection polyPlane polyPlatonicSolid polyPoke polyPrimitive polyPrism polyProjection polyPyramid polyQuad polyQueryBlindData polyReduce polySelect polySelectConstraint polySelectConstraintMonitor polySelectCtx polySelectEditCtx polySeparate polySetToFaceNormal polySewEdge polyShortestPathCtx polySmooth polySoftEdge polySphere polySphericalProjection polySplit polySplitCtx polySplitEdge polySplitRing polySplitVertex polyStraightenUVBorder polySubdivideEdge polySubdivideFacet polyToSubdiv polyTorus polyTransfer polyTriangulate polyUVSet polyUnite polyWedgeFace popen popupMenu pose pow preloadRefEd print progressBar progressWindow projFileViewer projectCurve projectTangent projectionContext projectionManip promptDialog propModCtx propMove psdChannelOutliner psdEditTextureFile psdExport psdTextureFile putenv pwd python querySubdiv quit rad_to_deg radial radioButton radioButtonGrp radioCollection radioMenuItemCollection rampColorPort rand randomizeFollicles randstate rangeControl readTake rebuildCurve rebuildSurface recordAttr recordDevice redo reference referenceEdit referenceQuery refineSubdivSelectionList refresh refreshAE registerPluginResource rehash reloadImage removeJoint removeMultiInstance removePanelCategory rename renameAttr renameSelectionList renameUI render renderGlobalsNode renderInfo renderLayerButton renderLayerParent renderLayerPostProcess renderLayerUnparent renderManip renderPartition renderQualityNode renderSettings renderThumbnailUpdate renderWindowEditor renderWindowSelectContext renderer reorder reorderDeformers requires reroot resampleFluid resetAE resetPfxToPolyCamera resetTool resolutionNode retarget reverseCurve reverseSurface revolve rgb_to_hsv rigidBody rigidSolver roll rollCtx rootOf rot rotate rotationInterpolation roundConstantRadius rowColumnLayout rowLayout runTimeCommand runup sampleImage saveAllShelves saveAttrPreset saveFluid saveImage saveInitialState saveMenu savePrefObjects savePrefs saveShelf saveToolSettings scale scaleBrushBrightness scaleComponents scaleConstraint scaleKey scaleKeyCtx sceneEditor sceneUIReplacement scmh scriptCtx scriptEditorInfo scriptJob scriptNode scriptTable scriptToShelf scriptedPanel scriptedPanelType scrollField scrollLayout sculpt searchPathArray seed selLoadSettings select selectContext selectCurveCV selectKey selectKeyCtx selectKeyframeRegionCtx selectMode selectPref selectPriority selectType selectedNodes selectionConnection separator setAttr setAttrEnumResource setAttrMapping setAttrNiceNameResource setConstraintRestPosition setDefaultShadingGroup setDrivenKeyframe setDynamic setEditCtx setEditor setFluidAttr setFocus setInfinity setInputDeviceMapping setKeyCtx setKeyPath setKeyframe setKeyframeBlendshapeTargetWts setMenuMode setNodeNiceNameResource setNodeTypeFlag setParent setParticleAttr setPfxToPolyCamera setPluginResource setProject setStampDensity setStartupMessage setState setToolTo setUITemplate setXformManip sets shadingConnection shadingGeometryRelCtx shadingLightRelCtx shadingNetworkCompare shadingNode shapeCompare shelfButton shelfLayout shelfTabLayout shellField shortNameOf showHelp showHidden showManipCtx showSelectionInTitle showShadingGroupAttrEditor showWindow sign simplify sin singleProfileBirailSurface size sizeBytes skinCluster skinPercent smoothCurve smoothTangentSurface smoothstep snap2to2 snapKey snapMode snapTogetherCtx snapshot soft softMod softModCtx sort sound soundControl source spaceLocator sphere sphrand spotLight spotLightPreviewPort spreadSheetEditor spring sqrt squareSurface srtContext stackTrace startString startsWith stitchAndExplodeShell stitchSurface stitchSurfacePoints strcmp stringArrayCatenate stringArrayContains stringArrayCount stringArrayInsertAtIndex stringArrayIntersector stringArrayRemove stringArrayRemoveAtIndex stringArrayRemoveDuplicates stringArrayRemoveExact stringArrayToString stringToStringArray strip stripPrefixFromName stroke subdAutoProjection subdCleanTopology subdCollapse subdDuplicateAndConnect subdEditUV subdListComponentConversion subdMapCut subdMapSewMove subdMatchTopology subdMirror subdToBlind subdToPoly subdTransferUVsToCache subdiv subdivCrease subdivDisplaySmoothness substitute substituteAllString substituteGeometry substring surface surfaceSampler surfaceShaderList swatchDisplayPort switchTable symbolButton symbolCheckBox sysFile system tabLayout tan tangentConstraint texLatticeDeformContext texManipContext texMoveContext texMoveUVShellContext texRotateContext texScaleContext texSelectContext texSelectShortestPathCtx texSmudgeUVContext texWinToolCtx text textCurves textField textFieldButtonGrp textFieldGrp textManip textScrollList textToShelf textureDisplacePlane textureHairColor texturePlacementContext textureWindow threadCount threePointArcCtx timeControl timePort timerX toNativePath toggle toggleAxis toggleWindowVisibility tokenize tokenizeList tolerance tolower toolButton toolCollection toolDropped toolHasOptions toolPropertyWindow torus toupper trace track trackCtx transferAttributes transformCompare transformLimits translator trim trunc truncateFluidCache truncateHairCache tumble tumbleCtx turbulence twoPointArcCtx uiRes uiTemplate unassignInputDevice undo undoInfo ungroup uniform unit unloadPlugin untangleUV untitledFileName untrim upAxis updateAE userCtx uvLink uvSnapshot validateShelfName vectorize view2dToolCtx viewCamera viewClipPlane viewFit viewHeadOn viewLookAt viewManip viewPlace viewSet visor volumeAxis vortex waitCursor warning webBrowser webBrowserPrefs whatIs window windowPref wire wireContext workspace wrinkle wrinkleContext writeTake xbmLangPathList xform",i:"",o={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:c,c:["self"].concat(r)}]};return{aliases:["coffee","cson","iced"],k:c,i:/\/\*/,c:r.concat([e.C("###","###"),e.HCM,{cN:"function",b:"^\\s*"+n+"\\s*=\\s*"+s,e:"[-=]>",rB:!0,c:[i,o]},{b:/[:\(,=]\s*/,r:0,c:[{cN:"function",b:s,e:"[-=]>",rB:!0,c:[o]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[i]},i]},{cN:"attribute",b:n+":",e:":",rB:!0,rE:!0,r:0}])}});hljs.registerLanguage("tex",function(c){var e={cN:"command",b:"\\\\[a-zA-Zа-яА-я]+[\\*]?"},m={cN:"command",b:"\\\\[^a-zA-Zа-яА-я0-9]"},r={cN:"special",b:"[{}\\[\\]\\&#~]",r:0};return{c:[{b:"\\\\[a-zA-Zа-яА-я]+[\\*]? *= *-?\\d*\\.?\\d+(pt|pc|mm|cm|in|dd|cc|ex|em)?",rB:!0,c:[e,m,{cN:"number",b:" *=",e:"-?\\d*\\.?\\d+(pt|pc|mm|cm|in|dd|cc|ex|em)?",eB:!0}],r:10},e,m,r,{cN:"formula",b:"\\$\\$",e:"\\$\\$",c:[e,m,r],r:0},{cN:"formula",b:"\\$",e:"\\$",c:[e,m,r],r:0},c.C("%","$",{r:0})]}});hljs.registerLanguage("go",function(e){var t={keyword:"break default func interface select case map struct chan else goto package switch const fallthrough if range type continue for import return var go defer",constant:"true false iota nil",typename:"bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune",built_in:"append cap close complex copy imag len make new panic print println real recover delete"};return{aliases:["golang"],k:t,i:"",sL:"vbscript"}]}});hljs.registerLanguage("haskell",function(e){var c=[e.C("--","$"),e.C("{-","-}",{c:["self"]})],a={cN:"pragma",b:"{-#",e:"#-}"},i={cN:"preprocessor",b:"^#",e:"$"},n={cN:"type",b:"\\b[A-Z][\\w']*",r:0},t={cN:"container",b:"\\(",e:"\\)",i:'"',c:[a,i,{cN:"type",b:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},e.inherit(e.TM,{b:"[_a-z][\\w']*"})].concat(c)},l={cN:"container",b:"{",e:"}",c:t.c};return{aliases:["hs"],k:"let in if then else case of where do module import hiding qualified type data newtype deriving class instance as default infix infixl infixr foreign export ccall stdcall cplusplus jvm dotnet safe unsafe family forall mdo proc rec",c:[{cN:"module",b:"\\bmodule\\b",e:"where",k:"module where",c:[t].concat(c),i:"\\W\\.|;"},{cN:"import",b:"\\bimport\\b",e:"$",k:"import|0 qualified as hiding",c:[t].concat(c),i:"\\W\\.|;"},{cN:"class",b:"^(\\s*)?(class|instance)\\b",e:"where",k:"class family instance where",c:[n,t].concat(c)},{cN:"typedef",b:"\\b(data|(new)?type)\\b",e:"$",k:"data family type newtype deriving",c:[a,n,t,l].concat(c)},{cN:"default",bK:"default",e:"$",c:[n,t].concat(c)},{cN:"infix",bK:"infix infixl infixr",e:"$",c:[e.CNM].concat(c)},{cN:"foreign",b:"\\bforeign\\b",e:"$",k:"foreign import export ccall stdcall cplusplus jvm dotnet safe unsafe",c:[n,e.QSM].concat(c)},{cN:"shebang",b:"#!\\/usr\\/bin\\/env runhaskell",e:"$"},a,i,e.QSM,e.CNM,n,e.inherit(e.TM,{b:"^[_a-z][\\w']*"}),{b:"->|<-"}].concat(c)}});hljs.registerLanguage("scilab",function(e){var n=[e.CNM,{cN:"string",b:"'|\"",e:"'|\"",c:[e.BE,{b:"''"}]}];return{aliases:["sci"],k:{keyword:"abort break case clear catch continue do elseif else endfunction end for functionglobal if pause return resume select try then while%f %F %t %T %pi %eps %inf %nan %e %i %z %s",built_in:"abs and acos asin atan ceil cd chdir clearglobal cosh cos cumprod deff disp errorexec execstr exists exp eye gettext floor fprintf fread fsolve imag isdef isemptyisinfisnan isvector lasterror length load linspace list listfiles log10 log2 logmax min msprintf mclose mopen ones or pathconvert poly printf prod pwd rand realround sinh sin size gsort sprintf sqrt strcat strcmps tring sum system tanh tantype typename warning zeros matrix"},i:'("|#|/\\*|\\s+/\\w+)',c:[{cN:"function",bK:"function endfunction",e:"$",k:"function endfunction|10",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)"}]},{cN:"transposed_variable",b:"[a-zA-Z_][a-zA-Z_0-9]*('+[\\.']*|[\\.']+)",e:"",r:0},{cN:"matrix",b:"\\[",e:"\\]'*[\\.']*",r:0,c:n},e.C("//","$")].concat(n)}});hljs.registerLanguage("profile",function(e){return{c:[e.CNM,{cN:"built_in",b:"{",e:"}$",eB:!0,eE:!0,c:[e.ASM,e.QSM],r:0},{cN:"filename",b:"[a-zA-Z_][\\da-zA-Z_]+\\.[\\da-zA-Z_]{1,3}",e:":",eE:!0},{cN:"header",b:"(ncalls|tottime|cumtime)",e:"$",k:"ncalls tottime|10 cumtime|10 filename",r:10},{cN:"summary",b:"function calls",e:"$",c:[e.CNM],r:10},e.ASM,e.QSM,{cN:"function",b:"\\(",e:"\\)$",c:[e.UTM],r:0}]}});hljs.registerLanguage("thrift",function(e){var t="bool byte i16 i32 i64 double string binary";return{k:{keyword:"namespace const typedef struct enum service exception void oneway set list map required optional",built_in:t,literal:"true false"},c:[e.QSM,e.NM,e.CLCM,e.CBCM,{cN:"class",bK:"struct enum service exception",e:/\{/,i:/\n/,c:[e.inherit(e.TM,{starts:{eW:!0,eE:!0}})]},{b:"\\b(set|list|map)\\s*<",e:">",k:t,c:["self"]}]}});hljs.registerLanguage("matlab",function(e){var a=[e.CNM,{cN:"string",b:"'",e:"'",c:[e.BE,{b:"''"}]}],s={r:0,c:[{cN:"operator",b:/'['\.]*/}]};return{k:{keyword:"break case catch classdef continue else elseif end enumerated events for function global if methods otherwise parfor persistent properties return spmd switch try while",built_in:"sin sind sinh asin asind asinh cos cosd cosh acos acosd acosh tan tand tanh atan atand atan2 atanh sec secd sech asec asecd asech csc cscd csch acsc acscd acsch cot cotd coth acot acotd acoth hypot exp expm1 log log1p log10 log2 pow2 realpow reallog realsqrt sqrt nthroot nextpow2 abs angle complex conj imag real unwrap isreal cplxpair fix floor ceil round mod rem sign airy besselj bessely besselh besseli besselk beta betainc betaln ellipj ellipke erf erfc erfcx erfinv expint gamma gammainc gammaln psi legendre cross dot factor isprime primes gcd lcm rat rats perms nchoosek factorial cart2sph cart2pol pol2cart sph2cart hsv2rgb rgb2hsv zeros ones eye repmat rand randn linspace logspace freqspace meshgrid accumarray size length ndims numel disp isempty isequal isequalwithequalnans cat reshape diag blkdiag tril triu fliplr flipud flipdim rot90 find sub2ind ind2sub bsxfun ndgrid permute ipermute shiftdim circshift squeeze isscalar isvector ans eps realmax realmin pi i inf nan isnan isinf isfinite j why compan gallery hadamard hankel hilb invhilb magic pascal rosser toeplitz vander wilkinson"},i:'(//|"|#|/\\*|\\s+/\\w+)',c:[{cN:"function",bK:"function",e:"$",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)"},{cN:"params",b:"\\[",e:"\\]"}]},{b:/[a-zA-Z_][a-zA-Z_0-9]*'['\.]*/,rB:!0,r:0,c:[{b:/[a-zA-Z_][a-zA-Z_0-9]*/,r:0},s.c[0]]},{cN:"matrix",b:"\\[",e:"\\]",c:a,r:0,starts:s},{cN:"cell",b:"\\{",e:/}/,c:a,r:0,starts:s},{b:/\)/,r:0,starts:s},e.C("^\\s*\\%\\{\\s*$","^\\s*\\%\\}\\s*$"),e.C("\\%","$")].concat(a)}});hljs.registerLanguage("vbscript",function(e){return{aliases:["vbs"],cI:!0,k:{keyword:"call class const dim do loop erase execute executeglobal exit for each next function if then else on error option explicit new private property let get public randomize redim rem select case set stop sub while wend with end to elseif is or xor and not class_initialize class_terminate default preserve in me byval byref step resume goto",built_in:"lcase month vartype instrrev ubound setlocale getobject rgb getref string weekdayname rnd dateadd monthname now day minute isarray cbool round formatcurrency conversions csng timevalue second year space abs clng timeserial fixs len asc isempty maths dateserial atn timer isobject filter weekday datevalue ccur isdate instr datediff formatdatetime replace isnull right sgn array snumeric log cdbl hex chr lbound msgbox ucase getlocale cos cdate cbyte rtrim join hour oct typename trim strcomp int createobject loadpicture tan formatnumber mid scriptenginebuildversion scriptengine split scriptengineminorversion cint sin datepart ltrim sqr scriptenginemajorversion time derived eval date formatpercent exp inputbox left ascw chrw regexp server response request cstr err",literal:"true false null nothing empty"},i:"//",c:[e.inherit(e.QSM,{c:[{b:'""'}]}),e.C(/'/,/$/,{r:0}),e.CNM]}});hljs.registerLanguage("capnproto",function(t){return{aliases:["capnp"],k:{keyword:"struct enum interface union group import using const annotation extends in of on as with from fixed",built_in:"Void Bool Int8 Int16 Int32 Int64 UInt8 UInt16 UInt32 UInt64 Float32 Float64 Text Data AnyPointer AnyStruct Capability List",literal:"true false"},c:[t.QSM,t.NM,t.HCM,{cN:"shebang",b:/@0x[\w\d]{16};/,i:/\n/},{cN:"number",b:/@\d+\b/},{cN:"class",bK:"struct enum",e:/\{/,i:/\n/,c:[t.inherit(t.TM,{starts:{eW:!0,eE:!0}})]},{cN:"class",bK:"interface",e:/\{/,i:/\n/,c:[t.inherit(t.TM,{starts:{eW:!0,eE:!0}})]}]}});hljs.registerLanguage("xl",function(e){var t="ObjectLoader Animate MovieCredits Slides Filters Shading Materials LensFlare Mapping VLCAudioVideo StereoDecoder PointCloud NetworkAccess RemoteControl RegExp ChromaKey Snowfall NodeJS Speech Charts",o={keyword:"if then else do while until for loop import with is as where when by data constant",literal:"true false nil",type:"integer real text name boolean symbol infix prefix postfix block tree",built_in:"in mod rem and or xor not abs sign floor ceil sqrt sin cos tan asin acos atan exp expm1 log log2 log10 log1p pi at",module:t,id:"text_length text_range text_find text_replace contains page slide basic_slide title_slide title subtitle fade_in fade_out fade_at clear_color color line_color line_width texture_wrap texture_transform texture scale_?x scale_?y scale_?z? translate_?x translate_?y translate_?z? rotate_?x rotate_?y rotate_?z? rectangle circle ellipse sphere path line_to move_to quad_to curve_to theme background contents locally time mouse_?x mouse_?y mouse_buttons"},a={cN:"constant",b:"[A-Z][A-Z_0-9]+",r:0},r={cN:"variable",b:"([A-Z][a-z_0-9]+)+",r:0},i={cN:"id",b:"[a-z][a-z_0-9]+",r:0},l={cN:"string",b:'"',e:'"',i:"\\n"},n={cN:"string",b:"'",e:"'",i:"\\n"},s={cN:"string",b:"<<",e:">>"},c={cN:"number",b:"[0-9]+#[0-9A-Z_]+(\\.[0-9-A-Z_]+)?#?([Ee][+-]?[0-9]+)?",r:10},_={cN:"import",bK:"import",e:"$",k:{keyword:"import",module:t},r:0,c:[l]},d={cN:"function",b:"[a-z].*->"};return{aliases:["tao"],l:/[a-zA-Z][a-zA-Z0-9_?]*/,k:o,c:[e.CLCM,e.CBCM,l,n,s,d,_,a,r,i,c,e.NM]}});hljs.registerLanguage("scala",function(e){var t={cN:"annotation",b:"@[A-Za-z]+"},a={cN:"string",b:'u?r?"""',e:'"""',r:10},r={cN:"symbol",b:"'\\w[\\w\\d_]*(?!')"},c={cN:"type",b:"\\b[A-Z][A-Za-z0-9_]*",r:0},i={cN:"title",b:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/,r:0},l={cN:"class",bK:"class object trait type",e:/[:={\[(\n;]/,c:[{cN:"keyword",bK:"extends with",r:10},i]},n={cN:"function",bK:"def val",e:/[:={\[(\n;]/,c:[i]};return{k:{literal:"true false null",keyword:"type yield lazy override def with val var sealed abstract private trait object if forSome for while throw finally protected extends import final return else break new catch super class case package default try this match continue throws implicit"},c:[e.CLCM,e.CBCM,a,e.QSM,r,c,n,l,e.CNM,t]}});hljs.registerLanguage("elixir",function(e){var n="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?",r="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",b="and false then defined module in return redo retry end for true self when next until do begin unless nil break not case cond alias while ensure or include use alias fn quote",c={cN:"subst",b:"#\\{",e:"}",l:n,k:b},a={cN:"string",c:[e.BE,c],v:[{b:/'/,e:/'/},{b:/"/,e:/"/}]},i={cN:"function",bK:"def defp defmacro",e:/\B\b/,c:[e.inherit(e.TM,{b:n,endsParent:!0})]},s=e.inherit(i,{cN:"class",bK:"defmodule defrecord",e:/\bdo\b|$|;/}),l=[a,e.HCM,s,i,{cN:"constant",b:"(\\b[A-Z_]\\w*(.)?)+",r:0},{cN:"symbol",b:":",c:[a,{b:r}],r:0},{cN:"symbol",b:n+":",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"->"},{b:"("+e.RSR+")\\s*",c:[e.HCM,{cN:"regexp",i:"\\n",c:[e.BE,c],v:[{b:"/",e:"/[a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],r:0}];return c.c=l,{l:n,k:b,c:l}});hljs.registerLanguage("sml",function(e){return{aliases:["ml"],k:{keyword:"abstype and andalso as case datatype do else end eqtype exception fn fun functor handle if in include infix infixr let local nonfix of op open orelse raise rec sharing sig signature struct structure then type val with withtype where while",built_in:"array bool char exn int list option order real ref string substring vector unit word",literal:"true false NONE SOME LESS EQUAL GREATER nil"},i:/\/\/|>>/,l:"[a-z_]\\w*!?",c:[{cN:"literal",b:"\\[(\\|\\|)?\\]|\\(\\)"},e.C("\\(\\*","\\*\\)",{c:["self"]}),{cN:"symbol",b:"'[A-Za-z_](?!')[\\w']*"},{cN:"tag",b:"`[A-Z][\\w']*"},{cN:"type",b:"\\b[A-Z][\\w']*",r:0},{b:"[a-z_]\\w*'[\\w']*"},e.inherit(e.ASM,{cN:"char",r:0}),e.inherit(e.QSM,{i:null}),{cN:"number",b:"\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",r:0},{b:/[-=]>/}]}});hljs.registerLanguage("apache",function(e){var r={cN:"number",b:"[\\$%]\\d+"};return{aliases:["apacheconf"],cI:!0,c:[e.HCM,{cN:"tag",b:""},{cN:"keyword",b:/\w+/,r:0,k:{common:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{e:/$/,r:0,k:{literal:"on off all"},c:[{cN:"sqbracket",b:"\\s\\[",e:"\\]$"},{cN:"cbracket",b:"[\\$%]\\{",e:"\\}",c:["self",r]},r,e.QSM]}}],i:/\S/}});hljs.registerLanguage("dockerfile",function(n){return{aliases:["docker"],cI:!0,k:{built_ins:"from maintainer cmd expose add copy entrypoint volume user workdir onbuild run env"},c:[n.HCM,{k:{built_in:"run cmd entrypoint volume add copy workdir onbuild"},b:/^ *(onbuild +)?(run|cmd|entrypoint|volume|add|copy|workdir) +/,starts:{e:/[^\\]\n/,sL:"bash",subLanguageMode:"continuous"}},{k:{built_in:"from maintainer expose env user onbuild"},b:/^ *(onbuild +)?(from|maintainer|expose|env|user|onbuild) +/,e:/[^\\]\n/,c:[n.ASM,n.QSM,n.NM,n.HCM]}]}});hljs.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"header",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"blockquote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"`.+?`"},{b:"^( {4}| )",e:"$",r:0}]},{cN:"horizontal_rule",b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"link_label",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link_url",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"link_reference",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:"^\\[.+\\]:",rB:!0,c:[{cN:"link_reference",b:"\\[",e:"\\]:",eB:!0,eE:!0,starts:{cN:"link_url",e:"$"}}]}]}});hljs.registerLanguage("haml",function(s){return{cI:!0,c:[{cN:"doctype",b:"^!!!( (5|1\\.1|Strict|Frameset|Basic|Mobile|RDFa|XML\\b.*))?$",r:10},s.C("^\\s*(!=#|=#|-#|/).*$",!1,{r:0}),{b:"^\\s*(-|=|!=)(?!#)",starts:{e:"\\n",sL:"ruby"}},{cN:"tag",b:"^\\s*%",c:[{cN:"title",b:"\\w+"},{cN:"value",b:"[#\\.]\\w+"},{b:"{\\s*",e:"\\s*}",eE:!0,c:[{b:":\\w+\\s*=>",e:",\\s+",rB:!0,eW:!0,c:[{cN:"symbol",b:":\\w+"},{cN:"string",b:'"',e:'"'},{cN:"string",b:"'",e:"'"},{b:"\\w+",r:0}]}]},{b:"\\(\\s*",e:"\\s*\\)",eE:!0,c:[{b:"\\w+\\s*=",e:"\\s+",rB:!0,eW:!0,c:[{cN:"attribute",b:"\\w+",r:0},{cN:"string",b:'"',e:'"'},{cN:"string",b:"'",e:"'"},{b:"\\w+",r:0}]}]}]},{cN:"bullet",b:"^\\s*[=~]\\s*",r:0},{b:"#{",starts:{e:"}",sL:"ruby"}}]}});hljs.registerLanguage("fortran",function(e){var t={cN:"params",b:"\\(",e:"\\)"},n={constant:".False. .True.",type:"integer real character complex logical dimension allocatable|10 parameter external implicit|10 none double precision assign intent optional pointer target in out common equivalence data",keyword:"kind do while private call intrinsic where elsewhere type endtype endmodule endselect endinterface end enddo endif if forall endforall only contains default return stop then public subroutine|10 function program .and. .or. .not. .le. .eq. .ge. .gt. .lt. goto save else use module select case access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit continue format pause cycle exit c_null_char c_alert c_backspace c_form_feed flush wait decimal round iomsg synchronous nopass non_overridable pass protected volatile abstract extends import non_intrinsic value deferred generic final enumerator class associate bind enum c_int c_short c_long c_long_long c_signed_char c_size_t c_int8_t c_int16_t c_int32_t c_int64_t c_int_least8_t c_int_least16_t c_int_least32_t c_int_least64_t c_int_fast8_t c_int_fast16_t c_int_fast32_t c_int_fast64_t c_intmax_t C_intptr_t c_float c_double c_long_double c_float_complex c_double_complex c_long_double_complex c_bool c_char c_null_ptr c_null_funptr c_new_line c_carriage_return c_horizontal_tab c_vertical_tab iso_c_binding c_loc c_funloc c_associated c_f_pointer c_ptr c_funptr iso_fortran_env character_storage_size error_unit file_storage_size input_unit iostat_end iostat_eor numeric_storage_size output_unit c_f_procpointer ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode newunit contiguous pad position action delim readwrite eor advance nml interface procedure namelist include sequence elemental pure",built_in:"alog alog10 amax0 amax1 amin0 amin1 amod cabs ccos cexp clog csin csqrt dabs dacos dasin datan datan2 dcos dcosh ddim dexp dint dlog dlog10 dmax1 dmin1 dmod dnint dsign dsin dsinh dsqrt dtan dtanh float iabs idim idint idnint ifix isign max0 max1 min0 min1 sngl algama cdabs cdcos cdexp cdlog cdsin cdsqrt cqabs cqcos cqexp cqlog cqsin cqsqrt dcmplx dconjg derf derfc dfloat dgamma dimag dlgama iqint qabs qacos qasin qatan qatan2 qcmplx qconjg qcos qcosh qdim qerf qerfc qexp qgamma qimag qlgama qlog qlog10 qmax1 qmin1 qmod qnint qsign qsin qsinh qsqrt qtan qtanh abs acos aimag aint anint asin atan atan2 char cmplx conjg cos cosh exp ichar index int log log10 max min nint sign sin sinh sqrt tan tanh print write dim lge lgt lle llt mod nullify allocate deallocate adjustl adjustr all allocated any associated bit_size btest ceiling count cshift date_and_time digits dot_product eoshift epsilon exponent floor fraction huge iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim matmul maxexponent maxloc maxval merge minexponent minloc minval modulo mvbits nearest pack present product radix random_number random_seed range repeat reshape rrspacing scale scan selected_int_kind selected_real_kind set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify achar iachar transfer dble entry dprod cpu_time command_argument_count get_command get_command_argument get_environment_variable is_iostat_end ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_ofacosh asinh atanh bessel_j0 bessel_j1 bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma hypot norm2 atomic_define atomic_ref execute_command_line leadz trailz storage_size merge_bits bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr num_images parity popcnt poppar shifta shiftl shiftr this_image"};return{cI:!0,aliases:["f90","f95"],k:n,c:[e.inherit(e.ASM,{cN:"string",r:0}),e.inherit(e.QSM,{cN:"string",r:0}),{cN:"function",bK:"subroutine function program",i:"[${=\\n]",c:[e.UTM,t]},e.C("!","$",{r:0}),{cN:"number",b:"(?=\\b|\\+|\\-|\\.)(?=\\.\\d|\\d)(?:\\d+)?(?:\\.?\\d*)(?:[de][+-]?\\d+)?\\b\\.?",r:0}]}});hljs.registerLanguage("smali",function(r){var t=["add","and","cmp","cmpg","cmpl","const","div","double","float","goto","if","int","long","move","mul","neg","new","nop","not","or","rem","return","shl","shr","sput","sub","throw","ushr","xor"],n=["aget","aput","array","check","execute","fill","filled","goto/16","goto/32","iget","instance","invoke","iput","monitor","packed","sget","sparse"],s=["transient","constructor","abstract","final","synthetic","public","private","protected","static","bridge","system"];return{aliases:["smali"],c:[{cN:"string",b:'"',e:'"',r:0},r.C("#","$",{r:0}),{cN:"keyword",b:"\\s*\\.end\\s[a-zA-Z0-9]*",r:1},{cN:"keyword",b:"^[ ]*\\.[a-zA-Z]*",r:0},{cN:"keyword",b:"\\s:[a-zA-Z_0-9]*",r:0},{cN:"keyword",b:"\\s("+s.join("|")+")",r:1},{cN:"keyword",b:"\\[",r:0},{cN:"instruction",b:"\\s("+t.join("|")+")\\s",r:1},{cN:"instruction",b:"\\s("+t.join("|")+")((\\-|/)[a-zA-Z0-9]+)+\\s",r:10},{cN:"instruction",b:"\\s("+n.join("|")+")((\\-|/)[a-zA-Z0-9]+)*\\s",r:10},{cN:"class",b:"L[^(;:\n]*;",r:0},{cN:"function",b:'( |->)[^(\n ;"]*\\(',r:0},{cN:"function",b:"\\)",r:0},{cN:"variable",b:"[vp][0-9]+",r:0}]}});hljs.registerLanguage("julia",function(r){var e={keyword:"in abstract baremodule begin bitstype break catch ccall const continue do else elseif end export finally for function global if immutable import importall let local macro module quote return try type typealias using while",literal:"true false ANY ARGS CPU_CORES C_NULL DL_LOAD_PATH DevNull ENDIAN_BOM ENV I|0 Inf Inf16 Inf32 InsertionSort JULIA_HOME LOAD_PATH MS_ASYNC MS_INVALIDATE MS_SYNC MergeSort NaN NaN16 NaN32 OS_NAME QuickSort RTLD_DEEPBIND RTLD_FIRST RTLD_GLOBAL RTLD_LAZY RTLD_LOCAL RTLD_NODELETE RTLD_NOLOAD RTLD_NOW RoundDown RoundFromZero RoundNearest RoundToZero RoundUp STDERR STDIN STDOUT VERSION WORD_SIZE catalan cglobal e eu eulergamma golden im nothing pi γ π φ",built_in:"ASCIIString AbstractArray AbstractRNG AbstractSparseArray Any ArgumentError Array Associative Base64Pipe Bidiagonal BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError Box CFILE Cchar Cdouble Cfloat Char CharString Cint Clong Clonglong ClusterManager Cmd Coff_t Colon Complex Complex128 Complex32 Complex64 Condition Cptrdiff_t Cshort Csize_t Cssize_t Cuchar Cuint Culong Culonglong Cushort Cwchar_t DArray DataType DenseArray Diagonal Dict DimensionMismatch DirectIndexString Display DivideError DomainError EOFError EachLine Enumerate ErrorException Exception Expr Factorization FileMonitor FileOffset Filter Float16 Float32 Float64 FloatRange FloatingPoint Function GetfieldNode GotoNode Hermitian IO IOBuffer IOStream IPv4 IPv6 InexactError Int Int128 Int16 Int32 Int64 Int8 IntSet Integer InterruptException IntrinsicFunction KeyError LabelNode LambdaStaticData LineNumberNode LoadError LocalProcess MIME MathConst MemoryError MersenneTwister Method MethodError MethodTable Module NTuple NewvarNode Nothing Number ObjectIdDict OrdinalRange OverflowError ParseError PollingFileWatcher ProcessExitedException ProcessGroup Ptr QuoteNode Range Range1 Ranges Rational RawFD Real Regex RegexMatch RemoteRef RepString RevString RopeString RoundingMode Set SharedArray Signed SparseMatrixCSC StackOverflowError Stat StatStruct StepRange String SubArray SubString SymTridiagonal Symbol SymbolNode Symmetric SystemError Task TextDisplay Timer TmStruct TopNode Triangular Tridiagonal Type TypeConstructor TypeError TypeName TypeVar UTF16String UTF32String UTF8String UdpSocket Uint Uint128 Uint16 Uint32 Uint64 Uint8 UndefRefError UndefVarError UniformScaling UnionType UnitRange Unsigned Vararg VersionNumber WString WeakKeyDict WeakRef Woodbury Zip"},t="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",o={l:t,k:e},n={cN:"type-annotation",b:/::/},a={cN:"subtype",b:/<:/},i={cN:"number",b:/(\b0x[\d_]*(\.[\d_]*)?|0x\.\d[\d_]*)p[-+]?\d+|\b0[box][a-fA-F0-9][a-fA-F0-9_]*|(\b\d[\d_]*(\.[\d_]*)?|\.\d[\d_]*)([eEfF][-+]?\d+)?/,r:0},l={cN:"char",b:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},c={cN:"subst",b:/\$\(/,e:/\)/,k:e},u={cN:"variable",b:"\\$"+t},d={cN:"string",c:[r.BE,c,u],v:[{b:/\w*"/,e:/"\w*/},{b:/\w*"""/,e:/"""\w*/}]},g={cN:"string",c:[r.BE,c,u],b:"`",e:"`"},s={cN:"macrocall",b:"@"+t},S={cN:"comment",v:[{b:"#=",e:"=#",r:10},{b:"#",e:"$"}]};return o.c=[i,l,n,a,d,g,s,S,r.HCM],c.c=o.c,o});hljs.registerLanguage("delphi",function(e){var r="exports register file shl array record property for mod while set ally label uses raise not stored class safecall var interface or private static exit index inherited to else stdcall override shr asm far resourcestring finalization packed virtual out and protected library do xorwrite goto near function end div overload object unit begin string on inline repeat until destructor write message program with read initialization except default nil if case cdecl in downto threadvar of try pascal const external constructor type public then implementation finally published procedure",t=[e.CLCM,e.C(/\{/,/\}/,{r:0}),e.C(/\(\*/,/\*\)/,{r:10})],i={cN:"string",b:/'/,e:/'/,c:[{b:/''/}]},c={cN:"string",b:/(#\d+)+/},o={b:e.IR+"\\s*=\\s*class\\s*\\(",rB:!0,c:[e.TM]},n={cN:"function",bK:"function constructor destructor procedure",e:/[:;]/,k:"function constructor|10 destructor|10 procedure|10",c:[e.TM,{cN:"params",b:/\(/,e:/\)/,k:r,c:[i,c]}].concat(t)};return{cI:!0,k:r,i:/"|\$[G-Zg-z]|\/\*|<\/|\|/,c:[i,c,e.NM,o,n].concat(t)}});hljs.registerLanguage("brainfuck",function(r){var n={cN:"literal",b:"[\\+\\-]",r:0};return{aliases:["bf"],c:[r.C("[^\\[\\]\\.,\\+\\-<> \r\n]","[\\[\\]\\.,\\+\\-<> \r\n]",{rE:!0,r:0}),{cN:"title",b:"[\\[\\]]",r:0},{cN:"string",b:"[\\.,]",r:0},{b:/\+\+|\-\-/,rB:!0,c:[n]},n]}});hljs.registerLanguage("ini",function(e){return{cI:!0,i:/\S/,c:[e.C(";","$"),{cN:"title",b:"^\\[",e:"\\]"},{cN:"setting",b:"^[a-z0-9\\[\\]_-]+[ \\t]*=[ \\t]*",e:"$",c:[{cN:"value",eW:!0,k:"on off true false yes no",c:[e.QSM,e.NM],r:0}]}]}});hljs.registerLanguage("json",function(e){var t={literal:"true false null"},i=[e.QSM,e.CNM],l={cN:"value",e:",",eW:!0,eE:!0,c:i,k:t},c={b:"{",e:"}",c:[{cN:"attribute",b:'\\s*"',e:'"\\s*:\\s*',eB:!0,eE:!0,c:[e.BE],i:"\\n",starts:l}],i:"\\S"},n={b:"\\[",e:"\\]",c:[e.inherit(l,{cN:null})],i:"\\S"};return i.splice(i.length,0,c,n),{c:i,k:t,i:"\\S"}});hljs.registerLanguage("powershell",function(e){var t={b:"`[\\s\\S]",r:0},r={cN:"variable",v:[{b:/\$[\w\d][\w\d_:]*/}]},o={cN:"string",b:/"/,e:/"/,c:[t,r,{cN:"variable",b:/\$[A-z]/,e:/[^A-z]/}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["ps"],l:/-?[A-z\.\-]+/,cI:!0,k:{keyword:"if else foreach return function do while until elseif begin for trap data dynamicparam end break throw param continue finally in switch exit filter try process catch",literal:"$null $true $false",built_in:"Add-Content Add-History Add-Member Add-PSSnapin Clear-Content Clear-Item Clear-Item Property Clear-Variable Compare-Object ConvertFrom-SecureString Convert-Path ConvertTo-Html ConvertTo-SecureString Copy-Item Copy-ItemProperty Export-Alias Export-Clixml Export-Console Export-Csv ForEach-Object Format-Custom Format-List Format-Table Format-Wide Get-Acl Get-Alias Get-AuthenticodeSignature Get-ChildItem Get-Command Get-Content Get-Credential Get-Culture Get-Date Get-EventLog Get-ExecutionPolicy Get-Help Get-History Get-Host Get-Item Get-ItemProperty Get-Location Get-Member Get-PfxCertificate Get-Process Get-PSDrive Get-PSProvider Get-PSSnapin Get-Service Get-TraceSource Get-UICulture Get-Unique Get-Variable Get-WmiObject Group-Object Import-Alias Import-Clixml Import-Csv Invoke-Expression Invoke-History Invoke-Item Join-Path Measure-Command Measure-Object Move-Item Move-ItemProperty New-Alias New-Item New-ItemProperty New-Object New-PSDrive New-Service New-TimeSpan New-Variable Out-Default Out-File Out-Host Out-Null Out-Printer Out-String Pop-Location Push-Location Read-Host Remove-Item Remove-ItemProperty Remove-PSDrive Remove-PSSnapin Remove-Variable Rename-Item Rename-ItemProperty Resolve-Path Restart-Service Resume-Service Select-Object Select-String Set-Acl Set-Alias Set-AuthenticodeSignature Set-Content Set-Date Set-ExecutionPolicy Set-Item Set-ItemProperty Set-Location Set-PSDebug Set-Service Set-TraceSource Set-Variable Sort-Object Split-Path Start-Service Start-Sleep Start-Transcript Stop-Process Stop-Service Stop-Transcript Suspend-Service Tee-Object Test-Path Trace-Command Update-FormatData Update-TypeData Where-Object Write-Debug Write-Error Write-Host Write-Output Write-Progress Write-Verbose Write-Warning",operator:"-ne -eq -lt -gt -ge -le -not -like -notlike -match -notmatch -contains -notcontains -in -notin -replace"},c:[e.HCM,e.NM,o,a,r]}});hljs.registerLanguage("gradle",function(e){return{cI:!0,k:{keyword:"task project allprojects subprojects artifacts buildscript configurations dependencies repositories sourceSets description delete from into include exclude source classpath destinationDir includes options sourceCompatibility targetCompatibility group flatDir doLast doFirst flatten todir fromdir ant def abstract break case catch continue default do else extends final finally for if implements instanceof native new private protected public return static switch synchronized throw throws transient try volatile while strictfp package import false null super this true antlrtask checkstyle codenarc copy boolean byte char class double float int interface long short void compile runTime file fileTree abs any append asList asWritable call collect compareTo count div dump each eachByte eachFile eachLine every find findAll flatten getAt getErr getIn getOut getText grep immutable inject inspect intersect invokeMethods isCase join leftShift minus multiply newInputStream newOutputStream newPrintWriter newReader newWriter next plus pop power previous print println push putAt read readBytes readLines reverse reverseEach round size sort splitEachLine step subMap times toInteger toList tokenize upto waitForOrKill withPrintWriter withReader withStream withWriter withWriterAppend write writeLine"},c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.NM,e.RM]}});hljs.registerLanguage("erb",function(e){return{sL:"xml",subLanguageMode:"continuous",c:[e.C("<%#","%>"),{b:"<%[%=-]?",e:"[%-]?%>",sL:"ruby",eB:!0,eE:!0}]}});hljs.registerLanguage("swift",function(e){var i={keyword:"class deinit enum extension func import init let protocol static struct subscript typealias var break case continue default do else fallthrough if in for return switch where while as dynamicType is new super self Self Type __COLUMN__ __FILE__ __FUNCTION__ __LINE__ associativity didSet get infix inout left mutating none nonmutating operator override postfix precedence prefix right set unowned unowned safe unsafe weak willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue assert bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal false filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced join lexicographicalCompare map max maxElement min minElement nil numericCast partition posix print println quickSort reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith strideof strideofValue swap swift toString transcode true underestimateCount unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafePointers withVaList"},t={cN:"type",b:"\\b[A-Z][\\w']*",r:0},n=e.C("/\\*","\\*/",{c:["self"]}),r={cN:"subst",b:/\\\(/,e:"\\)",k:i,c:[]},s={cN:"number",b:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",r:0},o=e.inherit(e.QSM,{c:[r,e.BE]});return r.c=[s],{k:i,c:[o,e.CLCM,n,t,s,{cN:"func",bK:"func",e:"{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/,i:/\(/}),{cN:"generics",b://,i:/>/},{cN:"params",b:/\(/,e:/\)/,endsParent:!0,k:i,c:["self",s,o,e.CBCM,{b:":"}],i:/["']/}],i:/\[|%/},{cN:"class",bK:"struct protocol class extension enum",k:i,e:"\\{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/})]},{cN:"preprocessor",b:"(@assignment|@class_protocol|@exported|@final|@lazy|@noreturn|@NSCopying|@NSManaged|@objc|@optional|@required|@auto_closure|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix)"}]}});hljs.registerLanguage("lisp",function(b){var e="[a-zA-Z_\\-\\+\\*\\/\\<\\=\\>\\&\\#][a-zA-Z0-9_\\-\\+\\*\\/\\<\\=\\>\\&\\#!]*",c="\\|[^]*?\\|",r="(\\-|\\+)?\\d+(\\.\\d+|\\/\\d+)?((d|e|f|l|s|D|E|F|L|S)(\\+|\\-)?\\d+)?",a={cN:"shebang",b:"^#!",e:"$"},i={cN:"literal",b:"\\b(t{1}|nil)\\b"},l={cN:"number",v:[{b:r,r:0},{b:"#(b|B)[0-1]+(/[0-1]+)?"},{b:"#(o|O)[0-7]+(/[0-7]+)?"},{b:"#(x|X)[0-9a-fA-F]+(/[0-9a-fA-F]+)?"},{b:"#(c|C)\\("+r+" +"+r,e:"\\)"}]},t=b.inherit(b.QSM,{i:null}),d=b.C(";","$",{r:0}),n={cN:"variable",b:"\\*",e:"\\*"},u={cN:"keyword",b:"[:&]"+e},N={b:e,r:0},o={b:c},s={b:"\\(",e:"\\)",c:["self",i,t,l,N]},v={cN:"quoted",c:[l,t,n,u,s,N],v:[{b:"['`]\\(",e:"\\)"},{b:"\\(quote ",e:"\\)",k:"quote"},{b:"'"+c}]},f={cN:"quoted",v:[{b:"'"+e},{b:"#'"+e+"(::"+e+")*"}]},g={cN:"list",b:"\\(\\s*",e:"\\)"},q={eW:!0,r:0};return g.c=[{cN:"keyword",v:[{b:e},{b:c}]},q],q.c=[v,f,g,i,l,t,d,n,u,o,N],{i:/\S/,c:[l,a,i,t,d,v,f,g,N]}});hljs.registerLanguage("rsl",function(e){return{k:{keyword:"float color point normal vector matrix while for if do return else break extern continue",built_in:"abs acos ambient area asin atan atmosphere attribute calculatenormal ceil cellnoise clamp comp concat cos degrees depth Deriv diffuse distance Du Dv environment exp faceforward filterstep floor format fresnel incident length lightsource log match max min mod noise normalize ntransform opposite option phong pnoise pow printf ptlined radians random reflect refract renderinfo round setcomp setxcomp setycomp setzcomp shadow sign sin smoothstep specular specularbrdf spline sqrt step tan texture textureinfo trace transform vtransform xcomp ycomp zcomp"},i:" > >= ` abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string=? string>? string? substring symbol->string symbol? tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"},n={cN:"shebang",b:"^#!",e:"$"},c={cN:"literal",b:"(#t|#f|#\\\\"+t+"|#\\\\.)"},l={cN:"number",v:[{b:r,r:0},{b:i,r:0},{b:"#b[0-1]+(/[0-1]+)?"},{b:"#o[0-7]+(/[0-7]+)?"},{b:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},s=e.QSM,o=[e.C(";","$",{r:0}),e.C("#\\|","\\|#")],u={b:t,r:0},p={cN:"variable",b:"'"+t},d={eW:!0,r:0},g={cN:"list",v:[{b:"\\(",e:"\\)"},{b:"\\[",e:"\\]"}],c:[{cN:"keyword",b:t,l:t,k:a},d]};return d.c=[c,l,s,u,p,g].concat(o),{i:/\S/,c:[n,l,s,p,g].concat(o)}});hljs.registerLanguage("stata",function(e){return{aliases:["do","ado"],cI:!0,k:"if else in foreach for forv forva forval forvalu forvalue forvalues by bys bysort xi quietly qui capture about ac ac_7 acprplot acprplot_7 adjust ado adopath adoupdate alpha ameans an ano anov anova anova_estat anova_terms anovadef aorder ap app appe appen append arch arch_dr arch_estat arch_p archlm areg areg_p args arima arima_dr arima_estat arima_p as asmprobit asmprobit_estat asmprobit_lf asmprobit_mfx__dlg asmprobit_p ass asse asser assert avplot avplot_7 avplots avplots_7 bcskew0 bgodfrey binreg bip0_lf biplot bipp_lf bipr_lf bipr_p biprobit bitest bitesti bitowt blogit bmemsize boot bootsamp bootstrap bootstrap_8 boxco_l boxco_p boxcox boxcox_6 boxcox_p bprobit br break brier bro brow brows browse brr brrstat bs bs_7 bsampl_w bsample bsample_7 bsqreg bstat bstat_7 bstat_8 bstrap bstrap_7 ca ca_estat ca_p cabiplot camat canon canon_8 canon_8_p canon_estat canon_p cap caprojection capt captu captur capture cat cc cchart cchart_7 cci cd censobs_table centile cf char chdir checkdlgfiles checkestimationsample checkhlpfiles checksum chelp ci cii cl class classutil clear cli clis clist clo clog clog_lf clog_p clogi clogi_sw clogit clogit_lf clogit_p clogitp clogl_sw cloglog clonevar clslistarray cluster cluster_measures cluster_stop cluster_tree cluster_tree_8 clustermat cmdlog cnr cnre cnreg cnreg_p cnreg_sw cnsreg codebook collaps4 collapse colormult_nb colormult_nw compare compress conf confi confir confirm conren cons const constr constra constrai constrain constraint continue contract copy copyright copysource cor corc corr corr2data corr_anti corr_kmo corr_smc corre correl correla correlat correlate corrgram cou coun count cox cox_p cox_sw coxbase coxhaz coxvar cprplot cprplot_7 crc cret cretu cretur creturn cross cs cscript cscript_log csi ct ct_is ctset ctst_5 ctst_st cttost cumsp cumsp_7 cumul cusum cusum_7 cutil d datasig datasign datasigna datasignat datasignatu datasignatur datasignature datetof db dbeta de dec deco decod decode deff des desc descr descri describ describe destring dfbeta dfgls dfuller di di_g dir dirstats dis discard disp disp_res disp_s displ displa display distinct do doe doed doedi doedit dotplot dotplot_7 dprobit drawnorm drop ds ds_util dstdize duplicates durbina dwstat dydx e ed edi edit egen eivreg emdef en enc enco encod encode eq erase ereg ereg_lf ereg_p ereg_sw ereghet ereghet_glf ereghet_glf_sh ereghet_gp ereghet_ilf ereghet_ilf_sh ereghet_ip eret eretu eretur ereturn err erro error est est_cfexist est_cfname est_clickable est_expand est_hold est_table est_unhold est_unholdok estat estat_default estat_summ estat_vce_only esti estimates etodow etof etomdy ex exi exit expand expandcl fac fact facto factor factor_estat factor_p factor_pca_rotated factor_rotate factormat fcast fcast_compute fcast_graph fdades fdadesc fdadescr fdadescri fdadescrib fdadescribe fdasav fdasave fdause fh_st file open file read file close file filefilter fillin find_hlp_file findfile findit findit_7 fit fl fli flis flist for5_0 form forma format fpredict frac_154 frac_adj frac_chk frac_cox frac_ddp frac_dis frac_dv frac_in frac_mun frac_pp frac_pq frac_pv frac_wgt frac_xo fracgen fracplot fracplot_7 fracpoly fracpred fron_ex fron_hn fron_p fron_tn fron_tn2 frontier ftodate ftoe ftomdy ftowdate g gamhet_glf gamhet_gp gamhet_ilf gamhet_ip gamma gamma_d2 gamma_p gamma_sw gammahet gdi_hexagon gdi_spokes ge gen gene gener genera generat generate genrank genstd genvmean gettoken gl gladder gladder_7 glim_l01 glim_l02 glim_l03 glim_l04 glim_l05 glim_l06 glim_l07 glim_l08 glim_l09 glim_l10 glim_l11 glim_l12 glim_lf glim_mu glim_nw1 glim_nw2 glim_nw3 glim_p glim_v1 glim_v2 glim_v3 glim_v4 glim_v5 glim_v6 glim_v7 glm glm_6 glm_p glm_sw glmpred glo glob globa global glogit glogit_8 glogit_p gmeans gnbre_lf gnbreg gnbreg_5 gnbreg_p gomp_lf gompe_sw gomper_p gompertz gompertzhet gomphet_glf gomphet_glf_sh gomphet_gp gomphet_ilf gomphet_ilf_sh gomphet_ip gphdot gphpen gphprint gprefs gprobi_p gprobit gprobit_8 gr gr7 gr_copy gr_current gr_db gr_describe gr_dir gr_draw gr_draw_replay gr_drop gr_edit gr_editviewopts gr_example gr_example2 gr_export gr_print gr_qscheme gr_query gr_read gr_rename gr_replay gr_save gr_set gr_setscheme gr_table gr_undo gr_use graph graph7 grebar greigen greigen_7 greigen_8 grmeanby grmeanby_7 gs_fileinfo gs_filetype gs_graphinfo gs_stat gsort gwood h hadimvo hareg hausman haver he heck_d2 heckma_p heckman heckp_lf heckpr_p heckprob hel help hereg hetpr_lf hetpr_p hetprob hettest hexdump hilite hist hist_7 histogram hlogit hlu hmeans hotel hotelling hprobit hreg hsearch icd9 icd9_ff icd9p iis impute imtest inbase include inf infi infil infile infix inp inpu input ins insheet insp inspe inspec inspect integ inten intreg intreg_7 intreg_p intrg2_ll intrg_ll intrg_ll2 ipolate iqreg ir irf irf_create irfm iri is_svy is_svysum isid istdize ivprob_1_lf ivprob_lf ivprobit ivprobit_p ivreg ivreg_footnote ivtob_1_lf ivtob_lf ivtobit ivtobit_p jackknife jacknife jknife jknife_6 jknife_8 jkstat joinby kalarma1 kap kap_3 kapmeier kappa kapwgt kdensity kdensity_7 keep ksm ksmirnov ktau kwallis l la lab labe label labelbook ladder levels levelsof leverage lfit lfit_p li lincom line linktest lis list lloghet_glf lloghet_glf_sh lloghet_gp lloghet_ilf lloghet_ilf_sh lloghet_ip llogi_sw llogis_p llogist llogistic llogistichet lnorm_lf lnorm_sw lnorma_p lnormal lnormalhet lnormhet_glf lnormhet_glf_sh lnormhet_gp lnormhet_ilf lnormhet_ilf_sh lnormhet_ip lnskew0 loadingplot loc loca local log logi logis_lf logistic logistic_p logit logit_estat logit_p loglogs logrank loneway lookfor lookup lowess lowess_7 lpredict lrecomp lroc lroc_7 lrtest ls lsens lsens_7 lsens_x lstat ltable ltable_7 ltriang lv lvr2plot lvr2plot_7 m ma mac macr macro makecns man manova manova_estat manova_p manovatest mantel mark markin markout marksample mat mat_capp mat_order mat_put_rr mat_rapp mata mata_clear mata_describe mata_drop mata_matdescribe mata_matsave mata_matuse mata_memory mata_mlib mata_mosave mata_rename mata_which matalabel matcproc matlist matname matr matri matrix matrix_input__dlg matstrik mcc mcci md0_ md1_ md1debug_ md2_ md2debug_ mds mds_estat mds_p mdsconfig mdslong mdsmat mdsshepard mdytoe mdytof me_derd mean means median memory memsize meqparse mer merg merge mfp mfx mhelp mhodds minbound mixed_ll mixed_ll_reparm mkassert mkdir mkmat mkspline ml ml_5 ml_adjs ml_bhhhs ml_c_d ml_check ml_clear ml_cnt ml_debug ml_defd ml_e0 ml_e0_bfgs ml_e0_cycle ml_e0_dfp ml_e0i ml_e1 ml_e1_bfgs ml_e1_bhhh ml_e1_cycle ml_e1_dfp ml_e2 ml_e2_cycle ml_ebfg0 ml_ebfr0 ml_ebfr1 ml_ebh0q ml_ebhh0 ml_ebhr0 ml_ebr0i ml_ecr0i ml_edfp0 ml_edfr0 ml_edfr1 ml_edr0i ml_eds ml_eer0i ml_egr0i ml_elf ml_elf_bfgs ml_elf_bhhh ml_elf_cycle ml_elf_dfp ml_elfi ml_elfs ml_enr0i ml_enrr0 ml_erdu0 ml_erdu0_bfgs ml_erdu0_bhhh ml_erdu0_bhhhq ml_erdu0_cycle ml_erdu0_dfp ml_erdu0_nrbfgs ml_exde ml_footnote ml_geqnr ml_grad0 ml_graph ml_hbhhh ml_hd0 ml_hold ml_init ml_inv ml_log ml_max ml_mlout ml_mlout_8 ml_model ml_nb0 ml_opt ml_p ml_plot ml_query ml_rdgrd ml_repor ml_s_e ml_score ml_searc ml_technique ml_unhold mleval mlf_ mlmatbysum mlmatsum mlog mlogi mlogit mlogit_footnote mlogit_p mlopts mlsum mlvecsum mnl0_ mor more mov move mprobit mprobit_lf mprobit_p mrdu0_ mrdu1_ mvdecode mvencode mvreg mvreg_estat n nbreg nbreg_al nbreg_lf nbreg_p nbreg_sw nestreg net newey newey_7 newey_p news nl nl_7 nl_9 nl_9_p nl_p nl_p_7 nlcom nlcom_p nlexp2 nlexp2_7 nlexp2a nlexp2a_7 nlexp3 nlexp3_7 nlgom3 nlgom3_7 nlgom4 nlgom4_7 nlinit nllog3 nllog3_7 nllog4 nllog4_7 nlog_rd nlogit nlogit_p nlogitgen nlogittree nlpred no nobreak noi nois noisi noisil noisily note notes notes_dlg nptrend numlabel numlist odbc old_ver olo olog ologi ologi_sw ologit ologit_p ologitp on one onew onewa oneway op_colnm op_comp op_diff op_inv op_str opr opro oprob oprob_sw oprobi oprobi_p oprobit oprobitp opts_exclusive order orthog orthpoly ou out outf outfi outfil outfile outs outsh outshe outshee outsheet ovtest pac pac_7 palette parse parse_dissim pause pca pca_8 pca_display pca_estat pca_p pca_rotate pcamat pchart pchart_7 pchi pchi_7 pcorr pctile pentium pergram pergram_7 permute permute_8 personal peto_st pkcollapse pkcross pkequiv pkexamine pkexamine_7 pkshape pksumm pksumm_7 pl plo plot plugin pnorm pnorm_7 poisgof poiss_lf poiss_sw poisso_p poisson poisson_estat post postclose postfile postutil pperron pr prais prais_e prais_e2 prais_p predict predictnl preserve print pro prob probi probit probit_estat probit_p proc_time procoverlay procrustes procrustes_estat procrustes_p profiler prog progr progra program prop proportion prtest prtesti pwcorr pwd q\\s qby qbys qchi qchi_7 qladder qladder_7 qnorm qnorm_7 qqplot qqplot_7 qreg qreg_c qreg_p qreg_sw qu quadchk quantile quantile_7 que quer query range ranksum ratio rchart rchart_7 rcof recast reclink recode reg reg3 reg3_p regdw regr regre regre_p2 regres regres_p regress regress_estat regriv_p remap ren rena renam rename renpfix repeat replace report reshape restore ret retu retur return rm rmdir robvar roccomp roccomp_7 roccomp_8 rocf_lf rocfit rocfit_8 rocgold rocplot rocplot_7 roctab roctab_7 rolling rologit rologit_p rot rota rotat rotate rotatemat rreg rreg_p ru run runtest rvfplot rvfplot_7 rvpplot rvpplot_7 sa safesum sample sampsi sav save savedresults saveold sc sca scal scala scalar scatter scm_mine sco scob_lf scob_p scobi_sw scobit scor score scoreplot scoreplot_help scree screeplot screeplot_help sdtest sdtesti se search separate seperate serrbar serrbar_7 serset set set_defaults sfrancia sh she shel shell shewhart shewhart_7 signestimationsample signrank signtest simul simul_7 simulate simulate_8 sktest sleep slogit slogit_d2 slogit_p smooth snapspan so sor sort spearman spikeplot spikeplot_7 spikeplt spline_x split sqreg sqreg_p sret sretu sretur sreturn ssc st st_ct st_hc st_hcd st_hcd_sh st_is st_issys st_note st_promo st_set st_show st_smpl st_subid stack statsby statsby_8 stbase stci stci_7 stcox stcox_estat stcox_fr stcox_fr_ll stcox_p stcox_sw stcoxkm stcoxkm_7 stcstat stcurv stcurve stcurve_7 stdes stem stepwise stereg stfill stgen stir stjoin stmc stmh stphplot stphplot_7 stphtest stphtest_7 stptime strate strate_7 streg streg_sw streset sts sts_7 stset stsplit stsum sttocc sttoct stvary stweib su suest suest_8 sum summ summa summar summari summariz summarize sunflower sureg survcurv survsum svar svar_p svmat svy svy_disp svy_dreg svy_est svy_est_7 svy_estat svy_get svy_gnbreg_p svy_head svy_header svy_heckman_p svy_heckprob_p svy_intreg_p svy_ivreg_p svy_logistic_p svy_logit_p svy_mlogit_p svy_nbreg_p svy_ologit_p svy_oprobit_p svy_poisson_p svy_probit_p svy_regress_p svy_sub svy_sub_7 svy_x svy_x_7 svy_x_p svydes svydes_8 svygen svygnbreg svyheckman svyheckprob svyintreg svyintreg_7 svyintrg svyivreg svylc svylog_p svylogit svymarkout svymarkout_8 svymean svymlog svymlogit svynbreg svyolog svyologit svyoprob svyoprobit svyopts svypois svypois_7 svypoisson svyprobit svyprobt svyprop svyprop_7 svyratio svyreg svyreg_p svyregress svyset svyset_7 svyset_8 svytab svytab_7 svytest svytotal sw sw_8 swcnreg swcox swereg swilk swlogis swlogit swologit swoprbt swpois swprobit swqreg swtobit swweib symmetry symmi symplot symplot_7 syntax sysdescribe sysdir sysuse szroeter ta tab tab1 tab2 tab_or tabd tabdi tabdis tabdisp tabi table tabodds tabodds_7 tabstat tabu tabul tabula tabulat tabulate te tempfile tempname tempvar tes test testnl testparm teststd tetrachoric time_it timer tis tob tobi tobit tobit_p tobit_sw token tokeni tokeniz tokenize tostring total translate translator transmap treat_ll treatr_p treatreg trim trnb_cons trnb_mean trpoiss_d2 trunc_ll truncr_p truncreg tsappend tset tsfill tsline tsline_ex tsreport tsrevar tsrline tsset tssmooth tsunab ttest ttesti tut_chk tut_wait tutorial tw tware_st two twoway twoway__fpfit_serset twoway__function_gen twoway__histogram_gen twoway__ipoint_serset twoway__ipoints_serset twoway__kdensity_gen twoway__lfit_serset twoway__normgen_gen twoway__pci_serset twoway__qfit_serset twoway__scatteri_serset twoway__sunflower_gen twoway_ksm_serset ty typ type typeof u unab unabbrev unabcmd update us use uselabel var var_mkcompanion var_p varbasic varfcast vargranger varirf varirf_add varirf_cgraph varirf_create varirf_ctable varirf_describe varirf_dir varirf_drop varirf_erase varirf_graph varirf_ograph varirf_rename varirf_set varirf_table varlist varlmar varnorm varsoc varstable varstable_w varstable_w2 varwle vce vec vec_fevd vec_mkphi vec_p vec_p_w vecirf_create veclmar veclmar_w vecnorm vecnorm_w vecrank vecstable verinst vers versi versio version view viewsource vif vwls wdatetof webdescribe webseek webuse weib1_lf weib2_lf weib_lf weib_lf0 weibhet_glf weibhet_glf_sh weibhet_glfa weibhet_glfa_sh weibhet_gp weibhet_ilf weibhet_ilf_sh weibhet_ilfa weibhet_ilfa_sh weibhet_ip weibu_sw weibul_p weibull weibull_c weibull_s weibullhet wh whelp whi which whil while wilc_st wilcoxon win wind windo window winexec wntestb wntestb_7 wntestq xchart xchart_7 xcorr xcorr_7 xi xi_6 xmlsav xmlsave xmluse xpose xsh xshe xshel xshell xt_iis xt_tis xtab_p xtabond xtbin_p xtclog xtcloglog xtcloglog_8 xtcloglog_d2 xtcloglog_pa_p xtcloglog_re_p xtcnt_p xtcorr xtdata xtdes xtfront_p xtfrontier xtgee xtgee_elink xtgee_estat xtgee_makeivar xtgee_p xtgee_plink xtgls xtgls_p xthaus xthausman xtht_p xthtaylor xtile xtint_p xtintreg xtintreg_8 xtintreg_d2 xtintreg_p xtivp_1 xtivp_2 xtivreg xtline xtline_ex xtlogit xtlogit_8 xtlogit_d2 xtlogit_fe_p xtlogit_pa_p xtlogit_re_p xtmixed xtmixed_estat xtmixed_p xtnb_fe xtnb_lf xtnbreg xtnbreg_pa_p xtnbreg_refe_p xtpcse xtpcse_p xtpois xtpoisson xtpoisson_d2 xtpoisson_pa_p xtpoisson_refe_p xtpred xtprobit xtprobit_8 xtprobit_d2 xtprobit_re_p xtps_fe xtps_lf xtps_ren xtps_ren_8 xtrar_p xtrc xtrc_p xtrchh xtrefe_p xtreg xtreg_be xtreg_fe xtreg_ml xtreg_pa_p xtreg_re xtregar xtrere_p xtset xtsf_ll xtsf_llti xtsum xttab xttest0 xttobit xttobit_8 xttobit_p xttrans yx yxview__barlike_draw yxview_area_draw yxview_bar_draw yxview_dot_draw yxview_dropline_draw yxview_function_draw yxview_iarrow_draw yxview_ilabels_draw yxview_normal_draw yxview_pcarrow_draw yxview_pcbarrow_draw yxview_pccapsym_draw yxview_pcscatter_draw yxview_pcspike_draw yxview_rarea_draw yxview_rbar_draw yxview_rbarm_draw yxview_rcap_draw yxview_rcapsym_draw yxview_rconnected_draw yxview_rline_draw yxview_rscatter_draw yxview_rspike_draw yxview_spike_draw yxview_sunflower_draw zap_s zinb zinb_llf zinb_plf zip zip_llf zip_p zip_plf zt_ct_5 zt_hc_5 zt_hcd_5 zt_is_5 zt_iss_5 zt_sho_5 zt_smp_5 ztbase_5 ztcox_5 ztdes_5 ztereg_5 ztfill_5 ztgen_5 ztir_5 ztjoin_5 ztnb ztnb_p ztp ztp_p zts_5 ztset_5 ztspli_5 ztsum_5 zttoct_5 ztvary_5 ztweib_5",c:[{cN:"label",v:[{b:"\\$\\{?[a-zA-Z0-9_]+\\}?"},{b:"`[a-zA-Z0-9_]+'"}]},{cN:"string",v:[{b:'`"[^\r\n]*?"\''},{b:'"[^\r\n"]*"'}]},{cN:"literal",v:[{b:"\\b(abs|acos|asin|atan|atan2|atanh|ceil|cloglog|comb|cos|digamma|exp|floor|invcloglog|invlogit|ln|lnfact|lnfactorial|lngamma|log|log10|max|min|mod|reldif|round|sign|sin|sqrt|sum|tan|tanh|trigamma|trunc|betaden|Binomial|binorm|binormal|chi2|chi2tail|dgammapda|dgammapdada|dgammapdadx|dgammapdx|dgammapdxdx|F|Fden|Ftail|gammaden|gammap|ibeta|invbinomial|invchi2|invchi2tail|invF|invFtail|invgammap|invibeta|invnchi2|invnFtail|invnibeta|invnorm|invnormal|invttail|nbetaden|nchi2|nFden|nFtail|nibeta|norm|normal|normalden|normd|npnchi2|tden|ttail|uniform|abbrev|char|index|indexnot|length|lower|ltrim|match|plural|proper|real|regexm|regexr|regexs|reverse|rtrim|string|strlen|strlower|strltrim|strmatch|strofreal|strpos|strproper|strreverse|strrtrim|strtrim|strupper|subinstr|subinword|substr|trim|upper|word|wordcount|_caller|autocode|byteorder|chop|clip|cond|e|epsdouble|epsfloat|group|inlist|inrange|irecode|matrix|maxbyte|maxdouble|maxfloat|maxint|maxlong|mi|minbyte|mindouble|minfloat|minint|minlong|missing|r|recode|replay|return|s|scalar|d|date|day|dow|doy|halfyear|mdy|month|quarter|week|year|d|daily|dofd|dofh|dofm|dofq|dofw|dofy|h|halfyearly|hofd|m|mofd|monthly|q|qofd|quarterly|tin|twithin|w|weekly|wofd|y|yearly|yh|ym|yofd|yq|yw|cholesky|colnumb|colsof|corr|det|diag|diag0cnt|el|get|hadamard|I|inv|invsym|issym|issymmetric|J|matmissing|matuniform|mreldif|nullmat|rownumb|rowsof|sweep|syminv|trace|vec|vecdiag)(?=\\(|$)"}]},e.C("^[ ]*\\*.*$",!1),e.CLCM,e.CBCM]}});hljs.registerLanguage("asciidoc",function(e){return{aliases:["adoc"],c:[e.C("^/{4,}\\n","\\n/{4,}$",{r:10}),e.C("^//","$",{r:0}),{cN:"title",b:"^\\.\\w.*$"},{b:"^[=\\*]{4,}\\n",e:"\\n^[=\\*]{4,}$",r:10},{cN:"header",b:"^(={1,5}) .+?( \\1)?$",r:10},{cN:"header",b:"^[^\\[\\]\\n]+?\\n[=\\-~\\^\\+]{2,}$",r:10},{cN:"attribute",b:"^:.+?:",e:"\\s",eE:!0,r:10},{cN:"attribute",b:"^\\[.+?\\]$",r:0},{cN:"blockquote",b:"^_{4,}\\n",e:"\\n_{4,}$",r:10},{cN:"code",b:"^[\\-\\.]{4,}\\n",e:"\\n[\\-\\.]{4,}$",r:10},{b:"^\\+{4,}\\n",e:"\\n\\+{4,}$",c:[{b:"<",e:">",sL:"xml",r:0}],r:10},{cN:"bullet",b:"^(\\*+|\\-+|\\.+|[^\\n]+?::)\\s+"},{cN:"label",b:"^(NOTE|TIP|IMPORTANT|WARNING|CAUTION):\\s+",r:10},{cN:"strong",b:"\\B\\*(?![\\*\\s])",e:"(\\n{2}|\\*)",c:[{b:"\\\\*\\w",r:0}]},{cN:"emphasis",b:"\\B'(?!['\\s])",e:"(\\n{2}|')",c:[{b:"\\\\'\\w",r:0}],r:0},{cN:"emphasis",b:"_(?![_\\s])",e:"(\\n{2}|_)",r:0},{cN:"smartquote",v:[{b:"``.+?''"},{b:"`.+?'"}]},{cN:"code",b:"(`.+?`|\\+.+?\\+)",r:0},{cN:"code",b:"^[ \\t]",e:"$",r:0},{cN:"horizontal_rule",b:"^'{3,}[ \\t]*$",r:10},{b:"(link:)?(http|https|ftp|file|irc|image:?):\\S+\\[.*?\\]",rB:!0,c:[{b:"(link|image:?):",r:0},{cN:"link_url",b:"\\w",e:"[^\\[]+",r:0},{cN:"link_label",b:"\\[",e:"\\]",eB:!0,eE:!0,r:0}],r:10}]}});hljs.registerLanguage("php",function(e){var c={cN:"variable",b:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},i={cN:"preprocessor",b:/<\?(php)?|\?>/},a={cN:"string",c:[e.BE,i],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},n={v:[e.BNM,e.CNM]};return{aliases:["php3","php4","php5","php6"],cI:!0,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally",c:[e.CLCM,e.HCM,e.C("/\\*","\\*/",{c:[{cN:"phpdoc",b:"\\s@[A-Za-z]+"},i]}),e.C("__halt_compiler.+?;",!1,{eW:!0,k:"__halt_compiler",l:e.UIR}),{cN:"string",b:"<<<['\"]?\\w+['\"]?$",e:"^\\w+;",c:[e.BE]},i,c,{b:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{cN:"function",bK:"function",e:/[;{]/,eE:!0,i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",c,e.CBCM,a,n]}]},{cN:"class",bK:"class interface",e:"{",eE:!0,i:/[:\(\$"]/,c:[{bK:"extends implements"},e.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[e.UTM]},{bK:"use",e:";",c:[e.UTM]},{b:"=>"},a,n]}});hljs.registerLanguage("java",function(e){var a=e.UIR+"(<"+e.UIR+">)?",t="false synchronized int abstract float private char boolean static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private",c="(\\b(0b[01_]+)|\\b0[xX][a-fA-F0-9_]+|(\\b[\\d_]+(\\.[\\d_]*)?|\\.[\\d_]+)([eE][-+]?\\d+)?)[lLfF]?",r={cN:"number",b:c,r:0};return{aliases:["jsp"],k:t,i:/<\//,c:[{cN:"javadoc",b:"/\\*\\*",e:"\\*/",r:0,c:[{cN:"javadoctag",b:"(^|\\s)@[A-Za-z]+"}]},e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"new throw return",r:0},{cN:"function",b:"("+a+"\\s+)+"+e.UIR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:t,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,k:t,r:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},r,{cN:"annotation",b:"@[A-Za-z]+"}]}});hljs.registerLanguage("glsl",function(e){return{k:{keyword:"atomic_uint attribute bool break bvec2 bvec3 bvec4 case centroid coherent const continue default discard dmat2 dmat2x2 dmat2x3 dmat2x4 dmat3 dmat3x2 dmat3x3 dmat3x4 dmat4 dmat4x2 dmat4x3 dmat4x4 do double dvec2 dvec3 dvec4 else flat float for highp if iimage1D iimage1DArray iimage2D iimage2DArray iimage2DMS iimage2DMSArray iimage2DRect iimage3D iimageBuffer iimageCube iimageCubeArray image1D image1DArray image2D image2DArray image2DMS image2DMSArray image2DRect image3D imageBuffer imageCube imageCubeArray in inout int invariant isampler1D isampler1DArray isampler2D isampler2DArray isampler2DMS isampler2DMSArray isampler2DRect isampler3D isamplerBuffer isamplerCube isamplerCubeArray ivec2 ivec3 ivec4 layout lowp mat2 mat2x2 mat2x3 mat2x4 mat3 mat3x2 mat3x3 mat3x4 mat4 mat4x2 mat4x3 mat4x4 mediump noperspective out patch precision readonly restrict return sample sampler1D sampler1DArray sampler1DArrayShadow sampler1DShadow sampler2D sampler2DArray sampler2DArrayShadow sampler2DMS sampler2DMSArray sampler2DRect sampler2DRectShadow sampler2DShadow sampler3D samplerBuffer samplerCube samplerCubeArray samplerCubeArrayShadow samplerCubeShadow smooth struct subroutine switch uimage1D uimage1DArray uimage2D uimage2DArray uimage2DMS uimage2DMSArray uimage2DRect uimage3D uimageBuffer uimageCube uimageCubeArray uint uniform usampler1D usampler1DArray usampler2D usampler2DArray usampler2DMS usampler2DMSArray usampler2DRect usampler3D usamplerBuffer usamplerCube usamplerCubeArray uvec2 uvec3 uvec4 varying vec2 vec3 vec4 void volatile while writeonly",built_in:"gl_BackColor gl_BackLightModelProduct gl_BackLightProduct gl_BackMaterial gl_BackSecondaryColor gl_ClipDistance gl_ClipPlane gl_ClipVertex gl_Color gl_DepthRange gl_EyePlaneQ gl_EyePlaneR gl_EyePlaneS gl_EyePlaneT gl_Fog gl_FogCoord gl_FogFragCoord gl_FragColor gl_FragCoord gl_FragData gl_FragDepth gl_FrontColor gl_FrontFacing gl_FrontLightModelProduct gl_FrontLightProduct gl_FrontMaterial gl_FrontSecondaryColor gl_InstanceID gl_InvocationID gl_Layer gl_LightModel gl_LightSource gl_MaxAtomicCounterBindings gl_MaxAtomicCounterBufferSize gl_MaxClipDistances gl_MaxClipPlanes gl_MaxCombinedAtomicCounterBuffers gl_MaxCombinedAtomicCounters gl_MaxCombinedImageUniforms gl_MaxCombinedImageUnitsAndFragmentOutputs gl_MaxCombinedTextureImageUnits gl_MaxDrawBuffers gl_MaxFragmentAtomicCounterBuffers gl_MaxFragmentAtomicCounters gl_MaxFragmentImageUniforms gl_MaxFragmentInputComponents gl_MaxFragmentUniformComponents gl_MaxFragmentUniformVectors gl_MaxGeometryAtomicCounterBuffers gl_MaxGeometryAtomicCounters gl_MaxGeometryImageUniforms gl_MaxGeometryInputComponents gl_MaxGeometryOutputComponents gl_MaxGeometryOutputVertices gl_MaxGeometryTextureImageUnits gl_MaxGeometryTotalOutputComponents gl_MaxGeometryUniformComponents gl_MaxGeometryVaryingComponents gl_MaxImageSamples gl_MaxImageUnits gl_MaxLights gl_MaxPatchVertices gl_MaxProgramTexelOffset gl_MaxTessControlAtomicCounterBuffers gl_MaxTessControlAtomicCounters gl_MaxTessControlImageUniforms gl_MaxTessControlInputComponents gl_MaxTessControlOutputComponents gl_MaxTessControlTextureImageUnits gl_MaxTessControlTotalOutputComponents gl_MaxTessControlUniformComponents gl_MaxTessEvaluationAtomicCounterBuffers gl_MaxTessEvaluationAtomicCounters gl_MaxTessEvaluationImageUniforms gl_MaxTessEvaluationInputComponents gl_MaxTessEvaluationOutputComponents gl_MaxTessEvaluationTextureImageUnits gl_MaxTessEvaluationUniformComponents gl_MaxTessGenLevel gl_MaxTessPatchComponents gl_MaxTextureCoords gl_MaxTextureImageUnits gl_MaxTextureUnits gl_MaxVaryingComponents gl_MaxVaryingFloats gl_MaxVaryingVectors gl_MaxVertexAtomicCounterBuffers gl_MaxVertexAtomicCounters gl_MaxVertexAttribs gl_MaxVertexImageUniforms gl_MaxVertexOutputComponents gl_MaxVertexTextureImageUnits gl_MaxVertexUniformComponents gl_MaxVertexUniformVectors gl_MaxViewports gl_MinProgramTexelOffsetgl_ModelViewMatrix gl_ModelViewMatrixInverse gl_ModelViewMatrixInverseTranspose gl_ModelViewMatrixTranspose gl_ModelViewProjectionMatrix gl_ModelViewProjectionMatrixInverse gl_ModelViewProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixTranspose gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_Normal gl_NormalMatrix gl_NormalScale gl_ObjectPlaneQ gl_ObjectPlaneR gl_ObjectPlaneS gl_ObjectPlaneT gl_PatchVerticesIn gl_PerVertex gl_Point gl_PointCoord gl_PointSize gl_Position gl_PrimitiveID gl_PrimitiveIDIn gl_ProjectionMatrix gl_ProjectionMatrixInverse gl_ProjectionMatrixInverseTranspose gl_ProjectionMatrixTranspose gl_SampleID gl_SampleMask gl_SampleMaskIn gl_SamplePosition gl_SecondaryColor gl_TessCoord gl_TessLevelInner gl_TessLevelOuter gl_TexCoord gl_TextureEnvColor gl_TextureMatrixInverseTranspose gl_TextureMatrixTranspose gl_Vertex gl_VertexID gl_ViewportIndex gl_in gl_out EmitStreamVertex EmitVertex EndPrimitive EndStreamPrimitive abs acos acosh all any asin asinh atan atanh atomicCounter atomicCounterDecrement atomicCounterIncrement barrier bitCount bitfieldExtract bitfieldInsert bitfieldReverse ceil clamp cos cosh cross dFdx dFdy degrees determinant distance dot equal exp exp2 faceforward findLSB findMSB floatBitsToInt floatBitsToUint floor fma fract frexp ftransform fwidth greaterThan greaterThanEqual imageAtomicAdd imageAtomicAnd imageAtomicCompSwap imageAtomicExchange imageAtomicMax imageAtomicMin imageAtomicOr imageAtomicXor imageLoad imageStore imulExtended intBitsToFloat interpolateAtCentroid interpolateAtOffset interpolateAtSample inverse inversesqrt isinf isnan ldexp length lessThan lessThanEqual log log2 matrixCompMult max memoryBarrier min mix mod modf noise1 noise2 noise3 noise4 normalize not notEqual outerProduct packDouble2x32 packHalf2x16 packSnorm2x16 packSnorm4x8 packUnorm2x16 packUnorm4x8 pow radians reflect refract round roundEven shadow1D shadow1DLod shadow1DProj shadow1DProjLod shadow2D shadow2DLod shadow2DProj shadow2DProjLod sign sin sinh smoothstep sqrt step tan tanh texelFetch texelFetchOffset texture texture1D texture1DLod texture1DProj texture1DProjLod texture2D texture2DLod texture2DProj texture2DProjLod texture3D texture3DLod texture3DProj texture3DProjLod textureCube textureCubeLod textureGather textureGatherOffset textureGatherOffsets textureGrad textureGradOffset textureLod textureLodOffset textureOffset textureProj textureProjGrad textureProjGradOffset textureProjLod textureProjLodOffset textureProjOffset textureQueryLod textureSize transpose trunc uaddCarry uintBitsToFloat umulExtended unpackDouble2x32 unpackHalf2x16 unpackSnorm2x16 unpackSnorm4x8 unpackUnorm2x16 unpackUnorm4x8 usubBorrow gl_TextureMatrix gl_TextureMatrixInverse",literal:"true false"},i:'"',c:[e.CLCM,e.CBCM,e.CNM,{cN:"preprocessor",b:"#",e:"$"}]}});hljs.registerLanguage("lua",function(e){var t="\\[=*\\[",a="\\]=*\\]",r={b:t,e:a,c:["self"]},n=[e.C("--(?!"+t+")","$"),e.C("--"+t,a,{c:[r],r:10})];return{l:e.UIR,k:{keyword:"and break do else elseif end false for if in local nil not or repeat return then true until while",built_in:"_G _VERSION assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall coroutine debug io math os package string table"},c:n.concat([{cN:"function",bK:"function",e:"\\)",c:[e.inherit(e.TM,{b:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),{cN:"params",b:"\\(",eW:!0,c:n}].concat(n)},e.CNM,e.ASM,e.QSM,{cN:"string",b:t,e:a,c:[r],r:5}])}});hljs.registerLanguage("protobuf",function(e){return{k:{keyword:"package import option optional required repeated group",built_in:"double float int32 int64 uint32 uint64 sint32 sint64 fixed32 fixed64 sfixed32 sfixed64 bool string bytes",literal:"true false"},c:[e.QSM,e.NM,e.CLCM,{cN:"class",bK:"message enum service",e:/\{/,i:/\n/,c:[e.inherit(e.TM,{starts:{eW:!0,eE:!0}})]},{cN:"function",bK:"rpc",e:/;/,eE:!0,k:"rpc returns"},{cN:"constant",b:/^\s*[A-Z_]+/,e:/\s*=/,eE:!0}]}});hljs.registerLanguage("gcode",function(e){var N="[A-Z_][A-Z0-9_.]*",i="\\%",c={literal:"",built_in:"",keyword:"IF DO WHILE ENDWHILE CALL ENDIF SUB ENDSUB GOTO REPEAT ENDREPEAT EQ LT GT NE GE LE OR XOR"},r={cN:"preprocessor",b:"([O])([0-9]+)"},l=[e.CLCM,e.CBCM,e.C(/\(/,/\)/),e.inherit(e.CNM,{b:"([-+]?([0-9]*\\.?[0-9]+\\.?))|"+e.CNR}),e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null}),{cN:"keyword",b:"([G])([0-9]+\\.?[0-9]?)"},{cN:"title",b:"([M])([0-9]+\\.?[0-9]?)"},{cN:"title",b:"(VC|VS|#)",e:"(\\d+)"},{cN:"title",b:"(VZOFX|VZOFY|VZOFZ)"},{cN:"built_in",b:"(ATAN|ABS|ACOS|ASIN|SIN|COS|EXP|FIX|FUP|ROUND|LN|TAN)(\\[)",e:"([-+]?([0-9]*\\.?[0-9]+\\.?))(\\])"},{cN:"label",v:[{b:"N",e:"\\d+",i:"\\W"}]}];return{aliases:["nc"],cI:!0,l:N,k:c,c:[{cN:"preprocessor",b:i},r].concat(l)}});hljs.registerLanguage("vim",function(e){return{l:/[!#@\w]+/,k:{keyword:"N|0 P|0 X|0 a|0 ab abc abo al am an|0 ar arga argd arge argdo argg argl argu as au aug aun b|0 bN ba bad bd be bel bf bl bm bn bo bp br brea breaka breakd breakl bro bufdo buffers bun bw c|0 cN cNf ca cabc caddb cad caddf cal cat cb cc ccl cd ce cex cf cfir cgetb cgete cg changes chd che checkt cl cla clo cm cmapc cme cn cnew cnf cno cnorea cnoreme co col colo com comc comp con conf cope cp cpf cq cr cs cst cu cuna cunme cw d|0 delm deb debugg delc delf dif diffg diffo diffp diffpu diffs diffthis dig di dl dell dj dli do doautoa dp dr ds dsp e|0 ea ec echoe echoh echom echon el elsei em en endfo endf endt endw ene ex exe exi exu f|0 files filet fin fina fini fir fix fo foldc foldd folddoc foldo for fu g|0 go gr grepa gu gv ha h|0 helpf helpg helpt hi hid his i|0 ia iabc if ij il im imapc ime ino inorea inoreme int is isp iu iuna iunme j|0 ju k|0 keepa kee keepj lN lNf l|0 lad laddb laddf la lan lat lb lc lch lcl lcs le lefta let lex lf lfir lgetb lgete lg lgr lgrepa lh ll lla lli lmak lm lmapc lne lnew lnf ln loadk lo loc lockv lol lope lp lpf lr ls lt lu lua luad luaf lv lvimgrepa lw m|0 ma mak map mapc marks mat me menut mes mk mks mksp mkv mkvie mod mz mzf nbc nb nbs n|0 new nm nmapc nme nn nnoreme noa no noh norea noreme norm nu nun nunme ol o|0 om omapc ome on ono onoreme opt ou ounme ow p|0 profd prof pro promptr pc ped pe perld po popu pp pre prev ps pt ptN ptf ptj ptl ptn ptp ptr pts pu pw py3 python3 py3d py3f py pyd pyf q|0 quita qa r|0 rec red redi redr redraws reg res ret retu rew ri rightb rub rubyd rubyf rund ru rv s|0 sN san sa sal sav sb sbN sba sbf sbl sbm sbn sbp sbr scrip scripte scs se setf setg setl sf sfir sh sim sig sil sl sla sm smap smapc sme sn sni sno snor snoreme sor so spelld spe spelli spellr spellu spellw sp spr sre st sta startg startr star stopi stj sts sun sunm sunme sus sv sw sy synti sync t|0 tN tabN tabc tabdo tabe tabf tabfir tabl tabm tabnew tabn tabo tabp tabr tabs tab ta tags tc tcld tclf te tf th tj tl tm tn to tp tr try ts tu u|0 undoj undol una unh unl unlo unm unme uns up v|0 ve verb vert vim vimgrepa vi viu vie vm vmapc vme vne vn vnoreme vs vu vunme windo w|0 wN wa wh wi winc winp wn wp wq wqa ws wu wv x|0 xa xmapc xm xme xn xnoreme xu xunme y|0 z|0 ~ Next Print append abbreviate abclear aboveleft all amenu anoremenu args argadd argdelete argedit argglobal arglocal argument ascii autocmd augroup aunmenu buffer bNext ball badd bdelete behave belowright bfirst blast bmodified bnext botright bprevious brewind break breakadd breakdel breaklist browse bunload bwipeout change cNext cNfile cabbrev cabclear caddbuffer caddexpr caddfile call catch cbuffer cclose center cexpr cfile cfirst cgetbuffer cgetexpr cgetfile chdir checkpath checktime clist clast close cmap cmapclear cmenu cnext cnewer cnfile cnoremap cnoreabbrev cnoremenu copy colder colorscheme command comclear compiler continue confirm copen cprevious cpfile cquit crewind cscope cstag cunmap cunabbrev cunmenu cwindow delete delmarks debug debuggreedy delcommand delfunction diffupdate diffget diffoff diffpatch diffput diffsplit digraphs display deletel djump dlist doautocmd doautoall deletep drop dsearch dsplit edit earlier echo echoerr echohl echomsg else elseif emenu endif endfor endfunction endtry endwhile enew execute exit exusage file filetype find finally finish first fixdel fold foldclose folddoopen folddoclosed foldopen function global goto grep grepadd gui gvim hardcopy help helpfind helpgrep helptags highlight hide history insert iabbrev iabclear ijump ilist imap imapclear imenu inoremap inoreabbrev inoremenu intro isearch isplit iunmap iunabbrev iunmenu join jumps keepalt keepmarks keepjumps lNext lNfile list laddexpr laddbuffer laddfile last language later lbuffer lcd lchdir lclose lcscope left leftabove lexpr lfile lfirst lgetbuffer lgetexpr lgetfile lgrep lgrepadd lhelpgrep llast llist lmake lmap lmapclear lnext lnewer lnfile lnoremap loadkeymap loadview lockmarks lockvar lolder lopen lprevious lpfile lrewind ltag lunmap luado luafile lvimgrep lvimgrepadd lwindow move mark make mapclear match menu menutranslate messages mkexrc mksession mkspell mkvimrc mkview mode mzscheme mzfile nbclose nbkey nbsart next nmap nmapclear nmenu nnoremap nnoremenu noautocmd noremap nohlsearch noreabbrev noremenu normal number nunmap nunmenu oldfiles open omap omapclear omenu only onoremap onoremenu options ounmap ounmenu ownsyntax print profdel profile promptfind promptrepl pclose pedit perl perldo pop popup ppop preserve previous psearch ptag ptNext ptfirst ptjump ptlast ptnext ptprevious ptrewind ptselect put pwd py3do py3file python pydo pyfile quit quitall qall read recover redo redir redraw redrawstatus registers resize retab return rewind right rightbelow ruby rubydo rubyfile rundo runtime rviminfo substitute sNext sandbox sargument sall saveas sbuffer sbNext sball sbfirst sblast sbmodified sbnext sbprevious sbrewind scriptnames scriptencoding scscope set setfiletype setglobal setlocal sfind sfirst shell simalt sign silent sleep slast smagic smapclear smenu snext sniff snomagic snoremap snoremenu sort source spelldump spellgood spellinfo spellrepall spellundo spellwrong split sprevious srewind stop stag startgreplace startreplace startinsert stopinsert stjump stselect sunhide sunmap sunmenu suspend sview swapname syntax syntime syncbind tNext tabNext tabclose tabedit tabfind tabfirst tablast tabmove tabnext tabonly tabprevious tabrewind tag tcl tcldo tclfile tearoff tfirst throw tjump tlast tmenu tnext topleft tprevious trewind tselect tunmenu undo undojoin undolist unabbreviate unhide unlet unlockvar unmap unmenu unsilent update vglobal version verbose vertical vimgrep vimgrepadd visual viusage view vmap vmapclear vmenu vnew vnoremap vnoremenu vsplit vunmap vunmenu write wNext wall while winsize wincmd winpos wnext wprevious wqall wsverb wundo wviminfo xit xall xmapclear xmap xmenu xnoremap xnoremenu xunmap xunmenu yank",built_in:"abs acos add and append argc argidx argv asin atan atan2 browse browsedir bufexists buflisted bufloaded bufname bufnr bufwinnr byte2line byteidx call ceil changenr char2nr cindent clearmatches col complete complete_add complete_check confirm copy cos cosh count cscope_connection cursor deepcopy delete did_filetype diff_filler diff_hlID empty escape eval eventhandler executable exists exp expand extend feedkeys filereadable filewritable filter finddir findfile float2nr floor fmod fnameescape fnamemodify foldclosed foldclosedend foldlevel foldtext foldtextresult foreground function garbagecollect get getbufline getbufvar getchar getcharmod getcmdline getcmdpos getcmdtype getcwd getfontname getfperm getfsize getftime getftype getline getloclist getmatches getpid getpos getqflist getreg getregtype gettabvar gettabwinvar getwinposx getwinposy getwinvar glob globpath has has_key haslocaldir hasmapto histadd histdel histget histnr hlexists hlID hostname iconv indent index input inputdialog inputlist inputrestore inputsave inputsecret insert invert isdirectory islocked items join keys len libcall libcallnr line line2byte lispindent localtime log log10 luaeval map maparg mapcheck match matchadd matcharg matchdelete matchend matchlist matchstr max min mkdir mode mzeval nextnonblank nr2char or pathshorten pow prevnonblank printf pumvisible py3eval pyeval range readfile reltime reltimestr remote_expr remote_foreground remote_peek remote_read remote_send remove rename repeat resolve reverse round screenattr screenchar screencol screenrow search searchdecl searchpair searchpairpos searchpos server2client serverlist setbufvar setcmdpos setline setloclist setmatches setpos setqflist setreg settabvar settabwinvar setwinvar sha256 shellescape shiftwidth simplify sin sinh sort soundfold spellbadword spellsuggest split sqrt str2float str2nr strchars strdisplaywidth strftime stridx string strlen strpart strridx strtrans strwidth submatch substitute synconcealed synID synIDattr synIDtrans synstack system tabpagebuflist tabpagenr tabpagewinnr tagfiles taglist tan tanh tempname tolower toupper tr trunc type undofile undotree values virtcol visualmode wildmenumode winbufnr wincol winheight winline winnr winrestcmd winrestview winsaveview winwidth writefile xor"},i:/[{:]/,c:[e.NM,e.ASM,{cN:"string",b:/"((\\")|[^"\n])*("|\n)/},{cN:"variable",b:/[bwtglsav]:[\w\d_]*/},{cN:"function",bK:"function function!",e:"$",r:0,c:[e.TM,{cN:"params",b:"\\(",e:"\\)"}]}]}});hljs.registerLanguage("processing",function(e){return{k:{keyword:"BufferedReader PVector PFont PImage PGraphics HashMap boolean byte char color double float int long String Array FloatDict FloatList IntDict IntList JSONArray JSONObject Object StringDict StringList Table TableRow XML false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private",constant:"P2D P3D HALF_PI PI QUARTER_PI TAU TWO_PI",variable:"displayHeight displayWidth mouseY mouseX mousePressed pmouseX pmouseY key keyCode pixels focused frameCount frameRate height width",title:"setup draw",built_in:"size createGraphics beginDraw createShape loadShape PShape arc ellipse line point quad rect triangle bezier bezierDetail bezierPoint bezierTangent curve curveDetail curvePoint curveTangent curveTightness shape shapeMode beginContour beginShape bezierVertex curveVertex endContour endShape quadraticVertex vertex ellipseMode noSmooth rectMode smooth strokeCap strokeJoin strokeWeight mouseClicked mouseDragged mouseMoved mousePressed mouseReleased mouseWheel keyPressed keyPressedkeyReleased keyTyped print println save saveFrame day hour millis minute month second year background clear colorMode fill noFill noStroke stroke alpha blue brightness color green hue lerpColor red saturation modelX modelY modelZ screenX screenY screenZ ambient emissive shininess specular add createImage beginCamera camera endCamera frustum ortho perspective printCamera printProjection cursor frameRate noCursor exit loop noLoop popStyle pushStyle redraw binary boolean byte char float hex int str unbinary unhex join match matchAll nf nfc nfp nfs split splitTokens trim append arrayCopy concat expand reverse shorten sort splice subset box sphere sphereDetail createInput createReader loadBytes loadJSONArray loadJSONObject loadStrings loadTable loadXML open parseXML saveTable selectFolder selectInput beginRaw beginRecord createOutput createWriter endRaw endRecord PrintWritersaveBytes saveJSONArray saveJSONObject saveStream saveStrings saveXML selectOutput popMatrix printMatrix pushMatrix resetMatrix rotate rotateX rotateY rotateZ scale shearX shearY translate ambientLight directionalLight lightFalloff lights lightSpecular noLights normal pointLight spotLight image imageMode loadImage noTint requestImage tint texture textureMode textureWrap blend copy filter get loadPixels set updatePixels blendMode loadShader PShaderresetShader shader createFont loadFont text textFont textAlign textLeading textMode textSize textWidth textAscent textDescent abs ceil constrain dist exp floor lerp log mag map max min norm pow round sq sqrt acos asin atan atan2 cos degrees radians sin tan noise noiseDetail noiseSeed random randomGaussian randomSeed"},c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM]}});hljs.registerLanguage("mizar",function(e){return{k:"environ vocabularies notations constructors definitions registrations theorems schemes requirements begin end definition registration cluster existence pred func defpred deffunc theorem proof let take assume then thus hence ex for st holds consider reconsider such that and in provided of as from be being by means equals implies iff redefine define now not or attr is mode suppose per cases set thesis contradiction scheme reserve struct correctness compatibility coherence symmetry assymetry reflexivity irreflexivity connectedness uniqueness commutativity idempotence involutiveness projectivity",c:[e.C("::","$")]}});hljs.registerLanguage("vbnet",function(e){return{aliases:["vb"],cI:!0,k:{keyword:"addhandler addressof alias and andalso aggregate ansi as assembly auto binary by byref byval call case catch class compare const continue custom declare default delegate dim distinct do each equals else elseif end enum erase error event exit explicit finally for friend from function get global goto group handles if implements imports in inherits interface into is isfalse isnot istrue join key let lib like loop me mid mod module mustinherit mustoverride mybase myclass namespace narrowing new next not notinheritable notoverridable of off on operator option optional or order orelse overloads overridable overrides paramarray partial preserve private property protected public raiseevent readonly redim rem removehandler resume return select set shadows shared skip static step stop structure strict sub synclock take text then throw to try unicode until using when where while widening with withevents writeonly xor",built_in:"boolean byte cbool cbyte cchar cdate cdec cdbl char cint clng cobj csbyte cshort csng cstr ctype date decimal directcast double gettype getxmlnamespace iif integer long object sbyte short single string trycast typeof uinteger ulong ushort",literal:"true false nothing"},i:"//|{|}|endif|gosub|variant|wend",c:[e.inherit(e.QSM,{c:[{b:'""'}]}),e.C("'","$",{rB:!0,c:[{cN:"xmlDocTag",b:"'''|",c:[e.PWM]},{cN:"xmlDocTag",b:"",c:[e.PWM]}]}),e.CNM,{cN:"preprocessor",b:"#",e:"$",k:"if else elseif end region externalsource"}]}});hljs.registerLanguage("q",function(e){var s={keyword:"do while select delete by update from",constant:"0b 1b",built_in:"neg not null string reciprocal floor ceiling signum mod xbar xlog and or each scan over prior mmu lsq inv md5 ltime gtime count first var dev med cov cor all any rand sums prds mins maxs fills deltas ratios avgs differ prev next rank reverse iasc idesc asc desc msum mcount mavg mdev xrank mmin mmax xprev rotate distinct group where flip type key til get value attr cut set upsert raze union inter except cross sv vs sublist enlist read0 read1 hopen hclose hdel hsym hcount peach system ltrim rtrim trim lower upper ssr view tables views cols xcols keys xkey xcol xasc xdesc fkeys meta lj aj aj0 ij pj asof uj ww wj wj1 fby xgroup ungroup ej save load rsave rload show csv parse eval min max avg wavg wsum sin cos tan sum",typename:"`float `double int `timestamp `timespan `datetime `time `boolean `symbol `char `byte `short `long `real `month `date `minute `second `guid"};return{aliases:["k","kdb"],k:s,l:/\b(`?)[A-Za-z0-9_]+\b/,c:[e.CLCM,e.QSM,e.CNM]}});hljs.registerLanguage("livescript",function(e){var t={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger case default function var with then unless until loop of by when and or is isnt not it that otherwise from to til fallthrough super case default function var void const let enum export import native __hasProp __extends __slice __bind __indexOf",literal:"true false null undefined yes no on off it that void",built_in:"npm require console print module global window document"},s="[A-Za-z$_](?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*",i=e.inherit(e.TM,{b:s}),n={cN:"subst",b:/#\{/,e:/}/,k:t},r={cN:"subst",b:/#[A-Za-z$_]/,e:/(?:\-[0-9A-Za-z$_]|[0-9A-Za-z$_])*/,k:t},c=[e.BNM,{cN:"number",b:"(\\b0[xX][a-fA-F0-9_]+)|(\\b\\d(\\d|_\\d)*(\\.(\\d(\\d|_\\d)*)?)?(_*[eE]([-+]\\d(_\\d|\\d)*)?)?[_a-z]*)",r:0,starts:{e:"(\\s*/)?",r:0}},{cN:"string",v:[{b:/'''/,e:/'''/,c:[e.BE]},{b:/'/,e:/'/,c:[e.BE]},{b:/"""/,e:/"""/,c:[e.BE,n,r]},{b:/"/,e:/"/,c:[e.BE,n,r]},{b:/\\/,e:/(\s|$)/,eE:!0}]},{cN:"pi",v:[{b:"//",e:"//[gim]*",c:[n,e.HCM]},{b:/\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W|$)/}]},{cN:"property",b:"@"+s},{b:"``",e:"``",eB:!0,eE:!0,sL:"javascript"}];n.c=c;var a={cN:"params",b:"\\(",rB:!0,c:[{b:/\(/,e:/\)/,k:t,c:["self"].concat(c)}]};return{aliases:["ls"],k:t,i:/\/\*/,c:c.concat([e.C("\\/\\*","\\*\\/"),e.HCM,{cN:"function",c:[i,a],rB:!0,v:[{b:"("+s+"\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B\\->\\*?",e:"\\->\\*?"},{b:"("+s+"\\s*(?:=|:=)\\s*)?!?(\\(.*\\))?\\s*\\B[-~]{1,2}>\\*?",e:"[-~]{1,2}>\\*?"},{b:"("+s+"\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B!?[-~]{1,2}>\\*?",e:"!?[-~]{1,2}>\\*?"}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[i]},i]},{cN:"attribute",b:s+":",e:":",rB:!0,rE:!0,r:0}])}});hljs.registerLanguage("haxe",function(e){var r="([*]|[a-zA-Z_$][a-zA-Z0-9_$]*)";return{aliases:["hx"],k:{keyword:"break callback case cast catch class continue default do dynamic else enum extends extern for function here if implements import in inline interface never new override package private public return static super switch this throw trace try typedef untyped using var while",literal:"true false null"},c:[e.ASM,e.QSM,e.CLCM,e.CBCM,e.CNM,{cN:"class",bK:"class interface",e:"{",eE:!0,c:[{bK:"extends implements"},e.TM]},{cN:"preprocessor",b:"#",e:"$",k:"if else elseif end error"},{cN:"function",bK:"function",e:"[{;]",eE:!0,i:"\\S",c:[e.TM,{cN:"params",b:"\\(",e:"\\)",c:[e.ASM,e.QSM,e.CLCM,e.CBCM]},{cN:"type",b:":",e:r,r:10}]}]}});hljs.registerLanguage("monkey",function(e){var n={cN:"number",r:0,v:[{b:"[$][a-fA-F0-9]+"},e.NM]};return{cI:!0,k:{keyword:"public private property continue exit extern new try catch eachin not abstract final select case default const local global field end if then else elseif endif while wend repeat until forever for to step next return module inline throw",built_in:"DebugLog DebugStop Error Print ACos ACosr ASin ASinr ATan ATan2 ATan2r ATanr Abs Abs Ceil Clamp Clamp Cos Cosr Exp Floor Log Max Max Min Min Pow Sgn Sgn Sin Sinr Sqrt Tan Tanr Seed PI HALFPI TWOPI",literal:"true false null and or shl shr mod"},c:[e.C("#rem","#end"),e.C("'","$",{r:0}),{cN:"function",bK:"function method",e:"[(=:]|$",i:/\n/,c:[e.UTM]},{cN:"class",bK:"class interface",e:"$",c:[{bK:"extends implements"},e.UTM]},{cN:"variable",b:"\\b(self|super)\\b"},{cN:"preprocessor",bK:"import",e:"$"},{cN:"preprocessor",b:"\\s*#",e:"$",k:"if else elseif endif end then"},{cN:"pi",b:"^\\s*strict\\b"},{bK:"alias",e:"=",c:[e.UTM]},e.QSM,n]}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/-?[a-z\.]+/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",operator:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"shebang",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,e.NM,s,a,t]}});hljs.registerLanguage("erlang",function(e){var r="[a-z'][a-zA-Z0-9_']*",c="("+r+":"+r+"|"+r+")",a={keyword:"after and andalso|10 band begin bnot bor bsl bzr bxor case catch cond div end fun if let not of orelse|10 query receive rem try when xor",literal:"false true"},n=e.C("%","$"),i={cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",r:0},b={b:"fun\\s+"+r+"/\\d+"},d={b:c+"\\(",e:"\\)",rB:!0,r:0,c:[{cN:"function_name",b:c,r:0},{b:"\\(",e:"\\)",eW:!0,rE:!0,r:0}]},o={cN:"tuple",b:"{",e:"}",r:0},t={cN:"variable",b:"\\b_([A-Z][A-Za-z0-9_]*)?",r:0},l={cN:"variable",b:"[A-Z][a-zA-Z0-9_]*",r:0},f={b:"#"+e.UIR,r:0,rB:!0,c:[{cN:"record_name",b:"#"+e.UIR,r:0},{b:"{",e:"}",r:0}]},s={bK:"fun receive if try case",e:"end",k:a};s.c=[n,b,e.inherit(e.ASM,{cN:""}),s,d,e.QSM,i,o,t,l,f];var u=[n,b,s,d,e.QSM,i,o,t,l,f];d.c[1].c=u,o.c=u,f.c[1].c=u;var v={cN:"params",b:"\\(",e:"\\)",c:u};return{aliases:["erl"],k:a,i:"(",rB:!0,i:"\\(|#|//|/\\*|\\\\|:|;",c:[v,e.inherit(e.TM,{b:r})],starts:{e:";|\\.",k:a,c:u}},n,{cN:"pp",b:"^-",e:"\\.",r:0,eE:!0,rB:!0,l:"-"+e.IR,k:"-module -record -undef -export -ifdef -ifndef -author -copyright -doc -vsn -import -include -include_lib -compile -define -else -endif -file -behaviour -behavior -spec",c:[v]},i,e.QSM,f,t,l,o,{b:/\.$/}]}});hljs.registerLanguage("kotlin",function(e){var a="val var get set class trait object public open private protected final enum if else do while for when break continue throw try catch finally import package is as in return fun override default companion reified inline volatile transient native";return{k:{typename:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",literal:"true false null",keyword:a},c:[e.CLCM,{cN:"javadoc",b:"/\\*\\*",e:"\\*//*",r:0,c:[{cN:"javadoctag",b:"(^|\\s)@[A-Za-z]+"}]},e.CBCM,{cN:"type",b://,rB:!0,eE:!1,r:0},{cN:"function",bK:"fun",e:"[(]|$",rB:!0,eE:!0,k:a,i:/fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,r:5,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"type",b://,k:"reified",r:0},{cN:"params",b:/\(/,e:/\)/,k:a,r:0,i:/\([^\(,\s:]+,/,c:[{cN:"typename",b:/:\s*/,e:/\s*[=\)]/,eB:!0,rE:!0,r:0}]},e.CLCM,e.CBCM]},{cN:"class",bK:"class trait",e:/[:\{(]|$/,eE:!0,i:"extends implements",c:[e.UTM,{cN:"type",b://,eB:!0,eE:!0,r:0},{cN:"typename",b:/[,:]\s*/,e:/[<\(,]|$/,eB:!0,rE:!0}]},{cN:"variable",bK:"var val",e:/\s*[=:$]/,eE:!0},e.QSM,{cN:"shebang",b:"^#!/usr/bin/env",e:"$",i:"\n"},e.CNM]}});hljs.registerLanguage("stylus",function(t){var e={cN:"variable",b:"\\$"+t.IR},o={cN:"hexcolor",b:"#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})",r:10},i=["charset","css","debug","extend","font-face","for","import","include","media","mixin","page","warn","while"],r=["after","before","first-letter","first-line","active","first-child","focus","hover","lang","link","visited"],n=["a","abbr","address","article","aside","audio","b","blockquote","body","button","canvas","caption","cite","code","dd","del","details","dfn","div","dl","dt","em","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","html","i","iframe","img","input","ins","kbd","label","legend","li","mark","menu","nav","object","ol","p","q","quote","samp","section","span","strong","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","ul","var","video"],a="[\\.\\s\\n\\[\\:,]",l=["align-content","align-items","align-self","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","auto","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","clip-path","color","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","cursor","direction","display","empty-cells","filter","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","font","font-family","font-feature-settings","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-variant-ligatures","font-weight","height","hyphens","icon","image-orientation","image-rendering","image-resolution","ime-mode","inherit","initial","justify-content","left","letter-spacing","line-height","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","mask","max-height","max-width","min-height","min-width","nav-down","nav-index","nav-left","nav-right","nav-up","none","normal","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page-break-after","page-break-before","page-break-inside","perspective","perspective-origin","pointer-events","position","quotes","resize","right","tab-size","table-layout","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-style","text-indent","text-overflow","text-rendering","text-shadow","text-transform","text-underline-position","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","white-space","widows","width","word-break","word-spacing","word-wrap","z-index"],d=["\\{","\\}","\\?","(\\bReturn\\b)","(\\bEnd\\b)","(\\bend\\b)",";","#\\s","\\*\\s","===\\s","\\|","%"];return{aliases:["styl"],cI:!1,i:"("+d.join("|")+")",k:"if else for in",c:[t.QSM,t.ASM,t.CLCM,t.CBCM,o,{b:"\\.[a-zA-Z][a-zA-Z0-9_-]*"+a,rB:!0,c:[{cN:"class",b:"\\.[a-zA-Z][a-zA-Z0-9_-]*"}]},{b:"\\#[a-zA-Z][a-zA-Z0-9_-]*"+a,rB:!0,c:[{cN:"id",b:"\\#[a-zA-Z][a-zA-Z0-9_-]*"}]},{b:"\\b("+n.join("|")+")"+a,rB:!0,c:[{cN:"tag",b:"\\b[a-zA-Z][a-zA-Z0-9_-]*"}]},{cN:"pseudo",b:"&?:?:\\b("+r.join("|")+")"+a},{cN:"at_rule",b:"@("+i.join("|")+")\\b"},e,t.CSSNM,t.NM,{cN:"function",b:"\\b[a-zA-Z][a-zA-Z0-9_-]*\\(.*\\)",i:"[\\n]",rB:!0,c:[{cN:"title",b:"\\b[a-zA-Z][a-zA-Z0-9_-]*"},{cN:"params",b:/\(/,e:/\)/,c:[o,e,t.ASM,t.CSSNM,t.NM,t.QSM]}]},{cN:"attribute",b:"\\b("+l.reverse().join("|")+")\\b"}]}});hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",a={cN:"function",b:c+"\\(",rB:!0,eE:!0,e:"\\("},r={cN:"rule",b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{cN:"value",eW:!0,eE:!0,c:[a,e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"hexcolor",b:"#[0-9A-Fa-f]+"},{cN:"important",b:"!important"}]}}]};return{cI:!0,i:/[=\/|']/,c:[e.CBCM,r,{cN:"id",b:/\#[A-Za-z0-9_-]+/},{cN:"class",b:/\.[A-Za-z0-9_-]+/,r:0},{cN:"attr_selector",b:/\[/,e:/\]/,i:"$"},{cN:"pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"']+/},{cN:"at_rule",b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{cN:"at_rule",b:"@",e:"[{;]",c:[{cN:"keyword",b:/\S+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[a,e.ASM,e.QSM,e.CSSNM]}]},{cN:"tag",b:c,r:0},{cN:"rules",b:"{",e:"}",i:/\S/,r:0,c:[e.CBCM,r]}]}});hljs.registerLanguage("puppet",function(e){var s="augeas computer cron exec file filebucket host interface k5login macauthorization mailalias maillist mcx mount nagios_command nagios_contact nagios_contactgroup nagios_host nagios_hostdependency nagios_hostescalation nagios_hostextinfo nagios_hostgroup nagios_service firewall nagios_servicedependency nagios_serviceescalation nagios_serviceextinfo nagios_servicegroup nagios_timeperiod notify package resources router schedule scheduled_task selboolean selmodule service ssh_authorized_key sshkey stage tidy user vlan yumrepo zfs zone zpool",r="alias audit before loglevel noop require subscribe tag owner ensure group mode name|0 changes context force incl lens load_path onlyif provider returns root show_diff type_check en_address ip_address realname command environment hour monute month monthday special target weekday creates cwd ogoutput refresh refreshonly tries try_sleep umask backup checksum content ctime force ignore links mtime purge recurse recurselimit replace selinux_ignore_defaults selrange selrole seltype seluser source souirce_permissions sourceselect validate_cmd validate_replacement allowdupe attribute_membership auth_membership forcelocal gid ia_load_module members system host_aliases ip allowed_trunk_vlans description device_url duplex encapsulation etherchannel native_vlan speed principals allow_root auth_class auth_type authenticate_user k_of_n mechanisms rule session_owner shared options device fstype enable hasrestart directory present absent link atboot blockdevice device dump pass remounts poller_tag use message withpath adminfile allow_virtual allowcdrom category configfiles flavor install_options instance package_settings platform responsefile status uninstall_options vendor unless_system_user unless_uid binary control flags hasstatus manifest pattern restart running start stop allowdupe auths expiry gid groups home iterations key_membership keys managehome membership password password_max_age password_min_age profile_membership profiles project purge_ssh_keys role_membership roles salt shell uid baseurl cost descr enabled enablegroups exclude failovermethod gpgcheck gpgkey http_caching include includepkgs keepalive metadata_expire metalink mirrorlist priority protect proxy proxy_password proxy_username repo_gpgcheck s3_enabled skip_if_unavailable sslcacert sslclientcert sslclientkey sslverify mounted",a={keyword:"and case class default define else elsif false if in import enherits node or true undef unless main settings $string "+s,literal:r,built_in:"architecture augeasversion blockdevices boardmanufacturer boardproductname boardserialnumber cfkey dhcp_servers domain ec2_ ec2_userdata facterversion filesystems ldom fqdn gid hardwareisa hardwaremodel hostname id|0 interfaces ipaddress ipaddress_ ipaddress6 ipaddress6_ iphostnumber is_virtual kernel kernelmajversion kernelrelease kernelversion kernelrelease kernelversion lsbdistcodename lsbdistdescription lsbdistid lsbdistrelease lsbmajdistrelease lsbminordistrelease lsbrelease macaddress macaddress_ macosx_buildversion macosx_productname macosx_productversion macosx_productverson_major macosx_productversion_minor manufacturer memoryfree memorysize netmask metmask_ network_ operatingsystem operatingsystemmajrelease operatingsystemrelease osfamily partitions path physicalprocessorcount processor processorcount productname ps puppetversion rubysitedir rubyversion selinux selinux_config_mode selinux_config_policy selinux_current_mode selinux_current_mode selinux_enforced selinux_policyversion serialnumber sp_ sshdsakey sshecdsakey sshrsakey swapencrypted swapfree swapsize timezone type uniqueid uptime uptime_days uptime_hours uptime_seconds uuid virtual vlans xendomains zfs_version zonenae zones zpool_version"},i=e.C("#","$"),o={cN:"string",c:[e.BE],v:[{b:/'/,e:/'/},{b:/"/,e:/"/}]},n=[o,i,{cN:"keyword",bK:"class",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"(::)?[A-Za-z_]\\w*(::\\w+)*"}),i,o]},{cN:"keyword",b:"([a-zA-Z_(::)]+ *\\{)",c:[o,i],r:0},{cN:"keyword",b:"(\\}|\\{)",r:0},{cN:"function",b:"[a-zA-Z_]+\\s*=>"},{cN:"constant",b:"(::)?(\\b[A-Z][a-z_]*(::)?)+",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0}];return{aliases:["pp"],k:a,c:n}});hljs.registerLanguage("nimrod",function(t){return{aliases:["nim"],k:{keyword:"addr and as asm bind block break|0 case|0 cast const|0 continue|0 converter discard distinct|10 div do elif else|0 end|0 enum|0 except export finally for from generic if|0 import|0 in include|0 interface is isnot|10 iterator|10 let|0 macro method|10 mixin mod nil not notin|10 object|0 of or out proc|10 ptr raise ref|10 return shl shr static template|10 try|0 tuple type|0 using|0 var|0 when while|0 with without xor yield",literal:"shared guarded stdin stdout stderr result|10 true false"},c:[{cN:"decorator",b:/{\./,e:/\.}/,r:10},{cN:"string",b:/[a-zA-Z]\w*"/,e:/"/,c:[{b:/""/}]},{cN:"string",b:/([a-zA-Z]\w*)?"""/,e:/"""/},t.QSM,{cN:"type",b:/\b[A-Z]\w+\b/,r:0},{cN:"type",b:/\b(int|int8|int16|int32|int64|uint|uint8|uint16|uint32|uint64|float|float32|float64|bool|char|string|cstring|pointer|expr|stmt|void|auto|any|range|array|openarray|varargs|seq|set|clong|culong|cchar|cschar|cshort|cint|csize|clonglong|cfloat|cdouble|clongdouble|cuchar|cushort|cuint|culonglong|cstringarray|semistatic)\b/},{cN:"number",b:/\b(0[xX][0-9a-fA-F][_0-9a-fA-F]*)('?[iIuU](8|16|32|64))?/,r:0},{cN:"number",b:/\b(0o[0-7][_0-7]*)('?[iIuUfF](8|16|32|64))?/,r:0},{cN:"number",b:/\b(0(b|B)[01][_01]*)('?[iIuUfF](8|16|32|64))?/,r:0},{cN:"number",b:/\b(\d[_\d]*)('?[iIuUfF](8|16|32|64))?/,r:0},t.HCM]}});hljs.registerLanguage("smalltalk",function(a){var r="[a-z][a-zA-Z0-9_]*",s={cN:"char",b:"\\$.{1}"},c={cN:"symbol",b:"#"+a.UIR};return{aliases:["st"],k:"self super nil true false thisContext",c:[a.C('"','"'),a.ASM,{cN:"class",b:"\\b[A-Z][A-Za-z0-9_]*",r:0},{cN:"method",b:r+":",r:0},a.CNM,c,s,{cN:"localvars",b:"\\|[ ]*"+r+"([ ]+"+r+")*[ ]*\\|",rB:!0,e:/\|/,i:/\S/,c:[{b:"(\\|[ ]*)?"+r}]},{cN:"array",b:"\\#\\(",e:"\\)",c:[a.ASM,s,a.CNM,c]}]}});hljs.registerLanguage("x86asm",function(s){return{cI:!0,l:"\\.?"+s.IR,k:{keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",literal:"ip eip rip al ah bl bh cl ch dl dh sil dil bpl spl r8b r9b r10b r11b r12b r13b r14b r15b ax bx cx dx si di bp sp r8w r9w r10w r11w r12w r13w r14w r15w eax ebx ecx edx esi edi ebp esp eip r8d r9d r10d r11d r12d r13d r14d r15d rax rbx rcx rdx rsi rdi rbp rsp r8 r9 r10 r11 r12 r13 r14 r15 cs ds es fs gs ss st st0 st1 st2 st3 st4 st5 st6 st7 mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 xmm0 xmm1 xmm2 xmm3 xmm4 xmm5 xmm6 xmm7 xmm8 xmm9 xmm10 xmm11 xmm12 xmm13 xmm14 xmm15 xmm16 xmm17 xmm18 xmm19 xmm20 xmm21 xmm22 xmm23 xmm24 xmm25 xmm26 xmm27 xmm28 xmm29 xmm30 xmm31 ymm0 ymm1 ymm2 ymm3 ymm4 ymm5 ymm6 ymm7 ymm8 ymm9 ymm10 ymm11 ymm12 ymm13 ymm14 ymm15 ymm16 ymm17 ymm18 ymm19 ymm20 ymm21 ymm22 ymm23 ymm24 ymm25 ymm26 ymm27 ymm28 ymm29 ymm30 ymm31 zmm0 zmm1 zmm2 zmm3 zmm4 zmm5 zmm6 zmm7 zmm8 zmm9 zmm10 zmm11 zmm12 zmm13 zmm14 zmm15 zmm16 zmm17 zmm18 zmm19 zmm20 zmm21 zmm22 zmm23 zmm24 zmm25 zmm26 zmm27 zmm28 zmm29 zmm30 zmm31 k0 k1 k2 k3 k4 k5 k6 k7 bnd0 bnd1 bnd2 bnd3 cr0 cr1 cr2 cr3 cr4 cr8 dr0 dr1 dr2 dr3 dr8 tr3 tr4 tr5 tr6 tr7 r0 r1 r2 r3 r4 r5 r6 r7 r0b r1b r2b r3b r4b r5b r6b r7b r0w r1w r2w r3w r4w r5w r6w r7w r0d r1d r2d r3d r4d r5d r6d r7d r0h r1h r2h r3h r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l",pseudo:"db dw dd dq dt ddq do dy dz resb resw resd resq rest resdq reso resy resz incbin equ times",preprocessor:"%define %xdefine %+ %undef %defstr %deftok %assign %strcat %strlen %substr %rotate %elif %else %endif %ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep %endrep %include %push %pop %repl %pathsearch %depend %use %arg %stacksize %local %line %comment %endcomment .nolist byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr __FILE__ __LINE__ __SECT__ __BITS__ __OUTPUT_FORMAT__ __DATE__ __TIME__ __DATE_NUM__ __TIME_NUM__ __UTC_DATE__ __UTC_TIME__ __UTC_DATE_NUM__ __UTC_TIME_NUM__ __PASS__ struc endstruc istruc at iend align alignb sectalign daz nodaz up down zero default option assume public ",built_in:"bits use16 use32 use64 default section segment absolute extern global common cpu float __utf16__ __utf16le__ __utf16be__ __utf32__ __utf32le__ __utf32be__ __float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__ __Infinity__ __QNaN__ __SNaN__ Inf NaN QNaN SNaN float8 float16 float32 float64 float80m float80e float128l float128h __FLOAT_DAZ__ __FLOAT_ROUND__ __FLOAT__"},c:[s.C(";","$",{r:0}),{cN:"number",b:"\\b(?:([0-9][0-9_]*)?\\.[0-9_]*(?:[eE][+-]?[0-9_]+)?|(0[Xx])?[0-9][0-9_]*\\.?[0-9_]*(?:[pP](?:[+-]?[0-9_]+)?)?)\\b",r:0},{cN:"number",b:"\\$[0-9][0-9A-Fa-f]*",r:0},{cN:"number",b:"\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[HhXx]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b"},{cN:"number",b:"\\b(?:0[HhXx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b"},s.QSM,{cN:"string",b:"'",e:"[^\\\\]'",r:0},{cN:"string",b:"`",e:"[^\\\\]`",r:0},{cN:"string",b:"\\.[A-Za-z0-9]+",r:0},{cN:"label",b:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)",r:0},{cN:"label",b:"^\\s*%%[A-Za-z0-9_$#@~.?]*:",r:0},{cN:"argument",b:"%[0-9]+",r:0},{cN:"built_in",b:"%!S+",r:0}]}});hljs.registerLanguage("roboconf",function(e){var n="[a-zA-Z-_][^\n{\r\n]+\\{";return{aliases:["graph","instances"],cI:!0,k:"import",c:[{cN:"facet",b:"^facet "+n,e:"}",k:"facet installer exports children extends",c:[e.HCM]},{cN:"instance-of",b:"^instance of "+n,e:"}",k:"name count channels instance-data instance-state instance of",c:[{cN:"keyword",b:"[a-zA-Z-_]+( | )*:"},e.HCM]},{cN:"component",b:"^"+n,e:"}",l:"\\(?[a-zA-Z]+\\)?",k:"installer exports children extends imports facets alias (optional)",c:[{cN:"string",b:"\\.[a-zA-Z-_]+",e:"\\s|,|;",eE:!0},e.HCM]},e.HCM]}});hljs.registerLanguage("ruby",function(e){var c="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",r="and false then defined module in return redo if BEGIN retry end for true self when next until do begin unless END rescue nil else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",b={cN:"yardoctag",b:"@[A-Za-z]+"},a={cN:"value",b:"#<",e:">"},n=[e.C("#","$",{c:[b]}),e.C("^\\=begin","^\\=end",{c:[b],r:10}),e.C("^__END__","\\n$")],s={cN:"subst",b:"#\\{",e:"}",k:r},t={cN:"string",c:[e.BE,s],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/}]},i={cN:"params",b:"\\(",e:"\\)",k:r},d=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{cN:"inheritance",b:"<\\s*",c:[{cN:"parent",b:"("+e.IR+"::)?"+e.IR}]}].concat(n)},{cN:"function",bK:"def",e:" |$|;",r:0,c:[e.inherit(e.TM,{b:c}),i].concat(n)},{cN:"constant",b:"(::)?(\\b[A-Z]\\w*(::)?)+",r:0},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":",c:[t,{b:c}],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"("+e.RSR+")\\s*",c:[a,{cN:"regexp",c:[e.BE,s],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(n),r:0}].concat(n);s.c=d,i.c=d;var o="[>?]>",l="[\\w#]+\\(\\w+\\):\\d+:\\d+>",u="(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>",N=[{b:/^\s*=>/,cN:"status",starts:{e:"$",c:d}},{cN:"prompt",b:"^("+o+"|"+l+"|"+u+")",starts:{e:"$",c:d}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:r,c:n.concat(N).concat(d)}});hljs.registerLanguage("typescript",function(e){return{aliases:["ts"],k:{keyword:"in if for while finally var new function|0 do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const class public private get set super interface extendsstatic constructor implements enum export import declare type protected",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document any number boolean string void"},c:[{cN:"pi",b:/^\s*('|")use strict('|")/,r:0},e.ASM,e.QSM,e.CLCM,e.CBCM,e.CNM,{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{b:/;/,r:0,sL:"xml"}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,c:[e.CLCM,e.CBCM],i:/["'\(]/}],i:/\[|%/,r:0},{cN:"constructor",bK:"constructor",e:/\{/,eE:!0,r:10},{cN:"module",bK:"module",e:/\{/,eE:!0},{cN:"interface",bK:"interface",e:/\{/,eE:!0},{b:/\$[(.]/},{b:"\\."+e.IR,r:0}]}});hljs.registerLanguage("handlebars",function(e){var a="each in with if else unless bindattr action collection debugger log outlet template unbound view yield";return{aliases:["hbs","html.hbs","html.handlebars"],cI:!0,sL:"xml",subLanguageMode:"continuous",c:[{cN:"expression",b:"{{",e:"}}",c:[{cN:"begin-block",b:"#[a-zA-Z- .]+",k:a},{cN:"string",b:'"',e:'"'},{cN:"end-block",b:"\\/[a-zA-Z- .]+",k:a},{cN:"variable",b:"[a-zA-Z-.]+",k:a}]}]}});hljs.registerLanguage("mercury",function(e){var i={keyword:"module use_module import_module include_module end_module initialise mutable initialize finalize finalise interface implementation pred mode func type inst solver any_pred any_func is semidet det nondet multi erroneous failure cc_nondet cc_multi typeclass instance where pragma promise external trace atomic or_else require_complete_switch require_det require_semidet require_multi require_nondet require_cc_multi require_cc_nondet require_erroneous require_failure",pragma:"inline no_inline type_spec source_file fact_table obsolete memo loop_check minimal_model terminates does_not_terminate check_termination promise_equivalent_clauses",preprocessor:"foreign_proc foreign_decl foreign_code foreign_type foreign_import_module foreign_export_enum foreign_export foreign_enum may_call_mercury will_not_call_mercury thread_safe not_thread_safe maybe_thread_safe promise_pure promise_semipure tabled_for_io local untrailed trailed attach_to_io_state can_pass_as_mercury_type stable will_not_throw_exception may_modify_trail will_not_modify_trail may_duplicate may_not_duplicate affects_liveness does_not_affect_liveness doesnt_affect_liveness no_sharing unknown_sharing sharing",built_in:"some all not if then else true fail false try catch catch_any semidet_true semidet_false semidet_fail impure_true impure semipure"},r={cN:"label",b:"XXX",e:"$",eW:!0,r:0},t=e.inherit(e.CLCM,{b:"%"}),_=e.inherit(e.CBCM,{r:0});t.c.push(r),_.c.push(r);var n={cN:"number",b:"0'.\\|0[box][0-9a-fA-F]*"},a=e.inherit(e.ASM,{r:0}),o=e.inherit(e.QSM,{r:0}),l={cN:"constant",b:"\\\\[abfnrtv]\\|\\\\x[0-9a-fA-F]*\\\\\\|%[-+# *.0-9]*[dioxXucsfeEgGp]",r:0};o.c.push(l);var s={cN:"built_in",v:[{b:"<=>"},{b:"<=",r:0},{b:"=>",r:0},{b:"/\\\\"},{b:"\\\\/"}]},c={cN:"built_in",v:[{b:":-\\|-->"},{b:"=",r:0}]};return{aliases:["m","moo"],k:i,c:[s,c,t,_,n,e.NM,a,o,{b:/:-/}]}});hljs.registerLanguage("fix",function(u){return{c:[{b:/[^\u2401\u0001]+/,e:/[\u2401\u0001]/,eE:!0,rB:!0,rE:!1,c:[{b:/([^\u2401\u0001=]+)/,e:/=([^\u2401\u0001=]+)/,rE:!0,rB:!1,cN:"attribute"},{b:/=/,e:/([\u2401\u0001])/,eE:!0,eB:!0,cN:"string"}]}],cI:!0}});hljs.registerLanguage("clojure",function(e){var t={built_in:"def cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit defmacro defn defn- macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy defstruct first rest cons defprotocol cast coll deftype defrecord last butlast sigs reify second ffirst fnext nfirst nnext defmulti defmethod meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},r="a-zA-Z_\\-!.?+*=<>&#'",n="["+r+"]["+r+"0-9/;:]*",a="[-+]?\\d+(\\.\\d+)?",o={b:n,r:0},s={cN:"number",b:a,r:0},i=e.inherit(e.QSM,{i:null}),c=e.C(";","$",{r:0}),d={cN:"literal",b:/\b(true|false|nil)\b/},l={cN:"collection",b:"[\\[\\{]",e:"[\\]\\}]"},m={cN:"comment",b:"\\^"+n},p=e.C("\\^\\{","\\}"),u={cN:"attribute",b:"[:]"+n},f={cN:"list",b:"\\(",e:"\\)"},h={eW:!0,r:0},y={k:t,l:n,cN:"keyword",b:n,starts:h},b=[f,i,m,p,c,u,l,s,d,o];return f.c=[e.C("comment",""),y,h],h.c=b,l.c=b,{aliases:["clj"],i:/\S/,c:[f,i,m,p,c,u,l,s,d]}});hljs.registerLanguage("perl",function(e){var t="getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when",r={cN:"subst",b:"[$@]\\{",e:"\\}",k:t},s={b:"->{",e:"}"},n={cN:"variable",v:[{b:/\$\d/},{b:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{b:/[\$%@][^\s\w{]/,r:0}]},i=e.C("^(__END__|__DATA__)","\\n$",{r:5}),o=[e.BE,r,n],a=[n,e.HCM,i,e.C("^\\=\\w","\\=cut",{eW:!0}),s,{cN:"string",c:o,v:[{b:"q[qwxr]?\\s*\\(",e:"\\)",r:5},{b:"q[qwxr]?\\s*\\[",e:"\\]",r:5},{b:"q[qwxr]?\\s*\\{",e:"\\}",r:5},{b:"q[qwxr]?\\s*\\|",e:"\\|",r:5},{b:"q[qwxr]?\\s*\\<",e:"\\>",r:5},{b:"qw\\s+q",e:"q",r:5},{b:"'",e:"'",c:[e.BE]},{b:'"',e:'"'},{b:"`",e:"`",c:[e.BE]},{b:"{\\w+}",c:[],r:0},{b:"-?\\w+\\s*\\=\\>",c:[],r:0}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\/\\/|"+e.RSR+"|\\b(split|return|print|reverse|grep)\\b)\\s*",k:"split return print reverse grep",r:0,c:[e.HCM,i,{cN:"regexp",b:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",r:10},{cN:"regexp",b:"(m|qr)?/",e:"/[a-z]*",c:[e.BE],r:0}]},{cN:"sub",bK:"sub",e:"(\\s*\\(.*?\\))?[;{]",r:5},{cN:"operator",b:"-\\w\\b",r:0}];return r.c=a,s.c=a,{aliases:["pl"],k:t,c:a}});hljs.registerLanguage("twig",function(e){var t={cN:"params",b:"\\(",e:"\\)"},a="attribute block constant cycle date dump include max min parent random range source template_from_string",r={cN:"function",bK:a,r:0,c:[t]},c={cN:"filter",b:/\|[A-Za-z_]+:?/,k:"abs batch capitalize convert_encoding date date_modify default escape first format join json_encode keys last length lower merge nl2br number_format raw replace reverse round slice sort split striptags title trim upper url_encode",c:[r]},n="autoescape block do embed extends filter flush for if import include macro sandbox set spaceless use verbatim";return n=n+" "+n.split(" ").map(function(e){return"end"+e}).join(" "),{aliases:["craftcms"],cI:!0,sL:"xml",subLanguageMode:"continuous",c:[e.C(/\{#/,/#}/),{cN:"template_tag",b:/\{%/,e:/%}/,k:n,c:[c,r]},{cN:"variable",b:/\{\{/,e:/}}/,c:[c,r]}]}});hljs.registerLanguage("livecodeserver",function(e){var r={cN:"variable",b:"\\b[gtps][A-Z]+[A-Za-z0-9_\\-]*\\b|\\$_[A-Z]+",r:0},t=[e.CBCM,e.HCM,e.C("--","$"),e.C("[^:]//","$")],a=e.inherit(e.TM,{v:[{b:"\\b_*rig[A-Z]+[A-Za-z0-9_\\-]*"},{b:"\\b_[a-z0-9\\-]+"}]}),o=e.inherit(e.TM,{b:"\\b([A-Za-z0-9_\\-]+)\\b"});return{cI:!1,k:{keyword:"$_COOKIE $_FILES $_GET $_GET_BINARY $_GET_RAW $_POST $_POST_BINARY $_POST_RAW $_SESSION $_SERVER codepoint codepoints segment segments codeunit codeunits sentence sentences trueWord trueWords paragraph after byte bytes english the until http forever descending using line real8 with seventh for stdout finally element word words fourth before black ninth sixth characters chars stderr uInt1 uInt1s uInt2 uInt2s stdin string lines relative rel any fifth items from middle mid at else of catch then third it file milliseconds seconds second secs sec int1 int1s int4 int4s internet int2 int2s normal text item last long detailed effective uInt4 uInt4s repeat end repeat URL in try into switch to words https token binfile each tenth as ticks tick system real4 by dateItems without char character ascending eighth whole dateTime numeric short first ftp integer abbreviated abbr abbrev private case while if",constant:"SIX TEN FORMFEED NINE ZERO NONE SPACE FOUR FALSE COLON CRLF PI COMMA ENDOFFILE EOF EIGHT FIVE QUOTE EMPTY ONE TRUE RETURN CR LINEFEED RIGHT BACKSLASH NULL SEVEN TAB THREE TWO six ten formfeed nine zero none space four false colon crlf pi comma endoffile eof eight five quote empty one true return cr linefeed right backslash null seven tab three two RIVERSION RISTATE FILE_READ_MODE FILE_WRITE_MODE FILE_WRITE_MODE DIR_WRITE_MODE FILE_READ_UMASK FILE_WRITE_UMASK DIR_READ_UMASK DIR_WRITE_UMASK",operator:"div mod wrap and or bitAnd bitNot bitOr bitXor among not in a an within contains ends with begins the keys of keys",built_in:"put abs acos aliasReference annuity arrayDecode arrayEncode asin atan atan2 average avg avgDev base64Decode base64Encode baseConvert binaryDecode binaryEncode byteOffset byteToNum cachedURL cachedURLs charToNum cipherNames codepointOffset codepointProperty codepointToNum codeunitOffset commandNames compound compress constantNames cos date dateFormat decompress directories diskSpace DNSServers exp exp1 exp2 exp10 extents files flushEvents folders format functionNames geometricMean global globals hasMemory harmonicMean hostAddress hostAddressToName hostName hostNameToAddress isNumber ISOToMac itemOffset keys len length libURLErrorData libUrlFormData libURLftpCommand libURLLastHTTPHeaders libURLLastRHHeaders libUrlMultipartFormAddPart libUrlMultipartFormData libURLVersion lineOffset ln ln1 localNames log log2 log10 longFilePath lower macToISO matchChunk matchText matrixMultiply max md5Digest median merge millisec millisecs millisecond milliseconds min monthNames nativeCharToNum normalizeText num number numToByte numToChar numToCodepoint numToNativeChar offset open openfiles openProcesses openProcessIDs openSockets paragraphOffset paramCount param params peerAddress pendingMessages platform popStdDev populationStandardDeviation populationVariance popVariance processID random randomBytes replaceText result revCreateXMLTree revCreateXMLTreeFromFile revCurrentRecord revCurrentRecordIsFirst revCurrentRecordIsLast revDatabaseColumnCount revDatabaseColumnIsNull revDatabaseColumnLengths revDatabaseColumnNames revDatabaseColumnNamed revDatabaseColumnNumbered revDatabaseColumnTypes revDatabaseConnectResult revDatabaseCursors revDatabaseID revDatabaseTableNames revDatabaseType revDataFromQuery revdb_closeCursor revdb_columnbynumber revdb_columncount revdb_columnisnull revdb_columnlengths revdb_columnnames revdb_columntypes revdb_commit revdb_connect revdb_connections revdb_connectionerr revdb_currentrecord revdb_cursorconnection revdb_cursorerr revdb_cursors revdb_dbtype revdb_disconnect revdb_execute revdb_iseof revdb_isbof revdb_movefirst revdb_movelast revdb_movenext revdb_moveprev revdb_query revdb_querylist revdb_recordcount revdb_rollback revdb_tablenames revGetDatabaseDriverPath revNumberOfRecords revOpenDatabase revOpenDatabases revQueryDatabase revQueryDatabaseBlob revQueryResult revQueryIsAtStart revQueryIsAtEnd revUnixFromMacPath revXMLAttribute revXMLAttributes revXMLAttributeValues revXMLChildContents revXMLChildNames revXMLCreateTreeFromFileWithNamespaces revXMLCreateTreeWithNamespaces revXMLDataFromXPathQuery revXMLEvaluateXPath revXMLFirstChild revXMLMatchingNode revXMLNextSibling revXMLNodeContents revXMLNumberOfChildren revXMLParent revXMLPreviousSibling revXMLRootNode revXMLRPC_CreateRequest revXMLRPC_Documents revXMLRPC_Error revXMLRPC_GetHost revXMLRPC_GetMethod revXMLRPC_GetParam revXMLText revXMLRPC_Execute revXMLRPC_GetParamCount revXMLRPC_GetParamNode revXMLRPC_GetParamType revXMLRPC_GetPath revXMLRPC_GetPort revXMLRPC_GetProtocol revXMLRPC_GetRequest revXMLRPC_GetResponse revXMLRPC_GetSocket revXMLTree revXMLTrees revXMLValidateDTD revZipDescribeItem revZipEnumerateItems revZipOpenArchives round sampVariance sec secs seconds sentenceOffset sha1Digest shell shortFilePath sin specialFolderPath sqrt standardDeviation statRound stdDev sum sysError systemVersion tan tempName textDecode textEncode tick ticks time to tokenOffset toLower toUpper transpose truewordOffset trunc uniDecode uniEncode upper URLDecode URLEncode URLStatus uuid value variableNames variance version waitDepth weekdayNames wordOffset xsltApplyStylesheet xsltApplyStylesheetFromFile xsltLoadStylesheet xsltLoadStylesheetFromFile add breakpoint cancel clear local variable file word line folder directory URL close socket process combine constant convert create new alias folder directory decrypt delete variable word line folder directory URL dispatch divide do encrypt filter get include intersect kill libURLDownloadToFile libURLFollowHttpRedirects libURLftpUpload libURLftpUploadFile libURLresetAll libUrlSetAuthCallback libURLSetCustomHTTPHeaders libUrlSetExpect100 libURLSetFTPListCommand libURLSetFTPMode libURLSetFTPStopTime libURLSetStatusCallback load multiply socket prepare process post seek rel relative read from process rename replace require resetAll resolve revAddXMLNode revAppendXML revCloseCursor revCloseDatabase revCommitDatabase revCopyFile revCopyFolder revCopyXMLNode revDeleteFolder revDeleteXMLNode revDeleteAllXMLTrees revDeleteXMLTree revExecuteSQL revGoURL revInsertXMLNode revMoveFolder revMoveToFirstRecord revMoveToLastRecord revMoveToNextRecord revMoveToPreviousRecord revMoveToRecord revMoveXMLNode revPutIntoXMLNode revRollBackDatabase revSetDatabaseDriverPath revSetXMLAttribute revXMLRPC_AddParam revXMLRPC_DeleteAllDocuments revXMLAddDTD revXMLRPC_Free revXMLRPC_FreeAll revXMLRPC_DeleteDocument revXMLRPC_DeleteParam revXMLRPC_SetHost revXMLRPC_SetMethod revXMLRPC_SetPort revXMLRPC_SetProtocol revXMLRPC_SetSocket revZipAddItemWithData revZipAddItemWithFile revZipAddUncompressedItemWithData revZipAddUncompressedItemWithFile revZipCancel revZipCloseArchive revZipDeleteItem revZipExtractItemToFile revZipExtractItemToVariable revZipSetProgressCallback revZipRenameItem revZipReplaceItemWithData revZipReplaceItemWithFile revZipOpenArchive send set sort split start stop subtract union unload wait write"},c:[r,{cN:"keyword",b:"\\bend\\sif\\b"},{cN:"function",bK:"function",e:"$",c:[r,o,e.ASM,e.QSM,e.BNM,e.CNM,a]},{cN:"function",bK:"end",e:"$",c:[o,a]},{cN:"command",bK:"command on",e:"$",c:[r,o,e.ASM,e.QSM,e.BNM,e.CNM,a]},{cN:"command",bK:"end",e:"$",c:[o,a]},{cN:"preprocessor",b:"<\\?rev|<\\?lc|<\\?livecode",r:10},{cN:"preprocessor",b:"<\\?"},{cN:"preprocessor",b:"\\?>"},e.ASM,e.QSM,e.BNM,e.CNM,a].concat(t),i:";$|^\\[|^="}});hljs.registerLanguage("step21",function(e){var r="[A-Z_][A-Z0-9_.]*",i="END-ISO-10303-21;",l={literal:"",built_in:"",keyword:"HEADER ENDSEC DATA"},s={cN:"preprocessor",b:"ISO-10303-21;",r:10},t=[e.CLCM,e.CBCM,e.C("/\\*\\*!","\\*/"),e.CNM,e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null}),{cN:"string",b:"'",e:"'"},{cN:"label",v:[{b:"#",e:"\\d+",i:"\\W"}]}];return{aliases:["p21","step","stp"],cI:!0,l:r,k:l,c:[{cN:"preprocessor",b:i,r:10},s].concat(t)}});hljs.registerLanguage("cpp",function(t){var i={keyword:"false int float while private char catch export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const struct for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using true class asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue wchar_t inline delete alignof char16_t char32_t constexpr decltype noexcept nullptr static_assert thread_local restrict _Bool complex _Complex _Imaginary intmax_t uintmax_t int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t int_least8_t uint_least8_t int_least16_t uint_least16_t int_least32_t uint_least32_t int_least64_t uint_least64_t int_fast8_t uint_fast8_t int_fast16_t uint_fast16_t int_fast32_t uint_fast32_t int_fast64_t uint_fast64_t intptr_t uintptr_t atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong atomic_wchar_t atomic_char16_t atomic_char32_t atomic_intmax_t atomic_uintmax_t atomic_intptr_t atomic_uintptr_t atomic_size_t atomic_ptrdiff_t atomic_int_least8_t atomic_int_least16_t atomic_int_least32_t atomic_int_least64_t atomic_uint_least8_t atomic_uint_least16_t atomic_uint_least32_t atomic_uint_least64_t atomic_int_fast8_t atomic_int_fast16_t atomic_int_fast32_t atomic_int_fast64_t atomic_uint_fast8_t atomic_uint_fast16_t atomic_uint_fast32_t atomic_uint_fast64_t",built_in:"std string cin cout cerr clog stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf"};return{aliases:["c","cc","h","c++","h++","hpp"],k:i,i:""]',k:"include",i:"\\n"},t.CLCM]},{b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:i,c:["self"]},{b:t.IR+"::",k:i},{bK:"new throw return else",r:0},{cN:"function",b:"("+t.IR+"\\s+)+"+t.IR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:i,c:[{b:t.IR+"\\s*\\(",rB:!0,c:[t.TM],r:0},{cN:"params",b:/\(/,e:/\)/,k:i,r:0,c:[t.CBCM]},t.CLCM,t.CBCM]}]}});hljs.registerLanguage("vala",function(e){return{k:{keyword:"char uchar unichar int uint long ulong short ushort int8 int16 int32 int64 uint8 uint16 uint32 uint64 float double bool struct enum string void weak unowned owned async signal static abstract interface override while do for foreach else switch case break default return try catch public private protected internal using new this get set const stdout stdin stderr var",built_in:"DBus GLib CCode Gee Object",literal:"false true null"},c:[{cN:"class",bK:"class interface delegate namespace",e:"{",eE:!0,i:"[^,:\\n\\s\\.]",c:[e.UTM]},e.CLCM,e.CBCM,{cN:"string",b:'"""',e:'"""',r:5},e.ASM,e.QSM,e.CNM,{cN:"preprocessor",b:"^#",e:"$",r:2},{cN:"constant",b:" [A-Z_]+ ",r:0}]}});hljs.registerLanguage("http",function(t){return{aliases:["https"],i:"\\S",c:[{cN:"status",b:"^HTTP/[0-9\\.]+",e:"$",c:[{cN:"number",b:"\\b\\d{3}\\b"}]},{cN:"request",b:"^[A-Z]+ (.*?) HTTP/[0-9\\.]+$",rB:!0,e:"$",c:[{cN:"string",b:" ",e:" ",eB:!0,eE:!0}]},{cN:"attribute",b:"^\\w",e:": ",eE:!0,i:"\\n|\\s|=",starts:{cN:"string",e:"$"}},{b:"\\n\\n",starts:{sL:"",eW:!0}}]}});hljs.registerLanguage("avrasm",function(r){return{cI:!0,l:"\\.?"+r.IR,k:{keyword:"adc add adiw and andi asr bclr bld brbc brbs brcc brcs break breq brge brhc brhs brid brie brlo brlt brmi brne brpl brsh brtc brts brvc brvs bset bst call cbi cbr clc clh cli cln clr cls clt clv clz com cp cpc cpi cpse dec eicall eijmp elpm eor fmul fmuls fmulsu icall ijmp in inc jmp ld ldd ldi lds lpm lsl lsr mov movw mul muls mulsu neg nop or ori out pop push rcall ret reti rjmp rol ror sbc sbr sbrc sbrs sec seh sbi sbci sbic sbis sbiw sei sen ser ses set sev sez sleep spm st std sts sub subi swap tst wdr",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 r16 r17 r18 r19 r20 r21 r22 r23 r24 r25 r26 r27 r28 r29 r30 r31 x|0 xh xl y|0 yh yl z|0 zh zl ucsr1c udr1 ucsr1a ucsr1b ubrr1l ubrr1h ucsr0c ubrr0h tccr3c tccr3a tccr3b tcnt3h tcnt3l ocr3ah ocr3al ocr3bh ocr3bl ocr3ch ocr3cl icr3h icr3l etimsk etifr tccr1c ocr1ch ocr1cl twcr twdr twar twsr twbr osccal xmcra xmcrb eicra spmcsr spmcr portg ddrg ping portf ddrf sreg sph spl xdiv rampz eicrb eimsk gimsk gicr eifr gifr timsk tifr mcucr mcucsr tccr0 tcnt0 ocr0 assr tccr1a tccr1b tcnt1h tcnt1l ocr1ah ocr1al ocr1bh ocr1bl icr1h icr1l tccr2 tcnt2 ocr2 ocdr wdtcr sfior eearh eearl eedr eecr porta ddra pina portb ddrb pinb portc ddrc pinc portd ddrd pind spdr spsr spcr udr0 ucsr0a ucsr0b ubrr0l acsr admux adcsr adch adcl porte ddre pine pinf",preprocessor:".byte .cseg .db .def .device .dseg .dw .endmacro .equ .eseg .exit .include .list .listmac .macro .nolist .org .set"},c:[r.CBCM,r.C(";","$",{r:0}),r.CNM,r.BNM,{cN:"number",b:"\\b(\\$[a-zA-Z0-9]+|0o[0-7]+)"},r.QSM,{cN:"string",b:"'",e:"[^\\\\]'",i:"[^\\\\][^']"},{cN:"label",b:"^[A-Za-z0-9_.$]+:"},{cN:"preprocessor",b:"#",e:"$"},{cN:"localvars",b:"@[0-9]+"}]}});hljs.registerLanguage("aspectj",function(e){var t="false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else extends implements break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws privileged aspectOf adviceexecution proceed cflowbelow cflow initialization preinitialization staticinitialization withincode target within execution getWithinTypeName handler thisJoinPoint thisJoinPointStaticPart thisEnclosingJoinPointStaticPart declare parents warning error soft precedence thisAspectInstance",i="get set args call";return{k:t,i:/<\//,c:[{cN:"javadoc",b:"/\\*\\*",e:"\\*/",r:0,c:[{cN:"javadoctag",b:"(^|\\s)@[A-Za-z]+"}]},e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"aspect",bK:"aspect",e:/[{;=]/,eE:!0,i:/[:;"\[\]]/,c:[{bK:"extends implements pertypewithin perthis pertarget percflowbelow percflow issingleton"},e.UTM,{b:/\([^\)]*/,e:/[)]+/,k:t+" "+i,eE:!1}]},{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,r:0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"pointcut after before around throwing returning",e:/[)]/,eE:!1,i:/["\[\]]/,c:[{b:e.UIR+"\\s*\\(",rB:!0,c:[e.UTM]}]},{b:/[:]/,rB:!0,e:/[{;]/,r:0,eE:!1,k:t,i:/["\[\]]/,c:[{b:e.UIR+"\\s*\\(",k:t+" "+i},e.QSM]},{bK:"new throw",r:0},{cN:"function",b:/\w+ +\w+(\.)?\w+\s*\([^\)]*\)\s*((throws)[\w\s,]+)?[\{;]/,rB:!0,e:/[{;=]/,k:t,eE:!0,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,r:0,k:t,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},e.CNM,{cN:"annotation",b:"@[A-Za-z]+"}]}});hljs.registerLanguage("rib",function(e){return{k:"ArchiveRecord AreaLightSource Atmosphere Attribute AttributeBegin AttributeEnd Basis Begin Blobby Bound Clipping ClippingPlane Color ColorSamples ConcatTransform Cone CoordinateSystem CoordSysTransform CropWindow Curves Cylinder DepthOfField Detail DetailRange Disk Displacement Display End ErrorHandler Exposure Exterior Format FrameAspectRatio FrameBegin FrameEnd GeneralPolygon GeometricApproximation Geometry Hider Hyperboloid Identity Illuminate Imager Interior LightSource MakeCubeFaceEnvironment MakeLatLongEnvironment MakeShadow MakeTexture Matte MotionBegin MotionEnd NuPatch ObjectBegin ObjectEnd ObjectInstance Opacity Option Orientation Paraboloid Patch PatchMesh Perspective PixelFilter PixelSamples PixelVariance Points PointsGeneralPolygons PointsPolygons Polygon Procedural Projection Quantize ReadArchive RelativeDetail ReverseOrientation Rotate Scale ScreenWindow ShadingInterpolation ShadingRate Shutter Sides Skew SolidBegin SolidEnd Sphere SubdivisionMesh Surface TextureCoordinates Torus Transform TransformBegin TransformEnd TransformPoints Translate TrimCurve WorldBegin WorldEnd",i:">>|\.\.\.) /},b={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[r],r:10},{b:/(u|b)?r?"""/,e:/"""/,c:[r],r:10},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},e.ASM,e.QSM]},l={cN:"number",r:0,v:[{b:e.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:e.CNR+"[lLjJ]?"}]},c={cN:"params",b:/\(/,e:/\)/,c:["self",r,l,b]};return{aliases:["py","gyp"],k:{keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda nonlocal|10 None True False",built_in:"Ellipsis NotImplemented"},i:/(<\/|->|\?)/,c:[r,l,b,e.HCM,{v:[{cN:"function",bK:"def",r:10},{cN:"class",bK:"class"}],e:/:/,i:/[${=;\n,]/,c:[e.UTM,c]},{cN:"decorator",b:/@/,e:/$/},{b:/\b(print|exec)\(/}]}});hljs.registerLanguage("axapta",function(e){return{k:"false int abstract private char boolean static null if for true while long throw finally protected final return void enum else break new catch byte super case short default double public try this switch continue reverse firstfast firstonly forupdate nofetch sum avg minof maxof count order group by asc desc index hint like dispaly edit client server ttsbegin ttscommit str real date container anytype common div mod",c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM,{cN:"preprocessor",b:"#",e:"$"},{cN:"class",bK:"class interface",e:"{",eE:!0,i:":",c:[{bK:"extends implements"},e.UTM]}]}});hljs.registerLanguage("nix",function(e){var t={keyword:"rec with let in inherit assert if else then",constant:"true false or and null",built_in:"import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation"},i={cN:"subst",b:/\$\{/,e:/}/,k:t},r={cN:"variable",b:/[a-zA-Z0-9-_]+(\s*=)/},n={cN:"string",b:"''",e:"''",c:[i]},s={cN:"string",b:'"',e:'"',c:[i]},a=[e.NM,e.HCM,e.CBCM,n,s,r];return i.c=a,{aliases:["nixos"],k:t,c:a}});hljs.registerLanguage("diff",function(e){return{aliases:["patch"],c:[{cN:"chunk",r:10,v:[{b:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"header",v:[{b:/Index: /,e:/$/},{b:/=====/,e:/=====$/},{b:/^\-\-\-/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+\+\+/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"change",b:"^\\!",e:"$"}]}});hljs.registerLanguage("parser3",function(r){var e=r.C("{","}",{c:["self"]});return{sL:"xml",r:0,c:[r.C("^#","$"),r.C("\\^rem{","}",{r:10,c:[e]}),{cN:"preprocessor",b:"^@(?:BASE|USE|CLASS|OPTIONS)$",r:10},{cN:"title",b:"@[\\w\\-]+\\[[\\w^;\\-]*\\](?:\\[[\\w^;\\-]*\\])?(?:.*)$"},{cN:"variable",b:"\\$\\{?[\\w\\-\\.\\:]+\\}?"},{cN:"keyword",b:"\\^[\\w\\-\\.\\:]+"},{cN:"number",b:"\\^#[0-9a-fA-F]+"},r.CNM]}});hljs.registerLanguage("django",function(e){var t={cN:"filter",b:/\|[A-Za-z]+:?/,k:"truncatewords removetags linebreaksbr yesno get_digit timesince random striptags filesizeformat escape linebreaks length_is ljust rjust cut urlize fix_ampersands title floatformat capfirst pprint divisibleby add make_list unordered_list urlencode timeuntil urlizetrunc wordcount stringformat linenumbers slice date dictsort dictsortreversed default_if_none pluralize lower join center default truncatewords_html upper length phone2numeric wordwrap time addslashes slugify first escapejs force_escape iriencode last safe safeseq truncatechars localize unlocalize localtime utc timezone",c:[{cN:"argument",b:/"/,e:/"/},{cN:"argument",b:/'/,e:/'/}]};return{aliases:["jinja"],cI:!0,sL:"xml",subLanguageMode:"continuous",c:[e.C(/\{%\s*comment\s*%}/,/\{%\s*endcomment\s*%}/),e.C(/\{#/,/#}/),{cN:"template_tag",b:/\{%/,e:/%}/,k:"comment endcomment load templatetag ifchanged endifchanged if endif firstof for endfor in ifnotequal endifnotequal widthratio extends include spaceless endspaceless regroup by as ifequal endifequal ssi now with cycle url filter endfilter debug block endblock else autoescape endautoescape csrf_token empty elif endwith static trans blocktrans endblocktrans get_static_prefix get_media_prefix plural get_current_language language get_available_languages get_current_language_bidi get_language_info get_language_info_list localize endlocalize localtime endlocaltime timezone endtimezone get_current_timezone verbatim",c:[t]},{cN:"variable",b:/\{\{/,e:/}}/,c:[t]}]}});hljs.registerLanguage("rust",function(e){var t=e.inherit(e.CBCM);return t.c.push("self"),{aliases:["rs"],k:{keyword:"alignof as be box break const continue crate do else enum extern false fn for if impl in let loop match mod mut offsetof once priv proc pub pure ref return self sizeof static struct super trait true type typeof unsafe unsized use virtual while yield int i8 i16 i32 i64 uint u8 u32 u64 float f32 f64 str char bool",built_in:"assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! debug_assert! debug_assert_eq! env! panic! file! format! format_args! include_bin! include_str! line! local_data_key! module_path! option_env! print! println! select! stringify! try! unimplemented! unreachable! vec! write! writeln!"},l:e.IR+"!?",i:""}]}});hljs.registerLanguage("vhdl",function(e){var t="\\d(_|\\d)*",r="[eE][-+]?"+t,n=t+"(\\."+t+")?("+r+")?",o="\\w+",i=t+"#"+o+"(\\."+o+")?#("+r+")?",a="\\b("+i+"|"+n+")";return{cI:!0,k:{keyword:"abs access after alias all and architecture array assert attribute begin block body buffer bus case component configuration constant context cover disconnect downto default else elsif end entity exit fairness file for force function generate generic group guarded if impure in inertial inout is label library linkage literal loop map mod nand new next nor not null of on open or others out package port postponed procedure process property protected pure range record register reject release rem report restrict restrict_guarantee return rol ror select sequence severity shared signal sla sll sra srl strong subtype then to transport type unaffected units until use variable vmode vprop vunit wait when while with xnor xor",typename:"boolean bit character severity_level integer time delay_length natural positive string bit_vector file_open_kind file_open_status std_ulogic std_ulogic_vector std_logic std_logic_vector unsigned signed boolean_vector integer_vector real_vector time_vector"},i:"{",c:[e.CBCM,e.C("--","$"),e.QSM,{cN:"number",b:a,r:0},{cN:"literal",b:"'(U|X|0|1|Z|W|L|H|-)'",c:[e.BE]},{cN:"attribute",b:"'[A-Za-z](_?[A-Za-z0-9])*",c:[e.BE]}]}});hljs.registerLanguage("ocaml",function(e){return{aliases:["ml"],k:{keyword:"and as assert asr begin class constraint do done downto else end exception external for fun function functor if in include inherit! inherit initializer land lazy let lor lsl lsr lxor match method!|10 method mod module mutable new object of open! open or private rec sig struct then to try type val! val virtual when while with parser value",built_in:"array bool bytes char exn|5 float int int32 int64 list lazy_t|5 nativeint|5 string unit in_channel out_channel ref",literal:"true false"},i:/\/\/|>>/,l:"[a-z_]\\w*!?",c:[{cN:"literal",b:"\\[(\\|\\|)?\\]|\\(\\)"},e.C("\\(\\*","\\*\\)",{c:["self"]}),{cN:"symbol",b:"'[A-Za-z_](?!')[\\w']*"},{cN:"tag",b:"`[A-Z][\\w']*"},{cN:"type",b:"\\b[A-Z][\\w']*",r:0},{b:"[a-z_]\\w*'[\\w']*"},e.inherit(e.ASM,{cN:"char",r:0}),e.inherit(e.QSM,{i:null}),{cN:"number",b:"\\b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\\.[0-9_]*)?([eE][-+]?[0-9_]+)?)?)",r:0},{b:/[-=]>/}]}});hljs.registerLanguage("cmake",function(e){return{aliases:["cmake.in"],cI:!0,k:{keyword:"add_custom_command add_custom_target add_definitions add_dependencies add_executable add_library add_subdirectory add_test aux_source_directory break build_command cmake_minimum_required cmake_policy configure_file create_test_sourcelist define_property else elseif enable_language enable_testing endforeach endfunction endif endmacro endwhile execute_process export find_file find_library find_package find_path find_program fltk_wrap_ui foreach function get_cmake_property get_directory_property get_filename_component get_property get_source_file_property get_target_property get_test_property if include include_directories include_external_msproject include_regular_expression install link_directories load_cache load_command macro mark_as_advanced message option output_required_files project qt_wrap_cpp qt_wrap_ui remove_definitions return separate_arguments set set_directory_properties set_property set_source_files_properties set_target_properties set_tests_properties site_name source_group string target_link_libraries try_compile try_run unset variable_watch while build_name exec_program export_library_dependencies install_files install_programs install_targets link_libraries make_directory remove subdir_depends subdirs use_mangled_mesa utility_source variable_requires write_file qt5_use_modules qt5_use_package qt5_wrap_cpp on off true false and or",operator:"equal less greater strless strgreater strequal matches"},c:[{cN:"envvar",b:"\\${",e:"}"},e.HCM,e.QSM,e.NM]}});hljs.registerLanguage("1c",function(c){var e="[a-zA-Zа-яА-Я][a-zA-Z0-9_а-яА-Я]*",r="возврат дата для если и или иначе иначеесли исключение конецесли конецпопытки конецпроцедуры конецфункции конеццикла константа не перейти перем перечисление по пока попытка прервать продолжить процедура строка тогда фс функция цикл число экспорт",t="ansitooem oemtoansi ввестивидсубконто ввестидату ввестизначение ввестиперечисление ввестипериод ввестиплансчетов ввестистроку ввестичисло вопрос восстановитьзначение врег выбранныйплансчетов вызватьисключение датагод датамесяц датачисло добавитьмесяц завершитьработусистемы заголовоксистемы записьжурналарегистрации запуститьприложение зафиксироватьтранзакцию значениевстроку значениевстрокувнутр значениевфайл значениеизстроки значениеизстрокивнутр значениеизфайла имякомпьютера имяпользователя каталогвременныхфайлов каталогиб каталогпользователя каталогпрограммы кодсимв командасистемы конгода конецпериодаби конецрассчитанногопериодаби конецстандартногоинтервала конквартала конмесяца коннедели лев лог лог10 макс максимальноеколичествосубконто мин монопольныйрежим названиеинтерфейса названиенабораправ назначитьвид назначитьсчет найти найтипомеченныенаудаление найтиссылки началопериодаби началостандартногоинтервала начатьтранзакцию начгода начквартала начмесяца начнедели номерднягода номерднянедели номернеделигода нрег обработкаожидания окр описаниеошибки основнойжурналрасчетов основнойплансчетов основнойязык открытьформу открытьформумодально отменитьтранзакцию очиститьокносообщений периодстр полноеимяпользователя получитьвремята получитьдатута получитьдокументта получитьзначенияотбора получитьпозициюта получитьпустоезначение получитьта прав праводоступа предупреждение префиксавтонумерации пустаястрока пустоезначение рабочаядаттьпустоезначение рабочаядата разделительстраниц разделительстрок разм разобратьпозициюдокумента рассчитатьрегистрына рассчитатьрегистрыпо сигнал симв символтабуляции создатьобъект сокрл сокрлп сокрп сообщить состояние сохранитьзначение сред статусвозврата стрдлина стрзаменить стрколичествострок стрполучитьстроку стрчисловхождений сформироватьпозициюдокумента счетпокоду текущаядата текущеевремя типзначения типзначениястр удалитьобъекты установитьтана установитьтапо фиксшаблон формат цел шаблон",i={cN:"dquote",b:'""'},n={cN:"string",b:'"',e:'"|$',c:[i]},a={cN:"string",b:"\\|",e:'"|$',c:[i]};return{cI:!0,l:e,k:{keyword:r,built_in:t},c:[c.CLCM,c.NM,n,a,{cN:"function",b:"(процедура|функция)",e:"$",l:e,k:"процедура функция",c:[c.inherit(c.TM,{b:e}),{cN:"tail",eW:!0,c:[{cN:"params",b:"\\(",e:"\\)",l:e,k:"знач",c:[n,a]},{cN:"export",b:"экспорт",eW:!0,l:e,k:"экспорт",c:[c.CLCM]}]},c.CLCM]},{cN:"preprocessor",b:"#",e:"$"},{cN:"date",b:"'\\d{2}\\.\\d{2}\\.(\\d{2}|\\d{4})'"}]}});hljs.registerLanguage("tcl",function(e){return{aliases:["tk"],k:"after append apply array auto_execok auto_import auto_load auto_mkindex auto_mkindex_old auto_qualify auto_reset bgerror binary break catch cd chan clock close concat continue dde dict encoding eof error eval exec exit expr fblocked fconfigure fcopy file fileevent filename flush for foreach format gets glob global history http if incr info interp join lappend|10 lassign|10 lindex|10 linsert|10 list llength|10 load lrange|10 lrepeat|10 lreplace|10 lreverse|10 lsearch|10 lset|10 lsort|10 mathfunc mathop memory msgcat namespace open package parray pid pkg::create pkg_mkIndex platform platform::shell proc puts pwd read refchan regexp registry regsub|10 rename return safe scan seek set socket source split string subst switch tcl_endOfWord tcl_findLibrary tcl_startOfNextWord tcl_startOfPreviousWord tcl_wordBreakAfter tcl_wordBreakBefore tcltest tclvars tell time tm trace unknown unload unset update uplevel upvar variable vwait while",c:[e.C(";[ \\t]*#","$"),e.C("^[ \\t]*#","$"),{bK:"proc",e:"[\\{]",eE:!0,c:[{cN:"symbol",b:"[ \\t\\n\\r]+(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*",e:"[ \\t\\n\\r]",eW:!0,eE:!0}]},{cN:"variable",eE:!0,v:[{b:"\\$(\\{)?(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*\\(([a-zA-Z0-9_])*\\)",e:"[^a-zA-Z0-9_\\}\\$]"},{b:"\\$(\\{)?(::)?[a-zA-Z_]((::)?[a-zA-Z0-9_])*",e:"(\\))?[^a-zA-Z0-9_\\}\\$]"}]},{cN:"string",c:[e.BE],v:[e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},{cN:"number",v:[e.BNM,e.CNM]}]}});hljs.registerLanguage("groovy",function(e){return{k:{typename:"byte short char int long boolean float double void",literal:"true false null",keyword:"def as in assert trait super this abstract static volatile transient public private protected synchronized final class interface enum if else for while switch case break default continue throw throws try catch finally implements extends new import package return instanceof"},c:[e.CLCM,{cN:"javadoc",b:"/\\*\\*",e:"\\*//*",r:0,c:[{cN:"javadoctag",b:"(^|\\s)@[A-Za-z]+"}]},e.CBCM,{cN:"string",b:'"""',e:'"""'},{cN:"string",b:"'''",e:"'''"},{cN:"string",b:"\\$/",e:"/\\$",r:10},e.ASM,{cN:"regexp",b:/~?\/[^\/\n]+\//,c:[e.BE]},e.QSM,{cN:"shebang",b:"^#!/usr/bin/env",e:"$",i:"\n"},e.BNM,{cN:"class",bK:"class interface trait enum",e:"{",i:":",c:[{bK:"extends implements"},e.UTM]},e.CNM,{cN:"annotation",b:"@[A-Za-z]+"},{cN:"string",b:/[^\?]{0}[A-Za-z0-9_$]+ *:/},{b:/\?/,e:/\:/},{cN:"label",b:"^\\s*[A-Za-z0-9_$]+:",r:0}]}});hljs.registerLanguage("erlang-repl",function(r){return{k:{special_functions:"spawn spawn_link self",reserved:"after and andalso|10 band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse|10 query receive rem try when xor"},c:[{cN:"prompt",b:"^[0-9]+> ",r:10},r.C("%","$"),{cN:"number",b:"\\b(\\d+#[a-fA-F0-9]+|\\d+(\\.\\d+)?([eE][-+]?\\d+)?)",r:0},r.ASM,r.QSM,{cN:"constant",b:"\\?(::)?([A-Z]\\w*(::)?)+"},{cN:"arrow",b:"->"},{cN:"ok",b:"ok"},{cN:"exclamation_mark",b:"!"},{cN:"function_or_atom",b:"(\\b[a-z'][a-zA-Z0-9_']*:[a-z'][a-zA-Z0-9_']*)|(\\b[a-z'][a-zA-Z0-9_']*)",r:0},{cN:"variable",b:"[A-Z][a-zA-Z0-9_']*",r:0}]}});hljs.registerLanguage("nginx",function(e){var r={cN:"variable",v:[{b:/\$\d+/},{b:/\$\{/,e:/}/},{b:"[\\$\\@]"+e.UIR}]},b={eW:!0,l:"[a-z/_]+",k:{built_in:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},r:0,i:"=>",c:[e.HCM,{cN:"string",c:[e.BE,r],v:[{b:/"/,e:/"/},{b:/'/,e:/'/}]},{cN:"url",b:"([a-z]+):/",e:"\\s",eW:!0,eE:!0,c:[r]},{cN:"regexp",c:[e.BE,r],v:[{b:"\\s\\^",e:"\\s|{|;",rE:!0},{b:"~\\*?\\s+",e:"\\s|{|;",rE:!0},{b:"\\*(\\.[a-z\\-]+)+"},{b:"([a-z\\-]+\\.)+\\*"}]},{cN:"number",b:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{cN:"number",b:"\\b\\d+[kKmMgGdshdwy]*\\b",r:0},r]};return{aliases:["nginxconf"],c:[e.HCM,{b:e.UIR+"\\s",e:";|{",rB:!0,c:[{cN:"title",b:e.UIR,starts:b}],r:0}],i:"[^\\s\\}]"}});hljs.registerLanguage("mathematica",function(e){return{aliases:["mma"],l:"(\\$|\\b)"+e.IR+"\\b",k:"AbelianGroup Abort AbortKernels AbortProtect Above Abs Absolute AbsoluteCorrelation AbsoluteCorrelationFunction AbsoluteCurrentValue AbsoluteDashing AbsoluteFileName AbsoluteOptions AbsolutePointSize AbsoluteThickness AbsoluteTime AbsoluteTiming AccountingForm Accumulate Accuracy AccuracyGoal ActionDelay ActionMenu ActionMenuBox ActionMenuBoxOptions Active ActiveItem ActiveStyle AcyclicGraphQ AddOnHelpPath AddTo AdjacencyGraph AdjacencyList AdjacencyMatrix AdjustmentBox AdjustmentBoxOptions AdjustTimeSeriesForecast AffineTransform After AiryAi AiryAiPrime AiryAiZero AiryBi AiryBiPrime AiryBiZero AlgebraicIntegerQ AlgebraicNumber AlgebraicNumberDenominator AlgebraicNumberNorm AlgebraicNumberPolynomial AlgebraicNumberTrace AlgebraicRules AlgebraicRulesData Algebraics AlgebraicUnitQ Alignment AlignmentMarker AlignmentPoint All AllowedDimensions AllowGroupClose AllowInlineCells AllowKernelInitialization AllowReverseGroupClose AllowScriptLevelChange AlphaChannel AlternatingGroup AlternativeHypothesis Alternatives AmbientLight Analytic AnchoredSearch And AndersonDarlingTest AngerJ AngleBracket AngularGauge Animate AnimationCycleOffset AnimationCycleRepetitions AnimationDirection AnimationDisplayTime AnimationRate AnimationRepetitions AnimationRunning Animator AnimatorBox AnimatorBoxOptions AnimatorElements Annotation Annuity AnnuityDue Antialiasing Antisymmetric Apart ApartSquareFree Appearance AppearanceElements AppellF1 Append AppendTo Apply ArcCos ArcCosh ArcCot ArcCoth ArcCsc ArcCsch ArcSec ArcSech ArcSin ArcSinDistribution ArcSinh ArcTan ArcTanh Arg ArgMax ArgMin ArgumentCountQ ARIMAProcess ArithmeticGeometricMean ARMAProcess ARProcess Array ArrayComponents ArrayDepth ArrayFlatten ArrayPad ArrayPlot ArrayQ ArrayReshape ArrayRules Arrays Arrow Arrow3DBox ArrowBox Arrowheads AspectRatio AspectRatioFixed Assert Assuming Assumptions AstronomicalData Asynchronous AsynchronousTaskObject AsynchronousTasks AtomQ Attributes AugmentedSymmetricPolynomial AutoAction AutoDelete AutoEvaluateEvents AutoGeneratedPackage AutoIndent AutoIndentSpacings AutoItalicWords AutoloadPath AutoMatch Automatic AutomaticImageSize AutoMultiplicationSymbol AutoNumberFormatting AutoOpenNotebooks AutoOpenPalettes AutorunSequencing AutoScaling AutoScroll AutoSpacing AutoStyleOptions AutoStyleWords Axes AxesEdge AxesLabel AxesOrigin AxesStyle Axis BabyMonsterGroupB Back Background BackgroundTasksSettings Backslash Backsubstitution Backward Band BandpassFilter BandstopFilter BarabasiAlbertGraphDistribution BarChart BarChart3D BarLegend BarlowProschanImportance BarnesG BarOrigin BarSpacing BartlettHannWindow BartlettWindow BaseForm Baseline BaselinePosition BaseStyle BatesDistribution BattleLemarieWavelet Because BeckmannDistribution Beep Before Begin BeginDialogPacket BeginFrontEndInteractionPacket BeginPackage BellB BellY Below BenfordDistribution BeniniDistribution BenktanderGibratDistribution BenktanderWeibullDistribution BernoulliB BernoulliDistribution BernoulliGraphDistribution BernoulliProcess BernsteinBasis BesselFilterModel BesselI BesselJ BesselJZero BesselK BesselY BesselYZero Beta BetaBinomialDistribution BetaDistribution BetaNegativeBinomialDistribution BetaPrimeDistribution BetaRegularized BetweennessCentrality BezierCurve BezierCurve3DBox BezierCurve3DBoxOptions BezierCurveBox BezierCurveBoxOptions BezierFunction BilateralFilter Binarize BinaryFormat BinaryImageQ BinaryRead BinaryReadList BinaryWrite BinCounts BinLists Binomial BinomialDistribution BinomialProcess BinormalDistribution BiorthogonalSplineWavelet BipartiteGraphQ BirnbaumImportance BirnbaumSaundersDistribution BitAnd BitClear BitGet BitLength BitNot BitOr BitSet BitShiftLeft BitShiftRight BitXor Black BlackmanHarrisWindow BlackmanNuttallWindow BlackmanWindow Blank BlankForm BlankNullSequence BlankSequence Blend Block BlockRandom BlomqvistBeta BlomqvistBetaTest Blue Blur BodePlot BohmanWindow Bold Bookmarks Boole BooleanConsecutiveFunction BooleanConvert BooleanCountingFunction BooleanFunction BooleanGraph BooleanMaxterms BooleanMinimize BooleanMinterms Booleans BooleanTable BooleanVariables BorderDimensions BorelTannerDistribution Bottom BottomHatTransform BoundaryStyle Bounds Box BoxBaselineShift BoxData BoxDimensions Boxed Boxes BoxForm BoxFormFormatTypes BoxFrame BoxID BoxMargins BoxMatrix BoxRatios BoxRotation BoxRotationPoint BoxStyle BoxWhiskerChart Bra BracketingBar BraKet BrayCurtisDistance BreadthFirstScan Break Brown BrownForsytheTest BrownianBridgeProcess BrowserCategory BSplineBasis BSplineCurve BSplineCurve3DBox BSplineCurveBox BSplineCurveBoxOptions BSplineFunction BSplineSurface BSplineSurface3DBox BubbleChart BubbleChart3D BubbleScale BubbleSizes BulletGauge BusinessDayQ ButterflyGraph ButterworthFilterModel Button ButtonBar ButtonBox ButtonBoxOptions ButtonCell ButtonContents ButtonData ButtonEvaluator ButtonExpandable ButtonFrame ButtonFunction ButtonMargins ButtonMinHeight ButtonNote ButtonNotebook ButtonSource ButtonStyle ButtonStyleMenuListing Byte ByteCount ByteOrdering C CachedValue CacheGraphics CalendarData CalendarType CallPacket CanberraDistance Cancel CancelButton CandlestickChart Cap CapForm CapitalDifferentialD CardinalBSplineBasis CarmichaelLambda Cases Cashflow Casoratian Catalan CatalanNumber Catch CauchyDistribution CauchyWindow CayleyGraph CDF CDFDeploy CDFInformation CDFWavelet Ceiling Cell CellAutoOverwrite CellBaseline CellBoundingBox CellBracketOptions CellChangeTimes CellContents CellContext CellDingbat CellDynamicExpression CellEditDuplicate CellElementsBoundingBox CellElementSpacings CellEpilog CellEvaluationDuplicate CellEvaluationFunction CellEventActions CellFrame CellFrameColor CellFrameLabelMargins CellFrameLabels CellFrameMargins CellGroup CellGroupData CellGrouping CellGroupingRules CellHorizontalScrolling CellID CellLabel CellLabelAutoDelete CellLabelMargins CellLabelPositioning CellMargins CellObject CellOpen CellPrint CellProlog Cells CellSize CellStyle CellTags CellularAutomaton CensoredDistribution Censoring Center CenterDot CentralMoment CentralMomentGeneratingFunction CForm ChampernowneNumber ChanVeseBinarize Character CharacterEncoding CharacterEncodingsPath CharacteristicFunction CharacteristicPolynomial CharacterRange Characters ChartBaseStyle ChartElementData ChartElementDataFunction ChartElementFunction ChartElements ChartLabels ChartLayout ChartLegends ChartStyle Chebyshev1FilterModel Chebyshev2FilterModel ChebyshevDistance ChebyshevT ChebyshevU Check CheckAbort CheckAll Checkbox CheckboxBar CheckboxBox CheckboxBoxOptions ChemicalData ChessboardDistance ChiDistribution ChineseRemainder ChiSquareDistribution ChoiceButtons ChoiceDialog CholeskyDecomposition Chop Circle CircleBox CircleDot CircleMinus CirclePlus CircleTimes CirculantGraph CityData Clear ClearAll ClearAttributes ClearSystemCache ClebschGordan ClickPane Clip ClipboardNotebook ClipFill ClippingStyle ClipPlanes ClipRange Clock ClockGauge ClockwiseContourIntegral Close Closed CloseKernels ClosenessCentrality Closing ClosingAutoSave ClosingEvent ClusteringComponents CMYKColor Coarse Coefficient CoefficientArrays CoefficientDomain CoefficientList CoefficientRules CoifletWavelet Collect Colon ColonForm ColorCombine ColorConvert ColorData ColorDataFunction ColorFunction ColorFunctionScaling Colorize ColorNegate ColorOutput ColorProfileData ColorQuantize ColorReplace ColorRules ColorSelectorSettings ColorSeparate ColorSetter ColorSetterBox ColorSetterBoxOptions ColorSlider ColorSpace Column ColumnAlignments ColumnBackgrounds ColumnForm ColumnLines ColumnsEqual ColumnSpacings ColumnWidths CommonDefaultFormatTypes Commonest CommonestFilter CommonUnits CommunityBoundaryStyle CommunityGraphPlot CommunityLabels CommunityRegionStyle CompatibleUnitQ CompilationOptions CompilationTarget Compile Compiled CompiledFunction Complement CompleteGraph CompleteGraphQ CompleteKaryTree CompletionsListPacket Complex Complexes ComplexExpand ComplexInfinity ComplexityFunction ComponentMeasurements ComponentwiseContextMenu Compose ComposeList ComposeSeries Composition CompoundExpression CompoundPoissonDistribution CompoundPoissonProcess CompoundRenewalProcess Compress CompressedData Condition ConditionalExpression Conditioned Cone ConeBox ConfidenceLevel ConfidenceRange ConfidenceTransform ConfigurationPath Congruent Conjugate ConjugateTranspose Conjunction Connect ConnectedComponents ConnectedGraphQ ConnesWindow ConoverTest ConsoleMessage ConsoleMessagePacket ConsolePrint Constant ConstantArray Constants ConstrainedMax ConstrainedMin ContentPadding ContentsBoundingBox ContentSelectable ContentSize Context ContextMenu Contexts ContextToFilename ContextToFileName Continuation Continue ContinuedFraction ContinuedFractionK ContinuousAction ContinuousMarkovProcess ContinuousTimeModelQ ContinuousWaveletData ContinuousWaveletTransform ContourDetect ContourGraphics ContourIntegral ContourLabels ContourLines ContourPlot ContourPlot3D Contours ContourShading ContourSmoothing ContourStyle ContraharmonicMean Control ControlActive ControlAlignment ControllabilityGramian ControllabilityMatrix ControllableDecomposition ControllableModelQ ControllerDuration ControllerInformation ControllerInformationData ControllerLinking ControllerManipulate ControllerMethod ControllerPath ControllerState ControlPlacement ControlsRendering ControlType Convergents ConversionOptions ConversionRules ConvertToBitmapPacket ConvertToPostScript ConvertToPostScriptPacket Convolve ConwayGroupCo1 ConwayGroupCo2 ConwayGroupCo3 CoordinateChartData CoordinatesToolOptions CoordinateTransform CoordinateTransformData CoprimeQ Coproduct CopulaDistribution Copyable CopyDirectory CopyFile CopyTag CopyToClipboard CornerFilter CornerNeighbors Correlation CorrelationDistance CorrelationFunction CorrelationTest Cos Cosh CoshIntegral CosineDistance CosineWindow CosIntegral Cot Coth Count CounterAssignments CounterBox CounterBoxOptions CounterClockwiseContourIntegral CounterEvaluator CounterFunction CounterIncrements CounterStyle CounterStyleMenuListing CountRoots CountryData Covariance CovarianceEstimatorFunction CovarianceFunction CoxianDistribution CoxIngersollRossProcess CoxModel CoxModelFit CramerVonMisesTest CreateArchive CreateDialog CreateDirectory CreateDocument CreateIntermediateDirectories CreatePalette CreatePalettePacket CreateScheduledTask CreateTemporary CreateWindow CriticalityFailureImportance CriticalitySuccessImportance CriticalSection Cross CrossingDetect CrossMatrix Csc Csch CubeRoot Cubics Cuboid CuboidBox Cumulant CumulantGeneratingFunction Cup CupCap Curl CurlyDoubleQuote CurlyQuote CurrentImage CurrentlySpeakingPacket CurrentValue CurvatureFlowFilter CurveClosed Cyan CycleGraph CycleIndexPolynomial Cycles CyclicGroup Cyclotomic Cylinder CylinderBox CylindricalDecomposition D DagumDistribution DamerauLevenshteinDistance DampingFactor Darker Dashed Dashing DataCompression DataDistribution DataRange DataReversed Date DateDelimiters DateDifference DateFunction DateList DateListLogPlot DateListPlot DatePattern DatePlus DateRange DateString DateTicksFormat DaubechiesWavelet DavisDistribution DawsonF DayCount DayCountConvention DayMatchQ DayName DayPlus DayRange DayRound DeBruijnGraph Debug DebugTag Decimal DeclareKnownSymbols DeclarePackage Decompose Decrement DedekindEta Default DefaultAxesStyle DefaultBaseStyle DefaultBoxStyle DefaultButton DefaultColor DefaultControlPlacement DefaultDuplicateCellStyle DefaultDuration DefaultElement DefaultFaceGridsStyle DefaultFieldHintStyle DefaultFont DefaultFontProperties DefaultFormatType DefaultFormatTypeForStyle DefaultFrameStyle DefaultFrameTicksStyle DefaultGridLinesStyle DefaultInlineFormatType DefaultInputFormatType DefaultLabelStyle DefaultMenuStyle DefaultNaturalLanguage DefaultNewCellStyle DefaultNewInlineCellStyle DefaultNotebook DefaultOptions DefaultOutputFormatType DefaultStyle DefaultStyleDefinitions DefaultTextFormatType DefaultTextInlineFormatType DefaultTicksStyle DefaultTooltipStyle DefaultValues Defer DefineExternal DefineInputStreamMethod DefineOutputStreamMethod Definition Degree DegreeCentrality DegreeGraphDistribution DegreeLexicographic DegreeReverseLexicographic Deinitialization Del Deletable Delete DeleteBorderComponents DeleteCases DeleteContents DeleteDirectory DeleteDuplicates DeleteFile DeleteSmallComponents DeleteWithContents DeletionWarning Delimiter DelimiterFlashTime DelimiterMatching Delimiters Denominator DensityGraphics DensityHistogram DensityPlot DependentVariables Deploy Deployed Depth DepthFirstScan Derivative DerivativeFilter DescriptorStateSpace DesignMatrix Det DGaussianWavelet DiacriticalPositioning Diagonal DiagonalMatrix Dialog DialogIndent DialogInput DialogLevel DialogNotebook DialogProlog DialogReturn DialogSymbols Diamond DiamondMatrix DiceDissimilarity DictionaryLookup DifferenceDelta DifferenceOrder DifferenceRoot DifferenceRootReduce Differences DifferentialD DifferentialRoot DifferentialRootReduce DifferentiatorFilter DigitBlock DigitBlockMinimum DigitCharacter DigitCount DigitQ DihedralGroup Dilation Dimensions DiracComb DiracDelta DirectedEdge DirectedEdges DirectedGraph DirectedGraphQ DirectedInfinity Direction Directive Directory DirectoryName DirectoryQ DirectoryStack DirichletCharacter DirichletConvolve DirichletDistribution DirichletL DirichletTransform DirichletWindow DisableConsolePrintPacket DiscreteChirpZTransform DiscreteConvolve DiscreteDelta DiscreteHadamardTransform DiscreteIndicator DiscreteLQEstimatorGains DiscreteLQRegulatorGains DiscreteLyapunovSolve DiscreteMarkovProcess DiscretePlot DiscretePlot3D DiscreteRatio DiscreteRiccatiSolve DiscreteShift DiscreteTimeModelQ DiscreteUniformDistribution DiscreteVariables DiscreteWaveletData DiscreteWaveletPacketTransform DiscreteWaveletTransform Discriminant Disjunction Disk DiskBox DiskMatrix Dispatch DispersionEstimatorFunction Display DisplayAllSteps DisplayEndPacket DisplayFlushImagePacket DisplayForm DisplayFunction DisplayPacket DisplayRules DisplaySetSizePacket DisplayString DisplayTemporary DisplayWith DisplayWithRef DisplayWithVariable DistanceFunction DistanceTransform Distribute Distributed DistributedContexts DistributeDefinitions DistributionChart DistributionDomain DistributionFitTest DistributionParameterAssumptions DistributionParameterQ Dithering Div Divergence Divide DivideBy Dividers Divisible Divisors DivisorSigma DivisorSum DMSList DMSString Do DockedCells DocumentNotebook DominantColors DOSTextFormat Dot DotDashed DotEqual Dotted DoubleBracketingBar DoubleContourIntegral DoubleDownArrow DoubleLeftArrow DoubleLeftRightArrow DoubleLeftTee DoubleLongLeftArrow DoubleLongLeftRightArrow DoubleLongRightArrow DoubleRightArrow DoubleRightTee DoubleUpArrow DoubleUpDownArrow DoubleVerticalBar DoublyInfinite Down DownArrow DownArrowBar DownArrowUpArrow DownLeftRightVector DownLeftTeeVector DownLeftVector DownLeftVectorBar DownRightTeeVector DownRightVector DownRightVectorBar Downsample DownTee DownTeeArrow DownValues DragAndDrop DrawEdges DrawFrontFaces DrawHighlighted Drop DSolve Dt DualLinearProgramming DualSystemsModel DumpGet DumpSave DuplicateFreeQ Dynamic DynamicBox DynamicBoxOptions DynamicEvaluationTimeout DynamicLocation DynamicModule DynamicModuleBox DynamicModuleBoxOptions DynamicModuleParent DynamicModuleValues DynamicName DynamicNamespace DynamicReference DynamicSetting DynamicUpdating DynamicWrapper DynamicWrapperBox DynamicWrapperBoxOptions E EccentricityCentrality EdgeAdd EdgeBetweennessCentrality EdgeCapacity EdgeCapForm EdgeColor EdgeConnectivity EdgeCost EdgeCount EdgeCoverQ EdgeDashing EdgeDelete EdgeDetect EdgeForm EdgeIndex EdgeJoinForm EdgeLabeling EdgeLabels EdgeLabelStyle EdgeList EdgeOpacity EdgeQ EdgeRenderingFunction EdgeRules EdgeShapeFunction EdgeStyle EdgeThickness EdgeWeight Editable EditButtonSettings EditCellTagsSettings EditDistance EffectiveInterest Eigensystem Eigenvalues EigenvectorCentrality Eigenvectors Element ElementData Eliminate EliminationOrder EllipticE EllipticExp EllipticExpPrime EllipticF EllipticFilterModel EllipticK EllipticLog EllipticNomeQ EllipticPi EllipticReducedHalfPeriods EllipticTheta EllipticThetaPrime EmitSound EmphasizeSyntaxErrors EmpiricalDistribution Empty EmptyGraphQ EnableConsolePrintPacket Enabled Encode End EndAdd EndDialogPacket EndFrontEndInteractionPacket EndOfFile EndOfLine EndOfString EndPackage EngineeringForm Enter EnterExpressionPacket EnterTextPacket Entropy EntropyFilter Environment Epilog Equal EqualColumns EqualRows EqualTilde EquatedTo Equilibrium EquirippleFilterKernel Equivalent Erf Erfc Erfi ErlangB ErlangC ErlangDistribution Erosion ErrorBox ErrorBoxOptions ErrorNorm ErrorPacket ErrorsDialogSettings EstimatedDistribution EstimatedProcess EstimatorGains EstimatorRegulator EuclideanDistance EulerE EulerGamma EulerianGraphQ EulerPhi Evaluatable Evaluate Evaluated EvaluatePacket EvaluationCell EvaluationCompletionAction EvaluationElements EvaluationMode EvaluationMonitor EvaluationNotebook EvaluationObject EvaluationOrder Evaluator EvaluatorNames EvenQ EventData EventEvaluator EventHandler EventHandlerTag EventLabels ExactBlackmanWindow ExactNumberQ ExactRootIsolation ExampleData Except ExcludedForms ExcludePods Exclusions ExclusionsStyle Exists Exit ExitDialog Exp Expand ExpandAll ExpandDenominator ExpandFileName ExpandNumerator Expectation ExpectationE ExpectedValue ExpGammaDistribution ExpIntegralE ExpIntegralEi Exponent ExponentFunction ExponentialDistribution ExponentialFamily ExponentialGeneratingFunction ExponentialMovingAverage ExponentialPowerDistribution ExponentPosition ExponentStep Export ExportAutoReplacements ExportPacket ExportString Expression ExpressionCell ExpressionPacket ExpToTrig ExtendedGCD Extension ExtentElementFunction ExtentMarkers ExtentSize ExternalCall ExternalDataCharacterEncoding Extract ExtractArchive ExtremeValueDistribution FaceForm FaceGrids FaceGridsStyle Factor FactorComplete Factorial Factorial2 FactorialMoment FactorialMomentGeneratingFunction FactorialPower FactorInteger FactorList FactorSquareFree FactorSquareFreeList FactorTerms FactorTermsList Fail FailureDistribution False FARIMAProcess FEDisableConsolePrintPacket FeedbackSector FeedbackSectorStyle FeedbackType FEEnableConsolePrintPacket Fibonacci FieldHint FieldHintStyle FieldMasked FieldSize File FileBaseName FileByteCount FileDate FileExistsQ FileExtension FileFormat FileHash FileInformation FileName FileNameDepth FileNameDialogSettings FileNameDrop FileNameJoin FileNames FileNameSetter FileNameSplit FileNameTake FilePrint FileType FilledCurve FilledCurveBox Filling FillingStyle FillingTransform FilterRules FinancialBond FinancialData FinancialDerivative FinancialIndicator Find FindArgMax FindArgMin FindClique FindClusters FindCurvePath FindDistributionParameters FindDivisions FindEdgeCover FindEdgeCut FindEulerianCycle FindFaces FindFile FindFit FindGeneratingFunction FindGeoLocation FindGeometricTransform FindGraphCommunities FindGraphIsomorphism FindGraphPartition FindHamiltonianCycle FindIndependentEdgeSet FindIndependentVertexSet FindInstance FindIntegerNullVector FindKClan FindKClique FindKClub FindKPlex FindLibrary FindLinearRecurrence FindList FindMaximum FindMaximumFlow FindMaxValue FindMinimum FindMinimumCostFlow FindMinimumCut FindMinValue FindPermutation FindPostmanTour FindProcessParameters FindRoot FindSequenceFunction FindSettings FindShortestPath FindShortestTour FindThreshold FindVertexCover FindVertexCut Fine FinishDynamic FiniteAbelianGroupCount FiniteGroupCount FiniteGroupData First FirstPassageTimeDistribution FischerGroupFi22 FischerGroupFi23 FischerGroupFi24Prime FisherHypergeometricDistribution FisherRatioTest FisherZDistribution Fit FitAll FittedModel FixedPoint FixedPointList FlashSelection Flat Flatten FlattenAt FlatTopWindow FlipView Floor FlushPrintOutputPacket Fold FoldList Font FontColor FontFamily FontForm FontName FontOpacity FontPostScriptName FontProperties FontReencoding FontSize FontSlant FontSubstitutions FontTracking FontVariations FontWeight For ForAll Format FormatRules FormatType FormatTypeAutoConvert FormatValues FormBox FormBoxOptions FortranForm Forward ForwardBackward Fourier FourierCoefficient FourierCosCoefficient FourierCosSeries FourierCosTransform FourierDCT FourierDCTFilter FourierDCTMatrix FourierDST FourierDSTMatrix FourierMatrix FourierParameters FourierSequenceTransform FourierSeries FourierSinCoefficient FourierSinSeries FourierSinTransform FourierTransform FourierTrigSeries FractionalBrownianMotionProcess FractionalPart FractionBox FractionBoxOptions FractionLine Frame FrameBox FrameBoxOptions Framed FrameInset FrameLabel Frameless FrameMargins FrameStyle FrameTicks FrameTicksStyle FRatioDistribution FrechetDistribution FreeQ FrequencySamplingFilterKernel FresnelC FresnelS Friday FrobeniusNumber FrobeniusSolve FromCharacterCode FromCoefficientRules FromContinuedFraction FromDate FromDigits FromDMS Front FrontEndDynamicExpression FrontEndEventActions FrontEndExecute FrontEndObject FrontEndResource FrontEndResourceString FrontEndStackSize FrontEndToken FrontEndTokenExecute FrontEndValueCache FrontEndVersion FrontFaceColor FrontFaceOpacity Full FullAxes FullDefinition FullForm FullGraphics FullOptions FullSimplify Function FunctionExpand FunctionInterpolation FunctionSpace FussellVeselyImportance GaborFilter GaborMatrix GaborWavelet GainMargins GainPhaseMargins Gamma GammaDistribution GammaRegularized GapPenalty Gather GatherBy GaugeFaceElementFunction GaugeFaceStyle GaugeFrameElementFunction GaugeFrameSize GaugeFrameStyle GaugeLabels GaugeMarkers GaugeStyle GaussianFilter GaussianIntegers GaussianMatrix GaussianWindow GCD GegenbauerC General GeneralizedLinearModelFit GenerateConditions GeneratedCell GeneratedParameters GeneratingFunction Generic GenericCylindricalDecomposition GenomeData GenomeLookup GeodesicClosing GeodesicDilation GeodesicErosion GeodesicOpening GeoDestination GeodesyData GeoDirection GeoDistance GeoGridPosition GeometricBrownianMotionProcess GeometricDistribution GeometricMean GeometricMeanFilter GeometricTransformation GeometricTransformation3DBox GeometricTransformation3DBoxOptions GeometricTransformationBox GeometricTransformationBoxOptions GeoPosition GeoPositionENU GeoPositionXYZ GeoProjectionData GestureHandler GestureHandlerTag Get GetBoundingBoxSizePacket GetContext GetEnvironment GetFileName GetFrontEndOptionsDataPacket GetLinebreakInformationPacket GetMenusPacket GetPageBreakInformationPacket Glaisher GlobalClusteringCoefficient GlobalPreferences GlobalSession Glow GoldenRatio GompertzMakehamDistribution GoodmanKruskalGamma GoodmanKruskalGammaTest Goto Grad Gradient GradientFilter GradientOrientationFilter Graph GraphAssortativity GraphCenter GraphComplement GraphData GraphDensity GraphDiameter GraphDifference GraphDisjointUnion GraphDistance GraphDistanceMatrix GraphElementData GraphEmbedding GraphHighlight GraphHighlightStyle GraphHub Graphics Graphics3D Graphics3DBox Graphics3DBoxOptions GraphicsArray GraphicsBaseline GraphicsBox GraphicsBoxOptions GraphicsColor GraphicsColumn GraphicsComplex GraphicsComplex3DBox GraphicsComplex3DBoxOptions GraphicsComplexBox GraphicsComplexBoxOptions GraphicsContents GraphicsData GraphicsGrid GraphicsGridBox GraphicsGroup GraphicsGroup3DBox GraphicsGroup3DBoxOptions GraphicsGroupBox GraphicsGroupBoxOptions GraphicsGrouping GraphicsHighlightColor GraphicsRow GraphicsSpacing GraphicsStyle GraphIntersection GraphLayout GraphLinkEfficiency GraphPeriphery GraphPlot GraphPlot3D GraphPower GraphPropertyDistribution GraphQ GraphRadius GraphReciprocity GraphRoot GraphStyle GraphUnion Gray GrayLevel GreatCircleDistance Greater GreaterEqual GreaterEqualLess GreaterFullEqual GreaterGreater GreaterLess GreaterSlantEqual GreaterTilde Green Grid GridBaseline GridBox GridBoxAlignment GridBoxBackground GridBoxDividers GridBoxFrame GridBoxItemSize GridBoxItemStyle GridBoxOptions GridBoxSpacings GridCreationSettings GridDefaultElement GridElementStyleOptions GridFrame GridFrameMargins GridGraph GridLines GridLinesStyle GroebnerBasis GroupActionBase GroupCentralizer GroupElementFromWord GroupElementPosition GroupElementQ GroupElements GroupElementToWord GroupGenerators GroupMultiplicationTable GroupOrbits GroupOrder GroupPageBreakWithin GroupSetwiseStabilizer GroupStabilizer GroupStabilizerChain Gudermannian GumbelDistribution HaarWavelet HadamardMatrix HalfNormalDistribution HamiltonianGraphQ HammingDistance HammingWindow HankelH1 HankelH2 HankelMatrix HannPoissonWindow HannWindow HaradaNortonGroupHN HararyGraph HarmonicMean HarmonicMeanFilter HarmonicNumber Hash HashTable Haversine HazardFunction Head HeadCompose Heads HeavisideLambda HeavisidePi HeavisideTheta HeldGroupHe HeldPart HelpBrowserLookup HelpBrowserNotebook HelpBrowserSettings HermiteDecomposition HermiteH HermitianMatrixQ HessenbergDecomposition Hessian HexadecimalCharacter Hexahedron HexahedronBox HexahedronBoxOptions HiddenSurface HighlightGraph HighlightImage HighpassFilter HigmanSimsGroupHS HilbertFilter HilbertMatrix Histogram Histogram3D HistogramDistribution HistogramList HistogramTransform HistogramTransformInterpolation HitMissTransform HITSCentrality HodgeDual HoeffdingD HoeffdingDTest Hold HoldAll HoldAllComplete HoldComplete HoldFirst HoldForm HoldPattern HoldRest HolidayCalendar HomeDirectory HomePage Horizontal HorizontalForm HorizontalGauge HorizontalScrollPosition HornerForm HotellingTSquareDistribution HoytDistribution HTMLSave Hue HumpDownHump HumpEqual HurwitzLerchPhi HurwitzZeta HyperbolicDistribution HypercubeGraph HyperexponentialDistribution Hyperfactorial Hypergeometric0F1 Hypergeometric0F1Regularized Hypergeometric1F1 Hypergeometric1F1Regularized Hypergeometric2F1 Hypergeometric2F1Regularized HypergeometricDistribution HypergeometricPFQ HypergeometricPFQRegularized HypergeometricU Hyperlink HyperlinkCreationSettings Hyphenation HyphenationOptions HypoexponentialDistribution HypothesisTestData I Identity IdentityMatrix If IgnoreCase Im Image Image3D Image3DSlices ImageAccumulate ImageAdd ImageAdjust ImageAlign ImageApply ImageAspectRatio ImageAssemble ImageCache ImageCacheValid ImageCapture ImageChannels ImageClip ImageColorSpace ImageCompose ImageConvolve ImageCooccurrence ImageCorners ImageCorrelate ImageCorrespondingPoints ImageCrop ImageData ImageDataPacket ImageDeconvolve ImageDemosaic ImageDifference ImageDimensions ImageDistance ImageEffect ImageFeatureTrack ImageFileApply ImageFileFilter ImageFileScan ImageFilter ImageForestingComponents ImageForwardTransformation ImageHistogram ImageKeypoints ImageLevels ImageLines ImageMargins ImageMarkers ImageMeasurements ImageMultiply ImageOffset ImagePad ImagePadding ImagePartition ImagePeriodogram ImagePerspectiveTransformation ImageQ ImageRangeCache ImageReflect ImageRegion ImageResize ImageResolution ImageRotate ImageRotated ImageScaled ImageScan ImageSize ImageSizeAction ImageSizeCache ImageSizeMultipliers ImageSizeRaw ImageSubtract ImageTake ImageTransformation ImageTrim ImageType ImageValue ImageValuePositions Implies Import ImportAutoReplacements ImportString ImprovementImportance In IncidenceGraph IncidenceList IncidenceMatrix IncludeConstantBasis IncludeFileExtension IncludePods IncludeSingularTerm Increment Indent IndentingNewlineSpacings IndentMaxFraction IndependenceTest IndependentEdgeSetQ IndependentUnit IndependentVertexSetQ Indeterminate IndexCreationOptions Indexed IndexGraph IndexTag Inequality InexactNumberQ InexactNumbers Infinity Infix Information Inherited InheritScope Initialization InitializationCell InitializationCellEvaluation InitializationCellWarning InlineCounterAssignments InlineCounterIncrements InlineRules Inner Inpaint Input InputAliases InputAssumptions InputAutoReplacements InputField InputFieldBox InputFieldBoxOptions InputForm InputGrouping InputNamePacket InputNotebook InputPacket InputSettings InputStream InputString InputStringPacket InputToBoxFormPacket Insert InsertionPointObject InsertResults Inset Inset3DBox Inset3DBoxOptions InsetBox InsetBoxOptions Install InstallService InString Integer IntegerDigits IntegerExponent IntegerLength IntegerPart IntegerPartitions IntegerQ Integers IntegerString Integral Integrate Interactive InteractiveTradingChart Interlaced Interleaving InternallyBalancedDecomposition InterpolatingFunction InterpolatingPolynomial Interpolation InterpolationOrder InterpolationPoints InterpolationPrecision Interpretation InterpretationBox InterpretationBoxOptions InterpretationFunction InterpretTemplate InterquartileRange Interrupt InterruptSettings Intersection Interval IntervalIntersection IntervalMemberQ IntervalUnion Inverse InverseBetaRegularized InverseCDF InverseChiSquareDistribution InverseContinuousWaveletTransform InverseDistanceTransform InverseEllipticNomeQ InverseErf InverseErfc InverseFourier InverseFourierCosTransform InverseFourierSequenceTransform InverseFourierSinTransform InverseFourierTransform InverseFunction InverseFunctions InverseGammaDistribution InverseGammaRegularized InverseGaussianDistribution InverseGudermannian InverseHaversine InverseJacobiCD InverseJacobiCN InverseJacobiCS InverseJacobiDC InverseJacobiDN InverseJacobiDS InverseJacobiNC InverseJacobiND InverseJacobiNS InverseJacobiSC InverseJacobiSD InverseJacobiSN InverseLaplaceTransform InversePermutation InverseRadon InverseSeries InverseSurvivalFunction InverseWaveletTransform InverseWeierstrassP InverseZTransform Invisible InvisibleApplication InvisibleTimes IrreduciblePolynomialQ IsolatingInterval IsomorphicGraphQ IsotopeData Italic Item ItemBox ItemBoxOptions ItemSize ItemStyle ItoProcess JaccardDissimilarity JacobiAmplitude Jacobian JacobiCD JacobiCN JacobiCS JacobiDC JacobiDN JacobiDS JacobiNC JacobiND JacobiNS JacobiP JacobiSC JacobiSD JacobiSN JacobiSymbol JacobiZeta JankoGroupJ1 JankoGroupJ2 JankoGroupJ3 JankoGroupJ4 JarqueBeraALMTest JohnsonDistribution Join Joined JoinedCurve JoinedCurveBox JoinForm JordanDecomposition JordanModelDecomposition K KagiChart KaiserBesselWindow KaiserWindow KalmanEstimator KalmanFilter KarhunenLoeveDecomposition KaryTree KatzCentrality KCoreComponents KDistribution KelvinBei KelvinBer KelvinKei KelvinKer KendallTau KendallTauTest KernelExecute KernelMixtureDistribution KernelObject Kernels Ket Khinchin KirchhoffGraph KirchhoffMatrix KleinInvariantJ KnightTourGraph KnotData KnownUnitQ KolmogorovSmirnovTest KroneckerDelta KroneckerModelDecomposition KroneckerProduct KroneckerSymbol KuiperTest KumaraswamyDistribution Kurtosis KuwaharaFilter Label Labeled LabeledSlider LabelingFunction LabelStyle LaguerreL LambdaComponents LambertW LanczosWindow LandauDistribution Language LanguageCategory LaplaceDistribution LaplaceTransform Laplacian LaplacianFilter LaplacianGaussianFilter Large Larger Last Latitude LatitudeLongitude LatticeData LatticeReduce Launch LaunchKernels LayeredGraphPlot LayerSizeFunction LayoutInformation LCM LeafCount LeapYearQ LeastSquares LeastSquaresFilterKernel Left LeftArrow LeftArrowBar LeftArrowRightArrow LeftDownTeeVector LeftDownVector LeftDownVectorBar LeftRightArrow LeftRightVector LeftTee LeftTeeArrow LeftTeeVector LeftTriangle LeftTriangleBar LeftTriangleEqual LeftUpDownVector LeftUpTeeVector LeftUpVector LeftUpVectorBar LeftVector LeftVectorBar LegendAppearance Legended LegendFunction LegendLabel LegendLayout LegendMargins LegendMarkers LegendMarkerSize LegendreP LegendreQ LegendreType Length LengthWhile LerchPhi Less LessEqual LessEqualGreater LessFullEqual LessGreater LessLess LessSlantEqual LessTilde LetterCharacter LetterQ Level LeveneTest LeviCivitaTensor LevyDistribution Lexicographic LibraryFunction LibraryFunctionError LibraryFunctionInformation LibraryFunctionLoad LibraryFunctionUnload LibraryLoad LibraryUnload LicenseID LiftingFilterData LiftingWaveletTransform LightBlue LightBrown LightCyan Lighter LightGray LightGreen Lighting LightingAngle LightMagenta LightOrange LightPink LightPurple LightRed LightSources LightYellow Likelihood Limit LimitsPositioning LimitsPositioningTokens LindleyDistribution Line Line3DBox LinearFilter LinearFractionalTransform LinearModelFit LinearOffsetFunction LinearProgramming LinearRecurrence LinearSolve LinearSolveFunction LineBox LineBreak LinebreakAdjustments LineBreakChart LineBreakWithin LineColor LineForm LineGraph LineIndent LineIndentMaxFraction LineIntegralConvolutionPlot LineIntegralConvolutionScale LineLegend LineOpacity LineSpacing LineWrapParts LinkActivate LinkClose LinkConnect LinkConnectedQ LinkCreate LinkError LinkFlush LinkFunction LinkHost LinkInterrupt LinkLaunch LinkMode LinkObject LinkOpen LinkOptions LinkPatterns LinkProtocol LinkRead LinkReadHeld LinkReadyQ Links LinkWrite LinkWriteHeld LiouvilleLambda List Listable ListAnimate ListContourPlot ListContourPlot3D ListConvolve ListCorrelate ListCurvePathPlot ListDeconvolve ListDensityPlot Listen ListFourierSequenceTransform ListInterpolation ListLineIntegralConvolutionPlot ListLinePlot ListLogLinearPlot ListLogLogPlot ListLogPlot ListPicker ListPickerBox ListPickerBoxBackground ListPickerBoxOptions ListPlay ListPlot ListPlot3D ListPointPlot3D ListPolarPlot ListQ ListStreamDensityPlot ListStreamPlot ListSurfacePlot3D ListVectorDensityPlot ListVectorPlot ListVectorPlot3D ListZTransform Literal LiteralSearch LocalClusteringCoefficient LocalizeVariables LocationEquivalenceTest LocationTest Locator LocatorAutoCreate LocatorBox LocatorBoxOptions LocatorCentering LocatorPane LocatorPaneBox LocatorPaneBoxOptions LocatorRegion Locked Log Log10 Log2 LogBarnesG LogGamma LogGammaDistribution LogicalExpand LogIntegral LogisticDistribution LogitModelFit LogLikelihood LogLinearPlot LogLogisticDistribution LogLogPlot LogMultinormalDistribution LogNormalDistribution LogPlot LogRankTest LogSeriesDistribution LongEqual Longest LongestAscendingSequence LongestCommonSequence LongestCommonSequencePositions LongestCommonSubsequence LongestCommonSubsequencePositions LongestMatch LongForm Longitude LongLeftArrow LongLeftRightArrow LongRightArrow Loopback LoopFreeGraphQ LowerCaseQ LowerLeftArrow LowerRightArrow LowerTriangularize LowpassFilter LQEstimatorGains LQGRegulator LQOutputRegulatorGains LQRegulatorGains LUBackSubstitution LucasL LuccioSamiComponents LUDecomposition LyapunovSolve LyonsGroupLy MachineID MachineName MachineNumberQ MachinePrecision MacintoshSystemPageSetup Magenta Magnification Magnify MainSolve MaintainDynamicCaches Majority MakeBoxes MakeExpression MakeRules MangoldtLambda ManhattanDistance Manipulate Manipulator MannWhitneyTest MantissaExponent Manual Map MapAll MapAt MapIndexed MAProcess MapThread MarcumQ MardiaCombinedTest MardiaKurtosisTest MardiaSkewnessTest MarginalDistribution MarkovProcessProperties Masking MatchingDissimilarity MatchLocalNameQ MatchLocalNames MatchQ Material MathematicaNotation MathieuC MathieuCharacteristicA MathieuCharacteristicB MathieuCharacteristicExponent MathieuCPrime MathieuGroupM11 MathieuGroupM12 MathieuGroupM22 MathieuGroupM23 MathieuGroupM24 MathieuS MathieuSPrime MathMLForm MathMLText Matrices MatrixExp MatrixForm MatrixFunction MatrixLog MatrixPlot MatrixPower MatrixQ MatrixRank Max MaxBend MaxDetect MaxExtraBandwidths MaxExtraConditions MaxFeatures MaxFilter Maximize MaxIterations MaxMemoryUsed MaxMixtureKernels MaxPlotPoints MaxPoints MaxRecursion MaxStableDistribution MaxStepFraction MaxSteps MaxStepSize MaxValue MaxwellDistribution McLaughlinGroupMcL Mean MeanClusteringCoefficient MeanDegreeConnectivity MeanDeviation MeanFilter MeanGraphDistance MeanNeighborDegree MeanShift MeanShiftFilter Median MedianDeviation MedianFilter Medium MeijerG MeixnerDistribution MemberQ MemoryConstrained MemoryInUse Menu MenuAppearance MenuCommandKey MenuEvaluator MenuItem MenuPacket MenuSortingValue MenuStyle MenuView MergeDifferences Mesh MeshFunctions MeshRange MeshShading MeshStyle Message MessageDialog MessageList MessageName MessageOptions MessagePacket Messages MessagesNotebook MetaCharacters MetaInformation Method MethodOptions MexicanHatWavelet MeyerWavelet Min MinDetect MinFilter MinimalPolynomial MinimalStateSpaceModel Minimize Minors MinRecursion MinSize MinStableDistribution Minus MinusPlus MinValue Missing MissingDataMethod MittagLefflerE MixedRadix MixedRadixQuantity MixtureDistribution Mod Modal Mode Modular ModularLambda Module Modulus MoebiusMu Moment Momentary MomentConvert MomentEvaluate MomentGeneratingFunction Monday Monitor MonomialList MonomialOrder MonsterGroupM MorletWavelet MorphologicalBinarize MorphologicalBranchPoints MorphologicalComponents MorphologicalEulerNumber MorphologicalGraph MorphologicalPerimeter MorphologicalTransform Most MouseAnnotation MouseAppearance MouseAppearanceTag MouseButtons Mouseover MousePointerNote MousePosition MovingAverage MovingMedian MoyalDistribution MultiedgeStyle MultilaunchWarning MultiLetterItalics MultiLetterStyle MultilineFunction Multinomial MultinomialDistribution MultinormalDistribution MultiplicativeOrder Multiplicity Multiselection MultivariateHypergeometricDistribution MultivariatePoissonDistribution MultivariateTDistribution N NakagamiDistribution NameQ Names NamespaceBox Nand NArgMax NArgMin NBernoulliB NCache NDSolve NDSolveValue Nearest NearestFunction NeedCurrentFrontEndPackagePacket NeedCurrentFrontEndSymbolsPacket NeedlemanWunschSimilarity Needs Negative NegativeBinomialDistribution NegativeMultinomialDistribution NeighborhoodGraph Nest NestedGreaterGreater NestedLessLess NestedScriptRules NestList NestWhile NestWhileList NevilleThetaC NevilleThetaD NevilleThetaN NevilleThetaS NewPrimitiveStyle NExpectation Next NextPrime NHoldAll NHoldFirst NHoldRest NicholsGridLines NicholsPlot NIntegrate NMaximize NMaxValue NMinimize NMinValue NominalVariables NonAssociative NoncentralBetaDistribution NoncentralChiSquareDistribution NoncentralFRatioDistribution NoncentralStudentTDistribution NonCommutativeMultiply NonConstants None NonlinearModelFit NonlocalMeansFilter NonNegative NonPositive Nor NorlundB Norm Normal NormalDistribution NormalGrouping Normalize NormalizedSquaredEuclideanDistance NormalsFunction NormFunction Not NotCongruent NotCupCap NotDoubleVerticalBar Notebook NotebookApply NotebookAutoSave NotebookClose NotebookConvertSettings NotebookCreate NotebookCreateReturnObject NotebookDefault NotebookDelete NotebookDirectory NotebookDynamicExpression NotebookEvaluate NotebookEventActions NotebookFileName NotebookFind NotebookFindReturnObject NotebookGet NotebookGetLayoutInformationPacket NotebookGetMisspellingsPacket NotebookInformation NotebookInterfaceObject NotebookLocate NotebookObject NotebookOpen NotebookOpenReturnObject NotebookPath NotebookPrint NotebookPut NotebookPutReturnObject NotebookRead NotebookResetGeneratedCells Notebooks NotebookSave NotebookSaveAs NotebookSelection NotebookSetupLayoutInformationPacket NotebooksMenu NotebookWrite NotElement NotEqualTilde NotExists NotGreater NotGreaterEqual NotGreaterFullEqual NotGreaterGreater NotGreaterLess NotGreaterSlantEqual NotGreaterTilde NotHumpDownHump NotHumpEqual NotLeftTriangle NotLeftTriangleBar NotLeftTriangleEqual NotLess NotLessEqual NotLessFullEqual NotLessGreater NotLessLess NotLessSlantEqual NotLessTilde NotNestedGreaterGreater NotNestedLessLess NotPrecedes NotPrecedesEqual NotPrecedesSlantEqual NotPrecedesTilde NotReverseElement NotRightTriangle NotRightTriangleBar NotRightTriangleEqual NotSquareSubset NotSquareSubsetEqual NotSquareSuperset NotSquareSupersetEqual NotSubset NotSubsetEqual NotSucceeds NotSucceedsEqual NotSucceedsSlantEqual NotSucceedsTilde NotSuperset NotSupersetEqual NotTilde NotTildeEqual NotTildeFullEqual NotTildeTilde NotVerticalBar NProbability NProduct NProductFactors NRoots NSolve NSum NSumTerms Null NullRecords NullSpace NullWords Number NumberFieldClassNumber NumberFieldDiscriminant NumberFieldFundamentalUnits NumberFieldIntegralBasis NumberFieldNormRepresentatives NumberFieldRegulator NumberFieldRootsOfUnity NumberFieldSignature NumberForm NumberFormat NumberMarks NumberMultiplier NumberPadding NumberPoint NumberQ NumberSeparator NumberSigns NumberString Numerator NumericFunction NumericQ NuttallWindow NValues NyquistGridLines NyquistPlot O ObservabilityGramian ObservabilityMatrix ObservableDecomposition ObservableModelQ OddQ Off Offset OLEData On ONanGroupON OneIdentity Opacity Open OpenAppend Opener OpenerBox OpenerBoxOptions OpenerView OpenFunctionInspectorPacket Opening OpenRead OpenSpecialOptions OpenTemporary OpenWrite Operate OperatingSystem OptimumFlowData Optional OptionInspectorSettings OptionQ Options OptionsPacket OptionsPattern OptionValue OptionValueBox OptionValueBoxOptions Or Orange Order OrderDistribution OrderedQ Ordering Orderless OrnsteinUhlenbeckProcess Orthogonalize Out Outer OutputAutoOverwrite OutputControllabilityMatrix OutputControllableModelQ OutputForm OutputFormData OutputGrouping OutputMathEditExpression OutputNamePacket OutputResponse OutputSizeLimit OutputStream Over OverBar OverDot Overflow OverHat Overlaps Overlay OverlayBox OverlayBoxOptions Overscript OverscriptBox OverscriptBoxOptions OverTilde OverVector OwenT OwnValues PackingMethod PaddedForm Padding PadeApproximant PadLeft PadRight PageBreakAbove PageBreakBelow PageBreakWithin PageFooterLines PageFooters PageHeaderLines PageHeaders PageHeight PageRankCentrality PageWidth PairedBarChart PairedHistogram PairedSmoothHistogram PairedTTest PairedZTest PaletteNotebook PalettePath Pane PaneBox PaneBoxOptions Panel PanelBox PanelBoxOptions Paneled PaneSelector PaneSelectorBox PaneSelectorBoxOptions PaperWidth ParabolicCylinderD ParagraphIndent ParagraphSpacing ParallelArray ParallelCombine ParallelDo ParallelEvaluate Parallelization Parallelize ParallelMap ParallelNeeds ParallelProduct ParallelSubmit ParallelSum ParallelTable ParallelTry Parameter ParameterEstimator ParameterMixtureDistribution ParameterVariables ParametricFunction ParametricNDSolve ParametricNDSolveValue ParametricPlot ParametricPlot3D ParentConnect ParentDirectory ParentForm Parenthesize ParentList ParetoDistribution Part PartialCorrelationFunction PartialD ParticleData Partition PartitionsP PartitionsQ ParzenWindow PascalDistribution PassEventsDown PassEventsUp Paste PasteBoxFormInlineCells PasteButton Path PathGraph PathGraphQ Pattern PatternSequence PatternTest PauliMatrix PaulWavelet Pause PausedTime PDF PearsonChiSquareTest PearsonCorrelationTest PearsonDistribution PerformanceGoal PeriodicInterpolation Periodogram PeriodogramArray PermutationCycles PermutationCyclesQ PermutationGroup PermutationLength PermutationList PermutationListQ PermutationMax PermutationMin PermutationOrder PermutationPower PermutationProduct PermutationReplace Permutations PermutationSupport Permute PeronaMalikFilter Perpendicular PERTDistribution PetersenGraph PhaseMargins Pi Pick PIDData PIDDerivativeFilter PIDFeedforward PIDTune Piecewise PiecewiseExpand PieChart PieChart3D PillaiTrace PillaiTraceTest Pink Pivoting PixelConstrained PixelValue PixelValuePositions Placed Placeholder PlaceholderReplace Plain PlanarGraphQ Play PlayRange Plot Plot3D Plot3Matrix PlotDivision PlotJoined PlotLabel PlotLayout PlotLegends PlotMarkers PlotPoints PlotRange PlotRangeClipping PlotRangePadding PlotRegion PlotStyle Plus PlusMinus Pochhammer PodStates PodWidth Point Point3DBox PointBox PointFigureChart PointForm PointLegend PointSize PoissonConsulDistribution PoissonDistribution PoissonProcess PoissonWindow PolarAxes PolarAxesOrigin PolarGridLines PolarPlot PolarTicks PoleZeroMarkers PolyaAeppliDistribution PolyGamma Polygon Polygon3DBox Polygon3DBoxOptions PolygonBox PolygonBoxOptions PolygonHoleScale PolygonIntersections PolygonScale PolyhedronData PolyLog PolynomialExtendedGCD PolynomialForm PolynomialGCD PolynomialLCM PolynomialMod PolynomialQ PolynomialQuotient PolynomialQuotientRemainder PolynomialReduce PolynomialRemainder Polynomials PopupMenu PopupMenuBox PopupMenuBoxOptions PopupView PopupWindow Position Positive PositiveDefiniteMatrixQ PossibleZeroQ Postfix PostScript Power PowerDistribution PowerExpand PowerMod PowerModList PowerSpectralDensity PowersRepresentations PowerSymmetricPolynomial Precedence PrecedenceForm Precedes PrecedesEqual PrecedesSlantEqual PrecedesTilde Precision PrecisionGoal PreDecrement PredictionRoot PreemptProtect PreferencesPath Prefix PreIncrement Prepend PrependTo PreserveImageOptions Previous PriceGraphDistribution PrimaryPlaceholder Prime PrimeNu PrimeOmega PrimePi PrimePowerQ PrimeQ Primes PrimeZetaP PrimitiveRoot PrincipalComponents PrincipalValue Print PrintAction PrintForm PrintingCopies PrintingOptions PrintingPageRange PrintingStartingPageNumber PrintingStyleEnvironment PrintPrecision PrintTemporary Prism PrismBox PrismBoxOptions PrivateCellOptions PrivateEvaluationOptions PrivateFontOptions PrivateFrontEndOptions PrivateNotebookOptions PrivatePaths Probability ProbabilityDistribution ProbabilityPlot ProbabilityPr ProbabilityScalePlot ProbitModelFit ProcessEstimator ProcessParameterAssumptions ProcessParameterQ ProcessStateDomain ProcessTimeDomain Product ProductDistribution ProductLog ProgressIndicator ProgressIndicatorBox ProgressIndicatorBoxOptions Projection Prolog PromptForm Properties Property PropertyList PropertyValue Proportion Proportional Protect Protected ProteinData Pruning PseudoInverse Purple Put PutAppend Pyramid PyramidBox PyramidBoxOptions QBinomial QFactorial QGamma QHypergeometricPFQ QPochhammer QPolyGamma QRDecomposition QuadraticIrrationalQ Quantile QuantilePlot Quantity QuantityForm QuantityMagnitude QuantityQ QuantityUnit Quartics QuartileDeviation Quartiles QuartileSkewness QueueingNetworkProcess QueueingProcess QueueProperties Quiet Quit Quotient QuotientRemainder RadialityCentrality RadicalBox RadicalBoxOptions RadioButton RadioButtonBar RadioButtonBox RadioButtonBoxOptions Radon RamanujanTau RamanujanTauL RamanujanTauTheta RamanujanTauZ Random RandomChoice RandomComplex RandomFunction RandomGraph RandomImage RandomInteger RandomPermutation RandomPrime RandomReal RandomSample RandomSeed RandomVariate RandomWalkProcess Range RangeFilter RangeSpecification RankedMax RankedMin Raster Raster3D Raster3DBox Raster3DBoxOptions RasterArray RasterBox RasterBoxOptions Rasterize RasterSize Rational RationalFunctions Rationalize Rationals Ratios Raw RawArray RawBoxes RawData RawMedium RayleighDistribution Re Read ReadList ReadProtected Real RealBlockDiagonalForm RealDigits RealExponent Reals Reap Record RecordLists RecordSeparators Rectangle RectangleBox RectangleBoxOptions RectangleChart RectangleChart3D RecurrenceFilter RecurrenceTable RecurringDigitsForm Red Reduce RefBox ReferenceLineStyle ReferenceMarkers ReferenceMarkerStyle Refine ReflectionMatrix ReflectionTransform Refresh RefreshRate RegionBinarize RegionFunction RegionPlot RegionPlot3D RegularExpression Regularization Reinstall Release ReleaseHold ReliabilityDistribution ReliefImage ReliefPlot Remove RemoveAlphaChannel RemoveAsynchronousTask Removed RemoveInputStreamMethod RemoveOutputStreamMethod RemoveProperty RemoveScheduledTask RenameDirectory RenameFile RenderAll RenderingOptions RenewalProcess RenkoChart Repeated RepeatedNull RepeatedString Replace ReplaceAll ReplaceHeldPart ReplaceImageValue ReplaceList ReplacePart ReplacePixelValue ReplaceRepeated Resampling Rescale RescalingTransform ResetDirectory ResetMenusPacket ResetScheduledTask Residue Resolve Rest Resultant ResumePacket Return ReturnExpressionPacket ReturnInputFormPacket ReturnPacket ReturnTextPacket Reverse ReverseBiorthogonalSplineWavelet ReverseElement ReverseEquilibrium ReverseGraph ReverseUpEquilibrium RevolutionAxis RevolutionPlot3D RGBColor RiccatiSolve RiceDistribution RidgeFilter RiemannR RiemannSiegelTheta RiemannSiegelZ Riffle Right RightArrow RightArrowBar RightArrowLeftArrow RightCosetRepresentative RightDownTeeVector RightDownVector RightDownVectorBar RightTee RightTeeArrow RightTeeVector RightTriangle RightTriangleBar RightTriangleEqual RightUpDownVector RightUpTeeVector RightUpVector RightUpVectorBar RightVector RightVectorBar RiskAchievementImportance RiskReductionImportance RogersTanimotoDissimilarity Root RootApproximant RootIntervals RootLocusPlot RootMeanSquare RootOfUnityQ RootReduce Roots RootSum Rotate RotateLabel RotateLeft RotateRight RotationAction RotationBox RotationBoxOptions RotationMatrix RotationTransform Round RoundImplies RoundingRadius Row RowAlignments RowBackgrounds RowBox RowHeights RowLines RowMinHeight RowReduce RowsEqual RowSpacings RSolve RudvalisGroupRu Rule RuleCondition RuleDelayed RuleForm RulerUnits Run RunScheduledTask RunThrough RuntimeAttributes RuntimeOptions RussellRaoDissimilarity SameQ SameTest SampleDepth SampledSoundFunction SampledSoundList SampleRate SamplingPeriod SARIMAProcess SARMAProcess SatisfiabilityCount SatisfiabilityInstances SatisfiableQ Saturday Save Saveable SaveAutoDelete SaveDefinitions SawtoothWave Scale Scaled ScaleDivisions ScaledMousePosition ScaleOrigin ScalePadding ScaleRanges ScaleRangeStyle ScalingFunctions ScalingMatrix ScalingTransform Scan ScheduledTaskActiveQ ScheduledTaskData ScheduledTaskObject ScheduledTasks SchurDecomposition ScientificForm ScreenRectangle ScreenStyleEnvironment ScriptBaselineShifts ScriptLevel ScriptMinSize ScriptRules ScriptSizeMultipliers Scrollbars ScrollingOptions ScrollPosition Sec Sech SechDistribution SectionGrouping SectorChart SectorChart3D SectorOrigin SectorSpacing SeedRandom Select Selectable SelectComponents SelectedCells SelectedNotebook Selection SelectionAnimate SelectionCell SelectionCellCreateCell SelectionCellDefaultStyle SelectionCellParentStyle SelectionCreateCell SelectionDebuggerTag SelectionDuplicateCell SelectionEvaluate SelectionEvaluateCreateCell SelectionMove SelectionPlaceholder SelectionSetStyle SelectWithContents SelfLoops SelfLoopStyle SemialgebraicComponentInstances SendMail Sequence SequenceAlignment SequenceForm SequenceHold SequenceLimit Series SeriesCoefficient SeriesData SessionTime Set SetAccuracy SetAlphaChannel SetAttributes Setbacks SetBoxFormNamesPacket SetDelayed SetDirectory SetEnvironment SetEvaluationNotebook SetFileDate SetFileLoadingContext SetNotebookStatusLine SetOptions SetOptionsPacket SetPrecision SetProperty SetSelectedNotebook SetSharedFunction SetSharedVariable SetSpeechParametersPacket SetStreamPosition SetSystemOptions Setter SetterBar SetterBox SetterBoxOptions Setting SetValue Shading Shallow ShannonWavelet ShapiroWilkTest Share Sharpen ShearingMatrix ShearingTransform ShenCastanMatrix Short ShortDownArrow Shortest ShortestMatch ShortestPathFunction ShortLeftArrow ShortRightArrow ShortUpArrow Show ShowAutoStyles ShowCellBracket ShowCellLabel ShowCellTags ShowClosedCellArea ShowContents ShowControls ShowCursorTracker ShowGroupOpenCloseIcon ShowGroupOpener ShowInvisibleCharacters ShowPageBreaks ShowPredictiveInterface ShowSelection ShowShortBoxForm ShowSpecialCharacters ShowStringCharacters ShowSyntaxStyles ShrinkingDelay ShrinkWrapBoundingBox SiegelTheta SiegelTukeyTest Sign Signature SignedRankTest SignificanceLevel SignPadding SignTest SimilarityRules SimpleGraph SimpleGraphQ Simplify Sin Sinc SinghMaddalaDistribution SingleEvaluation SingleLetterItalics SingleLetterStyle SingularValueDecomposition SingularValueList SingularValuePlot SingularValues Sinh SinhIntegral SinIntegral SixJSymbol Skeleton SkeletonTransform SkellamDistribution Skewness SkewNormalDistribution Skip SliceDistribution Slider Slider2D Slider2DBox Slider2DBoxOptions SliderBox SliderBoxOptions SlideView Slot SlotSequence Small SmallCircle Smaller SmithDelayCompensator SmithWatermanSimilarity SmoothDensityHistogram SmoothHistogram SmoothHistogram3D SmoothKernelDistribution SocialMediaData Socket SokalSneathDissimilarity Solve SolveAlways SolveDelayed Sort SortBy Sound SoundAndGraphics SoundNote SoundVolume Sow Space SpaceForm Spacer Spacings Span SpanAdjustments SpanCharacterRounding SpanFromAbove SpanFromBoth SpanFromLeft SpanLineThickness SpanMaxSize SpanMinSize SpanningCharacters SpanSymmetric SparseArray SpatialGraphDistribution Speak SpeakTextPacket SpearmanRankTest SpearmanRho Spectrogram SpectrogramArray Specularity SpellingCorrection SpellingDictionaries SpellingDictionariesPath SpellingOptions SpellingSuggestionsPacket Sphere SphereBox SphericalBesselJ SphericalBesselY SphericalHankelH1 SphericalHankelH2 SphericalHarmonicY SphericalPlot3D SphericalRegion SpheroidalEigenvalue SpheroidalJoiningFactor SpheroidalPS SpheroidalPSPrime SpheroidalQS SpheroidalQSPrime SpheroidalRadialFactor SpheroidalS1 SpheroidalS1Prime SpheroidalS2 SpheroidalS2Prime Splice SplicedDistribution SplineClosed SplineDegree SplineKnots SplineWeights Split SplitBy SpokenString Sqrt SqrtBox SqrtBoxOptions Square SquaredEuclideanDistance SquareFreeQ SquareIntersection SquaresR SquareSubset SquareSubsetEqual SquareSuperset SquareSupersetEqual SquareUnion SquareWave StabilityMargins StabilityMarginsStyle StableDistribution Stack StackBegin StackComplete StackInhibit StandardDeviation StandardDeviationFilter StandardForm Standardize StandbyDistribution Star StarGraph StartAsynchronousTask StartingStepSize StartOfLine StartOfString StartScheduledTask StartupSound StateDimensions StateFeedbackGains StateOutputEstimator StateResponse StateSpaceModel StateSpaceRealization StateSpaceTransform StationaryDistribution StationaryWaveletPacketTransform StationaryWaveletTransform StatusArea StatusCentrality StepMonitor StieltjesGamma StirlingS1 StirlingS2 StopAsynchronousTask StopScheduledTask StrataVariables StratonovichProcess StreamColorFunction StreamColorFunctionScaling StreamDensityPlot StreamPlot StreamPoints StreamPosition Streams StreamScale StreamStyle String StringBreak StringByteCount StringCases StringCount StringDrop StringExpression StringForm StringFormat StringFreeQ StringInsert StringJoin StringLength StringMatchQ StringPosition StringQ StringReplace StringReplaceList StringReplacePart StringReverse StringRotateLeft StringRotateRight StringSkeleton StringSplit StringTake StringToStream StringTrim StripBoxes StripOnInput StripWrapperBoxes StrokeForm StructuralImportance StructuredArray StructuredSelection StruveH StruveL Stub StudentTDistribution Style StyleBox StyleBoxAutoDelete StyleBoxOptions StyleData StyleDefinitions StyleForm StyleKeyMapping StyleMenuListing StyleNameDialogSettings StyleNames StylePrint StyleSheetPath Subfactorial Subgraph SubMinus SubPlus SubresultantPolynomialRemainders SubresultantPolynomials Subresultants Subscript SubscriptBox SubscriptBoxOptions Subscripted Subset SubsetEqual Subsets SubStar Subsuperscript SubsuperscriptBox SubsuperscriptBoxOptions Subtract SubtractFrom SubValues Succeeds SucceedsEqual SucceedsSlantEqual SucceedsTilde SuchThat Sum SumConvergence Sunday SuperDagger SuperMinus SuperPlus Superscript SuperscriptBox SuperscriptBoxOptions Superset SupersetEqual SuperStar Surd SurdForm SurfaceColor SurfaceGraphics SurvivalDistribution SurvivalFunction SurvivalModel SurvivalModelFit SuspendPacket SuzukiDistribution SuzukiGroupSuz SwatchLegend Switch Symbol SymbolName SymletWavelet Symmetric SymmetricGroup SymmetricMatrixQ SymmetricPolynomial SymmetricReduction Symmetrize SymmetrizedArray SymmetrizedArrayRules SymmetrizedDependentComponents SymmetrizedIndependentComponents SymmetrizedReplacePart SynchronousInitialization SynchronousUpdating Syntax SyntaxForm SyntaxInformation SyntaxLength SyntaxPacket SyntaxQ SystemDialogInput SystemException SystemHelpPath SystemInformation SystemInformationData SystemOpen SystemOptions SystemsModelDelay SystemsModelDelayApproximate SystemsModelDelete SystemsModelDimensions SystemsModelExtract SystemsModelFeedbackConnect SystemsModelLabels SystemsModelOrder SystemsModelParallelConnect SystemsModelSeriesConnect SystemsModelStateFeedbackConnect SystemStub Tab TabFilling Table TableAlignments TableDepth TableDirections TableForm TableHeadings TableSpacing TableView TableViewBox TabSpacings TabView TabViewBox TabViewBoxOptions TagBox TagBoxNote TagBoxOptions TaggingRules TagSet TagSetDelayed TagStyle TagUnset Take TakeWhile Tally Tan Tanh TargetFunctions TargetUnits TautologyQ TelegraphProcess TemplateBox TemplateBoxOptions TemplateSlotSequence TemporalData Temporary TemporaryVariable TensorContract TensorDimensions TensorExpand TensorProduct TensorQ TensorRank TensorReduce TensorSymmetry TensorTranspose TensorWedge Tetrahedron TetrahedronBox TetrahedronBoxOptions TeXForm TeXSave Text Text3DBox Text3DBoxOptions TextAlignment TextBand TextBoundingBox TextBox TextCell TextClipboardType TextData TextForm TextJustification TextLine TextPacket TextParagraph TextRecognize TextRendering TextStyle Texture TextureCoordinateFunction TextureCoordinateScaling Therefore ThermometerGauge Thick Thickness Thin Thinning ThisLink ThompsonGroupTh Thread ThreeJSymbol Threshold Through Throw Thumbnail Thursday Ticks TicksStyle Tilde TildeEqual TildeFullEqual TildeTilde TimeConstrained TimeConstraint Times TimesBy TimeSeriesForecast TimeSeriesInvertibility TimeUsed TimeValue TimeZone Timing Tiny TitleGrouping TitsGroupT ToBoxes ToCharacterCode ToColor ToContinuousTimeModel ToDate ToDiscreteTimeModel ToeplitzMatrix ToExpression ToFileName Together Toggle ToggleFalse Toggler TogglerBar TogglerBox TogglerBoxOptions ToHeldExpression ToInvertibleTimeSeries TokenWords Tolerance ToLowerCase ToNumberField TooBig Tooltip TooltipBox TooltipBoxOptions TooltipDelay TooltipStyle Top TopHatTransform TopologicalSort ToRadicals ToRules ToString Total TotalHeight TotalVariationFilter TotalWidth TouchscreenAutoZoom TouchscreenControlPlacement ToUpperCase Tr Trace TraceAbove TraceAction TraceBackward TraceDepth TraceDialog TraceForward TraceInternal TraceLevel TraceOff TraceOn TraceOriginal TracePrint TraceScan TrackedSymbols TradingChart TraditionalForm TraditionalFunctionNotation TraditionalNotation TraditionalOrder TransferFunctionCancel TransferFunctionExpand TransferFunctionFactor TransferFunctionModel TransferFunctionPoles TransferFunctionTransform TransferFunctionZeros TransformationFunction TransformationFunctions TransformationMatrix TransformedDistribution TransformedField Translate TranslationTransform TransparentColor Transpose TreeForm TreeGraph TreeGraphQ TreePlot TrendStyle TriangleWave TriangularDistribution Trig TrigExpand TrigFactor TrigFactorList Trigger TrigReduce TrigToExp TrimmedMean True TrueQ TruncatedDistribution TsallisQExponentialDistribution TsallisQGaussianDistribution TTest Tube TubeBezierCurveBox TubeBezierCurveBoxOptions TubeBox TubeBSplineCurveBox TubeBSplineCurveBoxOptions Tuesday TukeyLambdaDistribution TukeyWindow Tuples TuranGraph TuringMachine Transparent UnateQ Uncompress Undefined UnderBar Underflow Underlined Underoverscript UnderoverscriptBox UnderoverscriptBoxOptions Underscript UnderscriptBox UnderscriptBoxOptions UndirectedEdge UndirectedGraph UndirectedGraphQ UndocumentedTestFEParserPacket UndocumentedTestGetSelectionPacket Unequal Unevaluated UniformDistribution UniformGraphDistribution UniformSumDistribution Uninstall Union UnionPlus Unique UnitBox UnitConvert UnitDimensions Unitize UnitRootTest UnitSimplify UnitStep UnitTriangle UnitVector Unprotect UnsameQ UnsavedVariables Unset UnsetShared UntrackedVariables Up UpArrow UpArrowBar UpArrowDownArrow Update UpdateDynamicObjects UpdateDynamicObjectsSynchronous UpdateInterval UpDownArrow UpEquilibrium UpperCaseQ UpperLeftArrow UpperRightArrow UpperTriangularize Upsample UpSet UpSetDelayed UpTee UpTeeArrow UpValues URL URLFetch URLFetchAsynchronous URLSave URLSaveAsynchronous UseGraphicsRange Using UsingFrontEnd V2Get ValidationLength Value ValueBox ValueBoxOptions ValueForm ValueQ ValuesData Variables Variance VarianceEquivalenceTest VarianceEstimatorFunction VarianceGammaDistribution VarianceTest VectorAngle VectorColorFunction VectorColorFunctionScaling VectorDensityPlot VectorGlyphData VectorPlot VectorPlot3D VectorPoints VectorQ Vectors VectorScale VectorStyle Vee Verbatim Verbose VerboseConvertToPostScriptPacket VerifyConvergence VerifySolutions VerifyTestAssumptions Version VersionNumber VertexAdd VertexCapacity VertexColors VertexComponent VertexConnectivity VertexCoordinateRules VertexCoordinates VertexCorrelationSimilarity VertexCosineSimilarity VertexCount VertexCoverQ VertexDataCoordinates VertexDegree VertexDelete VertexDiceSimilarity VertexEccentricity VertexInComponent VertexInDegree VertexIndex VertexJaccardSimilarity VertexLabeling VertexLabels VertexLabelStyle VertexList VertexNormals VertexOutComponent VertexOutDegree VertexQ VertexRenderingFunction VertexReplace VertexShape VertexShapeFunction VertexSize VertexStyle VertexTextureCoordinates VertexWeight Vertical VerticalBar VerticalForm VerticalGauge VerticalSeparator VerticalSlider VerticalTilde ViewAngle ViewCenter ViewMatrix ViewPoint ViewPointSelectorSettings ViewPort ViewRange ViewVector ViewVertical VirtualGroupData Visible VisibleCell VoigtDistribution VonMisesDistribution WaitAll WaitAsynchronousTask WaitNext WaitUntil WakebyDistribution WalleniusHypergeometricDistribution WaringYuleDistribution WatershedComponents WatsonUSquareTest WattsStrogatzGraphDistribution WaveletBestBasis WaveletFilterCoefficients WaveletImagePlot WaveletListPlot WaveletMapIndexed WaveletMatrixPlot WaveletPhi WaveletPsi WaveletScale WaveletScalogram WaveletThreshold WeaklyConnectedComponents WeaklyConnectedGraphQ WeakStationarity WeatherData WeberE Wedge Wednesday WeibullDistribution WeierstrassHalfPeriods WeierstrassInvariants WeierstrassP WeierstrassPPrime WeierstrassSigma WeierstrassZeta WeightedAdjacencyGraph WeightedAdjacencyMatrix WeightedData WeightedGraphQ Weights WelchWindow WheelGraph WhenEvent Which While White Whitespace WhitespaceCharacter WhittakerM WhittakerW WienerFilter WienerProcess WignerD WignerSemicircleDistribution WilksW WilksWTest WindowClickSelect WindowElements WindowFloating WindowFrame WindowFrameElements WindowMargins WindowMovable WindowOpacity WindowSelected WindowSize WindowStatusArea WindowTitle WindowToolbars WindowWidth With WolframAlpha WolframAlphaDate WolframAlphaQuantity WolframAlphaResult Word WordBoundary WordCharacter WordData WordSearch WordSeparators WorkingPrecision Write WriteString Wronskian XMLElement XMLObject Xnor Xor Yellow YuleDissimilarity ZernikeR ZeroSymmetric ZeroTest ZeroWidthTimes Zeta ZetaZero ZipfDistribution ZTest ZTransform $Aborted $ActivationGroupID $ActivationKey $ActivationUserRegistered $AddOnsDirectory $AssertFunction $Assumptions $AsynchronousTask $BaseDirectory $BatchInput $BatchOutput $BoxForms $ByteOrdering $Canceled $CharacterEncoding $CharacterEncodings $CommandLine $CompilationTarget $ConditionHold $ConfiguredKernels $Context $ContextPath $ControlActiveSetting $CreationDate $CurrentLink $DateStringFormat $DefaultFont $DefaultFrontEnd $DefaultImagingDevice $DefaultPath $Display $DisplayFunction $DistributedContexts $DynamicEvaluation $Echo $Epilog $ExportFormats $Failed $FinancialDataSource $FormatType $FrontEnd $FrontEndSession $GeoLocation $HistoryLength $HomeDirectory $HTTPCookies $IgnoreEOF $ImagingDevices $ImportFormats $InitialDirectory $Input $InputFileName $InputStreamMethods $Inspector $InstallationDate $InstallationDirectory $InterfaceEnvironment $IterationLimit $KernelCount $KernelID $Language $LaunchDirectory $LibraryPath $LicenseExpirationDate $LicenseID $LicenseProcesses $LicenseServer $LicenseSubprocesses $LicenseType $Line $Linked $LinkSupported $LoadedFiles $MachineAddresses $MachineDomain $MachineDomains $MachineEpsilon $MachineID $MachineName $MachinePrecision $MachineType $MaxExtraPrecision $MaxLicenseProcesses $MaxLicenseSubprocesses $MaxMachineNumber $MaxNumber $MaxPiecewiseCases $MaxPrecision $MaxRootDegree $MessageGroups $MessageList $MessagePrePrint $Messages $MinMachineNumber $MinNumber $MinorReleaseNumber $MinPrecision $ModuleNumber $NetworkLicense $NewMessage $NewSymbol $Notebooks $NumberMarks $Off $OperatingSystem $Output $OutputForms $OutputSizeLimit $OutputStreamMethods $Packages $ParentLink $ParentProcessID $PasswordFile $PatchLevelID $Path $PathnameSeparator $PerformanceGoal $PipeSupported $Post $Pre $PreferencesDirectory $PrePrint $PreRead $PrintForms $PrintLiteral $ProcessID $ProcessorCount $ProcessorType $ProductInformation $ProgramName $RandomState $RecursionLimit $ReleaseNumber $RootDirectory $ScheduledTask $ScriptCommandLine $SessionID $SetParentLink $SharedFunctions $SharedVariables $SoundDisplay $SoundDisplayFunction $SuppressInputFormHeads $SynchronousEvaluation $SyntaxHandler $System $SystemCharacterEncoding $SystemID $SystemWordLength $TemporaryDirectory $TemporaryPrefix $TextStyle $TimedOut $TimeUnit $TimeZone $TopDirectory $TraceOff $TraceOn $TracePattern $TracePostAction $TracePreAction $Urgent $UserAddOnsDirectory $UserBaseDirectory $UserDocumentsDirectory $UserName $Version $VersionNumber", +c:[{cN:"comment",b:/\(\*/,e:/\*\)/},e.ASM,e.QSM,e.CNM,{cN:"list",b:/\{/,e:/\}/,i:/:/}]}});hljs.registerLanguage("fsharp",function(e){var t={b:"<",e:">",c:[e.inherit(e.TM,{b:/'[a-zA-Z0-9_]+/})]};return{aliases:["fs"],k:"yield! return! let! do!abstract and as assert base begin class default delegate do done downcast downto elif else end exception extern false finally for fun function global if in inherit inline interface internal lazy let match member module mutable namespace new null of open or override private public rec return sig static struct then to true try type upcast use val void when while with yield",c:[{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},{cN:"string",b:'"""',e:'"""'},e.C("\\(\\*","\\*\\)"),{cN:"class",bK:"type",e:"\\(|=|$",eE:!0,c:[e.UTM,t]},{cN:"annotation",b:"\\[<",e:">\\]",r:10},{cN:"attribute",b:"\\B('[A-Za-z])\\b",c:[e.BE]},e.CLCM,e.inherit(e.QSM,{i:null}),e.CNM]}});hljs.registerLanguage("verilog",function(e){return{aliases:["v"],cI:!0,k:{keyword:"always and assign begin buf bufif0 bufif1 case casex casez cmos deassign default defparam disable edge else end endcase endfunction endmodule endprimitive endspecify endtable endtask event for force forever fork function if ifnone initial inout input join macromodule module nand negedge nmos nor not notif0 notif1 or output parameter pmos posedge primitive pulldown pullup rcmos release repeat rnmos rpmos rtran rtranif0 rtranif1 specify specparam table task timescale tran tranif0 tranif1 wait while xnor xor",typename:"highz0 highz1 integer large medium pull0 pull1 real realtime reg scalared signed small strong0 strong1 supply0 supply0 supply1 supply1 time tri tri0 tri1 triand trior trireg vectored wand weak0 weak1 wire wor"},c:[e.CBCM,e.CLCM,e.QSM,{cN:"number",b:"\\b(\\d+'(b|h|o|d|B|H|O|D))?[0-9xzXZ]+",c:[e.BE],r:0},{cN:"typename",b:"\\.\\w+",r:0},{cN:"value",b:"#\\((?!parameter).+\\)"},{cN:"keyword",b:"\\+|-|\\*|/|%|<|>|=|#|`|\\!|&|\\||@|:|\\^|~|\\{|\\}",r:0}]}});hljs.registerLanguage("dos",function(e){var r=e.C(/@?rem\b/,/$/,{r:10}),t={cN:"label",b:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)",r:0};return{aliases:["bat","cmd"],cI:!0,k:{flow:"if else goto for in do call exit not exist errorlevel defined",operator:"equ neq lss leq gtr geq",keyword:"shift cd dir echo setlocal endlocal set pause copy",stream:"prn nul lpt3 lpt2 lpt1 con com4 com3 com2 com1 aux",winutils:"ping net ipconfig taskkill xcopy ren del",built_in:"append assoc at attrib break cacls cd chcp chdir chkdsk chkntfs cls cmd color comp compact convert date dir diskcomp diskcopy doskey erase fs find findstr format ftype graftabl help keyb label md mkdir mode more move path pause print popd pushd promt rd recover rem rename replace restore rmdir shiftsort start subst time title tree type ver verify vol"},c:[{cN:"envvar",b:/%%[^ ]|%[^ ]+?%|![^ ]+?!/},{cN:"function",b:t.b,e:"goto:eof",c:[e.inherit(e.TM,{b:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),r]},{cN:"number",b:"\\b\\d+",r:0},r]}});hljs.registerLanguage("gherkin",function(e){return{aliases:["feature"],k:"Feature Background Ability Business Need Scenario Scenarios Scenario Outline Scenario Template Examples Given And Then But When",c:[{cN:"keyword",b:"\\*"},e.C("@[^@\r\n ]+","$"),{cN:"string",b:"\\|",e:"\\$"},{cN:"variable",b:"<",e:">"},e.HCM,{cN:"string",b:'"""',e:'"""'},e.QSM]}});hljs.registerLanguage("xml",function(t){var e="[A-Za-z0-9\\._:-]+",s={b:/<\?(php)?(?!\w)/,e:/\?>/,sL:"php",subLanguageMode:"continuous"},c={eW:!0,i:/]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xsl","plist"],cI:!0,c:[{cN:"doctype",b:"",r:10,c:[{b:"\\[",e:"\\]"}]},t.C("",{r:10}),{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"|$)",e:">",k:{title:"style"},c:[c],starts:{e:"",rE:!0,sL:"css"}},{cN:"tag",b:"|$)",e:">",k:{title:"script"},c:[c],starts:{e:"",rE:!0,sL:""}},s,{cN:"pi",b:/<\?\w+/,e:/\?>/,r:10},{cN:"tag",b:"",c:[{cN:"title",b:/[^ \/><\n\t]+/,r:0},c]}]}});hljs.registerLanguage("autohotkey",function(e){var r={cN:"escape",b:"`[\\s\\S]"},c=e.C(";","$",{r:0}),n=[{cN:"built_in",b:"A_[a-zA-Z0-9]+"},{cN:"built_in",bK:"ComSpec Clipboard ClipboardAll ErrorLevel"}];return{cI:!0,k:{keyword:"Break Continue Else Gosub If Loop Return While",literal:"A true false NOT AND OR"},c:n.concat([r,e.inherit(e.QSM,{c:[r]}),c,{cN:"number",b:e.NR,r:0},{cN:"var_expand",b:"%",e:"%",i:"\\n",c:[r]},{cN:"label",c:[r],v:[{b:'^[^\\n";]+::(?!=)'},{b:'^[^\\n";]+:(?!=)',r:0}]},{b:",\\s*,",r:10}])}});hljs.registerLanguage("r",function(e){var r="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{c:[e.HCM,{b:r,l:r,k:{keyword:"function if in break next repeat else for return switch while try tryCatch stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},r:0},{cN:"number",b:"0[xX][0-9a-fA-F]+[Li]?\\b",r:0},{cN:"number",b:"\\d+(?:[eE][+\\-]?\\d*)?L\\b",r:0},{cN:"number",b:"\\d+\\.(?!\\d)(?:i\\b)?",r:0},{cN:"number",b:"\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",r:0},{cN:"number",b:"\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",r:0},{b:"`",e:"`",r:0},{cN:"string",c:[e.BE],v:[{b:'"',e:'"'},{b:"'",e:"'"}]}]}});hljs.registerLanguage("cs",function(e){var r="abstract as base bool break byte case catch char checked const continue decimal dynamic default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long null when object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this true try typeof uint ulong unchecked unsafe ushort using virtual volatile void while async protected public private internal ascending descending from get group into join let orderby partial select set value var where yield",t=e.IR+"(<"+e.IR+">)?";return{aliases:["csharp"],k:r,i:/::/,c:[e.C("///","$",{rB:!0,c:[{cN:"xmlDocTag",v:[{b:"///",r:0},{b:""},{b:""}]}]}),e.CLCM,e.CBCM,{cN:"preprocessor",b:"#",e:"$",k:"if else elif endif define undef warning error line region endregion pragma checksum"},{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},e.ASM,e.QSM,e.CNM,{bK:"class namespace interface",e:/[{;=]/,i:/[^\s:]/,c:[e.TM,e.CLCM,e.CBCM]},{bK:"new return throw await",r:0},{cN:"function",b:"("+t+"\\s+)+"+e.IR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:r,c:[{b:e.IR+"\\s*\\(",rB:!0,c:[e.TM],r:0},{cN:"params",b:/\(/,e:/\)/,k:r,r:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]}]}});hljs.registerLanguage("nsis",function(e){var t={cN:"symbol",b:"\\$(ADMINTOOLS|APPDATA|CDBURN_AREA|CMDLINE|COMMONFILES32|COMMONFILES64|COMMONFILES|COOKIES|DESKTOP|DOCUMENTS|EXEDIR|EXEFILE|EXEPATH|FAVORITES|FONTS|HISTORY|HWNDPARENT|INSTDIR|INTERNET_CACHE|LANGUAGE|LOCALAPPDATA|MUSIC|NETHOOD|OUTDIR|PICTURES|PLUGINSDIR|PRINTHOOD|PROFILE|PROGRAMFILES32|PROGRAMFILES64|PROGRAMFILES|QUICKLAUNCH|RECENT|RESOURCES_LOCALIZED|RESOURCES|SENDTO|SMPROGRAMS|SMSTARTUP|STARTMENU|SYSDIR|TEMP|TEMPLATES|VIDEOS|WINDIR)"},n={cN:"constant",b:"\\$+{[a-zA-Z0-9_]+}"},i={cN:"variable",b:"\\$+[a-zA-Z0-9_]+",i:"\\(\\){}"},r={cN:"constant",b:"\\$+\\([a-zA-Z0-9_]+\\)"},o={cN:"params",b:"(ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)"},l={cN:"constant",b:"\\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversionsystem|ifdef|ifmacrodef|ifmacrondef|ifndef|if|include|insertmacro|macroend|macro|makensis|packhdr|searchparse|searchreplace|tempfile|undef|verbose|warning)"};return{cI:!1,k:{keyword:"Abort AddBrandingImage AddSize AllowRootDirInstall AllowSkipFiles AutoCloseWindow BGFont BGGradient BrandingText BringToFront Call CallInstDLL Caption ChangeUI CheckBitmap ClearErrors CompletedText ComponentText CopyFiles CRCCheck CreateDirectory CreateFont CreateShortCut Delete DeleteINISec DeleteINIStr DeleteRegKey DeleteRegValue DetailPrint DetailsButtonText DirText DirVar DirVerify EnableWindow EnumRegKey EnumRegValue Exch Exec ExecShell ExecWait ExpandEnvStrings File FileBufSize FileClose FileErrorText FileOpen FileRead FileReadByte FileReadUTF16LE FileReadWord FileSeek FileWrite FileWriteByte FileWriteUTF16LE FileWriteWord FindClose FindFirst FindNext FindWindow FlushINI FunctionEnd GetCurInstType GetCurrentAddress GetDlgItem GetDLLVersion GetDLLVersionLocal GetErrorLevel GetFileTime GetFileTimeLocal GetFullPathName GetFunctionAddress GetInstDirError GetLabelAddress GetTempFileName Goto HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfSilent InitPluginsDir InstallButtonText InstallColors InstallDir InstallDirRegKey InstProgressFlags InstType InstTypeGetText InstTypeSetText IntCmp IntCmpU IntFmt IntOp IsWindow LangString LicenseBkColor LicenseData LicenseForceSelection LicenseLangString LicenseText LoadLanguageFile LockWindow LogSet LogText ManifestDPIAware ManifestSupportedOS MessageBox MiscButtonText Name Nop OutFile Page PageCallbacks PageExEnd Pop Push Quit ReadEnvStr ReadINIStr ReadRegDWORD ReadRegStr Reboot RegDLL Rename RequestExecutionLevel ReserveFile Return RMDir SearchPath SectionEnd SectionGetFlags SectionGetInstTypes SectionGetSize SectionGetText SectionGroupEnd SectionIn SectionSetFlags SectionSetInstTypes SectionSetSize SectionSetText SendMessage SetAutoClose SetBrandingImage SetCompress SetCompressor SetCompressorDictSize SetCtlColors SetCurInstType SetDatablockOptimize SetDateSave SetDetailsPrint SetDetailsView SetErrorLevel SetErrors SetFileAttributes SetFont SetOutPath SetOverwrite SetPluginUnload SetRebootFlag SetRegView SetShellVarContext SetSilent ShowInstDetails ShowUninstDetails ShowWindow SilentInstall SilentUnInstall Sleep SpaceTexts StrCmp StrCmpS StrCpy StrLen SubCaption SubSectionEnd Unicode UninstallButtonText UninstallCaption UninstallIcon UninstallSubCaption UninstallText UninstPage UnRegDLL Var VIAddVersionKey VIFileVersion VIProductVersion WindowIcon WriteINIStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegStr WriteUninstaller XPStyle",literal:"admin all auto both colored current false force hide highest lastused leave listonly none normal notset off on open print show silent silentlog smooth textonly true user "},c:[e.HCM,e.CBCM,{cN:"string",b:'"',e:'"',i:"\\n",c:[{cN:"symbol",b:"\\$(\\\\(n|r|t)|\\$)"},t,n,i,r]},e.C(";","$",{r:0}),{cN:"function",bK:"Function PageEx Section SectionGroup SubSection",e:"$"},l,n,i,r,o,e.NM,{cN:"literal",b:e.IR+"::"+e.IR}]}});hljs.registerLanguage("less",function(e){var r="[\\w-]+",t="("+r+"|@{"+r+"})",a=[],c=[],n=function(e){return{cN:"string",b:"~?"+e+".*?"+e}},i=function(e,r,t){return{cN:e,b:r,r:t}},s=function(r,t,a){return e.inherit({cN:r,b:t+"\\(",e:"\\(",rB:!0,eE:!0,r:0},a)},b={b:"\\(",e:"\\)",c:c,r:0};c.push(e.CLCM,e.CBCM,n("'"),n('"'),e.CSSNM,i("hexcolor","#[0-9A-Fa-f]+\\b"),s("function","(url|data-uri)",{starts:{cN:"string",e:"[\\)\\n]",eE:!0}}),s("function",r),b,i("variable","@@?"+r,10),i("variable","@{"+r+"}"),i("built_in","~?`[^`]*?`"),{cN:"attribute",b:r+"\\s*:",e:":",rB:!0,eE:!0});var o=c.concat({b:"{",e:"}",c:a}),u={bK:"when",eW:!0,c:[{bK:"and not"}].concat(c)},C={cN:"attribute",b:t,e:":",eE:!0,c:[e.CLCM,e.CBCM],i:/\S/,starts:{e:"[;}]",rE:!0,c:c,i:"[<=$]"}},l={cN:"at_rule",b:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",starts:{e:"[;{}]",rE:!0,c:c,r:0}},d={cN:"variable",v:[{b:"@"+r+"\\s*:",r:15},{b:"@"+r}],starts:{e:"[;}]",rE:!0,c:o}},p={v:[{b:"[\\.#:&\\[]",e:"[;{}]"},{b:t+"[^;]*{",e:"{"}],rB:!0,rE:!0,i:"[<='$\"]",c:[e.CLCM,e.CBCM,u,i("keyword","all\\b"),i("variable","@{"+r+"}"),i("tag",t+"%?",0),i("id","#"+t),i("class","\\."+t,0),i("keyword","&",0),s("pseudo",":not"),s("keyword",":extend"),i("pseudo","::?"+t),{cN:"attr_selector",b:"\\[",e:"\\]"},{b:"\\(",e:"\\)",c:o},{b:"!important"}]};return a.push(e.CLCM,e.CBCM,l,d,p,C),{cI:!0,i:"[=>'/<($\"]",c:a}});hljs.registerLanguage("pf",function(t){var o={cN:"variable",b:/\$[\w\d#@][\w\d_]*/},e={cN:"variable",b://};return{aliases:["pf.conf"],l:/[a-z0-9_<>-]+/,k:{built_in:"block match pass load anchor|5 antispoof|10 set table",keyword:"in out log quick on rdomain inet inet6 proto from port os to routeallow-opts divert-packet divert-reply divert-to flags group icmp-typeicmp6-type label once probability recieved-on rtable prio queuetos tag tagged user keep fragment for os dropaf-to|10 binat-to|10 nat-to|10 rdr-to|10 bitmask least-stats random round-robinsource-hash static-portdup-to reply-to route-toparent bandwidth default min max qlimitblock-policy debug fingerprints hostid limit loginterface optimizationreassemble ruleset-optimization basic none profile skip state-defaultsstate-policy timeoutconst counters persistno modulate synproxy state|5 floating if-bound no-sync pflow|10 sloppysource-track global rule max-src-nodes max-src-states max-src-connmax-src-conn-rate overload flushscrub|5 max-mss min-ttl no-df|10 random-id",literal:"all any no-route self urpf-failed egress|5 unknown"},c:[t.HCM,t.NM,t.QSM,o,e]}});hljs.registerLanguage("lasso",function(e){var r="[a-zA-Z_][a-zA-Z0-9_.]*",a="<\\?(lasso(script)?|=)",t="\\]|\\?>",s={literal:"true false none minimal full all void and or not bw nbw ew new cn ncn lt lte gt gte eq neq rx nrx ft",built_in:"array date decimal duration integer map pair string tag xml null boolean bytes keyword list locale queue set stack staticarray local var variable global data self inherited",keyword:"error_code error_msg error_pop error_push error_reset cache database_names database_schemanames database_tablenames define_tag define_type email_batch encode_set html_comment handle handle_error header if inline iterate ljax_target link link_currentaction link_currentgroup link_currentrecord link_detail link_firstgroup link_firstrecord link_lastgroup link_lastrecord link_nextgroup link_nextrecord link_prevgroup link_prevrecord log loop namespace_using output_none portal private protect records referer referrer repeating resultset rows search_args search_arguments select sort_args sort_arguments thread_atomic value_list while abort case else if_empty if_false if_null if_true loop_abort loop_continue loop_count params params_up return return_value run_children soap_definetag soap_lastrequest soap_lastresponse tag_name ascending average by define descending do equals frozen group handle_failure import in into join let match max min on order parent protected provide public require returnhome skip split_thread sum take thread to trait type where with yield yieldhome"},n=e.C("",{r:0}),o={cN:"preprocessor",b:"\\[noprocess\\]",starts:{cN:"markup",e:"\\[/noprocess\\]",rE:!0,c:[n]}},i={cN:"preprocessor",b:"\\[/noprocess|"+a},l={cN:"variable",b:"'"+r+"'"},c=[e.CLCM,{cN:"javadoc",b:"/\\*\\*!",e:"\\*/",c:[e.PWM]},e.CBCM,e.inherit(e.CNM,{b:e.CNR+"|(-?infinity|nan)\\b"}),e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null}),{cN:"string",b:"`",e:"`"},{cN:"variable",v:[{b:"[#$]"+r},{b:"#",e:"\\d+",i:"\\W"}]},{cN:"tag",b:"::\\s*",e:r,i:"\\W"},{cN:"attribute",v:[{b:"-"+e.UIR,r:0},{b:"(\\.\\.\\.)"}]},{cN:"subst",v:[{b:"->\\s*",c:[l]},{b:":=|/(?!\\w)=?|[-+*%=<>&|!?\\\\]+",r:0}]},{cN:"built_in",b:"\\.\\.?\\s*",r:0,c:[l]},{cN:"class",bK:"define",rE:!0,e:"\\(|=>",c:[e.inherit(e.TM,{b:e.UIR+"(=(?!>))?"})]}];return{aliases:["ls","lassoscript"],cI:!0,l:r+"|&[lg]t;",k:s,c:[{cN:"preprocessor",b:t,r:0,starts:{cN:"markup",e:"\\[|"+a,rE:!0,r:0,c:[n]}},o,i,{cN:"preprocessor",b:"\\[no_square_brackets",starts:{e:"\\[/no_square_brackets\\]",l:r+"|&[lg]t;",k:s,c:[{cN:"preprocessor",b:t,r:0,starts:{cN:"markup",e:"\\[noprocess\\]|"+a,rE:!0,c:[n]}},o,i].concat(c)}},{cN:"preprocessor",b:"\\[",r:0},{cN:"shebang",b:"^#!.+lasso9\\b",r:10}].concat(c)}});hljs.registerLanguage("prolog",function(c){var r={cN:"atom",b:/[a-z][A-Za-z0-9_]*/,r:0},b={cN:"name",v:[{b:/[A-Z][a-zA-Z0-9_]*/},{b:/_[A-Za-z0-9_]*/}],r:0},a={b:/\(/,e:/\)/,r:0},e={b:/\[/,e:/\]/},n={cN:"comment",b:/%/,e:/$/,c:[c.PWM]},t={cN:"string",b:/`/,e:/`/,c:[c.BE]},g={cN:"string",b:/0\'(\\\'|.)/},N={cN:"string",b:/0\'\\s/},o={b:/:-/},s=[r,b,a,o,e,n,c.CBCM,c.QSM,c.ASM,t,g,N,c.CNM];return a.c=s,e.c=s,{c:s.concat([{b:/\.$/}])}});hljs.registerLanguage("oxygene",function(e){var r="abstract add and array as asc aspect assembly async begin break block by case class concat const copy constructor continue create default delegate desc distinct div do downto dynamic each else empty end ensure enum equals event except exit extension external false final finalize finalizer finally flags for forward from function future global group has if implementation implements implies in index inherited inline interface into invariants is iterator join locked locking loop matching method mod module namespace nested new nil not notify nullable of old on operator or order out override parallel params partial pinned private procedure property protected public queryable raise read readonly record reintroduce remove repeat require result reverse sealed select self sequence set shl shr skip static step soft take then to true try tuple type union unit unsafe until uses using var virtual raises volatile where while with write xor yield await mapped deprecated stdcall cdecl pascal register safecall overload library platform reference packed strict published autoreleasepool selector strong weak unretained",t=e.C("{","}",{r:0}),a=e.C("\\(\\*","\\*\\)",{r:10}),n={cN:"string",b:"'",e:"'",c:[{b:"''"}]},o={cN:"string",b:"(#\\d+)+"},i={cN:"function",bK:"function constructor destructor procedure method",e:"[:;]",k:"function constructor|10 destructor|10 procedure|10 method|10",c:[e.TM,{cN:"params",b:"\\(",e:"\\)",k:r,c:[n,o]},t,a]};return{cI:!0,k:r,i:'("|\\$[G-Zg-z]|\\/\\*||->)',c:[t,a,e.CLCM,n,o,e.NM,i,{cN:"class",b:"=\\bclass\\b",e:"end;",k:r,c:[n,o,t,a,e.CLCM,i]}]}});hljs.registerLanguage("applescript",function(e){var t=e.inherit(e.QSM,{i:""}),r={cN:"params",b:"\\(",e:"\\)",c:["self",e.CNM,t]},o=e.C("--","$"),n=e.C("\\(\\*","\\*\\)",{c:["self",o]}),a=[o,n,e.HCM];return{aliases:["osascript"],k:{keyword:"about above after against and around as at back before beginning behind below beneath beside between but by considering contain contains continue copy div does eighth else end equal equals error every exit fifth first for fourth from front get given global if ignoring in into is it its last local me middle mod my ninth not of on onto or over prop property put ref reference repeat returning script second set seventh since sixth some tell tenth that the|0 then third through thru timeout times to transaction try until where while whose with without",constant:"AppleScript false linefeed return pi quote result space tab true",type:"alias application boolean class constant date file integer list number real record string text",command:"activate beep count delay launch log offset read round run say summarize write",property:"character characters contents day frontmost id item length month name paragraph paragraphs rest reverse running time version weekday word words year"},c:[t,e.CNM,{cN:"type",b:"\\bPOSIX file\\b"},{cN:"command",b:"\\b(clipboard info|the clipboard|info for|list (disks|folder)|mount volume|path to|(close|open for) access|(get|set) eof|current date|do shell script|get volume settings|random number|set volume|system attribute|system info|time to GMT|(load|run|store) script|scripting components|ASCII (character|number)|localized string|choose (application|color|file|file name|folder|from list|remote application|URL)|display (alert|dialog))\\b|^\\s*return\\b"},{cN:"constant",b:"\\b(text item delimiters|current application|missing value)\\b"},{cN:"keyword",b:"\\b(apart from|aside from|instead of|out of|greater than|isn't|(doesn't|does not) (equal|come before|come after|contain)|(greater|less) than( or equal)?|(starts?|ends|begins?) with|contained by|comes (before|after)|a (ref|reference))\\b"},{cN:"property",b:"\\b(POSIX path|(date|time) string|quoted form)\\b"},{cN:"function_start",bK:"on",i:"[${=;\\n]",c:[e.UTM,r]}].concat(a),i:"//|->|=>"}});hljs.registerLanguage("makefile",function(e){var a={cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]};return{aliases:["mk","mak"],c:[e.HCM,{b:/^\w+\s*\W*=/,rB:!0,r:0,starts:{cN:"constant",e:/\s*\W*=/,eE:!0,starts:{e:/$/,r:0,c:[a]}}},{cN:"title",b:/^[\w]+:\s*$/},{cN:"phony",b:/^\.PHONY:/,e:/$/,k:".PHONY",l:/[\.\w]+/},{b:/^\t+/,e:/$/,r:0,c:[e.QSM,a]}]}});hljs.registerLanguage("dust",function(e){var a="if eq ne lt lte gt gte select default math sep";return{aliases:["dst"],cI:!0,sL:"xml",subLanguageMode:"continuous",c:[{cN:"expression",b:"{",e:"}",r:0,c:[{cN:"begin-block",b:"#[a-zA-Z- .]+",k:a},{cN:"string",b:'"',e:'"'},{cN:"end-block",b:"\\/[a-zA-Z- .]+",k:a},{cN:"variable",b:"[a-zA-Z-.]+",k:a,r:0}]}]}});hljs.registerLanguage("clojure-repl",function(e){return{c:[{cN:"prompt",b:/^([\w.-]+|\s*#_)=>/,starts:{e:/$/,sL:"clojure",subLanguageMode:"continuous"}}]}});hljs.registerLanguage("dart",function(e){var t={cN:"subst",b:"\\$\\{",e:"}",k:"true false null this is new super"},r={cN:"string",v:[{b:"r'''",e:"'''"},{b:'r"""',e:'"""'},{b:"r'",e:"'",i:"\\n"},{b:'r"',e:'"',i:"\\n"},{b:"'''",e:"'''",c:[e.BE,t]},{b:'"""',e:'"""',c:[e.BE,t]},{b:"'",e:"'",i:"\\n",c:[e.BE,t]},{b:'"',e:'"',i:"\\n",c:[e.BE,t]}]};t.c=[e.CNM,r];var n={keyword:"assert break case catch class const continue default do else enum extends false final finally for if in is new null rethrow return super switch this throw true try var void while with",literal:"abstract as dynamic export external factory get implements import library operator part set static typedef",built_in:"print Comparable DateTime Duration Function Iterable Iterator List Map Match Null Object Pattern RegExp Set Stopwatch String StringBuffer StringSink Symbol Type Uri bool double int num document window querySelector querySelectorAll Element ElementList"};return{k:n,c:[r,{cN:"dartdoc",b:"/\\*\\*",e:"\\*/",sL:"markdown",subLanguageMode:"continuous"},{cN:"dartdoc",b:"///",e:"$",sL:"markdown",subLanguageMode:"continuous"},e.CLCM,e.CBCM,{cN:"class",bK:"class interface",e:"{",eE:!0,c:[{bK:"extends implements"},e.UTM]},e.CNM,{cN:"annotation",b:"@[A-Za-z]+"},{b:"=>"}]}}); \ No newline at end of file diff --git a/doc/html/js/jquery-2.1.1.min.js b/doc/html/js/jquery-2.1.1.min.js new file mode 100644 index 0000000..e5ace11 --- /dev/null +++ b/doc/html/js/jquery-2.1.1.min.js @@ -0,0 +1,4 @@ +/*! jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ +!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.1",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="
    ",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+Math.random()}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b) +},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthx",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*\s*$/g,ib={option:[1,""],thead:[1,"","
    "],col:[2,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("

    5q!RY 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 Ox*$vd000000000ka;p>o diff --git a/tpl/default/fonts/fontawesome-webfont.svg b/tpl/default/fonts/fontawesome-webfont.svg index d05688e..855c845 100644 --- a/tpl/default/fonts/fontawesome-webfont.svg +++ b/tpl/default/fonts/fontawesome-webfont.svg @@ -1,655 +1,2671 @@ - - + + +Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016 + By ,,, +Copyright Dave Gandy 2016. All rights reserved. + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tpl/default/fonts/fontawesome-webfont.ttf b/tpl/default/fonts/fontawesome-webfont.ttf index 84864859010dc8f37cf3bf4da374048fa09f3f56..35acda2fa1196aad98c2adf4378a7611dd713aa3 100644 GIT binary patch delta 30894 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 E0}%Dq7XSbN delta 7710 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

    - {loop="$theme_available"}
    -

    {function="strftime('%A %d, %B %Y', $day)"}

    +

    {function="format_date($dayDate, false)"}

    {loop="$daily_about_plugin"} From 935222b8b2d9744511cc95b2b5c17f555503582e Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 28 Mar 2017 20:51:11 +0200 Subject: [PATCH 531/658] Display daily date in the page title (browser title) Fixes #211 Depends on #838 --- index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/index.php b/index.php index 5c21c2f..259d017 100644 --- a/index.php +++ b/index.php @@ -695,6 +695,7 @@ function showDaily($pageBuilder, $LINKSDB, $conf, $pluginManager) $dayDate = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $day.'_000000'); $data = array( + 'pagetitle' => $conf->get('general.title') .' - '. format_date($dayDate, false), 'linksToDisplay' => $linksToDisplay, 'cols' => $columns, 'day' => $dayDate->getTimestamp(), From 8e33d0e767579f9f9c783973b6cce14ccf4620dd Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 1 Apr 2017 12:26:31 +0200 Subject: [PATCH 532/658] Remove readityourself plugin Fixes #818 --- plugins/readityourself/book-open.png | Bin 568 -> 0 bytes plugins/readityourself/readityourself.html | 1 - plugins/readityourself/readityourself.meta | 2 - plugins/readityourself/readityourself.php | 51 ----------- tests/plugins/PluginReadityourselfTest.php | 99 --------------------- 5 files changed, 153 deletions(-) delete mode 100644 plugins/readityourself/book-open.png delete mode 100644 plugins/readityourself/readityourself.html delete mode 100644 plugins/readityourself/readityourself.meta delete mode 100644 plugins/readityourself/readityourself.php delete mode 100644 tests/plugins/PluginReadityourselfTest.php diff --git a/plugins/readityourself/book-open.png b/plugins/readityourself/book-open.png deleted file mode 100644 index 36513d7b7cea3e6e607dfc01a1b2b153e0786c3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 568 zcmV-80>}M{P)Koj`T6MR;8U%(`=!ySPEAad=4NN-3zL&mL#CNeCzBbCbB(>I ztdq$mM;ItH08jP&6Sp#uI)*^RCh$Bj-azWeAU?s(2A2tZ z5o_SO?hQu}S4X&I0&!OfgxhaRD2j3cHA?^aZ-T3Jxpt}Ju&q>OYYUunP$$CBbqwZm z&r|JV@-{e_ASOw2^)I zxD#wwt8T-e{(0PTdMCe5&#hBOpwp;F$taTnmK=wgNreadityourself diff --git a/plugins/readityourself/readityourself.meta b/plugins/readityourself/readityourself.meta deleted file mode 100644 index bd611dd..0000000 --- a/plugins/readityourself/readityourself.meta +++ /dev/null @@ -1,2 +0,0 @@ -description="For each link, add a ReadItYourself icon to save the shaared URL." -parameters=READITYOUSELF_URL; \ No newline at end of file diff --git a/plugins/readityourself/readityourself.php b/plugins/readityourself/readityourself.php deleted file mode 100644 index 961c5bd..0000000 --- a/plugins/readityourself/readityourself.php +++ /dev/null @@ -1,51 +0,0 @@ -get('plugins.READITYOUSELF_URL'); - if (empty($riyUrl)) { - $error = 'Readityourself plugin error: '. - 'Please define the "READITYOUSELF_URL" setting in the plugin administration page.'; - return array($error); - } -} - -/** - * Add readityourself icon to link_plugin when rendering linklist. - * - * @param mixed $data Linklist data. - * @param ConfigManager $conf Configuration Manager instance. - * - * @return mixed - linklist data with readityourself plugin. - */ -function hook_readityourself_render_linklist($data, $conf) -{ - $riyUrl = $conf->get('plugins.READITYOUSELF_URL'); - if (empty($riyUrl)) { - return $data; - } - - $readityourself_html = file_get_contents(PluginManager::$PLUGINS_PATH . '/readityourself/readityourself.html'); - - foreach ($data['links'] as &$value) { - $readityourself = sprintf($readityourself_html, $riyUrl, $value['url'], PluginManager::$PLUGINS_PATH); - $value['link_plugin'][] = $readityourself; - } - - return $data; -} diff --git a/tests/plugins/PluginReadityourselfTest.php b/tests/plugins/PluginReadityourselfTest.php deleted file mode 100644 index bbba967..0000000 --- a/tests/plugins/PluginReadityourselfTest.php +++ /dev/null @@ -1,99 +0,0 @@ -set('plugins.READITYOUSELF_URL', 'value'); - $errors = readityourself_init($conf); - $this->assertEmpty($errors); - } - - /** - * Test Readityourself init with errors. - */ - public function testReadityourselfInitError() - { - $conf = new ConfigManager(''); - $errors = readityourself_init($conf); - $this->assertNotEmpty($errors); - } - - /** - * Test render_linklist hook. - */ - public function testReadityourselfLinklist() - { - $conf = new ConfigManager(''); - $conf->set('plugins.READITYOUSELF_URL', 'value'); - $str = 'http://randomstr.com/test'; - $data = array( - 'title' => $str, - 'links' => array( - array( - 'url' => $str, - ) - ) - ); - - $data = hook_readityourself_render_linklist($data, $conf); - $link = $data['links'][0]; - // data shouldn't be altered - $this->assertEquals($str, $data['title']); - $this->assertEquals($str, $link['url']); - - // plugin data - $this->assertEquals(1, count($link['link_plugin'])); - $this->assertNotFalse(strpos($link['link_plugin'][0], $str)); - } - - /** - * Test without config: nothing should happened. - */ - public function testReadityourselfLinklistWithoutConfig() - { - $conf = new ConfigManager(''); - $conf->set('plugins.READITYOUSELF_URL', null); - $str = 'http://randomstr.com/test'; - $data = array( - 'title' => $str, - 'links' => array( - array( - 'url' => $str, - ) - ) - ); - - $data = hook_readityourself_render_linklist($data, $conf); - $link = $data['links'][0]; - // data shouldn't be altered - $this->assertEquals($str, $data['title']); - $this->assertEquals($str, $link['url']); - - // plugin data - $this->assertArrayNotHasKey('link_plugin', $link); - } -} From 84315a3bad02652e5ea26586fab003eaaf467e30 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 10 Mar 2017 20:06:01 +0100 Subject: [PATCH 533/658] Fix a warning generated in return_bytes function and refactor it It was multiplying a string containing a letter. Moved function to Utils.php and display a human readable limit size --- application/Utils.php | 89 +++++++++++++++++++++++++++++++++++++++++ index.php | 32 +-------------- tests/UtilsTest.php | 80 ++++++++++++++++++++++++++++++++++++ tpl/vintage/import.html | 2 +- 4 files changed, 172 insertions(+), 31 deletions(-) diff --git a/application/Utils.php b/application/Utils.php index d6e0661..3ef2a7e 100644 --- a/application/Utils.php +++ b/application/Utils.php @@ -345,3 +345,92 @@ function format_date($date, $time = true, $intl = true) return $formatter->format($date); } + +/** + * Check if the input is an integer, no matter its real type. + * + * PHP is a bit messy regarding this: + * - is_int returns false if the input is a string + * - ctype_digit returns false if the input is an integer or negative + * + * @param mixed $input value + * + * @return bool true if the input is an integer, false otherwise + */ +function is_integer_mixed($input) +{ + if (is_array($input) || is_bool($input) || is_object($input)) { + return false; + } + $input = strval($input); + return ctype_digit($input) || (startsWith($input, '-') && ctype_digit(substr($input, 1))); +} + +/** + * Convert post_max_size/upload_max_filesize (e.g. '16M') parameters to bytes. + * + * @param string $val Size expressed in string. + * + * @return int Size expressed in bytes. + */ +function return_bytes($val) +{ + if (is_integer_mixed($val) || $val === '0' || empty($val)) { + return $val; + } + $val = trim($val); + $last = strtolower($val[strlen($val)-1]); + $val = intval(substr($val, 0, -1)); + switch($last) { + case 'g': $val *= 1024; + case 'm': $val *= 1024; + case 'k': $val *= 1024; + } + return $val; +} + +/** + * Return a human readable size from bytes. + * + * @param int $bytes value + * + * @return string Human readable size + */ +function human_bytes($bytes) +{ + if ($bytes === '') { + return t('Setting not set'); + } + if (! is_integer_mixed($bytes)) { + return $bytes; + } + $bytes = intval($bytes); + if ($bytes === 0) { + return t('Unlimited'); + } + + $units = [t('B'), t('kiB'), t('MiB'), t('GiB')]; + for ($i = 0; $i < count($units) && $bytes >= 1024; ++$i) { + $bytes /= 1024; + } + + return $bytes . $units[$i]; +} + +/** + * Try to determine max file size for uploads (POST). + * Returns an integer (in bytes) + * + * @param mixed $limitPost post_max_size PHP setting + * @param mixed $limitUpload upload_max_filesize PHP setting + * + * @return int max upload file size in bytes. + */ +function get_max_upload_size($limitPost, $limitUpload) +{ + $size1 = return_bytes($limitPost); + $size2 = return_bytes($limitUpload); + // Return the smaller of two: + $maxsize = min($size1, $size2); + return human_bytes($maxsize); +} diff --git a/index.php b/index.php index 863d509..8f26c39 100644 --- a/index.php +++ b/index.php @@ -472,34 +472,6 @@ if (isset($_POST['login'])) } } -// ------------------------------------------------------------------------------------------ -// Misc utility functions: - -// Convert post_max_size/upload_max_filesize (e.g. '16M') parameters to bytes. -function return_bytes($val) -{ - $val = trim($val); $last=strtolower($val[strlen($val)-1]); - switch($last) - { - case 'g': $val *= 1024; - case 'm': $val *= 1024; - case 'k': $val *= 1024; - } - return $val; -} - -// Try to determine max file size for uploads (POST). -// Returns an integer (in bytes) -function getMaxFileSize() -{ - $size1 = return_bytes(ini_get('post_max_size')); - $size2 = return_bytes(ini_get('upload_max_filesize')); - // Return the smaller of two: - $maxsize = min($size1,$size2); - // FIXME: Then convert back to readable notations ? (e.g. 2M instead of 2000000) - return $maxsize; -} - // ------------------------------------------------------------------------------------------ // Token management for XSRF protection // Token should be used in any form which acts on data (create,update,delete,import...). @@ -1517,7 +1489,7 @@ function renderPage($conf, $pluginManager, $LINKSDB) if (! isset($_POST['token']) || ! isset($_FILES['filetoupload'])) { // Show import dialog - $PAGE->assign('maxfilesize', getMaxFileSize()); + $PAGE->assign('maxfilesize', get_max_upload_size(ini_get('post_max_size'), ini_get('upload_max_filesize'))); $PAGE->renderPage('import'); exit; } @@ -1527,7 +1499,7 @@ function renderPage($conf, $pluginManager, $LINKSDB) // The file is too big or some form field may be missing. echo ''; exit; diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php index e70cc1a..e95c624 100644 --- a/tests/UtilsTest.php +++ b/tests/UtilsTest.php @@ -4,6 +4,7 @@ */ require_once 'application/Utils.php'; +require_once 'application/Languages.php'; require_once 'tests/utils/ReferenceSessionIdHashes.php'; // Initialize reference data before PHPUnit starts a session @@ -326,4 +327,83 @@ class UtilsTest extends PHPUnit_Framework_TestCase $this->assertFalse(format_date([])); $this->assertFalse(format_date(null)); } + + /** + * Test is_integer_mixed with valid values + */ + public function testIsIntegerMixedValid() + { + $this->assertTrue(is_integer_mixed(12)); + $this->assertTrue(is_integer_mixed('12')); + $this->assertTrue(is_integer_mixed(-12)); + $this->assertTrue(is_integer_mixed('-12')); + $this->assertTrue(is_integer_mixed(0)); + $this->assertTrue(is_integer_mixed('0')); + $this->assertTrue(is_integer_mixed(0x0a)); + } + + /** + * Test is_integer_mixed with invalid values + */ + public function testIsIntegerMixedInvalid() + { + $this->assertFalse(is_integer_mixed(true)); + $this->assertFalse(is_integer_mixed(false)); + $this->assertFalse(is_integer_mixed([])); + $this->assertFalse(is_integer_mixed(['test'])); + $this->assertFalse(is_integer_mixed([12])); + $this->assertFalse(is_integer_mixed(new DateTime())); + $this->assertFalse(is_integer_mixed('0x0a')); + $this->assertFalse(is_integer_mixed('12k')); + $this->assertFalse(is_integer_mixed('k12')); + $this->assertFalse(is_integer_mixed('')); + } + + /** + * Test return_bytes + */ + public function testReturnBytes() + { + $this->assertEquals(2 * 1024, return_bytes('2k')); + $this->assertEquals(2 * 1024, return_bytes('2K')); + $this->assertEquals(2 * (1024 ** 2), return_bytes('2m')); + $this->assertEquals(2 * (1024 ** 2), return_bytes('2M')); + $this->assertEquals(2 * (1024 ** 3), return_bytes('2g')); + $this->assertEquals(2 * (1024 ** 3), return_bytes('2G')); + $this->assertEquals(374, return_bytes('374')); + $this->assertEquals(374, return_bytes(374)); + $this->assertEquals(0, return_bytes('0')); + $this->assertEquals(0, return_bytes(0)); + $this->assertEquals(-1, return_bytes('-1')); + $this->assertEquals(-1, return_bytes(-1)); + $this->assertEquals('', return_bytes('')); + } + + /** + * Test human_bytes + */ + public function testHumanBytes() + { + $this->assertEquals('2kiB', human_bytes(2 * 1024)); + $this->assertEquals('2kiB', human_bytes(strval(2 * 1024))); + $this->assertEquals('2MiB', human_bytes(2 * (1024 ** 2))); + $this->assertEquals('2MiB', human_bytes(strval(2 * (1024 ** 2)))); + $this->assertEquals('2GiB', human_bytes(2 * (1024 ** 3))); + $this->assertEquals('2GiB', human_bytes(strval(2 * (1024 ** 3)))); + $this->assertEquals('374B', human_bytes(374)); + $this->assertEquals('374B', human_bytes('374')); + $this->assertEquals('Unlimited', human_bytes('0')); + $this->assertEquals('Unlimited', human_bytes(0)); + $this->assertEquals('Setting not set', human_bytes('')); + } + + /** + * Test get_max_upload_size + */ + public function testGetMaxUploadSize() + { + $this->assertEquals('1MiB', get_max_upload_size(2097152, '1024k')); + $this->assertEquals('1MiB', get_max_upload_size('1m', '2m')); + $this->assertEquals('100B', get_max_upload_size(100, 100)); + } } diff --git a/tpl/vintage/import.html b/tpl/vintage/import.html index 071e116..bb9e4a5 100644 --- a/tpl/vintage/import.html +++ b/tpl/vintage/import.html @@ -5,7 +5,7 @@
    -
    -
    -
    - -
    -
    -
    -
    - {ignore}FIXME! too hackish, needs to be fixed upstream{/ignore} -
    {$timezone_html}
    -
    -
    -
    -
    -
    @@ -80,6 +63,43 @@
    +
    +
    +
    + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index 30d8ed6..714420b 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js @@ -76,9 +76,12 @@ window.onload = function () { } } - document.getElementById('menu-toggle').addEventListener('click', function (e) { - toggleMenu(); - }); + var menuToggle = document.getElementById('menu-toggle'); + if (menuToggle != null) { + menuToggle.addEventListener('click', function (e) { + toggleMenu(); + }); + } window.addEventListener(WINDOW_CHANGE_EVENT, closeMenu); })(this, this.document); @@ -299,21 +302,6 @@ window.onload = function () { }); } - /** - * TimeZome select - * FIXME! way too hackish - */ - var toRemove = document.getElementById('timezone-remove'); - if (toRemove != null) { - var firstSelect = toRemove.getElementsByTagName('select')[0]; - var secondSelect = toRemove.getElementsByTagName('select')[1]; - toRemove.parentNode.removeChild(toRemove); - var toAdd = document.getElementById('timezone-add'); - var newTimezone = 'Continent ' + firstSelect.outerHTML + ''; - newTimezone += ' Country ' + secondSelect.outerHTML + ''; - toAdd.innerHTML = newTimezone; - } - /** * Awesomplete trigger. */ @@ -366,6 +354,15 @@ window.onload = function () { } }); }); + + var continent = document.getElementById('continent'); + var city = document.getElementById('city'); + if (continent != null && city != null) { + continent.addEventListener('change', function(event) { + hideTimezoneCities(city, continent.options[continent.selectedIndex].value, true); + }); + hideTimezoneCities(city, continent.options[continent.selectedIndex].value, false); + } }; function activateFirefoxSocial(node) { @@ -391,3 +388,25 @@ function activateFirefoxSocial(node) { var activate = new CustomEvent("ActivateSocialFeature"); node.dispatchEvent(activate); } + +/** + * Add the class 'hidden' to city options not attached to the current selected continent. + * + * @param cities List of 
    $ git clone https://github.com/shaarli/Shaarli.git -b stable /path/to/shaarli/
 # install/update third-party dependencies
 $ cd /path/to/shaarli/
-$ composer update --no-dev
    +$ composer install --no-dev

    Development version (mainline)

    Use at your own risk!

    To get the latest changes from the master branch:

    # clone the repository  
-$ git clone https://github.com/shaarli/Shaarli.git master /path/to/shaarli/
+$ git clone https://github.com/shaarli/Shaarli.git -b master /path/to/shaarli/
 # install/update third-party dependencies
 $ cd /path/to/shaarli
-$ composer update --no-dev
    +$ composer install --no-dev

    Finish Installation

    Once Shaarli is downloaded and files have been placed at the correct location, open it this location your favorite browser.

    diff --git a/doc/Download-and-Installation.md b/doc/Download-and-Installation.md index 32df898..970144a 100644 --- a/doc/Download-and-Installation.md +++ b/doc/Download-and-Installation.md @@ -13,13 +13,13 @@ Get the latest released version from the [releases](https://github.com/shaarli/S **Download our *shaarli-full* archive** to include dependencies. -The current latest released version is `v0.8.0` +The current latest released version is `v0.8.4` Or in command lines: ```bash -$ wget https://github.com/shaarli/Shaarli/releases/download/v0.8.0/shaarli-v0.8.0-full.zip -$ unzip shaarli-v0.8.0-full.zip +$ wget https://github.com/shaarli/Shaarli/releases/download/v0.8.4/shaarli-v0.8.4-full.zip +$ unzip shaarli-v0.8.4-full.zip $ mv Shaarli /path/to/shaarli/ ``` @@ -30,8 +30,8 @@ $ mv Shaarli /path/to/shaarli/ ``` mkdir -p /path/to/shaarli && cd /path/to/shaarli/ -git clone -b v0.8.0 https://github.com/shaarli/Shaarli.git . -composer update --no-dev +git clone -b v0.8 https://github.com/shaarli/Shaarli.git . +composer install --no-dev ``` -------------------------------------------------------- @@ -66,7 +66,7 @@ $ mv Shaarli-stable /path/to/shaarli/ $ git clone https://github.com/shaarli/Shaarli.git -b stable /path/to/shaarli/ # install/update third-party dependencies $ cd /path/to/shaarli/ -$ composer update --no-dev +$ composer install --no-dev ``` -------------------------------------------------------- @@ -79,10 +79,10 @@ To get the latest changes from the `master` branch: ```bash # clone the repository -$ git clone https://github.com/shaarli/Shaarli.git master /path/to/shaarli/ +$ git clone https://github.com/shaarli/Shaarli.git -b master /path/to/shaarli/ # install/update third-party dependencies $ cd /path/to/shaarli -$ composer update --no-dev +$ composer install --no-dev ``` -------------------------------------------------------- diff --git a/doc/Example-patch---add-new-via-field-for-links.html b/doc/Example-patch---add-new-via-field-for-links.html index 133224e..49036a7 100644 --- a/doc/Example-patch---add-new-via-field-for-links.html +++ b/doc/Example-patch---add-new-via-field-for-links.html @@ -32,6 +32,7 @@
  • Browsing and Searching
  • Firefox share
  • RSS feeds
    • +
  • REST API
  • How To
  • How To
  • How To
  • How To
  • How To
  • How To

    • Plugin System

    -
    -

    Note: Plugin current status - in development (not merged into master).

    -

    I am a developer. Developer API.

    I am a template designer. Guide for template designer.

    Developer API

    @@ -121,12 +120,21 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf | plugins/ |---| demo_plugin/ | |---| demo_plugin.php +

    Plugin initialization

    +

    At the beginning of Shaarli execution, all enabled plugins are loaded. At this point, the plugin system looks for an init() function to execute and run it if it exists. This function must be named this way, and takes the ConfigManager as parameter.

    +
    <plugin_name>_init($conf)
    +

    This function can be used to create initial data, load default settings, etc. But also to set plugin errors. If the initialization function returns an array of strings, they will be understand as errors, and displayed in the header to logged in users.

    Understanding hooks

    A plugin is a set of functions. Each function will be triggered by the plugin system at certain point in Shaarli execution.

    These functions need to be named with this pattern:

    -
    hook_<plugin_name>_<hook_name>
    +
    hook_<plugin_name>_<hook_name>($data, $conf)
    +

    Parameters:

    +

    For exemple, if my plugin want to add data to the header, this function is needed:

    -
    hook_demo_plugin_render_header()
    +
    hook_demo_plugin_render_header

    If this function is declared, and the plugin enabled, it will be called every time Shaarli is rendering the header.

    Plugin's data

    Parameters

    @@ -159,6 +167,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
    • description: plugin description
    • parameters: user parameter names, separated by a ;.
      • +
    • parameter.<PARAMETER_NAME>: add a text description the specified parameter.

    Note: In PHP, parse_ini_file() seems to want strings to be between by quotes " in the ini file.

    @@ -209,16 +218,28 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf render_tagcloud -Allow to add content at the top and bottom of the page. +Allow to add content at the top and bottom of the page, and after all tags. +render_taglist +Allow to add content at the top and bottom of the page, and after all tags. + + render_daily Allow to add content at the top and bottom of the page, the bottom of each link and to alter data. + +render_feed +Allow to do add tags in RSS and ATOM feeds. + -savelink +save_link Allow to alter the link being saved in the datastore. + +delete_link +Allow to do an action before a link is deleted from the datastore. +

    render_header

    @@ -376,17 +397,41 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf

  • plugin_start_zone: before displaying the template content.

  • plugin_end_zone: after displaying the template content.

    • +

    For each tag, the following placeholder can be used:

    +
      +
    • tag_plugin: after each tag
      • +

    plugin_start_end_zone_example

    +

    render_taglist

    +

    Triggered when taglist is displayed.

    +

    Allow to add content at the top and bottom of the page.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    • All templates data.
      • +
    +
    Template placeholders
    +

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +

    • plugin_start_zone: before displaying the template content.

      • +

    • plugin_end_zone: after displaying the template content.

      • +
    +

    For each tag, the following placeholder can be used:

    +
      +
    • tag_plugin: after each tag
      • +

    render_daily

    Triggered when tagcloud is displayed.

    Allow to add content at the top and bottom of the page, the bottom of each link and to alter data.

    -
    Data
    +
    Data

    $data is an array containing:

    • _LOGGEDIN_: true if user is logged in, false otherwise.
    • All templates data, including links.
    -
    Template placeholders
    +
    Template placeholders

    Items can be displayed in templates by adding an entry in $data['<placeholder>'] array.

    List of placeholders:

      @@ -397,18 +442,57 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf

    • plugin_start_zone: before displaying the template content.

    • plugin_end_zone: after displaying the template content.

    - +

    render_feed

    +

    Triggered when the ATOM or RSS feed is displayed.

    +

    Allow to add tags in the feed, either in the header or for each items. Items (links) can also be altered before being rendered.

    +
    Data
    +

    $data is an array containing:

    +
      +
    • _LOGGEDIN_: true if user is logged in, false otherwise.
      • +
    • _PAGE_: containing either rss or atom.
      • +
    • All templates data, including links.
      • +
    +
    Template placeholders
    +

    Tags can be added in feeds by adding an entry in $data['<placeholder>'] array.

    +

    List of placeholders:

    +
      +
    • feed_plugins_header: used as a header tag in the feed.
      • +
    +

    For each links:

    +
      +
    • feed_plugins: additional tag for every link entry.
      • +
    +

    Triggered when a link is save (new link or edit).

    Allow to alter the link being saved in the datastore.

    -
    Data
    +
    Data

    $data is an array containing the link being saved:

      +
    • id
    • title
    • url
      • +
    • shorturl
    • description
      • -
    • linkdate
    • private
    • tags
      • +
    • created
      • +
    • updated
      • +
    + +

    Triggered when a link is deleted.

    +

    Allow to execute any action before the link is actually removed from the datastore

    +
    Data
    +

    $data is an array containing the link being saved:

    +
      +
    • id
      • +
    • title
      • +
    • url
      • +
    • shorturl
      • +
    • description
      • +
    • private
      • +
    • tags
      • +
    • created
      • +
    • updated

    Guide for template designer

    Plugin administration

    @@ -537,5 +621,14 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf {$value} {/loop} </div>
    +

    feed.atom.xml and feed.rss.xml:

    +

    In headers tags section:

    +
    {loop="$feed_plugins_header"}
+  {$value}
+{/loop}
    +

    After each entry:

    +
    {loop="$value.feed_plugins"}
+  {$value}
+{/loop}
    diff --git a/doc/Plugin-System.md b/doc/Plugin-System.md index 623627d..addd792 100644 --- a/doc/Plugin-System.md +++ b/doc/Plugin-System.md @@ -1,6 +1,4 @@ #Plugin System -> Note: Plugin current status - in development (not merged into master). - [**I am a developer.** Developer API.](#developer-api)[](.html) [**I am a template designer.** Guide for template designer.](#guide-for-template-designer)[](.html) @@ -30,6 +28,14 @@ You should have the following tree view: | |---| demo_plugin.php ``` +### Plugin initialization + +At the beginning of Shaarli execution, all enabled plugins are loaded. At this point, the plugin system looks for an `init()` function to execute and run it if it exists. This function must be named this way, and takes the `ConfigManager` as parameter. + + _init($conf) + +This function can be used to create initial data, load default settings, etc. But also to set *plugin errors*. If the initialization function returns an array of strings, they will be understand as errors, and displayed in the header to logged in users. + ### Understanding hooks A plugin is a set of functions. Each function will be triggered by the plugin system at certain point in Shaarli execution. @@ -37,12 +43,17 @@ A plugin is a set of functions. Each function will be triggered by the plugin sy These functions need to be named with this pattern: ``` -hook__ +hook__($data, $conf) ``` +Parameters: + + - data: see [$data section](https://github.com/shaarli/Shaarli/wiki/Plugin-System#plugins-data)[](.html) + - conf: the `ConfigManager` instance. + For exemple, if my plugin want to add data to the header, this function is needed: - hook_demo_plugin_render_header() + hook_demo_plugin_render_header If this function is declared, and the plugin enabled, it will be called every time Shaarli is rendering the header. @@ -98,6 +109,7 @@ Each file contain two keys: * `description`: plugin description * `parameters`: user parameter names, separated by a `;`. + * `parameter.`: add a text description the specified parameter. > Note: In PHP, `parse_ini_file()` seems to want strings to be between by quotes `"` in the ini file. @@ -118,9 +130,13 @@ If it's still not working, please [open an issue](https://github.com/shaarli/Sha | [render_editlink](#render_editlink) | Allow to add fields in the form, or display elements. |[](.html) | [render_tools](#render_tools) | Allow to add content at the end of the page. |[](.html) | [render_picwall](#render_picwall) | Allow to add content at the top and bottom of the page. |[](.html) -| [render_tagcloud](#render_tagcloud) | Allow to add content at the top and bottom of the page. |[](.html) +| [render_tagcloud](#render_tagcloud) | Allow to add content at the top and bottom of the page, and after all tags. |[](.html) +| [render_taglist](#render_taglist) | Allow to add content at the top and bottom of the page, and after all tags. |[](.html) | [render_daily](#render_daily) | Allow to add content at the top and bottom of the page, the bottom of each link and to alter data. |[](.html) -| [savelink](#savelink) | Allow to alter the link being saved in the datastore. |[](.html) +| [render_feed](#render_feed) | Allow to do add tags in RSS and ATOM feeds. |[](.html) +| [save_link](#save_link) | Allow to alter the link being saved in the datastore. |[](.html) +| [delete_link](#delete_link) | Allow to do an action before a link is deleted from the datastore. |[](.html) + #### render_header @@ -330,8 +346,40 @@ List of placeholders: * `plugin_end_zone`: after displaying the template content. +For each tag, the following placeholder can be used: + + * `tag_plugin`: after each tag + ![plugin_start_end_zone_example](http://i.imgur.com/vHmyT3a.png)[](.html) + +#### render_taglist + +Triggered when taglist is displayed. + +Allow to add content at the top and bottom of the page. + +##### Data + +`$data` is an array containing: + + * `_LOGGEDIN_`: true if user is logged in, false otherwise. + * All templates data. + +##### Template placeholders + +Items can be displayed in templates by adding an entry in `$data['']` array.[](.html) + +List of placeholders: + + * `plugin_start_zone`: before displaying the template content. + + * `plugin_end_zone`: after displaying the template content. + +For each tag, the following placeholder can be used: + + * `tag_plugin`: after each tag + #### render_daily Triggered when tagcloud is displayed. @@ -359,7 +407,33 @@ List of placeholders: * `plugin_end_zone`: after displaying the template content. -#### savelink +#### render_feed + +Triggered when the ATOM or RSS feed is displayed. + +Allow to add tags in the feed, either in the header or for each items. Items (links) can also be altered before being rendered. + +##### Data + +`$data` is an array containing: + + * `_LOGGEDIN_`: true if user is logged in, false otherwise. + * `_PAGE_`: containing either `rss` or `atom`. + * All templates data, including links. + +##### Template placeholders + +Tags can be added in feeds by adding an entry in `$data['']` array.[](.html) + +List of placeholders: + + * `feed_plugins_header`: used as a header tag in the feed. + +For each links: + + * `feed_plugins`: additional tag for every link entry. + +#### save_link Triggered when a link is save (new link or edit). @@ -369,12 +443,36 @@ Allow to alter the link being saved in the datastore. `$data` is an array containing the link being saved: + * id * title * url + * shorturl * description - * linkdate * private * tags + * created + * updated + + +#### delete_link + +Triggered when a link is deleted. + +Allow to execute any action before the link is actually removed from the datastore + +##### Data + +`$data` is an array containing the link being saved: + + * id + * title + * url + * shorturl + * description + * private + * tags + * created + * updated ## Guide for template designer @@ -595,3 +693,19 @@ Bottom: {/loop}
    ``` + +**feed.atom.xml** and **feed.rss.xml**: + +In headers tags section: +```xml +{loop="$feed_plugins_header"} + {$value} +{/loop} +``` + +After each entry: +```xml +{loop="$value.feed_plugins"} + {$value} +{/loop} +``` diff --git a/doc/Plugins.html b/doc/Plugins.html index 435a836..08ce8a8 100644 --- a/doc/Plugins.html +++ b/doc/Plugins.html @@ -69,6 +69,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
  • Browsing and Searching
  • Firefox share
  • RSS feeds
    • +
  • REST API
  • How To

    Third party plugins

    diff --git a/doc/Plugins.md b/doc/Plugins.md index 81167fc..e3192a6 100644 --- a/doc/Plugins.md +++ b/doc/Plugins.md @@ -67,7 +67,6 @@ Usage of each plugin is documented in it's README file: * [`markdown`](https://github.com/shaarli/Shaarli/blob/master/plugins/markdown/README.md): Render shaare description with Markdown syntax.[](.html) * [`playvideos`](https://github.com/shaarli/Shaarli/blob/master/plugins/playvideos/README.md): Add a button in the toolbar allowing to watch all videos.[](.html) * `qrcode`: For each link, add a QRCode icon. - * `readityourself`: For each link, add a ReadItYourself icon to save the shaared URL * [`wallabag`](https://github.com/shaarli/Shaarli/blob/master/plugins/wallabag/README.md): For each link, add a Wallabag icon to save it in your instance.[](.html) diff --git a/doc/REST-API.html b/doc/REST-API.html new file mode 100644 index 0000000..d14c98c --- /dev/null +++ b/doc/REST-API.html @@ -0,0 +1,169 @@ + + + + + + + Shaarli – REST API + + + + + + + +

    REST API

    +

    Usage

    +

    See the REST API documentation.

    +

    Authentication

    +

    All requests to Shaarli's API must include a JWT token to verify their authenticity.

    +

    This token has to be included as an HTTP header called Authentication: Bearer <jwt token>.

    +

    JWT resources :

    + +

    Shaarli JWT Token

    +

    JWT tokens are composed by three parts, separated by a dot . and encoded in base64:

    +
    [header].[payload].[signature][](.html)
    + +

    Shaarli only allow one hash algorithm, so the header will always be the same:

    +
    {
+    "typ": "JWT",
+    "alg": "HS512"
+}
    +

    Encoded in base64, it gives:

    +
    ewogICAgICAgICJ0eXAiOiAiSldUIiwKICAgICAgICAiYWxnIjogIkhTNTEyIgogICAgfQ==
    +

    Payload

    +

    Validity duration

    +

    To avoid infinite token validity, JWT tokens must include their creation date in UNIX timestamp format (timezone independant - UTC) under the key iat (issued at). This token will be accepted during 9 minutes.

    +
    {
+    "iat": 1468663519
+}
    +

    See RFC reference.

    +

    Signature

    +

    The signature authenticate the token validity. It contains the base64 of the header and the body, separated by a dot ., hashed in SHA512 with the API secret available in Shaarli administration page.

    +

    Signature example with PHP:

    +
    $content = base64_encode($header) . '.' . base64_encode($payload);
+$signature = hash_hmac('sha512', $content, $secret);
    +

    Complete example

    +

    PHP

    +
    function generateToken($secret) {
+    $header = base64_encode('{
+        "typ": "JWT",
+        "alg": "HS512"
+    }');
+    $payload = base64_encode('{
+        "iat": '. time() .'
+    }');
+    $signature = hash_hmac('sha512', $header .'.'. $payload , $secret);
+    return $header .'.'. $payload .'.'. $signature;
+}
+
+$secret = 'mysecret';
+$token = generateToken($secret);
+echo $token;
    +
    +

    ewogICAgICAgICJ0eXAiOiAiSldUIiwKICAgICAgICAiYWxnIjogIkhTNTEyIgogICAgfQ==.ewogICAgICAgICJpYXQiOiAxNDY4NjY3MDQ3CiAgICB9.1d2c54fa947daf594fdbf7591796195652c8bc63bffad7f6a6db2a41c313f495a542cbfb595acade79e83f3810d709b4251d7b940bbc10b531a6e6134af63a68

    +
    +
    $options = [[](.html)
+    'http' => [[](.html)
+        'method' => 'GET',
+        'jwt' => $token,
+    ],
+];
+$context = stream_context_create($options);
+file_get_contents($apiEndpoint, false, $context);
    + + diff --git a/doc/REST-API.md b/doc/REST-API.md new file mode 100644 index 0000000..d790997 --- /dev/null +++ b/doc/REST-API.md @@ -0,0 +1,105 @@ +#REST API +## Usage + +See the [REST API documentation](http://shaarli.github.io/api-documentation/).[](.html) + +## Authentication + +All requests to Shaarli's API must include a JWT token to verify their authenticity. + +This token has to be included as an HTTP header called `Authentication: Bearer `. + +JWT resources : + + * [jwt.io](https://jwt.io) (including a list of client per language).[](.html) + * RFC : https://tools.ietf.org/html/rfc7519 + * https://float-middle.com/json-web-tokens-jwt-vs-sessions/ + * HackerNews thread: https://news.ycombinator.com/item?id=11929267 + + +### Shaarli JWT Token + +JWT tokens are composed by three parts, separated by a dot `.` and encoded in base64: + +``` +[header].[payload].[signature][](.html) +``` + +#### Header + +Shaarli only allow one hash algorithm, so the header will always be the same: + +```json +{ + "typ": "JWT", + "alg": "HS512" +} +``` + +Encoded in base64, it gives: + +``` +ewogICAgICAgICJ0eXAiOiAiSldUIiwKICAgICAgICAiYWxnIjogIkhTNTEyIgogICAgfQ== +``` + +#### Payload + +**Validity duration** + +To avoid infinite token validity, JWT tokens must include their creation date in UNIX timestamp format (timezone independant - UTC) under the key `iat` (issued at). This token will be accepted during 9 minutes. + +```json +{ + "iat": 1468663519 +} +``` + +See [RFC reference](https://tools.ietf.org/html/rfc7519#section-4.1.6).[](.html) + + +#### Signature + +The signature authenticate the token validity. It contains the base64 of the header and the body, separated by a dot `.`, hashed in SHA512 with the API secret available in Shaarli administration page. + +Signature example with PHP: + +```php +$content = base64_encode($header) . '.' . base64_encode($payload); +$signature = hash_hmac('sha512', $content, $secret); +``` + + +### Complete example + +#### PHP + +```php +function generateToken($secret) { + $header = base64_encode('{ + "typ": "JWT", + "alg": "HS512" + }'); + $payload = base64_encode('{ + "iat": '. time() .' + }'); + $signature = hash_hmac('sha512', $header .'.'. $payload , $secret); + return $header .'.'. $payload .'.'. $signature; +} + +$secret = 'mysecret'; +$token = generateToken($secret); +echo $token; +``` + +> `ewogICAgICAgICJ0eXAiOiAiSldUIiwKICAgICAgICAiYWxnIjogIkhTNTEyIgogICAgfQ==.ewogICAgICAgICJpYXQiOiAxNDY4NjY3MDQ3CiAgICB9.1d2c54fa947daf594fdbf7591796195652c8bc63bffad7f6a6db2a41c313f495a542cbfb595acade79e83f3810d709b4251d7b940bbc10b531a6e6134af63a68` + +```php +$options = [[](.html) + 'http' => [[](.html) + 'method' => 'GET', + 'jwt' => $token, + ], +]; +$context = stream_context_create($options); +file_get_contents($apiEndpoint, false, $context); +``` diff --git a/doc/RSS-feeds.html b/doc/RSS-feeds.html index 0f332b3..0ebfecc 100644 --- a/doc/RSS-feeds.html +++ b/doc/RSS-feeds.html @@ -32,6 +32,7 @@
  • Browsing and Searching
  • Firefox share
  • RSS feeds
    • +
  • REST API
  • How To
  • How To

    • Publish the GitHub release

    +

    Update release badges

    +

    Update README.md so version badges display and point to the newly released Shaarli version(s).

    Create a GitHub release from a Git tag

    From the previously drafted release:

      diff --git a/doc/Release-Shaarli.md b/doc/Release-Shaarli.md index 556a96e..ced5885 100644 --- a/doc/Release-Shaarli.md +++ b/doc/Release-Shaarli.md @@ -103,6 +103,9 @@ gpg: Good signature from "VirtualTam " [ultimate][](.htm ``` ## Publish the GitHub release +### Update release badges +Update `README.md` so version badges display and point to the newly released Shaarli version(s). + ### Create a GitHub release from a Git tag From the previously drafted release: - edit the release notes (if needed) diff --git a/doc/Security.html b/doc/Security.html index cec2059..12b46fa 100644 --- a/doc/Security.html +++ b/doc/Security.html @@ -69,6 +69,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
    • Browsing and Searching
    • Firefox share
    • RSS feeds
      • +
    • REST API
  • How To
  • How To
      @@ -87,6 +88,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
    • 3rd party libraries
    • Plugin System
    • Release Shaarli
      • +
    • Versioning and Branches
    • Security
    • Static analysis
    • Theming
      • @@ -196,6 +198,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf

      .htaccess

      Shaarli use .htaccess Apache files to deny access to files that shouldn't be directly accessed (datastore, config, etc.). You need the directive AllowOverride All in your virtual host configuration for them to work.

      Warning: If you use Apache 2.2 or lower, you need mod_version to be installed and enabled.

      +

      Apache module mod_rewrite must be enabled to use the REST API. URL rewriting rules for the Slim microframework are stated in the root .htaccess file.

      LightHttpd

      Nginx

      Foreword

      @@ -296,11 +299,14 @@ http { error_log /var/log/nginx/error.log; location /shaarli/ { + try_files $uri /shaarli/index.php$is_args$args; access_log /var/log/nginx/shaarli.access.log; error_log /var/log/nginx/shaarli.error.log; } location ~ (index)\.php$ { + try_files $uri =404; + fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; fastcgi_index index.php; include fastcgi.conf; @@ -335,6 +341,10 @@ location ~ ~$ { } 
      # /etc/nginx/php.conf
 location ~ (index)\.php$ {
+    # Slim - split URL path into (script_filename, path_info)
+    try_files $uri =404;
+    fastcgi_split_path_info ^(.+\.php)(/.+)$;
+
     # filter and proxy PHP requests to PHP-FPM
     fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
     fastcgi_index  index.php;
@@ -367,6 +377,9 @@ http {
         server_name  my.first.domain.org;
 
         location /shaarli/ {
+            # Slim - rewrite URLs
+            try_files $uri /shaarli/index.php$is_args$args;
+
             access_log  /var/log/nginx/shaarli.access.log;
             error_log   /var/log/nginx/shaarli.error.log;
         }
@@ -425,6 +438,9 @@ http {
         ssl_certificate_key  /home/john/ssl/localhost.key;
 
         location /shaarli/ {
+            # Slim - rewrite URLs
+            try_files $uri /index.php$is_args$args;
+
             access_log  /var/log/nginx/shaarli.access.log;
             error_log   /var/log/nginx/shaarli.error.log;
         }
diff --git a/doc/Server-configuration.md b/doc/Server-configuration.md
index df10feb..81cc1a7 100644
--- a/doc/Server-configuration.md
+++ b/doc/Server-configuration.md
@@ -107,6 +107,8 @@ See [Server-side TLS](https://wiki.mozilla.org/Security/Server_Side_TLS#Apache)
 Shaarli use `.htaccess` Apache files to deny access to files that shouldn't be directly accessed (datastore, config, etc.). You need the directive `AllowOverride All` in your virtual host configuration for them to work.
 
 **Warning**: If you use Apache 2.2 or lower, you need [mod_version](https://httpd.apache.org/docs/current/mod/mod_version.html) to be installed and enabled.[](.html)
+ 
+Apache module `mod_rewrite` **must** be enabled to use the REST API. URL rewriting rules for the Slim microframework are stated in the root `.htaccess` file.
 
 ## LightHttpd
 
@@ -218,11 +220,14 @@ http {
         error_log   /var/log/nginx/error.log;
 
         location /shaarli/ {
+            try_files $uri /shaarli/index.php$is_args$args;
             access_log  /var/log/nginx/shaarli.access.log;
             error_log   /var/log/nginx/shaarli.error.log;
         }
 
         location ~ (index)\.php$ {
+            try_files $uri =404;
+            fastcgi_split_path_info ^(.+\.php)(/.+)$;
             fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
             fastcgi_index  index.php;
             include        fastcgi.conf;
@@ -261,6 +266,10 @@ location ~ ~$ {
 ```nginx
 # /etc/nginx/php.conf
 location ~ (index)\.php$ {
+    # Slim - split URL path into (script_filename, path_info)
+    try_files $uri =404;
+    fastcgi_split_path_info ^(.+\.php)(/.+)$;
+
     # filter and proxy PHP requests to PHP-FPM
     fastcgi_pass   unix:/var/run/php-fpm/php-fpm.sock;
     fastcgi_index  index.php;
@@ -299,6 +308,9 @@ http {
         server_name  my.first.domain.org;
 
         location /shaarli/ {
+            # Slim - rewrite URLs
+            try_files $uri /shaarli/index.php$is_args$args;
+
             access_log  /var/log/nginx/shaarli.access.log;
             error_log   /var/log/nginx/shaarli.error.log;
         }
@@ -361,6 +373,9 @@ http {
         ssl_certificate_key  /home/john/ssl/localhost.key;
 
         location /shaarli/ {
+            # Slim - rewrite URLs
+            try_files $uri /index.php$is_args$args;
+
             access_log  /var/log/nginx/shaarli.access.log;
             error_log   /var/log/nginx/shaarli.error.log;
         }
diff --git a/doc/Server-requirements.html b/doc/Server-requirements.html
index 2c2545b..79d7411 100644
--- a/doc/Server-requirements.html
+++ b/doc/Server-requirements.html
@@ -32,6 +32,7 @@
 
    • Browsing and Searching
      • 
 
    • Firefox share
      • 
 
    • RSS feeds
      • 
+
    • REST API
      •
  • How To
      @@ -50,6 +51,7 @@
    • 3rd party libraries
    • Plugin System
    • Release Shaarli
      • +
    • Versioning and Branches
    • Security
    • Static analysis
    • Theming
      • @@ -83,26 +85,31 @@ +7.1 +Supported (v0.9.x) +✅ + + 7.0 Supported ✅ - + 5.6 Supported ✅ - + 5.5 EOL: 2016-07-10 ✅ - + 5.4 EOL: 2015-09-14 ✅ (up to Shaarli 0.8.x) - + 5.3 EOL: 2014-08-14 ✅ (up to Shaarli 0.8.x) @@ -130,6 +137,16 @@ download and install third-party PHP dependencies.

      All Import bookmarks from Netscape files + +erusev/parsedown +All +Parse MarkDown syntax for the MarkDown plugin + + +slim/slim +All +Handle routes and middleware for the REST API +

      Extensions

      diff --git a/doc/Server-requirements.md b/doc/Server-requirements.md index 4962193..07e70ab 100644 --- a/doc/Server-requirements.md +++ b/doc/Server-requirements.md @@ -10,6 +10,7 @@ ### Supported versions Version | Status | Shaarli compatibility :---:|:---:|:---: +7.1 | Supported (v0.9.x) | :white_check_mark: 7.0 | Supported | :white_check_mark: 5.6 | Supported | :white_check_mark: 5.5 | EOL: 2016-07-10 | :white_check_mark: @@ -26,6 +27,8 @@ download and install third-party PHP dependencies. Library | Required? | Usage ---|:---:|--- [`shaarli/netscape-bookmark-parser`](https://packagist.org/packages/shaarli/netscape-bookmark-parser) | All | Import bookmarks from Netscape files[](.html) +[`erusev/parsedown`](https://packagist.org/packages/erusev/parsedown) | All | Parse MarkDown syntax for the MarkDown plugin[](.html) +[`slim/slim`](https://packagist.org/packages/slim/slim) | All | Handle routes and middleware for the REST API[](.html) ### Extensions Extension | Required? | Usage diff --git a/doc/Server-security.html b/doc/Server-security.html index 3551def..4f7ff46 100644 --- a/doc/Server-security.html +++ b/doc/Server-security.html @@ -69,6 +69,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
    • Browsing and Searching
    • Firefox share
    • RSS feeds
      • +
    • REST API
  • How To
  • How To
      @@ -87,6 +88,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
    • 3rd party libraries
    • Plugin System
    • Release Shaarli
      • +
    • Versioning and Branches
    • Security
    • Static analysis
    • Theming
      • @@ -169,6 +171,7 @@ It might be useful if your IP adress often changes.

      Resources

      data_dir: Data directory.
      datastore: Shaarli's links database file path.
      +history: Shaarli's operation history file path.
      updates: File path for the ran updates file.
      log: Log file path.
      update_check: Last update check file path.
      diff --git a/doc/Shaarli-configuration.md b/doc/Shaarli-configuration.md index 4a783c0..25647cb 100644 --- a/doc/Shaarli-configuration.md +++ b/doc/Shaarli-configuration.md @@ -70,6 +70,7 @@ It might be useful if your IP adress often changes. **data_dir**: Data directory. **datastore**: Shaarli's links database file path. +**history**: Shaarli's operation history file path. **updates**: File path for the ran updates file. **log**: Log file path. **update_check**: Last update check file path. diff --git a/doc/Sharing-button.html b/doc/Sharing-button.html index 93710ef..f3682f8 100644 --- a/doc/Sharing-button.html +++ b/doc/Sharing-button.html @@ -32,6 +32,7 @@

    • Browsing and Searching
    • Firefox share
    • RSS feeds
      • +
    • REST API
  • How To
  • How To
  • How To

    • Theming

    -

    User CSS

    +

    Foreword

    +

    There are two ways of customizing how Shaarli looks:

    +
      +
    1. by using a custom CSS to override Shaarli's CSS
      2. +
    2. by using a full theme that provides its own RainTPL templates, CSS and Javascript resources
      3. +
    +

    Custom CSS

    +

    Shaarli's appearance can be modified by adding CSS rules to:

      -
    • Shaarli's apparence can be modified by editing CSS rules in inc/user.css. This file allows to override rules defined in the main inc/shaarli.css (only add changed rules), or define a whole new theme.
      • -
    • Do not edit inc/shaarli.css! Your changes would be overriden when updating Shaarli.
      • -
    • Some themes are available at https://github.com/shaarli/shaarli-themes.
      • +
    • Shaarli < v0.9.0: inc/user.css
      • +
    • Shaarli >= v0.9.0: data/user.css
    -

    See also:

    - -

    RainTPL template

    +

    This file allows overriding rules defined in the template CSS files (only add changed rules), or define a whole new theme.

    +

    Note: Do not edit tpl/default/css/shaarli.css! Your changes would be overridden when updating Shaarli.

    +

    See also Download CSS styles from an OPML list

    +

    Themes

    WARNING - This feature is currently being worked on and will be improved in the next releases. Experimental.

    +

    Installation:

      -
    • Find the template you'd like to install (see the list of available templates|Theming#community-themes--templates)
      • -
    • Find it's git clone URL or download the zip archive for the template.
      • -
    • In your Shaarli tpl/ directory, run git clone https://url/of/my-template/ or unpack the zip archive. +
    • find a theme you'd like to install
      • +
    • copy or clone the theme folder under tpl/<a_sweet_theme>
      • +
    • enable the theme:
        -
      • There should now be a my-template/ directory under the tpl/ dir, containing directly all the template files.
        • +
      • Shaarli < v0.9.0: edit data/config.json.php and set the value of raintpl_tpl to the new theme name:
        +"raintpl_tpl": "tpl\/my-template\/"
        • +
      • Shaarli >= v0.9.0: select the theme through the Tools page
      • -

    • Edit data/config.json.php to have Shaarli use this template, in "resource" e.g.

      -
      "raintpl_tpl": "tpl\/my-template\/",
    -

    Community themes & templates

    +

    Community CSS & themes

    +

    Custom CSS

    + +

    Themes

    +

    Shaarli forks

    + -

    Example installation: AlbinoMouse template

    +

    Example installation: AlbinoMouse theme

    With the following configuration:

    • Apache 2 / PHP 5.6
      • diff --git a/doc/Theming.md b/doc/Theming.md index a21899c..23877e5 100644 --- a/doc/Theming.md +++ b/doc/Theming.md @@ -1,39 +1,51 @@ #Theming -## User CSS +## Foreword +There are two ways of customizing how Shaarli looks: -- Shaarli's apparence can be modified by editing CSS rules in `inc/user.css`. This file allows to override rules defined in the main `inc/shaarli.css` (only add changed rules), or define a whole new theme. -- Do not edit `inc/shaarli.css`! Your changes would be overriden when updating Shaarli. -- Some themes are available at https://github.com/shaarli/shaarli-themes. +1. by using a custom CSS to override Shaarli's CSS +2. by using a full theme that provides its own RainTPL templates, CSS and Javascript resources -See also: -- [Download CSS styles from an OPML list](Download-CSS-styles-from-an-OPML-list.html) +## Custom CSS +Shaarli's appearance can be modified by adding CSS rules to: +- Shaarli < `v0.9.0`: `inc/user.css` +- Shaarli >= `v0.9.0`: `data/user.css` -## RainTPL template +This file allows overriding rules defined in the template CSS files (only add changed rules), or define a whole new theme. +**Note**: Do not edit `tpl/default/css/shaarli.css`! Your changes would be overridden when updating Shaarli. + +See also [Download CSS styles from an OPML list](Download-CSS-styles-from-an-OPML-list.html) + +## Themes _WARNING - This feature is currently being worked on and will be improved in the next releases. Experimental._ -- Find the template you'd like to install (see the list of [available templates|Theming#community-themes--templates](available-templates|Theming#community-themes--templates.html)) -- Find it's git clone URL or download the zip archive for the template. -- In your Shaarli `tpl/` directory, run `git clone https://url/of/my-template/` or unpack the zip archive. - - There should now be a `my-template/` directory under the `tpl/` dir, containing directly all the template files. -- Edit `data/config.json.php` to have Shaarli use this template, in `"resource"` e.g. -```json -"raintpl_tpl": "tpl\/my-template\/", -``` +Installation: +- find a theme you'd like to install +- copy or clone the theme folder under `tpl/` +- enable the theme: + - Shaarli < `v0.9.0`: edit `data/config.json.php` and set the value of `raintpl_tpl` to the new theme name: + `"raintpl_tpl": "tpl\/my-template\/"` + - Shaarli >= `v0.9.0`: select the theme through the _Tools_ page -## Community themes & templates +## Community CSS & themes +### Custom CSS +- [mrjovanovic/serious-theme-shaarli](https://github.com/mrjovanovic/serious-theme-shaarli) - A serious theme for Shaarli[](.html) +- [shaarli/shaarli-themes](https://github.com/shaarli/shaarli-themes)[](.html) + +### Themes - [AkibaTech/Shaarli Superhero Theme](https://github.com/AkibaTech/Shaarli---SuperHero-Theme) - A template/theme for Shaarli[](.html) - [alexisju/albinomouse-template](https://github.com/alexisju/albinomouse-template) - A full template for Shaarli[](.html) -- [ArthurHoaro/shaarli-launch](https://github.com/ArthurHoaro/shaarli-launch) - Customizable Shaarli theme.[](.html) +- [ArthurHoaro/shaarli-launch](https://github.com/ArthurHoaro/shaarli-launch) - Customizable Shaarli theme[](.html) - [dhoko/ShaarliTemplate](https://github.com/dhoko/ShaarliTemplate) - A template/theme for Shaarli[](.html) - [kalvn/shaarli-blocks](https://github.com/kalvn/shaarli-blocks) - A template/theme for Shaarli[](.html) -- [kalvn/Shaarli-Material](https://github.com/kalvn/Shaarli-Material) - A theme (template) based on Google's Material Design for Shaarli, the superfast delicious clone.[](.html) -- [ManufacturaInd/shaarli-2004licious-theme](https://github.com/ManufacturaInd/shaarli-2004licious-theme) - A template/theme as a humble homage to the early looks of the del.icio.us site.[](.html) +- [kalvn/Shaarli-Material](https://github.com/kalvn/Shaarli-Material) - A theme (template) based on Google's Material Design for Shaarli, the superfast delicious clone[](.html) +- [ManufacturaInd/shaarli-2004licious-theme](https://github.com/ManufacturaInd/shaarli-2004licious-theme) - A template/theme as a humble homage to the early looks of the del.icio.us site[](.html) + +### Shaarli forks - [misterair/Limonade](https://github.com/misterair/limonade) - A fork of (legacy) Shaarli with a new template[](.html) -- [mrjovanovic/serious-theme-shaarli](https://github.com/mrjovanovic/serious-theme-shaarli) - A serious theme for SHaarli.[](.html) - [vivienhaese/shaarlitheme](https://github.com/vivienhaese/shaarlitheme) - A Shaarli fork meant to be run in an openshift instance[](.html) -### Example installation: AlbinoMouse template +## Example installation: AlbinoMouse theme With the following configuration: - Apache 2 / PHP 5.6 - user sites are enabled, e.g. `/home/user/public_html/somedir` is served as `http://localhost/~user/somedir` diff --git a/doc/Troubleshooting.html b/doc/Troubleshooting.html index ed1c6f0..f43e6ed 100644 --- a/doc/Troubleshooting.html +++ b/doc/Troubleshooting.html @@ -69,6 +69,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
    • Browsing and Searching
    • Firefox share
    • RSS feeds
      • +
    • REST API
  • How To
      @@ -87,6 +88,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
    • 3rd party libraries
    • Plugin System
    • Release Shaarli
      • +
    • Versioning and Branches
    • Security
    • Static analysis
    • Theming
      • @@ -172,7 +174,7 @@ Search for failed in this file to look for unauthorized login attem
    • If you have the error Warning: file_get_contents() [function.file-get-contents]: URL file-access is disabled in the server configuration in /…/index.php on line xxx, it means that your host has disabled the ability to fetch a file by HTTP in the php config (Typically in 1and1 hosting). Bad host. Change host. Or comment the following lines:
    //list($status,$headers,$data) = getHTTP($url,4); // Short timeout to keep the application responsive.
-// FIXME: Decode charset according to charset specified in either 1) HTTP response headers or 2) <head> in html 
+// FIXME: Decode charset according to charset specified in either 1) HTTP response headers or 2) <head> in html 
 //if (strpos($status,'200 OK')) $title=html_extract_title($data);
    • On hosts which forbid outgoing HTTP requests (such as free.fr), some thumbnails will not work.
      • diff --git a/doc/Unit-tests.html b/doc/Unit-tests.html index 266fd33..0961146 100644 --- a/doc/Unit-tests.html +++ b/doc/Unit-tests.html @@ -69,6 +69,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
    • Browsing and Searching
    • Firefox share
    • RSS feeds
      • +
    • REST API
  • How To +

    Executing specific tests

    +

    Add a @group annotation in a test class or method comment:

    +
    /**
+ * Netscape bookmark import
+ * @group WIP
+ */
+class BookmarkImportTest extends PHPUnit_Framework_TestCase
+{
+   [...][](.html)
+}
    +

    To run all tests annotated with @group WIP:

    +
    $ vendor/bin/phpunit --group WIP tests/
    diff --git a/doc/Unit-tests.md b/doc/Unit-tests.md index f288878..0942ad3 100644 --- a/doc/Unit-tests.md +++ b/doc/Unit-tests.md @@ -126,3 +126,22 @@ If Xdebug has been installed and activated, two coverage reports will be generat * a summary in the console * a detailed HTML report with metrics for tested code * to open it in a web browser: `firefox coverage/index.html &` + +### Executing specific tests +Add a [`@group`](https://phpunit.de/manual/current/en/appendixes.annotations.html#appendixes.annotations.group) annotation in a test class or method comment:[](.html) + +```php +/** + * Netscape bookmark import + * @group WIP + */ +class BookmarkImportTest extends PHPUnit_Framework_TestCase +{ + [...][](.html) +} +``` + +To run all tests annotated with `@group WIP`: +```bash +$ vendor/bin/phpunit --group WIP tests/ +``` diff --git a/doc/Upgrade-and-migration.html b/doc/Upgrade-and-migration.html index a5b041d..667215a 100644 --- a/doc/Upgrade-and-migration.html +++ b/doc/Upgrade-and-migration.html @@ -69,6 +69,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
  • Browsing and Searching
  • Firefox share
  • RSS feeds
    • +
  • REST API
  • How To