Changeset 2905

Timestamp:

03/27/11 18:25:51 (2 years ago)

Author:

benjamin

Message:

trash ok for yes/no (was buggy)

Location:

alternc/trunk/bureau

Files:

• admin/mail_doadd.php (modified) (1 diff)
• class/m_trash.php (modified) (1 diff)

alternc/trunk/bureau/admin/mail_doadd.php

@@ -31 +31 @@
 $trash->getfromform();
 
+$fields = array (
+        "domain"    => array ("request", "string", ""),
+        "email"       => array ("request", "string", ""),
+        "pop"       => array ("request", "integer", 0),
+        "pass"       => array ("request", "string", ""),
+        "passconf"       => array ("request", "string", ""),
+        "alias"       => array ("request", "string", ""),
+);
+getFields($fields);
+
+
 if ($pass != $passconf) {
         $error = _("Passwords do not match");

alternc/trunk/bureau/class/m_trash.php

@@ -38 +38 @@
     $this->expiration_date_db=$expiration_date_db;
     $this->expiration_date=strtotime($this->expiration_date_db);
+    if ($this->expiration_date_db) $this->is_trash=true;
   }
 
   function human_display() {
-    return strftime("%d/%m/%Y %T",$this->expiration_date);
+    return strftime("%d/%m/%Y",$this->expiration_date);
   }
 
   function getfromform() {
     $fields = array (
-          "trash_type_expiration"   => array ("request", "string", ""),
-          "trash_exp_in_value"      => array ("request", "string", ""),
-          "trash_exp_in_unit"       => array ("request", "string", ""),
-          "trash_datepicker"        => array ("request", "string", ""),
+                     "istrash"                => array ("request", "boolean", false),
+                     "trash_type_expiration"  => array ("request", "string", ""),
+                     "trash_exp_in_value"     => array ("request", "string", ""),
+                     "trash_exp_in_unit"      => array ("request", "string", ""),
+                     "trash_datepicker"       => array ("request", "string", ""),
     );
     $champs=getFields($fields);
     foreach($champs as $k=>$v) $$k = $v; 
+
+    if (!$istrash) $trash_type_expiration="no_exp";
 
     switch($trash_type_expiration) {