extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 17:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged in patch for UW-mailfolder and added a config option for 8 charater limit on loginids for LDAP

Browse Source
This commit is contained in:
jengo 2000-12-06 11:19:59 +00:00
parent 2e86e4415a
commit e09c174427
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/editaccount.php
View File

@ -24,7 +24,7 @@
if ($submit) { if ($submit) {
$totalerrors = 0; $totalerrors = 0;
if ($phpgw_info["server"]["account_repository"] == "ldap") { if ($phpgw_info["server"]["account_repository"] == "ldap" && ! $allow_long_loginids) {
if (strlen($n_loginid) > 8) { if (strlen($n_loginid) > 8) {
$error[$totalerrors++] = lang("The loginid can not be more then 8 characters"); $error[$totalerrors++] = lang("The loginid can not be more then 8 characters");
} }

4
admin/inc/accounts_ldap.inc.php
View File

@ -14,6 +14,10 @@
// Sections of code where taking from slapda http://www.jeremias.net/projects/sldapa by // Sections of code where taking from slapda http://www.jeremias.net/projects/sldapa by
// Jason Jeremias <jason@jeremias.net> // 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"]); $ldap = ldap_connect($phpgw_info["server"]["ldap_host"]);

2
admin/newaccount.php
View File

@ -43,7 +43,7 @@
if ($submit) { if ($submit) {
$totalerrors = 0; $totalerrors = 0;
if ($phpgw_info["server"]["account_repository"] == "ldap") { if ($phpgw_info["server"]["account_repository"] == "ldap" && ! $allow_long_loginids) {
if (strlen($n_loginid) > 8) { if (strlen($n_loginid) > 8) {
$error[$totalerrors++] = lang("The loginid can not be more then 8 characters"); $error[$totalerrors++] = lang("The loginid can not be more then 8 characters");
} }

1
setup/config.php
View File

@ -127,6 +127,7 @@
<select name="newsettings[imap_server_type]"> <select name="newsettings[imap_server_type]">
<option value="Cyrus"<?php echo $selected["Cyrus"]; ?>>Cyrus or Courier</option> <option value="Cyrus"<?php echo $selected["Cyrus"]; ?>>Cyrus or Courier</option>
<option value="UWash"<?php echo $selected["UWash"]; ?>>UWash</option> <option value="UWash"<?php echo $selected["UWash"]; ?>>UWash</option>
<option value="UW-Maildir"<?php echo $selected["UW-Maildir"]; ?>>UW-Maildir</option>
</select> </select>
</td> </td>
</tr> </tr>