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

auto-format all files; add table-definitions to test-bootstrap file

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-21 12:24:07 +01:00
parent 1ff784198c
commit 97b5439c0d
209 changed files with 6840 additions and 4534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/functions/output/function.getCorrectUserSalutation.php
View File

@@ -20,26 +20,22 @@
/**
* Returns correct user salutation, either "Firstname Name" or "Company"
*
* @param array An array with keys firstname, name and company
* @param
* array An array with keys firstname, name and company
* @return string The correct salutation
*
*
* @author Florian Lippert <flo@syscp.org>
*/
function getCorrectUserSalutation($userinfo)
{
$returnval = '';
if(isset($userinfo['firstname']) && isset($userinfo['name']) && isset($userinfo['company']))
{
if (isset($userinfo['firstname']) && isset($userinfo['name']) && isset($userinfo['company'])) {
// Always prefer firstname name
if($userinfo['company'] != '' && $userinfo['name'] == '' && $userinfo['firstname'] == '')
{
if ($userinfo['company'] != '' && $userinfo['name'] == '' && $userinfo['firstname'] == '') {
$returnval = $userinfo['company'];
}
else
{
} else {
$returnval = $userinfo['firstname'] . ' ' . $userinfo['name'];
}
}