X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fservkolab.tpl;h=c43aa90c1c154f6865fd1fcfcfaca2d5bdf3f251;hb=82b212dba42b8bb340cb2689f7b9b009604940dd;hp=d4c230abb6ed662a43225bbce61e0fe1e23fdb51;hpb=027c0ffe749138c3f5266ab1afd3b333418076da;p=gosa.git

diff --git a/plugins/admin/systems/servkolab.tpl b/plugins/admin/systems/servkolab.tpl
index d4c230abb..c43aa90c1 100644
--- a/plugins/admin/systems/servkolab.tpl
+++ b/plugins/admin/systems/servkolab.tpl
@@ -1,130 +1,97 @@
-<table style="width:100%">
+<table summary="" style="width:100%">
  <tr>
   <td style="vertical-align:top; border-right:1px solid #A0A0A0; padding-right:5px;" width="50%">
 
-   <table>
+   <table summary="">
     <tr>
 	 <td colspan="2"><b>{t}Services{/t}</b></td>
 	</tr>
 	<tr>
 		<td>
-			<input name="" value="1" type="checkbox" >
+			<input id="cyrus_pop3" name="cyrus_pop3" value="1" type="checkbox" {$cyrus_pop3Check} {$cyrus_pop3ACL}>
 		</td>
 		<td>
-			POP3 Service  	
+			<LABEL for="cyrus_pop3">{t}POP3 service{/t}</LABEL>
 		</td>
 	</tr>
 	<tr>
         <td>
-            <input name="" value="1" type="checkbox" >
+            <input id="cyrus_pop3s" name="cyrus_pop3s" value="1" type="checkbox" {$cyrus_pop3sCheck} {$cyrus_pop3sACL}>
         </td>
 		<td>
-			POP3/SSL service (TCP port 995) 	
+			<LABEL for="cyrus_pop3s">{t}POP3/SSL service{/t}</LABEL>
         </td>
     </tr>
     <tr>
         <td>
-            <input name="" value="1" type="checkbox" >
+            <input id="cyrus_imap" name="cyrus_imap" value="1" type="checkbox" {$cyrus_imapCheck} {$cyrus_imapACL}>
         </td>
         <td>
-			IMAP Service 	
+			<LABEL for="cyrus_imap">{t}IMAP service{/t}</LABEL>
         </td>
     </tr>
     <tr>
         <td>
-            <input name="" value="1" type="checkbox" >
+            <input id="cyrus_imaps" name="cyrus_imaps" value="1" type="checkbox" {$cyrus_imapsCheck} {$cyrus_imapsACL}>
         </td>
         <td>
-			IMAP/SSL Service (TCP port 993) 	
+			<LABEL for="cyrus_imaps">{t}IMAP/SSL service{/t}</LABEL>
         </td>
     </tr>
     <tr>
         <td>
-            <input name="" value="1" type="checkbox" >
+            <input id="cyrus_sieve" name="cyrus_sieve" value="1" type="checkbox" {$cyrus_sieveCheck} {$cyrus_sieveACL}>
         </td>
         <td>
-			Sieve service (TCP port 2000) 	
+			<LABEL for="cyrus_sieve">{t}Sieve service{/t}</LABEL>
         </td>
     </tr>
     <tr>
         <td>
-            <input name="" value="1" type="checkbox" >
-        </td>
+            <input id="proftpd_ftp" name="proftpd_ftp" value="1" type="checkbox" {$proftpd_ftpCheck} {$proftpd_ftpACL}>
+        </td>	
         <td>
-			FTP FreeBusy Service (Legacy, not interoperable with Kolab2 FreeBusy) 	
+			<LABEL for="proftpd_ftp">{t}FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy){/t}</LABEL>
         </td>
     </tr>
     <tr>
         <td>
-            <input name="" value="1" type="checkbox" >
+            <input id="apache_http" name="apache_http" value="1" type="checkbox" {$apache_httpCheck} {$apache_httpACL}>
         </td>
         <td>
-			HTTP FreeBusy Service (Legacy) 	
+			<LABEL for="apache_http">{t}HTTP FreeBusy service (legacy){/t}</LABEL>
         </td>
     </tr>
     <tr>
         <td>
-            <input name="" value="1" type="checkbox" >
+			<input id="postfix_enable_virus_scan" name="postfix_enable_virus_scan" value="1" type="checkbox" {$postfix_enable_virus_scanCheck} {$postfix_enable_virus_scanACL}>
         </td>
         <td>
-			Amavis Email Scanning (Virus/Spam)
+			<LABEL for="postfix_enable_virus_scan">{t}Amavis email scanning (virus/spam){/t}</LABEL>
 		</td>
 	</tr>
    </table>
 
+   <p class="seperator">&nbsp;</p>
+   <br>
 
-
-
-<p class="seperator">&nbsp;</p>
-<br>
-
-	
-   <table>
-	<tr>
-		<td colspan="2" >
-			<b>{t}Kolab Hosts{/t}</b>
-		</td>
-	</tr>
+   <table summary="">
     <tr>
