Merge pull request #1023 from tobiasd/fixaddontrans

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 55318e1ec563a5364ad6ad47e771ff5ee12dce86..ee5943d61bbf230bd5429fb811a645f9036a1e2c 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.2.1748' );
+define ( 'FRIENDICA_VERSION',      '3.2.1751' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1170      );
 define ( 'EOL',                    "<br />\r\n"     );
@@ -142,6 +142,8 @@ define ( 'NETWORK_GPLUS',            'goog');    // Google+
 define ( 'NETWORK_PUMPIO',           'pump');    // pump.io
 define ( 'NETWORK_TWITTER',          'twit');    // Twitter
 define ( 'NETWORK_DIASPORA2',        'dspc');    // Diaspora connector
+define ( 'NETWORK_STATUSNET',        'stac');    // Statusnet connector
+define ( 'NETWORK_APPNET',           'apdn');    // app.net
 
 define ( 'NETWORK_PHANTOM',          'unkn');    // Place holder
 
@@ -167,6 +169,8 @@ $netgroup_ids = array(
        NETWORK_PUMPIO   => (-13),
        NETWORK_TWITTER  => (-14),
        NETWORK_DIASPORA2 => (-15),
+       NETWORK_STATUSNET => (-16),
+       NETWORK_APPNET => (-17),
 
        NETWORK_PHANTOM  => (-127),
 );
@@ -426,6 +430,8 @@ if(! class_exists('App')) {
 
                        global $default_timezone, $argv, $argc;
 
+                       $hostname = "";
+
                        if (file_exists(".htpreconfig.php"))
                                @include(".htpreconfig.php");
 
@@ -620,11 +626,16 @@ if(! class_exists('App')) {
                        if($parsed) {
                                $this->scheme = $parsed['scheme'];
 
-                               $this->hostname = $parsed['host'];
+                               $hostname = $parsed['host'];
                                if(x($parsed,'port'))
-                                       $this->hostname .= ':' . $parsed['port'];
+                                       $hostname .= ':' . $parsed['port'];
                                if(x($parsed,'path'))
                                        $this->path = trim($parsed['path'],'\\/');
+
+                               if (file_exists(".htpreconfig.php"))
+                                       @include(".htpreconfig.php");
+
+                               $this->hostname = $hostname;
                        }
 
                }
@@ -991,6 +1002,10 @@ if(! function_exists('update_db')) {
 
                                if(DB_UPDATE_VERSION == UPDATE_VERSION) {
 
+                                       // Compare the current structure with the defined structure
+                                       require_once("include/dbstructure.php");
+                                       update_structure(false, true);
+
                                        for($x = $stored; $x < $current; $x ++) {
                                                if(function_exists('update_' . $x)) {
 
@@ -1253,6 +1268,10 @@ if(! function_exists('info')) {
         */
        function info($s) {
                $a = get_app();
+
+               if (local_user() AND get_pconfig(local_user(),'system','ignore_info'))
+                       return;
+
                if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
                if($a->interactive)
                        $_SESSION['sysmsg_info'][] = $s;