Merge branch 'master' into myShaarli

README.md

@@ -45,7 +45,7 @@ http://sebsauvage.net/wiki/doku.php?id=php:shaarli
 
 myShaarli Features :
 
- * Markdown syntax
+ * Markdown support (web+RSS+Atom)
  * Define external thumbnailer
  * Add favicon
  * Better configuration page
@@ -54,7 +54,7 @@ myShaarli Features :
  * New default theme
  * Add link to archive.org (qwertygc https://github.com/nodiscc/Shaarli/commit/b113dc8e6bba052883297ab575dd36fd3073805e)
  * myShaali can use Firefox social API (Marsup https://github.com/shaarli/Shaarli/commit/d33c5d4c3b9c70441391a08e8bcb2a8c639a4635)
- * myShaali can post original article to wallabag (nodiscc https://github.com/nodiscc/Shaarli/tree/new-plugin-system/tpl/plugins/wallabag)
+ * myShaali can post original article to Wallabag (v1/v2)(nodiscc https://github.com/nodiscc/Shaarli/tree/new-plugin-system/tpl/plugins/wallabag)
  * myShaali implement OpenSearch (ArthurHoaro https://github.com/shaarli/Shaarli/issues/176)
  * Few small fix
  * You can upgrade original Shaarli to myShaarli without lost your data

index.php

@@ -32,7 +32,7 @@
                                           // Note: You must have publisher.php in the same directory as Shaarli index.php
 $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
-$GLOBALS['config']['UPDATECHECK_URL'] = 'http://book.knah-tsaeb.org/shaarli_version.txt'; // Define last version of myShaarli
+$GLOBALS['config']['UPDATECHECK_URL'] = 'https://book.knah-tsaeb.org/shaarli_version.txt'; // Define last version of myShaarli
 $GLOBALS['config']['UPDATECHECK_DOWNLOAD'] = 'https://forge.leslibres.org/Knah-Tsaeb/MyShaarli';
 $GLOBALS['config']['ENABLE_UPDATECHECK'] = true;
 $GLOBALS['config']['externalThumbshot'] = ''; // Url for external thumbnailer
@@ -40,6 +40,7 @@
                                               // the last param must be a url
 $GLOBALS['config']['ENABLE_MARKDOWN'] = true;
 $GLOBALS['config']['WALLABAG_URL'] = '';
+$GLOBALS['config']['WALLABAG_VERSION'] = ''; // 1 for V1 or 2 for v2
 $GLOBALS['config']['contactLink'] = ''; // Define link for contact Example : http://example.com/contact.php or mailo:contact@example.com
 $GLOBALS['config']['THEME'] = 'myShaarli';
 $GLOBALS['config']['DATE_FORMAT'] = '%A %d %B %Y %T'; // see http://php.net/manual/en/function.strftime.php for more example
@@ -54,7 +55,7 @@
     require $GLOBALS['config']['DATADIR'].'/options.php';
 }
 
-define('myShaarli_version', '1.1.4');
+define('myShaarli_version', '1.1.5');
 define('PHPPREFIX', '<?php /* '); // Prefix to encapsulate data in php code.
 define('PHPSUFFIX', ' */ ?>'); // Suffix to encapsulate data in php code.
 // http://server.com/x/shaarli --> /shaarli/
@@ -206,7 +207,7 @@ function checkUpdate()
     if (!is_file($GLOBALS['config']['UPDATECHECK_FILENAME']) || (filemtime($GLOBALS['config']['UPDATECHECK_FILENAME']) < time() - ($GLOBALS['config']['UPDATECHECK_INTERVAL']))) {
         $version = myShaarli_version;
         list($httpstatus, $headers, $data) = getHTTP($GLOBALS['config']['UPDATECHECK_URL'], 2);
-        if (strpos($httpstatus, '200 OK') !== false) {
+        if (strpos($httpstatus, '200 OK') !== false || strpos($httpstatus, '301') !== false) {
             $version = $data;
         }
           // If failed, nevermind. We don't want to bother the user with that.
@@ -223,7 +224,6 @@ function checkUpdate()
     if (version_compare(strtolower(myShaarli_version), strtolower($newestversion)) == -1) {
         return 'New update of myShaarli available.';
     }
-
     return false;
 }
 
@@ -1770,6 +1770,9 @@ function renderPage()
             $GLOBALS['config']['contactLink'] = $_POST['contactLink'];
             $_SESSION['LINKS_PER_PAGE'] = (int) $_POST['linkPerPage'];
             $GLOBALS['config']['DATE_FORMAT'] = strip_tags($_POST['dateFormat']);
+            $GLOBALS['config']['WALLABAG_URL'] = $_POST['wallabagUrl'];
+            $GLOBALS['config']['WALLABAG_VERSION'] = (int)$_POST['wallabagVersion'];
+
             writeConfig();
             echo '<script>alert("Configuration was saved.");document.location=\'?do=configure\';</script>';
             exit;
@@ -2811,7 +2814,10 @@ function writeConfig()
     $config .= '$GLOBALS[\'config\'][\'externalThumbshot\'] = '.var_export($GLOBALS['config']['externalThumbshot'], true).';'."\n";
     $config .= '$GLOBALS[\'config\'][\'contactLink\'] = '.var_export($GLOBALS['config']['contactLink'], true).';'."\n";
     $config .= '$GLOBALS[\'config\'][\'DATE_FORMAT\'] = '.var_export($GLOBALS['config']['DATE_FORMAT'], true).';'."\n";
-    if (!file_put_contents($GLOBALS['config']['CONFIG_FILE'], $config) || strcmp(file_get_contents($GLOBALS['config']['CONFIG_FILE']), $config) != 0) {
+    $config .= '$GLOBALS[\'config\'][\'WALLABAG_URL\'] = '.var_export($GLOBALS['config']['WALLABAG_URL'], true).';'."\n";
+    $config .= '$GLOBALS[\'config\'][\'WALLABAG_VERSION\'] = '.var_export($GLOBALS['config']['WALLABAG_VERSION'], true).';'."\n";
+    if (!file_put_contents($GLOBALS['config']['CONFIG_FILE'],$config) || strcmp(file_get_contents($GLOBALS['config']['CONFIG_FILE']),$config)!=0)
+    {
         echo '<script>alert("Shaarli could not create the config file. Please make sure Shaarli has the right to write in the folder is it installed in.");document.location=\'?\';</script>';
         exit;
     }

shaarli_version.txt

@@ -1 +1 @@
-1.1.4
+1.1.5

tpl/myShaarli/configure.html

@@ -1,13 +1,14 @@
 <!DOCTYPE html>
 <html>
+
     <head>
         {include="includes"}
         <link type="text/css" rel="stylesheet" href="myShaarli.css?version={$version|urlencode}" />
     </head>
+
     <body>
         <div id="pageheader">
-      {include="page.header"}
+            {include="page.header"} {$timezone_js}
-      {$timezone_js}
         </div>
         <div>
             <form method="post" action="" name="configform" id="configform">
@@ -26,7 +27,7 @@
                             </p>
                             <p>
                                 <label for="contactLink">Contact link in footer: </label>
-                <input type="text" name="contactLink" id="contactLink" value="{$GLOBALS['config']['contactLink']}"/>
+                                <input type="text" name="contactLink" id="contactLink" value="{$GLOBALS['config']['contactLink']}" />
                                 <span>Example : http://example.com/contact.php or mailo:contact@example.com</span>
                             </p>
                             <p>
@@ -35,8 +36,7 @@
                             </p>
                             <p>
                                 <label for="redirector">Redirector : </label>
-                <input type="text" name="redirector" id="redirector" value="{$redirector}">
+                                <input type="text" name="redirector" id="redirector" value="{$redirector}"> (e.g. <i>http://anonym.to/?</i> will mask the HTTP_REFERER)
-                (e.g. <i>http://anonym.to/?</i> will mask the HTTP_REFERER)
                             </p>
                             <p>
                                 <label for="enableCache">Enable local cache : </label>
@@ -46,7 +46,7 @@
                     </li>
                     <li>
                         <input type="radio" name="tabs" id="tab2">
-            <label class="tabsLabel" for="tab2" >&#9658; Security</label>
+                        <label class="tabsLabel" for="tab2">&#9658; Security</label>
                         <div id="tab-content2" class="tab-content">
                             <p>
                                 <label for="disablesessionprotection">Security :</label>
@@ -55,12 +55,11 @@
                             </p>
                             <p>
                                 <label for="banAfter">Ban after : </label>
-                <input type="text" name="banAfter" id="banAfter" value="{$GLOBALS['config']['BAN_AFTER']}"/>
+                                <input type="text" name="banAfter" id="banAfter" value="{$GLOBALS['config']['BAN_AFTER']}" />
                             </p>
                             <p>
                                 <label for="banDuration">Ban time : </label>
-                <input type="text" name="banDuration" id="banDuration" value="{$GLOBALS['config']['BAN_DURATION']}"/>
+                                <input type="text" name="banDuration" id="banDuration" value="{$GLOBALS['config']['BAN_DURATION']}" /> in second
-                in second
                             </p>
                             <p>
                                 <label for="updateCheck">Update :</label>
@@ -83,7 +82,7 @@
                             </p>
                             <p>
                                 <label for="linkPerPage">Link per page : </label>
-                <input type="text" name="linkPerPage" id="linkPerPage" value="{$GLOBALS['config']['LINKS_PER_PAGE']}"/>
+                                <input type="text" name="linkPerPage" id="linkPerPage" value="{$GLOBALS['config']['LINKS_PER_PAGE']}" />
                             </p>
                             <p>
                                 <label for="hideTimestamps">Hide timestamps : </label>
@@ -91,7 +90,8 @@
                             </p>
                             <p>
                                 <label for="dateFormat">Date Format : </label>
-                <input type="text" name="dateFormat" id="dateFormat" value="{$GLOBALS['config']['DATE_FORMAT']}"/><label>See <a href="http://php.net/manual/en/function.strftime.php">PHP documentation</a></label>
+                                <input type="text" name="dateFormat" id="dateFormat" value="{$GLOBALS['config']['DATE_FORMAT']}" />
+                                <label>See <a href="http://php.net/manual/en/function.strftime.php">PHP documentation</a></label>
                             </p>
                         </div>
                     </li>
@@ -120,6 +120,17 @@
                                 <label for="enableFavicon">Enable favicon : </label>
                                 <input type="checkbox" name="enableFavicon" id="enableFavicon" {if="!empty($GLOBALS['config']['ENABLE_FAVICON'])"}checked{/if}/>
                             </p>
+                            <p>
+                                <label for="wallabagUrl">Wallabag URL : </label>
+                                <input type="text" name="wallabagUrl" id="wallabagUrl" value="{$GLOBALS['config']['WALLABAG_URL']}">
+                            </p>
+                            <p>
+                                <label for="wallabagVersion">Wallabag version : </label>
+                                <select name="wallabagVersion" id="wallabagVersion">
+                                    <option {if="$GLOBALS['config']['WALLABAG_VERSION']===1"}selected{/if} value="1">v1</option>
+                                    <option {if="$GLOBALS['config']['WALLABAG_VERSION']===2"}selected{/if} value="2">v2</option>
+                                </select>
+                            </p>
                         </div>
                     </li>
                 </ul>
@@ -131,4 +142,5 @@
         </div>
         {include="page.footer"}
     </body>
+
 </html>

tpl/myShaarli/linklist.html

@@ -80,9 +80,12 @@ <h3 class="linktitle">{function="returnFavicon($value.url)"}<a href="{$redirecto
             <span class="linkdate linkBottom" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span>
             {/if}
             <span class="linkarchive linkBottom"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">Archive.org</a> - </span>
-            {if="$GLOBALS['config']['WALLABAG_URL'] && isLoggedIn()"}
+            {if="$GLOBALS['config']['WALLABAG_URL'] && isLoggedIn() && $GLOBALS['config']['WALLABAG_VERSION']===1"}
             <span class="linkWallabag linkBottom"><a href="{$GLOBALS['config']['WALLABAG_URL']}/?plainurl={$value.url|htmlspecialchars}">Save to Wallabag</a> - </span>
             {/if}
+            {if="$GLOBALS['config']['WALLABAG_URL'] && isLoggedIn() && $GLOBALS['config']['WALLABAG_VERSION']===2"}
+            <span class="linkWallabag linkBottom"><a href="{$GLOBALS['config']['WALLABAG_URL']}/bookmarklet?url={$value.url|htmlspecialchars}">Save to Wallabag</a> - </span>
+            {/if}
             <span><a href="http://qrfree.kaywa.com/?l=1&amp;s=8&d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}"
               onclick="showQrCode(this); return false;" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}"><img src="images/qrcode.png#" title="QR-Code" alt="qrcode logo"></a></span> - <span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span>
             <br>

tpl/myShaarli_Columns/configure.html

@@ -113,6 +113,17 @@
                 <label for="enableFavicon">Enable favicon : </label>
                 <input type="checkbox" name="enableFavicon" id="enableFavicon" {if="!empty($GLOBALS['config']['ENABLE_FAVICON'])"}checked{/if}/>
               </p>
+              <p>
+                  <label for="wallabagUrl">Wallabag URL : </label>
+                  <input type="text" name="wallabagUrl" id="wallabagUrl" value="{$GLOBALS['config']['WALLABAG_URL']}">
+              </p>
+              <p>
+                  <label for="wallabagVersion">Wallabag version : </label>
+                  <select name="wallabagVersion" id="wallabagVersion">
+                      <option {if="$GLOBALS['config']['WALLABAG_VERSION']===1"}selected{/if} value="1">v1</option>
+                      <option {if="$GLOBALS['config']['WALLABAG_VERSION']===2"}selected{/if} value="2">v2</option>
+                  </select>
+              </p>
             </div>
           </li>
         </ul>

tpl/myShaarli_Columns/linklist.html

@@ -80,9 +80,12 @@ <h3 class="linktitle">{function="returnFavicon($value.url)"}<a href="{$redirecto
             <span class="linkdate linkBottom" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span>
             {/if}
             <span class="linkarchive linkBottom"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">Archive.org</a> - </span>
-            {if="$GLOBALS['config']['WALLABAG_URL'] && isLoggedIn()"}
+            {if="$GLOBALS['config']['WALLABAG_URL'] && isLoggedIn() && $GLOBALS['config']['WALLABAG_VERSION']===1"}
             <span class="linkWallabag linkBottom"><a href="{$GLOBALS['config']['WALLABAG_URL']}/?plainurl={$value.url|htmlspecialchars}">Save to Wallabag</a> - </span>
             {/if}
+            {if="$GLOBALS['config']['WALLABAG_URL'] && isLoggedIn() && $GLOBALS['config']['WALLABAG_VERSION']===2"}
+            <span class="linkWallabag linkBottom"><a href="{$GLOBALS['config']['WALLABAG_URL']}/bookmarklet?url={$value.url|htmlspecialchars}">Save to Wallabag</a> - </span>
+            {/if}
             <span><a href="http://qrfree.kaywa.com/?l=1&amp;s=8&d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}"
               onclick="showQrCode(this); return false;" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}"><img src="images/qrcode.png#" title="QR-Code" alt="qrcode logo"></a></span> - <span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span>
             <br>

tpl/original/configure.html

@@ -113,6 +113,17 @@
                 <label for="enableFavicon">Enable favicon : </label>
                 <input type="checkbox" name="enableFavicon" id="enableFavicon" {if="!empty($GLOBALS['config']['ENABLE_FAVICON'])"}checked{/if}/>
               </p>
+              <p>
+                  <label for="wallabagUrl">Wallabag URL : </label>
+                  <input type="text" name="wallabagUrl" id="wallabagUrl" value="{$GLOBALS['config']['WALLABAG_URL']}">
+              </p>
+              <p>
+                  <label for="wallabagVersion">Wallabag version : </label>
+                  <select name="wallabagVersion" id="wallabagVersion">
+                      <option {if="$GLOBALS['config']['WALLABAG_VERSION']===1"}selected{/if} value="1">v1</option>
+                      <option {if="$GLOBALS['config']['WALLABAG_VERSION']===2"}selected{/if} value="2">v2</option>
+                  </select>
+              </p>
             </div>
           </li>
         </ul>

tpl/original/linklist.html

@@ -80,9 +80,12 @@ <h3 class="linktitle">{function="returnFavicon($value.url)"}<a href="{$redirecto
             <span class="linkdate linkBottom" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span>
             {/if}
             <span class="linkarchive linkBottom"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">Archive.org</a> - </span>
-            {if="$GLOBALS['config']['WALLABAG_URL'] && isLoggedIn()"}
+            {if="$GLOBALS['config']['WALLABAG_URL'] && isLoggedIn() && $GLOBALS['config']['WALLABAG_VERSION']===1"}
             <span class="linkWallabag linkBottom"><a href="{$GLOBALS['config']['WALLABAG_URL']}/?plainurl={$value.url|htmlspecialchars}">Save to Wallabag</a> - </span>
             {/if}
+            {if="$GLOBALS['config']['WALLABAG_URL'] && isLoggedIn() && $GLOBALS['config']['WALLABAG_VERSION']===2"}
+            <span class="linkWallabag linkBottom"><a href="{$GLOBALS['config']['WALLABAG_URL']}/bookmarklet?url={$value.url|htmlspecialchars}">Save to Wallabag</a> - </span>
+            {/if}
             <span><a href="http://qrfree.kaywa.com/?l=1&amp;s=8&d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}"
               onclick="showQrCode(this); return false;" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}"><img src="images/qrcode.png#" title="QR-Code" alt="qrcode logo"></a></span> - <span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span>
             <br>

tpl/original/shaarli.css

@@ -232,7 +232,7 @@ cursor:pointer;
 .linktitle { font-size:14pt; font-weight:bold; }
 .linktitle a { text-decoration: none; color:#80AD48; }
 .linktitle a:hover { color:#F57900; }
-.linkdate, .linkarchive { font-size:8pt; color:#888; }
+.linkdate, .linkarchive, .linkWallabag { font-size:8pt; color:#888; }
 .linkdate a, .linkarchive a { color:#E28E3F;text-decoration: none;}
 .linkarchive a {background-image:url('../../images/logo_Archive.org.jpg');padding:2px 0 3px 20px;background-repeat:no-repeat;}
 .linkdate a {background-image:url('../../images/calendar.png');padding:2px 0 3px 20px;background-repeat:no-repeat;}
@@ -469,3 +469,15 @@ div.dailyEntryDescription { font-size:10pt; }
 
 /* Highlight search results */
 .highlight { background-color: #FFFF33; }
+
+.linkWallabag a {
+  background-image: url(../../images/logo_wallabag.png);
+  background-repeat: no-repeat;
+}
+
+.linkBottom a {
+  color: #E28E3F;
+  line-height: 1.6em;
+  padding: 2px 0 3px 20px;
+  text-decoration: none;
+}