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

complete renaming uid to userId

This commit is contained in:
Morris Jobke 2014-06-13 16:18:21 +02:00
parent ebbf228309
commit ed8b7fc101
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/lostpassword/controller/lostcontroller.php
View File

@ -57,15 +57,15 @@ class LostController extends Controller {
* @NoCSRFRequired * @NoCSRFRequired
* *
* @param string $token * @param string $token
* @param string $uid * @param string $userId
*/ */
public function resetform($token, $uid) { public function resetform($token, $userId) {
return new TemplateResponse( return new TemplateResponse(
'core/lostpassword', 'core/lostpassword',
'resetpassword', 'resetpassword',
array( array(
'isEncrypted' => $this->isDataEncrypted, 'isEncrypted' => $this->isDataEncrypted,
'link' => $this->getLink('core.lost.setPassword', $uid, $token), 'link' => $this->getLink('core.lost.setPassword', $userId, $token),
), ),
'guest' 'guest'
); );
@ -178,7 +178,7 @@ class LostController extends Controller {
protected function getLink($route, $user, $token){ protected function getLink($route, $user, $token){
$parameters = array( $parameters = array(
'token' => $token, 'token' => $token,
'uid' => $user 'userId' => $user
); );
$link = $this->urlGenerator->linkToRoute($route, $parameters); $link = $this->urlGenerator->linkToRoute($route, $parameters);

4
core/routes.php
View File

@ -11,8 +11,8 @@ use OC\Core\LostPassword\Application;
$application = new Application(); $application = new Application();
$application->registerRoutes($this, array('routes' => array( $application->registerRoutes($this, array('routes' => array(
array('name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'), array('name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'),
array('name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{uid}', 'verb' => 'GET'), array('name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{userId}', 'verb' => 'GET'),
array('name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{uid}', 'verb' => 'POST'), array('name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'),
) )
)); ));