Merge branch 'pull'

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 836900fc4a69059e0fbc0e4beaad3788e35c107a..9582372ca150ae94b67a24345aacc83f5dc5b9c2 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1283' );
+define ( 'FRIENDICA_VERSION',      '2.3.1295' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1132      );
+define ( 'DB_UPDATE_VERSION',      1133      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -135,6 +135,9 @@ define ( 'NOTIFY_PROFILE',  0x0040 );
 define ( 'NOTIFY_TAGSELF',  0x0080 );
 define ( 'NOTIFY_TAGSHARE', 0x0100 );
 
+define ( 'NOTIFY_SYSTEM',   0x8000 );
+
+
 /**
  * various namespaces we may need to parse
  */
@@ -385,7 +388,7 @@ class App {
                $scheme = $this->scheme;
 
                if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
-                       if($this->config['system']['ssl_policy'] == SSL_POLICY_FULL) 
+                       if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL)) 
                                $scheme = 'https';
 
 //                     We need to populate the $ssl flag across the entire program before turning this on.
@@ -560,6 +563,10 @@ function absurl($path) {
        return $path;
 }
 
+function is_ajax() {
+       return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
+}
+
 
 // Primarily involved with database upgrade, but also sets the 
 // base url for use in cmdline programs which don't have
@@ -713,15 +720,16 @@ function login($register = false, $hiddens=false) {
 
        $noid = get_config('system','no_openid');
        
+       $dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
+
        if(local_user()) {
                $tpl = get_markup_template("logout.tpl");
        }
        else {
                $tpl = get_markup_template("login.tpl");
-
+               $_SESSION['return_url'] = $a->query_string;
        }
 
-       $dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
 
        $o .= replace_macros($tpl,array(
 
@@ -1377,6 +1385,11 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
                );
        }
 
+
+       $arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
+       call_hooks('profile_tabs', $arr);
+       
        $tpl = get_markup_template('common_tabs.tpl');
-       return replace_macros($tpl,array('$tabs'=>$tabs));
+
+       return replace_macros($tpl,array('$tabs' => $arr['tabs']));
 }}