remove \OC\Preview::showErrorPreview

diff --git a/core/ajax/preview.php b/core/ajax/preview.php
index a9d127ffcc48ea0aab289ac3645c28bac564de8d..486155831d72324e76bf1ab9b76b82b8f03e7381 100644 (file)
--- a/core/ajax/preview.php
+++ b/core/ajax/preview.php
@@ -15,14 +15,12 @@ $scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] :
 if($file === '') {
        \OC_Response::setStatus(400); //400 Bad Request
        \OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG);
-       \OC\Preview::showErrorPreview();
        exit;
 }
 
 if($maxX === 0 || $maxY === 0) {
        \OC_Response::setStatus(400); //400 Bad Request
        \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG);
-       \OC\Preview::showErrorPreview();
        exit;
 }
 
@@ -37,6 +35,5 @@ try{
 }catch(\Exception $e) {
        \OC_Response::setStatus(500);
        \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
-       \OC\Preview::showErrorPreview();
        exit;
 }
\ No newline at end of file

diff --git a/core/ajax/publicpreview.php b/core/ajax/publicpreview.php
index 955fbc2626a46394e68474218acb92bec9b63d48..83194d5349c2e768ce5f327c8df5e1feaca81209 100644 (file)
--- a/core/ajax/publicpreview.php
+++ b/core/ajax/publicpreview.php
@@ -18,7 +18,6 @@ $token = array_key_exists('t', $_GET) ? (string) $_GET['t'] : '';
 if($token === ''){
        \OC_Response::setStatus(400); //400 Bad Request
        \OC_Log::write('core-preview', 'No token parameter was passed', \OC_Log::DEBUG);
-       \OC\Preview::showErrorPreview();
        exit;
 }
 
@@ -26,14 +25,12 @@ $linkedItem = \OCP\Share::getShareByToken($token);
 if($linkedItem === false || ($linkedItem['item_type'] !== 'file' && $linkedItem['item_type'] !== 'folder')) {
        \OC_Response::setStatus(404);
        \OC_Log::write('core-preview', 'Passed token parameter is not valid', \OC_Log::DEBUG);
-       \OC\Preview::showErrorPreview();
        exit;
 }
 
 if(!isset($linkedItem['uid_owner']) || !isset($linkedItem['file_source'])) {
        \OC_Response::setStatus(500);
        \OC_Log::write('core-preview', 'Passed token seems to be valid, but it does not contain all necessary information . ("' . $token . '")', \OC_Log::WARN);
-       \OC\Preview::showErrorPreview();
        exit;
 }
 
@@ -50,7 +47,6 @@ if($linkedItem['item_type'] === 'folder') {
        if(!$isvalid) {
                \OC_Response::setStatus(400); //400 Bad Request
                \OC_Log::write('core-preview', 'Passed filename is not valid, might be malicious (file:"' . $file . '";ip:"' . $_SERVER['REMOTE_ADDR'] . '")', \OC_Log::WARN);
-               \OC\Preview::showErrorPreview();
                exit;
        }
        $sharedFile = \OC\Files\Filesystem::normalizePath($file);
@@ -70,7 +66,6 @@ if(substr($path, 0, 1) === '/') {
 if($maxX === 0 || $maxY === 0) {
        \OC_Response::setStatus(400); //400 Bad Request
        \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG);
-       \OC\Preview::showErrorPreview();
        exit;
 }
 
@@ -87,6 +82,5 @@ try{
 } catch (\Exception $e) {
        \OC_Response::setStatus(500);
        \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
-       \OC\Preview::showErrorPreview();
        exit;
 }
\ No newline at end of file

diff --git a/core/ajax/trashbinpreview.php b/core/ajax/trashbinpreview.php
index d018a57d37b190b9d02a0c988f0fbc802932f739..a916dcf229fcc85cd314f337a353f2147a910a90 100644 (file)
--- a/core/ajax/trashbinpreview.php
+++ b/core/ajax/trashbinpreview.php
@@ -19,14 +19,12 @@ $scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] :
 if($file === '') {
        \OC_Response::setStatus(400); //400 Bad Request
        \OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG);
-       \OC\Preview::showErrorPreview();
        exit;
 }
 
 if($maxX === 0 || $maxY === 0) {
        \OC_Response::setStatus(400); //400 Bad Request
        \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG);
-       \OC\Preview::showErrorPreview();
        exit;
 }
 
@@ -41,6 +39,5 @@ try{
 }catch(\Exception $e) {
        \OC_Response::setStatus(500);
        \OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
-       \OC\Preview::showErrorPreview();
        exit;
 }
\ No newline at end of file

diff --git a/lib/preview.php b/lib/preview.php
index 9f4d20b465074029b0a53a5fed235341dd94819c..92cc87c58971e69eb01a0b844c127ad5d295b412 100755 (executable)
--- a/lib/preview.php
+++ b/lib/preview.php
@@ -611,11 +611,4 @@ class Preview {
                }
                return false;
        }
-
-       private static function showErrorPreview() {
-               $path = \OC::$SERVERROOT . '/core/img/actions/delete.png';
-               $preview = new \OC_Image($path);
-               $preview->preciseResize(36, 36);
-               $preview->show();
-       }
 }
\ No newline at end of file