Bug #21165 » 12090_trunk-v2.diff
| t3lib/class.t3lib_stdgraphic.php (Arbeitskopie) | ||
|---|---|---|
|
$this->IM_commands[] = array($output,$cmd);
|
||
|
$ret = exec($cmd);
|
||
|
t3lib_div::fixPermissions($this->wrapFileName($output)); // Change the permissions of the file
|
||
|
t3lib_div::fixPermissions($output); // Change the permissions of the file
|
||
|
return $ret;
|
||
|
}
|
||
| ... | ... | |
|
$this->IM_commands[] = Array ($output,$cmd);
|
||
|
$ret = exec($cmd);
|
||
|
t3lib_div::fixPermissions($this->wrapFileName($output)); // Change the permissions of the file
|
||
|
t3lib_div::fixPermissions($output); // Change the permissions of the file
|
||
|
if (is_file($theMask)) {
|
||
|
@unlink($theMask);
|
||
| ... | ... | |
|
}
|
||
|
/**
|
||
|
* Wrapping the input filename in double-quotes
|
||
|
* Escapes a file name so it can safely be used on the command line.
|
||
|
*
|
||
|
* @param string Input filename
|
||
|
* @return string The output wrapped in "" (if there are spaces in the filepath)
|
||
|
* @access private
|
||
|
* @param string $inputName filename to safeguard, must not be empty
|
||
|
*
|
||
|
* @return string $inputName escaped as needed
|
||
|
*/
|
||
|
function wrapFileName($inputName) {
|
||
|
if (strstr($inputName,' ')) {
|
||
|
$inputName='"'.$inputName.'"';
|
||
|
}
|
||
|
return $inputName;
|
||
|
protected function wrapFileName($inputName) {
|
||
|
return escapeshellarg($inputName);
|
||
|
}
|
||