diff --git a/auth/saml/auth.php b/auth/saml/auth.php
index d1a8df3..3d48284 100755
--- a/auth/saml/auth.php
+++ b/auth/saml/auth.php
@@ -171,7 +171,7 @@ function config_form($config, $err, $user_fields) {
$dbman = $DB->get_manager();
$table_course_mapping = $this->get_course_mapping_xmldb();
- $table_role_mapping = $this->get_role_mapping_xmldb();
+ $table_role_mapping = $this->get_role_mapping_xmldb();
if(isset($config->supportcourses) && $config->supportcourses == 'internal') {
if(!$dbman->table_exists($table_course_mapping)) {
@@ -211,9 +211,9 @@ function validate_form($form, &$err) {
}
if ($form->supportcourses == 'external') {
- if ($form->externalcoursemappingdsn == '' || $form->externalcoursemappingsql == '' || $form->externalrolemappingdsn == '' || $form->externalrolemappingsql == '') {
+ if ($form->externalcoursemappingdsn == '' || $form->externalcoursemappingsql == '' || $form->externalrolemappingdsn == '' || $form->externalrolemappingsql == '') {
$err['samlexternal'] = get_string('auth_saml_errorsamlexternal', 'auth_saml', $form->samllib);
- }
+ }
}
else if($form->supportcourses == 'internal') {
@@ -223,7 +223,7 @@ function validate_form($form, &$err) {
if (isset($form->update_courses_id)) {
foreach ($form->update_courses_id as $course_id) {
$course = $form->{'course_' . $course_id};
- if (!empty($course[1]) && !empty($course[2])) {
+ if (!empty($course[1]) && !empty($course[2])) {
$lms_course_form_id[$course_id] = $course[0];
$saml_course_form_id[$course_id] = $course[1] . '_' . $course[2];
}
@@ -239,7 +239,7 @@ function validate_form($form, &$err) {
$lms_course_form_id[$i] = $new_course[0];
$saml_course_form_id[$i] = $new_course[1] . '_' . $new_course[2];
}
- }
+ }
}
//Comment the next line if you want let duplicate lms mapping
$err['course_mapping']['lms'] = array_diff_key($lms_course_form_id, array_unique($lms_course_form_id));
@@ -360,8 +360,8 @@ function process_config($config) {
if (!isset ($config->samllogoinfo)) {
$config->samllogoinfo = 'SAML login';
}
- if (!isset ($config->autologin)) {
- $config->autologin = false;
+ if (!isset ($config->autologin)) {
+ $config->autologin = false;
}
if (!isset ($config->samllogfile)) {
$config->samllogfile = '';
@@ -376,16 +376,16 @@ function process_config($config) {
$config->ignoreinactivecourses = '';
}
if (!isset ($config->externalcoursemappingdsn)) {
- $config->externalcoursemappingdsn = '';
+ $config->externalcoursemappingdsn = '';
}
if (!isset ($config->externalrolemappingdsn)) {
- $config->externalrolemappingdsn = '';
+ $config->externalrolemappingdsn = '';
}
if (!isset ($config->externalcoursemappingsql)) {
- $config->externalcoursemappingsql = '';
+ $config->externalcoursemappingsql = '';
}
if (!isset ($config->externalrolemappingsql)) {
- $config->externalrolemappingsql = '';
+ $config->externalrolemappingsql = '';
}
if (!isset ($config->disablejit)) {
$config->disablejit = false;
@@ -493,13 +493,13 @@ function process_config($config) {
}
}
}
- }
+ }
else {
//Updating roles
if (isset($config->update_roles_id) && empty($err['roles_mapping'])) {
foreach($config->update_roles_id as $role_id) {
$role = $config->{'role_' . $role_id};
- $sql = "UPDATE ".$DB->get_prefix() ."role_mapping SET lms_role='" . $role[0] . "', saml_role='" . $role[1] . "' where saml_role='" . $role_id . "'";
+ $sql = "UPDATE ".$DB->get_prefix() ."role_mapping SET lms_role='" . $role[0] . "', saml_role='" . $role[1] . "' where saml_role='" . $role_id . "'";
try {
$DB->execute($sql);
}
@@ -528,12 +528,27 @@ function process_config($config) {
if(isset($err['role_mapping_db']) || isset($err['course_mapping_db'])) {
return false;
}
-
+
//END-COURSE MAPPINGS
}
return true;
}
+ /**
+ * Get the auth description (from core or own auth lang files)
+ *
+ * @return string The description
+ */
+ function get_description() {
+ global $PAGE;
+ if ($PAGE->pagetype == 'admin-auth-saml') {
+ // Workaround require jquery and jquery-ui before auto_config.php $OUTPUT->header()
+ $PAGE->requires->jquery();
+ $PAGE->requires->jquery_plugin('ui');
+ }
+ return parent::get_description();
+ }
+
/**
* Cleans and returns first of potential many values (multi-valued attributes)
*
@@ -584,7 +599,7 @@ function create_role_mapping_db($DB, &$err) {
$dbman->create_table($table);
echo '';
print_string("auth_saml_sucess_creating_role_mapping", "auth_saml");
- echo '
';
+ echo '
';
}
catch (Exception $e) {
$err['role_mapping_db'][] = get_string("auth_saml_error_creating_role_mapping", "auth_saml");
@@ -594,7 +609,7 @@ function create_role_mapping_db($DB, &$err) {
function get_course_mapping_xmldb() {
- $table = new xmldb_table('course_mapping');
+ $table = new xmldb_table('course_mapping');
$table->add_field('course_mapping_id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null);
$table->add_field('saml_course_id', XMLDB_TYPE_CHAR, '100', null, XMLDB_NOTNULL, null, null, null);
@@ -642,5 +657,5 @@ function initialize_roles($DB, &$err) {
}
}
return $sucess;
- }
+ }
}
diff --git a/auth/saml/config.php b/auth/saml/config.php
index 031fcc8..bbd31ca 100755
--- a/auth/saml/config.php
+++ b/auth/saml/config.php
@@ -1,14 +1,10 @@
+
-
-
-
-
-
ignoreinactivecourses)) {
$config->ignoreinactivecourses = true;
}
- if (!isset ($config->externalcoursemappingdsn)) {
- $config->externalcoursemappingdsn = '';
+ if (!isset ($config->externalcoursemappingdsn)) {
+ $config->externalcoursemappingdsn = '';
}
- if (!isset ($config->externalrolemappingdsn)) {
- $config->externalrolemappingdsn = '';
+ if (!isset ($config->externalrolemappingdsn)) {
+ $config->externalrolemappingdsn = '';
}
- if (!isset ($config->externalcoursemappingsql)) {
- $config->externalcoursemappingsql = '';
+ if (!isset ($config->externalcoursemappingsql)) {
+ $config->externalcoursemappingsql = '';
}
- if (!isset ($config->externalrolemappingsql)) {
- $config->externalrolemappingsql = '';
+ if (!isset ($config->externalrolemappingsql)) {
+ $config->externalrolemappingsql = '';
}
if (!isset ($config->disablejit)) {
@@ -342,7 +338,7 @@
DSN and SQL examples:
+DSN and SQL examples:
" . htmlspecialchars(get_string("auth_saml_mapping_dsn_examples", "auth_saml")) . ""; echo "" . htmlspecialchars(get_string("auth_saml_mapping_sql_examples", "auth_saml")) . "
"; diff --git a/auth/saml/courses.php b/auth/saml/courses.php index 9dcebcd..c41c7ed 100644 --- a/auth/saml/courses.php +++ b/auth/saml/courses.php @@ -42,7 +42,7 @@ function get_course_mapping_for_sync(&$err, $config) { $course_mapping = array(); if($config->supportcourses == 'external') { - require_once ("DBNewConnection.php"); + require_once ("DBNewConnection.php"); $DB_mapping = DBNewConnection($config->externalcoursemappingdsn); $rs = false; if($DB_mapping) { @@ -50,7 +50,7 @@ function get_course_mapping_for_sync(&$err, $config) { $rs = $DB_mapping->Execute($config->externalcoursemappingsql); if($rs !==false) { $res_array = $rs->GetAll(); - } + } $DB_mapping->Disconnect(); } } @@ -76,9 +76,9 @@ function get_course_mapping_for_sync(&$err, $config) { $err['course_mapping_db'][] = get_string('auth_saml_duplicated_saml_data', "auth_saml").' saml_course_id:'.$tuple['saml_course_id'].' saml_course_period:'.$tuple['saml_course_period']; } else { - $course_mapping[$tuple['saml_course_id']][$tuple['saml_course_period']] = $tuple['lms_course_id']; + $course_mapping[$tuple['saml_course_id']][$tuple['saml_course_period']] = $tuple['lms_course_id']; } - } + } } unset($res_array); unset($rs); @@ -92,8 +92,8 @@ function print_course_mapping_options($course_mapping, $config, $err) { if(isset($err['course_mapping_db'])) { foreach ($err['course_maping_db'] as $value) { echo '