X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=ae33f7c414f6a40a1f1ad3338e6a6e54e35b6144;hb=04b513ba95f80865be60e873af869363cc6a78e6;hp=ba12f86d2c4f392bfcec9c8b73827e4822c8b0b8;hpb=2c2d4e58693f24e50a3469b3d34b959edf412fbd;p=friendica.git

diff --git a/boot.php b/boot.php
index ba12f86d2c..ae33f7c414 100644
--- a/boot.php
+++ b/boot.php
@@ -39,9 +39,9 @@ require_once 'include/text.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
-define('FRIENDICA_VERSION',      '2018-05-dev');
+define('FRIENDICA_VERSION',      '2018.08-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1259);
+define('DB_UPDATE_VERSION',      1277);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -451,8 +451,9 @@ define('ACTIVITY_OBJ_QUESTION', 'http://activityschema.org/object/question');
  * @{
  */
 define('GRAVITY_PARENT',       0);
-define('GRAVITY_LIKE',         3);
+define('GRAVITY_ACTIVITY',     3);
 define('GRAVITY_COMMENT',      6);
+define('GRAVITY_UNKNOWN',      9);
 /* @}*/
 
 /**
@@ -498,36 +499,6 @@ if (!defined("SIGTERM")) {
 if (!defined('CURLE_OPERATION_TIMEDOUT')) {
 	define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED);
 }
-/**
- * Reverse the effect of magic_quotes_gpc if it is enabled.
- * Please disable magic_quotes_gpc so we don't have to do this.
- * See http://php.net/manual/en/security.magicquotes.disabling.php
- */
-function startup()
-{
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-	set_time_limit(0);
-
-	// This has to be quite large to deal with embedded private photos
-	ini_set('pcre.backtrack_limit', 500000);
-
-	if (get_magic_quotes_gpc()) {
-		$process = [&$_GET, &$_POST, &$_COOKIE, &$_REQUEST];
-		while (list($key, $val) = each($process)) {
-			foreach ($val as $k => $v) {
-				unset($process[$key][$k]);
-				if (is_array($v)) {
-					$process[$key][stripslashes($k)] = $v;
-					$process[] = &$process[$key][stripslashes($k)];
-				} else {
-					$process[$key][stripslashes($k)] = stripslashes($v);
-				}
-			}
-		}
-		unset($process);
-	}
-}
 
 /**
  * @brief Retrieve the App structure
@@ -706,7 +677,7 @@ function check_url(App $a)
 	// and www.example.com vs example.com.
 	// We will only change the url to an ip address if there is no existing setting
 
-	if (empty($url) || (!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname))) {
+	if (empty($url) || (!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname()))) {
 		Config::set('system', 'url', System::baseUrl());
 	}
 
@@ -864,28 +835,6 @@ function check_addons(App $a)
 	return;
 }
 
-function get_guid($size = 16, $prefix = '')
-{
-	if (is_bool($prefix) && !$prefix) {
-		$prefix = '';
-	} elseif ($prefix == '') {
-		$a = get_app();
-		$prefix = hash('crc32', $a->get_hostname());
-	}
-
-	while (strlen($prefix) < ($size - 13)) {
-		$prefix .= mt_rand();
-	}
-
-	if ($size >= 24) {
-		$prefix = substr($prefix, 0, $size - 22);
-		return str_replace('.', '', uniqid($prefix, true));
-	} else {
-		$prefix = substr($prefix, 0, max($size - 13, 0));
-		return uniqid($prefix);
-	}
-}
-
 /**
  * @brief Used to end the current process, after saving session state.
  * @deprecated
@@ -917,7 +866,7 @@ function goaway($path)
  */
 function local_user()
 {
-	if (x($_SESSION, 'authenticated') && x($_SESSION, 'uid')) {
+	if (!empty($_SESSION['authenticated']) && !empty($_SESSION['uid'])) {
 		return intval($_SESSION['uid']);
 	}
 	return false;
@@ -960,6 +909,11 @@ function remote_user()
 //	if (local_user()) {
 //		return false;
 //	}
+
+	if (empty($_SESSION)) {
+		return false;
+	}
+
 	if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) {
 		return intval($_SESSION['visitor_id']);
 	}
@@ -975,6 +929,10 @@ function remote_user()
  */
 function notice($s)
 {
+	if (empty($_SESSION)) {
+		return;
+	}
+
 	$a = get_app();
 	if (!x($_SESSION, 'sysmsg')) {
 		$_SESSION['sysmsg'] = [];
@@ -1018,114 +976,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)
 {
 	/**
@@ -1184,6 +1034,7 @@ function is_site_admin()
 	$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
 
 	//if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
+	/// @TODO This if() + 2 returns can be shrinked into one return
 	if (local_user() && x($a->user, 'email') && x($a->config, 'admin_email') && in_array($a->user['email'], $adminlist)) {
 		return true;
 	}
@@ -1281,7 +1132,7 @@ function random_digits($digits)
 {
 	$rn = '';
 	for ($i = 0; $i < $digits; $i++) {
-		/// @TODO rand() is different to mt_rand() and maybe lesser "random"
+		/// @TODO Avoid rand/mt_rand, when it comes to cryptography, they are generating predictable (seedable) numbers.
 		$rn .= rand(0, 9);
 	}
 	return $rn;
@@ -1295,7 +1146,7 @@ function get_server()
 		$server = "https://dir.friendica.social";
 	}
 
-	return($server);
+	return $server;
 }
 
 function get_temppath()
@@ -1344,7 +1195,7 @@ function get_cachefile($file, $writemode = true)
 	$cache = get_itemcachepath();
 
 	if ((!$cache) || (!is_dir($cache))) {
-		return("");
+		return "";
 	}
 
 	$subfolder = $cache . "/" . substr($file, 0, 2);
@@ -1358,7 +1209,6 @@ function get_cachefile($file, $writemode = true)
 		}
 	}
 
-	/// @TODO no need to put braces here
 	return $cachepath;
 }
 
@@ -1465,7 +1315,6 @@ function get_spoolpath()
 	return "";
 }
 
-
 if (!function_exists('exif_imagetype')) {
 	function exif_imagetype($file)
 	{
@@ -1503,7 +1352,7 @@ function validate_include(&$file)
 	}
 
 	// Simply return flag
-	return ($valid);
+	return $valid;
 }
 
 function current_load()