--- /tmp/dsg/dolibarr/htdocs/contact/canvas/default/tpl/github_19.0.3_contactcard_edit.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/contact/canvas/default/tpl/client_contactcard_edit.tpl.php
@@ -19 +19,2 @@
-if (empty($conf) || !is_object($conf)) {

+if (empty($conf) || !is_object($conf))

+{

@@ -42 +43 @@
-<input type="hidden" name="token" value="<?php echo newToken(); ?>">

+<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">

@@ -79 +80 @@
-	<td colspan="3"><input name="poste" type="text" class="minwidth200" maxlength="80" value="<?php echo $this->control->tpl['poste']; ?>"></td>

+	<td colspan="3"><input name="poste" type="text" size="50" maxlength="80" value="<?php echo $this->control->tpl['poste']; ?>"></td>

@@ -118 +119 @@
-	<td><input name="email" type="text" class="minwidth200" maxlength="80" value="<?php echo $this->control->tpl['email']; ?>"></td>

+	<td><input name="email" type="text" size="50" maxlength="80" value="<?php echo $this->control->tpl['email']; ?>"></td>

@@ -154,2 +155,2 @@
-	<input type="submit" class="button button-save" name="save" value="<?php echo $langs->trans("Save"); ?>">&nbsp;

-	<input type="submit" class="button button-cancel" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">

+	<input type="submit" class="button" name="save" value="<?php echo $langs->trans("Save"); ?>">&nbsp;

+	<input type="submit" class="button" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">

--- /tmp/dsg/dolibarr/htdocs/contact/canvas/default/tpl/github_19.0.3_contactcard_view.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/contact/canvas/default/tpl/client_contactcard_view.tpl.php
@@ -19 +19,2 @@
-if (empty($conf) || !is_object($conf)) {

+if (empty($conf) || !is_object($conf))

+{

@@ -32,6 +33,2 @@
-if (!empty($this->control->tpl['action_create_user'])) {

-	echo $this->control->tpl['action_create_user'];

-}

-if (!empty($this->control->tpl['action_delete'])) {

-	echo $this->control->tpl['action_delete'];

-} ?>

+if (!empty($this->control->tpl['action_create_user'])) echo $this->control->tpl['action_create_user'];

+if (!empty($this->control->tpl['action_delete'])) echo $this->control->tpl['action_delete']; ?>

@@ -141,2 +138,2 @@
-	if ($user->hasRight('societe', 'contact', 'creer')) {

-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&action=edit&token='.newToken().'&canvas='.$canvas.'">'.$langs->trans('Modify').'</a>';

+	if ($user->rights->societe->contact->creer) {

+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=edit&amp;canvas='.$canvas.'">'.$langs->trans('Modify').'</a>';

@@ -145,2 +142,2 @@
-	if (!$this->control->tpl['user_id'] && $user->hasRight('user', 'user', 'creer')) {

-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&action=create_user&token='.newToken().'&canvas='.$canvas.'">'.$langs->trans("CreateDolibarrLogin").'</a>';

+	if (!$this->control->tpl['user_id'] && $user->rights->user->user->creer) {

+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=create_user&amp;canvas='.$canvas.'">'.$langs->trans("CreateDolibarrLogin").'</a>';

@@ -149,2 +146,2 @@
-	if ($user->hasRight('societe', 'contact', 'supprimer')) {

-		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&action=delete&token='.newToken().'&canvas='.$canvas.'">'.$langs->trans('Delete').'</a>';

+	if ($user->rights->societe->contact->supprimer) {

+		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas.'">'.$langs->trans('Delete').'</a>';