Merge branch 'develop' into improvement/move-app-to-src-2

diff --cc boot.php
Simple merge

diff --cc include/Probe.php
index 89145298675aa2d833d6f8c16620fc0325ff16ec,bed13fdf3df175c7e5d24f9c849b02aafdea55e0..85f64d29bc2e8a4f6d64842a5dc39e819e5daa42
--- 1/include/Probe.php
--- 2/include/Probe.php
+++ b/include/Probe.php
@@@ -1219,4 -1223,42 +1224,41 @@@ class Probe 
  
                return $data;
        }
+ 
+       /**
+        * @brief Mix two paths together to possibly fix missing parts
+        *
+        * @param string $avatar Path to the avatar
+        * @param string $base Another path that is hopefully complete
+        *
+        * @return string fixed avatar path
+        */
+       public static function fix_avatar($avatar, $base) {
+               $base_parts = parse_url($base);
+ 
+               // Remove all parts that could create a problem
+               unset($base_parts['path']);
+               unset($base_parts['query']);
+               unset($base_parts['fragment']);
+ 
+               $avatar_parts = parse_url($avatar);
+ 
+               // Now we mix them
+               $parts = array_merge($base_parts, $avatar_parts);
+ 
+               // And put them together again
+               $scheme   = isset($parts['scheme']) ? $parts['scheme'] . '://' : '';
+               $host     = isset($parts['host']) ? $parts['host'] : '';
+               $port     = isset($parts['port']) ? ':' . $parts['port'] : '';
+               $path     = isset($parts['path']) ? $parts['path'] : '';
+               $query    = isset($parts['query']) ? '?' . $parts['query'] : '';
+               $fragment = isset($parts['fragment']) ? '#' . $parts['fragment'] : '';
+ 
+               $fixed = $scheme.$host.$port.$path.$query.$fragment;
+ 
+               logger('Base: '.$base.' - Avatar: '.$avatar.' - Fixed: '.$fixed, LOGGER_DATA);
+ 
+               return $fixed;
+       }
+ 
  }
 -?>

diff --cc include/acl_selectors.php
Simple merge

diff --cc include/api.php
Simple merge

diff --cc include/dbstructure.php
Simple merge

diff --cc include/diaspora.php
Simple merge

diff --cc include/ostatus.php
index 82595529d2bc1f93cfea4dbbfb169abb04340f8f,7644eacc094ab434f72fd74c209a2958574b06b0..c3bdadf55b9522a714dc8ceaceb32ddc53d69d61
--- 1/include/ostatus.php
--- 2/include/ostatus.php
+++ b/include/ostatus.php
@@@ -3,7 -3,7 +3,8 @@@
   * @file include/ostatus.php
   */
  
 -use \Friendica\Core\Config;
 +use Friendica\App;
++use Friendica\Core\Config;
  
  require_once("include/Contact.php");
  require_once("include/threads.php");

diff --cc include/pubsubpublish.php
Simple merge

diff --cc include/socgraph.php
Simple merge

diff --cc mod/admin.php
Simple merge

diff --cc mod/contacts.php
Simple merge

diff --cc mod/receive.php
index abc91ce37e15ee96d296b05d77cb9ede6506812e,15c9f1d412796b1de5e2cd08664bdb36dba59d15..9048642174706bd486689bc9fdbca5907c425902
--- 1/mod/receive.php
--- 2/mod/receive.php
+++ b/mod/receive.php
@@@ -10,10 -9,10 +10,9 @@@ require_once('include/salmon.php')
  require_once('include/crypto.php');
  require_once('include/diaspora.php');
  
 -
  function receive_post(App $a) {
- 
-       $enabled = intval(get_config('system','diaspora_enabled'));
-       if(! $enabled) {
+       $enabled = intval(get_config('system', 'diaspora_enabled'));
+       if (!$enabled) {
                logger('mod-diaspora: disabled');
                http_status_exit(500);
        }