From 40d17add2296d42eddf8abf38e6b9fdf90e33179 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Jun 2015 19:42:07 +0200
Subject: [PATCH] Fix missing print

---
 htdocs/user/card.php  | 11 ++++++-----
 htdocs/user/index.php |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index a869097f629..5bf47eb19e0 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -824,7 +824,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
         }
     }
     print '</td></tr>';
-    
+
     if(! empty($conf->api->enabled)) {
         // API key
         $generated_api_key = '';
@@ -1271,7 +1271,7 @@ else
                 print "</td>";
             }
             print '</tr>'."\n";
-            
+
             // API key
             if(! empty($conf->api->enabled) && $user->admin) {
                 print '<tr><td>'.$langs->trans("ApiKey").'</td>';
@@ -1280,7 +1280,7 @@ else
                     print $langs->trans("Hidden");
                 print '<td>';
             }
-            
+
             // Administrator
             print '<tr><td>'.$langs->trans("Administrator").'</td><td colspan="2">';
             if (! empty($conf->multicompany->enabled) && $object->admin && ! $object->entity)
@@ -1303,7 +1303,8 @@ else
             print $form->textwithpicto($text, $langs->trans("InternalExternalDesc"));
             print '</td><td colspan="2">';
             $type=$langs->trans("Internal");
-            if ($object->societe_id) $type=$langs->trans("External");
+            if ($object->societe_id > 0) $type=$langs->trans("External");
+			print $type;
             if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
             print '</td></tr>'."\n";
 
@@ -1850,7 +1851,7 @@ else
             }
             print $text;
             print "</td></tr>\n";
-            
+
             // API key
             if(! empty($conf->api->enabled) && $user->admin) {
                 print '<tr><td>'.$langs->trans("ApiKey").'</td>';
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index ed413dd571f..cb2e5617f08 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2015      Alexandre Spangaro   <alexandre.spangaro@gmail.com>
  *
@@ -168,7 +168,7 @@ if ($result)
         $obj = $db->fetch_object($result);
         $var=!$var;
 
-		$userstatic->id=$obj->id;
+		$userstatic->id=$obj->rowid;
 		$userstatic->ref=$obj->label;
 		$userstatic->login=$obj->login;
 		$userstatic->statut=$obj->statut;