Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit dfc95fb5 authored by Nivesh Krishna's avatar Nivesh Krishna
Browse files

rename constants

parent 487b755f

app/index.php

+4 −4
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ if (!defined('R_APP_VERSION')) 
{

	define('R_APP_VERSION', '1.16.0');

	define('APP_VERSION_TYPE', 'community');

	define('APP_INDEX_ROOT_FILE', __FILE__);

	define('APP_INDEX_ROOT_PATH', str_replace('\\', '/', rtrim(dirname(__FILE__), '\\/').'/'));

	define('R_APP_INDEX_ROOT_FILE', __FILE__);

	define('R_APP_INDEX_ROOT_PATH', str_replace('\\', '/', rtrim(dirname(__FILE__), '\\/').'/'));

}



if (file_exists(APP_INDEX_ROOT_PATH.'rainloop/v/'.R_APP_VERSION.'/include.php'))

if (file_exists(R_APP_INDEX_ROOT_PATH.'rainloop/v/'.R_APP_VERSION.'/include.php'))

{

	include APP_INDEX_ROOT_PATH.'rainloop/v/'.R_APP_VERSION.'/include.php';

	include R_APP_INDEX_ROOT_PATH.'rainloop/v/'.R_APP_VERSION.'/include.php';

}

else

{

app/rainloop/v/1.16.0/app/libraries/RainLoop/Actions.php

+4 −4
Original line number Diff line number Diff line
@@ -4345,9 +4345,9 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins 


	private function rainLoopUpdatable()

	{

		return @file_exists(APP_INDEX_ROOT_PATH.'index.php') &&

			@is_writable(APP_INDEX_ROOT_PATH.'index.php') &&

			@is_writable(APP_INDEX_ROOT_PATH.'rainloop/') &&

		return @file_exists(R_APP_INDEX_ROOT_PATH.'index.php') &&

			@is_writable(R_APP_INDEX_ROOT_PATH.'index.php') &&

			@is_writable(R_APP_INDEX_ROOT_PATH.'rainloop/') &&

			R_APP_VERSION !== APP_DEV_VERSION

		;

	}
@@ -9271,7 +9271,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc LangLink IncludeBackground Plugins 
			}

		}



		$sDir = APP_INDEX_ROOT_PATH.'themes'; // custom user themes

		$sDir = R_APP_INDEX_ROOT_PATH.'themes'; // custom user themes

		if (@\is_dir($sDir))

		{

			$rDirH = \opendir($sDir);

app/rainloop/v/1.16.0/app/libraries/RainLoop/ServiceActions.php

+2 −2
Original line number Diff line number Diff line
@@ -745,8 +745,8 @@ class ServiceActions 


					$aResult = array();



					$sThemeFile = ($bCustomTheme ? APP_INDEX_ROOT_PATH : R_APP_VERSION_ROOT_PATH).'themes/'.$sRealTheme.'/styles.less';

					$sThemeExtFile = ($bCustomTheme ? APP_INDEX_ROOT_PATH : R_APP_VERSION_ROOT_PATH).'themes/'.$sRealTheme.'/ext.less';

					$sThemeFile = ($bCustomTheme ? R_APP_INDEX_ROOT_PATH : R_APP_VERSION_ROOT_PATH).'themes/'.$sRealTheme.'/styles.less';

					$sThemeExtFile = ($bCustomTheme ? R_APP_INDEX_ROOT_PATH : R_APP_VERSION_ROOT_PATH).'themes/'.$sRealTheme.'/ext.less';



					$sThemeValuesFile = R_APP_VERSION_ROOT_PATH.'app/templates/Themes/values.less';

					$sThemeTemplateFile = R_APP_VERSION_ROOT_PATH.'app/templates/Themes/template.less';

app/rainloop/v/1.16.0/include.php

+5 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


			define('APP_START_TIME', time());

			define('APP_REQUEST_RND', md5(APP_START.rand(10000, 99999).APP_START));

			define('R_APP_VERSION_ROOT_PATH', APP_INDEX_ROOT_PATH.'rainloop/v/'.R_APP_VERSION.'/');

			define('R_APP_VERSION_ROOT_PATH', R_APP_INDEX_ROOT_PATH.'rainloop/v/'.R_APP_VERSION.'/');



			define('APP_USE_APC_CACHE', true);
@@ -33,7 +33,7 @@ 


			define('APP_DEFAULT_PRIVATE_DATA_NAME', '_default_');



			$sPrivateDataFolderInternalName = @file_exists(APP_INDEX_ROOT_PATH.'MULTIPLY') ? APP_SITE : '';

			$sPrivateDataFolderInternalName = @file_exists(R_APP_INDEX_ROOT_PATH.'MULTIPLY') ? APP_SITE : '';

			define('APP_PRIVATE_DATA_NAME', 0 === strlen($sPrivateDataFolderInternalName) ? APP_DEFAULT_PRIVATE_DATA_NAME : $sPrivateDataFolderInternalName);

			define('APP_MULTIPLY', 0 < strlen($sPrivateDataFolderInternalName) && APP_DEFAULT_PRIVATE_DATA_NAME !== APP_PRIVATE_DATA_NAME);
@@ -49,13 +49,13 @@ 
			$sCustomDataPath = '';

			$sCustomConfiguration = '';



			if (file_exists(APP_INDEX_ROOT_PATH.'include.php'))

			if (file_exists(R_APP_INDEX_ROOT_PATH.'include.php'))

			{

				include_once APP_INDEX_ROOT_PATH.'include.php';

				include_once R_APP_INDEX_ROOT_PATH.'include.php';

			}



			$sCustomDataPath = function_exists('__get_custom_data_full_path') ? rtrim(trim(__get_custom_data_full_path()), '\\/') : $sCustomDataPath;

			define('R_APP_DATA_FOLDER_PATH', 0 === strlen($sCustomDataPath) ? APP_INDEX_ROOT_PATH.'data/' : $sCustomDataPath.'/');

			define('R_APP_DATA_FOLDER_PATH', 0 === strlen($sCustomDataPath) ? R_APP_INDEX_ROOT_PATH.'data/' : $sCustomDataPath.'/');

			unset($sCustomDataPath);



			$sCustomConfiguration = function_exists('__get_additional_configuration_name') ? trim(__get_additional_configuration_name()) : $sCustomConfiguration;

app/rainloop/v/1.16.0/index.php.root

+4 −4
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ if (!defined('R_APP_VERSION')) 
{

	define('R_APP_VERSION', '1.16.0');

	define('APP_VERSION_TYPE', 'community');

	define('APP_INDEX_ROOT_FILE', __FILE__);

	define('APP_INDEX_ROOT_PATH', str_replace('\\', '/', rtrim(dirname(__FILE__), '\\/').'/'));

	define('R_APP_INDEX_ROOT_FILE', __FILE__);

	define('R_APP_INDEX_ROOT_PATH', str_replace('\\', '/', rtrim(dirname(__FILE__), '\\/').'/'));

}



if (file_exists(APP_INDEX_ROOT_PATH.'rainloop/v/'.R_APP_VERSION.'/include.php'))

if (file_exists(R_APP_INDEX_ROOT_PATH.'rainloop/v/'.R_APP_VERSION.'/include.php'))

{

	include APP_INDEX_ROOT_PATH.'rainloop/v/'.R_APP_VERSION.'/include.php';

	include R_APP_INDEX_ROOT_PATH.'rainloop/v/'.R_APP_VERSION.'/include.php';

}

else

{