--- /tmp/dsg/dolibarr/htdocs/user/notify/github_card.php
+++ /tmp/dsg/dolibarr/htdocs/user/notify/client_card.php
@@ -63,48 +63,52 @@
 // Add a notification

 if ($action == 'add')

 {

-	$error = 0;

-

-	if ($actionid <= 0)

-	{

-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');

-		$error++;

-	}

-

-	if (!$error)

-	{

-		$db->begin();

-

-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";

-		$sql .= " WHERE fk_user=".$id." AND fk_action=".$actionid;

-		if ($db->query($sql))

-		{

-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_action)";

-			$sql .= " VALUES ('".$db->idate($now)."',".$id.",".$actionid.")";

-

-			if (!$db->query($sql))

-			{

-				$error++;

-				dol_print_error($db);

-			}

-		} else {

-			dol_print_error($db);

-		}

-

-		if (!$error)

-		{

-			$db->commit();

-		} else {

-			$db->rollback();

-		}

-	}

+    $error = 0;

+

+    if ($actionid <= 0)

+    {

+	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');

+        $error++;

+    }

+

+    if (!$error)

+    {

+        $db->begin();

+

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";

+        $sql .= " WHERE fk_user=".$id." AND fk_action=".$actionid;

+        if ($db->query($sql))

+        {

+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_action)";

+            $sql .= " VALUES ('".$db->idate($now)."',".$id.",".$actionid.")";

+

+            if (!$db->query($sql))

+            {

+                $error++;

+                dol_print_error($db);

+            }

+        }

+        else

+        {

+            dol_print_error($db);

+        }

+

+        if (!$error)

+        {

+            $db->commit();

+        }

+        else

+        {

+            $db->rollback();

+        }

+    }

 }

 

 // Remove a notification

 if ($action == 'delete')

 {

-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST("actid", "int");

-	$db->query($sql);

+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST("actid", "int");

+    $db->query($sql);

 }

 

 

@@ -127,32 +131,34 @@
 

 if ($result > 0)

 {

-	$langs->load("other");

-

-	$head = user_prepare_head($object);

-

-	print dol_get_fiche_head($head, 'notify', $langs->trans("User"), -1, 'user');

-

-	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';

-

-	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', '', '', 0, '', '', 0, '');

-

-	print '<div class="fichecenter">';

-

-	print '<div class="underbanner clearboth"></div>';

-	print '<table class="border centpercent tableforfield">';

-

-	// Login

-	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';

-	if (!empty($object->ldap_sid) && $object->statut == 0)

-	{

-		print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';

-	} else {

-		print '<td>'.$object->login.'</td>';

-	}

-	print '</tr>'."\n";

-

-	/*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty

+    $langs->load("other");

+

+    $head = user_prepare_head($object);

+

+    dol_fiche_head($head, 'notify', $langs->trans("User"), -1, 'user');

+

+    $linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';

+

+    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', '', '', 0, '', '', 0, '');

+

+    print '<div class="fichecenter">';

+

+    print '<div class="underbanner clearboth"></div>';

+    print '<table class="border centpercent tableforfield">';

+

+    // Login

+    print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';

+    if (!empty($object->ldap_sid) && $object->statut == 0)

+    {

+        print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';

+    }

+    else

+    {

+        print '<td>'.$object->login.'</td>';

+    }

+    print '</tr>'."\n";

+

+    /*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty

     print '<td colspan="3">';

     $nbofrecipientemails=0;

     $notify=new Notify($db);

@@ -164,164 +170,172 @@
     print $nbofrecipientemails;

     print '</td></tr>';*/

 

-	print '</table>';

-

-	print '</div>';

-

-	print dol_get_fiche_end();

-

-	print "\n";

-

-	// Help

-	print '<span class="opacitymedium">';

-	print '<br>'.$langs->trans("NotificationsDesc");

-	print '<br>'.$langs->trans("NotificationsDescUser");

-	print '<br>'.$langs->trans("NotificationsDescContact");

-	print '<br>'.$langs->trans("NotificationsDescGlobal");

-	print '</span>';

-

-	print '<br><br><br>'."\n";

-

-

-	// Add notification form

-	print load_fiche_titre($langs->trans("AddNewNotification"), '', '');

-

-	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">';

-	print '<input type="hidden" name="token" value="'.newToken().'">';

-	print '<input type="hidden" name="action" value="add">';

-

-	$param = "&id=".$id;

-

-	// Line with titles

-	print '<table width="100%" class="noborder">';

-	print '<tr class="liste_titre">';

-	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);

