mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
fixes reported quote issue on $file in shel exec commands (MDL14325)
This commit is contained in:
parent
3204b7a286
commit
8553d70023
2 changed files with 2 additions and 2 deletions
|
@ -34,7 +34,7 @@ function get_text_for_indexing_doc(&$resource){
|
||||||
else{
|
else{
|
||||||
$file = escapeshellarg($CFG->dataroot.'/'.$resource->course.'/'.$resource->reference);
|
$file = escapeshellarg($CFG->dataroot.'/'.$resource->course.'/'.$resource->reference);
|
||||||
$command = trim($CFG->block_search_word_to_text_cmd);
|
$command = trim($CFG->block_search_word_to_text_cmd);
|
||||||
$text_converter_cmd = "{$moodleroot}{$command} \"$file\"";
|
$text_converter_cmd = "{$moodleroot}{$command} $file";
|
||||||
if ($CFG->block_search_word_to_text_env){
|
if ($CFG->block_search_word_to_text_env){
|
||||||
putenv($CFG->block_search_word_to_text_env);
|
putenv($CFG->block_search_word_to_text_env);
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@ function get_text_for_indexing_pdf(&$resource){
|
||||||
else{
|
else{
|
||||||
$file = escapeshellarg($CFG->dataroot.'/'.$resource->course.'/'.$resource->reference);
|
$file = escapeshellarg($CFG->dataroot.'/'.$resource->course.'/'.$resource->reference);
|
||||||
$command = trim($CFG->block_search_pdf_to_text_cmd);
|
$command = trim($CFG->block_search_pdf_to_text_cmd);
|
||||||
$text_converter_cmd = "{$moodleroot}{$command} \"$file\" -";
|
$text_converter_cmd = "{$moodleroot}{$command} $file -";
|
||||||
$result = shell_exec($text_converter_cmd);
|
$result = shell_exec($text_converter_cmd);
|
||||||
if ($result){
|
if ($result){
|
||||||
return $result;
|
return $result;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue