Fixes size inside folder in the document tool see BT#4647

skala
Julio Montoya 14 years ago
parent c882a72897
commit 401af69153
  1. 2
      main/document/document.php
  2. 14
      main/inc/lib/fileDisplay.lib.php

@ -928,7 +928,6 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
$invisibility_span_open = ($is_visible == 0) ? '<span class="muted">' : '';
$invisibility_span_close = ($is_visible == 0) ? '</span>' : '';
// Size (or total size of a directory)
$size = $document_data['filetype'] == 'folder' ? get_total_folder_size($document_data['path'], $is_allowed_to_edit) : $document_data['size'];
@ -1015,6 +1014,7 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
$row[] = $last_edit_date;
$row[] = $size;
$row[] = $document_name;
$total_size = $total_size + $size;
if ((isset($_GET['keyword']) && search_keyword($document_name, $_GET['keyword'])) || !isset($_GET['keyword']) || empty($_GET['keyword'])) {

@ -234,19 +234,21 @@ function get_total_folder_size($path, $can_see_invisible = false) {
$tool_document = TOOL_DOCUMENT;
$course_id = api_get_course_int_id();
$session_id = api_get_session_id();
$session_condition = api_get_session_condition($session_id, true, false, 'id_session');
$visibility_rule = 'props.visibility ' . ($can_see_invisible ? '<> 2' : '= 1');
$sql = "SELECT SUM(size) FROM $table_itemproperty AS props, $table_document AS docs
WHERE docs.c_id = $course_id AND
props.c_id = $course_id AND
docs.id = props.ref AND
props.tool = '$tool_document' AND
path LIKE '$path/%' AND
$visibility_rule";
$result = Database::query($sql);
if($result && Database::num_rows($result) != 0) {
path LIKE '$path/%' AND
$visibility_rule
$session_condition ";
$result = Database::query($sql);
if ($result && Database::num_rows($result) != 0) {
$row = Database::fetch_row($result);
return $row[0] == null ? 0 : $row[0];
} else {

Loading…
Cancel
Save