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

FIX "Only variables can be passed by reference"

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-28 03:14:27 +01:00
parent 856793b187
commit d68a737f14
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/projet/activity/perday.php
View File

@ -222,7 +222,8 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
$listofprojcontact = $project->liste_type_contact('internal');
if (count($listofprojcontact)) {
$typeforprojectcontact = reset(array_keys($listofprojcontact));
$tmparray = array_keys($listofprojcontact);
$typeforprojectcontact = reset($tmparray);
$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
}
}

3
htdocs/projet/activity/permonth.php
View File

@ -167,7 +167,8 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
$listofprojcontact = $project->liste_type_contact('internal');
if (count($listofprojcontact)) {
$typeforprojectcontact = reset(array_keys($listofprojcontact));
$tmparray = array_keys($listofprojcontact);
$typeforprojectcontact = reset($tmparray);
$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
}
}

3
htdocs/projet/activity/perweek.php
View File

@ -229,7 +229,8 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
$listofprojcontact = $project->liste_type_contact('internal');
if (count($listofprojcontact)) {
$typeforprojectcontact = reset(array_keys($listofprojcontact));
$tmparray = array_keys($listofprojcontact);
$typeforprojectcontact = reset($tmparray);
$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
}
}

25
htdocs/user/vcard.php
View File

@ -99,18 +99,23 @@ if ($company->id) {
} elseif (empty(trim($user2->email))) {
// when user e-mail is empty, use only company e-mail
$v->setEmail($company->email, "TYPE=WORK");
} elseif (strtolower(end(explode("@", $user2->email))) == strtolower(end(explode("@", $company->email)))) {
// when e-mail domain of user and company are the same, use user e-mail at first (and company e-mail at second)
$v->setEmail($user2->email, "TYPE=WORK");
// support by Microsoft Outlook (2019 and possible earlier)
$v->setEmail($company->email, 'INTERNET');
} else {
// when e-mail of user and company complete different use company e-mail at first (and user e-mail at second)
$v->setEmail($company->email, "TYPE=WORK");
$tmpuser2 = explode("@", trim($user2->email));
$tmpcompany = explode("@", trim($company->email));
// support by Microsoft Outlook (2019 and possible earlier)
$v->setEmail($user2->email, 'INTERNET');
if (strtolower(end($tmpuser2)) == strtolower(end($tmpcompany))) {
// when e-mail domain of user and company are the same, use user e-mail at first (and company e-mail at second)
$v->setEmail($user2->email, "TYPE=WORK");
// support by Microsoft Outlook (2019 and possible earlier)
$v->setEmail($company->email, 'INTERNET');
} else {
// when e-mail of user and company complete different use company e-mail at first (and user e-mail at second)
$v->setEmail($company->email, "TYPE=WORK");
// support by Microsoft Outlook (2019 and possible earlier)
$v->setEmail($user2->email, 'INTERNET');
}
}
// Si user lie a un tiers non de type "particulier"