-	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);

-	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);

-	print_liste_field_titre('');

+    print '</table>';

+

+    print '</div>';

+

+    dol_fiche_end();

+

+    print "\n";

+

+    // Help

+    print '<span class="opacitymedium">';

+    print '<br>'.$langs->trans("NotificationsDesc");

+    print '<br>'.$langs->trans("NotificationsDescUser");

+    print '<br>'.$langs->trans("NotificationsDescContact");

+    print '<br>'.$langs->trans("NotificationsDescGlobal");

+    print '</span>';

+

+    print '<br><br><br>'."\n";

+

+

+    // Add notification form

+    print load_fiche_titre($langs->trans("AddNewNotification"), '', '');

+

+    print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">';

+    print '<input type="hidden" name="token" value="'.newToken().'">';

+    print '<input type="hidden" name="action" value="add">';

+

+    $param = "&id=".$id;

+

+    // Line with titles

+    print '<table width="100%" class="noborder">';

+    print '<tr class="liste_titre">';

+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);

+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);

+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);

+    print_liste_field_titre('');

 	print "</tr>\n";

 

 

-	// $listofemails=$object->thirdparty_and_contact_email_array();

-	if ($object->email)

-	{

-		$actions = array();

-

-		// Load array of available notifications

-		$notificationtrigger = new InterfaceNotification($db);

-		$listofnotifiedevents = $notificationtrigger->getListOfManagedEvents();

-

-		foreach ($listofnotifiedevents as $notifiedevent)

-		{

+    // $listofemails=$object->thirdparty_and_contact_email_array();

+    if ($object->email)

+    {

+        $actions = array();

+

+        // Load array of available notifications

+        $notificationtrigger = new InterfaceNotification($db);

+        $listofnotifiedevents = $notificationtrigger->getListOfManagedEvents();

+

+        foreach ($listofnotifiedevents as $notifiedevent)

+        {

  			$label = ($langs->trans("Notify_".$notifiedevent['code']) != "Notify_".$notifiedevent['code'] ? $langs->trans("Notify_".$notifiedevent['code']) : $notifiedevent['label']);

-			$actions[$notifiedevent['rowid']] = $label;

-		}

-		print '<tr class="oddeven nohover"><td>';

-		print $object->getNomUrl(1);

-		if (isValidEmail($object->email))

-		{

-			print ' &lt;'.$object->email.'&gt;';

-		} else {

-			$langs->load("errors");

-			print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $object->email);

-		}

-		print '</td>';

-		print '<td>';

-		print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1);

-		print '</td>';

-		print '<td>';

-		$type = array('email'=>$langs->trans("EMail"));

-		print $form->selectarray("typeid", $type);

-		print '</td>';

-		print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';

-		print '</tr>';

-	} else {

-		print '<tr class="oddeven"><td colspan="4">';

-		print $langs->trans("YouMustAssignUserMailFirst");

-		print '</td></tr>';

-	}

-

-	print '</table>';

-

-	print '</form>';

-	print '<br>';

-

-	// List of notifications enabled for contacts

-	$sql = "SELECT n.rowid, n.type,";

-	$sql .= " a.code, a.label,";

-	$sql .= " c.rowid as userid, c.lastname, c.firstname, c.email";

-	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";

-	$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";

-	$sql .= " ".MAIN_DB_PREFIX."user c";

-	$sql .= " WHERE a.rowid = n.fk_action";

-	$sql .= " AND c.rowid = n.fk_user";

-	$sql .= " AND c.rowid = ".$object->id;

-

-	$resql = $db->query($sql);

-	if ($resql)

-	{

-		$num = $db->num_rows($resql);

-	} else {

-		dol_print_error($db);

-	}

-

-	// List of active notifications

-	print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');

-

-	// Line with titles

-	print '<table width="100%" class="noborder">';

-	print '<tr class="liste_titre">';

-	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);

-	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);

-	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);

-	print_liste_field_titre('', '', '');

-	print '</tr>';

+            $actions[$notifiedevent['rowid']] = $label;

+        }

+        print '<tr class="oddeven nohover"><td>';

+        print $object->getNomUrl(1);

+        if (isValidEmail($object->email))

+        {

+            print ' &lt;'.$object->email.'&gt;';

+        }

+        else

+        {

+            $langs->load("errors");

+            print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $object->email);

+        }

+        print '</td>';

+        print '<td>';

+        print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1);

+        print '</td>';

+        print '<td>';

+        $type = array('email'=>$langs->trans("EMail"));

+        print $form->selectarray("typeid", $type);

+        print '</td>';

+        print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';

+        print '</tr>';

+    }

+    else

+    {

+        print '<tr class="oddeven"><td colspan="4">';

+        print $langs->trans("YouMustAssignUserMailFirst");

+        print '</td></tr>';

+    }

+

+    print '</table>';

+

+    print '</form>';

+    print '<br>';

+

+    // List of notifications enabled for contacts

+    $sql = "SELECT n.rowid, n.type,";

+    $sql .= " a.code, a.label,";

+    $sql .= " c.rowid as userid, c.lastname, c.firstname, c.email";

+    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";

+    $sql .= " ".MAIN_DB_PREFIX."notify_def as n,";

+    $sql .= " ".MAIN_DB_PREFIX."user c";

+    $sql .= " WHERE a.rowid = n.fk_action";

+    $sql .= " AND c.rowid = n.fk_user";

+    $sql .= " AND c.rowid = ".$object->id;

+

+    $resql = $db->query($sql);

+    if ($resql)

+    {

+        $num = $db->num_rows($resql);

+    }

+    else

+    {

+        dol_print_error($db);

+    }

+

+    // List of active notifications

+    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');

+

+    // Line with titles

+    print '<table width="100%" class="noborder">';

+    print '<tr class="liste_titre">';

+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);

+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);

+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);

+    print_liste_field_titre('', '', '');

+    print '</tr>';

 

 	$langs->load("errors");

 	$langs->load("other");

 

-	if ($num)

-	{

-		$i = 0;

-

-		$userstatic = new user($db);

-

-		while ($i < $num)

-		{

-			$obj = $db->fetch_object($resql);

-

-			$userstatic->id = $obj->userid;

-			$userstatic->lastname = $obj->lastname;

-			$userstatic->firstname = $obj->firstname;

-			print '<tr class="oddeven"><td>'.$userstatic->getNomUrl(1);

-			if ($obj->type == 'email')

-			{

-				if (isValidEmail($obj->email))

-				{

-					print ' &lt;'.$obj->email.'&gt;';

-				} else {

-					$langs->load("errors");

-					print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);

-				}

-			}

-			print '</td>';

-			print '<td>';

-			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);

-			print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;

-			print '</td>';

-			print '<td>';

-			if ($obj->type == 'email') print $langs->trans("Email");

-			if ($obj->type == 'sms') print $langs->trans("SMS");

-			print '</td>';

-			print '<td class="right"><a href="card.php?id='.$id.'&amp;action=delete&amp;token='.newToken().'&amp;actid='.$obj->rowid.'">'.img_delete().'</a></td>';

-			print '</tr>';

-			$i++;

-		}

-		$db->free($resql);

+    if ($num)

+    {

+        $i = 0;

+

+        $userstatic = new user($db);

+

+        while ($i < $num)

+        {

+            $obj = $db->fetch_object($resql);

+

+            $userstatic->id = $obj->userid;

+            $userstatic->lastname = $obj->lastname;

+            $userstatic->firstname = $obj->firstname;

+            print '<tr class="oddeven"><td>'.$userstatic->getNomUrl(1);

+            if ($obj->type == 'email')

+            {

+                if (isValidEmail($obj->email))

+                {

+                    print ' &lt;'.$obj->email.'&gt;';

+                }

+                else

+                {

+                    $langs->load("errors");

+                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);

+                }

+            }

+            print '</td>';

+            print '<td>';

+            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);

+            print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;

+            print '</td>';

+            print '<td>';

+            if ($obj->type == 'email') print $langs->trans("Email");

+            if ($obj->type == 'sms') print $langs->trans("SMS");

+            print '</td>';

+            print '<td class="right"><a href="card.php?id='.$id.'&amp;action=delete&amp;actid='.$obj->rowid.'">'.img_delete().'</a></td>';

+            print '</tr>';

+            $i++;

+        }

+        $db->free($resql);

 	}

 

-	// List of notifications enabled for fixed email

-	/*

+    // List of notifications enabled for fixed email

+    /*

     foreach($conf->global as $key => $val)

     {

     	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;

@@ -362,7 +376,7 @@
 		print '<td class="right">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</td>';

 		print '</tr>';

     }*/

-	/*if ($user->admin)

+    /*if ($user->admin)

     {

 	    $var = ! $var;

 		print '<tr class="oddeven"><td colspan="4">';

@@ -370,104 +384,108 @@
 		print '</td></tr>';

     }*/

 

-	print '</table>';

-

-

-	print '<br><br>'."\n";

-

-

-	// List

-	$sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";

-	$sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";

-	$sql .= " a.code, a.label";

-	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";

-	$sql .= " ".MAIN_DB_PREFIX."notify as n";

-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as c ON n.fk_user = c.rowid";

-	$sql .= " WHERE a.rowid = n.fk_action";

-	$sql .= " AND n.fk_user = ".$object->id;

-	$sql .= $db->order($sortfield, $sortorder);

-

-	// Count total nb of records

-	$nbtotalofrecords = '';

-	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))

-	{

-		$result = $db->query($sql);

-		$nbtotalofrecords = $db->num_rows($result);

-		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0

-		{

-			$page = 0;

-			$offset = 0;

-		}

-	}

-

-	$sql .= $db->plimit($limit + 1, $offset);

-

-	$resql = $db->query($sql);

-	if ($resql)

-	{

-		$num = $db->num_rows($resql);

-	} else {

-		dol_print_error($db);

-	}

-

-	$param = '&id='.$object->id;

-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;

-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;

-

-	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';

-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';

-	print '<input type="hidden" name="token" value="'.newToken().'">';

-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';

-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';

-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';

-	print '<input type="hidden" name="page" value="'.$page.'">';

-	print '<input type="hidden" name="id" value="'.$object->id.'">';

-

-	// List of notifications done

-	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);

-

-	// Line with titles

-	print '<table width="100%" class="noborder">';

-	print '<tr class="liste_titre">';

-	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);

-	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);

-	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);

-	//print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);

-	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');

-	print '</tr>';

-

-	if ($num)

