X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=78bd68f3e4fe8fecddff1ffb27d8e4d681495c7c;hb=ccbef51eff27bde0908e58f848ef58c705ec6a6a;hp=a069dcafc974e43312f0f6bf29141983cab40d0e;hpb=41d5c7d4c7bb7b45c63687a98170b505a96d3d2b;p=friendica.git

diff --git a/boot.php b/boot.php
index a069dcafc9..78bd68f3e4 100644
--- a/boot.php
+++ b/boot.php
@@ -20,6 +20,7 @@
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 use Friendica\App;
+use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
@@ -37,10 +38,10 @@ use Friendica\Util\DateTimeFormat;
 require_once 'include/text.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
-define('FRIENDICA_CODENAME',     'Asparagus');
-define('FRIENDICA_VERSION',      '3.6-dev');
+define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
+define('FRIENDICA_VERSION',      '2018.05-rc');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1256);
+define('DB_UPDATE_VERSION',      1265);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -211,12 +212,16 @@ define('PAGE_PRVGROUP',          5);
  *
  * ACCOUNT_TYPE_COMMUNITY - the account is community forum
  *	Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP
+ *
+ * ACCOUNT_TYPE_RELAY - the account is a relay
+ *      This will only be assigned to contacts, not to user accounts
  * @{
  */
 define('ACCOUNT_TYPE_PERSON',      0);
 define('ACCOUNT_TYPE_ORGANISATION', 1);
 define('ACCOUNT_TYPE_NEWS',        2);
 define('ACCOUNT_TYPE_COMMUNITY',   3);
+define('ACCOUNT_TYPE_RELAY',       4);
 /**
  * @}
  */
@@ -227,10 +232,11 @@ define('ACCOUNT_TYPE_COMMUNITY',   3);
  * Type of the community page
  * @{
  */
-define('CP_NO_COMMUNITY_PAGE',  -1);
-define('CP_USERS_ON_SERVER',     0);
-define('CP_GLOBAL_COMMUNITY',    1);
-define('CP_USERS_AND_GLOBAL',    2);
+define('CP_NO_INTERNAL_COMMUNITY', -2);
+define('CP_NO_COMMUNITY_PAGE',     -1);
+define('CP_USERS_ON_SERVER',        0);
+define('CP_GLOBAL_COMMUNITY',       1);
+define('CP_USERS_AND_GLOBAL',       2);
 /**
  * @}
  */
@@ -536,6 +542,7 @@ function get_app()
 
 	if (empty($a)) {
 		$a = new App(dirname(__DIR__));
+		BaseObject::setApp($a);
 	}
 
 	return $a;
@@ -947,10 +954,12 @@ function public_contact()
  */
 function remote_user()
 {
-	// You cannot be both local and remote
-	if (local_user()) {
-		return false;
-	}
+	// You cannot be both local and remote.
+	// Unncommented by rabuzarus because remote authentication to local
+	// profiles wasn't possible anymore (2018-04-12).
+//	if (local_user()) {
+//		return false;
+//	}
 	if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) {
 		return intval($_SESSION['visitor_id']);
 	}
@@ -1009,114 +1018,6 @@ function get_max_import_size()
 	return (x($a->config, 'max_import_size') ? $a->config['max_import_size'] : 0);
 }
 
-
-function current_theme()
-{
-	$app_base_themes = ['duepuntozero', 'dispy', 'quattro'];
-
-	$a = get_app();
-
-	$page_theme = null;
-
-	// Find the theme that belongs to the user whose stuff we are looking at
-
-	if ($a->profile_uid && ($a->profile_uid != local_user())) {
-		$r = q(
-			"select theme from user where uid = %d limit 1",
-			intval($a->profile_uid)
-		);
-		if (DBM::is_result($r)) {
-			$page_theme = $r[0]['theme'];
-		}
-	}
-
-	// Allow folks to over-rule user themes and always use their own on their own site.
-	// This works only if the user is on the same server
-
-	if ($page_theme && local_user() && (local_user() != $a->profile_uid)) {
-		if (PConfig::get(local_user(), 'system', 'always_my_theme')) {
-			$page_theme = null;
-		}
-	}
-
-//		$mobile_detect = new Mobile_Detect();
-//		$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
-	$is_mobile = $a->is_mobile || $a->is_tablet;
-
-	$standard_system_theme = Config::get('system', 'theme', '');
-	$standard_theme_name = ((isset($_SESSION) && x($_SESSION, 'theme')) ? $_SESSION['theme'] : $standard_system_theme);
-
-	if ($is_mobile) {
-		if (isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
-			$theme_name = $standard_theme_name;
-		} else {
-			$system_theme = Config::get('system', 'mobile-theme', '');
-			if ($system_theme == '') {
-				$system_theme = $standard_system_theme;
-			}
-			$theme_name = ((isset($_SESSION) && x($_SESSION, 'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
-
-			if ($theme_name === '---') {
-				// user has selected to have the mobile theme be the same as the normal one
-				$theme_name = $standard_theme_name;
-
-				if ($page_theme) {
-					$theme_name = $page_theme;
-				}
-			}
-		}
-	} else {
-		$theme_name = $standard_theme_name;
-
-		if ($page_theme) {
-			$theme_name = $page_theme;
-		}
-	}
-
-	if ($theme_name
-		&& (file_exists('view/theme/' . $theme_name . '/style.css')
-		|| file_exists('view/theme/' . $theme_name . '/style.php'))
-	) {
-		return($theme_name);
-	}
-
-	foreach ($app_base_themes as $t) {
-		if (file_exists('view/theme/' . $t . '/style.css')
-			|| file_exists('view/theme/' . $t . '/style.php')
-		) {
-			return($t);
-		}
-	}
-
-	$fallback = array_merge(glob('view/theme/*/style.css'), glob('view/theme/*/style.php'));
-	if (count($fallback)) {
-		return (str_replace('view/theme/', '', substr($fallback[0], 0, -10)));
-	}
-
-	/// @TODO No final return statement?
-}
-
-/**
- * @brief Return full URL to theme which is currently in effect.
- *
- * Provide a sane default if nothing is chosen or the specified theme does not exist.
- *
- * @return string
- */
-function current_theme_url()
-{
-	$a = get_app();
-
-	$t = current_theme();
-
-	$opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
-	if (file_exists('view/theme/' . $t . '/style.php')) {
-		return('view/theme/' . $t . '/style.pcss' . $opts);
-	}
-
-	return('view/theme/' . $t . '/style.css');
-}
-
 function feed_birthday($uid, $tz)
 {
 	/**
@@ -1283,7 +1184,7 @@ function get_server()
 	$server = Config::get("system", "directory");
 
 	if ($server == "") {
-		$server = "http://dir.friendica.social";
+		$server = "https://dir.friendica.social";
 	}
 
 	return($server);