mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 16:48:49 +01:00
Merged in patch for UW-mailfolder and added a config option for 8 charater limit on loginids for LDAP
This commit is contained in:
parent
2e86e4415a
commit
e09c174427
@ -24,7 +24,7 @@
|
||||
if ($submit) {
|
||||
$totalerrors = 0;
|
||||
|
||||
if ($phpgw_info["server"]["account_repository"] == "ldap") {
|
||||
if ($phpgw_info["server"]["account_repository"] == "ldap" && ! $allow_long_loginids) {
|
||||
if (strlen($n_loginid) > 8) {
|
||||
$error[$totalerrors++] = lang("The loginid can not be more then 8 characters");
|
||||
}
|
||||
|
@ -14,6 +14,10 @@
|
||||
// Sections of code where taking from slapda http://www.jeremias.net/projects/sldapa by
|
||||
// Jason Jeremias <jason@jeremias.net>
|
||||
|
||||
// This is a local config option, I didn't make it global. Becuase most people will leave it on
|
||||
// and its something that doesn't need to be in the config table.
|
||||
$allow_long_loginids = False;
|
||||
|
||||
|
||||
$ldap = ldap_connect($phpgw_info["server"]["ldap_host"]);
|
||||
|
||||
|
@ -43,7 +43,7 @@
|
||||
if ($submit) {
|
||||
$totalerrors = 0;
|
||||
|
||||
if ($phpgw_info["server"]["account_repository"] == "ldap") {
|
||||
if ($phpgw_info["server"]["account_repository"] == "ldap" && ! $allow_long_loginids) {
|
||||
if (strlen($n_loginid) > 8) {
|
||||
$error[$totalerrors++] = lang("The loginid can not be more then 8 characters");
|
||||
}
|
||||
|
@ -127,6 +127,7 @@
|
||||
<select name="newsettings[imap_server_type]">
|
||||
<option value="Cyrus"<?php echo $selected["Cyrus"]; ?>>Cyrus or Courier</option>
|
||||
<option value="UWash"<?php echo $selected["UWash"]; ?>>UWash</option>
|
||||
<option value="UW-Maildir"<?php echo $selected["UW-Maildir"]; ?>>UW-Maildir</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
|
Loading…
Reference in New Issue
Block a user