maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Fix that name is not returned for admins

Browse Source 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
This commit is contained in:
Roman Schmerold (BNoiZe)
2015-02-02 11:01:26 +01:00
parent 6534dbf47b
commit a0b0fa48bb
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/functions/output/function.getCorrectFullUserDetails.php
View File

@@ -26,28 +26,24 @@
* @author Florian Lippert <flo@syscp.org> * @author Florian Lippert <flo@syscp.org>
*/ */
function getCorrectFullUserDetails($userinfo) function getCorrectFullUserDetails($userinfo) {
{
$returnval = ''; $returnval = '';
if(isset($userinfo['firstname']) && isset($userinfo['name']) && isset($userinfo['company'])) if (isset($userinfo['firstname']) && isset($userinfo['name']) && isset($userinfo['company'])) {
{ if ($userinfo['company'] == '') {
if($userinfo['company'] == '')
{
$returnval = $userinfo['name'] . ', ' . $userinfo['firstname']; $returnval = $userinfo['name'] . ', ' . $userinfo['firstname'];
} }
else else {
{ if ($userinfo['name'] != ''
if($userinfo['name'] != '' && $userinfo['firstname'] != '') {
&& $userinfo['firstname'] != '')
{
$returnval = $userinfo['name'] . ', ' . $userinfo['firstname'] . ' | ' . $userinfo['company']; $returnval = $userinfo['name'] . ', ' . $userinfo['firstname'] . ' | ' . $userinfo['company'];
} }
else else {
{
$returnval = $userinfo['company']; $returnval = $userinfo['company'];
} }
} }
} elseif (isset($userinfo['name'])) {
$returnval = $userinfo['name'];
} }
return $returnval; return $returnval;