X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=boot.php;h=527103bc91542481971dbc47323c8c9ecc448972;hb=8e80755a47bb1ade7ab0657959bc2ea789e4e391;hp=4ea5a497626888882743fc284638f7d562a49952;hpb=6881edf1f77436609ca0c70ac027b6db45f06689;p=friendica.git

diff --git a/boot.php b/boot.php
index 4ea5a49762..527103bc91 100644
--- a/boot.php
+++ b/boot.php
@@ -12,9 +12,9 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1584' );
+define ( 'FRIENDICA_VERSION',      '3.1.1612' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1157      );
+define ( 'DB_UPDATE_VERSION',      1159      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -622,7 +622,6 @@ if(! class_exists('App')) {
 			 */
 			if(!isset($this->page['htmlhead']))
 				$this->page['htmlhead'] = '';
-			$tpl = get_markup_template('head.tpl');
 
 			// If we're using Smarty, then doing replace_macros() will replace
 			// any unrecognized variables with a blank string. Since we delay
@@ -633,6 +632,7 @@ if(! class_exists('App')) {
 			else
 				$stylesheet = '$stylesheet';
 
+			$tpl = get_markup_template('head.tpl');
 			$this->page['htmlhead'] = replace_macros($tpl,array(
 				'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
 				'$local_user' => local_user(),
@@ -671,14 +671,6 @@ if(! class_exists('App')) {
 			return $this->curl_headers;
 		}
 
-		function get_template_engine() {
-			return get_template_engine($this);
-		}
-
-		function set_template_engine($engine = 'internal') {
-			return set_template_engine($this,$engine);
-		}
-
 		function get_cached_avatar_image($avatar_image){
 			if($this->cached_profile_image[$avatar_image])
 				return $this->cached_profile_image[$avatar_image];
@@ -811,18 +803,26 @@ function is_ajax() {
 	return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
 }
 
+function check_db() {
 
-// Primarily involved with database upgrade, but also sets the
-// base url for use in cmdline programs which don't have
-// $_SERVER variables, and synchronising the state of installed plugins.
+	$build = get_config('system','build');
+	if(! x($build)) {
+		set_config('system','build',DB_UPDATE_VERSION);
+		$build = DB_UPDATE_VERSION;
+	}
+	if($build != DB_UPDATE_VERSION)
+		proc_run('php', 'include/dbupdate.php');
+
+}
 
 
-if(! function_exists('check_config')) {
-	function check_config(&$a) {
 
-		$build = get_config('system','build');
-		if(! x($build))
-			$build = set_config('system','build',DB_UPDATE_VERSION);
+
+// Sets the base url for use in cmdline programs which don't have
+// $_SERVER variables
+
+if(! function_exists('check_url')) {
+	function check_url(&$a) {
 
 		$url = get_config('system','url');
 
@@ -837,6 +837,19 @@ if(! function_exists('check_config')) {
 		if((! link_compare($url,$a->get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname)))
 			$url = set_config('system','url',$a->get_baseurl());
 
+		return;
+	}
+}
+
+
+// Automatic database updates
+
+if(! function_exists('update_db')) {
+	function update_db(&$a) {
+
+		$build = get_config('system','build');
+		if(! x($build))
+			$build = set_config('system','build',DB_UPDATE_VERSION);
 
 		if($build != DB_UPDATE_VERSION) {
 			$stored = intval($build);
@@ -906,6 +919,14 @@ if(! function_exists('check_config')) {
 			}
 		}
 
+		return;
+	}
+}
+
+
+if(! function_exists('check_plugins')) {
+	function check_plugins(&$a) {
+
 		/**
 		 *
 		 * Synchronise plugins:
@@ -1306,7 +1327,7 @@ if(! function_exists('profile_sidebar')) {
 			}
 		}
 
-		if(get_my_url() && $profile['unkmail'])
+		if( get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()) )
 			$wallmessage = t('Message');
 		else
 			$wallmessage = false;
@@ -1389,8 +1410,6 @@ if(! function_exists('profile_sidebar')) {
 		}
 
 
-		$tpl = get_markup_template('profile_vcard.tpl');
-
 		$p = array();
 		foreach($profile as $k => $v) {
 			$k = str_replace('-','_',$k);
@@ -1400,6 +1419,7 @@ if(! function_exists('profile_sidebar')) {
 		if($a->theme['template_engine'] === 'internal')
 			$location = template_escape($location);
 
+		$tpl = get_markup_template('profile_vcard.tpl');
 		$o .= replace_macros($tpl, array(
 			'$profile' => $p,
 			'$connect'  => $connect,
@@ -1915,6 +1935,36 @@ function build_querystring($params, $name=null) {
     return $ret;    
 }
 
+function explode_querystring($query) {
+	$arg_st = strpos($query, '?');
+	if($arg_st !== false) {
+		$base = substr($query, 0, $arg_st);
+		$arg_st += 1;
+	}
+	else {
+		$base = '';
+		$arg_st = 0;
+	}
+
+	$args = explode('&', substr($query, $arg_st));
+	foreach($args as $k=>$arg) {
+		if($arg === '')
+			unset($args[$k]);
+	}
+	$args = array_values($args);
+
+	if(!$base) {
+		$base = $args[0];
+		unset($args[0]);
+		$args = array_values($args);
+	}
+
+	return array(
+		'base' => $base,
+		'args' => $args,
+	);
+}
+
 /**
 * Returns the complete URL of the current page, e.g.: http(s)://something.com/network
 *