diff --git a/appinfo/routes.php b/appinfo/routes.php index 2658b125..016c1864 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -16,8 +16,8 @@ $application->registerRoutes($this, array( 'routes' => array( //users array('name' => 'user#rename', 'url' => 'ajax/user/rename', 'verb' => 'POST'), - array('name' => 'user#disconnect', 'url' => 'ajax/user/disconnect/{memberId}', 'verb' => 'POST'), - array('name' => 'user#disconnectGuest', 'url' => 'ajax/user/disconnectGuest/{memberId}', 'verb' => 'POST'), + array('name' => 'user#disconnectUser', 'url' => 'ajax/user/disconnect', 'verb' => 'POST'), + array('name' => 'user#disconnectGuest', 'url' => 'ajax/user/disconnectGuest', 'verb' => 'POST'), //session array('name' => 'session#joinAsUser', 'url' => 'ajax/session/joinasuser/{fileId}', 'verb' => 'POST'), array('name' => 'session#joinAsGuest', 'url' => 'ajax/session/joinasguest/{token}', 'verb' => 'POST'), diff --git a/controller/usercontroller.php b/controller/usercontroller.php index 87dbb19a..6bee7e02 100644 --- a/controller/usercontroller.php +++ b/controller/usercontroller.php @@ -19,6 +19,7 @@ use \OCP\AppFramework\Http\JSONResponse; use \OCA\Documents\Db; class UserController extends Controller { + public function __construct($appName, IRequest $request){ parent::__construct($appName, $request); } @@ -35,7 +36,7 @@ class UserController extends Controller { * @PublicPage */ public function disconnectGuest($memberId, $esId){ - return $this->disconnect($memberId, $esId); + return $this->disconnect($memberId, $esId); } private function disconnect($memberId, $esId){ diff --git a/js/documents.js b/js/documents.js index 99fd819b..42298417 100644 --- a/js/documents.js +++ b/js/documents.js @@ -682,12 +682,15 @@ var documentsMain = { var url = ''; if (documentsMain.isGuest){ - url = OC.generateUrl('apps/documents/ajax/user/disconnectGuest/{member_id}', {member_id: documentsMain.memberId}); + url = OC.generateUrl('apps/documents/ajax/user/disconnectGuest', {}); } else { - url = OC.generateUrl('apps/documents/ajax/user/disconnect/{member_id}', {member_id: documentsMain.memberId}); + url = OC.generateUrl('apps/documents/ajax/user/disconnect', {}); } - $.post(url, {esId: documentsMain.esId}); + $.post(url, { + memberId : documentsMain.memberId, + esId: documentsMain.esId + }); documentsMain.show(); // });