From d87f76019fc231ec20d95126a7fee0487e7be5f0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 14 Aug 2012 10:56:20 -0400
Subject: [PATCH] - Added new web folder named private to web folder layout. The folder is intended to store data that shall not be visible in the web directory, it is owned by the user of the web. - Changed ownership of web root directory to root user in all security modes to prevent symlink attacks. - Apache log files are now owned by user root. - Improved functions in system library.

---
 interface/web/admin/templates/users_user_edit.htm |  132 ++++++++++++++++++++++----------------------
 1 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index fffb766..4abe793 100644
--- a/interface/web/admin/templates/users_user_edit.htm
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -3,71 +3,71 @@
 
 <div class="panel panel_users">
 	
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels">
-      <div class="ctrlHolder">
-      	<label for="username">{tmpl_var name='username_txt'}</label>
-        <input name="username" id="username" value="{tmpl_var name='username'}" size="15" maxlength="30" type="text" class="textInput" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="passwort">{tmpl_var name='passwort_txt'}</label>
-        <input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput"  onkeyup="pass_check(this.value);checkPassMatch('passwort','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('passwort');">{tmpl_var name='generate_password_txt'}</a>
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='password_strength_txt'}</p>
-				<div id="passBar"></div>
-				<p class="formHint"><span id="passText">&nbsp;</span></p>
-			</div>
-		<div class="ctrlHolder">
-      	<label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
-        <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('passwort','repeat_password');" />
-		</div>
-		<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
-		<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='modules_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='modules'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="startmodule">{tmpl_var name='startmodule_txt'}</label>
-        <select name="startmodule" id="startmodule" class="selectInput formLengthHalf">
-					{tmpl_var name='startmodule'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='app_theme_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='app_theme'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='typ_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='typ'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='active_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='active'}
-					</div>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="language">{tmpl_var name='language_txt'}</label>
-        <select name="language" id="language" class="selectInput withicons">
-					{tmpl_var name='language'}
-				</select>
-      </div>
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}</label>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="15" maxlength="30" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="passwort">{tmpl_var name='passwort_txt'}</label>
+                <input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput"  onkeyup="pass_check(this.value);checkPassMatch('passwort','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('passwort','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('passwort','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='modules_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='modules'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="startmodule">{tmpl_var name='startmodule_txt'}</label>
+                <select name="startmodule" id="startmodule" class="selectInput formLengthHalf">
+                    {tmpl_var name='startmodule'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='app_theme_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='app_theme'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='typ_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='typ'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="language">{tmpl_var name='language_txt'}</label>
+                <select name="language" id="language" class="selectInput flags">
+                    {tmpl_var name='language'}
+                </select>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
     </div>
-  </div>
   
-</div>
+</div>
\ No newline at end of file

--
Gitblit v1.9.1