ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged branch 'master' into api

Browse source
This commit is contained in:
Marcin Kurczewski 2014-05-03 23:29:16 +02:00
commit 259eabfaaa
9 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public_html/dispatch.php
View file

@ -1,4 +1,6 @@
<?php <?php
$startTime = microtime(true);
require_once '../src/core.php'; require_once '../src/core.php';
$query = rtrim($_SERVER['REQUEST_URI'], '/'); $query = rtrim($_SERVER['REQUEST_URI'], '/');
@ -155,8 +157,10 @@ foreach (['GET', 'POST'] as $method)
\Chibi\Router::register(['UserController', 'settingsAction'], $method, '/user/{name}/settings', $userValidations); \Chibi\Router::register(['UserController', 'settingsAction'], $method, '/user/{name}/settings', $userValidations);
\Chibi\Router::register(['UserController', 'editAction'], $method, '/user/{name}/edit', $userValidations); \Chibi\Router::register(['UserController', 'editAction'], $method, '/user/{name}/edit', $userValidations);
\Chibi\Router::register(['UserController', 'activationAction'], $method, '/activation/{token}', $userValidations); \Chibi\Router::register(['UserController', 'activationAction'], $method, '/activation/{token}', $userValidations);
\Chibi\Router::register(['UserController', 'activationProxyAction'], $method, '/activation-proxy', $userValidations);
\Chibi\Router::register(['UserController', 'activationProxyAction'], $method, '/activation-proxy/{token}', $userValidations); \Chibi\Router::register(['UserController', 'activationProxyAction'], $method, '/activation-proxy/{token}', $userValidations);
\Chibi\Router::register(['UserController', 'passwordResetAction'], $method, '/password-reset/{token}', $userValidations); \Chibi\Router::register(['UserController', 'passwordResetAction'], $method, '/password-reset/{token}', $userValidations);
\Chibi\Router::register(['UserController', 'passwordResetProxyAction'], $method, '/password-reset-proxy', $userValidations);
\Chibi\Router::register(['UserController', 'passwordResetProxyAction'], $method, '/password-reset-proxy/{token}', $userValidations); \Chibi\Router::register(['UserController', 'passwordResetProxyAction'], $method, '/password-reset-proxy/{token}', $userValidations);
\Chibi\Router::register(['UserController', 'toggleSafetyAction'], $method, '/user/toggle-safety/{safety}', $userValidations); \Chibi\Router::register(['UserController', 'toggleSafetyAction'], $method, '/user/toggle-safety/{safety}', $userValidations);
} }

3
src/Controllers/AuthController.php
View file

@ -44,8 +44,9 @@ class AuthController
{ {
\Chibi\Util\Url::forward(\Chibi\Util\Url::makeAbsolute($_SESSION['login-redirect-url'])); \Chibi\Util\Url::forward(\Chibi\Util\Url::makeAbsolute($_SESSION['login-redirect-url']));
unset($_SESSION['login-redirect-url']); unset($_SESSION['login-redirect-url']);
return; exit;
} }
\Chibi\Util\Url::forward(\Chibi\Router::linkTo(['StaticPagesController', 'mainPageView'])); \Chibi\Util\Url::forward(\Chibi\Router::linkTo(['StaticPagesController', 'mainPageView']));
exit;
} }
} }

2
src/Controllers/LogController.php
View file

@ -24,7 +24,7 @@ class LogController
'filter' => $formQuery, 'filter' => $formQuery,
'page' => 1 'page' => 1
])); ]));
return; exit;
} }
$ret = Api::run( $ret = Api::run(

2
src/Controllers/PostController.php
View file

@ -23,7 +23,7 @@ class PostController
'additionalInfo' => $additionalInfo, 'additionalInfo' => $additionalInfo,
'query' => $formQuery]); 'query' => $formQuery]);
\Chibi\Util\Url::forward($url); \Chibi\Util\Url::forward($url);
return; exit;
} }
$query = trim($query); $query = trim($query);

1
src/Controllers/TagController.php
View file

@ -155,5 +155,6 @@ class TagController
if ($suppliedOldPage != 0 and $suppliedOldQuery == $suppliedQuery) if ($suppliedOldPage != 0 and $suppliedOldQuery == $suppliedQuery)
$params['page'] = $suppliedOldPage; $params['page'] = $suppliedOldPage;
\Chibi\Util\Url::forward(\Chibi\Router::linkTo(['PostController', 'listView'], $params)); \Chibi\Util\Url::forward(\Chibi\Router::linkTo(['PostController', 'listView'], $params));
exit;
} }
} }

3
src/Controllers/UserController.php
View file

@ -128,6 +128,7 @@ class UserController
\Chibi\Util\Url::forward(\Chibi\Router::linkTo(['StaticPagesController', 'mainPageView'])); \Chibi\Util\Url::forward(\Chibi\Router::linkTo(['StaticPagesController', 'mainPageView']));
LogHelper::log('{user} removed {subject}\'s account', ['subject' => TextHelper::reprUser($name)]); LogHelper::log('{user} removed {subject}\'s account', ['subject' => TextHelper::reprUser($name)]);
exit;
} }
public function settingsAction($name) public function settingsAction($name)
@ -348,7 +349,7 @@ class UserController
if (Auth::isLoggedIn()) if (Auth::isLoggedIn())
{ {
\Chibi\Util\Url::forward(\Chibi\Router::linkTo(['StaticPagesController', 'mainPageView'])); \Chibi\Util\Url::forward(\Chibi\Router::linkTo(['StaticPagesController', 'mainPageView']));
return; exit;
} }
$suppliedName = InputHelper::get('name'); $suppliedName = InputHelper::get('name');

2
src/Views/user-registration.phtml
View file

@ -2,7 +2,7 @@
Assets::setSubTitle('registration form'); Assets::setSubTitle('registration form');
?> ?>
<?php if ($this->context->transport->success === true): ?> <?php if (isset($this->context->transport->message)): ?>
<?php \Chibi\View::render('message', $this->context) ?> <?php \Chibi\View::render('message', $this->context) ?>
<?php else: ?> <?php else: ?>
<?php <?php

2
src/Views/user-select.phtml
View file

@ -1,4 +1,4 @@
<?php if ($this->context->transport->success === true): ?> <?php if (isset($this->context->transport->message)): ?>
<?php \Chibi\View::render('message', $this->context) ?> <?php \Chibi\View::render('message', $this->context) ?>
<?php else: ?> <?php else: ?>
<?php <?php

1
src/core.php
View file

@ -1,5 +1,4 @@
<?php <?php
$startTime = microtime(true);
define('SZURU_VERSION', '0.7.1'); define('SZURU_VERSION', '0.7.1');
define('SZURU_LINK', 'http://github.com/rr-/szurubooru'); define('SZURU_LINK', 'http://github.com/rr-/szurubooru');