mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 20:42:22 +02:00
Code Issues Projects Releases Wiki Activity

Revert " MDL-45044 filter_tex: properly escape excutable pathnames for Windows"

Browse Source 
This reverts commit f0da509835e3b8740c1693216a430dc3195cdb92.
This commit is contained in:
Eloy Lafuente (stronk7) 2014-06-26 10:06:20 +02:00
parent d70fe4f8d9
commit 078379a9aa
4 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
filter/tex/latex.php
View File

@ -94,7 +94,6 @@
if (empty($pathlatex)) {
return false;
}
$pathlatex = escapeshellarg(trim($pathlatex, " '\""));
$doc = $this->construct_latex_document( $formula, $fontsize );
@ -118,7 +117,7 @@
}
// run dvips (.dvi to .ps)
$pathdvips = escapeshellarg(trim(get_config('filter_tex', 'pathdvips'), " '\""));
$pathdvips = get_config('filter_tex', 'pathdvips');
$command = "{$pathdvips} -E $dvi -o $ps";
if ($this->execute($command, $log )) {
return false;
@ -130,7 +129,7 @@
} else {
$bg_opt = "";
}
$pathconvert = escapeshellarg(trim(get_config('filter_tex', 'pathconvert'), " '\""));
$pathconvert = get_config('filter_tex', 'pathconvert');
$command = "{$pathconvert} -density $density -trim $bg_opt $ps $img";
if ($this->execute($command, $log )) {
return false;

5
filter/tex/lib.php
View File

@ -125,9 +125,8 @@ function filter_tex_updatedcallback($name) {
return;
}
$pathlatex = trim($pathlatex, " '\"");
$pathdvips = trim(get_config('filter_tex', 'pathdvips'), " '\"");
$pathconvert = trim(get_config('filter_tex', 'pathconvert'), " '\"");
$pathdvips = get_config('filter_tex', 'pathdvips');
$pathconvert = get_config('filter_tex', 'pathconvert');
if (!(is_file($pathlatex) && is_executable($pathlatex) &&
is_file($pathdvips) && is_executable($pathdvips) &&

16
filter/tex/settings.php
View File

@ -50,9 +50,9 @@ if ($ADMIN->fulltree) {
} else if (PHP_OS=='WINNT' or PHP_OS=='WIN32' or PHP_OS=='Windows') {
// note: you need Ghostscript installed (standard), miktex (standard)
// and ImageMagick (install at c:\ImageMagick)
$default_filter_tex_pathlatex = "c:\\texmf\\miktex\\bin\\latex.exe";
$default_filter_tex_pathdvips = "c:\\texmf\\miktex\\bin\\dvips.exe";
$default_filter_tex_pathconvert = "c:\\imagemagick\\convert.exe";
$default_filter_tex_pathlatex = "\"c:\\texmf\\miktex\\bin\\latex.exe\" ";
$default_filter_tex_pathdvips = "\"c:\\texmf\\miktex\\bin\\dvips.exe\" ";
$default_filter_tex_pathconvert = "\"c:\\imagemagick\\convert.exe\" ";
} else {
$default_filter_tex_pathlatex = '';
@ -60,16 +60,6 @@ if ($ADMIN->fulltree) {
$default_filter_tex_pathconvert = '';
}
$pathlatex = get_config('filter_tex', 'pathlatex');
$pathdvips = get_config('filter_tex', 'pathdvips');
$pathconvert = get_config('filter_tex', 'pathconvert');
if (strrpos($pathlatex . $pathdvips . $pathconvert, '"') or
strrpos($pathlatex . $pathdvips . $pathconvert, "'")) {
set_config('pathlatex', trim($pathlatex, " '\""), 'filter_tex');
set_config('pathdvips', trim($pathdvips, " '\""), 'filter_tex');
set_config('pathconvert', trim($pathconvert, " '\""), 'filter_tex');
}
$items[] = new admin_setting_configexecutable('filter_tex/pathlatex', get_string('pathlatex', 'filter_tex'), '', $default_filter_tex_pathlatex);
$items[] = new admin_setting_configexecutable('filter_tex/pathdvips', get_string('pathdvips', 'filter_tex'), '', $default_filter_tex_pathdvips);
$items[] = new admin_setting_configexecutable('filter_tex/pathconvert', get_string('pathconvert', 'filter_tex'), '', $default_filter_tex_pathconvert);

9
filter/tex/texdebug.php
View File

@ -200,7 +200,7 @@
// first check if it is likely to work at all
$output .= "<h3>Checking executables</h3>\n";
$executables_exist = true;
$pathlatex = trim(get_config('filter_tex', 'pathlatex'), " '\"");
$pathlatex = get_config('filter_tex', 'pathlatex');
if (is_file($pathlatex)) {
$output .= "latex executable ($pathlatex) is readable<br />\n";
}
@ -208,7 +208,7 @@
$executables_exist = false;
$output .= "<b>Error:</b> latex executable ($pathlatex) is not readable<br />\n";
}
$pathdvips = trim(get_config('filter_tex', 'pathdvips'), " '\"");
$pathdvips = get_config('filter_tex', 'pathdvips');
if (is_file($pathdvips)) {
$output .= "dvips executable ($pathdvips) is readable<br />\n";
}
@ -216,7 +216,7 @@
$executables_exist = false;
$output .= "<b>Error:</b> dvips executable ($pathdvips) is not readable<br />\n";
}
$pathconvert = trim(get_config('filter_tex', 'pathconvert'), " '\"");
$pathconvert = get_config('filter_tex', 'pathconvert');
if (is_file($pathconvert)) {
$output .= "convert executable ($pathconvert) is readable<br />\n";
}
@ -248,17 +248,14 @@
chdir($latex->temp_dir);
// step 1: latex command
$pathlatex = escapeshellarg($pathlatex);
$cmd = "$pathlatex --interaction=nonstopmode --halt-on-error $tex";
$output .= execute($cmd);
// step 2: dvips command
$pathdvips = escapeshellarg($pathdvips);
$cmd = "$pathdvips -E $dvi -o $ps";
$output .= execute($cmd);
// step 3: convert command
$pathconvert = escapeshellarg($pathconvert);
$cmd = "$pathconvert -density 240 -trim $ps $img ";
$output .= execute($cmd);