Project

General

Profile

Bug #23845 » 16134_04-4.4.diff

Administrator Admin, 2010-12-20 20:34

View differences:

t3lib/thumbs.php (working copy)
exec($cmd);
if (!file_exists($this->output)) {
$this->errorGif('No thumb','generated!',basename($this->input));
} else {
t3lib_div::fixPermissions($this->output);
}
}
// The thumbnail is read and output to the browser
t3lib/class.t3lib_iconworks.php (working copy)
} else {
@ImageGif($im, $path);
}
if (@is_file($path)) {
t3lib_div::fixPermissions($path);
}
}
t3lib/class.t3lib_div.php (working copy)
exec($cmd);
$returnCode='IM';
if (@is_file($theFile)) {
self::fixPermissions($theFile);
}
} elseif (($type=='GD' || !$type) && $gfxConf['gdlib'] && !$gfxConf['gdlib_png']) { // GD
$tempImage = imageCreateFromGif($theFile);
imageGif($tempImage, $theFile);
imageDestroy($tempImage);
$returnCode='GD';
if (@is_file($theFile)) {
self::fixPermissions($theFile);
}
}
}
return $returnCode;
......
$cmd = self::imageMagickCommand('convert', '"'.$theFile.'" "'.$newFile.'"', $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path_lzw']);
exec($cmd);
$theFile = $newFile;
if (@is_file($newFile)) {
self::fixPermissions($newFile);
}
// unlink old file?? May be bad idea bacause TYPO3 would then recreate the file every time as TYPO3 thinks the file is not generated because it's missing!! So do not unlink $theFile here!!
}
return $theFile;
......
$newFile = PATH_site.'typo3temp/readPG_'.md5($theFile.'|'.filemtime($theFile)).($output_png?'.png':'.gif');
$cmd = self::imageMagickCommand('convert', '"'.$theFile.'" "'.$newFile.'"', $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path']);
exec($cmd);
if (@is_file($newFile)) return $newFile;
if (@is_file($newFile)) {
self::fixPermissions($newFile);
return $newFile;
}
}
}
}
......
fwrite($file, date($dateFormat.' '.$timeFormat).$msgLine.LF);
flock($file, LOCK_UN); // release the lock
fclose($file);
self::fixPermissions($destination);
}
}
// send message per mail
......
@fwrite($file, $date . $msg . LF);
flock($file, LOCK_UN); // release the lock
@fclose($file);
self::fixPermissions($destination);
}
}
t3lib/class.t3lib_lock.php (working copy)
if (($this->filepointer = touch($this->resource)) == FALSE) {
throw new Exception('Lock file could not be created');
}
t3lib_div::fixPermissions($this->resource);
break;
case 'flock':
if (($this->filepointer = fopen($this->resource, 'w+')) == FALSE) {
(4-4/6)