Should fix bug when uploading document see BT#4831

main/document/upload.php

@@ -66,16 +66,19 @@ function advanced_parameters() {
 	document.getElementById(\'options\').style.display = \'block\';
 	document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;<img style="vertical-align:middle;" src="../img/div_hide.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'\';
 	} else {
-			document.getElementById(\'options\').style.display = \'none\';
-			document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;<img style="vertical-align:middle;" src="../img/div_show.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'\';
-			}
-	}
+        document.getElementById(\'options\').style.display = \'none\';
+        document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;<img style="vertical-align:middle;" src="../img/div_show.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'\';
+    }
+}
+
 function setFocus(){
 	$("#title_file").focus();
-	}
-	$(document).ready(function () {
- 	 setFocus();
-	});	
+}
+
+$(document).ready(function () {
+        setFocus();
+});	
+
 </script>';
 
 $htmlHeadXtra[] = "
@@ -110,7 +113,6 @@ $base_work_dir = $sys_course_path.$courseDir;
 
 $selectcat = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : null;
 
-
 $document_data  = DocumentManager::get_document_data_by_id($_REQUEST['id'], api_get_course_id(), true);
 if (empty($document_data)) {
     $document_id  = $parent_id =  0;
@@ -158,9 +160,6 @@ if ($is_certificate_array[0] == 'certificates') {
 	$is_certificate_mode = true;
 }
 
-// Variables
-//$max_filled_space = DocumentManager::get_course_quota();
-
 // Title of the tool
 if ($to_group_id != 0) { // Add group name after for group documents
 	$add_group_to_title = ' ('.$group_properties['name'].')';
@@ -223,11 +222,15 @@ if (!$is_certificate_mode) {
 
 $params = Uri::course_params();
 $params['id'] = Request::get('id');
-$action = Uri::here($params, false);    
-$form = new FormValidator('upload', 'POST', $action, '', 'enctype="multipart/form-data"');
+$action = Uri::here($params, false);
+
+$form = new FormValidator('upload', 'POST', $action.'#tabs-2', '', 'enctype="multipart/form-data"');
 $form->addElement('hidden', 'id', $document_id);
 $form->addElement('hidden', 'curdirpath', $path);
-$label = get_lang('MaxFileSize').': '.ini_get('upload_max_filesize').'<br/>'.get_lang('DocumentQuota').': '.(round(DocumentManager::get_course_quota()/1000000)-round(DocumentManager::documents_total_space()/1000000)).'M';
+
+$course_quota = format_file_size(DocumentManager::get_course_quota() - DocumentManager::documents_total_space());
+
+$label = get_lang('MaxFileSize').': '.ini_get('upload_max_filesize').'<br/>'.get_lang('DocumentQuota').': '.$course_quota;
 
 $form->addElement('file', 'file', array(get_lang('File'), $label), 'id="user_upload" size="45"');
 

main/inc/lib/pear/HTML/QuickForm.php

@@ -327,6 +327,7 @@ class HTML_QuickForm extends HTML_Common
             unset($this->_submitValues['_qf__' . $formName]);
             $this->addElement('hidden', '_qf__' . $formName, null);
         }
+        
         if (preg_match('/^([0-9]+)([a-zA-Z]*)$/', ini_get('upload_max_filesize'), $matches)) {
             // see http://www.php.net/manual/en/faq.using.php#faq.using.shorthandbytes
             switch (strtoupper($matches['2'])) {
@@ -342,7 +343,16 @@ class HTML_QuickForm extends HTML_Common
                 default:
                     $this->_maxFileSize = $matches['1'];
             }
-        }     
+        }
+        
+        $course_id = api_get_course_int_id();
+        //If I'm in a course replace the default max filesize with the course limits
+        if (!empty($course_id)) {            
+            $free_course_quota = DocumentManager::get_course_quota() - DocumentManager::documents_total_space();
+            if (empty($this->_maxFileSize) || $free_course_quota <= $this->_maxFileSize) {
+                $this->_maxFileSize = intval($free_course_quota);
+            }
+        }
     } // end constructor
 
     // }}}