diaspora admin toggle, update install guide

[friendica.git] / include / network.php

diff --git a/include/network.php b/include/network.php
index ade8a40ac49a5090487e632852acc93385309ed3..f0dd828d14cb7508b45a4d7f373f35d62c564f01 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -508,7 +508,7 @@ function fetch_xrd_links($url) {
 
        $xrd_timeout = intval(get_config('system','xrd_timeout'));
        $redirects = 0;
-       $xml = fetch_url($url,false,$redirects,(($xrd_timeout) ? $xrd_timeout : 30));
+       $xml = fetch_url($url,false,$redirects,(($xrd_timeout) ? $xrd_timeout : 20));
 
        logger('fetch_xrd_links: ' . $xml, LOGGER_DATA);
 
@@ -536,7 +536,7 @@ function fetch_xrd_links($url) {
                        $aliases = array($alias);
                else
                        $aliases = $alias;
-               if(count($aliases)) {
+               if($aliases && count($aliases)) {
                        foreach($aliases as $alias) {
                                $links[]['@attributes'] = array('rel' => 'alias' , 'href' => $alias);
                        }
@@ -697,8 +697,8 @@ function parse_xml_string($s,$strict = true) {
 function add_fcontact($arr) {
 
        $r = q("insert into fcontact ( `url`,`name`,`photo`,`request`,`nick`,`addr`,
-               `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey` )
-               values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
+               `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated` )
+               values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
                dbesc($arr['url']),
                dbesc($arr['name']),
                dbesc($arr['photo']),
@@ -710,7 +710,8 @@ function add_fcontact($arr) {
                dbesc($arr['confirm']),
                dbesc($arr['network']),
                dbesc($arr['alias']),
-               dbesc($arr['pubkey'])
+               dbesc($arr['pubkey']),
+               dbesc(datetime_convert())
        );
        return $r;
 }