admin/Studio-42-elFinder
1
0
Fork 0
mirror of https://github.com/Studio-42/elFinder synced 2026-06-08 12:37:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,951 Commits 9 Branches 143 Tags
master
Commit Graph

28 Commits

Author SHA1 Message Date
Naoki Sawada 2a860167b8 fix: improve PHP 8 compatibility in session, cURL, and callback handling (#3780) 
- replace curl_close() handling for PHP 8 CurlHandle compatibility
- refine session cookie params and read-only session behavior
- change session get() default fallback from '' to null
- improve OAuth callback window close/message fallback
- add type-safe adjustments in watermark processing
 2026-04-20 10:28:31 +09:00
nao-pon 08300ac5f1 [php:core] fix #3120 allow plugins (Sanitizer etc) to be applied when pasting from another volume 2020-03-03 15:38:01 +09:00
nao-pon 674bbb744e [php:plugins:Watermark] repeated use of Imagick::compositeImage() may cause PHP to hang, so disable it 
rel. #3041
 2020-02-06 23:35:29 +09:00
nao-pon 28bb822aef [php:plugins] tiny correction 2019-02-03 18:23:05 +09:00
nao-pon 15cc46ea27 [php] change code style to PSR-2 of all of php files 2019-01-01 21:18:39 +09:00
nao-pon 759df980c0 [php:plugin] fix #2649 disable content editing plugin when saving data in OnlineConvert 2018-09-07 21:35:12 +09:00
nao-pon db57d2bea5 [php:plugin:Watermark] fix #2621 add option ratio, position, marginX and marginY 2018-08-19 15:32:16 +09:00
N. Petkov f1c59f6253 [php:plugin] add option onDropWith for plugin function iaEnabled (#2442) 
* Add option onDropWith for plugin function iaEnabled

* change to tab indent
 2018-03-26 23:32:46 +09:00
nao-pon 2a63106e87 [php:plugin:watermark] remove debug code 2018-03-22 23:40:30 +09:00
nao-pon a6c516d899 [php:core] fix #2402 add an option memoryLimitGD to connector main options 
```php
$opts = array(
    // Maximum memory size to be extended during GD processing
    // (0: not expanded, -1: unlimited or memory size notation)
    'memoryLimitGD' => '256M',
    'roots'  => array(
        array(
            'driver' => 'LocalFileSystem',
            'path'   => '/path/to/files/',
            'URL'    => 'http://localhost/to/files/'
        )
    )
);
```
 2018-02-24 16:12:29 +09:00
nao-pon 5d8eb55e2d [php:plugin:watermark] report error message into debug tab 
ref. #2372
 2018-02-03 00:26:01 +09:00
nao-pon f1e2ff1cb8 [php:plugin:watermark] add an option interlace 
```php
'interlace' => IMG_GIF|IMG_JPG, // Set interlacebit image formats ( bit-field )
```
 2017-10-27 23:50:38 +09:00
nao-pon 75302848ad [php:plugins] fix #2198 AutoResize/AutoRotate/Watermark fail if php fileinfo module not loaded 2017-09-12 11:02:56 +09:00
nao-pon 3c3b233a6e [VD:abstract,plugin] fix #2160 animation of apng is lost 2017-08-22 15:54:59 +09:00
nao-pon 9c26ac5e9a [php] Refactoring variable names more friendly 
c.f. #1983
 2017-04-24 10:51:46 +09:00
nao-pon 75a14f6a36 [php:plugin] fix #1807 enable/disable plugin by pressing meta key on DnD upload 2016-12-15 00:24:48 +09:00
nao-pon f3c1ef2a1d [php:plugins] fix notice error 2016-07-28 17:35:17 +09:00
nao-pon e88048a205 [php] add PHP error handler and remove @ error-control operator 2016-05-13 17:13:31 +09:00
nao-pon 54bea258f7 [plugin:AutoResize,Watermark] fix notice error 2016-01-24 00:11:03 +09:00
nao-pon aa58030bf7 [php] fix #1162 to set false to second param of class_exists() 2015-12-11 21:57:14 +09:00
nao-pon ceef1b6813 [plugin:Watermark] use elFinder::isAnimationGif() 2015-07-22 17:19:59 +09:00
nao-pon dd31b3d236 [php:plugin:Watermark] It isn't applied to Animation GIF 2015-07-21 22:02:54 +09:00
nao-pon 6cb76dbfd2 [php.plugin] add usage comments (AutoResize,Watermark) 2014-11-24 09:33:25 +09:00
nao-pon 34a97ead72 [plugin:Watermark] support class "Imagick" 2013-07-15 21:21:21 +09:00
nao-pon 3c4cbbee2c [plugin:Watermark] fix volume driver options plugin-Watermark-source 2013-07-14 18:29:41 +09:00
nao-pon afcc1e11b7 [plugin:Watermark] support volume driver option "plugin" 
# Connector configuration options

$opts = array(
    'roots'  => array(
         array(
            'driver' => 'LocalFileSystem',
            'path'   => '/path/to/files/',
            'URL'    => 'http://localhost/to/files/',
            'plugin' => array(
                /* optional, this volume values are */
                'Watermark' => array(
                    'enable'         => true,       // For control by volume driver
                    'source'         => 'logo.png', // Path to Water mark image
                    'marginRight'    => 5,          // Margin right pixel
                    'marginBottom'   => 5,          // Margin bottom pixel
                    'quality'        => 90,         // JPEG image save quality
                    'transparency'   => 90, // Water mark image transparency
                                            // ( other than PNG )
                    'targetType'     => IMG_GIF|IMG_JPG|IMG_PNG|IMG_WBMP,
                                        // Target image formats ( bit-field )
                    'targetMinPixel' => 200         // Target image minimum 
                                                    // pixel size
                ),
            ),
    ),
    'bind'   => array(
        /* regist action, require */
        'upload.presave' => 'Plugin.Watermark.onUpLoadPreSave',
    ),
    'plugin' => array(
        /* optional, All volume's default values are */
        'Watermark' => array(
            'enable'         => true,       // For control by volume driver
            'source'         => 'logo.png', // Path to Water mark image
            'marginRight'    => 5,          // Margin right pixel
            'marginBottom'   => 5,          // Margin bottom pixel
            'quality'        => 90,         // JPEG image save quality
            'transparency'   => 90, // Water mark image transparency
                                    // ( other than PNG )
            'targetType'     => IMG_GIF|IMG_JPG|IMG_PNG|IMG_WBMP,
                                // Target image formats ( bit-field )
            'targetMinPixel' => 200         // Target image minimum 
                                            // pixel size
        ),
    ),
);
$connector = new elFinderConnector(new xelFinder($opts), true);
$connector->run();
 2013-07-14 16:18:55 +09:00
nao-pon 99b968a0d3 [plugin:Watermark] fix PNG blending 2013-07-14 01:51:12 +09:00
nao-pon 04d55c87a5 add watermark plugin 
# Connector configuration options

$opts = array(
	'roots'  => array(...),
	'bind'   => array(
		/* regist action, require */
		'upload.presave' => 'Plugin.Watermark.onUpLoadPreSave',
	),
	'plugin' => array(
		/* optional, default values are */
		'Watermark' => array(
			'source'         => 'logo.png', // Path to Water mark image
			'marginRight'    => 5,          // Margin right pixel
			'marginBottom'   => 5,          // Margin bottom pixel
			'quality'        => 90,         // JPEG image save quality
			'transparency'   => 90, // Water mark image transparency
			                        // ( other than PNG )
			'targetType'     => IMG_GIF|IMG_JPG|IMG_PNG|IMG_WBMP,
			                    // Target image formats ( bit-field )
			'targetMinPixel' => 200         // Target image minimum 
			                                // pixel size
		),
	),
);
$connector = new elFinderConnector(new xelFinder($opts), true);
$connector->run();
 2013-07-13 20:32:43 +09:00