Merge pull request #41 from valadas/issue-24

Making folder paths to relative

Author: valadas

Helpers.cs

@@ -409,23 +409,9 @@ public void SetRepositoryFolders(int ModuleId)
 				g_UserFolders = true;
 			}
 
-			if (!string.IsNullOrEmpty(Convert.ToString(settings["folderlocation"]))) {
-				g_ApprovedFolder = Convert.ToString(settings["folderlocation"]);
-			} else {
-				g_ApprovedFolder = HttpContext.Current.Server.MapPath(_portalSettings.HomeDirectory) + "Repository";
-			}
-
-			if (!string.IsNullOrEmpty(Convert.ToString(settings["pendinglocation"]))) {
-				g_UnApprovedFolder = Convert.ToString(settings["pendinglocation"]);
-			} else {
-				g_UnApprovedFolder = HttpContext.Current.Server.MapPath(_portalSettings.HomeDirectory) + "Repository\\Pending";
-			}
-
-			if (!string.IsNullOrEmpty(Convert.ToString(settings["anonymouslocation"]))) {
-				g_AnonymousFolder = Convert.ToString(settings["anonymouslocation"]);
-			} else {
-				g_AnonymousFolder = HttpContext.Current.Server.MapPath(_portalSettings.HomeDirectory) + "Repository\\Anonymous";
-			}
+            g_ApprovedFolder = HttpContext.Current.Server.MapPath(_portalSettings.HomeDirectory) + "Repository";
+            g_UnApprovedFolder = HttpContext.Current.Server.MapPath(_portalSettings.HomeDirectory) + "Repository\\Pending";
+            g_AnonymousFolder = HttpContext.Current.Server.MapPath(_portalSettings.HomeDirectory) + "Repository\\Anonymous";
 
 			// make sure the Repository folder exists
 			if (!Directory.Exists(g_ApprovedFolder)) {

Settings.ascx.cs

@@ -688,29 +688,22 @@ private void Page_Load(System.Object sender, System.EventArgs e)
 						// default value
 					}
 
-					if (!string.IsNullOrEmpty(Convert.ToString(settings["folderlocation"]))) {
-						txtFolderLocation.Text = Convert.ToString(settings["folderlocation"]);
-					} else {
-						txtFolderLocation.Text = Request.MapPath(_portalSettings.HomeDirectory) + "Repository";
-					}
+                    txtFolderLocation.Text = Request.MapPath(_portalSettings.HomeDirectory) + "Repository";
+                    txtFolderLocation.ReadOnly = true;
+					
 
 					if (!string.IsNullOrEmpty(Convert.ToString(settings["userfolders"]))) {
 						cbUserFolders.Checked = bool.Parse(settings["userfolders"].ToString());
 					} else {
 						cbUserFolders.Checked = false;
 					}
 
-					if (!string.IsNullOrEmpty(Convert.ToString(settings["pendinglocation"]))) {
-						txtPendingLocation.Text = Convert.ToString(settings["pendinglocation"]);
-					} else {
-						txtPendingLocation.Text = Request.MapPath(_portalSettings.HomeDirectory) + "Repository";
-					}
+                    txtPendingLocation.Text = Request.MapPath(_portalSettings.HomeDirectory) + "Repository\\Pending";
+                    txtPendingLocation.ReadOnly = true;
 
-					if (!string.IsNullOrEmpty(Convert.ToString(settings["anonymouslocation"]))) {
-						txtAnonymousLocation.Text = Convert.ToString(settings["anonymouslocation"]);
-					} else {
-						txtAnonymousLocation.Text = Request.MapPath(_portalSettings.HomeDirectory) + "Repository";
-					}
+                    txtAnonymousLocation.Text = Request.MapPath(_portalSettings.HomeDirectory) + "Repository\\Anonymous";
+                    txtAnonymousLocation.ReadOnly = true;
+					
 
 					// only HOST account can modify file locations
 					if (UserInfo.IsSuperUser) {
@@ -935,10 +928,7 @@ public override void UpdateSettings()
 
 				// double check to make sure the person submitting the Update is indeed a SuperUser
 				if (UserInfo.IsSuperUser) {
-					objModules.UpdateModuleSetting(ModuleId, "folderlocation", txtFolderLocation.Text.Trim());
 					objModules.UpdateModuleSetting(ModuleId, "userfolders", cbUserFolders.Checked.ToString());
-					objModules.UpdateModuleSetting(ModuleId, "pendinglocation", txtPendingLocation.Text.Trim());
-					objModules.UpdateModuleSetting(ModuleId, "anonymouslocation", txtAnonymousLocation.Text.Trim());
 				}
 
 				objModules.UpdateModuleSetting(ModuleId, "noimage", ctlURL.Url.ToString());

Upgrade.cs

@@ -145,10 +145,10 @@ public static string CustomUpgrade315()
 					if (!string.IsNullOrEmpty(Convert.ToString(settings["userfolders"]))) {
 						// then get the base folder name
 						if (!string.IsNullOrEmpty(Convert.ToString(settings["folderlocation"]))) {
-							m_foldername = Convert.ToString(settings["folderlocation"]);
+							m_foldername = HttpContext.Current.Server.MapPath(_portalSettings.HomeDirectory) + "Repository";
 
-							// look in the base folder for any user folders
-							m_Folders = Directory.GetDirectories(m_foldername);
+                            // look in the base folder for any user folders
+                            m_Folders = Directory.GetDirectories(m_foldername);
 
 							foreach (string m_Folder_loopVariable in m_Folders) {
 								m_Folder = m_Folder_loopVariable;