From bce886595efd09b427ebab06dfee6c94536d8faf Mon Sep 17 00:00:00 2001
From: kaetemi <jan.boon@kaetemi.be>
Date: Thu, 3 Jun 2021 10:26:55 +0800
Subject: [PATCH] Include webig config in setup, ref kaetemi/ryzomclassic#4

---
 web/private_php/setup/config/config.php                    | 3 +++
 .../webig/template/browse_bar.html                         | 0
 .../webig/template/browse_link.html                        | 0
 .../webig/template/confirm_delete_mail.html                | 0
 .../webig/template/forum_main.html                         | 0
 .../webig/template/forum_topic.html                        | 0
 web/{public_php => private_php}/webig/template/mail.html   | 0
 .../webig/template/mailbox_mail.html                       | 0
 .../webig/template/mailbox_main.html                       | 0
 .../webig/template/new_mail.html                           | 0
 .../webig/template/new_post.html                           | 0
 .../webig/template/new_thread.html                         | 0
 .../webig/template/topic_main.html                         | 0
 .../webig/template/topic_post.html                         | 0
 web/public_php/setup/install.php                           | 7 +++++++
 web/public_php/webig/config.php                            | 5 +++--
 16 files changed, 13 insertions(+), 2 deletions(-)
 rename web/{public_php => private_php}/webig/template/browse_bar.html (100%)
 rename web/{public_php => private_php}/webig/template/browse_link.html (100%)
 rename web/{public_php => private_php}/webig/template/confirm_delete_mail.html (100%)
 rename web/{public_php => private_php}/webig/template/forum_main.html (100%)
 rename web/{public_php => private_php}/webig/template/forum_topic.html (100%)
 rename web/{public_php => private_php}/webig/template/mail.html (100%)
 rename web/{public_php => private_php}/webig/template/mailbox_mail.html (100%)
 rename web/{public_php => private_php}/webig/template/mailbox_main.html (100%)
 rename web/{public_php => private_php}/webig/template/new_mail.html (100%)
 rename web/{public_php => private_php}/webig/template/new_post.html (100%)
 rename web/{public_php => private_php}/webig/template/new_thread.html (100%)
 rename web/{public_php => private_php}/webig/template/topic_main.html (100%)
 rename web/{public_php => private_php}/webig/template/topic_post.html (100%)

diff --git a/web/private_php/setup/config/config.php b/web/private_php/setup/config/config.php
index 4ec62d551..284bb6204 100644
--- a/web/private_php/setup/config/config.php
+++ b/web/private_php/setup/config/config.php
@@ -130,6 +130,9 @@ $FORCE_INGAME = false;
 $FILE_STORAGE_PATH = $PUBLIC_PHP_PATH . '/ams/files/';
 $FILE_WEB_PATH = $BASE_WEBPATH . 'files/';
 
+// Shard web storage (without final /)
+$USERS_DIR = '%domainUsersDir%';
+
 // Setup password
 $NEL_SETUP_PASSWORD = '%nelSetupPassword%';
 
