Merge pull request #699 from teromene/https-no-social

Disable Firefox Social in the tools section if the page is not loaded using HTTPS.

2 files changed, 6 insertions, 1 deletions

diff --git a/index.php b/index.php
index 84282b8d..5366cb0e 100644
--- a/index.php
+++ b/index.php
@@ -1078,6 +1078,7 @@ function renderPage($conf, $pluginManager)
     {
         $data = array(
             'pageabsaddr' => index_url($_SERVER),
+            'sslenabled' => !empty($_SERVER['HTTPS'])
         );
         $pluginManager->executeHooks('render_tools', $data);
 
diff --git a/tpl/tools.html b/tpl/tools.html
index 8e285f44..e06d239d 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -50,12 +50,15 @@
                                     Then click "✚Add Note" button anytime to start composing a private Note (text post) to your Shaarli.
                         </span>
                 </a><br><br>
+
+                {if="$sslenabled"}
                 <a class="smallbutton" onclick="activateFirefoxSocial(this)">
                         <b>✚Add to Firefox social</b>
                 </a>
                 <a href="#">
                         <span>&#x21D0; Click on this button to add Shaarli to the "Share this page" button in Firefox.</span>
                 </a><br><br>
+                {/if}
 
                 {loop="$tools_plugin"}
             {$value}
@@ -64,6 +67,7 @@
                 <div class="clear"></div>
 
                 <script>
+                        {if="$sslenabled"}
                         function activateFirefoxSocial(node) {
                                 var loc = location.href;
                                 var baseURL = loc.substring(0, loc.lastIndexOf("/"));
@@ -87,7 +91,7 @@
                                 var activate = new CustomEvent("ActivateSocialFeature");
                                 node.dispatchEvent(activate);
                         }
-
+                        {/if}
                         function alertBookmarklet() {
                                 alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');
                                 return false;