X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fsetup%2Fsetup_config2.tpl;h=3ed7daec9ac28659f395fbacb8b60fcb0d44bf86;hb=90c530854a9ba61f3d22a77708f61bf66f61dbed;hp=80c5cf6aac5666e2d4412c51e4e9e035f6ba5903;hpb=7f7f21906eb6121c29823abbf96461733d642509;p=gosa.git

diff --git a/gosa-core/setup/setup_config2.tpl b/gosa-core/setup/setup_config2.tpl
index 80c5cf6aa..3ed7daec9 100644
--- a/gosa-core/setup/setup_config2.tpl
+++ b/gosa-core/setup/setup_config2.tpl
@@ -71,7 +71,7 @@
             {t}Timezone{/t}
         </div>
         <div class='step4_value'>
-            <select name='timezone' title='{t}Please your preferred timezone here{/t}' style="width:100%">
+            <select name='timezone' title='{t}Please choose your preferred timezone here{/t}' style="width:100%">
  		{foreach from=$timezones.TIMEZONES item=val key=key}
             {if $key == $timezone}
                 {if isset($timezones.DST_ZONES.$key)}
@@ -177,16 +177,45 @@
         </div>
     </div>
 
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Logging options{/t}
+        </div>
+        <div class='step4_value'>
+			<input type='checkbox' name='logging_syslog' value='1' 
+				{if $logging_syslog} checked {/if} class='center'>{t}Syslog{/t} 
+			<input type='checkbox' name='logging_mysql' value='1' 
+				{if $logging_mysql} checked {/if} class='center'>{t}MySQL{/t}
+        </div>
+    </div>
+
+
     <p><b>{t}Mail settings{/t}</b></p>
 
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Mail method{/t}
         </div>
-        <div class='step4_value'>
-            <select name="mail" size="1" title="">
+  		<div class='step4_value'>
+            <select name="mail" size="1" title="" onChange="document.mainform.submit();">
                 <option  value="disabled">{t}disabled{/t}</option>
-                {html_options options=$mail_methods selected=$mail}
+                {foreach from=$mail_methods item=item}
+                    <option value="{$item.name}" {if $mail == $item.name} selected {/if}>{$item.name}&nbsp;({$item.uattrib})</option>
+                {/foreach}
+            </select>
+        </div>
+        <div class='step4_status'>
+        </div>
+    </div>
+
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Account identification attribute{/t}
+        </div>
+        <div class='step4_value'>
+            <select name="mail_attrib" size="1" {if $mail == "disabled"} disabled {/if}>
+                <option value="mail" {if $mail_attrib == "mail"} selected {/if} >mail</option>
+                <option value="uid" {if $mail_attrib == "uid"} selected {/if} >uid</option>
             </select>
         </div>
         <div class='step4_status'>