Merge branch 'pull'
This commit is contained in:
friendica
commit
1d5f1723e0
5 changed files with 153 additions and 5 deletions
|
|
@ -186,8 +186,8 @@ function install_content(&$a) {
|
||||||
|
|
||||||
check_keys($checks);
|
check_keys($checks);
|
||||||
|
|
||||||
if(x($_POST,'phppath'))
|
if(x($_POST,'phpath'))
|
||||||
$phpath = notags(trim($_POST['phppath']));
|
$phpath = notags(trim($_POST['phpath']));
|
||||||
|
|
||||||
check_php($phpath, $checks);
|
check_php($phpath, $checks);
|
||||||
|
|
||||||
|
|
@ -221,7 +221,7 @@ function install_content(&$a) {
|
||||||
$dbuser = notags(trim($_POST['dbuser']));
|
$dbuser = notags(trim($_POST['dbuser']));
|
||||||
$dbpass = notags(trim($_POST['dbpass']));
|
$dbpass = notags(trim($_POST['dbpass']));
|
||||||
$dbdata = notags(trim($_POST['dbdata']));
|
$dbdata = notags(trim($_POST['dbdata']));
|
||||||
$phpath = notags(trim($_POST['phppath']));
|
$phpath = notags(trim($_POST['phpath']));
|
||||||
|
|
||||||
|
|
||||||
$tpl = get_markup_template('install_db.tpl');
|
$tpl = get_markup_template('install_db.tpl');
|
||||||
|
|
@ -259,7 +259,7 @@ function install_content(&$a) {
|
||||||
$dbuser = notags(trim($_POST['dbuser']));
|
$dbuser = notags(trim($_POST['dbuser']));
|
||||||
$dbpass = notags(trim($_POST['dbpass']));
|
$dbpass = notags(trim($_POST['dbpass']));
|
||||||
$dbdata = notags(trim($_POST['dbdata']));
|
$dbdata = notags(trim($_POST['dbdata']));
|
||||||
$phpath = notags(trim($_POST['phppath']));
|
$phpath = notags(trim($_POST['phpath']));
|
||||||
|
|
||||||
$adminmail = notags(trim($_POST['adminmail']));
|
$adminmail = notags(trim($_POST['adminmail']));
|
||||||
$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
|
$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
|
||||||
|
|
@ -323,7 +323,7 @@ function check_php(&$phpath, &$checks) {
|
||||||
$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
|
$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
|
||||||
$tpl = get_markup_template('field_input.tpl');
|
$tpl = get_markup_template('field_input.tpl');
|
||||||
$help .= replace_macros($tpl, array(
|
$help .= replace_macros($tpl, array(
|
||||||
'$field' => array('phppath', t('PHP executable path'), $phpath, t('Enter full path to php executable')),
|
'$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable')),
|
||||||
));
|
));
|
||||||
$phpath="";
|
$phpath="";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
8
util/fpostit/README
Normal file
8
util/fpostit/README
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
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
|
||||||
11
util/fpostit/fpostit.js
Normal file
11
util/fpostit/fpostit.js
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
javascript: (function() {
|
||||||
|
the_url = 'http://testbubble.com/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()
|
||||||
|
}
|
||||||
|
})()
|
||||||
129
util/fpostit/fpostit.php
Normal file
129
util/fpostit/fpostit.php
Normal file
|
|
@ -0,0 +1,129 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
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: #729FCF;
|
||||||
|
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';/>
|
||||||
|
Friendika Bookmarklet</h2>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="wrap2">
|
||||||
|
<form method="post" action="{$_SERVER['PHP_SELF']}">
|
||||||
|
Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.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" /> <span class='error'>$error</span>
|
||||||
|
</form>
|
||||||
|
<p></p>
|
||||||
|
</div>
|
||||||
|
EOF;
|
||||||
|
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
BIN
util/fpostit/friendika-32.png
Normal file
BIN
util/fpostit/friendika-32.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Loading…
Reference in a new issue