Skip to content

Commit 87ec0cc

Browse files
committed
Cleaning code when calling the document quota see #3535
1 parent 94ddc4e commit 87ec0cc

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

main/inc/lib/document.lib.php

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,14 @@
1616
/* CONSTANTS */
1717

1818
define('DISK_QUOTA_FIELD', 'disk_quota'); //name of the database field
19-
/** default quota for the course documents folder */
20-
define('DEFAULT_DOCUMENT_QUOTA', api_get_setting('default_document_quotum'));
19+
20+
//Default quota for the course documents folder
21+
$default_quota = api_get_setting('default_document_quotum');
22+
//Just in case the setting is not correctly set
23+
if (empty($default_quota)) {
24+
$default_quota = 100000000;
25+
}
26+
define('DEFAULT_DOCUMENT_QUOTA', $default_quota);
2127

2228
class DocumentManager {
2329

@@ -30,22 +36,24 @@ private function __construct() {
3036
* @todo eliminate globals
3137
*/
3238
public static function get_course_quota() {
33-
global $_course;
34-
if (empty($_course['sysCode'])) { return DEFAULT_DOCUMENT_QUOTA; }
35-
$course_code = Database::escape_string($_course['sysCode']);
39+
$course_info = api_get_course_info();
40+
if (empty($course_info)) {
41+
return DEFAULT_DOCUMENT_QUOTA;
42+
}
43+
$course_code = Database::escape_string($course_info['code']);
3644
$course_table = Database::get_main_table(TABLE_MAIN_COURSE);
3745

3846
$sql_query = "SELECT ".DISK_QUOTA_FIELD." FROM $course_table WHERE code = '$course_code'";
3947
$sql_result = Database::query($sql_query);
40-
$course_quota = null;
48+
$course_quota = null;
4149
if (Database::num_rows($sql_result)) {
4250
$result = Database::fetch_array($sql_result);
4351
$course_quota = $result[DISK_QUOTA_FIELD];
4452
}
4553

46-
if (is_null($course_quota)) {
54+
if (is_null($course_quota) || empty($course_quota)) {
4755
// Course table entry for quota was null, then use default value
48-
$course_quota = DEFAULT_DOCUMENT_QUOTA;
56+
$course_quota = DEFAULT_DOCUMENT_QUOTA;
4957
}
5058
return $course_quota;
5159
}

0 commit comments

Comments
 (0)