From b30c761aae7e01e6fe727232e48b14303484a228 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Tue, 17 Apr 2012 16:15:49 +0200 Subject: diabook-themes: removed fpostit due to security issues and small fix in german translation --- view/theme/diabook-blue/communityhome.tpl | 6 - view/theme/diabook-blue/fpostit/README | 8 -- view/theme/diabook-blue/fpostit/fpostit.js | 6 - view/theme/diabook-blue/fpostit/fpostit.php | 135 ----------------------- view/theme/diabook-blue/fpostit/friendika-32.png | Bin 1593 -> 0 bytes view/theme/diabook-blue/style-network.css | 2 +- view/theme/diabook-blue/style-profile.css | 2 +- view/theme/diabook-blue/theme.php | 38 ++----- 8 files changed, 9 insertions(+), 188 deletions(-) delete mode 100644 view/theme/diabook-blue/fpostit/README delete mode 100644 view/theme/diabook-blue/fpostit/fpostit.js delete mode 100644 view/theme/diabook-blue/fpostit/fpostit.php delete mode 100644 view/theme/diabook-blue/fpostit/friendika-32.png (limited to 'view/theme/diabook-blue') diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index 6e126827b..6ac414ef4 100644 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -42,12 +42,6 @@ $nv.search {{ endif }} -
-{{ if $lastusers_title }} -

$postit.title.1

-
$postit.title.2$postit.text.1
-{{ endif }} -
{{ if $lastusers_title }} diff --git a/view/theme/diabook-blue/fpostit/README b/view/theme/diabook-blue/fpostit/README deleted file mode 100644 index 39b7c5761..000000000 --- a/view/theme/diabook-blue/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-blue/fpostit/fpostit.js b/view/theme/diabook-blue/fpostit/fpostit.js deleted file mode 100644 index d183c7573..000000000 --- a/view/theme/diabook-blue/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-blue/fpostit/fpostit.php b/view/theme/diabook-blue/fpostit/fpostit.php deleted file mode 100644 index 4505c9946..000000000 --- a/view/theme/diabook-blue/fpostit/fpostit.php +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - $content); - - // echo "posting to: $url
"; - - $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 ''; - } - - } 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 << -

- Friendica Bookmarklet

-
- -
-
- Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

- Account ID:
- Password:
-
-   $error -
-

-
-EOF; - -} -?> - - - \ No newline at end of file diff --git a/view/theme/diabook-blue/fpostit/friendika-32.png b/view/theme/diabook-blue/fpostit/friendika-32.png deleted file mode 100644 index 61764bf20..000000000 Binary files a/view/theme/diabook-blue/fpostit/friendika-32.png and /dev/null differ diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index d8e569338..3f4756ccc 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -1355,7 +1355,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-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index 135cdb1c6..c7b33dbc7 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -1334,7 +1334,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-blue/theme.php b/view/theme/diabook-blue/theme.php index 9aac48c38..827e36cb0 100644 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-blue * Description: Diabook-blue: 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-blue (Version: 1.019)"; +$diabook_version = "Diabook-blue (Version: 1.020)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -130,14 +130,6 @@ function diabook_blue_community_info(){ } } - $fostitJS = "javascript: (function() { - the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-blue/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; //nav FIND FRIENDS if(local_user()) { @@ -205,13 +197,7 @@ function diabook_blue_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); @@ -254,9 +240,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_blue_community_info(); @@ -269,7 +255,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_blue_community_info(); @@ -369,7 +355,7 @@ $a->page['htmlhead'] .= ' '; - if($ccCookie != "8") { + if($ccCookie != "7") { $a->page['htmlhead'] .= '