]> git.mxchange.org Git - friendica.git/commitdiff
diabook-themes: removed fpostit due to security issues and small fix in german transl...
authortommy tomson <thomas.bierey@gmx.de>
Tue, 17 Apr 2012 14:15:49 +0000 (16:15 +0200)
committertommy tomson <thomas.bierey@gmx.de>
Tue, 17 Apr 2012 14:15:49 +0000 (16:15 +0200)
33 files changed:
view/de/strings.php
view/theme/diabook-aerith/communityhome.tpl
view/theme/diabook-aerith/fpostit/README [deleted file]
view/theme/diabook-aerith/fpostit/fpostit.js [deleted file]
view/theme/diabook-aerith/fpostit/fpostit.php [deleted file]
view/theme/diabook-aerith/fpostit/friendika-32.png [deleted file]
view/theme/diabook-aerith/style-network.css
view/theme/diabook-aerith/style-profile.css
view/theme/diabook-aerith/theme.php
view/theme/diabook-blue/communityhome.tpl
view/theme/diabook-blue/fpostit/README [deleted file]
view/theme/diabook-blue/fpostit/fpostit.js [deleted file]
view/theme/diabook-blue/fpostit/fpostit.php [deleted file]
view/theme/diabook-blue/fpostit/friendika-32.png [deleted file]
view/theme/diabook-blue/style-network.css
view/theme/diabook-blue/style-profile.css
view/theme/diabook-blue/theme.php
view/theme/diabook-red/communityhome.tpl
view/theme/diabook-red/fpostit/README [deleted file]
view/theme/diabook-red/fpostit/fpostit.js [deleted file]
view/theme/diabook-red/fpostit/fpostit.php [deleted file]
view/theme/diabook-red/fpostit/friendika-32.png [deleted file]
view/theme/diabook-red/style-network.css
view/theme/diabook-red/style-profile.css
view/theme/diabook-red/theme.php
view/theme/diabook/communityhome.tpl
view/theme/diabook/fpostit/README [deleted file]
view/theme/diabook/fpostit/fpostit.js [deleted file]
view/theme/diabook/fpostit/fpostit.php [deleted file]
view/theme/diabook/fpostit/friendika-32.png [deleted file]
view/theme/diabook/style-network.css
view/theme/diabook/style-profile.css
view/theme/diabook/theme.php

index 91c01f8cd841a7c57778991b15119103b80f5c22..76c22f0aecd876dbe12422a8d7271f913787c737 100644 (file)
@@ -1161,7 +1161,7 @@ $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
 $a->strings["Connect Services"] = "Verbinde Dienste";
 $a->strings["PostIt to Friendica"] = "Bei Friendica posten";
 $a->strings["Post to Friendica"] = "Wenn du diesen Link";
-$a->strings[" from anywhere by bookmarking this Link."] = "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
+$a->strings[" from anywhere by bookmarking this Link."] = " zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
 $a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
 $a->strings["Your profile page"] = "Deine Profilseite";
 $a->strings["Your contacts"] = "Deine Kontakte";
index 4873cdd14b20d26c3f809da29437070527ebb4a7..875d83f1b5a774cbfe3d79337c9022ae651a53af 100644 (file)
@@ -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-aerith/fpostit/README b/view/theme/diabook-aerith/fpostit/README
deleted file mode 100644 (file)
index 39b7c57..0000000
+++ /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-aerith/fpostit/fpostit.js b/view/theme/diabook-aerith/fpostit/fpostit.js
deleted file mode 100644 (file)
index d183c75..0000000
+++ /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-aerith/fpostit/fpostit.php b/view/theme/diabook-aerith/fpostit/fpostit.php
deleted file mode 100644 (file)
index 4505c99..0000000
+++ /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-aerith/fpostit/friendika-32.png b/view/theme/diabook-aerith/fpostit/friendika-32.png
deleted file mode 100644 (file)
index 61764bf..0000000
Binary files a/view/theme/diabook-aerith/fpostit/friendika-32.png and /dev/null differ
index 82c5a257554f05ec47ebbbbf911d8beb89a25374..abab80a6af55874e92bf76612754c89bce1a4a4b 100644 (file)
@@ -1393,7 +1393,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;
index 3471b67ad2016bbd0405ef88b0654812154fedc0..dc1fbd2851868d29ff92abb23e4d6e36e43ee04b 100644 (file)
@@ -1367,7 +1367,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;
index c798643b5c2ad8049ef2d0ec8ea545efc844eac0..358d284983313e7c0731c2445e9fad10aec502a9 100644 (file)
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook-aerith
  * Description: Diabook-aerith : 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-aerith (Version: 1.019)";
+$diabook_version = "Diabook-aerith (Version: 1.020)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 
@@ -131,14 +131,7 @@ function diabook_aerith_community_info(){
                }
        }
        
-       $fostitJS = "javascript: (function() {
-                                       the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/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()) {
@@ -206,13 +199,7 @@ function diabook_aerith_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);   
@@ -255,9 +242,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_aerith_community_info();
        
@@ -270,7 +257,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_aerith_community_info();
        
@@ -369,7 +356,7 @@ $a->page['htmlhead'] .= '
 </script>';
 
 
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@@ -394,10 +381,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") 
                {
@@ -436,10 +419,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";
@@ -464,7 +443,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: "/" });
index 6e126827b548c6924ae0389ca3e1a65566429b59..6ac414ef44bef7c97d55c09f43f14c58962794b9 100644 (file)
@@ -42,12 +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 }}
diff --git a/view/theme/diabook-blue/fpostit/README b/view/theme/diabook-blue/fpostit/README
deleted file mode 100644 (file)
index 39b7c57..0000000
+++ /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 (file)
index d183c75..0000000
+++ /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 (file)
index 4505c99..0000000
+++ /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-blue/fpostit/friendika-32.png b/view/theme/diabook-blue/fpostit/friendika-32.png
deleted file mode 100644 (file)
index 61764bf..0000000
Binary files a/view/theme/diabook-blue/fpostit/friendika-32.png and /dev/null differ
index d8e569338a586f5c58915833aa541a05fc7c878e..3f4756ccc8f82204156d61231e21b6ae0c1c8f58 100644 (file)
@@ -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;
index 135cdb1c6374440cd733ff10289715cbeec3b3c8..c7b33dbc701d01db8705d89692e8f281a020cdea 100644 (file)
@@ -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;
index 9aac48c382eda50ab3eee6547f6713f8e859daff..827e36cb09bb4046b59de8c8075c18f8d5888f53 100644 (file)
@@ -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('<script "%s" ></script>', $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'] .= '
 </script>';
 
 
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@@ -394,10 +380,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") 
                {
@@ -435,11 +417,6 @@ function close_friends(){
  document.getElementById( "close_friends" ).style.display = "none";
  $.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";
@@ -464,7 +441,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: "/" });
index c47bfbda5f3a6ae27bdfc48ff434df2ff456d041..179757f4a78bb421d3ed655ca3df2a3b179cedfd 100644 (file)
@@ -42,12 +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 }}
diff --git a/view/theme/diabook-red/fpostit/README b/view/theme/diabook-red/fpostit/README
deleted file mode 100644 (file)
index 39b7c57..0000000
+++ /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-red/fpostit/fpostit.js b/view/theme/diabook-red/fpostit/fpostit.js
deleted file mode 100644 (file)
index d183c75..0000000
+++ /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-red/fpostit/fpostit.php b/view/theme/diabook-red/fpostit/fpostit.php
deleted file mode 100644 (file)
index 4505c99..0000000
+++ /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-red/fpostit/friendika-32.png b/view/theme/diabook-red/fpostit/friendika-32.png
deleted file mode 100644 (file)
index 61764bf..0000000
Binary files a/view/theme/diabook-red/fpostit/friendika-32.png and /dev/null differ
index 1158687113d8df9f374508c46e85eab9bc223ab0..8c0600b5a863b2850946b785efdfdaa967b434e4 100644 (file)
@@ -1389,7 +1389,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;
index 1b2caa6c00774d41499913a1294837bf8e5ca0a8..4f5de365bfcd4fe548b3524834ecf5258ae0d666 100644 (file)
@@ -1347,7 +1347,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;
index 1ef65d83e6dc39153c8d07c5d279afb9fea44457..02b6ee5a4db7079c05688b9035129d464e9e01f7 100644 (file)
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook-red
  * Description: Diabook-red: 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-red (Version: 1.019)";
+$diabook_version = "Diabook-red (Version: 1.020)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -130,14 +130,6 @@ function diabook_red_community_info(){
                }
        }
        
-       $fostitJS = "javascript: (function() {
-                                       the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-red/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_red_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_red_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_red_community_info();
        
@@ -367,7 +353,7 @@ $a->page['htmlhead'] .= '
 </script>';
 
 
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@@ -391,11 +377,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") 
                {
@@ -433,11 +414,6 @@ function close_friends(){
  document.getElementById( "close_friends" ).style.display = "none";
  $.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";
@@ -462,7 +438,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: "/" });
index 5c2164b50aa87dd3989e4ab96286ca3a681d37ef..ff04d9da0db0657b7e6f2136ee905c388c980d74 100755 (executable)
@@ -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 (file)
index 39b7c57..0000000
+++ /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 (executable)
index d183c75..0000000
+++ /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 (file)
index 4505c99..0000000
+++ /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 (file)
index 61764bf..0000000
Binary files a/view/theme/diabook/fpostit/friendika-32.png and /dev/null differ
index ba45f757e2f0029846f72ca5dc69be7021d893fd..21c08e856bcc4f94c9eed1bc0c9264d7fb81573a 100644 (file)
@@ -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;
index ebde6ecfc89c4badfca073e45ba1ecca20a68500..71b0348659400360ded530b8f9c6d4fb756a660f 100644 (file)
@@ -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;
index 0fdcbf701eee91ad735e95ab6bb71be3e0314814..3ce0cc39d0b092e8a07c952d429a41f6bb3ec63e 100755 (executable)
@@ -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: "/" });