Style cleanup files_sharing
This commit is contained in:
parent
40a5a52684
commit
59a3238d1a
|
@ -52,7 +52,10 @@ if (version_compare($installedVersion, '0.3', '<')) {
|
|||
}
|
||||
catch (Exception $e) {
|
||||
$update_error = true;
|
||||
OCP\Util::writeLog('files_sharing', 'Upgrade Routine: Skipping sharing "'.$row['source'].'" to "'.$shareWith.'" (error is "'.$e->getMessage().'")', OCP\Util::WARN);
|
||||
OCP\Util::writeLog('files_sharing',
|
||||
'Upgrade Routine: Skipping sharing "'.$row['source'].'" to "'.$shareWith
|
||||
.'" (error is "'.$e->getMessage().'")',
|
||||
OCP\Util::WARN);
|
||||
}
|
||||
OC_Util::tearDownFS();
|
||||
}
|
||||
|
|
|
@ -71,8 +71,9 @@ class Shared_Cache extends Cache {
|
|||
}
|
||||
} else {
|
||||
$query = \OC_DB::prepare(
|
||||
'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`
|
||||
FROM `*PREFIX*filecache` WHERE `fileid` = ?');
|
||||
'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`,'
|
||||
.' `size`, `mtime`, `encrypted`'
|
||||
.' FROM `*PREFIX*filecache` WHERE `fileid` = ?');
|
||||
$result = $query->execute(array($file));
|
||||
$data = $result->fetchRow();
|
||||
$data['fileid'] = (int)$data['fileid'];
|
||||
|
|
|
@ -33,7 +33,8 @@ class Shared_Permissions extends Permissions {
|
|||
if ($fileId == -1) {
|
||||
return \OCP\PERMISSION_READ;
|
||||
}
|
||||
$source = \OCP\Share::getItemSharedWithBySource('file', $fileId, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE, null, true);
|
||||
$source = \OCP\Share::getItemSharedWithBySource('file', $fileId, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE,
|
||||
null, true);
|
||||
if ($source) {
|
||||
return $source['permissions'];
|
||||
} else {
|
||||
|
|
|
@ -72,7 +72,11 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
|
|||
public function formatItems($items, $format, $parameters = null) {
|
||||
if ($format == self::FORMAT_SHARED_STORAGE) {
|
||||
// Only 1 item should come through for this format call
|
||||
return array('path' => $items[key($items)]['path'], 'permissions' => $items[key($items)]['permissions'], 'uid_owner' => $items[key($items)]['uid_owner']);
|
||||
return array(
|
||||
'path' => $items[key($items)]['path'],
|
||||
'permissions' => $items[key($items)]['permissions'],
|
||||
'uid_owner' => $items[key($items)]['uid_owner']
|
||||
);
|
||||
} else if ($format == self::FORMAT_GET_FOLDER_CONTENTS) {
|
||||
$files = array();
|
||||
foreach ($items as $item) {
|
||||
|
@ -99,7 +103,13 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
|
|||
}
|
||||
$size += (int)$item['size'];
|
||||
}
|
||||
return array('fileid' => -1, 'name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size);
|
||||
return array(
|
||||
'fileid' => -1,
|
||||
'name' => 'Shared',
|
||||
'mtime' => $mtime,
|
||||
'mimetype' => 'httpd/unix-directory',
|
||||
'size' => $size
|
||||
);
|
||||
} else if ($format == self::FORMAT_OPENDIR) {
|
||||
$files = array();
|
||||
foreach ($items as $item) {
|
||||
|
|
|
@ -33,7 +33,8 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share
|
|||
}
|
||||
while (!empty($parents)) {
|
||||
$parents = "'".implode("','", $parents)."'";
|
||||
$query = OC_DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache` WHERE `parent` IN ('.$parents.')');
|
||||
$query = OC_DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`'
|
||||
.' WHERE `parent` IN ('.$parents.')');
|
||||
$result = $query->execute();
|
||||
$parents = array();
|
||||
while ($file = $result->fetchRow()) {
|
||||
|
|
|
@ -240,7 +240,8 @@ class Shared extends \OC\Files\Storage\Common {
|
|||
public function file_put_contents($path, $data) {
|
||||
if ($source = $this->getSourcePath($path)) {
|
||||
// Check if permission is granted
|
||||
if (($this->file_exists($path) && !$this->isUpdatable($path)) || ($this->is_dir($path) && !$this->isCreatable($path))) {
|
||||
if (($this->file_exists($path) && !$this->isUpdatable($path))
|
||||
|| ($this->is_dir($path) && !$this->isCreatable($path))) {
|
||||
return false;
|
||||
}
|
||||
$info = array(
|
||||
|
@ -390,9 +391,12 @@ class Shared extends \OC\Files\Storage\Common {
|
|||
}
|
||||
|
||||
public static function setup($options) {
|
||||
if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user'] || \OCP\Share::getItemsSharedWith('file')) {
|
||||
if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user']
|
||||
|| \OCP\Share::getItemsSharedWith('file')) {
|
||||
$user_dir = $options['user_dir'];
|
||||
\OC\Files\Filesystem::mount('\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), $user_dir.'/Shared/');
|
||||
\OC\Files\Filesystem::mount('\OC\Files\Storage\Shared',
|
||||
array('sharedFolder' => '/Shared'),
|
||||
$user_dir.'/Shared/');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -171,7 +171,9 @@ if (isset($path)) {
|
|||
$list->assign('files', $files, false);
|
||||
$list->assign('disableSharing', true);
|
||||
$list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=', false);
|
||||
$list->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=', false);
|
||||
$list->assign('downloadURL',
|
||||
OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=',
|
||||
false);
|
||||
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
|
||||
$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
|
||||
$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=', false);
|
||||
|
@ -188,7 +190,8 @@ if (isset($path)) {
|
|||
$folder->assign('usedSpacePercent', 0);
|
||||
$tmpl->assign('folder', $folder->fetchPage(), false);
|
||||
$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
|
||||
$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath));
|
||||
$tmpl->assign('downloadURL',
|
||||
OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath));
|
||||
} else {
|
||||
$tmpl->assign('dir', $dir);
|
||||
|
||||
|
|
|
@ -3,15 +3,20 @@
|
|||
<input type="hidden" name="filename" value="<?php echo $_['filename'] ?>" id="filename">
|
||||
<input type="hidden" name="mimetype" value="<?php echo $_['mimetype'] ?>" id="mimetype">
|
||||
<header><div id="header">
|
||||
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
|
||||
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg"
|
||||
src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
|
||||
<div class="header-right">
|
||||
<?php if (isset($_['folder'])): ?>
|
||||
<span id="details"><?php echo $l->t('%s shared the folder %s with you', array($_['displayName'], $_['fileTarget'])) ?></span>
|
||||
<span id="details"><?php echo $l->t('%s shared the folder %s with you',
|
||||
array($_['displayName'], $_['fileTarget'])) ?></span>
|
||||
<?php else: ?>
|
||||
<span id="details"><?php echo $l->t('%s shared the file %s with you', array($_['displayName'], $_['fileTarget'])) ?></span>
|
||||
<span id="details"><?php echo $l->t('%s shared the file %s with you',
|
||||
array($_['displayName'], $_['fileTarget'])) ?></span>
|
||||
<?php endif; ?>
|
||||
<?php if (!isset($_['folder']) || $_['allowZipDownload']): ?>
|
||||
<a href="<?php echo $_['downloadURL']; ?>" class="button" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
|
||||
<a href="<?php echo $_['downloadURL']; ?>" class="button" id="download"><img
|
||||
class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>"
|
||||
/><?php echo $l->t('Download')?></a>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div></header>
|
||||
|
@ -27,9 +32,12 @@
|
|||
<ul id="noPreview">
|
||||
<li class="error">
|
||||
<?php echo $l->t('No preview available for').' '.$_['fileTarget']; ?><br />
|
||||
<a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
|
||||
<a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download"
|
||||
src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>"
|
||||
/><?php echo $l->t('Download')?></a>
|
||||
</li>
|
||||
</ul>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> – <?php echo $l->t('web services under your control'); ?></p></footer>
|
||||
<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> –
|
||||
<?php echo $l->t('web services under your control'); ?></p></footer>
|
||||
|
|
Loading…
Reference in New Issue