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

Minor - format code.

Browse Source
1.9.x
Julio Montoya 11 years ago
parent 1412344bb5
commit ce6b08ab5e
2 changed files with 54 additions and 47 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. 36
      main/inc/lib/fileDisplay.lib.php
  2. 65
      main/inc/lib/main_api.lib.php

36
main/inc/lib/fileDisplay.lib.php
Unescape View File

@ -185,28 +185,36 @@ function folder_size($dir_name)
*
* @param string $path
* @param boolean $can_see_invisible
* @return Total size
* @return int Total size
*/
function get_total_folder_size($path, $can_see_invisible = false) {
function get_total_folder_size($path, $can_see_invisible = false)
{
$table_itemproperty = Database::get_course_table(TABLE_ITEM_PROPERTY);
$table_document = Database::get_course_table(TABLE_DOCUMENT);
$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, true, 'props.id_session');
$course_id = api_get_course_int_id();
$session_id = api_get_session_id();
$session_condition = api_get_session_condition(
$session_id,
true,
true,
'props.id_session'
);
$visibility_rule = ' props.visibility ' . ($can_see_invisible ? '<> 2' : '= 1');
$sql = "SELECT SUM(table1.size) FROM (
SELECT size FROM $table_itemproperty AS props, $table_document AS docs
WHERE docs.c_id = $course_id AND
docs.id = props.ref AND
docs.path LIKE '$path/%' AND
props.c_id = $course_id AND
props.tool = '$tool_document' AND
$visibility_rule
$session_condition
SELECT size
FROM $table_itemproperty AS props, $table_document AS docs
WHERE
docs.c_id = $course_id AND
docs.id = props.ref AND
docs.path LIKE '$path/%' AND
props.c_id = $course_id AND
props.tool = '$tool_document' AND
$visibility_rule
$session_condition
GROUP BY ref
) as table1";
@ -217,4 +225,4 @@ function get_total_folder_size($path, $can_see_invisible = false) {
} else {
return 0;
}
}
}

65
main/inc/lib/main_api.lib.php
Unescape View File

@ -1510,51 +1510,50 @@ function api_format_course_array($course_data) {
}
$_course = array();
$_course['id' ] = $course_data['code' ];
$_course['real_id' ] = $course_data['id' ];
$_course['id'] = $course_data['code'];
$_course['real_id'] = $course_data['id'];
// Added
$_course['code' ] = $course_data['code' ];
$_course['name' ] = $course_data['title' ];
$_course['title' ] = $course_data['title' ];
$_course['official_code'] = $course_data['visual_code' ]; // Use in echo statements.
$_course['visual_code'] = $course_data['visual_code' ];
$_course['sysCode' ] = $course_data['code' ]; // Use as key in db.
$_course['path' ] = $course_data['directory' ]; // Use as key in path.
$_course['directory' ] = $course_data['directory' ];
$_course['code'] = $course_data['code'];
$_course['name'] = $course_data['title'];
$_course['title'] = $course_data['title'];
$_course['official_code'] = $course_data['visual_code'];
$_course['visual_code'] = $course_data['visual_code'];
$_course['sysCode'] = $course_data['code'];
$_course['path'] = $course_data['directory']; // Use as key in path.
$_course['directory'] = $course_data['directory'];
//@todo should be deprecated
// Use as key in db list.
$_course['dbName' ] = $course_data['db_name' ];
$_course['db_name' ] = $course_data['db_name' ];
$_course['dbName'] = $course_data['db_name'];
$_course['db_name'] = $course_data['db_name'];
// Use in all queries.
$_course['dbNameGlu' ] = $_configuration['table_prefix'] . $course_data['db_name'] . $_configuration['db_glue'];
$_course['dbNameGlu'] = $_configuration['table_prefix'] . $course_data['db_name'] . $_configuration['db_glue'];
$_course['titular' ] = $course_data['tutor_name' ];
$_course['language' ] = $course_data['course_language'];
$_course['extLink' ]['url' ] = $course_data['department_url' ];
$_course['extLink' ]['name'] = $course_data['department_name'];
$_course['titular'] = $course_data['tutor_name'];
$_course['language'] = $course_data['course_language'];
$_course['extLink']['url'] = $course_data['department_url'];
$_course['extLink']['name'] = $course_data['department_name'];
$_course['categoryCode' ] = $course_data['faCode' ];
$_course['categoryName' ] = $course_data['faName' ];
$_course['categoryCode'] = $course_data['faCode'];
$_course['categoryName'] = $course_data['faName'];
$_course['visibility' ] = $course_data['visibility' ];
$_course['subscribe_allowed'] = $course_data['subscribe'];
$_course['subscribe'] = $course_data['subscribe'];
$_course['unsubscribe'] = $course_data['unsubscribe' ];
$_course['visibility'] = $course_data['visibility'];
$_course['subscribe_allowed'] = $course_data['subscribe'];
$_course['subscribe'] = $course_data['subscribe'];
$_course['unsubscribe'] = $course_data['unsubscribe'];
$_course['course_language'] = $course_data['course_language'];
$_course['activate_legal'] = isset($course_data['activate_legal']) ? $course_data['activate_legal'] : false;;
$_course['legal'] = $course_data['legal' ];
$_course['show_score'] = $course_data['show_score']; //used in the work tool
$_course['department_name'] = $course_data['department_name'];
$_course['department_url'] = $course_data['department_url' ];
$_course['course_language'] = $course_data['course_language'];
$_course['activate_legal'] = isset($course_data['activate_legal']) ? $course_data['activate_legal'] : false;;
$_course['legal'] = $course_data['legal'];
$_course['show_score'] = $course_data['show_score']; //used in the work tool
$_course['department_name'] = $course_data['department_name'];
$_course['department_url'] = $course_data['department_url'];
//Course password
$_course['registration_code'] = !empty($course_data['registration_code']) ? sha1($course_data['registration_code']) : null;
$_course['disk_quota'] = $course_data['disk_quota'];
$_course['course_public_url'] = api_get_path(WEB_COURSE_PATH).$course_data['directory'].'/index.php';
$_course['registration_code'] = !empty($course_data['registration_code']) ? sha1($course_data['registration_code']) : null;
$_course['disk_quota'] = $course_data['disk_quota'];
$_course['course_public_url'] = api_get_path(WEB_COURSE_PATH).$course_data['directory'].'/index.php';
if (array_key_exists('add_teachers_to_sessions_courses', $course_data)) {
$_course['add_teachers_to_sessions_courses'] = $course_data['add_teachers_to_sessions_courses'];

Write Preview
Loading…
Cancel
Save