scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Worked on #8

Browse Source 
Also:
- changed URL schema for posts from /posts/action/id to /posts/id/action
- moved XXXController::locateXXX methods to Model_XXX::locate
This commit is contained in:
Marcin Kurczewski
2013-10-17 22:57:32 +02:00
parent ffc373e871
commit ee050cfd01
24 changed files with 437 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Controllers/UserController.php
View File

@ -1,14 +1,6 @@
<?php
class UserController
{
private static function locateUser($key)
{
$user = R::findOne('user', 'name = ?', [$key]);
if (!$user)
throw new SimpleException('Invalid user name "' . $key . '"');
return $user;
}
private static function sendEmailConfirmation(&$user)
{
$regConfig = \Chibi\Registry::getConfig()->registration;
@ -134,7 +126,7 @@ class UserController
*/
public function banAction($name)
{
$user = self::locateUser($name);
$user = Model_User::locate($name);
$secondary = $user->id == $this->context->user->id ? 'own' : 'all';
PrivilegesHelper::confirmWithException($this->context->user, Privilege::BanUser, $secondary);
$user->banned = true;
@ -148,7 +140,7 @@ class UserController
*/
public function unbanAction($name)
{
$user = self::locateUser($name);
$user = Model_User::locate($name);
$secondary = $user->id == $this->context->user->id ? 'own' : 'all';
PrivilegesHelper::confirmWithException($this->context->user, Privilege::BanUser, $secondary);
$user->banned = false;
@ -162,7 +154,7 @@ class UserController
*/
public function acceptRegistrationAction($name)
{
$user = self::locateUser($name);
$user = Model_User::locate($name);
PrivilegesHelper::confirmWithException($this->context->user, Privilege::AcceptUserRegistration);
$user->staff_confirmed = true;
R::store($user);
@ -178,7 +170,7 @@ class UserController
*/
public function deleteAction($name)
{
$user = self::locateUser($name);
$user = Model_User::locate($name);
$secondary = $user->id == $this->context->user->id ? 'own' : 'all';
PrivilegesHelper::confirmWithException($this->context->user, Privilege::ViewUser, $secondary);
PrivilegesHelper::confirmWithException($this->context->user, Privilege::DeleteUser, $secondary);
@ -219,7 +211,7 @@ class UserController
try
{
$user = self::locateUser($name);
$user = Model_User::locate($name);
$edited = false;
$secondary = $user->id == $this->context->user->id ? 'own' : 'all';
PrivilegesHelper::confirmWithException($this->context->user, Privilege::ViewUser, $secondary);
@ -297,7 +289,7 @@ class UserController
}
catch (Exception $e)
{
$this->context->transport->user = self::locateUser($name);
$this->context->transport->user = Model_User::locate($name);
throw $e;
}
}
@ -314,7 +306,7 @@ class UserController
public function viewAction($name, $tab, $page)
{
$postsPerPage = intval($this->config->browsing->postsPerPage);
$user = self::locateUser($name);
$user = Model_User::locate($name);
if ($tab === null)
$tab = 'favs';
if ($page === null)