gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-16 21:12:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2024-01-02 17:58:39 +01:00
commit 3af7ce8177
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/inc.ClassConversionServiceImageToImage.php
View File

@ -86,9 +86,9 @@ class SeedDMS_ConversionServiceImageToImage extends SeedDMS_ConversionServiceBas
break;
}
if($im) {
$size = getimagesize($infile);
$width = imagesx($im);
if(!empty($params['width']))
$im = imagescale($im, min((int) $params['width'], $size[0]));
$im = imagescale($im, min((int) $params['width'], $width));
$end = microtime(true);
if($this->logger) {
$this->logger->log('Conversion from '.$this->from.' to '.$this->to.' with gd image service took '.($end-$start).' sec.', PEAR_LOG_INFO);
@ -97,7 +97,7 @@ class SeedDMS_ConversionServiceImageToImage extends SeedDMS_ConversionServiceBas
return imagepng($im, $target);
} else {
ob_start();
var_dump(imagepng($im));
echo imagepng($im);
$image = ob_get_clean();
return $image;
}

3
webdav/webdav.php
View File

@ -877,6 +877,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
*/
function MKCOL($options) /* {{{ */
{
global $fulltextservice;
$this->log_options('MKCOL', $options);
$path = $options["path"];
@ -925,6 +927,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
$controller = Controller::factory('AddSubFolder');
$controller->setParam('dms', $this->dms);
$controller->setParam('user', $this->user);
$controller->setParam('fulltextservice', $fulltextservice);
$controller->setParam('folder', $folder);
$controller->setParam('name', $name);
$controller->setParam('comment', '');