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;
define ( 'FRIENDICA_CODENAME', 'Asparagus');
define ( 'FRIENDICA_VERSION', '3.5.3-dev' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1233 );
+define ( 'DB_UPDATE_VERSION', 1234 );
/**
* @brief Constant with a HTML line break.
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);
/** @}*/
/**
define ( 'NOTIFY_POKE', 0x0200 );
define ( 'NOTIFY_SHARE', 0x0400 );
+define ( 'SYSTEM_EMAIL', 0x4000 );
+
define ( 'NOTIFY_SYSTEM', 0x8000 );
/* @}*/
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();
}
/**
// 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;
*/
function goaway($s) {
if (!strstr(normalise_link($s), "http://")) {
- $s = App::get_baseurl() . "/" . $s;
+ $s = System::baseUrl() . "/" . $s;
}
header("Location: $s");
* @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']);
}