lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing print

Browse Source
This commit is contained in:
Laurent Destailleur 2015-06-20 19:42:07 +02:00
parent 87b4381d47
commit 40d17add22
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/user/card.php
View File

@ -824,7 +824,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
} }
} }
print '</td></tr>'; print '</td></tr>';
if(! empty($conf->api->enabled)) { if(! empty($conf->api->enabled)) {
// API key // API key
$generated_api_key = ''; $generated_api_key = '';
@ -1271,7 +1271,7 @@ else
print "</td>"; print "</td>";
} }
print '</tr>'."\n"; print '</tr>'."\n";
// API key // API key
if(! empty($conf->api->enabled) && $user->admin) { if(! empty($conf->api->enabled) && $user->admin) {
print '<tr><td>'.$langs->trans("ApiKey").'</td>'; print '<tr><td>'.$langs->trans("ApiKey").'</td>';
@ -1280,7 +1280,7 @@ else
print $langs->trans("Hidden"); print $langs->trans("Hidden");
print '<td>'; print '<td>';
} }
// Administrator // Administrator
print '<tr><td>'.$langs->trans("Administrator").'</td><td colspan="2">'; print '<tr><td>'.$langs->trans("Administrator").'</td><td colspan="2">';
if (! empty($conf->multicompany->enabled) && $object->admin && ! $object->entity) if (! empty($conf->multicompany->enabled) && $object->admin && ! $object->entity)
@ -1303,7 +1303,8 @@ else
print $form->textwithpicto($text, $langs->trans("InternalExternalDesc")); print $form->textwithpicto($text, $langs->trans("InternalExternalDesc"));
print '</td><td colspan="2">'; print '</td><td colspan="2">';
$type=$langs->trans("Internal"); $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").')'; if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
print '</td></tr>'."\n"; print '</td></tr>'."\n";
@ -1850,7 +1851,7 @@ else
} }
print $text; print $text;
print "</td></tr>\n"; print "</td></tr>\n";
// API key // API key
if(! empty($conf->api->enabled) && $user->admin) { if(! empty($conf->api->enabled) && $user->admin) {
print '<tr><td>'.$langs->trans("ApiKey").'</td>'; print '<tr><td>'.$langs->trans("ApiKey").'</td>';

4
htdocs/user/index.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* 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) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com> * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* *
@ -168,7 +168,7 @@ if ($result)
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$var=!$var; $var=!$var;
$userstatic->id=$obj->id; $userstatic->id=$obj->rowid;
$userstatic->ref=$obj->label; $userstatic->ref=$obj->label;
$userstatic->login=$obj->login; $userstatic->login=$obj->login;
$userstatic->statut=$obj->statut; $userstatic->statut=$obj->statut;