diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 2c37bcd9e42..9ef2ff7c7e4 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -70,7 +70,7 @@ $hookmanager->initHooks(array('admin'));
// Put here declaration of dictionaries properties
// Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,6,0,10,23,12,13,0,14,0,7,17,0,22,20,18,21,0,15,0,24,0,25,0,26);
+$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,6,0,10,23,12,13,0,14,0,7,17,24,0,22,20,18,21,0,15,0,25,0,26);
// Name of SQL tables of dictionaries
$tabname=array();
@@ -832,7 +832,7 @@ if ($id)
$fieldlist=explode(',',$tabfield[$id]);
// Line for title
- print '
';
+ print '
';
foreach ($fieldlist as $field => $value)
{
// Determine le nom du champ par rapport aux noms possibles
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index aa34c83523c..27841434f5a 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004-2014 Laurent Destailleur
+ * Copyright (C) 2004-2015 Laurent Destailleur
* Copyright (C) 2005 Simon TOSSER
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2010-2013 Juanjo Menent
@@ -671,7 +671,7 @@ if ($action == 'create')
}
// Assigned to
- print '
'.$langs->trans("ActionAffectedTo").'
';
+ print '
'.$langs->trans("ActionAffectedTo").'
';
$listofuserid=array();
if (empty($donotclearsession))
{
@@ -727,7 +727,7 @@ if ($action == 'create')
print '
';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 0f81a861a81..95215cc7d41 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1781,26 +1781,19 @@ class User extends CommonObject
/**
- * Return a link to the user card (with optionaly the picto)
- * Use this->id,this->lastname, this->firstname
+ * Return a link with photo
+ * Use this->id,this->photo
*
- * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
- * @param string $option On what the link point to
- * @param integer $infologin Add connection info to the tooltip
- * @param integer $notooltip 1=Disable tooltip
- * @param int $maxlen Max length of visible user name
- * @return string String with URL
+ * @param int $width Width of image
+ * @param int $height Height of image
+ * @return string String with URL link
*/
- function getPhotoUrl($with=0)
+ function getPhotoUrl($width, $height)
{
- global $form;
-
- if (! is_object($form)) $form=new Form($this->db);
-
$result='';
$result.='';
- $result.=$form->showphoto('userphoto', $this, ($with?$with:16));
+ $result.=Form::showphoto('userphoto', $this, $width, $height);
$result.='';
return $result;
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 454ac080cbc..646754668bd 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -44,7 +44,7 @@ if ($user->id == $id) // A user can always read its own card
}
$result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
-// If user is not user read and no permission to read other users, we stop
+// If user is not user that read and no permission to read other users, we stop
if (($fuser->id != $user->id) && (! $user->rights->user->user->lire))
accessforbidden();
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 2fd827fb639..af96d8149e8 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -112,8 +112,8 @@ if ($id)
print '
\n";
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index a1c7fbff5ea..2a5a8422231 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -1,24 +1,24 @@
* Copyright (C) 2002-2003 Jean-Louis Bergamo
-* Copyright (C) 2004-2012 Laurent Destailleur
-* Copyright (C) 2004 Eric Seigne
-* Copyright (C) 2005-2012 Regis Houssin
-* Copyright (C) 2012 Juanjo Menent
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see .
-*/
+ * Copyright (C) 2004-2015 Laurent Destailleur
+ * Copyright (C) 2004 Eric Seigne
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2012 Juanjo Menent
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
/**
* \file htdocs/user/perms.php
@@ -256,19 +256,19 @@ else
print '
.'?s='.$width.'&d='.urlencode(dol_buildpath($nophoto,2)).' "Photo Gravatar.com - email '.$email.'")
'; // gravatar need md5 hash
+ $ret.='