? auth/cas/auth.php.org
? auth/cas/config.html.org
? auth/db/auth.php.org
? auth/db/config.html.org
? auth/ldap/auth.php.org
? auth/ldap/config.html.org
? lib/authlib.php.org
Index: auth/cas/auth.php
===================================================================
RCS file: /cvsroot/moodle/moodle/auth/cas/auth.php,v
retrieving revision 1.20
diff -r1.20 auth.php
272c272
<             {$config->removeuser = 0; }
---
>             {$config->removeuser = AUTH_REMOVEUSER_KEEP; }
711c711
<                     if ($this->config->removeuser == 2) {
---
>                     if ($this->config->removeuser == AUTH_REMOVEUSER_FULLDELETE) {
717c717
<                     } else if ($this->config->removeuser == 1) {
---
>                     } else if ($this->config->removeuser == AUTH_REMOVEUSER_SUSPEND) {
734c734
<         if (!empty($this->config->removeuser) and $this->config->removeuser == 1) {
---
>         if (!empty($this->config->removeuser) and $this->config->removeuser == AUTH_REMOVEUSER_SUSPEND) {
Index: auth/cas/config.html
===================================================================
RCS file: /cvsroot/moodle/moodle/auth/cas/config.html,v
retrieving revision 1.16
diff -r1.16 config.html
115c115
<         {$config->removeuser = 0; }
---
>         {$config->removeuser = AUTH_REMOVEUSER_KEEP; }
785c785
<        $deleteopt['0'] = get_string('auth_remove_keep','auth');
---
>        $deleteopt[AUTH_REMOVEUSER_KEEP] = get_string('auth_remove_keep','auth');
787c787
<        $deleteopt['1'] = get_string('auth_remove_suspend','auth');
---
>        $deleteopt[AUTH_REMOVEUSER_SUSPEND] = get_string('auth_remove_suspend','auth');
789c789
<        $deleteopt['2'] = get_string('auth_remove_delete','auth');
---
>        $deleteopt[AUTH_REMOVEUSER_FULLDELETE] = get_string('auth_remove_delete','auth');
828c828
< </table>
\ No newline at end of file
---
> </table>
Index: auth/db/auth.php
===================================================================
RCS file: /cvsroot/moodle/moodle/auth/db/auth.php,v
retrieving revision 1.22
diff -r1.22 auth.php
258c258
<                     if ($this->config->removeuser == 2) {
---
>                     if ($this->config->removeuser == AUTH_REMOVEUSER_FULLDELETE) {
264c264
<                     } else if ($this->config->removeuser == 1) {
---
>                     } else if ($this->config->removeuser == AUTH_REMOVEUSER_SUSPEND) {
669c669
<             $config->removeuser = 0;
---
>             $config->removeuser = AUTH_REMOVEUSER_KEEP;
Index: auth/db/config.html
===================================================================
RCS file: /cvsroot/moodle/moodle/auth/db/config.html,v
retrieving revision 1.18
diff -r1.18 config.html
47c47
<         $config->removeuser = 0;
---
>         $config->removeuser = AUTH_REMOVEUSER_KEEP;
259,261c259,261
<        $deleteopt['0'] = get_string('auth_remove_keep','auth');
<        $deleteopt['1'] = get_string('auth_remove_suspend','auth');
<        $deleteopt['2'] = get_string('auth_remove_delete','auth');
---
>        $deleteopt[AUTH_REMOVEUSER_KEEP] = get_string('auth_remove_keep','auth');
>        $deleteopt[AUTH_REMOVEUSER_SUSPEND] = get_string('auth_remove_suspend','auth');
>        $deleteopt[AUTH_REMOVEUSER_FULLDELETE] = get_string('auth_remove_delete','auth');
Index: auth/ldap/auth.php
===================================================================
RCS file: /cvsroot/moodle/moodle/auth/ldap/auth.php,v
retrieving revision 1.47
diff -r1.47 auth.php
658c658
<                     if ($this->config->removeuser == 2) {
---
>                     if ($this->config->removeuser == AUTH_REMOVEUSER_FULLDELETE) {
664c664
<                     } else if ($this->config->removeuser == 1) {
---
>                     } else if ($this->config->removeuser == AUTH_REMOVEUSER_SUSPEND) {
682c682
<         if (!empty($this->config->removeuser) and $this->config->removeuser == 1) {
---
>         if (!empty($this->config->removeuser) and $this->config->removeuser == AUTH_REMOVEUSER_SUSPEND) {
1974c1974
<             {$config->removeuser = 0; }
---
>             {$config->removeuser = AUTH_REMOVEUSER_KEEP; }
Index: auth/ldap/config.html
===================================================================
RCS file: /cvsroot/moodle/moodle/auth/ldap/config.html,v
retrieving revision 1.38
diff -r1.38 config.html
57c57
<         {$config->removeuser = 0; }
---
>         {$config->removeuser = AUTH_REMOVEUSER_KEEP; }
435,437c435,437
<        $deleteopt['0'] = get_string('auth_remove_keep','auth');
<        $deleteopt['1'] = get_string('auth_remove_suspend','auth');
<        $deleteopt['2'] = get_string('auth_remove_delete','auth');
---
>        $deleteopt[AUTH_REMOVEUSER_KEEP] = get_string('auth_remove_keep','auth');
>        $deleteopt[AUTH_REMOVEUSER_SUSPEND] = get_string('auth_remove_suspend','auth');
>        $deleteopt[AUTH_REMOVEUSER_FULLDELETE] = get_string('auth_remove_delete','auth');
Index: lib/authlib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/authlib.php,v
retrieving revision 1.10
diff -r1.10 authlib.php
41c41,44
< 
---
> # MDL-14055
> define('AUTH_REMOVEUSER_KEEP', 0);
> define('AUTH_REMOVEUSER_SUSPEND', 1);
> define('AUTH_REMOVEUSER_FULLDELETE', 2);