From 17fe7fed401a267692fbcacd5e3d3fbdaf3ca885 Mon Sep 17 00:00:00 2001 From: Dominik Date: Wed, 6 Apr 2016 15:33:08 +0200 Subject: [PATCH] fix unreachable code --- php/chars-test.php | 1 - php/elFinderVolumeDriver.class.php | 12 ------------ php/elFinderVolumeDropbox.class.php | 22 ---------------------- 3 files changed, 35 deletions(-) diff --git a/php/chars-test.php b/php/chars-test.php index 60f8a7bc7..80d86659c 100644 --- a/php/chars-test.php +++ b/php/chars-test.php @@ -6,7 +6,6 @@ header('Content-Type: text/html; charset=utf-8'); echo 'белая собака'; echo strToLower('белая собака'); -exit(); $orig = 'ёЁйЙØÅŻ'; echo $orig.'
'; $path = '../../../files/tmp/'; diff --git a/php/elFinderVolumeDriver.class.php b/php/elFinderVolumeDriver.class.php index 038604dc7..43741ee95 100644 --- a/php/elFinderVolumeDriver.class.php +++ b/php/elFinderVolumeDriver.class.php @@ -4713,18 +4713,6 @@ abstract class elFinderVolumeDriver { } return $result; - - - - if ($destformat == 'jpg' || ($destformat == null && $mime == 'image/jpeg')) { - return imagejpeg($image, $filename, $jpgQuality); - } - - if ($destformat == 'gif' || ($destformat == null && $mime == 'image/gif')) { - return imagegif($image, $filename, 7); - } - - return imagepng($image, $filename, 7); } /** diff --git a/php/elFinderVolumeDropbox.class.php b/php/elFinderVolumeDropbox.class.php index 7832b9c42..1bded25e2 100644 --- a/php/elFinderVolumeDropbox.class.php +++ b/php/elFinderVolumeDropbox.class.php @@ -1429,7 +1429,6 @@ class elFinderVolumeDropbox extends elFinderVolumeDriver { **/ protected function _unpack($path, $arc) { die('Not yet implemented. (_unpack)'); - return false; } /** @@ -1441,26 +1440,6 @@ class elFinderVolumeDropbox extends elFinderVolumeDriver { **/ protected function _findSymlinks($path) { die('Not yet implemented. (_findSymlinks)'); - if (is_link($path)) { - return true; - } - if (is_dir($path)) { - foreach (self::localScandir($path) as $name) { - $p = $path.DIRECTORY_SEPARATOR.$name; - if (is_link($p)) { - return true; - } - if (is_dir($p) && $this->_findSymlinks($p)) { - return true; - } elseif (is_file($p)) { - $this->archiveSize += filesize($p); - } - } - } else { - $this->archiveSize += filesize($path); - } - - return false; } /** @@ -1490,7 +1469,6 @@ class elFinderVolumeDropbox extends elFinderVolumeDriver { **/ protected function _archive($dir, $files, $name, $arc) { die('Not yet implemented. (_archive)'); - return false; } } // END class