Merge pull request #699 from teromene/https-no-social
Disable Firefox Social in the tools section if the page is not loaded using HTTPS.
This commit is contained in:
commit
fd7d9cad2b
2 changed files with 6 additions and 1 deletions
|
@ -1078,6 +1078,7 @@ function renderPage($conf, $pluginManager)
|
|||
{
|
||||
$data = array(
|
||||
'pageabsaddr' => index_url($_SERVER),
|
||||
'sslenabled' => !empty($_SERVER['HTTPS'])
|
||||
);
|
||||
$pluginManager->executeHooks('render_tools', $data);
|
||||
|
||||
|
|
|
@ -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>⇐ 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;
|
||||
|
|
Loading…
Reference in a new issue