From e8d38a68704a8546abe2c354f7af9095e2e9b3eb Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Wed, 11 Mar 2020 11:49:45 +0100
Subject: [PATCH] More PHP7 strict typing

---
 rainloop/v/0.0.0/app/handle.php                       |  4 ----
 rainloop/v/0.0.0/app/libraries/RainLoop/Service.php   |  2 +-
 .../v/0.0.0/app/libraries/RainLoop/ServiceActions.php |  7 ++++++-
 rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php     | 11 +++--------
 rainloop/v/0.0.0/app/templates/Views/User/Login.html  |  9 ---------
 rainloop/v/0.0.0/include.php                          | 10 +++-------
 6 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/rainloop/v/0.0.0/app/handle.php b/rainloop/v/0.0.0/app/handle.php
index 4af8498ef..0438a940d 100644
--- a/rainloop/v/0.0.0/app/handle.php
+++ b/rainloop/v/0.0.0/app/handle.php
@@ -7,10 +7,6 @@ if (!\defined('RAINLOOP_APP_LIBRARIES_PATH'))
 
 	\define('RAINLOOP_INCLUDE_AS_API_DEF', isset($_ENV['RAINLOOP_INCLUDE_AS_API']) && $_ENV['RAINLOOP_INCLUDE_AS_API']);
 
-	if (!\function_exists('mb_strtoupper')) {
-		exit('PHP mbstring required');
-	}
-
 	function rainLoopSplAutoloadNamespaces() : array
 	{
 		return RAINLOOP_INCLUDE_AS_API_DEF ? array('RainLoop', 'Predis') :
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
index b7a9885ab..506e63d1c 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -218,7 +218,7 @@ class Service
 			}
 
 			$sResult .= '<!--';
-			$sResult .= '[time:'.\substr(\microtime(true) - APP_START, 0, 6);
+			$sResult .= '[time:'.\substr(\microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'], 0, 6);
 			$sResult .= '][AGPLv3';
 			$sResult .= '][cached:'.($bCached ? 'true' : 'false');
 //			$sResult .= '][hash:'.$aTemplateParameters['{{BaseHash}}'];
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index d042b9f87..3827d68b8 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -170,6 +170,11 @@ class ServiceActions
 		}
 		catch (\Throwable $oException)
 		{
+			error_log($oException->getMessage());
+			if ($e = $oException->getPrevious()) {
+				error_log("\t".$e->getMessage());
+			}
+
 			$aResponseItem = $this->oActions->ExceptionResponse(
 				empty($sAction) ? 'Unknown' : $sAction, $oException);
 
@@ -193,7 +198,7 @@ class ServiceActions
 
 		if (\is_array($aResponseItem))
 		{
-			$aResponseItem['Time'] = (int) ((\microtime(true) - APP_START) * 1000);
+			$aResponseItem['Time'] = (int) ((\microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']) * 1000);
 
 			$sUpdateToken = $this->oActions->GetUpdateAuthToken();
 			if ($sUpdateToken)
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php
index b6fae65c9..99960440d 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php
@@ -47,10 +47,7 @@ class Utils
 		\RainLoop\Utils::$RsaKey = \is_string(\RainLoop\Utils::$RsaKey) ? \RainLoop\Utils::$RsaKey : '';
 	}
 
-	/**
-	 * @return string|false
-	 */
-	static public function EncryptStringRSA(string $sString, string $sKey = '')
+	static public function EncryptStringRSA(string $sString, string $sKey = '') : string
 	{
 		$sResult = '';
 		$sKey = \md5($sKey);
@@ -87,10 +84,7 @@ class Utils
 		return $sResult;
 	}
 
-	/**
-	 * @return string|false
-	 */
-	static public function DecryptStringRSA(string $sString, string $sKey = '')
+	static public function DecryptStringRSA(string $sString, string $sKey = '') : string
 	{
 		$sResult = '';
 		$sKey = \md5($sKey);
@@ -425,6 +419,7 @@ class Utils
 		$sAppPath = '';
 		return $sAppPath;
 	}
+
 	public static function WebVersionPath() : string
 	{
 		return self::WebPath().'rainloop/v/'.APP_VERSION.'/';
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/Login.html b/rainloop/v/0.0.0/app/templates/Views/User/Login.html
index aae6c1829..46a76723a 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/Login.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/Login.html
@@ -137,15 +137,6 @@
 					</a>
 				</span>
 			</div>
-			<div class="e-languages thm-languages plugin-mark-Login-BottomFooter"
-				data-bind="visible: allowLanguagesOnLogin()">
-				<label class="flag-selector">
-					<i data-bind="css: langRequest() ? 'icon-spinner animated' : 'icon-world'"></i>
-					&nbsp;&nbsp;
-					<span class="flag-name" tabindex="0"
-						data-bind="text: languageFullName, click: selectLanguage, onSpace: selectLanguage, onEnter: selectLanguage, onTab: selectLanguageOnTab"></span>
-				</label>
-			</div>
 			{{INCLUDE/BottomFooter/PLACE}}
 		</center>
 	</div>
diff --git a/rainloop/v/0.0.0/include.php b/rainloop/v/0.0.0/include.php
index 3f11e5bac..fcd4c1ead 100644
--- a/rainloop/v/0.0.0/include.php
+++ b/rainloop/v/0.0.0/include.php
@@ -2,17 +2,15 @@
 
 	if (defined('APP_VERSION'))
 	{
-		if (!defined('APP_START'))
+		if (!defined('APP_START_TIME'))
 		{
-			define('APP_START', microtime(true));
-
 			@ini_set('register_globals', 0);
 			@ini_set('zend.ze1_compatibility_mode', 0);
 			@ini_set('magic_quotes_gpc', 0);
 			@ini_set('magic_quotes_runtime', 0);
 
 			define('APP_START_TIME', time());
-			define('APP_REQUEST_RND', md5(APP_START.rand(10000, 99999).APP_START));
+			define('APP_REQUEST_RND', function_exists('uuid_create') ? md5(uuid_create(UUID_TYPE_DEFAULT)) : bin2hex(random_bytes(16)));
 			define('APP_VERSION_ROOT_PATH', APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/');
 
 			define('APP_USE_APC_CACHE', true);
@@ -123,9 +121,7 @@
 			if (false === $sSalt)
 			{
 				// random salt
-				$sSalt = '<'.'?php //'.bin2hex(random_bytes(48));
-
-				@file_put_contents(APP_DATA_FOLDER_PATH.'SALT.php', $sSalt);
+				file_put_contents(APP_DATA_FOLDER_PATH.'SALT.php', '<'.'?php //'.bin2hex(random_bytes(48)));
 			}
 
 			define('APP_SALT', md5($sSalt.APP_PRIVATE_DATA_NAME.$sSalt));