From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 22 Mar 2010 10:45:39 +0000 (+0000)
Subject: Updated Spamserver templates and acls
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e1c0b60c85fe50483f19c1029855086ff4d8f42d;p=gosa.git

Updated Spamserver templates and acls


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16987 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServer.inc b/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServer.inc
index 2967a40e9..892607e9b 100644
--- a/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServer.inc
+++ b/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServer.inc
@@ -108,6 +108,8 @@ class gospamserver extends goService{
     /* Add a new rule */
     if(isset($_POST['AddRule']) && $this->acl_is_writeable("saRule")){
       $this->dialog = new goSpamServerRule($this->config,$this->dn);
+      $this->dialog->acl_base = $this->acl_base;
+      $this->dialog->acl_category = $this->acl_category;
     }
   
     /* Cancel adding/editing specified rule */
@@ -125,6 +127,8 @@ class gospamserver extends goService{
         $rule = $this->Rules[$entry];
         $name = $entry;
         $this->dialog = new goSpamServerRule($this->config,$this->dn,$name,$rule);
+        $this->dialog->acl_base = $this->acl_base;
+        $this->dialog->acl_category = $this->acl_category;
       }
       if(preg_match("/^delRule_/",$name) && $once && $this->acl_is_writeable("saRule")){
         $once = false;
diff --git a/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServerRule.inc b/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServerRule.inc
index ba5673db5..9ffa19088 100644
--- a/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServerRule.inc
+++ b/gosa-plugins/mail/admin/systems/services/spam/class_goSpamServerRule.inc
@@ -43,6 +43,12 @@ class goSpamServerRule extends plugin {
 		}
 	}
 
+  function acl_is_writeable($attribute,$skip_write = FALSE)
+  {
+    if($this->read_only) return(FALSE);
+    $ui= get_userinfo();
+    return preg_match('/w/', $ui->get_permissions($this->acl_base, $this->acl_category."gospamserver", $attribute,      $skip_write));
+  }
 
 	function save()
 	{
diff --git a/gosa-plugins/mail/admin/systems/services/spam/goSpamServer.tpl b/gosa-plugins/mail/admin/systems/services/spam/goSpamServer.tpl
index b12503261..9699efffb 100644
--- a/gosa-plugins/mail/admin/systems/services/spam/goSpamServer.tpl
+++ b/gosa-plugins/mail/admin/systems/services/spam/goSpamServer.tpl
@@ -1,60 +1,54 @@
-<table style='width:100%'>
+
+<table style='width:100%' summary="{t}Spam taggin{/t}">
  <tr>
   <td style='width:50%;'>
-<h3>Spam tagging</h3>
-
-   <table>
+   <h3>{t}Spam tagging{/t}</h3>
+   <table summary="{t}Spam taggin{/t}">
     <tr>
+     <td>{t}Rewrite header{/t}</td>
      <td>
-      {t}Rewrite header{/t}      
-     </td>
-     <td>
-{render acl=$saRewriteHeaderACL}
-      <input type='text' name='saRewriteHeader' value='{$saRewriteHeader}'>
-{/render}
+      {render acl=$saRewriteHeaderACL}
+       <input type='text' name='saRewriteHeader' value='{$saRewriteHeader}'>
+      {/render}
      </td>
     </tr>
     <tr>
+     <td>{t}Required score{/t}</td>
      <td>
-      {t}Required score{/t}      
-     </td>
-     <td>
-{render acl=$saRequiredScoreACL}
-      <select name='saRequiredScore' title='{t}Select required score to tag mail as spam{/t}' size=1>
-       {html_options options=$SpamScore selected=$saRequiredScore}
-      </select>
-{/render}
+      {render acl=$saRequiredScoreACL}
+       <select name='saRequiredScore' title='{t}Select required score to tag mail as spam{/t}' size=1>
+        {html_options options=$SpamScore selected=$saRequiredScore}
+       </select>
+      {/render}
      </td>
     </tr>
    </table>
-
   </td>
   <td class='left-border'>
-<h3>Trusted networks</h3>
+  
+   <h3>Trusted networks</h3>
 
-   <table width='100%'>
+   <table width='100%' summary="{t}Network settings{/t}">
     <tr>
      <td>
-{render acl=$saTrustedNetworksACL}
-      <select name='TrustedNetworks[]' size=4 style='width:100%;' multiple>
-       {html_options options=$TrustedNetworks}
-      </select><br>
-{/render}
-{render acl=$saTrustedNetworksACL}
-      <input type='text'	name='NewTrustName' value=''>&nbsp;
-{/render}
-{render acl=$saTrustedNetworksACL}
-      <button type='submit' name='AddNewTrust'>{msgPool type=addButton}</button>
-
-{/render}
-{render acl=$saTrustedNetworksACL}
-      <button type='submit' name='DelTrust'>{t}Remove{/t}</button>
-
-{/render}
+      {render acl=$saTrustedNetworksACL}
+       <select name='TrustedNetworks[]' size=4 style='width:100%;' multiple>
+        {html_options options=$TrustedNetworks}
+       </select>
+       <br>
+      {/render}
+      {render acl=$saTrustedNetworksACL}
+       <input type='text'	name='NewTrustName' value=''>&nbsp;
+      {/render}
+      {render acl=$saTrustedNetworksACL}
+       <button type='submit' name='AddNewTrust'>{msgPool type=addButton}</button>
+      {/render}
+      {render acl=$saTrustedNetworksACL}
+       <button type='submit' name='DelTrust'>{t}Remove{/t}</button>
+      {/render}
      </td>
     </tr>
    </table>
-
   </td>
  </tr>
  <tr>
@@ -64,42 +58,43 @@
  </tr>
  <tr>
   <td>
-	<h3>Flags</h3>
-	
-   <table>
+   <h3>{t}Flags{/t}</h3>
+   <table summary="{t}Flags{/t}">
     <tr>
      <td>
-{render acl=$saFlagsBACL}
-      <input type='checkbox' name='saFlagsB' value='1' {$saFlagsBCHK}> &nbsp;{t}Enable use of bayes filtering{/t}<br>
-{/render}
-{render acl=$saFlagsbACL}
-      <input type='checkbox' name='saFlagsb' value='1' {$saFlagsbCHK}> &nbsp;{t}Enable bayes auto learning{/t}<br>
-{/render}
-{render acl=$saFlagsCACL}
-      <input type='checkbox' name='saFlagsC' value='1' {$saFlagsCCHK}> &nbsp;{t}Enable RBL checks{/t}
-{/render}
+      {render acl=$saFlagsBACL}
+       <input type='checkbox' name='saFlagsB' value='1' {$saFlagsBCHK}> &nbsp;{t}Enable use of bayes filtering{/t}
+      {/render}
+      <br>
+      {render acl=$saFlagsbACL}
+       <input type='checkbox' name='saFlagsb' value='1' {$saFlagsbCHK}> &nbsp;{t}Enable bayes auto learning{/t}
+      {/render}
+      <br>
+      {render acl=$saFlagsCACL}
+       <input type='checkbox' name='saFlagsC' value='1' {$saFlagsCCHK}> &nbsp;{t}Enable RBL checks{/t}
+      {/render}
      </td>
     </tr>
    </table>
   </td>
   <td class='left-border'>
-
-   <table>
+   <table summary="{t}Flags{/t}">
     <tr>
      <td>
-{render acl=$saFlagsRACL}
-      <input type='checkbox' name='saFlagsR' value='1' {$saFlagsRCHK}> &nbsp;{t}Enable use of Razor{/t}<br>
-{/render}
-{render acl=$saFlagsDACL}
-      <input type='checkbox' name='saFlagsD' value='1' {$saFlagsDCHK}> &nbsp;{t}Enable use of DDC{/t}<br>
-{/render}
-{render acl=$saFlagsPACL}
-      <input type='checkbox' name='saFlagsP' value='1' {$saFlagsPCHK}> &nbsp;{t}Enable use of Pyzor{/t}
-{/render}
+      {render acl=$saFlagsRACL}
+       <input type='checkbox' name='saFlagsR' value='1' {$saFlagsRCHK}> &nbsp;{t}Enable use of Razor{/t}
+      {/render}
+      <br>
+      {render acl=$saFlagsDACL}
+       <input type='checkbox' name='saFlagsD' value='1' {$saFlagsDCHK}> &nbsp;{t}Enable use of DDC{/t}
+      {/render}
+      <br>
+      {render acl=$saFlagsPACL}
+       <input type='checkbox' name='saFlagsP' value='1' {$saFlagsPCHK}> &nbsp;{t}Enable use of Pyzor{/t}
+      {/render}
      </td>
     </tr>
    </table>
-
   </td>
  </tr>
  <tr>
@@ -108,30 +103,30 @@
   </td>
  </tr>
  <tr>
-  <td colspan='2'><h3>Rules</h3>
+  <td colspan='2'>
+   <h3>{t}Rules{/t}</h3>
 
-   <table width='100%'>
+   <table width='100%' summary="{t}Rules{/t}">
     <tr>
      <td>
-      {$divRules}<br>
-{render acl=$saTrustedNetworksACL}
-      <button type='submit' name='AddRule'>{msgPool type=addButton}</button> 
-
-{/render}
+      {$divRules}
+      <br>
+      {render acl=$saTrustedNetworksACL}
+       <button type='submit' name='AddRule'>{msgPool type=addButton}</button>
+      {/render}
      </td>
     </tr>
    </table>
 
   </td>
+ </tr>
 </table>
+
 <input type='hidden' value='1' name='goSpamServer'>
 
 <hr>
-<div style="width:100%; text-align:right;padding-top:10px;padding-bottom:3px;">
-    <button type='submit' name='SaveService'>{msgPool type=saveButton}</button>
-
-    &nbsp;
-    <button type='submit' name='CancelService'>{msgPool type=cancelButton}</button>
 
+<div class="plugin-actions">
+  <button type='submit' name='SaveService'>{msgPool type=saveButton}</button>
+  <button type='submit' name='CancelService'>{msgPool type=cancelButton}</button>
 </div>
-
diff --git a/gosa-plugins/mail/admin/systems/services/spam/goSpamServerRule.tpl b/gosa-plugins/mail/admin/systems/services/spam/goSpamServerRule.tpl
index 1850933d2..4131b2729 100644
--- a/gosa-plugins/mail/admin/systems/services/spam/goSpamServerRule.tpl
+++ b/gosa-plugins/mail/admin/systems/services/spam/goSpamServerRule.tpl
@@ -1,27 +1,17 @@
-<h3>Edit spam rule</h3>
+<p>
+{t}Name{/t}
+<input type='text' name='name' value='{$name}' >
+</p>
 
-<table style='width:100%;'>
- <tr>
-  <td width='70'>
-   {t}Name{/t}
-  </td>
-  <td>
-   <input type='text' name='name' value='{$name}' >
-  </td>
- </tr>
- <tr>
-  <td colspan=2>
-   {t}Rule{/t}
-   <textarea name='rule' style='width:100%;'>{$rule}</textarea>
-  </td>
- </tr>
-</table>
 <hr>
-<div style="width:100%; text-align:right;padding-top:10px;padding-bottom:3px;">
-    <button type='submit' name='SaveRule'>{msgPool type=saveButton}</button>
 
-    &nbsp;
-    <button type='submit' name='CancelRule'>{msgPool type=cancelButton}</button>
+<h3>{t}Rule{/t}</h3>
+<textarea name='rule' style='width:100%;'>{$rule}</textarea>
 
+<hr>
+<div style="width:100%; text-align:right;padding-top:10px;padding-bottom:3px;">
+ <button type='submit' name='SaveRule'>
+ {msgPool type=saveButton}</button>&nbsp;
+ <button type='submit' name='CancelRule'>
+ {msgPool type=cancelButton}</button>
 </div>
-