Fixed User dialog, to detect changed attributes correctly

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

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index d34faef653f87dda87f5b814534e0882a75e2199..a8b4f3a62accbba03bd4dd90563f234307a7fb58 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -42,10 +42,10 @@ class user extends plugin
   var $l= "";
   var $st= "";
   var $postalAddress= "";
-  var $dob= "0";
+  var $dateOfBirth;
   var $use_dob= "0";
-  var $gender= "0";
-  var $preferredLanguage= "";
+  var $gender="0";
+  var $preferredLanguage="0";
 
   var $jpegPhoto= "*removed*";
   var $photoData= "";
@@ -83,7 +83,7 @@ class user extends plugin
 
   /* attribute list for save action */
   var $attributes= array("sn", "givenName", "uid", "personalTitle", "academicTitle",
-      "homePostalAddress", "homePhone", "labeledURI", "o", "ou", "dob", "gender","preferredLanguage",
+      "homePostalAddress", "homePhone", "labeledURI", "o", "ou", "dateOfBirth", "gender","preferredLanguage",
       "departmentNumber", "employeeNumber", "employeeType", "l", "st",
       "roomNumber", "telephoneNumber", "mobile", "pager", "cn", "userPKCS12",
       "postalAddress", "facsimileTelephoneNumber", "userSMIMECertificate");
@@ -182,12 +182,12 @@ class user extends plugin
       $this->last_pw_storage= $this->pw_storage;
     }
 
-    /* Generate dob entry */
+    /* Generate dateOfBirth entry */
     if (isset ($this->attrs['dateOfBirth'])){
       /* This entry is ISO 8601 conform */
       list($year, $month, $day)= split("-", $this->attrs['dateOfBirth'][0], 3);
     
-      $this->dob=array( 'mon'=> $month,"mday"=> $day,"year"=> $year);
+      $this->dateOfBirth=array( 'mon'=> $month,"mday"=> $day,"year"=> $year);
       $this->use_dob= "1";
     } else {
       $this->use_dob= "0";
@@ -209,13 +209,13 @@ class user extends plugin
     $smarty= get_smarty();
 
     /* Fill calendar */
-    if ($this->dob == "0"){
+    if ($this->dateOfBirth == "0"){
       $date= getdate();
     } else {
-      if(is_array($this->dob)){
-        $date = $this->dob;
+      if(is_array($this->dateOfBirth)){
+        $date = $this->dateOfBirth;
       }else{
-        $date = getdate($this->dob);
+        $date = getdate($this->dateOfBirth);
       } 
     }
 
@@ -318,7 +318,7 @@ class user extends plugin
       $this->dialog= FALSE;
     }
 
-    /* Toggle dob information */
+    /* Toggle dateOfBirth information */
     if (isset($_POST['set_dob'])){
       $this->use_dob= ($this->use_dob == "0")?"1":"0";
     }
@@ -594,6 +594,16 @@ class user extends plugin
   /* Save data to LDAP, depending on is_account we save or delete */
   function save()
   {
+    /* Only force save of changes .... 
+       If this attributes aren't changed, avoid saving.
+     */
+    if ($this->use_dob == "1"){
+      $this->dateOfBirth= date("Y-m-d", $this->dateOfBirth);
+    }
+    if($this->gender=="0") $this->gender ="";
+    if($this->preferredLanguage=="0") $this->preferredLanguage ="";
+    
+ 
     /* First use parents methods to do some basic fillup in $this->attrs */
     plugin::save ();
 
@@ -655,24 +665,22 @@ class user extends plugin
       $remove_userCertificate= true;
     }
 
-    /* Special handling for dob value */
-    if ($this->use_dob == "1"){
-      $this->attrs["dob"]= date("Y-m-d", $this->dob);
-    } else {
+    /* Special handling for dateOfBirth value */
+    if ($this->use_dob != "1"){
       if ($this->new) {
-        unset($this->attrs["dob"]);
+        unset($this->attrs["dateOfBirth"]);
       } else {
-        $this->attrs["dob"]= array();
+        $this->attrs["dateOfBirth"]= array();
       }
     }
-    if ($this->gender == "0"){
+    if (!$this->gender){
       if ($this->new) {
         unset($this->attrs["gender"]);
       } else {
         $this->attrs["gender"]= array();
       }
     }
-      if ($this->preferredLanguage == "0"){
+    if (!$this->preferredLanguage){
       if ($this->new) {
         unset($this->attrs["preferredLanguage"]);
       } else {

diff --git a/plugins/personal/generic/generic.tpl b/plugins/personal/generic/generic.tpl
index 17ea49364af87da533f3c939818be34ba1c49a13..81fd56016a5fcec407dd3aa7a71503e181992ce9 100644 (file)
--- a/plugins/personal/generic/generic.tpl
+++ b/plugins/personal/generic/generic.tpl
@@ -67,19 +67,19 @@
      <td>
       <div style="height:10px;"></div>
       {if $use_dob eq 1}
-      <select id="day" name=day onChange="createResult(this.form,this.form.dob);" {$dobACL}>
+      <select id="day" name=day onChange="createResult(this.form,this.form.dateOfBirth);" {$dateOfBirthACL}>
        {html_options values=$days output=$days selected=$day}
       </select>
-      <select name=month onChange="populate(this.form,this.form.dob);" {$dobACL}>
+      <select name=month onChange="populate(this.form,this.form.dateOfBirth);" {$dateOfBirthACL}>
        {html_options options=$months selected=$month}
       </select>
-      <select name=year onChange="populate(this.form,this.form.dob);" {$dobACL}>
+      <select name=year onChange="populate(this.form,this.form.dateOfBirth);" {$dateOfBirthACL}>
        {html_options values=$years output=$years selected=$year}
       </select>
-      <input type="hidden" name="dob" value="{$dob}">
-      <input type="submit" name="set_dob" value="-" {$dobACL}>
+      <input type="hidden" name="dateOfBirth" value="{$dateOfBirth}">
+      <input type="submit" name="set_dob" value="-" {$dateOfBirthACL}>
       {else}
-      <input type="submit" name="set_dob" value="{t}Set{/t}" {$dobACL}>
+      <input type="submit" name="set_dob" value="{t}Set{/t}" {$dateOfBirthACL}>
       {/if}
      </td>
     </tr>
@@ -411,7 +411,7 @@
   <!-- // First input field on page
   document.mainform.sn.focus();
        if (document.mainform.yearSel != "")
-                               populate(document.mainform,document.mainform.dob);
+                               populate(document.mainform,document.mainform.dateOfBirth);
   -->
 </script>