mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix comparisons in the sharing app 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2017-05-10 14:16:22 +02:00 committed by Morris Jobke
parent 7a62fbd205
commit 80febeae21
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/lib/Controller/ShareController.php
View File

@ -514,7 +514,7 @@ class ShareController extends Controller {
$this->emitAccessShareHook($share); $this->emitAccessShareHook($share);
$server_params = array( 'head' => $this->request->getMethod() == 'HEAD' ); $server_params = array( 'head' => $this->request->getMethod() === 'HEAD' );
/** /**
* Http range requests support * Http range requests support

4
apps/files_sharing/lib/Helper.php
View File

@ -132,7 +132,7 @@ class Helper {
Filesystem::initMountPoints($owner); Filesystem::initMountPoints($owner);
$info = Filesystem::getFileInfo($target); $info = Filesystem::getFileInfo($target);
$ownerView = new View('/'.$owner.'/files'); $ownerView = new View('/'.$owner.'/files');
if ( $owner != User::getUser() ) { if ( $owner !== User::getUser() ) {
$path = $ownerView->getPath($info['fileid']); $path = $ownerView->getPath($info['fileid']);
} else { } else {
$path = $target; $path = $target;
@ -183,7 +183,7 @@ class Helper {
$uid = User::getUser(); $uid = User::getUser();
} }
Filesystem::initMountPoints($uid); Filesystem::initMountPoints($uid);
if ( $uid != User::getUser() ) { if ( $uid !== User::getUser() ) {
$info = Filesystem::getFileInfo($filename); $info = Filesystem::getFileInfo($filename);
$ownerView = new View('/'.$uid.'/files'); $ownerView = new View('/'.$uid.'/files');
try { try {

8
apps/files_sharing/lib/ShareBackend/File.php
View File

@ -123,7 +123,7 @@ class File implements \OCP\Share_Backend_File_Dependent {
} }
public function formatItems($items, $format, $parameters = null) { public function formatItems($items, $format, $parameters = null) {
if ($format == self::FORMAT_SHARED_STORAGE) { if ($format === self::FORMAT_SHARED_STORAGE) {
// Only 1 item should come through for this format call // Only 1 item should come through for this format call
$item = array_shift($items); $item = array_shift($items);
return array( return array(
@ -133,7 +133,7 @@ class File implements \OCP\Share_Backend_File_Dependent {
'permissions' => $item['permissions'], 'permissions' => $item['permissions'],
'uid_owner' => $item['uid_owner'], 'uid_owner' => $item['uid_owner'],
); );
} else if ($format == self::FORMAT_GET_FOLDER_CONTENTS) { } else if ($format === self::FORMAT_GET_FOLDER_CONTENTS) {
$files = array(); $files = array();
foreach ($items as $item) { foreach ($items as $item) {
$file = array(); $file = array();
@ -156,13 +156,13 @@ class File implements \OCP\Share_Backend_File_Dependent {
$files[] = $file; $files[] = $file;
} }
return $files; return $files;
} else if ($format == self::FORMAT_OPENDIR) { } else if ($format === self::FORMAT_OPENDIR) {
$files = array(); $files = array();
foreach ($items as $item) { foreach ($items as $item) {
$files[] = basename($item['file_target']); $files[] = basename($item['file_target']);
} }
return $files; return $files;
} else if ($format == self::FORMAT_GET_ALL) { } else if ($format === self::FORMAT_GET_ALL) {
$ids = array(); $ids = array();
foreach ($items as $item) { foreach ($items as $item) {
$ids[] = $item['file_source']; $ids[] = $item['file_source'];

4
apps/files_sharing/lib/ShareBackend/Folder.php
View File

@ -83,7 +83,7 @@ class Folder extends File implements \OCP\Share_Backend_Collection {
$query = \OCP\DB::prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?'); $query = \OCP\DB::prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?');
$result = $query->execute(array('httpd/unix-directory')); $result = $query->execute(array('httpd/unix-directory'));
if ($row = $result->fetchRow()) { if ($row = $result->fetchRow()) {
$mimetype = $row['id']; $mimetype = (int) $row['id'];
} else { } else {
$mimetype = -1; $mimetype = -1;
} }
@ -96,7 +96,7 @@ class Folder extends File implements \OCP\Share_Backend_Collection {
while ($file = $result->fetchRow()) { while ($file = $result->fetchRow()) {
$children[] = array('source' => $file['fileid'], 'file_path' => $file['name']); $children[] = array('source' => $file['fileid'], 'file_path' => $file['name']);
// If a child folder is found look inside it // If a child folder is found look inside it
if ($file['mimetype'] == $mimetype) { if ((int) $file['mimetype'] === $mimetype) {
$parents[] = $file['fileid']; $parents[] = $file['fileid'];
} }
} }

2
apps/files_sharing/templates/public.php
View File

@ -75,7 +75,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
<?php if (isset($_['folder'])): ?> <?php if (isset($_['folder'])): ?>
<?php print_unescaped($_['folder']); ?> <?php print_unescaped($_['folder']); ?>
<?php else: ?> <?php else: ?>
<?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?> <?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) === 'video'): ?>
<div id="imgframe"> <div id="imgframe">
<video tabindex="0" controls="" preload="none" style="max-width: <?php p($_['previewMaxX']); ?>px; max-height: <?php p($_['previewMaxY']); ?>px"> <video tabindex="0" controls="" preload="none" style="max-width: <?php p($_['previewMaxX']); ?>px; max-height: <?php p($_['previewMaxY']); ?>px">
<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" /> <source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />