Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mail use fullname #71

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Mail use fullname #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a1b7edb
Merge pull request #1 from KircheNeuenburg/mail_from_ldap
Dec 14, 2016
2bacd0c
Merge pull request #2 from KircheNeuenburg/mail_signature
Dec 14, 2016
7640043
Merge pull request #3 from ltb-project/master
Dec 25, 2016
6e5524b
Select display name for mail with mail_display_name.
Jan 5, 2017
bcee4fb
changed a comment.
Jan 5, 2017
c04ebcd
Added bugfix, now handles also multiple values for ldap attributes
Jan 5, 2017
dd070b7
Merge branch 'master' into mail_use_realname
coudot Jul 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions conf/config.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
$ldap_base = "dc=example,dc=com";
$ldap_login_attribute = "uid";
$ldap_fullname_attribute = "cn";
$ldap_givenname_attribue = "givenName";
$ldap_filter = "(&(objectClass=person)($ldap_login_attribute={login}))";

# Active Directory mode
Expand Down Expand Up @@ -172,6 +173,11 @@
$mail_from = "[email protected]";
$mail_from_name = "Self Service Password";
$mail_signature = "";
# Which display name is used in mails?
# login (default)
# fullname
# givenname
$mail_display_name = "login";
# Notify users anytime their password is changed
$notify_on_change = false;
# PHPMailer configuration (see https://github.com/PHPMailer/PHPMailer)
Expand Down
28 changes: 26 additions & 2 deletions pages/change.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
$oldpassword = "";
$ldap = "";
$userdn = "";
$display_name_lookup = "";
if (!isset($pwd_forbidden_chars)) { $pwd_forbidden_chars=""; }
$mail = "";

Expand Down Expand Up @@ -123,12 +124,35 @@
error_log("LDAP - User $login not found");
} else {

# Get user email for notification
# Get user email and names for notification

if ( $notify_on_change ) {
$mailValues = ldap_get_values($ldap, $entry, $mail_attribute);
$login_values = ldap_get_values($ldap, $entry, $ldap_login_attribute);
$givenname_values = ldap_get_values($ldap, $entry, $ldap_givenname_attribute);
$fullname_values = ldap_get_values($ldap, $entry, $ldap_fullname_attribute);

if ( $mailValues["count"] > 0 ) {
$mail = $mailValues[0];
}
if ( $login_values["count"] > 0 ) {
$display_name_lookup["login"] = $login_values[0];
} else {
# fallback to login provided by user
$display_name_lookup["login"] = $login;
}
if ( $givenname_values["count"] > 0 ) {
$display_name_lookup["givenname"] = $givenname_values[0];
} else {
# fallback to login provided by user
$display_name_lookup["givenname"] = $login;
}
if ( $fullname_values["count"] > 0 ) {
$display_name_lookup["fullname"] = $fullname_values[0];
} else {
# fallback to login provided by user
$display_name_lookup["fullname"] = $login;
}
}

# Check objectClass to allow samba and shadow updates
Expand Down Expand Up @@ -305,7 +329,7 @@

# Notify password change
if ($mail and $notify_on_change) {
$data = array( "login" => $login, "mail" => $mail, "password" => $newpassword);
$data = array( "login" => $display_name_lookup[$mail_display_name], "mail" => $mail, "password" => $newpassword);
if ( !send_mail($mailer, $mail, $mail_from, $mail_from_name, $messages["changesubject"], $messages["changemessage"].$mail_signature, $data) ) {
error_log("Error while sending change email to $mail (user $login)");
}
Expand Down
27 changes: 25 additions & 2 deletions pages/resetbyquestions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
$confirmpassword = "";
$ldap = "";
$userdn = "";
$display_name_lookup = "";
if (!isset($pwd_forbidden_chars)) { $pwd_forbidden_chars=""; }
$mail = "";

Expand Down Expand Up @@ -134,12 +135,34 @@
$shadow_options['update_shadowExpire'] = false;
}

# Get user email for notification
# Get user email and names for notification
if ( $notify_on_change ) {
$mailValues = ldap_get_values($ldap, $entry, $mail_attribute);
$login_values = ldap_get_values($ldap, $entry, $ldap_login_attribute);
$givenname_values = ldap_get_values($ldap, $entry, $ldap_givenname_attribute);
$fullname_values = ldap_get_values($ldap, $entry, $ldap_fullname_attribute);

if ( $mailValues["count"] > 0 ) {
$mail = $mailValues[0];
}
if ( $login_values["count"] > 0 ) {
$display_name_lookup["login"] = $login_values[0];
} else {
# fallback to login provided by user
$display_name_lookup["login"] = $login;
}
if ( $givenname_values["count"] > 0 ) {
$display_name_lookup["givenname"] = $givenname_values[0];
} else {
# fallback to login provided by user
$display_name_lookup["givenname"] = $login;
}
if ( $fullname_values["count"] > 0 ) {
$display_name_lookup["fullname"] = $fullname_values[0];
} else {
# fallback to login provided by user
$display_name_lookup["fullname"] = $login;
}
}

# Get question/answer values
Expand Down Expand Up @@ -292,7 +315,7 @@

# Notify password change
if ($mail and $notify_on_change) {
$data = array( "login" => $login, "mail" => $mail, "password" => $newpassword);
$data = array( "login" => $display_name_lookup[$mail_display_name], "mail" => $mail, "password" => $newpassword);
if ( !send_mail($mailer, $mail, $mail_from, $mail_from_name, $messages["changesubject"], $messages["changemessage"].$mail_signature, $data) ) {
error_log("Error while sending change email to $mail (user $login)");
}
Expand Down
28 changes: 26 additions & 2 deletions pages/resetbytoken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
$confirmpassword = "";
$ldap = "";
$userdn = "";
$display_name_lookup = "";

if (!isset($pwd_forbidden_chars)) { $pwd_forbidden_chars=""; }
$mail = "";

Expand Down Expand Up @@ -170,12 +172,34 @@
$shadow_options['update_shadowExpire'] = false;
}

# Get user email for notification
# Get user email and names for notification
if ( $notify_on_change ) {
$mailValues = ldap_get_values($ldap, $entry, $mail_attribute);
$login_values = ldap_get_values($ldap, $entry, $ldap_login_attribute);
$givenname_values = ldap_get_values($ldap, $entry, $ldap_givenname_attribute);
$fullname_values = ldap_get_values($ldap, $entry, $ldap_fullname_attribute);

if ( $mailValues["count"] > 0 ) {
$mail = $mailValues[0];
}
if ( $login_values["count"] > 0 ) {
$display_name_lookup["login"] = $login_values[0];
} else {
# fallback to login provided by user
$display_name_lookup["login"] = $login;
}
if ( $givenname_values["count"] > 0 ) {
$display_name_lookup["givenname"] = $givenname_values[0];
} else {
# fallback to login provided by user
$display_name_lookup["givenname"] = $login;
}
if ( $fullname_values["count"] > 0 ) {
$display_name_lookup["fullname"] = $fullname_values[0];
} else {
# fallback to login provided by user
$display_name_lookup["fullname"] = $login;
}
}

}}}}
Expand Down Expand Up @@ -301,7 +325,7 @@

