deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some fixes for subdirectory support.

Browse source
This commit is contained in:
Tobias Tom 2013-07-30 19:45:27 +02:00
parent c935c5c7ee
commit 0590890511
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PHPCI/Application.php
View file

@ -65,7 +65,7 @@ class Application extends b8\Application
$this->response->setContent(''); $this->response->setContent('');
} else { } else {
$this->response = new RedirectResponse($this->response); $this->response = new RedirectResponse($this->response);
$this->response->setHeader('Location', '/session/login'); $this->response->setHeader('Location', PHPCI_URL.'session/login');
} }
return false; return false;

6
PHPCI/Controller/SessionController.php
View file

@ -21,7 +21,7 @@ class SessionController extends \PHPCI\Controller
{ {
public function init() public function init()
{ {
$this->response->disableLayout(); $this->response->disableLayout();
$this->_userStore = b8\Store\Factory::getStore('User'); $this->_userStore = b8\Store\Factory::getStore('User');
} }
@ -29,7 +29,7 @@ class SessionController extends \PHPCI\Controller
* Handles user login (form and processing) * Handles user login (form and processing)
*/ */
public function login() public function login()
{ {
if ($this->request->getMethod() == 'POST') { if ($this->request->getMethod() == 'POST') {
$user = $this->_userStore->getByEmail($this->getParam('email')); $user = $this->_userStore->getByEmail($this->getParam('email'));
@ -42,7 +42,7 @@ class SessionController extends \PHPCI\Controller
$form = new b8\Form(); $form = new b8\Form();
$form->setMethod('POST'); $form->setMethod('POST');
$form->setAction('/session/login'); $form->setAction(PHPCI_URL.'session/login');
$email = new b8\Form\Element\Email('email'); $email = new b8\Form\Element\Email('email');
$email->setLabel('Email Address'); $email->setLabel('Email Address');

2
PHPCI/Controller/UserController.php
View file

@ -129,7 +129,7 @@ class UserController extends \PHPCI\Controller
{ {
$form = new Form(); $form = new Form();
$form->setMethod('POST'); $form->setMethod('POST');
$form->setAction('/user/' . $type); $form->setAction(PHPCI_URL.'user/' . $type);
$form->addField(new Form\Element\Csrf('csrf')); $form->addField(new Form\Element\Csrf('csrf'));
$field = new Form\Element\Email('email'); $field = new Form\Element\Email('email');

8
assets/css/phpci.css
View file

@ -57,22 +57,22 @@ td .label { margin-right: 5px; }
.icon-build-ok .icon-build-ok
{ {
background: url('/assets/img/icon-build-ok.png') no-repeat top left; background: url('../img/icon-build-ok.png') no-repeat top left;
} }
.icon-build-failed .icon-build-failed
{ {
background: url('/assets/img/icon-build-failed.png') no-repeat top left; background: url('../img/icon-build-failed.png') no-repeat top left;
} }
.icon-build-pending .icon-build-pending
{ {
background: url('/assets/img/icon-build-pending.png') no-repeat top left; background: url('../img/icon-build-pending.png') no-repeat top left;
} }
.icon-build-running .icon-build-running
{ {
background: url('/assets/img/icon-build-running.png') no-repeat top left; background: url('../img/icon-build-running.png') no-repeat top left;
} }
h3 h3