X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fsetup_config3.tpl;h=96364a75e2e723cb1317ec109f925685c0a6c18d;hb=6557949139db5e19dfc46394a76396440efa1dd3;hp=ad1092858905f6e8575409f45987d95d1416858b;hpb=b9ac823bc86478666beee77abb317b4d950fd795;p=gosa.git

diff --git a/setup/setup_config3.tpl b/setup/setup_config3.tpl
index ad1092858..96364a75e 100644
--- a/setup/setup_config3.tpl
+++ b/setup/setup_config3.tpl
@@ -1,8 +1,5 @@
 <div class='default' style='margin:12px; '>
-    <div style='float:left; '>
-		<br>
-		<b>{t}Optional settings{/t}</b>
-	</div>
+     <p><b>{t}GOsa core settings{/t}</b></p>
 
     <div class='step4_container'>
         <div class='step4_name'>
@@ -18,68 +15,60 @@
 
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Force globals{/t}
+            {t}Honour administrative units{/t}
         </div>
         <div class='step4_value'>
 	
-            <select name="forceglobals" size="1" title="">
-            	{html_options options=$bool selected=$optional.forceglobals}
-            </select>
-        </div>
-    </div>
-
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Force SSL{/t}
-        </div>
-        <div class='step4_value'>
-	
-            <select name="forcessl" size="1" title="">
-            	{html_options options=$bool selected=$optional.forcessl}
+            <select name="strict_units" size="1" title="">
+            	{html_options options=$bool selected=$optional.strict_units}
             </select>
         </div>
     </div>
 
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Warn SSL{/t}
+            {t}Smarty compile directory{/t}
         </div>
         <div class='step4_value'>
-	
-            <select name="warnssl" size="1" title="">
-            	{html_options options=$bool selected=$optional.warnssl}
-            </select>
+			<input size=40 id='compile' name='compile' 
+				type='text' value='{$optional.compile}'>
         </div>
     </div>
-
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Strict units{/t}
+            {t}Path for PPD storage{/t}
         </div>
         <div class='step4_value'>
-	
-            <select name="strict_units" size="1" title="">
-            	{html_options options=$bool selected=$optional.strict_units}
-            </select>
+            {if $optional.ppd_path_active == FALSE}
+                <input type='checkbox' value='1' name='ppd_path_active'
+                    onClick='changeState("ppd_path");'>
+                <input size=40 id='ppd_path' name='ppd_path' type='text' value='{$optional.ppd_path}' disabled>
+            {else}
+                <input type='checkbox' value='1' name='ppd_path_active' checked>
+                <input size=40 id='ppd_path' name='ppd_path' type='text' value='{$optional.ppd_path}'  >
+            {/if}
         </div>
     </div>
 
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}PPd path{/t}
+            {t}Path for kiosk profile storage{/t}
         </div>
         <div class='step4_value'>
-            {if $optional.ppd_path_active == FALSE}
-                <input type='checkbox' value='1' name='ppd_path_active'
-                    onClick='changeState("ppd_path");'>
-                <input style='width:90%' id='ppd_path' name='ppd_path' type='text' value='{$optional.ppd_path}' disabled>
+            {if $optional.kioskpath_active == FALSE}
+                <input type='checkbox' value='1' name='kioskpath_active'
+                    onClick='changeState("kioskpath");'>
+                <input size=40 id='kioskpath' name='kioskpath' 
+					type='text' value='{$optional.kioskpath}' disabled>
             {else}
-                <input type='checkbox' value='1' name='ppd_path_active' checked>
-                <input style='width:90%' id='ppd_path' name='ppd_path' type='text' value='{$optional.ppd_path}'  >
+                <input type='checkbox' value='1' name='kioskpath_active' checked>
+                <input size=40 id='kioskpath' name='kioskpath' 
+					type='text' value='{$optional.kioskpath}'  >
             {/if}
         </div>
     </div>
 
+
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Network resolv hook{/t}
@@ -88,11 +77,11 @@
             {if $optional.auto_network_hook_active == FALSE}
                 <input type='checkbox' value='1' name='auto_network_hook_active'
                     onClick='changeState("auto_network_hook");'>
-                <input style='width:90%' id='auto_network_hook' name='auto_network_hook' 
+                <input size=40 id='auto_network_hook' name='auto_network_hook' 
 					type='text' value='{$optional.auto_network_hook}' disabled>
             {else}
                 <input type='checkbox' value='1' name='auto_network_hook_active' checked>
-                <input style='width:90%' id='auto_network_hook' name='auto_network_hook' type='text' 
+                <input size=40 id='auto_network_hook' name='auto_network_hook' type='text' 
 					value='{$optional.auto_network_hook}'  >
             {/if}
         </div>
@@ -100,17 +89,17 @@
 
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Mail queue script path{/t}
+            {t}Mail queue script{/t}
         </div>
         <div class='step4_value'>
             {if $optional.mailQueueScriptPath_active == FALSE}
                 <input type='checkbox' value='1' name='mailQueueScriptPath_active'
                     onClick='changeState("mailQueueScriptPath");'>
-                <input style='width:90%' id='mailQueueScriptPath' name='mailQueueScriptPath' 
+                <input size=40 id='mailQueueScriptPath' name='mailQueueScriptPath' 
 					type='text' value='{$optional.mailQueueScriptPath}' disabled>
             {else}
                 <input type='checkbox' value='1' name='mailQueueScriptPath_active' checked>
