diff options
| author | Michael Hamann <michael@content-space.de> | 2011-01-23 20:33:32 +0100 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2011-01-23 20:33:32 +0100 |
| commit | fc756e0d4d88b37c01a9155e675a549430b00593 (patch) | |
| tree | 7adc185d2c349788961ff7cb8f9bcb25afbce485 /inc/auth | |
| parent | 8605afb1b4e2a6a9e11e21a7bf0775bbb0d5af03 (diff) | |
| parent | 820923f1328bcfe6002831570eb65238411c5b70 (diff) | |
| download | rpg-fc756e0d4d88b37c01a9155e675a549430b00593.tar.gz rpg-fc756e0d4d88b37c01a9155e675a549430b00593.tar.bz2 | |
Merge branch 'master' into indexer_improvements
Conflicts:
inc/fulltext.php
inc/indexer.php
lib/exe/indexer.php
Diffstat (limited to 'inc/auth')
| -rw-r--r-- | inc/auth/ad.class.php | 4 | ||||
| -rw-r--r-- | inc/auth/basic.class.php | 2 | ||||
| -rw-r--r-- | inc/auth/ldap.class.php | 2 | ||||
| -rw-r--r-- | inc/auth/mysql.class.php | 2 | ||||
| -rw-r--r-- | inc/auth/pgsql.class.php | 2 | ||||
| -rw-r--r-- | inc/auth/plain.class.php | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php index 90fe0266b..5478d64b9 100644 --- a/inc/auth/ad.class.php +++ b/inc/auth/ad.class.php @@ -126,7 +126,7 @@ class auth_ad extends auth_basic { * at least these fields: * * name string full name of the user - * mail string email addres of the user + * mail string email address of the user * grps array list of groups the user is in * * This LDAP specific function returns the following @@ -296,4 +296,4 @@ class auth_ad extends auth_basic { } } -//Setup VIM: ex: et ts=4 enc=utf-8 : +//Setup VIM: ex: et ts=4 : diff --git a/inc/auth/basic.class.php b/inc/auth/basic.class.php index fa38970ae..c7e7031bf 100644 --- a/inc/auth/basic.class.php +++ b/inc/auth/basic.class.php @@ -400,4 +400,4 @@ class auth_basic { } } -//Setup VIM: ex: et ts=2 enc=utf-8 : +//Setup VIM: ex: et ts=2 : diff --git a/inc/auth/ldap.class.php b/inc/auth/ldap.class.php index 7f1eec187..420043238 100644 --- a/inc/auth/ldap.class.php +++ b/inc/auth/ldap.class.php @@ -457,4 +457,4 @@ class auth_ldap extends auth_basic { } } -//Setup VIM: ex: et ts=4 enc=utf-8 : +//Setup VIM: ex: et ts=4 : diff --git a/inc/auth/mysql.class.php b/inc/auth/mysql.class.php index ca607ced5..dbdfe5fda 100644 --- a/inc/auth/mysql.class.php +++ b/inc/auth/mysql.class.php @@ -936,4 +936,4 @@ class auth_mysql extends auth_basic { } } -//Setup VIM: ex: et ts=2 enc=utf-8 : +//Setup VIM: ex: et ts=2 : diff --git a/inc/auth/pgsql.class.php b/inc/auth/pgsql.class.php index 8e68e865e..cf8bf7600 100644 --- a/inc/auth/pgsql.class.php +++ b/inc/auth/pgsql.class.php @@ -407,4 +407,4 @@ class auth_pgsql extends auth_mysql { } -//Setup VIM: ex: et ts=2 enc=utf-8 : +//Setup VIM: ex: et ts=2 : diff --git a/inc/auth/plain.class.php b/inc/auth/plain.class.php index ec9e52beb..3941190e9 100644 --- a/inc/auth/plain.class.php +++ b/inc/auth/plain.class.php @@ -325,4 +325,4 @@ class auth_plain extends auth_basic { } } -//Setup VIM: ex: et ts=2 enc=utf-8 : +//Setup VIM: ex: et ts=2 : |