aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook
diff options
context:
space:
mode:
authortommy tomson <thomas.bierey@gmx.de>2012-04-17 16:15:49 +0200
committertommy tomson <thomas.bierey@gmx.de>2012-04-17 16:15:49 +0200
commitb30c761aae7e01e6fe727232e48b14303484a228 (patch)
tree822a3ef89dfdde311a4a542def21a7c124f757df /view/theme/diabook
parent8269d6aa19eb71063ff578b43b237ffd4fea93b1 (diff)
downloadvolse-hubzilla-b30c761aae7e01e6fe727232e48b14303484a228.tar.gz
volse-hubzilla-b30c761aae7e01e6fe727232e48b14303484a228.tar.bz2
volse-hubzilla-b30c761aae7e01e6fe727232e48b14303484a228.zip
diabook-themes: removed fpostit due to security issues and small fix in german translation
Diffstat (limited to 'view/theme/diabook')
-rwxr-xr-xview/theme/diabook/communityhome.tpl7
-rw-r--r--view/theme/diabook/fpostit/README8
-rwxr-xr-xview/theme/diabook/fpostit/fpostit.js6
-rw-r--r--view/theme/diabook/fpostit/fpostit.php135
-rw-r--r--view/theme/diabook/fpostit/friendika-32.pngbin1593 -> 0 bytes
-rw-r--r--view/theme/diabook/style-network.css2
-rw-r--r--view/theme/diabook/style-profile.css2
-rwxr-xr-xview/theme/diabook/theme.php38
8 files changed, 10 insertions, 188 deletions
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 5c2164b50..ff04d9da0 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -42,13 +42,6 @@ $nv.search
{{ endif }}
</div>
-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
-{{ endif }}
-</div>
-
<div id="close_lastusers">
{{ if $lastusers_title }}
<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
diff --git a/view/theme/diabook/fpostit/README b/view/theme/diabook/fpostit/README
deleted file mode 100644
index 39b7c5761..000000000
--- a/view/theme/diabook/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js
deleted file mode 100755
index d183c7573..000000000
--- a/view/theme/diabook/fpostit/fpostit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-javascript: (function() {
- the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
- a_funct = function() {
- if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
- if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)}
- else {a_funct()}})()" \ No newline at end of file
diff --git a/view/theme/diabook/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php
deleted file mode 100644
index 4505c9946..000000000
--- a/view/theme/diabook/fpostit/fpostit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
- setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
- setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
- <style>
- body {
- font-family: arial, Helvetica,sans-serif;
- margin: 0px;
- }
- .wrap1 {
- padding: 2px 5px;
- background-color: #000;
- margin-bottom: 10px;
- }
- .wrap2 {
- margin-left: 10px;
- font-size: 12px;
- }
- .logo {
- margin-left: 3px;
- margin-right: 5px;
- float: left;
- }
- h2 {
- color: #ffffff;
- }
- .error {
- background-color: #FFFF66;
- font-size: 12px;
- margin-left: 10px;
- }
- </style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
- $title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
- $text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
- $url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
- $content = "$title\nsource:$url\n\n$text";
-} else {
- $content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-
- if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
- $acctname = $_POST["friendika_acct_name"];
- $tmp_account_array = explode("@", $acctname);
- if (isset($tmp_account_array[1])) {
- $username = $tmp_account_array[0];
- $hostname = $tmp_account_array[1];
- }
- $password = $_POST["friendika_password"];
- $content = $_POST["content"];
-
- $url = "http://" . $hostname . '/api/statuses/update';
- $data = array('status' => $content);
-
- // echo "posting to: $url<br/>";
-
- $c = curl_init();
- curl_setopt($c, CURLOPT_URL, $url);
- curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
- curl_setopt($c, CURLOPT_POSTFIELDS, $data);
- curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
- $c_result = curl_exec($c);
- if(curl_errno($c)){
- $error = curl_error($c);
- showForm($error, $content);
- }
-
- curl_close($c);
- if (!isset($error)) {
- echo '<script language="javascript" type="text/javascript">window.close();</script>';
- }
-
- } else {
- $error = "Missing account name and/or password...try again please";
- showForm($error, $content);
- }
-
-} else {
- showForm(null, $content);
-}
-
-function showForm($error, $content) {
- $username_cookie = $_COOKIE['username'];
- $password_cookie = $_COOKIE['password'];
-
- echo <<<EOF
- <div class='wrap1'>
- <h2><img class='logo' src='friendika-32.png' align='middle';/>
- Friendica Bookmarklet</h2>
- </div>
-
- <div class="wrap2">
- <form method="post" action="{$_SERVER['PHP_SELF']}">
- Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
- Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
- Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
- <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
- <input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
- </form>
- <p></p>
- </div>
-EOF;
-
-}
-?>
-
-</body>
-</html> \ No newline at end of file
diff --git a/view/theme/diabook/fpostit/friendika-32.png b/view/theme/diabook/fpostit/friendika-32.png
deleted file mode 100644
index 61764bf20..000000000
--- a/view/theme/diabook/fpostit/friendika-32.png
+++ /dev/null
Binary files differ
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index ba45f757e..21c08e856 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1331,7 +1331,7 @@ transition: all 0.2s ease-in-out;
.wall-item-container .wall-item-content img {
max-width: 400px;
- max-height: 400px;
+
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index ebde6ecfc..71b034865 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -1307,7 +1307,7 @@ transition: all 0.2s ease-in-out;
.wall-item-container .wall-item-content img {
max-width: 400px;
- max-height: 400px;
+
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 0fdcbf701..3ce0cc39d 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
/*
* Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.019)
+ * Version: (Version: 1.020)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.019)";
+$diabook_version = "Diabook (Version: 1.020)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@@ -136,14 +136,7 @@ function diabook_community_info(){
}
}
- $fostitJS = "javascript: (function() {
- the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
- a_funct = function() {
- if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
- if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)}
- else {a_funct()}})()" ;
-
- $aside['$fostitJS'] = $fostitJS;
+
//right_aside FIND FRIENDS
if(local_user()) {
@@ -212,13 +205,7 @@ function diabook_community_info(){
$aside['$con_services'] = $con_services;
//end connectable services
- //postit
- $postit = array();
- $postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
- $postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
-
- $aside['$postit'] = $postit;
- //end postit
+
//get_baseurl
$url = $a->get_baseurl($ssl_state);
@@ -264,9 +251,9 @@ if ($a->argv[0] === "network" && local_user()){
}
- $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+ $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
- if($ccCookie != "8") {
+ if($ccCookie != "7") {
// COMMUNITY
diabook_community_info();
@@ -280,7 +267,7 @@ if ($a->argv[0] === "network" && local_user()){
//right_aside at profile pages
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
- if($ccCookie != "8") {
+ if($ccCookie != "7") {
// COMMUNITY
diabook_community_info();
@@ -383,7 +370,7 @@ $a->page['htmlhead'] .= '
</script>';
- if($ccCookie != "8") {
+ if($ccCookie != "7") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
@@ -408,10 +395,6 @@ $("right_aside").ready(function(){
document.getElementById( "close_friends" ).style.display = "none";
};
- if($.cookie("close_postit") == "1")
- {
- document.getElementById( "close_postit" ).style.display = "none";
- };
if($.cookie("close_lastusers") == "1")
{
@@ -450,10 +433,6 @@ function close_friends(){
$.cookie("close_friends","1", { expires: 365, path: "/" });
};
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie("close_postit","1", { expires: 365, path: "/" });
- };
function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none";
@@ -478,7 +457,6 @@ function restore_boxes(){
$.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie("close_services","2", { expires: 365, path: "/" });
$.cookie("close_friends","2", { expires: 365, path: "/" });
- $.cookie("close_postit","2", { expires: 365, path: "/" });
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 18:08:02 +0000