WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

config option check may change settings

This commit is contained in:
Roland Gruber 2012-11-25 10:57:15 +00:00
parent 1883fe086f
commit e439d2cc5a
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lam/lib/baseModule.inc
View File

@ -688,7 +688,7 @@ abstract class baseModule {
* *
* @see baseModule::get_metaData() * @see baseModule::get_metaData()
*/ */
public function check_configOptions($scopes, $options) { public function check_configOptions($scopes, &$options) {
$messages = array(); $messages = array();
$scopes[] = 'all'; // add checks that are independent of scope $scopes[] = 'all'; // add checks that are independent of scope
for ($s = 0; $s < sizeof($scopes); $s++) { for ($s = 0; $s < sizeof($scopes); $s++) {

2
lam/lib/modules.inc
View File

@ -326,7 +326,7 @@ function getConfigOptions($scopes) {
* @param array $options hash array containing all options (name => array(...)) * @param array $options hash array containing all options (name => array(...))
* @return array list of error messages * @return array list of error messages
*/ */
function checkConfigOptions($scopes, $options) { function checkConfigOptions($scopes, &$options) {
$return = array(); $return = array();
$modules = array_keys($scopes); $modules = array_keys($scopes);
for ($i = 0; $i < sizeof($modules); $i++) { for ($i = 0; $i < sizeof($modules); $i++) {

6
lam/lib/modules/account.inc
View File

@ -229,7 +229,11 @@ class account extends baseModule {
*/ */
function get_pdfEntries() { function get_pdfEntries() {
$return = array(); $return = array();
$return['account_description'] = array('<block><key>' . _('Description') . '</key><value>' . $this->attributes['description'][0] . '</value></block>'); $description = '';
if (isset($this->attributes['description'][0])) {
$description = $this->attributes['description'][0];
}
$return['account_description'] = array('<block><key>' . _('Description') . '</key><value>' . $description . '</value></block>');
$return['account_uid'] = array('<block><key>' . _('User name') . '</key><value>' . $this->attributes['uid'][0] . '</value></block>'); $return['account_uid'] = array('<block><key>' . _('User name') . '</key><value>' . $this->attributes['uid'][0] . '</value></block>');
return $return; return $return;
} }

2
lam/lib/modules/posixAccount.inc
View File

@ -1513,7 +1513,7 @@ class posixAccount extends baseModule implements passwordService {
* @param array $options hash array containing the settings (array('option' => array('value'))) * @param array $options hash array containing the settings (array('option' => array('value')))
* @return array list of error messages * @return array list of error messages
*/ */
function check_configOptions($scopes, $options) { function check_configOptions($scopes, &$options) {
$return = array(); $return = array();
// user settings // user settings
if (in_array('user', $scopes)) { if (in_array('user', $scopes)) {