X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=boot.php;h=35c37d715ea07909bb5f8f0623ec3dd3571d0fc2;hb=70c08dee1dfa6960a611961e8ff23fffb7e15177;hp=b8be70229c8a2336e3ee5efed1695704abea606a;hpb=637eb0bfb495399502f3a8faf500572c143cdfc3;p=friendica.git

diff --git a/boot.php b/boot.php
index b8be70229c..35c37d715e 100644
--- a/boot.php
+++ b/boot.php
@@ -41,9 +41,9 @@ require_once 'include/poller.php';
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
-define ( 'FRIENDICA_VERSION',      '3.5.3-dev' );
+define ( 'FRIENDICA_VERSION',      '3.6-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1234      );
+define ( 'DB_UPDATE_VERSION',      1235      );
 
 /**
  * @brief Constant with a HTML line break.
@@ -229,8 +229,9 @@ define('PROTOCOL_UNKNOWN',         0);
 define('PROTOCOL_DFRN',            1);
 define('PROTOCOL_DIASPORA',        2);
 define('PROTOCOL_OSTATUS_SALMON',  3);
-define('PROTOCOL_OSTATUS_FEED',    4);
-define('PROTOCOL_GS_CONVERSATION', 5);
+define('PROTOCOL_OSTATUS_FEED',    4); // Deprecated
+define('PROTOCOL_GS_CONVERSATION', 5); // Deprecated
+define('PROTOCOL_SPLITTED_CONV',   6);
 /** @}*/
 
 /**
@@ -393,6 +394,7 @@ define ( 'ACTIVITY_POST',        NAMESPACE_ACTIVITY_SCHEMA . 'post' );
 define ( 'ACTIVITY_UPDATE',      NAMESPACE_ACTIVITY_SCHEMA . 'update' );
 define ( 'ACTIVITY_TAG',         NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
 define ( 'ACTIVITY_FAVORITE',    NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
+define ( 'ACTIVITY_UNFAVORITE',  NAMESPACE_ACTIVITY_SCHEMA . 'unfavorite' );
 define ( 'ACTIVITY_SHARE',       NAMESPACE_ACTIVITY_SCHEMA . 'share' );
 define ( 'ACTIVITY_DELETE',      NAMESPACE_ACTIVITY_SCHEMA . 'delete' );
 
@@ -508,6 +510,11 @@ function startup() {
  */
 function get_app() {
 	global $a;
+
+	if (empty($a)) {
+		$a = new App(dirname(__DIR__));
+	}
+
 	return $a;
 }
 
@@ -589,7 +596,12 @@ function is_ajax() {
 	return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
 }
 
-function check_db() {
+/**
+ * @brief Function to check if request was an AJAX (xmlhttprequest) request.
+ *
+ * @param $via_worker boolean Is the check run via the poller?
+ */
+function check_db($via_worker) {
 
 	$build = get_config('system', 'build');
 	if (!x($build)) {
@@ -597,7 +609,10 @@ function check_db() {
 		$build = DB_UPDATE_VERSION;
 	}
 	if ($build != DB_UPDATE_VERSION) {
-		proc_run(PRIORITY_CRITICAL, 'include/dbupdate.php');
+		// When we cannot execute the database update via the worker, we will do it directly
+		if (!Worker::add(PRIORITY_CRITICAL, 'dbupdate') && $via_worker) {
+			update_db(get_app());
+		}
 	}
 }
 
@@ -889,8 +904,14 @@ function login($register = false, $hiddens = false) {
  * @brief Used to end the current process, after saving session state.
  */
 function killme() {
+	global $session_exists;
+
 	if (!get_app()->is_backend()) {
-		session_write_close();
+		if (!$session_exists) {
+			session_abort();
+		} else {
+			session_write_close();
+		}
 	}
 
 	exit();
@@ -1009,107 +1030,15 @@ function get_max_import_size() {
 }
 
 /**
- * @brief Wrap calls to proc_close(proc_open()) and call hook
- * 	so plugins can take part in process :)
+ * @brief compatibilty wrapper for Worker::add function
  *
  * @param (integer|array) priority or parameter array, $cmd atrings are deprecated and are ignored
  *
- * next args are passed as $cmd command line
- * 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 ""
- *
- * @hooks 'proc_run'
- * 	array $arr
+ * @return boolean "false" if proc_run couldn't be executed
  */
-function proc_run($cmd) {
-
-	$a = get_app();
-
+function proc_run() {
 	$proc_args = func_get_args();
-
-	$args = array();
-	if (!count($proc_args)) {
-		return;
-	}
-
-	// 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);
-
-	// expand any arrays
-	foreach ($proc_args as $arg) {
-		if (is_array($arg)) {
-			foreach ($arg as $n) {
-				$args[] = $n;
-			}
-		} else {
-			$args[] = $arg;
-		}
-	}
-
-	// Now we add the run parameters back to the array
-	array_unshift($args, $run_parameter);
-
-	$arr = array('args' => $args, 'run_cmd' => true);
-
-	call_hooks("proc_run", $arr);
-	if (!$arr['run_cmd'] || ! count($args)) {
-		return;
-	}
-
-	$priority = PRIORITY_MEDIUM;
-	$dont_fork = get_config("system", "worker_dont_fork");
-	$created = datetime_convert();
-
-	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['created'])) {
-			$created = $run_parameter['created'];
-		}
-		if (isset($run_parameter['dont_fork'])) {
-			$dont_fork = $run_parameter['dont_fork'];
-		}
-	}
-
-	$argv = $args;
-	array_shift($argv);
-
-	$parameters = json_encode($argv);
-	$found = dba::exists('workerqueue', array('parameter' => $parameters, 'done' => false));
-
-	if (!$found) {
-		dba::insert('workerqueue', array('parameter' => $parameters, 'created' => $created, 'priority' => $priority));
-	}
-
-	// Should we quit and wait for the poller to be called as a cronjob?
-	if ($dont_fork) {
-		return;
-	}
-
-	// If there is a lock then we don't have to check for too much worker
-	if (!Lock::set('poller_worker', 0)) {
-		return;
-	}
-
-	// If there are already enough workers running, don't fork another one
-	$quit = poller_too_much_workers();
-	Lock::remove('poller_worker');
-
-	if ($quit) {
-		return;
-	}
-
-	// Now call the poller to execute the jobs that we just added to the queue
-	$args = array("include/poller.php", "no_cron");
-
-	$a->proc_run($args);
+	call_user_func_array('Friendica\Core\Worker::add', $proc_args);
 }
 
 function current_theme() {