X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=230cbc1e3a43a7f24fe1a10f6cff3ed2dddc3518;hb=02a0269a670d14c449d1cf6d95a5eb3dbabe530d;hp=0be159540625073f6bc4103a0ca436c6751a2b58;hpb=8e50254bb994592b28e04299a4bfc11f4c8c979a;p=friendica.git

diff --git a/boot.php b/boot.php
index 0be1595406..230cbc1e3a 100644
--- a/boot.php
+++ b/boot.php
@@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.1-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1207      );
+define ( 'DB_UPDATE_VERSION',      1208      );
 
 /**
  * @brief Constant with a HTML line break.
@@ -788,10 +788,18 @@ class App {
 	/**
 	 * @brief Retrieves the Friendica instance base URL
 	 *
-	 * Caches both SSL and non-SSL version for performance
+	 * This function assembles the base URL from multiple parts:
+	 * - Protocol is determined either by the request or a combination of
+	 * system.ssl_policy and the $ssl parameter.
+	 * - Host name is determined either by system.hostname or inferred from request
+	 * - Path is inferred from SCRIPT_NAME
 	 *
-	 * @param bool $ssl
-	 * @return string
+	 * Caches the result (depending on $ssl value) for performance.
+	 *
+	 * Note: $ssl parameter value doesn't directly correlate with the resulting protocol
+	 *
+	 * @param bool $ssl Whether to append http or https under SSL_POLICY_SELFSIGN
+	 * @return string Friendica server base URL
 	 */
 	function get_baseurl($ssl = false) {
 
@@ -800,33 +808,40 @@ class App {
 			return self::$a->get_baseurl($ssl);
 		}
 
-		if (!isset($this->baseurl[$ssl ? 'https' : 'http'])) {
-			$scheme = $this->scheme;
+		// Arbitrary values, the resulting url protocol can be different
+		$cache_index = $ssl ? 'https' : 'http';
 
-			if ((x($this->config, 'system')) && (x($this->config['system'], 'ssl_policy'))) {
-				if (intval($this->config['system']['ssl_policy']) === SSL_POLICY_FULL) {
-					$scheme = 'https';
-				}
+		// Cached value found, nothing to process
+		if (isset($this->baseurl[$cache_index])) {
+			return $this->baseurl[$cache_index];
+		}
 
-				//	Basically, we have $ssl = true on any links which can only be seen by a logged in user
-				//	(and also the login link). Anything seen by an outsider will have it turned off.
+		$scheme = $this->scheme;
 
-				if ($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
-					if ($ssl) {
-						$scheme = 'https';
-					} else {
-						$scheme = 'http';
-					}
-				}
+		if ((x($this->config, 'system')) && (x($this->config['system'], 'ssl_policy'))) {
+			if (intval($this->config['system']['ssl_policy']) === SSL_POLICY_FULL) {
+				$scheme = 'https';
 			}
 
-			if (get_config('config', 'hostname') != '') {
-				$this->hostname = get_config('config', 'hostname');
+			//	Basically, we have $ssl = true on any links which can only be seen by a logged in user
+			//	(and also the login link). Anything seen by an outsider will have it turned off.
+
+			if ($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
+				if ($ssl) {
+					$scheme = 'https';
+				} else {
+					$scheme = 'http';
+				}
 			}
+		}
 
-			$this->baseurl[$ssl ? 'https' : 'http'] = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
+		if (get_config('config', 'hostname') != '') {
+			$this->hostname = get_config('config', 'hostname');
 		}
-		return $this->baseurl[$ssl ? 'https' : 'http'];
+
+		$this->baseurl[$cache_index] = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
+
+		return $this->baseurl[$cache_index];
 	}
 
 	/**
@@ -1030,16 +1045,24 @@ class App {
 	 *
 	 * @return string The cleaned url
 	 */
-	function remove_baseurl($url){
+	function remove_baseurl($orig_url){
 
 		// Is the function called statically?
-		if (!is_object($this))
+		if (!is_object($this)) {
 			return(self::$a->remove_baseurl($url));
+		}
 
-		$url = normalise_link($url);
+		// Remove the hostname from the url if it is an internal link
+		$url = normalise_link($orig_url);
 		$base = normalise_link($this->get_baseurl());
 		$url = str_replace($base."/", "", $url);
-		return $url;
+
+		// if it is an external link return the orignal value
+		if ($url == normalise_link($orig_url)) {
+			return $orig_url;
+		} else {
+			return $url;
+		}
 	}
 
 	/**
@@ -1362,7 +1385,7 @@ class App {
 	function proc_run($args) {
 
 		// Add the php path if it is a php call
-		if (count($args) && ($args[0] === 'php' OR is_int($args[0]))) {
+		if (count($args) && ($args[0] === 'php' OR !is_string($args[0]))) {
 
 			// If the last worker fork was less than 10 seconds before then don't fork another one.
 			// This should prevent the forking of masses of workers.
@@ -1882,11 +1905,12 @@ function get_max_import_size() {
  * @brief Wrap calls to proc_close(proc_open()) and call hook
  *	so plugins can take part in process :)
  *
- * @param (string|integer) $cmd program to run or priority
+ * @param (string|integer|array) $cmd program to run, priority or parameter array
  *
  * next args are passed as $cmd command line
  * e.g.: proc_run("ls","-la","/tmp");
  * or: proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
+ * or: proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "include/create_shadowentry.php", $post_id);
  *
  * @note $cmd and string args are surrounded with ""
  *
@@ -1897,24 +1921,31 @@ function proc_run($cmd){
 
 	$a = get_app();
 
-	$args = func_get_args();
+	$proc_args = func_get_args();
 
-	$newargs = array();
-	if (!count($args))
+	$args = array();
+	if (!count($proc_args)) {
 		return;
+	}
 
-	// expand any arrays
+	// Preserve the first parameter
+	// It could contain a command, the priority or an parameter array
+	// If we use the parameter array we have to protect it from the following function
+	$run_parameter = array_shift($proc_args);
 
-	foreach($args as $arg) {
-		if(is_array($arg)) {
-			foreach($arg as $n) {
-				$newargs[] = $n;
+	// expand any arrays
+	foreach ($proc_args as $arg) {
+		if (is_array($arg)) {
+			foreach ($arg as $n) {
+				$args[] = $n;
 			}
-		} else
-			$newargs[] = $arg;
+		} else {
+			$args[] = $arg;
+		}
 	}
 
-	$args = $newargs;
+	// Now we add the run parameters back to the array
+	array_unshift($args, $run_parameter);
 
 	$arr = array('args' => $args, 'run_cmd' => true);
 
@@ -1922,16 +1953,24 @@ function proc_run($cmd){
 	if (!$arr['run_cmd'] OR !count($args))
 		return;
 
-	if (!get_config("system", "worker") OR
-		(($args[0] != 'php') AND !is_int($args[0]))) {
+	if (!get_config("system", "worker") OR (is_string($run_parameter) AND ($run_parameter != 'php'))) {
 		$a->proc_run($args);
 		return;
 	}
 
-	if (is_int($args[0]))
-		$priority = $args[0];
-	else
-		$priority = PRIORITY_MEDIUM;
+	$priority = PRIORITY_MEDIUM;
+	$dont_fork = get_config("system", "worker_dont_fork");
+
+	if (is_int($run_parameter)) {
+		$priority = $run_parameter;
+	} elseif (is_array($run_parameter)) {
+		if (isset($run_parameter['priority'])) {
+			$priority = $run_parameter['priority'];
+		}
+		if (isset($run_parameter['dont_fork'])) {
+			$dont_fork = $run_parameter['dont_fork'];
+		}
+	}
 
 	$argv = $args;
 	array_shift($argv);
@@ -1948,8 +1987,9 @@ function proc_run($cmd){
 			intval($priority));
 
 	// Should we quit and wait for the poller to be called as a cronjob?
-	if (get_config("system", "worker_dont_fork"))
+	if ($dont_fork) {
 		return;
+	}
 
 	// Checking number of workers
 	$workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");