# Notify password change
if ($mail and $notify_on_change) {
$data = array( "login" => $login, "mail" => $mail, "password" => $newpassword);
$data = array( "login" => $display_name_lookup[$mail_display_name], "mail" => $mail, "password" => $newpassword);
if ( !send_mail($mailer, $mail, $mail_from, $mail_from_name, $messages["changesubject"], $messages["changemessage"].$mail_signature, $data) ) {
error_log("Error while sending change email to $mail (user $login)");
}
Expand Down
27 changes: 26 additions & 1 deletion pages/sendtoken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
$ldap = "";
$userdn = "";
$token = "";
$display_name_lookup = "";

if (!$mail_address_use_ldap) {
if (isset($_POST["mail"]) and $_POST["mail"]) { $mail = $_POST["mail"]; }
Expand Down Expand Up @@ -140,6 +141,30 @@
}
}

# Get user names for email
$login_values = ldap_get_values($ldap, $entry, $ldap_login_attribute);
$givenname_values = ldap_get_values($ldap, $entry, $ldap_givenname_attribute);
$fullname_values = ldap_get_values($ldap, $entry, $ldap_fullname_attribute);

if ( $login_values["count"] > 0 ) {
$display_name_lookup["login"] = $login_values[0];
} else {
# fallback to login provided by user
$display_name_lookup["login"] = $login;
}
if ( $givenname_values["count"] > 0 ) {
$display_name_lookup["givenname"] = $givenname_values[0];
} else {
# fallback to login provided by user
$display_name_lookup["givenname"] = $login;
}
if ( $fullname_values["count"] > 0 ) {
$display_name_lookup["fullname"] = $fullname_values[0];
} else {
# fallback to login provided by user
$display_name_lookup["fullname"] = $login;
}

if (!$match) {
if (!$mail_address_use_ldap) {
$result = "mailnomatch";
Expand Down Expand Up @@ -207,7 +232,7 @@
error_log("Send reset URL $reset_url");
}

$data = array( "login" => $login, "mail" => $mail, "url" => $reset_url ) ;
$data = array( "login" => $display_name_lookup[$mail_display_name], "mail" => $mail, "url" => $reset_url ) ;

# Send message
if ( send_mail($mailer, $mail, $mail_from, $mail_from_name, $messages["resetsubject"], $messages["resetmessage"].$mail_signature, $data) ) {
Expand Down