Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
dd1e47b3
Commit
dd1e47b3
authored
11 years ago
by
Thomas Müller
Committed by
Bjoern Schiessle
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
typos, use, unused and return fixed
parent
2049bedc
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
apps/files_sharing/appinfo/update.php
+3
-1
3 additions, 1 deletion
apps/files_sharing/appinfo/update.php
apps/files_sharing/lib/helper.php
+3
-4
3 additions, 4 deletions
apps/files_sharing/lib/helper.php
apps/files_sharing/lib/sharedstorage.php
+3
-2
3 additions, 2 deletions
apps/files_sharing/lib/sharedstorage.php
with
9 additions
and
7 deletions
apps/files_sharing/appinfo/update.php
+
3
−
1
View file @
dd1e47b3
...
...
@@ -18,7 +18,7 @@ if (version_compare($installedVersion, '0.4', '<')) {
$users
[]
=
$row
[
'share_with'
];
$shares
[
$row
[
'id'
]]
=
$row
[
'file_target'
];
}
else
if
(
$row
[
'share_type'
]
===
"1"
&&
(
$row
[
'item_type'
]
===
'file'
||
$row
[
'item_type'
]
===
'folder'
))
{
//collect all group shares
X
//collect all group shares
$users
=
array_merge
(
$users
,
\OC_group
::
usersInGroup
(
$row
[
'share_with'
]));
$shares
[
$row
[
'id'
]]
=
$row
[
'file_target'
];
}
else
if
(
$row
[
'share_type'
]
===
"2"
)
{
...
...
@@ -48,7 +48,9 @@ if (version_compare($installedVersion, '0.4', '<')) {
$statement
.
=
' END WHERE `id` IN ('
.
$ids
.
')'
;
$query
=
OCP\DB
::
prepare
(
$statement
);
$query
->
execute
(
array
());
}
}
...
...
This diff is collapsed.
Click to expand it.
apps/files_sharing/lib/helper.php
+
3
−
4
View file @
dd1e47b3
...
...
@@ -2,6 +2,9 @@
namespace
OCA\Files_Sharing
;
use
OC_Config
;
use
PasswordHash
;
class
Helper
{
/**
...
...
@@ -26,9 +29,6 @@ class Helper {
exit
;
}
$type
=
$linkItem
[
'item_type'
];
$fileSource
=
$linkItem
[
'file_source'
];
$shareOwner
=
$linkItem
[
'uid_owner'
];
$rootLinkItem
=
\OCP\Share
::
resolveReShare
(
$linkItem
);
$path
=
null
;
if
(
isset
(
$rootLinkItem
[
'uid_owner'
]))
{
...
...
@@ -61,7 +61,6 @@ class Helper {
}
$basePath
=
$path
;
$rootName
=
basename
(
$path
);
if
(
$relativePath
!==
null
&&
\OC\Files\Filesystem
::
isReadable
(
$basePath
.
$relativePath
))
{
$path
.
=
\OC\Files\Filesystem
::
normalizePath
(
$relativePath
);
...
...
This diff is collapsed.
Click to expand it.
apps/files_sharing/lib/sharedstorage.php
+
3
−
2
View file @
dd1e47b3
...
...
@@ -299,14 +299,14 @@ class Shared extends \OC\Files\Storage\Common {
}
/**
* @brief rename a shared foder/file
* @brief rename a shared fo
l
der/file
* @param string $sourcePath
* @param string $targetPath
* @return bool
*/
private
function
renameMountPoint
(
$sourcePath
,
$targetPath
)
{
// it shoul
b
n't be possible to move a Shared storage into another one
// it shoul
d
n't be possible to move a Shared storage into another one
list
(
$targetStorage
,
)
=
\OC\Files\Filesystem
::
resolvePath
(
$targetPath
);
if
(
$targetStorage
instanceof
\OC\Files\Storage\Shared
)
{
\OCP\Util
::
writeLog
(
'file sharing'
,
...
...
@@ -452,6 +452,7 @@ class Shared extends \OC\Files\Storage\Common {
list
(
$storage
,
$internalPath
)
=
\OC\Files\Filesystem
::
resolvePath
(
$source
);
return
$storage
->
free_space
(
$internalPath
);
}
return
\OC\Files\SPACE_UNKNOWN
;
}
public
function
getLocalFile
(
$path
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment