diff options
author | Simon <simon@kisikew.org> | 2012-04-17 10:16:56 -0700 |
---|---|---|
committer | Simon <simon@kisikew.org> | 2012-04-17 10:16:56 -0700 |
commit | 04af5d9e2cc7a05c6ea0312643ddc4e8b45846bf (patch) | |
tree | 3b78cca8cb5a7e36a2ca597dede1d83ac79ac1f2 /view | |
parent | dbff4252d4ac7ccc1cda6b378a53c6761ea4c49d (diff) | |
parent | 1b2209fb3c9223d356979aa0200aa39cc66c9fe8 (diff) | |
download | volse-hubzilla-04af5d9e2cc7a05c6ea0312643ddc4e8b45846bf.tar.gz volse-hubzilla-04af5d9e2cc7a05c6ea0312643ddc4e8b45846bf.tar.bz2 volse-hubzilla-04af5d9e2cc7a05c6ea0312643ddc4e8b45846bf.zip |
Merge pull request #241 from simonlnu/master
rip out fpostit
Diffstat (limited to 'view')
-rw-r--r-- | view/theme/dispy-dark/fpostit/README | 8 | ||||
-rw-r--r-- | view/theme/dispy-dark/fpostit/fpostit.js | 14 | ||||
-rw-r--r-- | view/theme/dispy-dark/fpostit/fpostit.php | 134 | ||||
-rw-r--r-- | view/theme/dispy-dark/fpostit/friendica-32.png | bin | 1593 -> 0 bytes | |||
-rw-r--r-- | view/theme/dispy-dark/fpostit/friendika-32.png | bin | 1593 -> 0 bytes | |||
-rw-r--r-- | view/theme/dispy-dark/theme.php | 8 | ||||
-rw-r--r-- | view/theme/dispy/fpostit/README | 8 | ||||
-rw-r--r-- | view/theme/dispy/fpostit/fpostit.js | 14 | ||||
-rw-r--r-- | view/theme/dispy/fpostit/fpostit.php | 134 | ||||
-rw-r--r-- | view/theme/dispy/fpostit/friendica-32.png | bin | 1593 -> 0 bytes | |||
-rw-r--r-- | view/theme/dispy/fpostit/friendika-32.png | bin | 1593 -> 0 bytes | |||
-rw-r--r-- | view/theme/dispy/theme.php | 8 |
12 files changed, 0 insertions, 328 deletions
diff --git a/view/theme/dispy-dark/fpostit/README b/view/theme/dispy-dark/fpostit/README deleted file mode 100644 index 39b7c5761..000000000 --- a/view/theme/dispy-dark/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/dispy-dark/fpostit/fpostit.js b/view/theme/dispy-dark/fpostit/fpostit.js deleted file mode 100644 index eb593d838..000000000 --- a/view/theme/dispy-dark/fpostit/fpostit.js +++ /dev/null @@ -1,14 +0,0 @@ -javascript: (function() { - the_url = 'view/theme/dispy-dark/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(); - } - })();" diff --git a/view/theme/dispy-dark/fpostit/fpostit.php b/view/theme/dispy-dark/fpostit/fpostit.php deleted file mode 100644 index d00182946..000000000 --- a/view/theme/dispy-dark/fpostit/fpostit.php +++ /dev/null @@ -1,134 +0,0 @@ -<?php -if (!isset($_POST["friendica_acct_name"])) $_POST["friendica_acct_name"] = ''; -if (!isset($_COOKIE['username'])) $_COOKIE['username'] = ''; -if (!isset($_COOKIE['password'])) $_COOKIE['password'] = ''; -if (!isset($hostname)) $hostname = ''; -if (!isset($username)) $username = ''; - - -if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) { - setcookie("username", $_POST["friendica_acct_name"], time()+60*60*24*300); - setcookie("password", $_POST["friendica_password"], time()+60*60*24*300); -} - -?> -<html> -<head> - <style> - body { - font-family: 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["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) { - $acctname = $_POST["friendica_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["friendica_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. Please try again."; - 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="friendica-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="friendica_acct_name" value="{$username_cookie}" size="50" /><br /> - Password: <input type="password" name="friendica_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" />  <span class="error">$error</span> - </form> - <p></p> - </div> -EOF; - -} -?> - -</body> -</html> diff --git a/view/theme/dispy-dark/fpostit/friendica-32.png b/view/theme/dispy-dark/fpostit/friendica-32.png Binary files differdeleted file mode 100644 index 61764bf20..000000000 --- a/view/theme/dispy-dark/fpostit/friendica-32.png +++ /dev/null diff --git a/view/theme/dispy-dark/fpostit/friendika-32.png b/view/theme/dispy-dark/fpostit/friendika-32.png Binary files differdeleted file mode 100644 index 61764bf20..000000000 --- a/view/theme/dispy-dark/fpostit/friendika-32.png +++ /dev/null diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index 6275980bc..57e0fbe5c 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -147,14 +147,6 @@ function dispy_dark_community_info() { $url = $a->get_baseurl($ssl_state); $aside['$url'] = $url; - $fpostitJS = "javascript:(function() {" - . "the_url = '" . $url . "/view/theme/".$a->theme_info['name']."/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['$fpostitJS'] = $fpostitJS; $tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl'); return $a->page['aside_bottom'] = replace_macros($tpl, $aside); } diff --git a/view/theme/dispy/fpostit/README b/view/theme/dispy/fpostit/README deleted file mode 100644 index 39b7c5761..000000000 --- a/view/theme/dispy/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/dispy/fpostit/fpostit.js b/view/theme/dispy/fpostit/fpostit.js deleted file mode 100644 index d18f5d345..000000000 --- a/view/theme/dispy/fpostit/fpostit.js +++ /dev/null @@ -1,14 +0,0 @@ -javascript: (function() { - the_url = 'view/theme/dispy/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(); - } - })();" diff --git a/view/theme/dispy/fpostit/fpostit.php b/view/theme/dispy/fpostit/fpostit.php deleted file mode 100644 index d00182946..000000000 --- a/view/theme/dispy/fpostit/fpostit.php +++ /dev/null @@ -1,134 +0,0 @@ -<?php -if (!isset($_POST["friendica_acct_name"])) $_POST["friendica_acct_name"] = ''; -if (!isset($_COOKIE['username'])) $_COOKIE['username'] = ''; -if (!isset($_COOKIE['password'])) $_COOKIE['password'] = ''; -if (!isset($hostname)) $hostname = ''; -if (!isset($username)) $username = ''; - - -if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) { - setcookie("username", $_POST["friendica_acct_name"], time()+60*60*24*300); - setcookie("password", $_POST["friendica_password"], time()+60*60*24*300); -} - -?> -<html> -<head> - <style> - body { - font-family: 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["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) { - $acctname = $_POST["friendica_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["friendica_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. Please try again."; - 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="friendica-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="friendica_acct_name" value="{$username_cookie}" size="50" /><br /> - Password: <input type="password" name="friendica_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" />  <span class="error">$error</span> - </form> - <p></p> - </div> -EOF; - -} -?> - -</body> -</html> diff --git a/view/theme/dispy/fpostit/friendica-32.png b/view/theme/dispy/fpostit/friendica-32.png Binary files differdeleted file mode 100644 index 61764bf20..000000000 --- a/view/theme/dispy/fpostit/friendica-32.png +++ /dev/null diff --git a/view/theme/dispy/fpostit/friendika-32.png b/view/theme/dispy/fpostit/friendika-32.png Binary files differdeleted file mode 100644 index 61764bf20..000000000 --- a/view/theme/dispy/fpostit/friendika-32.png +++ /dev/null diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 125910593..b72de51e5 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -147,14 +147,6 @@ function dispy_community_info() { $url = $a->get_baseurl($ssl_state); $aside['$url'] = $url; - $fpostitJS = "javascript:(function() {" - . "the_url = '" . $url . "/view/theme/".$a->theme_info['name']."/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['$fpostitJS'] = $fpostitJS; $tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl'); return $a->page['aside_bottom'] = replace_macros($tpl, $aside); } |