X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=5b82c8b8f28d43cf0f2d7bf224375e9f6d2c2d3b;hb=ab60641e3ba731aca42ab510bdf9c2411db6aab4;hp=b69fd91c45905d3d51ba6cf57e60491ddbf9140b;hpb=ef3398f09a32adcb30d4a56f85bff732d3745ace;p=friendica.git diff --git a/boot.php b/boot.php index b69fd91c45..5b82c8b8f2 100644 --- a/boot.php +++ b/boot.php @@ -21,6 +21,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php'); use Friendica\App; +use Friendica\Core\System; use Friendica\Core\Config; use Friendica\Util\Lock; @@ -40,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', 1232 ); +define ( 'DB_UPDATE_VERSION', 1234 ); /** * @brief Constant with a HTML line break. @@ -228,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); /** @}*/ /** @@ -319,6 +321,8 @@ define ( 'NOTIFY_TAGSHARE', 0x0100 ); define ( 'NOTIFY_POKE', 0x0200 ); define ( 'NOTIFY_SHARE', 0x0400 ); +define ( 'SYSTEM_EMAIL', 0x4000 ); + define ( 'NOTIFY_SYSTEM', 0x8000 ); /* @}*/ @@ -390,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' ); @@ -551,31 +556,16 @@ function system_unavailable() { killme(); } -function clean_urls() { - $a = get_app(); - return true; -} - -function z_path() { - $base = App::get_baseurl(); - - if (!clean_urls()) { - $base .= '/?q='; - } - - return $base; -} - /** * @brief Returns the baseurl. * - * @see App::get_baseurl() + * @see System::baseUrl() * * @return string - * @TODO Maybe super-flous and deprecated? Seems to only wrap App::get_baseurl() + * @TODO Function is deprecated and only used in some addons */ function z_root() { - return App::get_baseurl(); + return System::baseUrl(); } /** @@ -601,7 +591,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)) { @@ -609,7 +604,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 (!proc_run(PRIORITY_CRITICAL, 'include/dbupdate.php') && $via_worker) { + update_db(get_app()); + } } } @@ -628,10 +626,10 @@ function check_url(App $a) { // We will only change the url to an ip address if there is no existing setting if (!x($url)) { - $url = set_config('system', 'url', App::get_baseurl()); + $url = set_config('system', 'url', System::baseUrl()); } - if ((!link_compare($url, App::get_baseurl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname))) { - $url = set_config('system', 'url', App::get_baseurl()); + if ((!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname))) { + $url = set_config('system', 'url', System::baseUrl()); } return; @@ -913,7 +911,7 @@ function killme() { */ function goaway($s) { if (!strstr(normalise_link($s), "http://")) { - $s = App::get_baseurl() . "/" . $s; + $s = System::baseUrl() . "/" . $s; } header("Location: $s"); @@ -961,6 +959,10 @@ function public_contact() { * @return int|bool visitor_id or false */ function remote_user() { + // You cannot be both local and remote + if (local_user()) { + return false; + } if ((x($_SESSION, 'authenticated')) && (x($_SESSION, 'visitor_id'))) { return intval($_SESSION['visitor_id']); } @@ -1030,6 +1032,8 @@ function get_max_import_size() { * * @hooks 'proc_run' * array $arr + * + * @return boolean "false" if proc_run couldn't be executed */ function proc_run($cmd) { @@ -1039,7 +1043,7 @@ function proc_run($cmd) { $args = array(); if (!count($proc_args)) { - return; + return false; } // Preserve the first parameter @@ -1065,7 +1069,7 @@ function proc_run($cmd) { call_hooks("proc_run", $arr); if (!$arr['run_cmd'] || ! count($args)) { - return; + return true; } $priority = PRIORITY_MEDIUM; @@ -1090,20 +1094,25 @@ function proc_run($cmd) { array_shift($argv); $parameters = json_encode($argv); - $found = dba::select('workerqueue', array('id'), array('parameter' => $parameters, 'done' => false), array('limit' => 1)); + $found = dba::exists('workerqueue', array('parameter' => $parameters, 'done' => false)); - if (!dbm::is_result($found)) { + // Quit if there was a database error - a precaution for the update process to 3.5.3 + if (dba::errorNo() != 0) { + return 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; + return true; } // If there is a lock then we don't have to check for too much worker if (!Lock::set('poller_worker', 0)) { - return; + return true; } // If there are already enough workers running, don't fork another one @@ -1111,13 +1120,15 @@ function proc_run($cmd) { Lock::remove('poller_worker'); if ($quit) { - return; + return true; } // 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); + + return true; } function current_theme() { @@ -1399,7 +1410,7 @@ function get_temppath() { if (($temppath != "") && App::directory_usable($temppath)) { // We have a temp path and it is usable - return $temppath; + return App::realpath($temppath); } // We don't have a working preconfigured temp path, so we take the system path. @@ -1407,6 +1418,9 @@ function get_temppath() { // Check if it is usable if (($temppath != "") && App::directory_usable($temppath)) { + // Always store the real path, not the path through symlinks + $temppath = App::realpath($temppath); + // To avoid any interferences with other systems we create our own directory $new_temppath = $temppath . "/" . $a->get_hostname(); if (!is_dir($new_temppath)) { @@ -1495,7 +1509,7 @@ function get_itemcachepath() { $itemcache = get_config('system', 'itemcache'); if (($itemcache != "") && App::directory_usable($itemcache)) { - return $itemcache; + return App::realpath($itemcache); } $temppath = get_temppath();