Fix URL link (use absolute URL, adding space, format code)

pull/2487/head
jmontoyaa 8 years ago
parent 0df6764e7f
commit 20a2464a56
  1. 12
      main/inc/lib/document.lib.php
  2. 2
      main/lp/lp_add_audio.php

@ -3411,7 +3411,7 @@ class DocumentManager
$session_id = 0, $session_id = 0,
$add_move_button = false, $add_move_button = false,
$filter_by_folder = null, $filter_by_folder = null,
$overwrite_url = null, $overwrite_url = '',
$showInvisibleFiles = false, $showInvisibleFiles = false,
$showOnlyFolders = false, $showOnlyFolders = false,
$folderId = false $folderId = false
@ -3420,7 +3420,6 @@ class DocumentManager
return ''; return '';
} }
$overwrite_url = Security::remove_XSS($overwrite_url);
$user_id = api_get_user_id(); $user_id = api_get_user_id();
$userInfo = api_get_user_info(); $userInfo = api_get_user_info();
@ -3746,7 +3745,7 @@ class DocumentManager
// Show the "image name" not the filename of the image. // Show the "image name" not the filename of the image.
if ($lp_id) { if ($lp_id) {
// LP URL // LP URL
$url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&action=add_item&type='.TOOL_DOCUMENT.'&file='.$documentId.'&lp_id='.$lp_id; $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&action=add_item&type='.TOOL_DOCUMENT.'&file='.$documentId.'&lp_id='.$lp_id;
if (!empty($overwrite_url)) { if (!empty($overwrite_url)) {
$url = $overwrite_url.'&cidReq='.$course_info['code'].'&id_session='.$session_id.'&document_id='.$documentId.''; $url = $overwrite_url.'&cidReq='.$course_info['code'].'&id_session='.$session_id.'&document_id='.$documentId.'';
} }
@ -3764,12 +3763,13 @@ class DocumentManager
} }
$link = Display::url( $link = Display::url(
'<img alt="" src="'.$img.'" title="" />&nbsp;'.$my_file_title, $url, '<img alt="" src="'.$img.'" title="" />&nbsp;'.$my_file_title,
$url,
array('target' => $target, 'class' => 'moved') array('target' => $target, 'class' => 'moved')
); );
$directUrl = $web_code_path.'document/document.php?cidReq='.$course_info['code'].'&id_session='.$session_id.'&id='.$documentId; $directUrl = $web_code_path.'document/document.php?cidReq='.$course_info['code'].'&id_session='.$session_id.'&id='.$documentId;
$link .= Display::url( $link .= '&nbsp;'.Display::url(
Display::return_icon('preview_view.png', get_lang('Preview')), Display::return_icon('preview_view.png', get_lang('Preview')),
$directUrl, $directUrl,
['target' => '_blank'] ['target' => '_blank']
@ -3909,7 +3909,7 @@ class DocumentManager
$lp_id = false, $lp_id = false,
$target = '', $target = '',
$add_move_button = false, $add_move_button = false,
$overwrite_url = null, $overwrite_url = '',
$folderId = false $folderId = false
) { ) {
$return = ''; $return = '';

@ -160,7 +160,7 @@ $documentTree = DocumentManager::get_document_preview(
api_get_session_id(), api_get_session_id(),
false, false,
'', '',
urlencode('lp_controller.php?action=add_audio&lp_id='.$lp->get_id().'&id='.$lp_item_id), api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?action=add_audio&lp_id='.$lp->get_id().'&id='.$lp_item_id,
false, false,
true true
//$folderId = false //$folderId = false

Loading…
Cancel
Save