Remove stupid links

This commit is contained in:
Laurent Destailleur
2011-01-29 18:50:23 +00:00
parent 4e0cca5593
commit 96f5108ac8
2 changed files with 10 additions and 7 deletions

View File

@@ -22,7 +22,7 @@
/** /**
* \file htdocs/contact/index.php * \file htdocs/contact/index.php
* \ingroup societe * \ingroup societe
* \brief Page liste des contacts * \brief Page to list all contacts
* \version $Id$ * \version $Id$
*/ */
@@ -296,7 +296,7 @@ if ($result)
$contactstatic->firstname=''; $contactstatic->firstname='';
$contactstatic->id=$obj->cidp; $contactstatic->id=$obj->cidp;
print $contactstatic->getNomUrl(1,'',20); print $contactstatic->getNomUrl(1,'',20);
print '</td>'; print '</td>';
// Firstname // Firstname
print '<td>'.dol_trunc($obj->firstname,20).'</td>'; print '<td>'.dol_trunc($obj->firstname,20).'</td>';
@@ -337,8 +337,11 @@ if ($result)
// Private/Public // Private/Public
print '<td align="center">'.$contactstatic->LibPubPriv($obj->priv).'</td>'; print '<td align="center">'.$contactstatic->LibPubPriv($obj->priv).'</td>';
// Link export vcard // Links Add action and Export vcard
print '<td align="right">'; print '<td align="right">';
$link='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;backtopage=1&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
print $link;
print ' &nbsp; ';
print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$obj->cidp.'">'; print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$obj->cidp.'">';
print img_picto($langs->trans("VCard"),'vcard.png').' '; print img_picto($langs->trans("VCard"),'vcard.png').' ';
print '</a></td>'; print '</a></td>';

View File

@@ -918,8 +918,8 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=
if (($cid || $socid) && $conf->agenda->enabled && $user->rights->agenda->myactions->create) if (($cid || $socid) && $conf->agenda->enabled && $user->rights->agenda->myactions->create)
{ {
$type='AC_EMAIL'; $type='AC_EMAIL'; $link='';
$link='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>'; if (! empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
$newemail='<table class="nobordernopadding"><tr><td>'.$newemail.' </td><td>&nbsp;'.$link.'</td></tr></table>'; $newemail='<table class="nobordernopadding"><tr><td>'.$newemail.' </td><td>&nbsp;'.$link.'</td></tr></table>';
} }
} }
@@ -1008,9 +1008,9 @@ function dol_print_phone($phone,$country="FR",$cid=0,$socid=0,$addlink=0,$separ=
//if (($cid || $socid) && $conf->agenda->enabled && $user->rights->agenda->myactions->create) //if (($cid || $socid) && $conf->agenda->enabled && $user->rights->agenda->myactions->create)
if ($conf->agenda->enabled && $user->rights->agenda->myactions->create) if ($conf->agenda->enabled && $user->rights->agenda->myactions->create)
{ {
$type='AC_TEL'; $type='AC_TEL'; $link='';
if ($addlink == 'AC_FAX') $type='AC_FAX'; if ($addlink == 'AC_FAX') $type='AC_FAX';
$link='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid?'&amp;contactid='.$cid:'').($socid?'&amp;socid='.$socid:'').'">'.img_object($langs->trans("AddAction"),"calendar").'</a>'; if (! empty($conf->global->AGENDA_ADDACTIONFORPHONE)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid?'&amp;contactid='.$cid:'').($socid?'&amp;socid='.$socid:'').'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
$newphone='<table class="nobordernopadding"><tr><td>'.$newphone.' </td><td>&nbsp;'.$link.'</td></tr></table>'; $newphone='<table class="nobordernopadding"><tr><td>'.$newphone.' </td><td>&nbsp;'.$link.'</td></tr></table>';
} }
} }