From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 1 Oct 2009 11:04:38 +0000 (+0000)
Subject: Replaced old date picker by new one
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=98146af2c12b3303ab773285e0fe8a8205211f73;p=gosa.git

Replaced old date picker by new one


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

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index c34c0686a..d011ff508 100644
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -131,6 +131,8 @@ class user extends plugin
      'dn' from LDAP */
   function user (&$config, $dn= NULL)
   {
+    global $lang;
+
     $this->config= $config;
     /* Configuration is fine, allways */
     if($this->config->get_cfg_value("honourIvbbAttributes") == "true"){
@@ -222,10 +224,10 @@ class user extends plugin
       /* This entry is ISO 8601 conform */
       list($year, $month, $day)= split("-", $this->attrs['dateOfBirth'][0], 3);
     
-      $this->dateOfBirth=array( 'mon'=> $month,"mday"=> $day,"year"=> $year);
-      $this->use_dob= "1";
+      #TODO: use $lang to convert date
+      $this->dateOfBirth= "$day.$month.$year";
     } else {
-      $this->use_dob= "0";
+      $this->dateOfBirth= "";
     }
 
     /* Put gender attribute to upper case */
@@ -275,50 +277,7 @@ class user extends plugin
     }
 
     $smarty= get_smarty();
-
-    /* Fill calendar */
-    if ($this->dateOfBirth == "0"){
-      $date= getdate();
-    } else {
-      if(is_array($this->dateOfBirth)){
-        $date = $this->dateOfBirth;
-  
-        // Trigger on dates like 1985-04-01, getdate only understands timestamps
-      } else if (!empty($this->dateOfBirth) && !is_numeric($this->dateOfBirth)){
-        $date= getdate(strtotime($this->dateOfBirth));
-
-      } else {
-        $date = getdate($this->dateOfBirth);
-      }
-    }
-
-    $days= array();
-    for($d= 1; $d<32; $d++){
-      $days[$d]= $d;
-    }
-    $years= array();
-
-    if(($date['year']-100)<1901){
-      $start = 1901;
-    }else{
-      $start = $date['year']-100;
-    }
-
-    $end = $start +100;
-    
-    for($y= $start; $y<=$end; $y++){
-      $years[]= $y;
-    }
-    $years['-']= "-&nbsp;";
-    $months= msgPool::months();
-    $months['-'] = '-&nbsp;';
-
-    $smarty->assign("day", $date["mday"]);
-    $smarty->assign("days", $days);
-    $smarty->assign("months", $months);
-    $smarty->assign("month", $date["mon"]-1);
-    $smarty->assign("years", $years);
-    $smarty->assign("year", $date["year"]);
+    $smarty->assign("usePrototype", "true");
 
     /* Assign sex */
     $sex= array(0 => "&nbsp;", "F" => _("female"), "M" => _("male"));
@@ -445,12 +404,6 @@ class user extends plugin
       $this->dialog= FALSE;
     }
 
-    /* Toggle dateOfBirth information */
-    if (isset($_POST['set_dob'])){
-      $this->use_dob= ($this->use_dob == "0")?"1":"0";
-    }
-
-
     /* Want certificate= */
     if ((isset($_POST['edit_cert'])) && $this->acl_is_readable("Certificate")){
 
@@ -883,6 +836,8 @@ class user extends plugin
   /* Save data to LDAP, depending on is_account we save or delete */
   function save()
   {
+    global $lang;
+
     /* Only force save of changes .... 
        If this attributes aren't changed, avoid saving.
      */
@@ -893,10 +848,11 @@ class user extends plugin
     /* First use parents methods to do some basic fillup in $this->attrs */
     plugin::save ();
 
-    if ($this->use_dob == "1"){
-      /* If it is an array, the generic page has never been loaded - so there's no difference. Using an array would cause an error btw. */
+    if ($this->dateOfBirth != ""){
       if(!is_array($this->attrs['dateOfBirth'])) {
-        $this->attrs['dateOfBirth'] = date("Y-m-d", $this->dateOfBirth);
+        #TODO: use $lang to convert date
+        list($day, $month, $year)= split("\.", $this->dateOfBirth);
+        $this->attrs['dateOfBirth'] = sprintf("%04d-%02d-%02d", $year, $month, $day);
       }
     }
 
@@ -959,7 +915,7 @@ class user extends plugin
     }
 
     /* Special handling for dateOfBirth value */
-    if ($this->use_dob != "1"){
+    if ($this->dateOfBirth == ""){
       if ($this->is_new) {
         unset($this->attrs["dateOfBirth"]);
       } else {
@@ -1292,9 +1248,7 @@ class user extends plugin
       $this->set_acl_base($this->base);
     }
 
-    /* Check if we are allowed to create/move this user 
-     */
-    
+    /* Check if we are allowed to create/move this user */
     if($this->orig_dn == "new" && !$this->acl_is_createable($this->base)){
       $message[]= msgPool::permCreate();
     }elseif($this->orig_dn != "new" && $this->new_dn != $this->orig_dn && !$this->acl_is_moveable($this->base)){
@@ -1357,6 +1311,11 @@ class user extends plugin
       $message[]= msgPool::invalid(_("Pager"), $this->pager, "/[\/0-9 ()+*-]/");
     }
 
+    /* Check dates */
+    if (!tests::is_date($this->dateOfBirth)){
+      $message[]= msgPool::invalid(_("Date of birth"), $this->dateOfBirth);
+    }
+
     /* Check for reserved characers */
     if (preg_match ('/[,+"?\'()=<>;\\\\]/', $this->givenName)){
       $message[]= msgPool::invalid(_("Given name"), $this->givenName, '/[^,+"?\'()=<>;\\\\]/');
diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl
index eba5a0127..9833e7b30 100644
--- a/gosa-core/plugins/personal/generic/generic.tpl
+++ b/gosa-core/plugins/personal/generic/generic.tpl
@@ -121,21 +121,15 @@
      <td>
       <div style="height:10px;"></div>
 {render acl=$dateOfBirthACL}
-	      {if $use_dob eq 1}
-	      <select id="day" name=day onChange="createResult(this.form,this.form.dateOfBirth);"> 
-	       {html_options values=$days output=$days selected=$day}
-	      </select>
-	      <select name=month onChange="populate(this.form,this.form.dateOfBirth);" >
-	       {html_options options=$months selected=$month}
-	      </select>
-	      <select name=year onChange="populate(this.form,this.form.dateOfBirth);" >
-	       {html_options values=$years output=$years selected=$year}
-	      </select>
-	      <input type="hidden" name="dateOfBirth" value="{$dateOfBirth}">
-	      <input type="submit" name="set_dob" value="-" >
-	      {else}
-	      <input type="submit" name="set_dob" value="{t}Set{/t}" >
-	      {/if}
+        <input type="text" id="dateOfBirth" name="dateOfBirth" class="date" style='width:100px' value="{$dateOfBirth}">
+        {if $dateOfBirthACL|regex_replace:"/[cdmr]/":"" == "w"}
+        <script type="text/javascript">
+          {literal}
+          var datepicker  = new DatePicker({ relative : 'dateOfBirth', language : '{/literal}{$lang}{literal}', keepFieldEmpty : true,
+                                             enableCloseEffect : false, enableShowEffect : false });
+          {/literal}
+        </script>
+        {/if}
 {/render}
      </td>
     </tr>
@@ -584,7 +578,5 @@
 <script language="JavaScript" type="text/javascript">
   <!-- // First input field on page
 	focus_field('sn');
-  	if (document.mainform.yearSel != "")
-				populate(document.mainform,document.mainform.dateOfBirth);
   -->
 </script>