diff --git a/web/public_php/webig/template/browse_bar.html b/web/private_php/webig/template/browse_bar.html
similarity index 100%
rename from web/public_php/webig/template/browse_bar.html
rename to web/private_php/webig/template/browse_bar.html
diff --git a/web/public_php/webig/template/browse_link.html b/web/private_php/webig/template/browse_link.html
similarity index 100%
rename from web/public_php/webig/template/browse_link.html
rename to web/private_php/webig/template/browse_link.html
diff --git a/web/public_php/webig/template/confirm_delete_mail.html b/web/private_php/webig/template/confirm_delete_mail.html
similarity index 100%
rename from web/public_php/webig/template/confirm_delete_mail.html
rename to web/private_php/webig/template/confirm_delete_mail.html
diff --git a/web/public_php/webig/template/forum_main.html b/web/private_php/webig/template/forum_main.html
similarity index 100%
rename from web/public_php/webig/template/forum_main.html
rename to web/private_php/webig/template/forum_main.html
diff --git a/web/public_php/webig/template/forum_topic.html b/web/private_php/webig/template/forum_topic.html
similarity index 100%
rename from web/public_php/webig/template/forum_topic.html
rename to web/private_php/webig/template/forum_topic.html
diff --git a/web/public_php/webig/template/mail.html b/web/private_php/webig/template/mail.html
similarity index 100%
rename from web/public_php/webig/template/mail.html
rename to web/private_php/webig/template/mail.html
diff --git a/web/public_php/webig/template/mailbox_mail.html b/web/private_php/webig/template/mailbox_mail.html
similarity index 100%
rename from web/public_php/webig/template/mailbox_mail.html
rename to web/private_php/webig/template/mailbox_mail.html
diff --git a/web/public_php/webig/template/mailbox_main.html b/web/private_php/webig/template/mailbox_main.html
similarity index 100%
rename from web/public_php/webig/template/mailbox_main.html
rename to web/private_php/webig/template/mailbox_main.html
diff --git a/web/public_php/webig/template/new_mail.html b/web/private_php/webig/template/new_mail.html
similarity index 100%
rename from web/public_php/webig/template/new_mail.html
rename to web/private_php/webig/template/new_mail.html
diff --git a/web/public_php/webig/template/new_post.html b/web/private_php/webig/template/new_post.html
similarity index 100%
rename from web/public_php/webig/template/new_post.html
rename to web/private_php/webig/template/new_post.html
diff --git a/web/public_php/webig/template/new_thread.html b/web/private_php/webig/template/new_thread.html
similarity index 100%
rename from web/public_php/webig/template/new_thread.html
rename to web/private_php/webig/template/new_thread.html
diff --git a/web/public_php/webig/template/topic_main.html b/web/private_php/webig/template/topic_main.html
similarity index 100%
rename from web/public_php/webig/template/topic_main.html
rename to web/private_php/webig/template/topic_main.html
diff --git a/web/public_php/webig/template/topic_post.html b/web/private_php/webig/template/topic_post.html
similarity index 100%
rename from web/public_php/webig/template/topic_post.html
rename to web/private_php/webig/template/topic_post.html
diff --git a/web/public_php/setup/install.php b/web/public_php/setup/install.php
index 67f27f5c0..ef7cf169f 100644
--- a/web/public_php/setup/install.php
+++ b/web/public_php/setup/install.php
@@ -151,6 +151,7 @@ require_once('setup/version.php');
 			$config = str_replace("%amsLibDatabase%", addslashes($_POST["amsLibDatabase"]), $config);
 			$config = str_replace("%nelSetupPassword%", addslashes($_POST["nelSetupPassword"]), $config);
 			$config = str_replace("%domainDatabase%", addslashes($_POST["domainDatabase"]), $config);
+			$config = str_replace("%domainUsersDir%", addslashes($_POST["domainUsersDir"]), $config);
 			$config = str_replace("%nelDomainName%", addslashes($_POST["nelDomainName"]), $config);
 			$config = str_replace("%nelSetupVersion%", addslashes($NEL_SETUP_VERSION), $config);
 			$cryptKeyLength = 16;
@@ -532,6 +533,12 @@ require_once('setup/version.php');
 								<input type="text" class="form-control" id="domainDatabase" name="domainDatabase" value="ring_mini01">
 							</div>
 						</div>
+						<div class="form-group">
+							<label for="domainUsersDir" class="col-sm-3 control-label">Users Directory (MFS, etc)</label>
+							<div class="col-sm-6">
+								<input type="text" class="form-control" id="domainUsersDir" name="domainUsersDir" value="/home/nevrax/mini01/www">
+							</div>
+						</div>
 					</div>
 				</div>
 				<input name="submit" type="submit" value="Configure" class="btn btn-primary">
diff --git a/web/public_php/webig/config.php b/web/public_php/webig/config.php
index c525f9b13..adcb65cda 100644
--- a/web/public_php/webig/config.php
+++ b/web/public_php/webig/config.php
@@ -1,6 +1,7 @@
 <?php
 
-$USERS_DIR 		= '/home/nevrax/live/www';				// without final /
-$TEMPLATE_DIR	= './template';		// without final /
+require_once dirname(__DIR__).'/config.php';
+
+$TEMPLATE_DIR = $PRIVATE_PHP_PATH + '/webig/template'; // without final /
 
 ?>