Skip to content

Commit

Permalink
Merged parameter fixes from stable
Browse files Browse the repository at this point in the history
  • Loading branch information
moodler committed Dec 5, 2005
1 parent c992ff8 commit 5a0345c
Show file tree
Hide file tree
Showing 2 changed files with 141 additions and 55 deletions.
110 changes: 81 additions & 29 deletions enrol/ldap/config.html
View file
@@ -1,39 +1,91 @@
<?php // initialize variables

// general
optional_variable($frm->enrol_ldap_host_url, '');
optional_variable($frm->enrol_ldap_version, '');
optional_variable($frm->enrol_ldap_bind_dn, '');
optional_variable($frm->enrol_ldap_bind_pw, '');
optional_variable($frm->enrol_ldap_search_sub, '0');
if (!isset ($frm->enrol_ldap_host_url)) {
$frm->enrol_ldap_host_url = '';
}
if (!isset ($frm->enrol_ldap_version )) {
$frm->enrol_ldap_version = '';
}
if (!isset ($frm->enrol_ldap_bind_dn)) {
$frm->enrol_ldap_bind_dn = '';
}
if (!isset ($frm->enrol_ldap_bind_pw)) {
$frm->enrol_ldap_bind_pw = '';
}
if (!isset ($frm->enrol_ldap_search_sub)) {
$frm->enrol_ldap_search_sub = '0';
}
// student & teacher enrol
optional_variable($frm->enrol_ldap_student_contexts, '');
optional_variable($frm->enrol_ldap_student_memberattribute, '');
optional_variable($frm->enrol_ldap_teacher_contexts, '');
optional_variable($frm->enrol_ldap_teacher_memberattribute, '');
optional_variable($frm->enrol_ldap_objectclass, '');
optional_variable($frm->enrol_ldap_course_idnumber_updatelocal, '');
if (!isset ($frm->enrol_ldap_student_contexts)) {
$frm->enrol_ldap_student_contexts = '';
}
if (!isset ($frm->enrol_ldap_student_memberattribute)) {
$frm->enrol_ldap_student_memberattribute = '';
}
if (!isset ($frm->enrol_ldap_teacher_contexts)) {
$frm->enrol_ldap_teacher_contexts = '';
}
if (!isset ($frm->enrol_ldap_teacher_memberattribute)) {
$frm->enrol_ldap_teacher_memberattribute = '';
}
if (!isset ($frm->enrol_ldap_objectclass)) {
$frm->enrol_ldap_objectclass = '';
}
if (!isset ($frm->enrol_ldap_course_idnumber_updatelocal)) {
$frm->enrol_ldap_course_idnumber_updatelocal = '';
}
// fields
optional_variable($frm->enrol_ldap_course_idnumber, '');
optional_variable($frm->enrol_ldap_course_idnumber_updatelocal, false);
optional_variable($frm->enrol_ldap_course_idnumber_editlock, false);
optional_variable($frm->enrol_ldap_course_fullname, '');
optional_variable($frm->enrol_ldap_course_fullname_updatelocal, false);
optional_variable($frm->enrol_ldap_course_fullname_editlock, false);
optional_variable($frm->enrol_ldap_course_shortname, '');
optional_variable($frm->enrol_ldap_course_shortname_updatelocal, false);
optional_variable($frm->enrol_ldap_course_shortname_editlock, false);
optional_variable($frm->enrol_ldap_course_summary, '');
optional_variable($frm->enrol_ldap_course_summary_updatelocal, false);
optional_variable($frm->enrol_ldap_course_summary_editlock, false);
if (!isset ($frm->enrol_ldap_course_idnumber)) {
$frm->enrol_ldap_course_idnumber = '';
}
if (!isset ($frm->enrol_ldap_course_idnumber_updatelocal)) {
$frm->enrol_ldap_course_idnumber_updatelocal = false;
}
if (!isset ($frm->enrol_ldap_course_idnumber_editlock)) {
$frm->enrol_ldap_course_idnumber_editlock = false;
}
if (!isset ($frm->enrol_ldap_course_fullname)) {
$frm->enrol_ldap_course_fullname = '';
}
if (!isset ($frm->enrol_ldap_course_fullname_updatelocal)) {
$frm->enrol_ldap_course_fullname_updatelocal = false;
}
if (!isset ($frm->enrol_ldap_course_fullname_editlock)) {
$frm->enrol_ldap_course_fullname_editlock = false;
}
if (!isset ($frm->enrol_ldap_course_shortname)) {
$frm->enrol_ldap_course_shortname = '';
}
if (!isset ($frm->enrol_ldap_course_shortname_updatelocal)) {
$frm->enrol_ldap_course_shortname_updatelocal = false;
}
if (!isset ($frm->enrol_ldap_course_shortname_editlock)) {
$frm->enrol_ldap_course_shortname_editlock = false;
}
if (!isset ($frm->enrol_ldap_course_summary)) {
$frm->enrol_ldap_course_summary = '';
}
if (!isset ($frm->enrol_ldap_course_summary_updatelocal)) {
$frm->enrol_ldap_course_summary_updatelocal = false;
}
if (!isset ($frm->enrol_ldap_course_summary_editlock)) {
$frm->enrol_ldap_course_summary_editlock = false;
}
// autocreate
optional_variable($frm->enrol_ldap_autocreate, false);
optional_variable($frm->enrol_ldap_category, 1);
optional_variable($frm->enrol_ldap_template, '');

if (!isset ($frm->enrol_ldap_autocreate)) {
$frm->enrol_ldap_autocreate = false;
}
if (!isset ($frm->enrol_ldap_category)) {
$frm->enrol_ldap_category = 1;
}
if (!isset ($frm->enrol_ldap_template)) {
$frm->enrol_ldap_template = '';
}
// general options
optional_variable($frm->enrol_allowinternal, false);