-                <input style='width:90%' id='mailQueueScriptPath' name='mailQueueScriptPath' type='text' 
+                <input size=40 id='mailQueueScriptPath' name='mailQueueScriptPath' type='text' 
 					value='{$optional.mailQueueScriptPath}'  >
             {/if}
         </div>
@@ -118,64 +107,56 @@
 
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Notification path{/t}
+            {t}Notification script{/t}
         </div>
         <div class='step4_value'>
             {if $optional.notifydir_active == FALSE}
                 <input type='checkbox' value='1' name='notifydir_active'
                     onClick='changeState("notifydir");'>
-                <input style='width:90%' id='notifydir' name='notifydir' 
+                <input size=40 id='notifydir' name='notifydir' 
 					type='text' value='{$optional.notifydir}' disabled>
             {else}
                 <input type='checkbox' value='1' name='notifydir_active' checked>
-                <input style='width:90%' id='notifydir' name='notifydir' 
+                <input size=40 id='notifydir' name='notifydir' 
 					type='text' value='{$optional.notifydir}'  >
             {/if}
         </div>
     </div>
 
+    <p><b>{t}Login and session{/t}</b></p>
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Kiosk path{/t}
+            {t}Enforce register_globals to be activated{/t}
         </div>
         <div class='step4_value'>
-            {if $optional.kioskpath_active == FALSE}
-                <input type='checkbox' value='1' name='kioskpath_active'
-                    onClick='changeState("kioskpath");'>
-                <input style='width:90%' id='kioskpath' name='kioskpath' 
-					type='text' value='{$optional.kioskpath}' disabled>
-            {else}
-                <input type='checkbox' value='1' name='kioskpath_active' checked>
-                <input style='width:90%' id='kioskpath' name='kioskpath' 
-					type='text' value='{$optional.kioskpath}'  >
-            {/if}
+	
+            <select name="forceglobals" size="1" title="">
+            	{html_options options=$bool selected=$optional.forceglobals}
+            </select>
         </div>
     </div>
 
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Smarty compile directory{/t}
+            {t}Enforce encrypted connections{/t}
         </div>
         <div class='step4_value'>
-			<input style='width:90%' id='compile' name='compile' 
-				type='text' value='{$optional.compile}'>
+	
+            <select name="forcessl" size="1" title="">
+            	{html_options options=$bool selected=$optional.forcessl}
+            </select>
         </div>
     </div>
 
-    <div class='step4_container' style='height:5em;'>
-        <div class='step4_name' style='height:5em;'>
-            {t}SMB hash{/t}
-        </div>
-        <div class='step4_value' style='height:5em;'>
-			<input {if $optional.smbhash == "/usr/bin/mkntpasswd"} checked {/if} 
-				type='radio' name='smbhash' value='/usr/bin/mkntpasswd'>&nbsp;
-				/usr/bin/mkntpasswd<br>
-			<input {if $optional.smbhash == "mkntpwd"} checked {/if}
-				type='radio' name='smbhash' value='mkntpwd'>&nbsp;
-				mkntpwd<br>
-			<input {if $optional.smbhash == 'perl -MCrypt::SmbHash -e "print join(q[:], ntlmgen \$ARGV[0]), $/;"'} checked {/if}
-				type='radio' name='smbhash' value='perl -MCrypt::SmbHash -e "print join(q[:], ntlmgen \$ARGV[0]), $/;"'>&nbsp;
-				perl -MCrypt::SmbHash ...
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Warn if session is not encrypted{/t}
+        </div>
+        <div class='step4_value'>
+	
+            <select name="warnssl" size="1" title="">
+            	{html_options options=$bool selected=$optional.warnssl}
+            </select>
         </div>
     </div>
 
@@ -184,24 +165,25 @@
             {t}Session lifetime{/t}
         </div>
         <div class='step4_value'>
-			<input style='width:90%' id='session_lifetime' name='session_lifetime' 
+			<input size=10 id='session_lifetime' name='session_lifetime' 
 				type='text' value='{$optional.session_lifetime}'>
         </div>
     </div>
 
+    <p><b>{t}Debugging{/t}</b></p>
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Maximal ldap query time{/t}
+            {t}Maximum LDAP query time{/t}
         </div>
         <div class='step4_value'>
             {if $optional.max_ldap_query_time_active == FALSE}
                 <input type='checkbox' value='1' name='max_ldap_query_time_active'
                     onClick='changeState("max_ldap_query_time");'>
-                <input style='width:90%' id='max_ldap_query_time' name='max_ldap_query_time' 
+                <input size=10 id='max_ldap_query_time' name='max_ldap_query_time' 
 					type='text' value='{$optional.max_ldap_query_time}' disabled>
             {else}
                 <input type='checkbox' value='1' name='max_ldap_query_time_active' checked>
-                <input style='width:90%' id='max_ldap_query_time' name='max_ldap_query_time' 
+                <input size=10 id='max_ldap_query_time' name='max_ldap_query_time' 
 					type='text' value='{$optional.max_ldap_query_time}'  >
             {/if}
         </div>
@@ -209,7 +191,19 @@
 
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Debuglevel{/t}
+            {t}Log LDAP statistics{/t}
+        </div>
+        <div class='step4_value'>
+	
+            <select name="ldapstats" size="1" title="">
+            	{html_options options=$bool selected=$optional.ldapstats}
+            </select>
+        </div>
+    </div>
+
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Debug level{/t}
         </div>
         <div class='step4_value'>
 			<select name='debuglevel'>