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 - fixing typos, removing comments

Browse Source
skala
Julio Montoya 12 years ago
parent 4b82fad6e7
commit f2eed64f71
4 changed files with 13 additions and 20 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. 9
      main/document/edit_document.php
  2. 11
      main/inc/lib/fckeditor/fcktemplates.xml.php
  3. 11
      main/inc/lib/fileManager.lib.php
  4. 2
      main/newscorm/learnpath.class.php

9
main/document/edit_document.php
Unescape View File

@ -174,10 +174,7 @@ if ($is_certificate_mode) {
$html_editor_config['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir;
}
$is_allowed_to_edit = api_is_allowed_to_edit(
null,
true
) || $_SESSION['group_member_with_upload_rights'] || is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
$is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] || is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
$noPHP_SELF = true;
/* Other initialization code */
@ -222,7 +219,7 @@ if (!is_allowed_to_edit) {
event_access_tool(TOOL_DOCUMENT);
//TODO:check the below code and his funcionality
//TODO:check the below code and his functionality
if (!is_allowed_to_edit()) {
if (DocumentManager::check_readonly($course_info, $user_id, $file)) {
api_not_allowed();
@ -285,7 +282,7 @@ if ($is_allowed_to_edit) {
if ($read_only_flag == 0) {
if (!empty($content)) {
if ($fp = @fopen($document_data['absolute_path'], 'w')) {
// For flv player, change absolute paht temporarely to prevent from erasing it in the following lines
// For flv player, change absolute path temporarely to prevent from erasing it in the following lines
$content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content);
// Change the path of mp3 to absolute

11
main/inc/lib/fckeditor/fcktemplates.xml.php
Unescape View File

@ -204,16 +204,16 @@ function load_personal_templates($user_id = 0) {
$table_template = Database::get_main_table(TABLE_MAIN_TEMPLATES);
$table_document = Database::get_course_table(TABLE_DOCUMENT);
$course_id = api_get_course_int_id();
// The sql statement for getting all the user defined templates
$sql = "SELECT template.id, template.title, template.description, template.image, template.ref_doc, document.path
FROM ".$table_template." template, ".$table_document." document
WHERE
user_id='".Database::escape_string($user_id)."' AND
WHERE
user_id='".Database::escape_string($user_id)."' AND
course_code='".Database::escape_string(api_get_course_id())."' AND
document.c_id = $course_id AND
document.c_id = $course_id AND
document.id = template.ref_doc";
$result_template = Database::query($sql);
@ -221,7 +221,6 @@ function load_personal_templates($user_id = 0) {
while ($row = Database::fetch_array($result_template)) {
$row['content'] = file_get_contents(api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$row['path']);
//$row['content'] = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$row['path'];
if (!empty($row['image'])) {
$image = api_get_path(WEB_PATH).'courses/'.$_course['path'].'/upload/template_thumbnails/'.$row['image'];
@ -252,7 +251,7 @@ function load_empty_template() {
<![CDATA[
<html>
<head>
<meta charset="<?php echo api_get_system_encoding(); ?>" />
<meta charset="<?php echo api_get_system_encoding(); ?>" />
</head>
<body dir="<?php echo api_get_text_direction(); ?>">
</body>

11
main/inc/lib/fileManager.lib.php
Unescape View File

@ -528,7 +528,7 @@ class FileManager
Function kept for compatibility with older PHP versions.
Function is binary safe (is needed on Windows)
*/
function compat_load_file($file_name)
static function compat_load_file($file_name)
{
$buffer = '';
if (file_exists($file_name)) {
@ -540,7 +540,7 @@ class FileManager
return $buffer;
}
function choose_image($file_name)
static function choose_image($file_name)
{
static $type, $image;
@ -631,7 +631,7 @@ class FileManager
* @param - $file_path (string) - Relative local path of the file on the hard disk
* @return - Relative url
*/
function format_url($file_path)
static function format_url($file_path)
{
$path_component = explode('/', $file_path);
$path_component = array_map('rawurlencode', $path_component);
@ -1925,16 +1925,13 @@ class FileManager
*/
static function replace_img_path_in_html_file($original_img_path, $new_img_path, $html_file)
{
global $_course;
// Open the file
$fp = fopen($html_file, 'r');
$buffer = fread($fp, filesize($html_file));
$new_html_content = null;
// Fix the image tags
for ($i = 0, $fileNb = count($original_img_path); $i < $fileNb; $i++) {
$replace_what = $original_img_path[$i];
// We only need the directory and the filename /path/to/file_html_files/missing_file.gif -> file_html_files/missing_file.gif

2
main/newscorm/learnpath.class.php
Unescape View File

@ -4141,7 +4141,7 @@ class learnpath
$sql = "SELECT * FROM $tbl_tool WHERE c_id = ".$course_id." AND link='$link' and image='scormbuilder.gif' and link LIKE '$link%' $session_condition";
$result = Database::query($sql);
$num = Database :: num_rows($result);
//if ($this->debug > 2) { error_log('New LP - '.$sql.' - '.$num, 0); }
if (($set_visibility == 'i') && ($num > 0)) {
$sql = "DELETE FROM $tbl_tool WHERE c_id = ".$course_id." AND (link='$link' and image='scormbuilder.gif' $session_condition)";
} elseif (($set_visibility == 'v') && ($num == 0)) {

Write Preview
Loading…
Cancel
Save