Skip to content

Fix/review comments #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
navid-shokri merged 4 commits into from
Jul 14, 2023
Merged

Fix/review comments #17

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53b2921
improve logics
shokri-navid Jul 14, 2023
36b625d
adjust code format
shokri-navid Jul 14, 2023
263ceaa
remove extra space
shokri-navid Jul 14, 2023
2bea3c6
remove extra space
shokri-navid Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
remove extra space
  • Loading branch information
@shokri-navid
shokri-navid authored Jul 14, 2023
commit 2bea3c659bb2b476788a7ee8aef497c1f7706812
1 change: 0 additions & 1 deletion apps/files_sharing/lib/Controller/RemoteOcsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ public function __construct(
IConfig $config,
ILogger $logger,
$uid

) {
parent::__construct($appName, $request);
$this->request = $request;
Expand Down
8 changes: 4 additions & 4 deletions apps/files_sharing/lib/Controllers/ExternalSharesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class ExternalSharesController extends Controller {
/** @var IConfig $config */
private $config;

const group_share_type = "group";
public const group_share_type = "group";
/**
* ExternalSharesController constructor.
*
Expand Down Expand Up @@ -88,7 +88,7 @@ public function __construct(
*/
public function index() {
$federatedGroupResult = [];
$groupExternalManager = $this->initGroupManager();
$groupExternalManager = $this->initGroupManager();
if ($groupExternalManager !== null) {
$federatedGroupResult = $groupExternalManager->getOpenShares();
}
Expand All @@ -105,7 +105,6 @@ public function index() {
* @return JSONResponse
*/
public function create($id, $share_type) {

$manager = $this->getManagerForShareType($share_type);
$shareInfo = $manager->getShare($id);

Expand Down Expand Up @@ -157,14 +156,15 @@ public function destroy($id, $share_type) {
return new JSONResponse();
}

private function initGroupManager(){
private function initGroupManager() {
// Allow other apps to add an external manager for user-to-group shares
$managerClass = $this->config->getSystemValue('sharing.groupExternalManager');
if ($managerClass !== '') {
return \OC::$server->query($managerClass);
}
return null;
}

private function getManagerForShareType($share_type) {
$groupExternalManager = $this->initGroupManager();
if ($share_type === self::group_share_type && $groupExternalManager !== null) {
Expand Down