Merge pull request #21797 from owncloud/proper-controller-in-core
Move controller in core/ to a common subfolder
This commit is contained in:
commit
2b4532c6b9
|
@ -29,9 +29,9 @@ namespace OC\Core;
|
||||||
use OC\AppFramework\Utility\SimpleContainer;
|
use OC\AppFramework\Utility\SimpleContainer;
|
||||||
use OC\AppFramework\Utility\TimeFactory;
|
use OC\AppFramework\Utility\TimeFactory;
|
||||||
use \OCP\AppFramework\App;
|
use \OCP\AppFramework\App;
|
||||||
use OC\Core\LostPassword\Controller\LostController;
|
use OC\Core\Controller\LostController;
|
||||||
use OC\Core\User\UserController;
|
use OC\Core\Controller\UserController;
|
||||||
use OC\Core\Avatar\AvatarController;
|
use OC\Core\Controller\AvatarController;
|
||||||
use \OCP\Util;
|
use \OCP\Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
namespace OC\Core\Avatar;
|
namespace OC\Core\Controller;
|
||||||
|
|
||||||
use OCP\AppFramework\Controller;
|
use OCP\AppFramework\Controller;
|
||||||
use OCP\AppFramework\Http;
|
use OCP\AppFramework\Http;
|
||||||
|
@ -42,7 +42,7 @@ use OCP\Files\Folder;
|
||||||
/**
|
/**
|
||||||
* Class AvatarController
|
* Class AvatarController
|
||||||
*
|
*
|
||||||
* @package OC\Core\Avatar
|
* @package OC\Core\Controller
|
||||||
*/
|
*/
|
||||||
class AvatarController extends Controller {
|
class AvatarController extends Controller {
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OC\Core\LostPassword\Controller;
|
namespace OC\Core\Controller;
|
||||||
|
|
||||||
use \OCP\AppFramework\Controller;
|
use \OCP\AppFramework\Controller;
|
||||||
use \OCP\AppFramework\Http\TemplateResponse;
|
use \OCP\AppFramework\Http\TemplateResponse;
|
||||||
|
@ -45,7 +45,7 @@ use OCP\Security\StringUtils;
|
||||||
*
|
*
|
||||||
* Successfully changing a password will emit the post_passwordReset hook.
|
* Successfully changing a password will emit the post_passwordReset hook.
|
||||||
*
|
*
|
||||||
* @package OC\Core\LostPassword\Controller
|
* @package OC\Core\Controller
|
||||||
*/
|
*/
|
||||||
class LostController extends Controller {
|
class LostController extends Controller {
|
||||||
|
|
||||||
|
@ -122,8 +122,8 @@ class LostController extends Controller {
|
||||||
*/
|
*/
|
||||||
public function resetform($token, $userId) {
|
public function resetform($token, $userId) {
|
||||||
return new TemplateResponse(
|
return new TemplateResponse(
|
||||||
'core/lostpassword',
|
'core',
|
||||||
'resetpassword',
|
'lostpassword/resetpassword',
|
||||||
array(
|
array(
|
||||||
'link' => $this->urlGenerator->linkToRouteAbsolute('core.lost.setPassword', array('userId' => $userId, 'token' => $token)),
|
'link' => $this->urlGenerator->linkToRouteAbsolute('core.lost.setPassword', array('userId' => $userId, 'token' => $token)),
|
||||||
),
|
),
|
||||||
|
@ -236,7 +236,7 @@ class LostController extends Controller {
|
||||||
|
|
||||||
$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', array('userId' => $user, 'token' => $token));
|
$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', array('userId' => $user, 'token' => $token));
|
||||||
|
|
||||||
$tmpl = new \OC_Template('core/lostpassword', 'email');
|
$tmpl = new \OC_Template('core', 'lostpassword/email');
|
||||||
$tmpl->assign('link', $link);
|
$tmpl->assign('link', $link);
|
||||||
$msg = $tmpl->fetchPage();
|
$msg = $tmpl->fetchPage();
|
||||||
|
|
|
@ -25,11 +25,11 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OC\Core\Setup;
|
namespace OC\Core\Controller;
|
||||||
|
|
||||||
use OC\Setup;
|
use OC\Setup;
|
||||||
|
|
||||||
class Controller {
|
class SetupController {
|
||||||
/** @var Setup */
|
/** @var Setup */
|
||||||
protected $setupHelper;
|
protected $setupHelper;
|
||||||
/** @var string */
|
/** @var string */
|
|
@ -20,7 +20,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OC\Core\User;
|
namespace OC\Core\Controller;
|
||||||
|
|
||||||
use \OCP\AppFramework\Controller;
|
use \OCP\AppFramework\Controller;
|
||||||
use \OCP\AppFramework\Http\JSONResponse;
|
use \OCP\AppFramework\Http\JSONResponse;
|
|
@ -1,31 +0,0 @@
|
||||||
#body-login
|
|
||||||
input[type="text"]#user{
|
|
||||||
padding-right: 20px;
|
|
||||||
padding-left: 41px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#body-login
|
|
||||||
input[type="submit"] {
|
|
||||||
text-align: center;
|
|
||||||
width: 170px;
|
|
||||||
height: 45px;
|
|
||||||
padding-top: 7px;
|
|
||||||
padding-bottom: 7px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#body-login input[type="submit"]#submit {
|
|
||||||
width: 280px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#body-login .update {
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
#body-login .update,
|
|
||||||
#body-login .error {
|
|
||||||
margin: 10px 0 5px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#user {
|
|
||||||
width: 226px !important;
|
|
||||||
}
|
|
|
@ -22,7 +22,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
style('lostpassword', 'resetpassword');
|
style('core', 'lostpassword/resetpassword');
|
||||||
script('core', 'lostpassword');
|
script('core', 'lostpassword');
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -826,7 +826,7 @@ class OC {
|
||||||
$setupHelper = new OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(),
|
$setupHelper = new OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(),
|
||||||
\OC::$server->getL10N('lib'), new \OC_Defaults(), \OC::$server->getLogger(),
|
\OC::$server->getL10N('lib'), new \OC_Defaults(), \OC::$server->getLogger(),
|
||||||
\OC::$server->getSecureRandom());
|
\OC::$server->getSecureRandom());
|
||||||
$controller = new OC\Core\Setup\Controller($setupHelper);
|
$controller = new OC\Core\Controller\SetupController($setupHelper);
|
||||||
$controller->run($_POST);
|
$controller->run($_POST);
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
namespace OC\Core\Avatar;
|
namespace OC\Core\Controller;
|
||||||
|
|
||||||
use OC;
|
use OC;
|
||||||
use OC\Core\Application;
|
use OC\Core\Application;
|
||||||
|
@ -45,7 +45,7 @@ function is_uploaded_file($filename) {
|
||||||
*
|
*
|
||||||
* @group DB
|
* @group DB
|
||||||
*
|
*
|
||||||
* @package OC\Core\Avatar
|
* @package OC\Core\Controller
|
||||||
*/
|
*/
|
||||||
class AvatarControllerTest extends \Test\TestCase {
|
class AvatarControllerTest extends \Test\TestCase {
|
||||||
use UserTrait;
|
use UserTrait;
|
|
@ -19,7 +19,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OC\Core\LostPassword\Controller;
|
namespace OC\Core\Controller;
|
||||||
|
|
||||||
use OCP\AppFramework\Http\TemplateResponse;
|
use OCP\AppFramework\Http\TemplateResponse;
|
||||||
use OCP\AppFramework\Utility\ITimeFactory;
|
use OCP\AppFramework\Utility\ITimeFactory;
|
||||||
|
@ -36,7 +36,7 @@ use PHPUnit_Framework_MockObject_MockObject;
|
||||||
/**
|
/**
|
||||||
* Class LostControllerTest
|
* Class LostControllerTest
|
||||||
*
|
*
|
||||||
* @package OC\Core\LostPassword\Controller
|
* @package OC\Core\Controller
|
||||||
*/
|
*/
|
||||||
class LostControllerTest extends \PHPUnit_Framework_TestCase {
|
class LostControllerTest extends \PHPUnit_Framework_TestCase {
|
||||||
|
|
||||||
|
@ -124,8 +124,8 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
|
||||||
->will($this->returnValue('https://ownCloud.com/index.php/lostpassword/'));
|
->will($this->returnValue('https://ownCloud.com/index.php/lostpassword/'));
|
||||||
|
|
||||||
$response = $this->lostController->resetform($token, $userId);
|
$response = $this->lostController->resetform($token, $userId);
|
||||||
$expectedResponse = new TemplateResponse('core/lostpassword',
|
$expectedResponse = new TemplateResponse('core',
|
||||||
'resetpassword',
|
'lostpassword/resetpassword',
|
||||||
array(
|
array(
|
||||||
'link' => 'https://ownCloud.com/index.php/lostpassword/',
|
'link' => 'https://ownCloud.com/index.php/lostpassword/',
|
||||||
),
|
),
|
Loading…
Reference in New Issue