- 
+
+
';
$scorebetw= array ();
@@ -352,16 +352,15 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
$renderer->setElementTemplate($elementTemplateTwoLabel,'gradebook_score_display_custom_values_endscore[' . $counter . ']');
$renderer->setElementTemplate($elementTemplateTwoLabel2,'gradebook_score_display_custom_values_displaytext[' . $counter . ']');
$form->addRule('gradebook_score_display_custom_values_endscore[' . $counter . ']', get_lang('OnlyNumbers'), 'numeric');
- $form->addRule(array ('gradebook_score_display_custom_values_endscore[' . $counter . ']', 'gradebook_score_display_custom_values_maxvalue'), get_lang('Over100'), 'compare', '<=');
- $form->addRule(array ('gradebook_score_display_custom_values_endscore[' . $counter . ']', 'gradebook_score_display_custom_values_minvalue'), get_lang('UnderMin'), 'compare', '>');
+ $form->addRule(array('gradebook_score_display_custom_values_endscore[' . $counter . ']', 'gradebook_score_display_custom_values_maxvalue'), get_lang('Over100'), 'compare', '<=');
+ $form->addRule(array('gradebook_score_display_custom_values_endscore[' . $counter . ']', 'gradebook_score_display_custom_values_minvalue'), get_lang('UnderMin'), 'compare', '>');
if ($customdisplays[$counter - 1]) {
- $default_values['gradebook_score_display_custom_values_endscore['.$counter.']'] = $customdisplays[$counter-1]['score'];
- $default_values['gradebook_score_display_custom_values_displaytext['.$counter.']'] = $customdisplays[$counter-1]['display'];
+ $default_values['gradebook_score_display_custom_values_endscore['.$counter.']'] = $customdisplays[$counter - 1]['score'];
+ $default_values['gradebook_score_display_custom_values_displaytext['.$counter.']'] = $customdisplays[$counter - 1]['display'];
}
}
}
break;
-
*/
}
}
@@ -384,22 +383,55 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
// therefore not be set to false.
// This, however, also means that if the process breaks on the third of five checkboxes, the others
// will be set to false.
- $r = api_set_settings_category($my_category,'false',$_configuration['access_url'],array('checkbox','radio'));
+ $r = api_set_settings_category($my_category, 'false', $_configuration['access_url'], array('checkbox', 'radio'));
//$sql = "UPDATE $table_settings_current SET selected_value='false' WHERE category='$my_category' AND type='checkbox'";
//$result = Database::query($sql);
- // Save the settings
+ // Save the settings.
$keys = array();
//$gradebook_score_display_custom_values = array();
foreach ($values as $key => $value) {
// Treat gradebook values in separate function.
- //if(strpos($key, 'gradebook_score_display_custom_values') === false) {
+ //if (strpos($key, 'gradebook_score_display_custom_values') === false) {
if (!is_array($value)) {
//$sql = "UPDATE $table_settings_current SET selected_value='".Database::escape_string($value)."' WHERE variable='$key'";
//$result = Database::query($sql);
- if (api_get_setting($key) != $value) $keys[] = $key;
+ $old_value = api_get_setting($key);
+
+ switch ($key) {
+
+ // URL validation for some settings.
+ case 'InstitutionUrl':
+ case 'course_validation_terms_and_conditions_url':
+ $value = trim(Security::remove_XSS($value));
+ if ($value != '') {
+ // Here we accept absolute URLs only.
+ if (strpos($value, '://') === false) {
+ $value = 'http://'.$value;
+ }
+ if (!api_valid_url($value, true)) {
+ // If the new (non-empty) URL value is invalid, then the old URL value stays.
+ $value = $old_value;
+ }
+ }
+ // If the new URL value is empty, then it will be stored (i.e. the setting will be deleted).
+ break;
+
+ // Validation against e-mail address for some settings.
+ case 'emailAdministrator':
+ $value = trim(Security::remove_XSS($value));
+ if ($value != '' && !api_valid_email($value)) {
+ // If the new (non-empty) e-mail address is invalid, then the old e-mail address stays.
+ // If the new e-mail address is empty, then it will be stored (i.e. the setting will be deleted).
+ $value = $old_value;
+ }
+ break;
+
+ }
+
+ if ($old_value != $value) $keys[] = $key;
- $result = api_set_setting($key,$value,null,null,$_configuration['access_url']);
+ $result = api_set_setting($key, $value, null, null, $_configuration['access_url']);
} else {
@@ -408,8 +440,8 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
$subkeys = array();
while ($row_subkeys = Database::fetch_array($res)) {
// If subkey is changed:
- if ( (isset($value[$row_subkeys['subkey']]) && api_get_setting($key,$row_subkeys['subkey']) == 'false') ||
- (!isset($value[$row_subkeys['subkey']]) && api_get_setting($key,$row_subkeys['subkey']) == 'true')) {
+ if ((isset($value[$row_subkeys['subkey']]) && api_get_setting($key, $row_subkeys['subkey']) == 'false') ||
+ (!isset($value[$row_subkeys['subkey']]) && api_get_setting($key, $row_subkeys['subkey']) == 'true')) {
$keys[] = $key;
break;
}
@@ -420,7 +452,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
//$sql = "UPDATE $table_settings_current SET selected_value='true' WHERE variable='$key' AND subkey = '$subkey'";
//$result = Database::query($sql);
- $result = api_set_setting($key,'true',$subkey,null,$_configuration['access_url']);
+ $result = api_set_setting($key, 'true', $subkey, null, $_configuration['access_url']);
}
}
@@ -483,7 +515,7 @@ $action_images['timezones'] = 'timezones.png';
// Grabbing the categories.
//$selectcategories = "SELECT DISTINCT category FROM ".$table_settings_current." WHERE category NOT IN ('stylesheets','Plugins')";
//$resultcategories = Database::query($selectcategories);
-$resultcategories = api_get_settings_categories(array('stylesheets','Plugins', 'Templates', 'Search'));
+$resultcategories = api_get_settings_categories(array('stylesheets', 'Plugins', 'Templates', 'Search'));
echo "\n