aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2014-11-08 18:40:27 +0100
committernodiscc <nodiscc@gmail.com>2014-11-08 18:40:27 +0100
commitdffa06ed61663c2ba9229f1b615627f2f5ac5887 (patch)
treec35b9cb2f64a2d584346f698d71f80f052e027bc
parent6fdbfe817abeb863cd1bfcade4da17b376414ca0 (diff)
parentd2f517638c337b5529684ab09966f74c304f0f99 (diff)
downloadShaarli-dffa06ed61663c2ba9229f1b615627f2f5ac5887.tar.gz
Shaarli-dffa06ed61663c2ba9229f1b615627f2f5ac5887.tar.zst
Shaarli-dffa06ed61663c2ba9229f1b615627f2f5ac5887.zip
Merge pull request #51 from nodiscc/optional-archiveorg
make archive.org integration optional (ARCHIVE_ORG option, defaults to false)
-rw-r--r--index.php1
-rw-r--r--tpl/linklist.html2
2 files changed, 3 insertions, 0 deletions
diff --git a/index.php b/index.php
index 06e5b784..1d523a33 100644
--- a/index.php
+++ b/index.php
@@ -32,6 +32,7 @@ $GLOBALS['config']['RAINTPL_TPL'] = 'tpl/' ; // Raintpl template directory (keep
32$GLOBALS['config']['UPDATECHECK_FILENAME'] = $GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt'; // For updates check of Shaarli. 32$GLOBALS['config']['UPDATECHECK_FILENAME'] = $GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt'; // For updates check of Shaarli.
33$GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400 ; // Updates check frequency for Shaarli. 86400 seconds=24 hours 33$GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400 ; // Updates check frequency for Shaarli. 86400 seconds=24 hours
34 // Note: You must have publisher.php in the same directory as Shaarli index.php 34 // Note: You must have publisher.php in the same directory as Shaarli index.php
35$GLOBALS['config']['ARCHIVE_ORG'] = false; // For each link, add a link to an archived version on archive.org
35// ----------------------------------------------------------------------------------------------- 36// -----------------------------------------------------------------------------------------------
36// You should not touch below (or at your own risks!) 37// You should not touch below (or at your own risks!)
37// Optional config file. 38// Optional config file.
diff --git a/tpl/linklist.html b/tpl/linklist.html
index b7cf096f..770819fc 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -48,7 +48,9 @@
48 {else} 48 {else}
49 <span class="linkdate" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span> 49 <span class="linkdate" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span>
50 {/if} 50 {/if}
51 {if="$GLOBALS['config']['ARCHIVE_ORG']"}
51 <span class="linkarchive"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">archive</a> - </span> 52 <span class="linkarchive"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">archive</a> - </span>
53 {/if}
52 <div style="position:relative;display:inline;"><a href="http://qrfree.kaywa.com/?l=1&s=8&d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}" 54 <div style="position:relative;display:inline;"><a href="http://qrfree.kaywa.com/?l=1&s=8&d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}"
53 onclick="showQrCode(this); return false;" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}"><img src="images/qrcode.png#" width="13" height="13" title="QR-Code"></a></div> - 55 onclick="showQrCode(this); return false;" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}"><img src="images/qrcode.png#" width="13" height="13" title="QR-Code"></a></div> -
54 <span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span><br> 56 <span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span><br>