chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Using MB instead of bytes see #4016

Browse Source
skala
Julio Montoya 13 years ago
parent a14828551c
commit f0b9f887f4
2 changed files with 36 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      main/admin/course_edit.php
  2. 31
      main/admin/settings.php

16
main/admin/course_edit.php
Unescape View File

@ -11,10 +11,12 @@ require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
$course_table = Database::get_main_table(TABLE_MAIN_COURSE);
$course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$course_table = Database::get_main_table(TABLE_MAIN_COURSE);
$course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$course_code = isset($_GET['course_code']) ? $_GET['course_code'] : $_POST['code'];
$noPHP_SELF = true;
$tool_name = get_lang('ModifyCourseInfo');
@ -166,7 +168,7 @@ $group[]= $form->createElement('radio', 'unsubscribe', null, get_lang('NotAllowe
$form->addGroup($group,'', get_lang('Unsubscription'), '<br />');
$form->addElement('text','disk_quota',get_lang('CourseQuota'));
$form->addElement('text','disk_quota',array(get_lang('CourseQuota'), null, get_lang('MB')));
$form->addRule('disk_quota', get_lang('ThisFieldIsRequired'),'required');
$form->addRule('disk_quota',get_lang('ThisFieldShouldBeNumeric'),'numeric');
@ -180,8 +182,7 @@ foreach ($list_course_extra_field as $extra_field) {
$checked = (array_key_exists('extra_field_value', $extra_field) && $extra_field['extra_field_value'] == 1)? array('checked'=>'checked'): '';
$form->addElement('hidden', '_extra_'.$extra_field['field_variable'], 0);
$field_display_text=$extra_field['field_display_text'];
$form->addElement('checkbox', 'extra_'.$extra_field['field_variable'],get_lang('SpecialCourse') , get_lang($extra_field['field_default_value']).' '.Display::return_icon('synthese_view.gif',get_lang('AllUsersAreAutomaticallyRegistered')), $checked);
$form->addElement('checkbox', 'extra_'.$extra_field['field_variable'], array(get_lang('SpecialCourse'), get_lang('AllUsersAreAutomaticallyRegistered')) , get_lang($extra_field['field_default_value']), $checked);
break;
/* case USER_FIELD_TYPE_SELECT_MULTIPLE:
case USER_FIELD_TYPE_DATE:
@ -194,7 +195,9 @@ $form->addElement('style_submit_button', 'button', get_lang('ModifyCourseInfo'),
// Set some default values
$course_db_name = $course['db_name'];
$course['disk_quota'] = round($course['disk_quota']/1024/1024, 1);
$course['title'] = api_html_entity_decode($course['title'], ENT_QUOTES, $charset);
$form->setDefaults($course);
// Validate form
if ($form->validate()) {
@ -239,6 +242,9 @@ if ($form->validate()) {
$department_name = $course['department_name'];
$department_url = $course['department_url'];
$course_language = $course['course_language'];
$course['disk_quota'] = $course['disk_quota']*1024*1024;
$disk_quota = $course['disk_quota'];
$visibility = $course['visibility'];
$subscribe = $course['subscribe'];

31
main/admin/settings.php
Unescape View File

@ -94,7 +94,17 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
$form = new FormValidator('settings', 'post', 'settings.php?category='.$_GET['category']);
$renderer = & $form->defaultRenderer();
$renderer->setElementTemplate('<div class="row"><div class="label">{label}</div><div class="formw">{element}<!-- BEGIN label_2 --><span class="help-block">{label_2}</span><!-- END label_2 --></div></div>');
$renderer->setElementTemplate('<div class="row">
<div class="label">{label}</div>
<div class="formw">{element}
<!-- BEGIN label_3 -->
{label_3}
<!-- END label_3 -->
<!-- BEGIN label_2 -->
<span class="help-block">{label_2}</span>
<!-- END label_2 -->
</div>
</div>');
/*$renderer->setHeaderTemplate('<div class="sectiontitle">{header}</div>');
$renderer->setElementTemplate('<div class="sectionvalue">{element}</div><div class="sectioncomment">{label}</div>'."\n");*/
@ -192,17 +202,20 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
// There is no else{} statement because we load the default $row['selected_value'] of the main Chamilo site.
}
}
switch ($row['type']) {
case 'textfield':
if ($row['variable'] == 'account_valid_duration') {
case 'textfield':
if (in_array($row['variable'], array('dropbox_max_filesize', 'message_max_upload_filesize'))) {
$form->addElement('text', $row['variable'], array(get_lang($row['title']), get_lang($row['comment']), get_lang('MB')), array('maxlength' => '5'));
$form->applyFilter($row['variable'], 'html_filter');
$default_values[$row['variable']] = round($row['selected_value']/1024/1024, 1);
} elseif ($row['variable'] == 'account_valid_duration') {
$form->addElement('text', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), array('maxlength' => '5'));
$form->applyFilter($row['variable'], 'html_filter');
$default_values[$row['variable']] = $row['selected_value'];
// For platform character set selection: Conversion of the textfield to a select box with valid values.
// For platform character set selection: Conversion of the textfield to a select box with valid values.
} elseif ($row['variable'] == 'platform_charset') {
$current_system_encoding = api_refine_encoding_id(trim($row['selected_value']));
$valid_encodings = array_flip(api_get_valid_encodings());
@ -489,6 +502,12 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
}
// Set true for allow_message_tool variable if social tool is actived.
$values['dropbox_max_filesize'] = $values['dropbox_max_filesize']*1024*1024;
$values['message_max_upload_filesize'] = $values['message_max_upload_filesize']*1024*1024;
if ($values['allow_social_tool'] == 'true') {
$values['allow_message_tool'] = 'true';
}

Write Preview
Loading…
Cancel
Save