shaarli · pikzen · Jan 29, 2015 · Feb 9, 2015
diff --git a/COPYING b/COPYING
@@ -63,6 +63,10 @@ Copyright: 2011-2012, Federico Ulfo <[email protected]>
            2011-2012, The Rain Team <[email protected]>
 License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt)
 
+Files: vendor/symfony/*
+License: MIT (http://opensource.org/licenses/MIT)
+Copyright: (C) 2004-2015 Fabien Potencier http://symfony.com/
+
 ----------------------------------------------------
 ZLIB/LIBPNG LICENSE
 

diff --git a/data/conf.dist.yaml b/data/conf.dist.yaml
@@ -0,0 +1,40 @@
+dev: true
+dirs:
+    data: data/
+    cache: cache/
+    pagecache: pagecache/
+    raintpl_temp: tmp/
+    raintpl_templates: tpl/
+files:
+    user: config.php
+    datastore: datastore.php
+    ipbans: ipbans.php
+    update: lastupdatecheck.txt
+bans:
+    ban_after: 4
+    ban_duration: 1800
+display:
+    links_per_page: 20
+    hide_timestamps: false
+    show_atom: false
+    enable_thumbnails: true
+    title: 'Shared links'
+    page_title: ''
+    timezone: 'Europe/London'
+    default_link_name: '?'
+cache:
+    enable: true
+security:
+    open_shaarli: false
+    disable_session_protection: false
+    disable_jquery: false
+    private_links_by_default: false
+pubsubhub:
+    url: ''
+update:
+    interval: 86400
+rss:
+    permalink_in_title: true
+redirector: ''
+plugins:
+    archive_org: true
diff --git a/index.php b/index.php
diff --git a/tpl/addlink.html b/tpl/addlink.html
diff --git a/tpl/changepassword.html b/tpl/changepassword.html
diff --git a/tpl/changetag.html b/tpl/changetag.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>{include="includes"}
-{if="empty($GLOBALS['disablejquery'])"}<script src="inc/jquery.min.js#"></script><script src="inc/jquery-ui.min.js#"></script>{/if}
+{if="!$options.security.disable_jquery"}<script src="inc/jquery.min.js#"></script><script src="inc/jquery-ui.min.js#"></script>{/if}
 </head>
 <body onload="document.changetag.fromtag.focus();">
 <div id="pageheader">
@@ -15,7 +15,7 @@
 <script>function confirmDeleteTag() { var agree=confirm("Are you sure you want to delete this tag from all links ?"); if (agree) return true ; else return false ; }</script>
 </div>
 {include="page.footer"}
-{if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"}
+{if="($options.security.open_shaarli || $logged_in) && !$options.security.disable_jquery"}
 <script>
 $(document).ready(function()
 {

diff --git a/tpl/configure.html b/tpl/configure.html
@@ -4,7 +4,7 @@
 <body onload="document.configform.title.focus();">
 <div id="pageheader">
 	{include="page.header"}
-{$timezone_js}
+	{$timezone_js}
     <form method="POST" action="#" name="configform" id="configform">
 	<input type="hidden" name="token" value="{$token}">
 	<table id="configuration_table">
@@ -16,18 +16,23 @@
 
 	    <tr><td><b>Redirector</b></td><td><input type="text" name="redirector" id="redirector" size="50" value="{$redirector}"><br>(e.g. <i>http://anonym.to/?</i> will mask the HTTP_REFERER)</td></tr>
 
-        <tr><td><b>Security:</b></td><td><input type="checkbox" name="disablesessionprotection" id="disablesessionprotection" {if="!empty($GLOBALS['disablesessionprotection'])"}checked{/if}><label for="disablesessionprotection">&nbsp;Disable session cookie hijacking protection (Check this if you get disconnected often or if your IP address changes often.)</label></td></tr>
+        <tr><td><b>Security:</b></td><td><input type="checkbox" name="disablesessionprotection" id="disablesessionprotection" {if="$options.security.disable_session_protection"}checked{/if}><label for="disablesessionprotection">&nbsp;Disable session cookie hijacking protection (Check this if you get disconnected often or if your IP address changes often.)</label></td></tr>
 
         <tr><td><b>Features:</b></td><td>
-        	<input type="checkbox" name="disablejquery" id="disablejquery" {if="!empty($GLOBALS['disablejquery'])"}checked{/if}><label for="disablejquery">&nbsp;Disable jQuery and all heavy JavaScript (for example: Autocomplete in tags. Useful for slow computers.)</label>
+        	<input type="checkbox" name="disablejquery" id="disablejquery" {if="$options.security.disable_jquery"}checked{/if}><label for="disablejquery">&nbsp;Disable jQuery and all heavy JavaScript (for example: Autocomplete in tags. Useful for slow computers.)</label>
         </td></tr>
-        <tr><td valign="top"><b>New link:</b></td><td>
-        	<input type="checkbox" name="privateLinkByDefault" id="privateLinkByDefault" {if="!empty($GLOBALS['privateLinkByDefault'])"}checked{/if}/><label for="privateLinkByDefault">&nbsp;All new links are private by default</label></td>
+        <tr>
+		<td>
+			<b>New link:</b>
+		</td>
+		<td>
+	        	<input type="checkbox" name="privateLinkByDefault" id="privateLinkByDefault" {if="$options.security.private_links_by_default"}checked{/if}/><label for="privateLinkByDefault">&nbsp;All new links are private by default</label>
+		</td>
         </tr>
         <tr>
         	<td valign="top"><b>Enable RSS Permalinks</b></td>
         	<td>
-        		<input type="checkbox" name="enableRssPermalinks" id="enableRssPermalinks" {if="!empty($GLOBALS['config']['ENABLE_RSS_PERMALINKS'])"}checked{/if}/><label for="enableRssPermalinks">&nbsp;Switches the RSS feed URLs between full URLs and shortlinks. Enabling it will show a permalink in the description, and the feed item will be linked to the absolute URL. Disabling it swaps this behaviour around (permalink in title and link in description). RSS Permalinks are currently <b>{if="$GLOBALS['config']['ENABLE_RSS_PERMALINKS']"}enabled{else}disabled{/if}</b></label>
+        		<input type="checkbox" name="enableRssPermalinks" id="enableRssPermalinks" {if="!$options.rss.permalink_in_title"}checked{/if}/><label for="enableRssPermalinks">&nbsp;Switches the RSS feed URLs between full URLs and shortlinks. Enabling it will show a permalink in the description, and the feed item will be linked to the absolute URL. Disabling it swaps this behaviour around (permalink in title and link in description). RSS Permalinks are currently <b>{if="!$options.rss.permalink_in_title"}enabled{else}disabled{/if}</b></label>
         	</td>
         </tr>
 	  <tr><td></td><td class="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr>

diff --git a/tpl/daily.html b/tpl/daily.html
@@ -28,7 +28,7 @@
                                 <img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink">
                             </a>
                         </div>
-                        {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
+                        {if="$options.display.hide_timestamps || $logged_in"}
                             <div class="dailyEntryLinkdate">
                                 <a href="?{$link.linkdate|smallHash}">{$link.localdate}</a>
                             </div>

diff --git a/tpl/dailyrss.html b/tpl/dailyrss.html
@@ -1,6 +1,6 @@
 {loop="links"}
 	<h3><a href="{$value.url}">{$value.title|htmlspecialchars}</a></h3>
-	<small>{if="!$GLOBALS['config']['HIDE_TIMESTAMPS']"}{$value.localdate|htmlspecialchars} - {/if}{if="$value.tags"}{$value.tags|htmlspecialchars}{/if}<br>
+	<small>{if="!$options.display.hide_timestamps"}{$value.localdate|htmlspecialchars} - {/if}{if="$value.tags"}{$value.tags|htmlspecialchars}{/if}<br>
 	{$value.url|htmlspecialchars}</small><br>
 	{if="$value.thumbnail"}{$value.thumbnail}{/if}<br>
 	{if="$value.description"}{$value.formatedDescription}{/if}

diff --git a/tpl/editlink.html b/tpl/editlink.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>{include="includes"}
-{if="empty($GLOBALS['disablejquery'])"}<script src="inc/jquery-1.11.2.min.js#"></script><script src="inc/jquery-ui-1.11.2.min.js#"></script>{/if}
+{if="!$options.security.disable_jquery"}<script src="inc/jquery-1.11.2.min.js#"></script><script src="inc/jquery-ui-1.11.2.min.js#"></script>{/if}
 </head>
 <body
 {if="$link.title==''"}onload="document.linkform.lf_title.focus();"
@@ -16,7 +16,7 @@
 	        <i>Title</i><br><input type="text" name="lf_title" value="{$link.title|htmlspecialchars}" class="lf_input"><br>
 	        <i>Description</i><br><textarea name="lf_description" rows="4" cols="25">{$link.description|htmlspecialchars}</textarea><br>
 	        <i>Tags</i><br><input type="text" id="lf_tags" name="lf_tags" value="{$link.tags|htmlspecialchars}" class="lf_input"><br>
-	        {if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}
+	        {if="($link_is_new && $options.security.private_links_by_default) || $link.private == true"}
             <input type="checkbox" checked="checked" name="lf_private" id="lf_private">
             &nbsp;<label for="lf_private"><i>Private</i></label><br>
             {else}
@@ -32,7 +32,7 @@
 	</div>
 </div>
 {include="page.footer"}
-{if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn()) && empty($GLOBALS['disablejquery'])"}
+{if="($options.security.open_shaarli || $logged_in) && $options.security.disable_jquery"}
 <script>
 $(document).ready(function()
 {

diff --git a/tpl/export.html b/tpl/export.html
diff --git a/tpl/import.html b/tpl/import.html
diff --git a/tpl/includes.html b/tpl/includes.html
diff --git a/tpl/install.html b/tpl/install.html
diff --git a/tpl/linklist.html b/tpl/linklist.html
@@ -11,7 +11,6 @@
 </div>
 
 <div id="linklist">
-
     {include="linklist.paging"}
 
     {if="count($links)==0"}
@@ -33,7 +32,7 @@
             <a id="{$value.linkdate|smallHash}"></a>
             <div class="thumbnail">{$value.url|thumbnail}</div>
             <div class="linkcontainer">
-                {if="isLoggedIn()"}
+                {if="$logged_in"}
                     <div class="linkeditbuttons">
                         <form method="GET" class="buttoneditform"><input type="hidden" name="edit_link" value="{$value.linkdate}"><input type="image" alt="Edit" src="images/edit_icon.png#" title="Edit" class="button_edit"></form><br>
                         <form method="POST" class="buttoneditform"><input type="hidden" name="lf_linkdate" value="{$value.linkdate}">
@@ -43,12 +42,12 @@
                 <span class="linktitle"><a href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a></span>
                 <br>
                 {if="$value.description"}<div class="linkdescription">{$value.description}</div>{/if}
-                {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
+                {if="!$options.display.hide_timestamps || $logged_in"}
                     <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{$value.localdate|htmlspecialchars} - permalink</a> - </span>
                 {else}
                     <span class="linkdate" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span>
                 {/if}
-                {if="$GLOBALS['config']['ARCHIVE_ORG']"}
+                {if="$options.plugins.archive_org"}
                 <span class="linkarchive"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">archive</a> - </span>
                 {/if}
                 <div class="linkqrcode"><a href="http://qrfree.kaywa.com/?l=1&amp;s=8&amp;d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}"

diff --git a/tpl/linklist.paging.html b/tpl/linklist.paging.html
@@ -1,5 +1,5 @@
 <div class="paging">
-{if="isLoggedIn()"}
+{if="$logged_in"}
     <div class="paging_privatelinks">
         <a href="?privateonly">
 		{if="$privateonly"}

diff --git a/tpl/loginform.html b/tpl/loginform.html
diff --git a/tpl/page.footer.html b/tpl/page.footer.html
@@ -4,6 +4,6 @@
 {if="$newversion"}
     <div id="newversion"><span id="version_id">&#x25CF;</span> Shaarli {$newversion|htmlspecialchars} is <a href="https://github.com/shaarli/Shaarli/releases">available</a>.</div>
 {/if}
-{if="isLoggedIn()"}
+{if="$logged_in"}
 <script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>
 {/if}
diff --git a/tpl/page.header.html b/tpl/page.header.html
@@ -8,15 +8,15 @@
     {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore}
 {else}
     <a href="?" class="nomobile">Home</a>
-    {if="isLoggedIn()"}
+    {if="$logged_in"}
         <a href="?do=logout">Logout</a><a href="?do=tools">Tools</a><a href="?do=addlink"><b>Add link</b></a>
-    {elseif="$GLOBALS['config']['OPEN_SHAARLI']"}
+    {elseif="$options.security.open_shaarli"}
         <a href="?do=tools">Tools</a><a href="?do=addlink"><b>Add link</b></a>
     {else}
         <a href="?do=login">Login</a>
     {/if}
     <a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a>
-    {if="$GLOBALS['config']['SHOW_ATOM']"}
+    {if="$options.display.show_atom"}
         <a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a>
     {/if}
     <a href="?do=tagcloud">Tag cloud</a>

diff --git a/tpl/page.html b/tpl/page.html
diff --git a/tpl/picwall.html b/tpl/picwall.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>{include="includes"}
-{if="empty($GLOBALS['disablejquery'])"}	
+{if="!$options.security.disable_jquery"}	
 <script src="inc/jquery-1.11.2.min.js#"></script>
 <script src="inc/jquery-ui-1.11.2.min.js#"></script>
 <script src="inc/jquery.lazyload-1.9.3.min.js#"></script>
@@ -20,7 +20,7 @@
 </div>
 {include="page.footer"}
 
-{if="empty($GLOBALS['disablejquery'])"} 
+{if="!$options.security.disable_jquery"} 
 <script>
 $(document).ready(function() {
     $("img.lazyimage").show().lazyload();

diff --git a/tpl/picwall2.html b/tpl/picwall2.html
diff --git a/tpl/readme.txt b/tpl/readme.txt
diff --git a/tpl/tagcloud.html b/tpl/tagcloud.html
diff --git a/tpl/tools.html b/tpl/tools.html
@@ -5,7 +5,7 @@
 <div id="pageheader">
 	{include="page.header"}
 	<div id="toolsdiv">
-		{if="!$GLOBALS['config']['OPEN_SHAARLI']"}<a href="?do=changepasswd"><b>Change password</b>  <span>: Change your password.</span></a><br><br>{/if}
+		{if="!$options.security.open_shaarli"}<a href="?do=changepasswd"><b>Change password</b>  <span>: Change your password.</span></a><br><br>{/if}
 		<a href="?do=configure"><b>Configure your Shaarli</b> <span>:  Change Title, timezone...</span></a><br><br>
 		<a href="?do=changetag"><b>Rename/delete tags</b> <span>:  Rename or delete a tag in all links</span></a><br><br>
 		<a href="?do=import"><b>Import</b> <span>:  Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)</span></a> <br><br>

diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/.gitignore b/vendor/symfony/yaml/Symfony/Component/Yaml/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/CHANGELOG.md b/vendor/symfony/yaml/Symfony/Component/Yaml/CHANGELOG.md
@@ -0,0 +1,8 @@
+CHANGELOG
+=========
+
+2.1.0
+-----
+
+ * Yaml::parse() does not evaluate loaded files as PHP files by default
+   anymore (call Yaml::enablePhpParsing() to get back the old behavior)
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Dumper.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Dumper.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml;
+
+/**
+ * Dumper dumps PHP variables to YAML strings.
+ *
+ * @author Fabien Potencier <[email protected]>
+ */
+class Dumper
+{
+    /**
+     * The amount of spaces to use for indentation of nested nodes.
+     *
+     * @var int
+     */
+    protected $indentation = 4;
+
+    /**
+     * Sets the indentation.
+     *
+     * @param int $num The amount of spaces to use for indentation of nested nodes.
+     */
+    public function setIndentation($num)
+    {
+        $this->indentation = (int) $num;
+    }
+
+    /**
+     * Dumps a PHP value to YAML.
+     *
+     * @param mixed $input                  The PHP value
+     * @param int   $inline                 The level where you switch to inline YAML
+     * @param int   $indent                 The level of indentation (used internally)
+     * @param bool  $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param bool  $objectSupport          true if object support is enabled, false otherwise
+     *
+     * @return string The YAML representation of the PHP value
+     */
+    public function dump($input, $inline = 0, $indent = 0, $exceptionOnInvalidType = false, $objectSupport = false)
+    {
+        $output = '';
+        $prefix = $indent ? str_repeat(' ', $indent) : '';
+
+        if ($inline <= 0 || !is_array($input) || empty($input)) {
+            $output .= $prefix.Inline::dump($input, $exceptionOnInvalidType, $objectSupport);
+        } else {
+            $isAHash = array_keys($input) !== range(0, count($input) - 1);
+
+            foreach ($input as $key => $value) {
+                $willBeInlined = $inline - 1 <= 0 || !is_array($value) || empty($value);
+
+                $output .= sprintf('%s%s%s%s',
+                    $prefix,
+                    $isAHash ? Inline::dump($key, $exceptionOnInvalidType, $objectSupport).':' : '-',
+                    $willBeInlined ? ' ' : "\n",
+                    $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + $this->indentation, $exceptionOnInvalidType, $objectSupport)
+                ).($willBeInlined ? "\n" : '');
+            }
+        }
+
+        return $output;
+    }
+}