Author: fapeeler
Date: Mon Oct 15 17:24:47 2012
New Revision: 1398403
URL: http://svn.apache.org/viewvc?rev=1398403&view=rev
Log:
CMS commit to vcl by fapeeler
Modified:
vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.mdtext
Modified:
vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.mdtext
URL:
http://svn.apache.org/viewvc/vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.mdtext?rev=1398403&r1=1398402&r2=1398403&view=diff
==============================================================================
---
vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.mdtext
(original)
+++
vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.mdtext
Mon Oct 15 17:24:47 2012
@@ -128,40 +128,40 @@ The web code now requires access to crea
f. The way the authentication functions toward the bottom of conf.php are
initialized has been simplified. Make the following changes:
- **REMOVE**
+**REMOVE**
- :::BashLexer
- $affilValFunc
- $affilValFuncArgs
- $addUserFunc
- $addUserFuncArgs
- $updateUserFunc
- $updateUserFuncArgs
+ :::BashLexer
+ $affilValFunc
+ $affilValFuncArgs
+ $addUserFunc
+ $addUserFuncArgs
+ $updateUserFunc
+ $updateUserFuncArgs
- **ADD**
+**ADD**
- :::BashLexer
- $affilValFunc = array();
- $affilValFuncArgs = array();
- $addUserFunc = array();
- $addUserFuncArgs = array();
- $updateUserFunc = array();
- $updateUserFuncArgs = array();
- foreach($authMechs as $key => $item) {
- if($item['type'] == 'ldap') {
- $affilValFunc[$item['affiliationid']] =
'validateLDAPUser';
- $affilValFuncArgs[$item['affiliationid']] = $key;
- $addUserFunc[$item['affiliationid']] =
'addLDAPUser';
- $addUserFuncArgs[$item['affiliationid']] = $key;
- $updateUserFunc[$item['affiliationid']] =
'updateLDAPUser';
- $updateUserFuncArgs[$item['affiliationid']] =
$key;
- }
- elseif($item['type'] == 'local') {
- $affilValFunc[$item['affiliationid']] =
create_function('', 'return 0;');
- $addUserFunc[$item['affiliationid']] =
create_function('', 'return NULL;');
- $updateUserFunc[$item['affiliationid']] =
create_function('', 'return NULL;');
- }
- }
+ :::BashLexer
+ $affilValFunc = array();
+ $affilValFuncArgs = array();
+ $addUserFunc = array();
+ $addUserFuncArgs = array();
+ $updateUserFunc = array();
+ $updateUserFuncArgs = array();
+ foreach($authMechs as $key => $item) {
+ if($item['type'] == 'ldap') {
+ $affilValFunc[$item['affiliationid']] = 'validateLDAPUser';
+ $affilValFuncArgs[$item['affiliationid']] = $key;
+ $addUserFunc[$item['affiliationid']] = 'addLDAPUser';
+ $addUserFuncArgs[$item['affiliationid']] = $key;
+ $updateUserFunc[$item['affiliationid']] = 'updateLDAPUser';
+ $updateUserFuncArgs[$item['affiliationid']] = $key;
+ }
+ elseif($item['type'] == 'local') {
+ $affilValFunc[$item['affiliationid']] =
create_function('', 'return 0;');
+ $addUserFunc[$item['affiliationid']] = create_function('',
'return NULL;');
+ $updateUserFunc[$item['affiliationid']] =
create_function('', 'return NULL;');
+ }
+ }
13. **Restart httpd service**