Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Disable Firefox Social in the tools section if the page is not loaded using HTTPS, as Firefox will deny the request.

Browse source
This commit is contained in:
Teromene 2016-11-29 11:06:31 +00:00
parent 76fb679e38
commit caa382dd55
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
index.php
View file

@ -1078,6 +1078,7 @@ function renderPage($conf, $pluginManager)
{ {
$data = array( $data = array(
'pageabsaddr' => index_url($_SERVER), 'pageabsaddr' => index_url($_SERVER),
'sslenabled' => !empty($_SERVER['HTTPS'])
); );
$pluginManager->executeHooks('render_tools', $data); $pluginManager->executeHooks('render_tools', $data);

6
tpl/tools.html
View file

@ -50,12 +50,15 @@
    Then click "✚Add Note" button anytime to start composing a private Note (text post) to your Shaarli.     Then click "✚Add Note" button anytime to start composing a private Note (text post) to your Shaarli.
</span> </span>
</a><br><br> </a><br><br>
{if="$sslenabled"}
<a class="smallbutton" onclick="activateFirefoxSocial(this)"> <a class="smallbutton" onclick="activateFirefoxSocial(this)">
<b>✚Add to Firefox social</b> <b>✚Add to Firefox social</b>
</a> </a>
<a href="#"> <a href="#">
<span>&#x21D0; Click on this button to add Shaarli to the "Share this page" button in Firefox.</span> <span>&#x21D0; Click on this button to add Shaarli to the "Share this page" button in Firefox.</span>
</a><br><br> </a><br><br>
{/if}
{loop="$tools_plugin"} {loop="$tools_plugin"}
{$value} {$value}
@ -64,6 +67,7 @@
<div class="clear"></div> <div class="clear"></div>
<script> <script>
{if="$sslenabled"}
function activateFirefoxSocial(node) { function activateFirefoxSocial(node) {
var loc = location.href; var loc = location.href;
var baseURL = loc.substring(0, loc.lastIndexOf("/")); var baseURL = loc.substring(0, loc.lastIndexOf("/"));
@ -87,7 +91,7 @@
var activate = new CustomEvent("ActivateSocialFeature"); var activate = new CustomEvent("ActivateSocialFeature");
node.dispatchEvent(activate); node.dispatchEvent(activate);
} }
{/if}
function alertBookmarklet() { function alertBookmarklet() {
alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...'); alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');
return false; return false;