Updated MailAccount

-Fixed post handling

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

diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
index 67a3256111cdbb30b3247b33c405f3e388fbb77f..e5cc18f8cf4551366f2094541a9289d2a5d36341 100644 (file)
--- a/gosa-plugins/mail/personal/mail/class_mailAccount.inc
+++ b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
@@ -320,7 +320,7 @@ class mailAccount extends plugin
 
     if (isset($_POST['add_forwarder'])){
       if ($_POST['forward_address'] != ""){
-        $address= $_POST['forward_address'];
+        $address= get_post('forward_address');
         $valid= FALSE;
         if (!tests::is_email($address)){
           if (!tests::is_email($address, TRUE)){
@@ -373,7 +373,7 @@ class mailAccount extends plugin
       } else {
         $valid= TRUE;
       }
-      if ($valid && ($user= $this->addAlternate ($_POST['alternate_address'])) != ""){
+      if ($valid && ($user= $this->addAlternate (get_post('alternate_address'))) != ""){
         $ui= get_userinfo();
         $addon= "";
         if ($user[0] == "!") {
@@ -404,17 +404,17 @@ class mailAccount extends plugin
       $smarty->assign("$name"."ACL", $this->getacl($name));
     }
     foreach($this->attributes as $attr){
-      $smarty->assign($attr,$this->$attr);
+      $smarty->assign($attr,set_post($this->$attr));
     }
     $smarty->assign("quotaEnabled", $this->mailMethod->quotaEnabled());
     if($this->mailMethod->quotaEnabled()){
       $smarty->assign("quotaUsage",   mailMethod::quota_to_image($this->quotaUsage,$this->gosaMailQuota));
-      $smarty->assign("gosaMailQuota",$this->gosaMailQuota);
+      $smarty->assign("gosaMailQuota",set_post($this->gosaMailQuota));
     }
     $smarty->assign("domainSelectionEnabled", $this->mailMethod->domainSelectionEnabled());
-    $smarty->assign("MailDomains", $this->mailDomainParts);
-    $smarty->assign("MailDomain" , $this->mailDomainPart);
-    $smarty->assign("MailServers", $this->mailMethod->getMailServers());
+    $smarty->assign("MailDomains", set_post($this->mailDomainParts));
+    $smarty->assign("MailDomain" , set_post($this->mailDomainPart));
+    $smarty->assign("MailServers", set_post($this->mailMethod->getMailServers()));
     $smarty->assign("allowSieveManagement", $this->mailMethod->allowSieveManagement());
     $smarty->assign("own_script",  $this->sieveManagementUsed);
 
@@ -460,9 +460,9 @@ class mailAccount extends plugin
     $smarty->assign("template", "");
     if (count($this->vacationTemplates)){
       $smarty->assign("show_templates", "true");
-      $smarty->assign("vacationtemplates", $this->vacationTemplates);
+      $smarty->assign("vacationtemplates", set_post($this->vacationTemplates));
       if (isset($_POST['vacation_template'])){
-        $smarty->assign("template", $_POST['vacation_template']);
+        $smarty->assign("template", set_post(get_post('vacation_template')));
       }
     } else {
       $smarty->assign("show_templates", "false");
@@ -516,9 +516,9 @@ class mailAccount extends plugin
        */
       if (isset($_POST["import_vacation"]) && isset($this->vacationTemplates[$_POST["vacation_template"]])){
         if($this->multiple_support_active){
-          $contents = ltrim(preg_replace("/^DESC:.*$/m","",file_get_contents($_POST["vacation_template"])));
+          $contents = ltrim(preg_replace("/^DESC:.*$/m","",file_get_contents(get_post("vacation_template"))));
         }else{
-          $contents = $this->prepare_vacation_template(file_get_contents($_POST["vacation_template"]));
+          $contents = $this->prepare_vacation_template(file_get_contents(get_post("vacation_template")));
         }
         $this->gosaVacationMessage= htmlspecialchars($contents);
       }
@@ -584,10 +584,10 @@ class mailAccount extends plugin
         if($this->mailMethod->vacationRangeEnabled()){
           if($this->acl_is_writeable("gosaVacationMessage") && preg_match("/V/",$this->gosaMailDeliveryMode)){
             if(isset($_POST['gosaVacationStart'])){
-              $this->gosaVacationStart = $_POST['gosaVacationStart'];
+              $this->gosaVacationStart = get_post('gosaVacationStart');
             }
             if(isset($_POST['gosaVacationStop'])){
-              $this->gosaVacationStop = $_POST['gosaVacationStop'];
+              $this->gosaVacationStop = get_post('gosaVacationStop');
             }
           }
         }
@@ -1165,7 +1165,7 @@ class mailAccount extends plugin
       /* Execute to save mailAlternateAddress && gosaMailForwardingAddress */
       $this->execute();
       if(isset($_POST['mail'])){
-          $this->mail = $_POST['mail'];
+          $this->mail = get_post('mail');
       }
   }
 
@@ -1231,8 +1231,8 @@ class mailAccount extends plugin
 
     if($this->mailMethod->vacationRangeEnabled()){
       if(in_array("V",$flag_add)){
-        $ret['gosaVacationStart'] =  $this->gosaVacationStart = $_POST['gosaVacationStart'];
-        $ret['gosaVacationStop'] =  $this->gosaVacationStop = $_POST['gosaVacationStop'];
+        $ret['gosaVacationStart'] =  $this->gosaVacationStart = get_post('gosaVacationStart');
+        $ret['gosaVacationStop'] =  $this->gosaVacationStop = get_post('gosaVacationStop');
       }
     }
     return($ret);

diff --git a/gosa-plugins/mail/personal/mail/generic.tpl b/gosa-plugins/mail/personal/mail/generic.tpl
index 05b21fac541bf81b9938bf2d223c1eda81a033b3..789e646ae2e7d73847c5a7aad3d38c49abb80603 100644 (file)
--- a/gosa-plugins/mail/personal/mail/generic.tpl
+++ b/gosa-plugins/mail/personal/mail/generic.tpl
@@ -58,7 +58,7 @@
      <td><label for="gosaMailQuota">{t}Quota size{/t}</label></td>
      <td>
       {render acl=$gosaMailQuotaACL checkbox=$multiple_support checked=$use_gosaMailQuota}
-      <input id="gosaMailQuota" name="gosaMailQuota" size="6" align="middle" maxlength="60"
+      <input type='text' id="gosaMailQuota" name="gosaMailQuota" size="6" align="middle" maxlength="60"
       value="{$gosaMailQuota}"> MB
       {/render}
      </td>
@@ -253,7 +253,7 @@
   <label for="gosaMailMaxSize">{t}Reject mails bigger than{/t}</label>
   {render acl=$gosaMailMaxSizeACL checkbox=$multiple_support checked=$use_gosaMailMaxSize}
   <input {if $own_script != ""} disabled {/if} id="gosaMailMaxSize" name="gosaMailMaxSize" 
-  size="6" align="middle" maxlength="30" value="{$gosaMailMaxSize}"  class="center"> {t}MB{/t}
+  size="6" align="middle" type='text' maxlength="30" value="{$gosaMailMaxSize}"  class="center"> {t}MB{/t}
   {/render}
  </div>
 </div>