@ -1 +1 @@ |
||||
Subproject commit 21b466b72cdd4c823c011669593ecef1defb1f3c |
||||
Subproject commit dc87ea630287f27502eba825fbb19fcc33c34c86 |
@ -0,0 +1,85 @@ |
||||
<?php |
||||
/** |
||||
* Copyright (c) 2013 Georg Ehrke georg@ownCloud.com |
||||
* This file is licensed under the Affero General Public License version 3 or |
||||
* later. |
||||
* See the COPYING-README file. |
||||
*/ |
||||
if(!\OC_App::isEnabled('files_sharing')){ |
||||
exit; |
||||
} |
||||
|
||||
$file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; |
||||
$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '36'; |
||||
$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '36'; |
||||
$scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; |
||||
$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); |
||||
exit; |
||||
} |
||||
|
||||
$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); |
||||
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); |
||||
exit; |
||||
} |
||||
|
||||
$userId = $linkedItem['uid_owner']; |
||||
\OC_Util::setupFS($userId); |
||||
|
||||
$pathId = $linkedItem['file_source']; |
||||
$path = \OC\Files\Filesystem::getPath($pathId); |
||||
$pathInfo = \OC\Files\Filesystem::getFileInfo($path); |
||||
$sharedFile = null; |
||||
|
||||
if($linkedItem['item_type'] === 'folder') { |
||||
$isvalid = \OC\Files\Filesystem::isValidPath($file); |
||||
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); |
||||
exit; |
||||
} |
||||
$sharedFile = \OC\Files\Filesystem::normalizePath($file); |
||||
} |
||||
|
||||
if($linkedItem['item_type'] === 'file') { |
||||
$parent = $pathInfo['parent']; |
||||
$path = \OC\Files\Filesystem::getPath($parent); |
||||
$sharedFile = $pathInfo['name']; |
||||
} |
||||
|
||||
$path = \OC\Files\Filesystem::normalizePath($path, false); |
||||
if(substr($path, 0, 1) === '/') { |
||||
$path = substr($path, 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); |
||||
exit; |
||||
} |
||||
|
||||
$root = 'files/' . $path; |
||||
|
||||
try{ |
||||
$preview = new \OC\Preview($userId, $root); |
||||
$preview->setFile($sharedFile); |
||||
$preview->setMaxX($maxX); |
||||
$preview->setMaxY($maxY); |
||||
$preview->setScalingUp($scalingUp); |
||||
|
||||
$preview->show(); |
||||
} catch (\Exception $e) { |
||||
\OC_Response::setStatus(500); |
||||
\OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG); |
||||
} |
@ -0,0 +1,5 @@ |
||||
<?php |
||||
$this->create('core_ajax_public_preview', '/publicpreview.png')->action( |
||||
function() { |
||||
require_once __DIR__ . '/../ajax/publicpreview.php'; |
||||
}); |
@ -0,0 +1,42 @@ |
||||
<?php |
||||
/** |
||||
* Copyright (c) 2013 Georg Ehrke georg@ownCloud.com |
||||
* This file is licensed under the Affero General Public License version 3 or |
||||
* later. |
||||
* See the COPYING-README file. |
||||
*/ |
||||
\OC_Util::checkLoggedIn(); |
||||
|
||||
if(!\OC_App::isEnabled('files_trashbin')){ |
||||
exit; |
||||
} |
||||
|
||||
$file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; |
||||
$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '44'; |
||||
$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '44'; |
||||
$scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; |
||||
|
||||
if($file === '') { |
||||
\OC_Response::setStatus(400); //400 Bad Request |
||||
\OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG); |
||||
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); |
||||
exit; |
||||
} |
||||
|
||||
try{ |
||||
$preview = new \OC\Preview(\OC_User::getUser(), 'files_trashbin/files'); |
||||
$preview->setFile($file); |
||||
$preview->setMaxX($maxX); |
||||
$preview->setMaxY($maxY); |
||||
$preview->setScalingUp($scalingUp); |
||||
|
||||
$preview->showPreview(); |
||||
}catch(\Exception $e) { |
||||
\OC_Response::setStatus(500); |
||||
\OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG); |
||||
} |
@ -0,0 +1,5 @@ |
||||
<?php |
||||
$this->create('core_ajax_trashbin_preview', '/preview.png')->action( |
||||
function() { |
||||
require_once __DIR__ . '/../ajax/preview.php'; |
||||
}); |
@ -0,0 +1,40 @@ |
||||
<?php |
||||
/** |
||||
* Copyright (c) 2013 Georg Ehrke georg@ownCloud.com |
||||
* This file is licensed under the Affero General Public License version 3 or |
||||
* later. |
||||
* See the COPYING-README file. |
||||
*/ |
||||
\OC_Util::checkLoggedIn(); |
||||
|
||||
$file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; |
||||
$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '36'; |
||||
$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '36'; |
||||
$scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; |
||||
|
||||
if($file === '') { |
||||
//400 Bad Request |
||||
\OC_Response::setStatus(400); |
||||
\OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG); |
||||
exit; |
||||
} |
||||
|
||||
if($maxX === 0 || $maxY === 0) { |
||||
//400 Bad Request |
||||
\OC_Response::setStatus(400); |
||||
\OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG); |
||||
exit; |
||||
} |
||||
|
||||
try{ |
||||
$preview = new \OC\Preview(\OC_User::getUser(), 'files'); |
||||
$preview->setFile($file); |
||||
$preview->setMaxX($maxX); |
||||
$preview->setMaxY($maxY); |
||||
$preview->setScalingUp($scalingUp); |
||||
|
||||
$preview->show(); |
||||
}catch(\Exception $e) { |
||||
\OC_Response::setStatus(500); |
||||
\OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG); |
||||
} |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 663 B |
Before Width: | Height: | Size: 588 B |
Before Width: | Height: | Size: 651 B |
Before Width: | Height: | Size: 591 B After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 5.0 KiB |
Before Width: | Height: | Size: 691 B After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 702 B |
Before Width: | Height: | Size: 479 B |
Before Width: | Height: | Size: 475 B |
Before Width: | Height: | Size: 333 B |
Before Width: | Height: | Size: 344 B |
Before Width: | Height: | Size: 347 B |
Before Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 539 B |
Before Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 464 B After Width: | Height: | Size: 1018 B |
After Width: | Height: | Size: 7.6 KiB |
Before Width: | Height: | Size: 385 B After Width: | Height: | Size: 816 B |
After Width: | Height: | Size: 4.2 KiB |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 8.7 KiB |
Before Width: | Height: | Size: 859 B |
Before Width: | Height: | Size: 603 B |
Before Width: | Height: | Size: 390 B After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 294 B After Width: | Height: | Size: 374 B |
After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 580 B After Width: | Height: | Size: 954 B |
After Width: | Height: | Size: 5.0 KiB |
After Width: | Height: | Size: 757 B |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 1012 B |
After Width: | Height: | Size: 5.5 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 8.9 KiB |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 537 B After Width: | Height: | Size: 709 B |
After Width: | Height: | Size: 5.1 KiB |
Before Width: | Height: | Size: 813 B After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 481 B After Width: | Height: | Size: 959 B |
After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 606 B After Width: | Height: | Size: 976 B |
After Width: | Height: | Size: 7.1 KiB |
Before Width: | Height: | Size: 923 B |
Before Width: | Height: | Size: 452 B |
Before Width: | Height: | Size: 663 B |
Before Width: | Height: | Size: 588 B |
After Width: | Height: | Size: 794 B |
After Width: | Height: | Size: 5.1 KiB |
Before Width: | Height: | Size: 519 B |
@ -1,28 +0,0 @@ |
||||
15.02.2012 |
||||
|
||||
Following new icons have been added: |
||||
core/img/filetypes/application-vnd.oasis.opendocument.formula.png |
||||
core/img/filetypes/application-vnd.oasis.opendocument.graphics.png |
||||
core/img/filetypes/application-vnd.oasis.opendocument.presentation.png |
||||
core/img/filetypes/application-vnd.oasis.opendocument.spreadsheet.png |
||||
core/img/filetypes/application-vnd.oasis.opendocument.text.png |
||||
Download: http://odftoolkit.org/ODF-Icons#ODF_Icons |
||||
License: Apache 2.0 |
||||
|
||||
core/img/filetypes/application-x-7z-compressed.png |
||||
core/img/filetypes/application-x-bzip-compressed-tar.png |
||||
core/img/filetypes/application-x-bzip.png |
||||
core/img/filetypes/application-x-compressed-tar.png |
||||
core/img/filetypes/application-x-deb.png |
||||
core/img/filetypes/application-x-debian-package.png |
||||
core/img/filetypes/application-x-gzip.png |
||||
core/img/filetypes/application-x-lzma-compressed-tar.png |
||||
core/img/filetypes/application-x-rar.png |
||||
core/img/filetypes/application-x-rpm.png |
||||
core/img/filetypes/application-x-tar.png |
||||
core/img/filetypes/application-x-tarz.png |
||||
core/img/filetypes/application-zip.png |
||||
Author: Gomez Hyuuga |
||||
License: Creative Commons Attribution-Share Alike 3.0 Unported License |
||||
Download: http://kde-look.org/content/show.php/?content=101767 |
||||
|
@ -1,22 +0,0 @@ |
||||
Silk icon set 1.3 |
||||
|
||||
_________________________________________ |
||||
Mark James |
||||
http://www.famfamfam.com/lab/icons/silk/ |
||||
_________________________________________ |
||||
|
||||
This work is licensed under a |
||||
Creative Commons Attribution 2.5 License. |
||||
[ http://creativecommons.org/licenses/by/2.5/ ] |
||||
|
||||
This means you may use it for any purpose, |
||||
and make any changes you like. |
||||
All I ask is that you include a link back |
||||
to this page in your credits. |
||||
|
||||
Are you using this icon set? Send me an email |
||||
(including a link or picture if available) to |
||||
mjames@gmail.com |
||||
|
||||
Any other questions about this icon set please |
||||
contact mjames@gmail.com |
Before Width: | Height: | Size: 626 B |
Before Width: | Height: | Size: 566 B |
Before Width: | Height: | Size: 675 B |
After Width: | Height: | Size: 908 B |
After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 524 B |
Before Width: | Height: | Size: 578 B After Width: | Height: | Size: 654 B |
After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 533 B After Width: | Height: | Size: 782 B |
After Width: | Height: | Size: 8.1 KiB |
Before Width: | Height: | Size: 621 B |