Only some spaces removed

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 55318e1ec563a5364ad6ad47e771ff5ee12dce86..f5ce32ac5c0d4bd7b0e56a3acfc973e8a913a140 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;
                        }
 
                }
@@ -682,6 +693,14 @@ if(! class_exists('App')) {
                        else
                                $stylesheet = '$stylesheet';
 
+                       $shortcut_icon = get_config("system", "shortcut_icon");
+                       if ($shortcut_icon == "")
+                               $shortcut_icon = $this->get_baseurl()."/images/friendica-32.png";
+
+                       $touch_icon = get_config("system", "touch_icon");
+                       if ($touch_icon == "")
+                               $touch_icon = $this->get_baseurl()."/images/friendica-128.png";
+
                        $tpl = get_markup_template('head.tpl');
                        $this->page['htmlhead'] = replace_macros($tpl,array(
                                '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
@@ -692,6 +711,8 @@ if(! class_exists('App')) {
                                '$showmore' => t('show more'),
                                '$showfewer' => t('show fewer'),
                                '$update_interval' => $interval,
+                               '$shortcut_icon' => $shortcut_icon,
+                               '$touch_icon' => $touch_icon,
                                '$stylesheet' => $stylesheet
                        )) . $this->page['htmlhead'];
                }
@@ -991,6 +1012,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 +1278,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;
@@ -2131,7 +2160,7 @@ function random_digits($digits) {
 }
 
 function get_cachefile($file, $writemode = true) {
-       $cache = get_config("system","itemcache");
+       $cache = get_itemcachepath();
 
        if ((! $cache) || (! is_dir($cache)))
                return("");
@@ -2152,7 +2181,7 @@ function get_cachefile($file, $writemode = true) {
 
 function clear_cache($basepath = "", $path = "") {
        if ($path == "") {
-               $basepath = get_config('system','itemcache');
+               $basepath = get_itemcachepath();
                $path = $basepath;
        }
 
@@ -2180,6 +2209,63 @@ function clear_cache($basepath = "", $path = "") {
        }
 }
 
+function get_itemcachepath() {
+       // Checking, if the cache is deactivated
+       $cachetime = (int)get_config('system','itemcache_duration');
+       if ($cachetime < 0)
+               return "";
+
+       $itemcache = get_config('system','itemcache');
+       if (($itemcache != "") AND is_dir($itemcache) AND is_writable($itemcache))
+               return($itemcache);
+
+       $temppath = get_temppath();
+
+       if ($temppath != "") {
+               $itemcache = $temppath."/itemcache";
+               mkdir($itemcache);
+
+               if (is_dir($itemcache) AND is_writable($itemcache)) {
+                       set_config("system", "itemcache", $itemcache);
+                       return($itemcache);
+               }
+       }
+       return "";
+}
+
+function get_lockpath() {
+       $lockpath = get_config('system','lockpath');
+       if (($lockpath != "") AND is_dir($lockpath) AND is_writable($lockpath))
+               return($lockpath);
+
+       $temppath = get_temppath();
+
+       if ($temppath != "") {
+               $lockpath = $temppath."/lock";
+               mkdir($lockpath);
+
+               if (is_dir($lockpath) AND is_writable($lockpath)) {
+                       set_config("system", "lockpath", $lockpath);
+                       return($lockpath);
+               }
+       }
+       return "";
+}
+
+function get_temppath() {
+       $temppath = get_config("system","temppath");
+       if (($temppath != "") AND is_dir($temppath) AND is_writable($temppath))
+               return($temppath);
+
+       $temppath = sys_get_temp_dir();
+       if (($temppath != "") AND is_dir($temppath) AND is_writable($temppath)) {
+               set_config("system", "temppath", $temppath);
+               return($temppath);
+       }
+
+       return("");
+}
+
 function set_template_engine(&$a, $engine = 'internal') {
 // This function is no longer necessary, but keep it as a wrapper to the class method
 // to avoid breaking themes again unnecessarily