3 files changed, 9 insertions, 5 deletions

diff --git a/inc/shaarli.css b/inc/shaarli.css
index 13e6ab33..28394ed5 100644
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -232,9 +232,10 @@ cursor:pointer;
 .linktitle { font-size:14pt; font-weight:bold; }
 .linktitle a { text-decoration: none; color:#80AD48; }
 .linktitle a:hover { color:#F57900; }
-.linkdate { font-size:8pt; color:#888; }
-.linkdate a { background-image:url('../images/calendar.png');padding:2px 0 3px 20px;background-repeat:no-repeat;text-decoration: none; color:#E28E3F;  }
-.linkdate a:hover { color: #F57900 }
+.linkdate, .linkarchive { font-size:8pt; color:#888; }
+.linkdate a, .linkarchive a { color:#E28E3F;  }
+.linkdate a {background-image:url('../images/calendar.png');padding:2px 0 3px 20px;background-repeat:no-repeat;text-decoration: none; }
+.linkdate a:hover, .linkarchive a:hover { color: #F57900 }
 .linkurl { font-size:8pt; color:#4BAA74; }
 .linkdescription { color:#000; margin-top:0; margin-bottom:12px; font-weight:normal; max-height:400px; overflow:auto; }
 .linkdescription a { text-decoration: none; color:#3465A4; }
@@ -466,4 +467,4 @@ div.dailyEntryDescription { font-size:10pt; }
 } 
 
 /* Highlight search results */
-.highlight { background-color: #FFFF33; }
\ No newline at end of file
+.highlight { background-color: #FFFF33; }
diff --git a/index.php b/index.php
index 01931198..06e5b784 100644
--- a/index.php
+++ b/index.php
@@ -2067,7 +2067,9 @@ function install()
     {   // Step 2: Check if data in session is correct.
         echo '<pre>Sessions do not seem to work correctly on your server.<br>';
         echo 'Make sure the variable session.save_path is set correctly in your php config, and that you have write access to it.<br>';
-        echo 'It currently points to '.session_save_path().'<br><br><a href="?">Click to try again.</a></pre>';
+        echo 'It currently points to '.session_save_path().'<br>';
+        echo 'Check that the hostname used to access Shaarli contains a dot. On some browsers, accessing your server via a hostname like \'localhost\' or any custom hostname without a dot causes cookie storage to fail. We recommend accessing your server via it\'s IP address or Fully Qualified Domain Name.<br>';
+        echo '<br><a href="?">Click to try again.</a></pre>';
         die;
     }
     if (!isset($_SESSION['session_tested']))
diff --git a/tpl/linklist.html b/tpl/linklist.html
index ddc38cb0..b7cf096f 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -48,6 +48,7 @@
                 {else}
                     <span class="linkdate" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span>
                 {/if}
+                <span class="linkarchive"><a href="https://web.archive.org/web/{$value.url|htmlspecialchars}">archive</a> - </span>
                 <div style="position:relative;display:inline;"><a href="http://qrfree.kaywa.com/?l=1&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#" width="13" height="13" title="QR-Code"></a></div> - 
                 <span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span><br>