if (!isset ($frm->enrol_allowinternal)) {
$frm->enrol_allowinternal = false;
}
?>

<table cellspacing="0" cellpadding="5" border="0" align="center">
Expand Down
86 changes: 60 additions & 26 deletions enrol/ldap/enrol.php
View file
Expand Up @@ -363,65 +363,99 @@ function config_form($frm) {
/// Override the base process_config() function
function process_config($config) {

optional_variable($config->enrol_ldap_host_url, '');
if (!isset ($config->enrol_ldap_host_url)) {
$config->enrol_ldap_host_url = '';
}
set_config('enrol_ldap_host_url', $config->enrol_ldap_host_url);

optional_variable($config->enrol_ldap_version, '');
if (!isset ($config->enrol_ldap_version)) {
$config->enrol_ldap_version = '';
}
set_config('enrol_ldap_version', $config->enrol_ldap_version);

optional_variable($config->enrol_ldap_bind_dn, '');
if (!isset ($config->enrol_ldap_bind_dn)) {
$config->enrol_ldap_bind_dn = '';
}
set_config('enrol_ldap_bind_dn', $config->enrol_ldap_bind_dn);

optional_variable($config->enrol_ldap_bind_pw, '');

if (!isset ($config->enrol_ldap_bind_pw)) {
$config->enrol_ldap_bind_pw = '';
}
set_config('enrol_ldap_bind_pw', $config->enrol_ldap_bind_pw);

optional_variable($config->enrol_ldap_student_contexts, '');
if (!isset ($config->enrol_ldap_student_contexts)) {
$config->enrol_ldap_student_contexts = '';
}
set_config('enrol_ldap_student_contexts', $config->enrol_ldap_student_contexts);

optional_variable($config->enrol_ldap_student_memberattribute, '');
if (!isset ($config->enrol_ldap_student_memberattribute)) {
$config->enrol_ldap_student_memberattribute = '';
}
set_config('enrol_ldap_student_memberattribute', $config->enrol_ldap_student_memberattribute);

optional_variable($config->enrol_ldap_teacher_contexts, '');
if (!isset ($config->enrol_ldap_teacher_contexts)) {
$config->enrol_ldap_teacher_contexts = '';
}
set_config('enrol_ldap_teacher_contexts', $config->enrol_ldap_teacher_contexts);

optional_variable($config->enrol_ldap_teacher_memberattribute, '');
if (!isset ($config->enrol_ldap_teacher_memberattribute)) {
$config->enrol_ldap_teacher_memberattribute = '';
}
set_config('enrol_ldap_teacher_memberattribute', $config->enrol_ldap_teacher_memberattribute);

optional_variable($config->enrol_ldap_objectclass, '');
if (!isset ($config->enrol_ldap_objectclass)) {
$config->enrol_ldap_objectclass = '';
}
set_config('enrol_ldap_objectclass', $config->enrol_ldap_objectclass);

optional_variable($config->enrol_ldap_category, '');
if (!isset ($config->enrol_ldap_category)) {
$config->enrol_ldap_category = '';
}
set_config('enrol_ldap_category', $config->enrol_ldap_category);

optional_variable($config->enrol_ldap_template, '');
if (!isset ($config->enrol_ldap_template)) {
$config->enrol_ldap_template = '';
}
set_config('enrol_ldap_template', $config->enrol_ldap_template);

optional_variable($config->enrol_ldap_course_fullname, '');
if (!isset ($config->enrol_ldap_course_fullname)) {
$config->enrol_ldap_course_fullname = '';
}
set_config('enrol_ldap_course_fullname', $config->enrol_ldap_course_fullname);

optional_variable($config->enrol_ldap_course_shortname, '');
if (!isset ($config->enrol_ldap_course_shortname)) {
$config->enrol_ldap_course_shortname = '';
}
set_config('enrol_ldap_course_shortname', $config->enrol_ldap_course_shortname);

optional_variable($config->enrol_ldap_course_summary, '');

if (!isset ($config->enrol_ldap_course_summary)) {
$config->enrol_ldap_course_summary = '';
}
set_config('enrol_ldap_course_summary', $config->enrol_ldap_course_summary);

optional_variable($config->enrol_ldap_course_idnumber, '');
if (!isset ($config->enrol_ldap_course_idnumber)) {
$config->enrol_ldap_course_idnumber = '';
}
set_config('enrol_ldap_course_idnumber', $config->enrol_ldap_course_idnumber);

optional_variable($config->enrol_localcoursefield, '');
if (!isset ($config->enrol_localcoursefield)) {
$config->enrol_localcoursefield = '';
}
set_config('enrol_localcoursefield', $config->enrol_localcoursefield);

optional_variable($config->enrol_ldap_user_memberfield, '');
if (!isset ($config->enrol_ldap_user_memberfield)) {
$config->enrol_ldap_user_memberfield = '';
}
set_config('enrol_ldap_user_memberfield', $config->enrol_ldap_user_memberfield);

optional_variable($config->enrol_ldap_search_sub, '0');
if (!isset ($config->enrol_ldap_search_sub)) {
$config->enrol_ldap_search_sub = '0';
}
set_config('enrol_ldap_search_sub', $config->enrol_ldap_search_sub);

optional_variable($config->enrol_ldap_autocreate, '0');
if (!isset ($config->enrol_ldap_autocreate)) {
$config->enrol_ldap_autocreate = '0';
}
set_config('enrol_ldap_autocreate', $config->enrol_ldap_autocreate);




if (!isset($config->enrol_allowinternal)) {
$config->enrol_allowinternal = '';
}
Expand Down

0 comments on commit 5a0345c

Please sign in to comment.