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

NEW Add key __USER_REMOTE_IP__ into available substitution variables

Browse Source
This commit is contained in:
Laurent Destailleur 2018-01-26 17:00:14 +01:00
parent eb3eee9b6a
commit 6cae36cc33
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/lib/functions.lib.php
View File

@ -5620,7 +5620,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
'__USER_LASTNAME__' => (string) $user->lastname, '__USER_LASTNAME__' => (string) $user->lastname,
'__USER_FIRSTNAME__' => (string) $user->firstname, '__USER_FIRSTNAME__' => (string) $user->firstname,
'__USER_FULLNAME__' => (string) $user->getFullName($outputlangs), '__USER_FULLNAME__' => (string) $user->getFullName($outputlangs),
'__USER_SUPERVISOR_ID__' => (string) $user->fk_user '__USER_SUPERVISOR_ID__' => (string) $user->fk_user,
'__USER_REMOTE_IP__' => (string) $_SERVER['REMOTE_ADDR']
) )
); );
} }

4
htdocs/langs/en_US/other.lang
View File

@ -227,7 +227,9 @@ Chart=Chart
PassEncoding=Password encoding PassEncoding=Password encoding
PermissionsAdd=Permissions added PermissionsAdd=Permissions added
PermissionsDelete=Permissions removed PermissionsDelete=Permissions removed
YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
YourPasswordHasBeenReset=Your password has been reset successfully
ApplicantIpAddress=IP address of applicant
##### Export ##### ##### Export #####
ExportsArea=Exports area ExportsArea=Exports area
AvailableFormats=Available formats AvailableFormats=Available formats

2
htdocs/langs/en_US/users.lang
View File

@ -44,7 +44,9 @@ NewGroup=New group
CreateGroup=Create group CreateGroup=Create group
RemoveFromGroup=Remove from group RemoveFromGroup=Remove from group
PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>. PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
PasswordChangeRequest=Request to change password for <b>%s</b>
PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>. PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
ConfirmPasswordReset=Confirm password reset
MenuUsersAndGroups=Users & Groups MenuUsersAndGroups=Users & Groups
LastGroupsCreated=Latest %s created groups LastGroupsCreated=Latest %s created groups
LastUsersCreated=Latest %s users created LastUsersCreated=Latest %s users created