From 3e9a4232c2c9ec9a7c89cfef7e897dae0d12b34a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 17 Jul 2004 17:14:36 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20L'alerte=20anniversaire=20est=20bien=20s?=
 =?UTF-8?q?tock=E9e=20en=20base.=20New:=20Renommage=20de=20llx=5Fbirthday?=
 =?UTF-8?q?=5Falert=20en=20llx=5Fuser=5Falert=20et=20ajout=20d'un=20champ?=
 =?UTF-8?q?=20type=20d'alerte=20afin=20de=20pouvoir=20sp=E9cifier=20d'autr?=
 =?UTF-8?q?es=20types=20d'alertes=20que=20les=20anniversaires.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/contact/fiche.php | 25 +++----------------------
 htdocs/contact/perso.php | 37 ++++++++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 9adbbf936d5..eb135897a12 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -46,12 +46,6 @@ if ($_POST["action"] == 'add')
       $contact->address      = $_POST["adresse"];
       $contact->cp           = $_POST["cp"];
       $contact->ville        = $_POST["ville"];
-      if ($_POST["birthdayyear"] && $_POST["birthdayyear"]<=1970 && $_SERVER["WINDIR"]) {
-        # windows does not support negative date timestamp so birthday is not support for old persons
-        array_push($error,"Windows ne sachant pas gérer des dates avant 1970, les dates de naissance avant cette date ne seront pas sauvegardées");
-      } else {
-        $contact->birthday     = mktime(0,0,0,$_POST["birthdaymonth"],$_POST["birthdayday"],$_POST["birthdayyear"]);
-      }
       $contact->email        = $_POST["email"];
       $contact->phone_pro    = $_POST["phone_pro"];
       $contact->phone_perso  = $_POST["phone_perso"];
@@ -102,8 +96,6 @@ if ($_POST["action"] == 'update')
   $contact->fax           = $_POST["fax"];
   $contact->jabberid      = $_POST["jabberid"];
 
-  $contact->birthday     = mktime(0,0,0,$_POST["birthdaymonth"],$_POST["birthdayday"],$_POST["birthdayyear"]);
-
   $contact->note          = $_POST["note"];
 
   $result = $contact->update($_POST["contactid"], $user);
@@ -203,9 +195,9 @@ if ($_GET["action"] == 'create')
 
   print '<tr><td>Jabberid</td><td colspan="5"><input name="jabberid" type="text" size="50" maxlength="80" value="'.$contact->jabberid.'"></td></tr>';
 
-  print '<tr><td>Date de naissance</td><td colspan="5">';
-  print $form->select_date('','birthday',0,0,1);
-  print '</td></tr>';
+//  print '<tr><td>Date de naissance</td><td colspan="5">';
+//  print $form->select_date('','birthday',0,0,1);
+//  print '</td></tr>';
 
   print '<tr><td>Note</td><td colspan="5"><textarea name="note" cols="60" rows="3"></textarea></td></tr>';
   print '<tr><td align="center" colspan="6"><input type="submit" value="Ajouter"></td></tr>';
@@ -257,14 +249,6 @@ elseif ($_GET["action"] == 'edit')
 
   print '<tr><td>Jabberid</td><td colspan="5"><input name="jabberid" type="text" size="50" maxlength="80" value="'.$contact->jabberid.'"></td></tr>';
 
-  print '<tr><td>Date de naissance</td><td colspan="5">';
-  if ($contact->birthday) { 
-    print $form->select_date($contact->birthday,'birthday',0,0,0);
-  } else {
-    print $form->select_date(0,'birthday',0,0,1);
-  }
-  print '</td></tr>';
-
   print '<tr><td>Note</td><td colspan="5">';
   print '<textarea name="note" cols="60" rows="3">';
   print nl2br($contact->note);
@@ -329,9 +313,6 @@ else
 
   print '</td></tr>';
 
-  if($contact->birthday && $contact->birthday > 0)
-    print '<tr><td>Date de naissance : '.dolibarr_print_date($contact->birthday)."</td></tr>";
-
   if ($contact->note) {
     print '<tr><td>';
     print nl2br($contact->note);
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 3546eb50cc8..8a2e14f942b 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -29,8 +29,15 @@ if ($_POST["action"] == 'update')
   $contact = new Contact($db);
   $contact->id = $_POST["contactid"];
 
-  $contact->birthday = $_POST["reyear"].'-'.$_POST["remonth"].'-'.$_POST["reday"];
-			
+  if ($_POST["birthdayyear"]) {
+    if ($_POST["birthdayyear"]<=1970 && $_SERVER["WINDIR"]) {
+        # windows mktime does not support negative date timestamp so birthday is not support for old persons
+        $contact->birthday = $_POST["birthdayyear"].'-'.$_POST["birthdaymonth"].'-'.$_POST["birthdayday"];
+        //array_push($error,"Windows ne sachant pas gérer des dates avant 1970, les dates de naissance avant cette date ne seront pas sauvegardées");
+    } else {
+        $contact->birthday     = mktime(0,0,0,$_POST["birthdaymonth"],$_POST["birthdayday"],$_POST["birthdayyear"]);
+    }
+  }
 
   $contact->birthday_alert = $_POST["birthday_alert"];
 
@@ -53,11 +60,13 @@ print '<div class="tabBar">';
 
 if ($_GET["action"] == 'edit') 
 {
-  print_fiche_titre ("Edition d'un contact");
-
+  // Fiche info perso en mode edition
+ 
   $contact = new Contact($db);
   $contact->fetch($_GET["id"], $user);
 
+  print_fiche_titre ("Contact : ". $contact->firstname.' '.$contact->name);
+
   print '<form method="post" action="perso.php?id='.$_GET["id"].'">';
   print '<input type="hidden" name="action" value="update">';
   print '<input type="hidden" name="contactid" value="'.$contact->id.'">';
@@ -67,18 +76,24 @@ if ($_GET["action"] == 'edit')
       $objsoc = new Societe($db);
       $objsoc->fetch($contact->socid);
 
-      print 'Société : '.$objsoc->nom.'<br>';
+      print 'Société : '.$objsoc->nom_url.'<br>';
     }
 
   print 'Nom : '.$contact->name.' '.$contact->firstname ."<br>";
 
   print '<table class="border" cellpadding="3" celspacing="0" border="0" width="100%">';
 
-  print '<tr><td>Date de naissance</td><td>';
   $html = new Form($db);
 
-  print $html->select_date('','re',0,0,1);
-  print '</td><td>Alerte : ';
+  print '<tr><td>Date de naissance</td><td>';
+  if ($contact->birthday && $contact->birthday > 0) { 
+    print $html->select_date($contact->birthday,'birthday',0,0,0);
+  } else {
+    print $html->select_date(0,'birthday',0,0,1);
+  }
+  print '</td>';
+
+  print '<td>Alerte : ';
   if ($contact->birthday_alert)
     {
       print '<input type="checkbox" name="birthday_alert" checked></td></tr>';
@@ -114,13 +129,13 @@ else
       print 'Société : '.$objsoc->nom_url.'<br>';
     }
 
-  if ($contact->birthday) {
+  if ($contact->birthday && $contact->birthday > 0) {
     print 'Date de naissance : '.dolibarr_print_date($contact->birthday);
 
     if ($contact->birthday_alert)
-      print ' (alerte active)<br>';
+      print ' (alerte anniversaire active)<br>';
     else
-      print ' (alerte inactive)<br>';
+      print ' (alerte anniversaire inactive)<br>';
   }
   print "<br>";