From cd4c81d15de4770556b59fd9138ba7389bcfff7f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 Sep 2014 16:31:37 +0200
Subject: [PATCH] Uniformize code.

---
 htdocs/adherents/agenda.php     | 20 +++++++++++++++++++-
 htdocs/comm/action/peruser.php  | 15 ++++++++-------
 htdocs/contact/card.php         | 17 ++++++++++++++++-
 htdocs/core/lib/company.lib.php | 20 --------------------
 htdocs/societe/agenda.php       | 17 ++++++++++++++++-
 5 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index 501b5ed87d1..343c8c4a628 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -44,6 +44,8 @@ $object = new Adherent($db);
 $result=$object->fetch($id);
 if ($result > 0)
 {
+	$object->fetch_thirdparty();
+
     $adht = new AdherentType($db);
     $result=$adht->fetch($object->typeid);
 }
@@ -146,7 +148,23 @@ if ($object->id > 0)
 
     print '<br>';
 
-    print load_fiche_titre($langs->trans("ActionsOnMember"),'','');
+    $out='';
+
+    /*$objthirdparty=$object->thirdparty;
+    $objcon=new stdClass();
+
+    $permok=$user->rights->agenda->myactions->create;
+    if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
+    {
+        $out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+        if (get_class($objthirdparty) == 'Societe') $out.='&amp;socid='.$objthirdparty->id;
+        $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1">';
+    	$out.=$langs->trans("AddAnAction").' ';
+    	$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+    	$out.="</a>";
+	}*/
+
+    print load_fiche_titre($langs->trans("ActionsOnMember"),$out,'');
 
     // List of todo actions
     show_actions_todo($conf,$langs,$db,$object);
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index a8629f57d68..e7e84e08c7d 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -601,6 +601,7 @@ else
 $colorsbytype=array();
 
 // Loop on each user to show calendar
+$todayarray=dol_getdate($now,'fast');
 $sav = $tmpday;
 $showheader = true;
 foreach ($usernames as $username)
@@ -629,11 +630,10 @@ foreach ($usernames as $username)
 		$style='cal_current_month';
 		if ($iter_day == 6) $style.=' cal_other_month';
 		$today=0;
-		$todayarray=dol_getdate($now,'fast');
-		if ($todayarray['mday']==$tmpday && $todayarray['mon']==$month && $todayarray['year']==$year) $today=1;
+		if ($todayarray['mday']==$tmpday && $todayarray['mon']==$tmpmonth && $todayarray['year']==$tmpyear) $today=1;
 		if ($today) $style='cal_today_peruser';
 
-		show_day_events2($username, $tmpday, $month, $year, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype);
+		show_day_events2($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype);
 
 		$i++;
 	}
@@ -642,7 +642,6 @@ foreach ($usernames as $username)
 }
 
 echo "</table>\n";
-var_dump($eventarray);exit;
 
 // Add js code to manage click on a box
 print '<script type="text/javascript" language="javascript">
@@ -731,9 +730,11 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		$annee = date('Y',$daykey);
 		$mois = date('m',$daykey);
 		$jour = date('d',$daykey);
-		if ($day==$jour && $month==$mois && $year==$annee)
+		//print $annee.'-'.$mois.'-'.$jour.' '.$year.'-'.$month.'-'.$day."<br>\n";
+
+		if ($day==$jour && $month==$mois && $year==$annee)	// Is it the day we are looking for when calling function ?
 		{
-			//Tout les events à la même date :
+			// Scan all event for this date
 			foreach ($eventarray[$daykey] as $index => $event)
 			{
 				$keysofuserassigned=array_keys($event->userassigned);
@@ -836,7 +837,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 				$i++;
 			}
 
-			break;
+			break;	// We found the date we were looking for. No need to search anymore.
 		}
 	}
 
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index f4d42dbaca0..2df9986dba0 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1110,7 +1110,22 @@ else
 
 		if (! empty($conf->agenda->enabled))
 		{
-        	print load_fiche_titre($langs->trans("TasksHistoryForThisContact"),'','');
+			$objthirdparty=$objsoc;
+			$objcon=$object;
+
+		    $out='';
+		    $permok=$user->rights->agenda->myactions->create;
+		    if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
+		    {
+		        $out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		        if (get_class($objthirdparty) == 'Societe') $out.='&amp;socid='.$objthirdparty->id;
+		        $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1">';
+		    	$out.=$langs->trans("AddAnAction").' ';
+		    	$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		    	$out.="</a>";
+			}
+
+        	print load_fiche_titre($langs->trans("TasksHistoryForThisContact"),$out,'');
 
         	print show_actions_todo($conf,$langs,$db,$objsoc,$object);
 
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index d6e9a7276e0..5d24493724e 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -914,16 +914,6 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0)
         if (get_class($object) == 'Societe') $out.='</a>';
         $out.='</td>';
         $out.='<td colspan="5" align="right">';
-		$permok=$user->rights->agenda->myactions->create;
-        if (($object->id || $objcon->id) && $permok)
-		{
-            $out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-            if (get_class($object) == 'Societe') $out.='&amp;socid='.$object->id;
-            $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1">';
-    		$out.=$langs->trans("AddAnAction").' ';
-    		$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    		$out.="</a>";
-		}
         $out.='</td>';
         $out.='</tr>';
 
@@ -1208,16 +1198,6 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
         if (get_class($object) == 'Societe') $out.='</a>';
         $out.='</td>';
         $out.='<td colspan="5" align="right">';
-		$permok=$user->rights->agenda->myactions->create;
-        if ((! empty($object->id) || ! empty($objcon->id)) && $permok)
-		{
-            $out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-            if (get_class($object) == 'Societe') $out.='&amp;socid='.$object->id;
-            $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1">';
-    		$out.=$langs->trans("AddAnAction").' ';
-    		$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    		$out.="</a>";
-		}
         $out.='</td>';
         $out.='</tr>';
 
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 742039176b8..8d731875442 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -171,7 +171,22 @@ if ($socid)
 
     print '<br>';
 
-    print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
+    $objthirdparty=$soc;
+    $objcon=new stdClass();
+
+    $out='';
+    $permok=$user->rights->agenda->myactions->create;
+    if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
+    {
+        $out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+        if (get_class($objthirdparty) == 'Societe') $out.='&amp;socid='.$objthirdparty->id;
+        $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1">';
+    	$out.=$langs->trans("AddAnAction").' ';
+    	$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+    	$out.="</a>";
+	}
+
+    print load_fiche_titre($langs->trans("ActionsOnCompany"),$out,'');
 
     // List of todo actions
     show_actions_todo($conf,$langs,$db,$soc);