-     <td>
-        <select style="width:350px;" id="goExportEntry" name="goExportEntry" {$goNfsServerState} size=6 multiple {$trustmodeACL} {$trusthide}>
-            {html_options values=$goExportEntry output=$goExportEntry}
-        </select>
-    <br>
-        <input type="text"      name="NewNfsExport" {$goNfsServerState} id="NewNfsExportId">
-        <input type="submit"    value="{t}Add{/t}"      name="NewNfsAdd"    {$goNfsServerState} id="NewNfsAddId">
-        <input type="submit"    value="{t}Delete{/t}"   name="DelNfsEnt"    {$goNfsServerState} id="DelNfsEntId">
-    </td>
-	</tr>
-	</table>	
-
-
-  </td>
-  <td style="vertical-align:top" width="50%">
-
-
-   <table>
-    <tr>
-		<td colspan="2"> 
+		<td> 
 			<b>{t}Quota settings{/t}</b>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<input name="" value="" type="text" maxlength="2" size="3">%
-		</td>
-		<td>
-			Percentage to warn users
+			{$quotastr}
 		</td>
 	</tr>
    </table>
   
+  </td>
+  <td style="vertical-align:top" width="50%">
 
-<p class="seperator">&nbsp;</p>
-<br>
-
-
-   <table>
+   <table summary="">
     <tr>
         <td colspan="2">
             <b>{t}Free/Busy settings{/t}</b>
@@ -132,41 +99,31 @@
     </tr>
     <tr>
         <td>
-            <input name="" value="1" type="checkbox">
-        </td>
-        <td>
-            Allow unauthenticated downloading of Free/Busy information 
+            <input name="apache_allow_unauthenticated_fb" value="1" type="checkbox" {$apache_allow_unauthenticated_fbCheck} {$apache_allow_unauthenticated_fbACL}> {t}Allow unauthenticated downloading of Free/Busy information{/t}
         </td>
 	 </tr>
 	 <tr>
         <td>
-        	<input name="" value="" type="text" maxlength="2" size="3">
-		</td>
-        <td>
-			When creating free/busy lists, include data from x days in the past
-		</td>
+		{$fbfuture}
+	</td>
      </tr>
-
    </table>
 
-
 <p class="seperator">&nbsp;</p>
 <br>
-
-
-   <table>
+   <table summary="">
     <tr>
-        <td colspan="2">
-        	<b>{t}Privileged Networks{/t}</b>
+        <td>
+        	<b>{t}SMTP privileged networks{/t}</b>
 		</td>
     </tr>
     <tr>
-        <td>
-            <input name="" value="" type="text">
-        </td>
-        <td>
-			Networks allowed to relay and send mail through unauthenticated SMTP connections to the Kolab server (comma separated networks in x.x.x.x/y format)
-		</td>
+	  <td>
+	    <LABEL for="postfix_mynetworks">{t}Hosts/networks allowed to relay{/t}</LABEL><br>
+        <input id="postfix_mynetworks" name="postfix_mynetworks" size="60" maxlength="220" value="{$postfix_mynetworks}" {$postfix_mynetworksACL} type="text">
+		<br>
+		( {t}Enter multiple values, seperated with{/t} ; )
+	</td>
      </tr>
    </table>
 
@@ -175,21 +132,24 @@
 <br>
 
 
-   <table>
+   <table summary="">
     <tr>
-        <td colspan="2">
-        	<b>{t}SMTP "smarthost/relayhost"{/t}</b>
+        <td>
+        	<b>{t}SMTP smarthost/relayhost{/t}</b>
 		</td>
     </tr>
     <tr>
         <td>
-            <input name="" value="1" type="checkbox" >
-        </td>
-        <td>
-        	Smarthost to use to send outgoing mail (host.domain.tld). Leave empty for no relayhost.
-			Enable MX lookup for relayhost (if in doubt, leave it off)
+            <input id="RelayMxSupport" name="RelayMxSupport" value="1" type="checkbox" {$RelayMxSupportCheck} {$postfix_relayhostACL}>
+			<LABEL for="RelayMxSupport">{t}Enable MX lookup for relayhost{/t}</LABEL>
 		</td>
      </tr>
+	<tr>	
+		<td>
+		    <LABEL for="postfix_relayhost">{t}Host used to relay mails{/t}</LABEL>&nbsp;
+			<input id="postfix_relayhost" name="postfix_relayhost" size="35" maxlength="120" value="{$postfix_relayhost}" {$postfix_relayhostACL} type="text">
+		</td>
+	</tr>
    </table>
 
 
@@ -197,28 +157,23 @@
 <br>
 
 
-   <table>
+   <table summary="">
     <tr>
-        <td colspan="2">
-        	<b>{t}Accept Internet Mai{/t}</b>
+        <td>
+        	<b>{t}Accept Internet Mail{/t}</b>
 		</td>
     </tr>
     <tr>
         <td>
-            <input name="" value="1" type="checkbox" >
-        </td>
-        <td>
-        	Accept mail from other domains over non-authenticated SMTP. This must be enabled if you want to use the Kolab server to receive mail from other internet domains.
+            <input id="postfix_allow_unauthenticated" name="postfix_allow_unauthenticated" value="1" type="checkbox" {$postfix_allow_unauthenticatedCheck} {$postfix_allow_unauthenticatedACL}>
+        	<LABEL for="postfix_allow_unauthenticated">{t}Accept mail from other domains over non-authenticated SMTP{/t}</LABEL>
 		</td>
      </tr>
    </table>
 
 
-
-
-
-
-
   </td>
  </tr>
 </table>
+
+<input type="hidden" name="kolabtab">