From 2a22ade112a10b397162091bdc3aafb6b3e0b686 Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Tue, 15 Apr 2014 04:18:40 +0400
Subject: [PATCH] Multiple domain installation trigger file

---
 _MULTIPLY                                            |  1 +
 _include.php                                         | 12 +-----------
 .../0.0.0/app/templates/Views/SettingsContacts.html  |  5 ++---
 rainloop/v/0.0.0/index.php                           |  3 +--
 4 files changed, 5 insertions(+), 16 deletions(-)
 create mode 100644 _MULTIPLY

diff --git a/_MULTIPLY b/_MULTIPLY
new file mode 100644
index 000000000..77250d4ab
--- /dev/null
+++ b/_MULTIPLY
@@ -0,0 +1 @@
+Rename this file to "MULTIPLY" to enable multiple domain installation
\ No newline at end of file
diff --git a/_include.php b/_include.php
index 319f3bd8d..eefd7e088 100644
--- a/_include.php
+++ b/_include.php
@@ -1,6 +1,6 @@
 <?php
 
-// TODO
+// Rename this file to "include.php" to enable it.
 
 /**
  * @return string
@@ -10,13 +10,3 @@ function __get_custom_data_full_path()
 	return '';
 	return '/var/external-rainloop-data-folder/'; // custom data folder path
 }
-
-/**
- * @param string $siteName
- * @return string
- */
-function __get_private_data_folder_internal_name($siteName)
-{
-	return ''; // default value
-	return $siteName;
-}
diff --git a/rainloop/v/0.0.0/app/templates/Views/SettingsContacts.html b/rainloop/v/0.0.0/app/templates/Views/SettingsContacts.html
index 8d1345e01..e04186e13 100644
--- a/rainloop/v/0.0.0/app/templates/Views/SettingsContacts.html
+++ b/rainloop/v/0.0.0/app/templates/Views/SettingsContacts.html
@@ -38,11 +38,10 @@
 			   <span class="i18n" data-i18n-text="SETTINGS_CONTACTS/LABEL_SYNC_PASSWORD"></span>
 			</label>
 			<div class="controls">
-				<div data-bind="visible: showPassword">
-					<strong style="color:red" data-bind="text: contactsSyncPass"></strong>
-				</div>
+				<strong style="color:red" data-bind="text: contactsSyncPass, visible: showPassword"></strong>
 				<span class="g-ui-link i18n" data-bind="visible: !showPassword(), click: toggleShowPassword"
 					data-i18n-text="SETTINGS_CONTACTS/LINK_SHOW"></span>
+				&nbsp;&nbsp;
 				<span class="g-ui-link i18n" data-bind="visible: showPassword, click: toggleShowPassword"
 					data-i18n-text="SETTINGS_CONTACTS/LINK_HIDE"></span>
 			</div>
diff --git a/rainloop/v/0.0.0/index.php b/rainloop/v/0.0.0/index.php
index dfbdc3a3a..478d105ee 100644
--- a/rainloop/v/0.0.0/index.php
+++ b/rainloop/v/0.0.0/index.php
@@ -24,8 +24,7 @@
 		
 		define('APP_DEFAULT_PRIVATE_DATA_NAME', '_default_');
 
-		$sPrivateDataFolderInternalName = function_exists('__get_private_data_folder_internal_name') ?
-			trim(__get_private_data_folder_internal_name(APP_SITE)) : '';
+		$sPrivateDataFolderInternalName = @file_exists(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);