Merge pull request #2437 from annando/1604-session

[friendica.git] / include / network.php

diff --git a/include/network.php b/include/network.php
index 86d5eda6227dd2750e901d16b20960d6690cd713..27459112d6a9cf2476d7c51c4e7ba537bc9c7623 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -42,6 +42,7 @@ if(!function_exists('z_fetch_url')){
  * @return array an assoziative array with:
  *  * \e int \b return_code => HTTP return code or 0 if timeout or failure
  *  * \e boolean \b success => boolean true (if HTTP 2xx result) or false
+ *  * \e string \b redirect_url => in case of redirect, content was finally retrieved from this URL
  *  * \e string \b header => HTTP headers
  *  * \e string \b body => fetched content
  */
@@ -861,64 +862,6 @@ function parse_xml_string($s,$strict = true) {
        return $x;
 }}
 
-function add_fcontact($arr,$update = false) {
-
-       if($update) {
-               $r = q("UPDATE `fcontact` SET
-                       `name` = '%s',
-                       `photo` = '%s',
-                       `request` = '%s',
-                       `nick` = '%s',
-                       `addr` = '%s',
-                       `batch` = '%s',
-                       `notify` = '%s',
-                       `poll` = '%s',
-                       `confirm` = '%s',
-                       `alias` = '%s',
-                       `pubkey` = '%s',
-                       `updated` = '%s'
-                       WHERE `url` = '%s' AND `network` = '%s'",
-                       dbesc($arr['name']),
-                       dbesc($arr['photo']),
-                       dbesc($arr['request']),
-                       dbesc($arr['nick']),
-                       dbesc($arr['addr']),
-                       dbesc($arr['batch']),
-                       dbesc($arr['notify']),
-                       dbesc($arr['poll']),
-                       dbesc($arr['confirm']),
-                       dbesc($arr['alias']),
-                       dbesc($arr['pubkey']),
-                       dbesc(datetime_convert()),
-                       dbesc($arr['url']),
-                       dbesc($arr['network'])
-               );
-       }
-       else {
-               $r = q("insert into fcontact ( `url`,`name`,`photo`,`request`,`nick`,`addr`,
-                       `batch`, `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated` )
-                       values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
-                       dbesc($arr['url']),
-                       dbesc($arr['name']),
-                       dbesc($arr['photo']),
-                       dbesc($arr['request']),
-                       dbesc($arr['nick']),
-                       dbesc($arr['addr']),
-                       dbesc($arr['batch']),
-                       dbesc($arr['notify']),
-                       dbesc($arr['poll']),
-                       dbesc($arr['confirm']),
-                       dbesc($arr['network']),
-                       dbesc($arr['alias']),
-                       dbesc($arr['pubkey']),
-                       dbesc(datetime_convert())
-               );
-       }
-
-       return $r;
-}
-
-
 function scale_external_images($srctext, $include_link = true, $scale_replace = false) {
 
        // Suppress "view full size"