Merge pull request #4637 from tobiasd/3.6

[friendica.git] / util / fpostit / fpostit.php

diff --git a/util/fpostit/fpostit.php b/util/fpostit/fpostit.php
index 491d81f6d6ffd38cf7ce28bac16785017e02e51d..3a2f0d15f54192fa74b92f8d6ea0caa0be3c0f99 100644 (file)
--- a/util/fpostit/fpostit.php
+++ b/util/fpostit/fpostit.php
@@ -1,8 +1,8 @@
 <?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);
+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);
 }
 
 ?>
@@ -58,44 +58,44 @@ if ((isset($title)) && (isset($text)) && (isset($url))) {
 }
 
 if (isset($_POST['submit'])) {
-       
-       if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-               $acctname = $_POST["friendika_acct_name"];
+
+       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["friendika_password"];
+               $password = $_POST["friendica_password"];
                $content = $_POST["content"];
 
                $url = "http://" . $hostname . '/api/statuses/update';
-               $data = array('status' => $content);
-               
+               $data = ['status' => $content];
+
                // echo "posting to: $url<br/>";
 
                $c = curl_init();
-               curl_setopt($c, CURLOPT_URL, $url); 
+               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_POSTFIELDS, $data);
+               curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
                curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-               $c_result = curl_exec($c); 
-               if(curl_errno($c)){ 
+               $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);
 }
@@ -103,25 +103,25 @@ if (isset($_POST['submit'])) {
 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>
+               <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 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 />
+                       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" />&nbsp;&nbsp;<span class='error'>$error</span>
                </form>
                <p></p>
        </div>
 EOF;
-       
+
 }
 ?>