-	{

-		$i = 0;

-

-		$userstatic = new User($db);

-

-		while ($i < $num)

-		{

-			$obj = $db->fetch_object($resql);

-

-			print '<tr class="oddeven"><td>';

-			if ($obj->id > 0)

+    print '</table>';

+

+

+    print '<br><br>'."\n";

+

+

+    // List

+    $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";

+    $sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";

+    $sql .= " a.code, a.label";

+    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";

+    $sql .= " ".MAIN_DB_PREFIX."notify as n";

+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as c ON n.fk_user = c.rowid";

+    $sql .= " WHERE a.rowid = n.fk_action";

+    $sql .= " AND n.fk_user = ".$object->id;

+    $sql .= $db->order($sortfield, $sortorder);

+

+    // Count total nb of records

+    $nbtotalofrecords = '';

+    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))

+    {

+        $result = $db->query($sql);

+        $nbtotalofrecords = $db->num_rows($result);

+        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0

+        {

+        	$page = 0;

+        	$offset = 0;

+        }

+    }

+

+    $sql .= $db->plimit($limit + 1, $offset);

+

+    $resql = $db->query($sql);

+    if ($resql)

+    {

+        $num = $db->num_rows($resql);

+    }

+    else

+    {

+        dol_print_error($db);

+    }

+

+    $param = '&id='.$object->id;

+    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;

+    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;

+

+    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';

+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';

+    print '<input type="hidden" name="token" value="'.newToken().'">';

+    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';

+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';

+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';

+    print '<input type="hidden" name="page" value="'.$page.'">';

+    print '<input type="hidden" name="id" value="'.$object->id.'">';

+

+    // List of notifications done

+    print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);

+

+    // Line with titles

+    print '<table width="100%" class="noborder">';

+    print '<tr class="liste_titre">';

+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);

+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);

+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);

+    //print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);

+    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');

+    print '</tr>';

+

+    if ($num)

+    {

+        $i = 0;

+

+        $userstatic = new User($db);

+

+        while ($i < $num)

+        {

+            $obj = $db->fetch_object($resql);

+

+            print '<tr class="oddeven"><td>';

+            if ($obj->id > 0)

+            {

+	            $userstatic->id = $obj->id;

+	            $userstatic->lastname = $obj->lastname;

+	            $userstatic->firstname = $obj->firstname;

+	            print $userstatic->getNomUrl(1);

+	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");

+            }

+            else

 			{

-				$userstatic->id = $obj->id;

-				$userstatic->lastname = $obj->lastname;

-				$userstatic->firstname = $obj->firstname;

-				print $userstatic->getNomUrl(1);

-				print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");

-			} else {

 				print $obj->email;

-			}

-			print '</td>';

-			print '<td>';

-			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);

-			print $label;

-			print '</td>';

-			print '<td>';

-			if ($obj->type == 'email') print $langs->trans("Email");

-			if ($obj->type == 'sms') print $langs->trans("Sms");

-			print '</td>';

-			// TODO Add link to object here for other types

-			/*print '<td>';

+            }

+            print '</td>';

+            print '<td>';

+            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);

+            print $label;

+            print '</td>';

+            print '<td>';

+            if ($obj->type == 'email') print $langs->trans("Email");

+            if ($obj->type == 'sms') print $langs->trans("Sms");

+            print '</td>';

+            // TODO Add link to object here for other types

+            /*print '<td>';

             if ($obj->object_type == 'order')

             {

 				$orderstatic->id=$obj->object_id;

@@ -475,20 +493,22 @@
 				print $orderstatic->getNomUrl(1);

             }

            	print '</td>';*/

-			// print

-			print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';

-			print '</tr>';

-			$i++;

-		}

-		$db->free($resql);

-	} else {

-		print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';

-	}

-

-	print '</table>';

-

-	print '</form>';

-} else dol_print_error('', 'RecordNotFound');

+            // print

+            print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';

+            print '</tr>';

+            $i++;

+        }

+        $db->free($resql);

+    }

+    else {

+    	print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';

+    }

+

+    print '</table>';

+

+    print '</form>';

+}

+else dol_print_error('', 'RecordNotFound');

 

 // End of page

 llxFooter();